diff --git a/inspect-main/inspect-main-task/src/main/java/com/inspect/analysis/domain/AnalyseResPoint.java b/inspect-main/inspect-main-task/src/main/java/com/inspect/analysis/domain/AnalyseResPoint.java index 6f9202e..cb137a3 100644 --- a/inspect-main/inspect-main-task/src/main/java/com/inspect/analysis/domain/AnalyseResPoint.java +++ b/inspect-main/inspect-main-task/src/main/java/com/inspect/analysis/domain/AnalyseResPoint.java @@ -12,6 +12,8 @@ public class AnalyseResPoint implements Serializable { private String type; private String Value; private String value; + // 辅助值:如避雷器读数值 + private String value2; private String code; private String resImageUrl; private String imageNormalUrlPath; @@ -117,6 +119,14 @@ public class AnalyseResPoint implements Serializable { this.pos = pos; } + public String getValue2() { + return this.value2; + } + + public void setValue2(String value2) { + this.value2 = value2; + } + @Override public boolean equals(Object object) { if (this == object) return true; diff --git a/inspect-main/inspect-main-task/src/main/java/com/inspect/analysis/service/impl/AnalyseResponseServiceImpl.java b/inspect-main/inspect-main-task/src/main/java/com/inspect/analysis/service/impl/AnalyseResponseServiceImpl.java index 2ebd198..4b73106 100644 --- a/inspect-main/inspect-main-task/src/main/java/com/inspect/analysis/service/impl/AnalyseResponseServiceImpl.java +++ b/inspect-main/inspect-main-task/src/main/java/com/inspect/analysis/service/impl/AnalyseResponseServiceImpl.java @@ -901,6 +901,8 @@ public class AnalyseResponseServiceImpl implements IAnalyseResponseService { || ("correction".equals(analyseResPoint.getType()) && Arrays.asList("2001", "2002", "2003").contains(analyseResPoint.getCode()) )) { AlgValue algValue = selectAlgMap(objectId, analyseResPoint.getType()); resultAnalysisUtils.parseAlg(analyseResPoint.getType(), algValue, value, analyseResPoint.getDesc(), resultAnalysis); + // 合并辅助值字段 + resultAnalysisUtils.mergeValue(analyseResPoint ,resultAnalysis); } return resultAnalysis; @@ -919,7 +921,7 @@ public class AnalyseResponseServiceImpl implements IAnalyseResponseService { PatrolTaskStatus patrolTaskStatus = new PatrolTaskStatus(); patrolTaskStatus.setTaskPatrolledId(taskPatrolledId); List patrolTaskStatusList = patrolTaskStatusService.selectPatrolTaskStatusList(patrolTaskStatus); - log.info("CALC_REMOTE_ALGORITHM_PROGRESS patrolTaskStatusList size: {}", patrolTaskStatusList.size()); + log.info("CALC_REMOTE_ALGORITHM_PROGRESS algorithmProgress: {}, patrolTaskStatusList size: {}", algorithmProgress, patrolTaskStatusList.size()); if (!patrolTaskStatusList.isEmpty()) { patrolTaskStatus = patrolTaskStatusList.get(0); patrolTaskStatus.setTaskEstimatedTime(algorithmProgress);