手动任务联合执行修改

inspect-job/src/main/java/com/inspect/job/task/JobMainTask.java

@@ -33,6 +33,9 @@ import com.inspect.system.base.domain.SysDictData;
 import java.net.URLConnection;
 import java.text.DecimalFormat;
 import java.text.SimpleDateFormat;
+import java.time.LocalDateTime;
+import java.time.LocalTime;
+import java.time.format.DateTimeFormatter;
 import java.util.*;
 import java.util.concurrent.*;
 
@@ -919,7 +922,8 @@ public class JobMainTask {
             redisService.redisTemplate.opsForValue().set(BIG_FILE_POINT, -1);
         }
 
-        String immediatelyExecTaskTime = DateUtils.parseDateToStr(DateUtils.yyyyMMddHHmmss, new Date());
+//        String immediatelyExecTaskTime = DateUtils.parseDateToStr(DateUtils.yyyyMMddHHmmss, new Date());
+        String immediatelyExecTaskTime = LocalDateTime.now().format(DateTimeFormatter.ofPattern("yyyyMMddHHmmssSSS"));
         redisService.setCacheObjectOfTask(RedisConst.IMMEDIATELY_EXEC_TASK_TIME, patrolTask.getTaskCode(), immediatelyExecTaskTime);
         redisService.setCacheObjectOfTask(RedisConst.TASK_CURRENT_CODE, patrolTask.getTaskCode(), RedisConst.TASK_CODE + patrolTask.getTaskCode() + StringUtils.AT + immediatelyExecTaskTime, 5L, TimeUnit.MINUTES);
         resetRecordCounter(patrolTask.getTaskCode());
@@ -1140,7 +1144,7 @@ public class JobMainTask {
     private String decimalFormatNum(int current, int all) {
         DecimalFormat nf = new DecimalFormat("#");
         nf.setMaximumIntegerDigits(3);
-        float decimalFormatNum = (float) (current + 1) / (float) all;
+        float decimalFormatNum = (float) (current) / (float) all;
         if (decimalFormatNum > 1) {
             decimalFormatNum = 1;
         }

inspect-main/inspect-main-task/src/main/java/com/inspect/analysis/utils/ResultAnalysisUtils.java

@@ -51,9 +51,9 @@ public class ResultAnalysisUtils {
         }
 
         value = algValue.formatValue(value);
-        if ("1".equals(resultAnalysis.getFilter())) {
-            algType = "";
-        }
+//        if ("1".equals(resultAnalysis.getFilter())) {
+//            algType = "";
+//        }
 
         if(StringUtils.isNull(algType)) {
             log.warn("parseAlg algType is null!");
@@ -61,6 +61,7 @@ public class ResultAnalysisUtils {
         }
 
         if (value.isEmpty() || value.equals("-1")) {
+            log.info("--------------parseAlg value is empty or -1!");
             resultAnalysis.setPointStatus("0");
             resultAnalysis.setResultType("2");
             resultAnalysis.setResStatus("0");
@@ -88,12 +89,15 @@ public class ResultAnalysisUtils {
             resultAnalysis.setPointStatus("1");
             resultAnalysis.setResultType("1");
         } else if (algType.equals("meter")) {
+            log.info("------------------parseAlg : meter");
             if (!algValue.isAlarm(value)) {
+                log.info("------------------parseAlg meter is not alarm");
                 resultAnalysis.setResStatus("0");
                 resultAnalysis.setPointStatus("1");
                 resultAnalysis.setResultType("1");
                 defaultDesc = messageUtils.get("正常");
             } else {
+                log.info("------------------parseAlg meter is alarm");
                 resultAnalysis.setResStatus("0");
                 resultAnalysis.setPointStatus("0");
                 resultAnalysis.setResultType("0");
@@ -159,6 +163,7 @@ public class ResultAnalysisUtils {
                 resultAnalysis.setResStatus("0");
             }
         } else {
+            log.info("parseAlg algType: {}", algType);
             if (value.equals("0")) {
                 resultAnalysis.setPointStatus("1");
                 resultAnalysis.setResultType("1");
@@ -174,5 +179,6 @@ public class ResultAnalysisUtils {
         }
         resultAnalysis.setDescription(defaultDesc);
         resultAnalysis.setCreateTime(new Date());
+        log.info("------------------parseAlg resultAnalysis: {}", resultAnalysis);
     }
 }

inspect-main/inspect-main-task/src/main/java/com/inspect/taskstatus/controller/PatrolTaskStatusController.java

@@ -646,10 +646,12 @@ public class PatrolTaskStatusController extends BaseController {
         }
 
         if (StringUtils.isNotEmpty(patrolTask.getDevNo())) {
+            String[] devTypes = patrolTask.getDevType().split(StringUtils.COMMA);
             String[] devNos = patrolTask.getDevNo().split(StringUtils.COMMA);
-            for (String devNo : devNos) {
+            for (int i = 0; i < devNos.length; i++) {
+                log.info("第{}个devNo------------issueToRobot", i + 1);
                 BasedataEqpBookMoMain basedataEqpbookMomain = new BasedataEqpBookMoMain();
-                basedataEqpbookMomain.setPatrolDeviceCode(devNo);
+                basedataEqpbookMomain.setPatrolDeviceCode(devNos[i]);
                 List<BasedataEqpBookMoMain> eqpBookMoMains = this.patrolResultService.selectBasedataEqpBookList(basedataEqpbookMomain);
                 if (!eqpBookMoMains.isEmpty() && eqpBookMoMains.get(0).getMainSystemCode() != null) {
                     receiveCode = eqpBookMoMains.get(0).getMainSystemCode();
@@ -669,7 +671,11 @@ public class PatrolTaskStatusController extends BaseController {
 //                        log.info("[TASK] CURRENT EXEC TASK: {}", taskCode);
 //                        return AjaxResult.error(501, "THERE TASK IS RUNNING!");
 //                    } else {
-                        sendTaskToVideo(patrolTask);
+                    // 手动任务执行
+                    log.info("第{}个devNo{}", i + 1, devNos[i]);
+                    patrolTask.setDevType(devTypes[i]);
+                    patrolTask.setDevNo(devNos[i]);
+                    sendTaskToVideo(patrolTask);
 //                    }
                 }
             }