diff --git a/pom.xml b/pom.xml index 9c1863c..1429e95 100644 --- a/pom.xml +++ b/pom.xml @@ -187,7 +187,7 @@ src/main/resources - true + false diff --git a/src/main/java/com/biutag/supervision/controller/datav/DataGobalController.java b/src/main/java/com/biutag/supervision/controller/datav/DataGobalController.java index b216983..0b03936 100644 --- a/src/main/java/com/biutag/supervision/controller/datav/DataGobalController.java +++ b/src/main/java/com/biutag/supervision/controller/datav/DataGobalController.java @@ -40,34 +40,26 @@ public class DataGobalController { /** * 获取数据大屏概览 - * 大屏中央数据和地图数据 + * 大屏中央数据 * * @param beginTime * @param endTime * @return */ - @Operation(summary = "初始化大屏数据") + @Operation(summary = "大屏中央数据") @GetMapping public Result getAllGobalCount(@RequestParam @DateTimeFormat(pattern = "yyyy-MM-dd") Date beginTime, @RequestParam @DateTimeFormat(pattern = "yyyy-MM-dd") Date endTime) { // 获取数据大屏中央总数概览 JSONObject overview = dataGobalService.getAllGobalCount(beginTime, endTime); - // 地图数据 - List gobalTempMapVoList = dataGobalService.getMapIconInfo(beginTime, endTime); - if (gobalTempMapVoList == null || gobalTempMapVoList.size() == 0) { - gobalTempMapVoList = new ArrayList<>(); - } - JSONObject data = new JSONObject() - .fluentPut("overview", overview) - .fluentPut("gobalTempMapVoList", gobalTempMapVoList); + .fluentPut("overview", overview); return Result.success(data); } - /** * 数据大屏问题趋势统计(按月展示) * @@ -168,4 +160,21 @@ public class DataGobalController { } + @Operation(summary = "地图数据") + @GetMapping("/getMap") + public Result getMap( + @RequestParam @DateTimeFormat(pattern = "yyyy-MM-dd") Date beginTime, + @RequestParam @DateTimeFormat(pattern = "yyyy-MM-dd") Date endTime) { + + // 地图数据 + List gobalTempMapVoList = dataGobalService.getMapIconInfo(beginTime, endTime); + if (gobalTempMapVoList == null || gobalTempMapVoList.size() == 0) { + gobalTempMapVoList = new ArrayList<>(); + } + JSONObject data = new JSONObject() + .fluentPut("gobalTempMapVoList", gobalTempMapVoList); + return Result.success(data); + } + + }