diff --git a/src/main/java/com/casic/controller/ScreenDataController.java b/src/main/java/com/casic/controller/ScreenDataController.java index f70d25e..32e1a0e 100644 --- a/src/main/java/com/casic/controller/ScreenDataController.java +++ b/src/main/java/com/casic/controller/ScreenDataController.java @@ -33,7 +33,7 @@ */ @RequestMapping("/road-indicator") public Object getRoadIndicator(String isSort,String limitNum,String beginTime, String endTime) { - return screenDataService.getHealthIndicatorByRoad( isSort, limitNum,beginTime, endTime); + return screenDataService.getHealthIndicatorByRoad(isSort, limitNum,beginTime, endTime); } /** diff --git a/src/main/java/com/casic/controller/ScreenDataController.java b/src/main/java/com/casic/controller/ScreenDataController.java index f70d25e..32e1a0e 100644 --- a/src/main/java/com/casic/controller/ScreenDataController.java +++ b/src/main/java/com/casic/controller/ScreenDataController.java @@ -33,7 +33,7 @@ */ @RequestMapping("/road-indicator") public Object getRoadIndicator(String isSort,String limitNum,String beginTime, String endTime) { - return screenDataService.getHealthIndicatorByRoad( isSort, limitNum,beginTime, endTime); + return screenDataService.getHealthIndicatorByRoad(isSort, limitNum,beginTime, endTime); } /** diff --git a/src/main/resources/mapper/smartwell/MapDataMapper.xml b/src/main/resources/mapper/smartwell/MapDataMapper.xml index 7da7bd4..bb087e3 100644 --- a/src/main/resources/mapper/smartwell/MapDataMapper.xml +++ b/src/main/resources/mapper/smartwell/MapDataMapper.xml @@ -81,7 +81,7 @@ position AS "position", coordinateX AS "coordinateX", coordinateY AS "coordinateY", lngBaidu AS "lngBaidu", latBaidu AS "latBaidu", lngGaode AS "lngGaode", latGaode AS "latGaode" FROM alarm_now_view w - WHERE 1 = 1 + WHERE alarmType=1 ORDER BY alarmTimeDate DESC