缓存测试接口,开启读取缓存

src/main/java/com/example/demo/controller/CCKHController.java

@@ -39,7 +39,7 @@ public class CCKHController {
     //统计模块-抽查考核
     @GetMapping("/GetKaoHeLv")
     @ApiOperation(value = "抽查考核考核率")
-    @DapingCache(isEnableCache = false)
+    @DapingCache(isEnableCache = true)
     @Log(title = "抽查考核考核率", businessType = BusinessType.SELECT)
     public Object GetKaoHe(String wherestr) {
         AllQuery xinXiZhuiSuQuery = JSONUtil.toBean(wherestr, AllQuery.class);
@@ -51,7 +51,7 @@ public class CCKHController {
 
     @GetMapping("/kaoHeLvExport")
     @ApiOperation(value = "抽查考核及相关结果导出")
-    @DapingCache(isEnableCache = false)
+    @DapingCache(isEnableCache = true)
     @Log(title = "抽查考核及相关结果导出", businessType = BusinessType.EXPORT)
     public void kaoHeLvExport(String wherestr, HttpServletResponse response) {
         AllQuery xinXiZhuiSuQuery = JSONUtil.toBean(wherestr, AllQuery.class);
@@ -66,7 +66,7 @@ public class CCKHController {
     @GetMapping("/GetKaoHeDaPing")
     @ApiOperation(value = "抽查考核大屏主界面")
     @Log(title = "抽查考核(大屏)", businessType = BusinessType.SELECT)
-    @DapingCache(isEnableCache = false)
+    @DapingCache(isEnableCache = true)
     public ZR<List<CCKHVo>> GetKaoHeDaPing(String hj, String szqx, String month) {
 //        szqx = Util.setSzqxFromUserName(szqx);
         String startMonth = ObjectUtils.isEmpty(month) ? "1" : month;
@@ -80,7 +80,7 @@ public class CCKHController {
 
     @GetMapping("/GetScoreByHuanJie")
     @Log(title = "追溯信息根据环节获取成绩", businessType = BusinessType.SELECT)
-    @DapingCache(isEnableCache = false)
+    @DapingCache(isEnableCache = true)
     public Object GetScoreByHuanJie(String szqx, String month) {
         String startMonth = ObjectUtils.isEmpty(month) ? "1" : month;
         String endMonth = ObjectUtils.isEmpty(month) ? "12" : month;

src/main/java/com/example/demo/controller/TSJBController.java

@@ -139,7 +139,7 @@ public class TSJBController {
     @GetMapping("/GetTouSuLvDaPing")
     @ApiOperation(value = "投诉举报(大屏演示)")
     @Log(title = "投诉举报(大屏演示)", businessType = BusinessType.SELECT)
-    @DapingCache(isEnableCache = false)
+    @DapingCache(isEnableCache = true)
     public ZR<List<TouSuJuBaoLv>> GetTouSuLvDaPing(String hj, String szqx, String month) {
 //        String userName = BaseContext.getUserName();
 //        if (Tools.isNotEmpty(userName) && userName.contains("区")) {
@@ -156,7 +156,7 @@ public class TSJBController {
     @GetMapping("/GetTouSuLvDaPingStreet")
     @ApiOperation(value = "投诉举报(大屏演示)街道")
     @Log(title = "投诉举报(大屏)街道", businessType = BusinessType.SELECT)
-    @DapingCache(isEnableCache = false)
+    @DapingCache(isEnableCache = true)
     public ZR<List<TouSuJuBaoLv>> GetTouSuLvDaPingStreet(String hj, String szqx, String month,String street) {
         String startMonth = ObjectUtils.isEmpty(month) ? "1" : month;
         String endMonth = ObjectUtils.isEmpty(month) ? "12" : month;
@@ -169,7 +169,7 @@ public class TSJBController {
     @GetMapping("/GetTouSuLvDaPingStreetDasai")
     @ApiOperation(value = "投诉举报(大屏演示)街道")
     @Log(title = "投诉举报(大屏)街道", businessType = BusinessType.SELECT)
-    @DapingCache(isEnableCache = false)
+    @DapingCache(isEnableCache = true)
     public ZR<List<TouSuJuBaoLv>> GetTouSuLvDaPingStreetDasai(String hj, String szqx, String month,String street, int littlemonth) {
         String startMonth = ObjectUtils.isEmpty(month) ? "1" : month;
         String endMonth = ObjectUtils.isEmpty(month) ? "12" : month;
@@ -182,7 +182,7 @@ public class TSJBController {
     //投诉举报
     @GetMapping("/GetScoreByHuanJie")
     @Log(title = "投诉举报根据环节获取成绩", businessType = BusinessType.SELECT)
-    @DapingCache(isEnableCache = false)
+    @DapingCache(isEnableCache = true)
     public Object GetScoreByHuanJie(String szqx, String month) {
         String startMonth = ObjectUtils.isEmpty(month) ? "1" : month;
         String endMonth = ObjectUtils.isEmpty(month) ? "12" : month;

src/main/java/com/example/demo/controller/TongJiController.java

@@ -334,7 +334,7 @@ public class TongJiController {
     /// 查询合格率统计信息20231021Add
     @GetMapping("/TongJi/GetTongJiHeGeLvDaPing")
     @Log(title = "抽检监测(大屏)", businessType = BusinessType.SELECT)
-    @DapingCache(isEnableCache = false)
+    @DapingCache(isEnableCache = true)
     public ZR<List<TongJiHeGeLv>> GetTongJiHeGeLvDaPing(String hj, String szqx, String month) {
 
 //        String userName = BaseContext.getUserName();
@@ -353,7 +353,7 @@ public class TongJiController {
     /// 查询合格率统计信息20231021Add
     @GetMapping("/TongJi/GetTongJiHeGeLvDaPingStreet")
     @Log(title = "抽检监测(大屏)街道", businessType = BusinessType.SELECT)
-    @DapingCache(isEnableCache = false)
+    @DapingCache(isEnableCache = true)
     public ZR<List<TongJiHeGeLv>> GetTongJiHeGeLvDaPingStreet(String hj, String szqx, String month,String street) {
 
 //        String userName = BaseContext.getUserName();
@@ -372,7 +372,7 @@ public class TongJiController {
     /// 查询合格率统计信息20231021Add
     @GetMapping("/TongJi/GetTongJiHeGeLvDaPingStreetDasai")
     @Log(title = "抽检监测(大屏)街道", businessType = BusinessType.SELECT)
-    @DapingCache(isEnableCache = false)
+    @DapingCache(isEnableCache = true)
     public ZR<List<TongJiHeGeLv>> GetTongJiHeGeLvDaPingStreetDasai(String hj, String szqx, String month,String street,int littlemonth) {
 //        传的月份 + 差的月 作为新的月份
         month = Integer.valueOf(month) + littlemonth + "";
@@ -465,7 +465,7 @@ public class TongJiController {
 
     @GetMapping("/CJJC/GetScoreByHuanJie")
     @Log(title = "抽检监测根据环节获取成绩", businessType = BusinessType.SELECT)
-    @DapingCache(isEnableCache = false)
+    @DapingCache(isEnableCache = true)
     public Object GetScoreByHuanJie(String szqx, String month) {
         String startMonth = ObjectUtils.isEmpty(month) ? "1" : month;
         String endMonth = ObjectUtils.isEmpty(month) ? "12" : month;

src/main/java/com/example/demo/controller/XXZSController.java

@@ -69,7 +69,7 @@ public class XXZSController {
     @GetMapping("/GetZhuiSuDaPing")
     @ApiOperation(value = "信息追溯(大屏)")
     @Log(title = "信息追溯(大屏)", businessType = BusinessType.SELECT)
-    @DapingCache(isEnableCache = false)
+    @DapingCache(isEnableCache = true)
     public Object GetZhuiSuDaPing(String hj, String szqx, String month) {
         String startMonth = ObjectUtils.isEmpty(month) ? "1" : month;
         String endMonth = ObjectUtils.isEmpty(month) ? "12" : month;
@@ -83,7 +83,7 @@ public class XXZSController {
     @GetMapping("/GetZhuiSuDaPingStreet")
     @ApiOperation(value = "信息追溯(大屏)街道")
     @Log(title = "信息追溯(大屏)街道", businessType = BusinessType.SELECT)
-    @DapingCache(isEnableCache = false)
+    @DapingCache(isEnableCache = true)
     public Object GetZhuiSuDaPingStreet(String hj, String szqx, String month,String street) {
         String startMonth = ObjectUtils.isEmpty(month) ? "1" : month;
         String endMonth = ObjectUtils.isEmpty(month) ? "12" : month;
@@ -95,7 +95,7 @@ public class XXZSController {
 
     @GetMapping("/GetScoreByHuanJie")
     @Log(title = "追溯信息根据环节获取成绩", businessType = BusinessType.SELECT)
-    @DapingCache(isEnableCache = false)
+    @DapingCache(isEnableCache = true)
     public Object GetScoreByHuanJie(String szqx, String month) {
         String startMonth = ObjectUtils.isEmpty(month) ? "1" : month;
         String endMonth = ObjectUtils.isEmpty(month) ? "12" : month;

src/main/java/com/example/demo/controller/XZCFController.java

@@ -95,7 +95,7 @@ public class XZCFController {
     //统计模块-行政处罚
     @GetMapping("/GetFaShengLvDaPing")
     @Log(title = "行政处罚(大屏)", businessType = BusinessType.SELECT)
-    @DapingCache(isEnableCache = false)
+    @DapingCache(isEnableCache = true)
     public Map<String, Object> GetFaShengLvDaPing(String hj, String szqx, String month) {
 //        String userName = BaseContext.getUserName();
 //        if (Tools.isNotEmpty(userName) && userName.contains("区")) {
@@ -114,7 +114,7 @@ public class XZCFController {
     //统计模块-行政处罚
     @GetMapping("/GetFaShengLvDaPingStreet")
     @Log(title = "行政处罚(大屏)街道", businessType = BusinessType.SELECT)
-    @DapingCache(isEnableCache = false)
+    @DapingCache(isEnableCache = true)
     public Map<String, Object> GetFaShengLvDaPingStreet(String hj, String szqx, String month,String street) {
 //        String userName = BaseContext.getUserName();
 //        if (Tools.isNotEmpty(userName) && userName.contains("区")) {
@@ -152,7 +152,7 @@ public class XZCFController {
 
     @GetMapping("/GetScoreByHuanJie")
     @Log(title = "行政处罚根据环节获取成绩", businessType = BusinessType.SELECT)
-    @DapingCache(isEnableCache = false)
+    @DapingCache(isEnableCache = true)
     public Object GetScoreByHuanJie(String szqx, String month) {
         String startMonth = ObjectUtils.isEmpty(month) ? "1" : month;
         String endMonth = ObjectUtils.isEmpty(month) ? "12" : month;

src/main/java/com/example/demo/controller/ZFJCController.java

@@ -59,7 +59,7 @@ public class ZFJCController {
     //统计模块-执法检查
     @GetMapping("/GetWenTiLvDaPing")
     @Log(title = "执法检查(大屏)", businessType = BusinessType.SELECT)
-    @DapingCache(isEnableCache = false)
+    @DapingCache(isEnableCache = true)
     public Object GetWenTiLvDaPing(String hj, String szqx, String month) {
         String startMonth = ObjectUtils.isEmpty(month) ? "1" : month;
         String endMonth = ObjectUtils.isEmpty(month) ? "12" : month;
@@ -72,7 +72,7 @@ public class ZFJCController {
     //统计模块-执法检查
     @GetMapping("/GetWenTiLvDaPingDasai")
     @Log(title = "执法检查(大屏)", businessType = BusinessType.SELECT)
-    @DapingCache(isEnableCache = false)
+    @DapingCache(isEnableCache = true)
     public Object GetWenTiLvDaPingDasai(String hj, String szqx, String month,int littlemonth) {
         String startMonth = ObjectUtils.isEmpty(month) ? "1" : month;
         String endMonth = ObjectUtils.isEmpty(month) ? "12" : month;
@@ -85,7 +85,7 @@ public class ZFJCController {
     //执法检查 大屏 街道
     @GetMapping("/GetWenTiLvDaPingStreet")
     @Log(title = "执法检查(大屏)街道", businessType = BusinessType.SELECT)
-    @DapingCache(isEnableCache = false)
+    @DapingCache(isEnableCache = true)
     public Object GetWenTiLvDaPingStreet(String hj, String szqx, String month,String street) {
         String startMonth = ObjectUtils.isEmpty(month) ? "1" : month;
         String endMonth = ObjectUtils.isEmpty(month) ? "12" : month;
@@ -95,9 +95,22 @@ public class ZFJCController {
         return zfjcDataService.getWenTiLvDaPingStreet(hj, szqx, start, end,street);
     }
 
+    //执法检查 大屏 街道
+    @GetMapping("/GetWenTiLvDaPingStreetDasai")
+    @Log(title = "执法检查(大屏)街道", businessType = BusinessType.SELECT)
+    @DapingCache(isEnableCache = true)
+    public Object GetWenTiLvDaPingStreetDasai(String hj, String szqx, String month,String street,int littlemonth) {
+        String startMonth = ObjectUtils.isEmpty(month) ? "1" : month;
+        String endMonth = ObjectUtils.isEmpty(month) ? "12" : month;
+        //开始时间不用
+        String start = "2022/" + startMonth + "/1";
+        String end = "2022/" + endMonth + "/31";
+        return zfjcDataService.getWenTiLvDaPingStreetDasai(hj, szqx, start, end,street,littlemonth);
+    }
+
     @GetMapping("/GetScoreByHuanJie")
     @Log(title = "执法检查据环节获取成绩", businessType = BusinessType.SELECT)
-    @DapingCache(isEnableCache = false)
+    @DapingCache(isEnableCache = true)
     public Object GetScoreByHuanJie(String szqx, String month) {
         String startMonth = ObjectUtils.isEmpty(month) ? "1" : month;
         String endMonth = ObjectUtils.isEmpty(month) ? "12" : month;

src/main/java/com/example/demo/controller/ZHZSController.java

@@ -53,7 +53,7 @@ public class ZHZSController {
     @GetMapping("/GetScoreNew")
     @ApiOperation(value = "综合指数各区分数大屏，计算分数", notes = "返回各区的各个维度的分数，以及总分")
     @Log(title = "综合指数各区分数大屏，计算分数", businessType = BusinessType.SELECT)
-    @DapingCache(isEnableCache = false)
+    @DapingCache(isEnableCache = true)
     public R<List<DaPingScoreQX>> getCountyMapScore(String hj, String szqx, String month) throws ParseException {
         String startMonth = ObjectUtils.isEmpty(month) ? "1" : month;
         String endMonth = ObjectUtils.isEmpty(month) ? "12" : month;
@@ -71,7 +71,7 @@ public class ZHZSController {
     @GetMapping("/GetScoreNewDasai")
     @ApiOperation(value = "综合指数各区分数大屏，计算分数", notes = "返回各区的各个维度的分数，以及总分")
     @Log(title = "综合指数各区分数大屏，计算分数", businessType = BusinessType.SELECT)
-    @DapingCache(isEnableCache = false)
+    @DapingCache(isEnableCache = true)
     public R<List<DaPingScoreQX>> getCountyMapScore(String hj, String szqx, String month,int littlemonth) throws ParseException {
         String startMonth = ObjectUtils.isEmpty(month) ? "1" : month;
         String endMonth = ObjectUtils.isEmpty(month) ? "12" : month;
@@ -91,7 +91,7 @@ public class ZHZSController {
     @GetMapping("/GetScoreNewStreet")
     @ApiOperation(value = "综合指数各街道分数大屏，计算分数", notes = "返回各区的各个维度的分数，以及总分")
     @Log(title = "综合指数各街道分数大屏，计算分数", businessType = BusinessType.SELECT)
-    @DapingCache(isEnableCache = false)
+    @DapingCache(isEnableCache = true)
     public R<List<DaPingScoreQX>> getStreetMapScore(String hj, String szqx, String month) throws ParseException {
         String startMonth = ObjectUtils.isEmpty(month) ? "1" : month;
         String endMonth = ObjectUtils.isEmpty(month) ? "12" : month;
@@ -108,7 +108,7 @@ public class ZHZSController {
     @GetMapping("/GetScoreNewStreetAndShanghaiDasai")
     @ApiOperation(value = "综合指数各街道分数大屏，计算分数", notes = "返回各区的各个维度的分数，以及总分")
     @Log(title = "综合指数各街道分数大屏，计算分数", businessType = BusinessType.SELECT)
-    @DapingCache(isEnableCache = false)
+    @DapingCache(isEnableCache = true)
     public R<List<DaPingScoreQX>> getScoreStreetAndShanghai(String hj, String szqx, String month,int littlemonth) throws ParseException {
         String startMonth = ObjectUtils.isEmpty(month) ? "1" : month;
         String endMonth = ObjectUtils.isEmpty(month) ? "12" : month;
@@ -141,7 +141,7 @@ public class ZHZSController {
     @GetMapping("/GetTitleScore")
     @ApiOperation(value = "计算标题分数", notes = "计算当前条件下的总分（不受区县条件影响）")
     @Log(title = "计算标题分数", businessType = BusinessType.SELECT)
-    @DapingCache(isEnableCache = false)
+    @DapingCache(isEnableCache = true)
     public R<BigDecimal> GetTitleScoreNew(String hj, String szqx, String month) {
 //        szqx = Util.setSzqxFromUserName(szqx);
         String startMonth = ObjectUtils.isEmpty(month) ? "1" : month;
@@ -161,7 +161,7 @@ public class ZHZSController {
     //综合性指标 大屏，综合指数
     @GetMapping("/GetZHScoreDaPing")
     @Log(title = "综合性指标 大屏", businessType = BusinessType.SELECT)
-    @DapingCache(isEnableCache = false)
+    @DapingCache(isEnableCache = true)
     public ZR<List<ZhData>> GetZHScoreDaPing(String szqx) {
 //        szqx = Util.setSzqxFromUserName(szqx);
         String year = "2023";

src/main/resources/public/app/yujing/controller/dataBuhegelvCtrl.js

@@ -373,13 +373,16 @@
         }
 
 
-
         $scope.DasaiCache = function () {
             dasaiFetchData();
         }
 
         $scope.DasaiMonths = ['', 3, 4, 5]
 
+        $scope.DasaiSzqx = ["上海市",
+            "奉贤区"
+        ]
+
         $scope.DasaiStreet = ["",
             "庄行镇", "金汇镇", "柘林镇", "上海市奉贤区海湾旅游区",
 //            "青村镇",
@@ -391,57 +394,33 @@
             //            ,"上海海港综合经济开发区"
         ]
 
-        $scope.DasaiLittlemonth = [-1,1,2,0
+        $scope.DaaiHj = [''
         ]
+
+        $scope.DasaiLittlemonth = [-1, 1, 2, 0
+        ]
+
         async function dasaiFetchData() {
-            for (let i = 0; i < $scope.DaPingMonths.length; i++) {
+            for (let i = 0; i < $scope.DasaiMonths.length; i++) {
-                for (let j = 0; j < $scope.DaPingSzqx.length; j++) {
+                for (let j = 0; j < $scope.DasaiSzqx.length; j++) {
-                    for (let k = 0; k < $scope.DaPingHj.length; k++) {
+                    for (let k = 0; k < $scope.DaaiHj.length; k++) {
-                        await $http.get(Gaddress + '/ZHZS/GetScoreNewStreetAndShanghaiDasai?szqx=' + $scope.Dasaitreet[i] + '&month='
+                        for (let p = 0; p < $scope.DasaiStreet.length; p++) {
-                            + $scope.DasaiMonths[k] + '&szqx=' + $scope.DaPingSzqx[j]);
+                            await $http.get(Gaddress + '/ZHZS/GetScoreNewStreetAndShanghaiDasai?&month=' + $scope.DasaiMonths[k] + '&hj='
-                        await $http.get(Gaddress + '/XZCF/GetFaShengLvDaPing?month=' + $scope.DaPingMonths[i] + '&hj='
+                                + $scope.DaaiHj[k] + '&szqx=' + $scope.DasaiSzqx[j] + '&street=' + $scope.DasaiStreet[j]
-                            + $scope.DaPingHj[k] + '&szqx=' + $scope.DaPingSzqx[j]);
+                                + '&littlemonth=' + $scope.DasaiLittlemonth[j]);
-                        await $http.get(Gaddress + '/CCKH/GetKaoHeDaPing?month=' + $scope.DaPingMonths[i] + '&hj='
+                            await $http.get(Gaddress + '/TSJB/GetTouSuLvDaPingStreetDasai?month=' + $scope.DasaiMonths[i] + '&hj='
-                            + $scope.DaPingHj[k] + '&szqx=' + $scope.DaPingSzqx[j]);
+                                + $scope.DaaiHj[k] + '&szqx=' + $scope.DasaiSzqx[j] + '&street=' + $scope.DasaiStreet[j]
-                        await $http.get(Gaddress + '/TSJB/GetTouSuLvDaPing?month=' + $scope.DaPingMonths[i] + '&hj='
+                                + '&littlemonth=' + $scope.DasaiLittlemonth[j]);
-                            + $scope.DaPingHj[k] + '&szqx=' + $scope.DaPingSzqx[j]);
+                            await $http.get(Gaddress + '/ZFJC/GetWenTiLvDaPingStreetDasai?month=' + $scope.DasaiMonths[i] + '&hj='
-                        await $http.get(Gaddress + '/XXZS/GetZhuiSuDaPing?month=' + $scope.DaPingMonths[i] + '&hj='
+                                + $scope.DaaiHj[k] + '&szqx=' + $scope.DasaiSzqx[j] + '&street=' + $scope.DasaiStreet[j]
-                            + $scope.DaPingHj[k] + '&szqx=' + $scope.DaPingSzqx[j]);
+                                + '&littlemonth=' + $scope.DasaiLittlemonth[j]);
-                        await $http.get(Gaddress + '/ZFJC/GetWenTiLvDaPing?month=' + $scope.DaPingMonths[i] + '&hj='
+                            await $http.get(Gaddress + '/TongJi/GetTongJiHeGeLvDaPingStreetDasai?month=' + $scope.DasaiMonths[i] + '&hj='
-                            + $scope.DaPingHj[k] + '&szqx=' + $scope.DaPingSzqx[j]);
+                                + $scope.DaaiHj[k] + '&szqx=' + $scope.DasaiSzqx[j] + '&street=' + $scope.DasaiStreet[j]
-                        await $http.get(Gaddress + '/ZHZS/GetTitleScore?month=' + $scope.DaPingMonths[i] + '&hj='
+                                + '&littlemonth=' + $scope.DasaiLittlemonth[j]);
-                            + $scope.DaPingHj[k] + '&szqx=' + $scope.DaPingSzqx[j]);
                             debugger;
                         }
                     }
                 }
-
-            for (let i = 0; i < $scope.DaPingMonths.length; i++) {
-                await $http.get(Gaddress + '/ZHZS/GetZHScoreDaPing?szqx=' + $scope.DaPingSzqx[i]);
-            }
-
-            for (let i = 0; i < $scope.DaPingMonths.length; i++) {
-                for (let k = 0; k < $scope.DaPingHj.length; k++) {
-                    await $http.get(Gaddress + '/ZHZS/GetScoreNew?month=' + $scope.DaPingMonths[i] + '&hj='
-                        + $scope.DaPingHj[k]);
-                }
-            }
-
-            for (let i = 0; i < $scope.DaPingMonths.length; i++) {
-                for (let j = 0; j < $scope.DaPingSzqx.length; j++) {
-                    await $http.get(Gaddress + '/CJJC/GetScoreByHuanJie?month=' + $scope.DaPingMonths[i]
-                        + '&szqx=' + $scope.DaPingSzqx[j]);
-                    await $http.get(Gaddress + '/CCKH/GetScoreByHuanJie?month=' + $scope.DaPingMonths[i]
-                        + '&szqx=' + $scope.DaPingSzqx[j]);
-                    await $http.get(Gaddress + '/XZCF/GetScoreByHuanJie?month=' + $scope.DaPingMonths[i]
-                        + '&szqx=' + $scope.DaPingSzqx[j]);
-                    await $http.get(Gaddress + '/TSJB/GetScoreByHuanJie?month=' + $scope.DaPingMonths[i]
-                        + '&szqx=' + $scope.DaPingSzqx[j]);
-                    await $http.get(Gaddress + '/XXZS/GetScoreByHuanJie?month=' + $scope.DaPingMonths[i]
-                        + '&szqx=' + $scope.DaPingSzqx[j]);
-                    await $http.get(Gaddress + '/ZFJC/GetScoreByHuanJie?month=' + $scope.DaPingMonths[i]
-                        + '&szqx=' + $scope.DaPingSzqx[j]);
-                }
             }
         }
 
@@ -1951,4 +1930,6 @@
             }
 
 
-    }])
+        }
+
+    ])