Merge branch 'master' of http://git.ht-atia.cn/qinyanlei/inspect

inspect-main/inspect-main-task/src/main/java/com/inspect/analysis/service/impl/AnalyseResponseServiceImpl.java

@@ -898,7 +898,8 @@ public class AnalyseResponseServiceImpl implements IAnalyseResponseService {
 //            AlgValue algValue = selectAlgMap(objectId, analyseResPoint.getType());
 //            resultAnalysis.parseAlg(analyseResPoint.getType(), algValue, value, analyseResPoint.getDesc());
 //        }
-        if (resultAnalysisUtils.checkCode(analyseResPoint.getCode(), analyseResPoint.getDesc(), resultAnalysis)) {
+        if (resultAnalysisUtils.checkCode(analyseResPoint.getCode(), analyseResPoint.getDesc(), resultAnalysis)
+        || "2001".equals(analyseResPoint.getCode()) && "correction".equals(analyseResPoint.getType())) {
             AlgValue algValue = selectAlgMap(objectId, analyseResPoint.getType());
             resultAnalysisUtils.parseAlg(analyseResPoint.getType(), algValue, value, analyseResPoint.getDesc(), resultAnalysis);
         }

inspect-main/inspect-main-task/src/main/java/com/inspect/partrolresult/controller/PatrolResultController.java

@@ -2226,13 +2226,17 @@ public class PatrolResultController extends BaseController {
         PatrolResult patrolResult = new PatrolResult();
         patrolResult.setCreateTime(newTime);
         List<ResultValue> list = new ArrayList<>();
+        long start = System.currentTimeMillis();
         if ("1".equals(type)) {
             list = patrolResultService.selectOilResultValue(patrolResult);
         }
+        logger.info("openApi selectOilResultValue cost: {}ms", System.currentTimeMillis() - start);
 
+        start = System.currentTimeMillis();
         if ("2".equals(type)) {
             list = patrolResultService.select6FsResultValue(patrolResult);
         }
+        logger.info("openApi select6FsResultValue cost: {}ms", System.currentTimeMillis() - start);
 
         for (ResultValue object : list) {
             object.setValue(object.formatValue(object.getValue()));