diff --git a/inspect-main/inspect-main-task/src/main/java/com/inspect/partrolresult/controller/PatrolResultController.java b/inspect-main/inspect-main-task/src/main/java/com/inspect/partrolresult/controller/PatrolResultController.java index de3a22e..28ec029 100644 --- a/inspect-main/inspect-main-task/src/main/java/com/inspect/partrolresult/controller/PatrolResultController.java +++ b/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 list = patrolResultService.selectPatroByAllDev(patrolResult); - - PatrolResult pr; - for (Iterator 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 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("异常"); } } diff --git a/inspect-metadata/src/main/resources/mapper/montdata/BasedataMontPatDevPatRouteMapper.xml b/inspect-metadata/src/main/resources/mapper/montdata/BasedataMontPatDevPatRouteMapper.xml index c254456..b185bb3 100644 --- a/inspect-metadata/src/main/resources/mapper/montdata/BasedataMontPatDevPatRouteMapper.xml +++ b/inspect-metadata/src/main/resources/mapper/montdata/BasedataMontPatDevPatRouteMapper.xml @@ -63,7 +63,7 @@ patrol_device_name, time, coord_pixel, - coord_geography, + coord_geography, create_by, create_time, update_by,