检测指令修改

src/main/java/com/chinaitop/depot/intelligent/IntelligentDetection/service/AbstractTask.java

@@ -14,7 +14,7 @@ public abstract class AbstractTask implements Job {
 
     private Logger logger = LoggerFactory.getLogger(AbstractTask.class);
 
-    protected abstract void executeInternal(JobExecutionContext context);
+   /* protected abstract void executeInternal(JobExecutionContext context);*/
 
     protected String cronExpression;
 
@@ -23,7 +23,7 @@ public abstract class AbstractTask implements Job {
     @Override
     public void execute(JobExecutionContext context) {
         try {
-            executeInternal(context);
+            //executeInternal(context);
         } catch (Exception e) {
             logger.error(e.getMessage(), e);
             logger.error("工作执行失败!");

src/main/java/com/chinaitop/depot/intelligent/IntelligentDetection/service/TestTask.java

@@ -67,7 +67,7 @@ public class TestTask extends AbstractTask {
         this.cronExpression = "0/2 * * * * ? ";
     }
 
-    @Override
+   /* @Override
     protected void executeInternal(JobExecutionContext context) {
         logger.info("检测任务开始执行");
         try {
@@ -226,7 +226,7 @@ public class TestTask extends AbstractTask {
         }
         logger.info("检测任务执行结束");
     }
-
+*/
     private TTimingTaskHistory saveTaskHistory(TTimingTask tTimingTask, String kdname, String s, String type, String cfName) {
         TTimingTaskHistory taskHistory = new TTimingTaskHistory();
         taskHistory.setId(UuidUtils.getCode());

src/main/java/com/chinaitop/depot/intelligent/grainsituation/controller/GasDetectionController.java

@@ -119,7 +119,7 @@ public class GasDetectionController {
         MultiValueMap<String, String> requestEntity = new LinkedMultiValueMap<>();
         requestEntity.add("storeCode", storeCode);
         return remoteControlUtil.remoteScan(
-                String.format("%s%s", url, remoteControlUtil.chooseCFCode),
+                String.format("%s%s", url, remoteControlUtil.nowGasDetection),
                 requestEntity, "POST", null
         );
     }
@@ -146,7 +146,7 @@ public class GasDetectionController {
         MultiValueMap<String, String> requestEntity = new LinkedMultiValueMap<>();
         requestEntity.add("vCfCode", vCfCode);
         return remoteControlUtil.remoteScan(
-                String.format("%s%s", url, remoteControlUtil.foodOnly),
+                String.format("%s%s", url, remoteControlUtil.gasOnly),
                 requestEntity, "POST", null);
 
     }
@@ -168,7 +168,7 @@ public class GasDetectionController {
         Map<String, String> requestEntity = new HashMap<>();
         requestEntity.put("orgId", orgId);
         return remoteControlUtil.remoteScan(
-                String.format("%s%s", url, remoteControlUtil.foodAll),
+                String.format("%s%s", url, remoteControlUtil.gasAll),
                 null, "GET", requestEntity
         );
 

src/main/java/com/chinaitop/depot/intelligent/grainsituation/controller/InsectPestDetectionController.java

@@ -126,7 +126,7 @@ public class InsectPestDetectionController {
         MultiValueMap<String, String> requestEntity = new LinkedMultiValueMap<>();
         requestEntity.add("storeCode", storeCode);
         return remoteControlUtil.remoteScan(
-                String.format("%s%s", url, remoteControlUtil.chooseCFCode),
+                String.format("%s%s", url, remoteControlUtil.nowInsectPest),
                 requestEntity, "POST", null
         );
     }
@@ -152,7 +152,7 @@ public class InsectPestDetectionController {
         MultiValueMap<String, String> requestEntity = new LinkedMultiValueMap<>();
         requestEntity.add("vCfCode", vCfCode);
         return remoteControlUtil.remoteScan(
-                String.format("%s%s", url, remoteControlUtil.chooseCFCode),
+                String.format("%s%s", url, remoteControlUtil.onlyPest),
                 requestEntity, "POST", null
         );
     }
@@ -173,7 +173,7 @@ public class InsectPestDetectionController {
         Map<String, String> requestEntity = new HashMap<>();
 
         return remoteControlUtil.remoteScan(
-                String.format("%s%s", url, remoteControlUtil.foodAll),
+                String.format("%s%s", url, remoteControlUtil.pestAll),
                 null, "GET", requestEntity
         );
 

src/main/java/com/chinaitop/depot/intelligent/insideCirculation/controller/InsideCirculationController.java

@@ -85,7 +85,7 @@ public class InsideCirculationController {
         requestEntity.add("uperson", uperson);
         requestEntity.add("orgId", orgId+"");
         return remoteControlUtil.remoteScan(
-                String.format("%s%s", url, remoteControlUtil.foodOnly),
+                String.format("%s%s", url, remoteControlUtil.airConditionDir),
                 requestEntity, "POST", null
         );
     }

src/main/java/com/chinaitop/depot/intelligent/utils/RemoteControlUtil.java

@@ -28,6 +28,12 @@ public class RemoteControlUtil {
     /**
      * url常量
      */
+    // 虫害实时检测
+    public static final String airConditionDir = "/intelligents/monitorWarning/sendAirConditionDir";
+    // 虫害实时检测
+    public static final String nowInsectPest = "/intelligents/monitorWarning/sendNowInsectPest";
+    // 气体实时检测
+    public static final String nowGasDetection = "/intelligents/monitorWarning/sendNowGasDetection";
     // 数量检测,获取测量进度
     public static final String scanProgress = "/intelligents/monitorWarning/getScanResult";
     // 数量检测,获取扫描结果