diff --git a/inspect-main/inspect-main-task/src/main/java/com/inspect/analysis/controller/ResultAnalysisController.java b/inspect-main/inspect-main-task/src/main/java/com/inspect/analysis/controller/ResultAnalysisController.java index f90b472..77e4563 100644 --- a/inspect-main/inspect-main-task/src/main/java/com/inspect/analysis/controller/ResultAnalysisController.java +++ b/inspect-main/inspect-main-task/src/main/java/com/inspect/analysis/controller/ResultAnalysisController.java @@ -340,9 +340,6 @@ public class ResultAnalysisController extends BaseController { if ("0".equals(resultType)) { return DefectLevel.NORMAL.getCode(); } - if ("2".equals(resultType)) { - return DefectLevel.MINOR.getCode(); - } return DefectLevel.NONE.getCode(); } 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 a3e3855..ff61f5d 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 @@ -961,7 +961,7 @@ public class AnalyseResponseServiceImpl implements IAnalyseResponseService { resultAnalysis.setResImgUrl(analyseResPoint.getResImageUrl()); resultAnalysis.setImageNormalUrlPath(analyseResPoint.getImageNormalUrlPath()); resultAnalysis.setResPos(analyseResPoint.getPos() == null ? StringUtils.EMPTY : JSONObject.toJSONString(analyseResPoint.getPos())); - String value = analyseResPoint.getValue(); + String value = analyseResPoint.getValue().trim(); resultAnalysis.setFilter(analyseResult.getFilter()); // 处理正常结果、以及兼容处理无机人表计gis_meter2、纠偏correction的异常结果 if (resultAnalysisUtils.checkCode(analyseResPoint.getCode(), analyseResPoint.getDesc(), resultAnalysis) @@ -969,9 +969,6 @@ public class AnalyseResponseServiceImpl implements IAnalyseResponseService { || (AlgConstants.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); - // 合并辅助值字段 - // todo 等待避雷器表计记算法优化再放开 -// resultAnalysisUtils.mergeValue(analyseResPoint ,resultAnalysis); } return resultAnalysis; 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 56b7bf9..28e3851 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 @@ -88,7 +88,7 @@ public class ResultAnalysisUtils { return; } - if (value == null || value == "null") { + if (value == null || "null".equals(value)) { value = ""; } @@ -119,14 +119,10 @@ public class ResultAnalysisUtils { if (value.isEmpty() || value.equals("-1") || "null".equals(value)) { log.info("PARSE_ALG_EMPTY algType: {}, algValue: {}, value: {}, defaultDesc: {}", algType, algValue, value, defaultDesc); - resultAnalysis.setPointStatus("0"); - resultAnalysis.setResultType("2"); - resultAnalysis.setResStatus("0"); - if ("meter".equals(algType)) { - resultAnalysis.setResultType("0"); - resultAnalysis.setPointStatus(PointStatusEnum.DEFECT.getCode()); - defaultDesc = messageUtils.get("读数失败"); - } else if ("infrared".equals(algType)) { + resultAnalysis.setPointStatus(PointStatusEnum.ABNORMAL.getCode()); + resultAnalysis.setResultType(ResultTypeEnum.ABNORMAL.getCode()); + resultAnalysis.setResStatus(ResStatusEnum.UNCONFIRM.getCode()); + if ("infrared".equals(algType) || "meter".equals(algType)) { defaultDesc = messageUtils.get("读数失败"); } else { defaultDesc = messageUtils.get("算法内部异常"); diff --git a/inspect-main/inspect-main-task/src/main/java/com/inspect/task/domain/PatrolData.java b/inspect-main/inspect-main-task/src/main/java/com/inspect/task/domain/PatrolData.java index 2daa47d..b84d302 100644 --- a/inspect-main/inspect-main-task/src/main/java/com/inspect/task/domain/PatrolData.java +++ b/inspect-main/inspect-main-task/src/main/java/com/inspect/task/domain/PatrolData.java @@ -106,8 +106,6 @@ public class PatrolData implements Comparable { this.warnStatus = warnStatus; if ("0".equals(warnStatus)) { this.defectLevel = DefectLevel.NORMAL.getCode(); - } else if ("2".equals(warnStatus)) { - this.defectLevel = DefectLevel.MINOR.getCode(); } else { this.defectLevel = DefectLevel.NONE.getCode(); }