大屏展示慢修改

src/main/java/com/biutag/supervision/controller/datav/DataGobalController.java

@@ -24,6 +24,7 @@ import java.util.stream.Collectors;
 
 /**
  * 数据大屏首页
+ *
  * @author: sh
  * @date: 2024/11/7
  */
@@ -39,6 +40,8 @@ public class DataGobalController {
 
     /**
      * 获取数据大屏概览
+     * 大屏中央数据和地图数据
+     *
      * @param beginTime
      * @param endTime
      * @return
@@ -50,34 +53,16 @@ public class DataGobalController {
         // 获取数据大屏中央总数概览
         JSONObject overview = dataGobalService.getAllGobalCount(beginTime, endTime);
 
-        // 机构问题排名  fxsjlist中必有所有机构，不会为空
-        List<OrganizeProblemRankVo> fxsjlist = dataGobalService.getOrganizeProblemRank(3, beginTime, endTime);
-        List<OrganizeProblemRankVo> jsdwlist = dataGobalService.getOrganizeProblemRank(4, beginTime, endTime);
-
-        // 业务类型占比
-        List<EchartsVo> ywzblist = dataGobalService.getBusinessRate(beginTime, endTime);
-
-        // 突出问题排名
-        List<StrongProblemRank> tcwtlist = dataGobalService.getStrongProblemRank(beginTime, endTime);
-
-        // 问题类型占比
-        List<EchartsVo> wtlxlist = dataGobalService.getProblemRate(beginTime, endTime);
-
         // 地图数据
-     List<GobalMapIconVo> gobalTempMapVoList =  dataGobalService.getMapIconInfo(beginTime, endTime);
-     if ( gobalTempMapVoList==null || gobalTempMapVoList.size() == 0) {
-         gobalTempMapVoList = new ArrayList<>();
-     }
+        List<GobalMapIconVo> gobalTempMapVoList = dataGobalService.getMapIconInfo(beginTime, endTime);
+        if (gobalTempMapVoList == null || gobalTempMapVoList.size() == 0) {
+            gobalTempMapVoList = new ArrayList<>();
+        }
 
 
-        JSONObject data = new JSONObject().fluentPut("overview", overview)
-                .fluentPut("fxsjlist", fxsjlist)
-                .fluentPut("jsdwlist", jsdwlist)
-                .fluentPut("ywzblist", ywzblist)
-                .fluentPut("wtlxlist", wtlxlist)
-                .fluentPut("tcwtlist", tcwtlist)
+        JSONObject data = new JSONObject()
+                .fluentPut("overview", overview)
                 .fluentPut("gobalTempMapVoList", gobalTempMapVoList);
-
         return Result.success(data);
     }
 
@@ -95,10 +80,11 @@ public class DataGobalController {
 
     /**
      * 数据大屏问题趋势统计（按月展示）
+     *
      * @param year
      * @return
      */
-    @Operation(summary = "数据大屏问题趋势统计（按月）")
+    @Operation(summary = "数据大屏问题趋势统计（按年展示）")
     @GetMapping("/getGobalRecentlyTrendByMonth")
     public Result<JSONObject> getGobalRecentlyTrendByMonth(@RequestParam Integer year) {
         List<RecentTrendByMonthVo> recentTrendVoList = dataGobalService.getGobalRecentlyTrendByMonth(String.valueOf(year));
@@ -141,6 +127,55 @@ public class DataGobalController {
     }
 
 
+    @Operation(summary = "机构问题排名")
+    @GetMapping("/getOrganizationRank")
+    public Result<JSONObject> getOrganizationRank(@RequestParam @DateTimeFormat(pattern = "yyyy-MM-dd") Date beginTime,
+                                                  @RequestParam @DateTimeFormat(pattern = "yyyy-MM-dd") Date endTime) {
+        // 机构问题排名  fxsjlist中必有所有机构，不会为空
+        List<OrganizeProblemRankVo> fxsjlist = dataGobalService.getOrganizeProblemRank(3, beginTime, endTime);
+        List<OrganizeProblemRankVo> jsdwlist = dataGobalService.getOrganizeProblemRank(4, beginTime, endTime);
+
+        JSONObject res = new JSONObject()
+                .fluentPut("fxsjlist", fxsjlist)
+                .fluentPut("jsdwlist", jsdwlist);
+        return Result.success(res);
+    }
+
+
+    @Operation(summary = "业务类型占比")
+    @GetMapping("/getBusinessRate")
+    public Result<JSONObject> getBusinessRate(@RequestParam @DateTimeFormat(pattern = "yyyy-MM-dd") Date beginTime,
+                                              @RequestParam @DateTimeFormat(pattern = "yyyy-MM-dd") Date endTime) {
+        // 业务类型占比
+        List<EchartsVo> ywzblist = dataGobalService.getBusinessRate(beginTime, endTime);
+        JSONObject res = new JSONObject().fluentPut("ywzblist", ywzblist);
+        return Result.success(res);
+    }
+
+
+    @Operation(summary = "突出问题排名")
+    @GetMapping("/getStrongProblemRate")
+    public Result<JSONObject> getStrongProblemRate(@RequestParam @DateTimeFormat(pattern = "yyyy-MM-dd") Date beginTime,
+                                                   @RequestParam @DateTimeFormat(pattern = "yyyy-MM-dd") Date endTime) {
+        // 突出问题排名
+        List<StrongProblemRank> tcwtlist = dataGobalService.getStrongProblemRank(beginTime, endTime);
+        JSONObject res = new JSONObject()
+                .fluentPut("tcwtlist", tcwtlist);
+        return Result.success(res);
+    }
+
+
+    @Operation(summary = "问题类型占比")
+    @GetMapping("/getProblemBusinessRate")
+    public Result<JSONObject> getProblemBusinessRate(@RequestParam @DateTimeFormat(pattern = "yyyy-MM-dd") Date beginTime,
+                                                     @RequestParam @DateTimeFormat(pattern = "yyyy-MM-dd") Date endTime) {
+
+        // 问题类型占比
+        List<EchartsVo> wtlxlist = dataGobalService.getProblemRate(beginTime, endTime);
+        JSONObject res = new JSONObject()
+                .fluentPut("wtlxlist", wtlxlist);
+        return Result.success(res);
+    }
 
 
 }