Merge remote-tracking branch 'origin/master'

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

@@ -46,11 +46,29 @@ public class ResultAnalysisUtils {
 
     public void parseAlg(String algType, AlgValue algValue, String value, String defaultDesc, ResultAnalysis resultAnalysis) {
         log.warn("parseAlg algType: {}, algValue: {}, value: {}, defaultDesc: {}", algType, algValue, value, defaultDesc);
+
+        if ("1".equals(resultAnalysis.getFilter()) && algType != null && (algType.equals("infrared") ||
+                algType.equals("infra_1800") ||
+                algType.equals("infra_yu3") ||
+                algType.equals("infra_camera") ||
+                algType.equals("infra_camera_reverse"))) {
+            if (messageUtils.get("分析失败").equals(defaultDesc)) {
+                // 绍兴红外分析失败改成正常
+                resultAnalysis.setResultType("1");
+                resultAnalysis.setPointStatus("1");
+                resultAnalysis.setResStatus("0");
+                resultAnalysis.setCreateTime(new Date());
+                resultAnalysis.setDescription("-");
+                return;
+            }
+        }
+
         if (value == null) {
             value = "";
         }
 
         value = algValue.formatValue(value);
+        // 这个不知道为什么加上
         if ("1".equals(resultAnalysis.getFilter())) {
             algType = "";
         }

inspect-main/inspect-main-task/src/main/java/com/inspect/task/controller/PatrolTaskController.java

@@ -140,6 +140,7 @@ public class PatrolTaskController extends BaseController {
                 JSONArray data = jsonObject.getJSONArray("data");
                 if (data != null && !data.isEmpty()) {
                     List<String> areaNames = data.stream()
+                            .filter(item -> "station_in".equals(((JSONObject) item).getString("areaType")))
                             .map(item -> ((JSONObject) item).getString("areaName"))
                             .collect(Collectors.toList());
                     task.setAreaName(StringUtils.join(areaNames, StringUtils.COMMA));