diff --git a/src/main/java/com/example/demo/controller/XZCFController.java b/src/main/java/com/example/demo/controller/XZCFController.java index a93391b..a4f140b 100644 --- a/src/main/java/com/example/demo/controller/XZCFController.java +++ b/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 = true) + @DapingCache(isEnableCache = false) public Map GetFaShengLvDaPing(String hj, String szqx, String month) { // String userName = BaseContext.getUserName(); // if (Tools.isNotEmpty(userName) && userName.contains("区")) { @@ -111,10 +111,35 @@ public class XZCFController { return xzcfDataService.getFaShengLvDaPing(hj, szqx, timeByMonth.getStartTime(), timeByMonth.getEndTime()); } + @GetMapping("/GetFaShengLvDaPingDasai") + @Log(title = "行政处罚(大屏)", businessType = BusinessType.SELECT) + @DapingCache(isEnableCache = false) + public Map GetFaShengLvDaPing(String hj, String szqx, String month ,int littlemonth) { +// String userName = BaseContext.getUserName(); +// if (Tools.isNotEmpty(userName) && userName.contains("区")) { +// szqx = userName; +// } + String startMonth1 = ObjectUtils.isEmpty(month) ? "1" : month; + String endMonth1 = ObjectUtils.isEmpty(month) ? "12" : month; + + int startmonthInt = Integer.parseInt(startMonth1); + int resultInt = startmonthInt - littlemonth; + String startMonth = String.valueOf(resultInt); + int endmonthInt = Integer.parseInt(endMonth1); + int resultInt1 = startmonthInt - littlemonth; + String endMonth = String.valueOf(resultInt1); + + MonthTimeVo timeByMonth = TimeUtil.getTimeByMonth("2024", month, month, TimeUtil.FORMAT_1); + + String start = "2024/" + startMonth + "/1"; + String end = "2024/" + endMonth + "/31"; + return xzcfDataService.getFaShengLvDaPing(hj, szqx, timeByMonth.getStartTime(), timeByMonth.getEndTime()); + } + //统计模块-行政处罚 @GetMapping("/GetFaShengLvDaPingStreet") @Log(title = "行政处罚(大屏)街道", businessType = BusinessType.SELECT) - @DapingCache(isEnableCache = true) + @DapingCache(isEnableCache = false) public Map GetFaShengLvDaPingStreet(String hj, String szqx, String month,String street) { // String userName = BaseContext.getUserName(); // if (Tools.isNotEmpty(userName) && userName.contains("区")) { @@ -152,7 +177,7 @@ public class XZCFController { @GetMapping("/GetScoreByHuanJie") @Log(title = "行政处罚根据环节获取成绩", businessType = BusinessType.SELECT) - @DapingCache(isEnableCache = true) + @DapingCache(isEnableCache = false) public Object GetScoreByHuanJie(String szqx, String month) { String startMonth = ObjectUtils.isEmpty(month) ? "1" : month; String endMonth = ObjectUtils.isEmpty(month) ? "12" : month; diff --git a/src/main/java/com/example/demo/service/impl/XzcfDataServiceImpl.java b/src/main/java/com/example/demo/service/impl/XzcfDataServiceImpl.java index c6d87ee..f453648 100644 --- a/src/main/java/com/example/demo/service/impl/XzcfDataServiceImpl.java +++ b/src/main/java/com/example/demo/service/impl/XzcfDataServiceImpl.java @@ -504,7 +504,7 @@ public class XzcfDataServiceImpl extends ServiceImpl System.out.println("startTime = " + startTime); System.out.println("endTime = " + endTime); //默认2023 - String rwnf = "2023"; + String rwnf = "2024"; // 将字符串转换为LocalDate对象 LocalDate nowDate = LocalDate.of(Integer.parseInt(rwnf), 1, 1); // 找到该年的最后一天