武汉现场联调问题修改

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

@@ -169,25 +169,20 @@ public class PatrolResultController extends BaseController {
     public TableDataInfo list(PatrolResult patrolResult) {
         startPage();
         List<PatrolResult> list = patrolResultService.selectPatroByAllDev(patrolResult);
-
-        PatrolResult pr;
-        for (Iterator<PatrolResult> iterator = list.iterator(); iterator.hasNext(); pr.setRecognitionType("1")) {
-            pr = iterator.next();
+        for (PatrolResult result : list) {
             PatrolResultAux pra = new PatrolResultAux();
-            pra.setResultId(pr.getLineId() + "");
+            pra.setResultId(result.getLineId() + "");
             List<PatrolResultAux> pra1 = iPatrolResultAuxService.selectPatrolResultAuxList(pra);
             if (!pra1.isEmpty()) {
-                pr.setValue(pra1.get(0).getValue());
+                result.setValue(pra1.get(0).getValue());
             }
 
-            if ("0".equals(pr.getValue())) {
-                pr.setValue("正常");
-                pr.setRecognitionType("3");
+            if ("0".equals(result.getValue())) {
+                result.setValue("正常");
             }
 
-            if ("-1".equals(pr.getValue()) || "1".equals(pr.getValue())) {
-                pr.setValue("异常");
-                pr.setRecognitionType("3");
+            if ("-1".equals(result.getValue()) || "1".equals(result.getValue())) {
+                result.setValue("异常");
             }
         }
 

inspect-metadata/src/main/resources/mapper/montdata/BasedataMontPatDevPatRouteMapper.xml

@@ -63,7 +63,7 @@
             <if test="patrolDeviceName != null">patrol_device_name,</if>
             <if test="time != null">time,</if>
             <if test="coordPixel != null">coord_pixel,</if>
-            <if test="coord_geography != null">coord_geography,</if>
+            <if test="coordGeography != null">coord_geography,</if>
             <if test="createBy != null">create_by,</if>
             <if test="createTime != null">create_time,</if>
             <if test="updateBy != null">update_by,</if>