diff --git a/inspect-admin/src/main/resources/logback.xml b/inspect-admin/src/main/resources/logback.xml
index 57a4ea3..70ae7fd 100644
--- a/inspect-admin/src/main/resources/logback.xml
+++ b/inspect-admin/src/main/resources/logback.xml
@@ -5,7 +5,7 @@
-
+
@@ -23,7 +23,7 @@
${log.path}/info/info.%d{yyyy-MM-dd}.%i.log
${log.maxFileSize}
-
+
${log.maxHistory}
@@ -45,8 +45,8 @@
${log.path}/error.%d{yyyy-MM-dd}.log
-
- 60
+
+ 15
${log.pattern}
diff --git a/inspect-fastcall/src/main/resources/logback.xml b/inspect-fastcall/src/main/resources/logback.xml
index 5979b08..bf5e999 100644
--- a/inspect-fastcall/src/main/resources/logback.xml
+++ b/inspect-fastcall/src/main/resources/logback.xml
@@ -5,7 +5,7 @@
-
+
@@ -23,7 +23,7 @@
${log.path}/info/info.%d{yyyy-MM-dd}.%i.log
${log.maxFileSize}
-
+
${log.maxHistory}
@@ -45,8 +45,8 @@
${log.path}/error.%d{yyyy-MM-dd}.log
-
- 60
+
+ 15
${log.pattern}
diff --git a/inspect-gateway/src/main/resources/logback.xml b/inspect-gateway/src/main/resources/logback.xml
index 98412ce..6caafd1 100644
--- a/inspect-gateway/src/main/resources/logback.xml
+++ b/inspect-gateway/src/main/resources/logback.xml
@@ -5,7 +5,7 @@
-
+
@@ -23,7 +23,7 @@
${log.path}/info/info.%d{yyyy-MM-dd}.%i.log
${log.maxFileSize}
-
+
${log.maxHistory}
@@ -45,8 +45,8 @@
${log.path}/error.%d{yyyy-MM-dd}.log
-
- 60
+
+ 15
${log.pattern}
diff --git a/inspect-ivs/src/main/resources/logback.xml b/inspect-ivs/src/main/resources/logback.xml
index d149ead..f7a9963 100644
--- a/inspect-ivs/src/main/resources/logback.xml
+++ b/inspect-ivs/src/main/resources/logback.xml
@@ -5,7 +5,7 @@
-
+
@@ -23,7 +23,7 @@
${log.path}/info/info.%d{yyyy-MM-dd}.%i.log
${log.maxFileSize}
-
+
${log.maxHistory}
@@ -45,8 +45,8 @@
${log.path}/error.%d{yyyy-MM-dd}.log
-
- 60
+
+ 15
${log.pattern}
diff --git a/inspect-job/src/main/java/com/inspect/job/task/JobMainTask.java b/inspect-job/src/main/java/com/inspect/job/task/JobMainTask.java
index 8e98397..92299c0 100644
--- a/inspect-job/src/main/java/com/inspect/job/task/JobMainTask.java
+++ b/inspect-job/src/main/java/com/inspect/job/task/JobMainTask.java
@@ -714,7 +714,7 @@ public class JobMainTask {
return rectangles.toString();
}
- synchronized private void addPointRecord(PatrolTaskExecRecord taskExecRecord,
+ synchronized private PatrolTaskPointExecRecord addPointRecord(PatrolTaskExecRecord taskExecRecord,
PatrolTaskInfo taskInfo,
PatrolPresetPosSlim presetPos,
StringBuffer fileTypes,
@@ -747,12 +747,13 @@ public class JobMainTask {
log.info(Color.RED + "ADD_POINT_2_RECORD crud add taskPatrolId: {}, deviceId: {}" + Color.END,
taskExecRecord.getOldTaskPatrolId(), deviceId);
//if(!testMode)
- {
- String patrolId = taskExecRecord.getTaskPatrolId();
- String[] ids = patrolId.split(StringUtils.UNDERLINE);
- String taskPatrolIdRemote = ids[1] + "_" + ids[2];
- callRemoteSendMsgCtrlMode(taskPatrolIdRemote, taskExecRecord.getTotalAlgorithmNumber(), pointExecRecord);/*上报巡视结果*/
- }
+// {
+// String patrolId = taskExecRecord.getTaskPatrolId();
+// String[] ids = patrolId.split(StringUtils.UNDERLINE);
+// String taskPatrolIdRemote = ids[1] + "_" + ids[2];
+// callRemoteSendMsgCtrlMode(taskPatrolIdRemote, taskExecRecord.getTotalAlgorithmNumber(), pointExecRecord);/*上报巡视结果*/
+// }
+ return pointExecRecord;
}
private void callRemoteSendMsgRunMode(final String taskCode, final String taskName, final String taskPatrolId, final String taskProgress, final String state) {
@@ -822,7 +823,10 @@ public class JobMainTask {
}
}
- synchronized private int addCursorNumber(String taskPatrolId, int infoListSize) {
+ synchronized private int addCursorNumber(String taskPatrolId,
+ int infoListSize,
+ PatrolTaskPointExecRecord pointExecRecord,
+ int totalAlgorithNumber) {
PatrolTaskExecRecord taskExecRecord = taskExecClient.selectPatrolTaskExecRecordByTaskPatrolId(taskPatrolId);
int total = taskExecRecord.getTotalNumber();
@@ -840,11 +844,12 @@ public class JobMainTask {
taskExecRecord.setCursorNumber(cursor);
//if (bOk) {
success++;
- log.info("EXECUTE_POINT_SUCCESS taskPatrolId: {}, cursor: {}, success: {}, total: {}",
+ log.info("EXECUTE_POINT_SUCCESS taskPatrolId: {}, cursor: {}, success: {}, total: {}, totalAlgorithNumber: {}",
taskExecRecord.getOldTaskPatrolId(),
cursor,
success,
- total);
+ total,
+ totalAlgorithNumber);
taskExecRecord.setFinishNumber(success);
String taskProgress = decimalFormatNum(success, total);// task_progress=success/total -> patrol_task_exec_record
taskExecRecord.setTaskProgress(taskProgress);
@@ -864,6 +869,19 @@ public class JobMainTask {
totalProgress,
TaskStatus.RUNNING.getCode()/*运行中百分比上报*/
);
+
+ try {
+ Thread.sleep(1000);
+ } catch (Exception e) {
+ log.error("error", e);
+ }
+
+ {
+ String patrolId = taskExecRecord.getTaskPatrolId();
+ String[] ids = patrolId.split(StringUtils.UNDERLINE);
+ String taskPatrolIdRemote = ids[1] + "_" + ids[2];
+ callRemoteSendMsgCtrlMode(taskPatrolIdRemote, totalAlgorithNumber, pointExecRecord);/*上报巡视结果*/
+ }
// }
// else {
// log.info("execute point fail, cursor: {}, success: {}, total: {}", cursor, success, total);
@@ -956,8 +974,9 @@ public class JobMainTask {
StringBuffer filePaths) {
//log.info(Color.CYAN + "recordPersistTrace bOk: {}" + Color.END, bOk);
+ PatrolTaskPointExecRecord patrolTaskPointExecRecord = null;
try {
- addPointRecord(taskExecRecord, taskInfo, presetPos, fileTypes, filePaths);
+ patrolTaskPointExecRecord = addPointRecord(taskExecRecord, taskInfo, presetPos, fileTypes, filePaths);
} catch (Exception e) {
log.error("error", e);
}
@@ -966,7 +985,7 @@ public class JobMainTask {
log.info(Color.CYAN + "addCursorNumberStart" + Color.END);
int cursorNumber = 0;
try {
- cursorNumber = addCursorNumber(taskExecRecord.getTaskPatrolId(), infoListSize);
+ cursorNumber = addCursorNumber(taskExecRecord.getTaskPatrolId(), infoListSize, patrolTaskPointExecRecord, taskExecRecord.getTotalAlgorithmNumber());
} catch (Exception e) {
log.error("error", e);
}
@@ -2091,9 +2110,9 @@ public class JobMainTask {
continue;
}
String isEnable = patrolTasks.get(0).getIsEnable();
- log.info("---execEveryDayTask isEnable: {}, taskCode: {}", isEnable, taskCode);
+ log.debug("---execEveryDayTask isEnable: {}, taskCode: {}", isEnable, taskCode);
if (isTaskSlotEmpty(taskCode) && "0".equals(isEnable)) {
- log.info(Color.YELLOW + "[JOB] TASK_CODE: {}" + Color.END, taskCode);
+ log.debug(Color.YELLOW + "[JOB] TASK_CODE: {}" + Color.END, taskCode);
// long currentTime = System.currentTimeMillis();
// long currentDays = TimeUnit.MILLISECONDS.toDays(currentTime);
// long currentMinutes = TimeUnit.MILLISECONDS.toMinutes(currentTime);
diff --git a/inspect-job/src/main/resources/logback.xml b/inspect-job/src/main/resources/logback.xml
index 306fd8a..e6cff4b 100644
--- a/inspect-job/src/main/resources/logback.xml
+++ b/inspect-job/src/main/resources/logback.xml
@@ -5,7 +5,7 @@
-
+
@@ -23,7 +23,7 @@
${log.path}/info/info.%d{yyyy-MM-dd}.%i.log
${log.maxFileSize}
-
+
${log.maxHistory}
@@ -45,8 +45,8 @@
${log.path}/error.%d{yyyy-MM-dd}.log
-
- 60
+
+ 15
${log.pattern}
diff --git a/inspect-main/inspect-main-start/src/main/resources/logback.xml b/inspect-main/inspect-main-start/src/main/resources/logback.xml
index 6c73192..f3965ff 100644
--- a/inspect-main/inspect-main-start/src/main/resources/logback.xml
+++ b/inspect-main/inspect-main-start/src/main/resources/logback.xml
@@ -5,7 +5,7 @@
-
+
@@ -23,7 +23,7 @@
${log.path}/info/info.%d{yyyy-MM-dd}.%i.log
${log.maxFileSize}
-
+
${log.maxHistory}
@@ -45,8 +45,8 @@
${log.path}/error.%d{yyyy-MM-dd}.log
-
- 60
+
+ 15
${log.pattern}
diff --git a/inspect-main/inspect-main-task-exec/src/main/java/com/inspect/exec/controller/PatrolTaskExecController.java b/inspect-main/inspect-main-task-exec/src/main/java/com/inspect/exec/controller/PatrolTaskExecController.java
index 2d6c87f..86576b5 100644
--- a/inspect-main/inspect-main-task-exec/src/main/java/com/inspect/exec/controller/PatrolTaskExecController.java
+++ b/inspect-main/inspect-main-task-exec/src/main/java/com/inspect/exec/controller/PatrolTaskExecController.java
@@ -568,7 +568,7 @@ public class PatrolTaskExecController extends BaseController {
List exeTimes = getExecTimes(task.getIntervalExecuteTime(), DateUtils.format(DateUtils.yyyyMMddHHmmss2, task.getIntervalStartTime()), DateUtils.format(DateUtils.yyyyMMddHHmmss2, task.getIntervalEndTime()), intervalNumber);
// List exeTimes = getExecTimesOld(task.getIntervalExecuteTime(), intervalNumber);
for (Date exeTime : exeTimes) {
- logger.info("[TASK] {}， isInterTaskByHour exeTime: {}", task.getTaskCode(), DateUtils.format(DateUtils.yyyyMMddHHmmss2, exeTime));
+ logger.debug("[TASK] {}， isInterTaskByHour exeTime: {}", task.getTaskCode(), DateUtils.format(DateUtils.yyyyMMddHHmmss2, exeTime));
task.setFixedStartTime(exeTime);
final String taskType = "INTER-BY-HOUR";
parseTaskToRedis(taskType, task, task.getIntervalEndTime());
@@ -654,7 +654,7 @@ public class PatrolTaskExecController extends BaseController {
}
}
}
- logger.info(Color.GREEN + "[TASK] TYPE: {}, CYCLE BY WEEK key: {}, patrolId: {}" + Color.END, taskType, key, taskPatrolledId);
+ logger.debug(Color.GREEN + "[TASK] TYPE: {}, CYCLE BY WEEK key: {}, patrolId: {}" + Color.END, taskType, key, taskPatrolledId);
redisService.setCacheObject(key, JSONArray.toJSONString(patrolTasks));
}
}
@@ -888,8 +888,8 @@ public class PatrolTaskExecController extends BaseController {
}
String devNoListStr = StringUtils.join(devNoList, StringUtils.COMMA);
String devTypeListStr = StringUtils.join(devTypeList, StringUtils.COMMA);
- log.info("[TASK] devNoListStr: {}", devNoListStr);
- log.info("[TASK] devTypeListStr: {}", devTypeListStr);
+ log.debug("[TASK] devNoListStr: {}", devNoListStr);
+ log.debug("[TASK] devTypeListStr: {}", devTypeListStr);
PatrolTask patrolTask = PatrolTask.builder()
.taskId(task.getTaskId())
.stationName(task.getStationName())
diff --git a/inspect-main/inspect-main-task/src/main/java/com/inspect/analysis/utils/ResultAnalysisUtils.java b/inspect-main/inspect-main-task/src/main/java/com/inspect/analysis/utils/ResultAnalysisUtils.java
index 11bb180..81db404 100644
--- a/inspect-main/inspect-main-task/src/main/java/com/inspect/analysis/utils/ResultAnalysisUtils.java
+++ b/inspect-main/inspect-main-task/src/main/java/com/inspect/analysis/utils/ResultAnalysisUtils.java
@@ -254,8 +254,8 @@ public class ResultAnalysisUtils {
defaultDesc = "未检测到刀闸";
}
} else if (algType.equals("correction")) {
- log.info("parseAlg algType correction");
- if("2001".equals(resultAnalysis.getResCode())) {
+ log.info("parseAlg algType correction resCode: {}", resultAnalysis.getResCode());
+ if("2000".equals(resultAnalysis.getResCode()) || "2001".equals(resultAnalysis.getResCode())) {
ObjectMapper mapper = new ObjectMapper();
List> list;
try {
@@ -268,10 +268,28 @@ public class ResultAnalysisUtils {
}
if(list.size() == 2 && list.get(0).size() == 2 && list.get(1).size() == 2) {
- resultAnalysis.setPointStatus("0");
- resultAnalysis.setResultType("0");
- resultAnalysis.setResStatus("3");
- defaultDesc = "请进行纠偏";
+ final double EPSILON = 1e-8;
+ double value0 = list.get(0).get(0);
+ double value1 = list.get(0).get(1);
+ double value2 = list.get(1).get(0);
+ double value3 = list.get(1).get(1);
+ if (Math.abs(value0) < EPSILON &&
+ Math.abs(value1) < EPSILON &&
+ Math.abs(value2) < EPSILON &&
+ Math.abs(value3) < EPSILON) {
+ log.info("correction no need value0: {}, value1: {}, value2: {}, value3: {}", value0, value1, value2, value3);
+ resultAnalysis.setPointStatus("1");
+ resultAnalysis.setResultType("1");
+ resultAnalysis.setResStatus("2");
+ defaultDesc = messageUtils.get("正常");
+ resultAnalysis.setResDesc(defaultDesc);
+ } else {
+ log.info("correction need value0: {}, value1: {}, value2: {}, value3: {}", value0, value1, value2, value3);
+ resultAnalysis.setPointStatus("0");
+ resultAnalysis.setResultType("0");
+ resultAnalysis.setResStatus("3");
+ defaultDesc = "请进行纠偏";
+ }
} else {
log.info("parseAlg algType correction value abnormal");
resultAnalysis.setPointStatus("0");
@@ -280,10 +298,10 @@ public class ResultAnalysisUtils {
defaultDesc = "纠偏结果异常";
}
} else {
- resultAnalysis.setPointStatus("1");
- resultAnalysis.setResultType("1");
- resultAnalysis.setResStatus("2");
- defaultDesc = messageUtils.get("正常");
+ resultAnalysis.setPointStatus("0");
+ resultAnalysis.setResultType("0");
+ resultAnalysis.setResStatus("0");
+ defaultDesc = messageUtils.get("未知异常");
resultAnalysis.setResDesc(defaultDesc);
}
} else {
diff --git a/inspect-main/inspect-main-task/src/main/java/com/inspect/partrolresult/controller/PatrolResultController.java b/inspect-main/inspect-main-task/src/main/java/com/inspect/partrolresult/controller/PatrolResultController.java
index 3e1974d..373e871 100644
--- a/inspect-main/inspect-main-task/src/main/java/com/inspect/partrolresult/controller/PatrolResultController.java
+++ b/inspect-main/inspect-main-task/src/main/java/com/inspect/partrolresult/controller/PatrolResultController.java
@@ -1365,6 +1365,32 @@ public class PatrolResultController extends BaseController {
}
code = arr.getTaskCode();
patrolDeviceCodeList.add(arr.getPatrolDeviceCode());
+
+ //qinyl
+// String taskPatrolledId = arr.getTaskPatrolledId();
+// String taskCode = arr.getTaskCode();
+// String taskName = arr.getTaskName();
+// logger.info("CMD_61 taskPatrolledId: {}", taskPatrolledId);
+// if(StringUtils.isNotEmpty(taskPatrolledId)) {
+// PatrolTaskStatus patrolTaskStatus = new PatrolTaskStatus();
+// patrolTaskStatus.setTaskPatrolledId(taskPatrolledId);
+// List patrolTaskStatusList = iPatrolTaskStatusService.selectPatrolTaskStatusList(patrolTaskStatus);
+// logger.info("CMD_61 patrolTaskStatusList size: {}", patrolTaskStatusList.size());
+// if(patrolTaskStatusList.isEmpty()) {
+// PatrolTaskStatus patrolTaskStatusItem = new PatrolTaskStatus();
+// patrolTaskStatusItem.setTaskPatrolledId(taskPatrolledId);
+// patrolTaskStatusItem.setTaskCode(taskCode);
+// patrolTaskStatusItem.setTaskName(taskName);
+// patrolTaskStatusItem.setTaskState("2");
+// patrolTaskStatusItem.setTaskProgress("0");
+// patrolTaskStatusItem.setTaskEstimatedTime("0");
+// patrolTaskStatusItem.setCreateTime(new Date());
+// patrolTaskStatusItem.setStartTime(new Date());
+// patrolTaskStatusItem.setTaskEstimatedTime("");
+// i = iPatrolTaskStatusService.insertPatrolTaskStatus(patrolTaskStatusItem);
+// logger.info("CMD_61 CREATE patrol_task_status record taskPatrolledId: {}, i: {}", taskPatrolledId, i);
+// }
+// }
}
List tasks = patrolTaskService.selectPatrolTaskList(PatrolTask.builder().taskCode(code).build());
diff --git a/inspect-management/src/main/resources/logback.xml b/inspect-management/src/main/resources/logback.xml
index 5aed3c9..8788c37 100644
--- a/inspect-management/src/main/resources/logback.xml
+++ b/inspect-management/src/main/resources/logback.xml
@@ -5,7 +5,7 @@
-
+
@@ -23,7 +23,7 @@
${log.path}/info/info.%d{yyyy-MM-dd}.%i.log
${log.maxFileSize}
-
+
${log.maxHistory}
@@ -45,8 +45,8 @@
${log.path}/error.%d{yyyy-MM-dd}.log
-
- 60
+
+ 15
${log.pattern}
diff --git a/inspect-metadata/src/main/resources/logback.xml b/inspect-metadata/src/main/resources/logback.xml
index b676773..656c1e7 100644
--- a/inspect-metadata/src/main/resources/logback.xml
+++ b/inspect-metadata/src/main/resources/logback.xml
@@ -5,7 +5,7 @@
-
+
@@ -23,7 +23,7 @@
${log.path}/info/info.%d{yyyy-MM-dd}.%i.log
${log.maxFileSize}
-
+
${log.maxHistory}
@@ -45,8 +45,8 @@
${log.path}/error.%d{yyyy-MM-dd}.log
-
- 60
+
+ 15
${log.pattern}