From 83e4cb66a8dbeb62aac4fbfd8cc049fa82737f3c Mon Sep 17 00:00:00 2001 From: lijianlin Date: Sat, 19 Jul 2025 09:53:37 +0800 Subject: [PATCH] =?UTF-8?q?=E7=88=B6=E7=BA=A7=E8=A7=92=E8=89=B2=E4=BF=A1?= =?UTF-8?q?=E6=81=AF=E5=B1=95=E7=A4=BA=EF=BC=8C=E5=B7=A5=E4=BD=9C=E5=8F=B0?= =?UTF-8?q?=E9=80=BB=E8=BE=91=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../demo/controller/WorkbenchController.java | 24 ++++++++++++++-------- .../java/com/example/demo/domain/vo/RoleVo.java | 1 + .../demo/serviceImpl/StatisticsServiceImpl.java | 10 ++++----- src/main/resources/application.yml | 4 ++-- src/main/resources/mapper/RoleMapper.xml | 12 +++++++++-- 5 files changed, 34 insertions(+), 17 deletions(-) diff --git a/src/main/java/com/example/demo/controller/WorkbenchController.java b/src/main/java/com/example/demo/controller/WorkbenchController.java index 5b2b11e..b08baba 100644 --- a/src/main/java/com/example/demo/controller/WorkbenchController.java +++ b/src/main/java/com/example/demo/controller/WorkbenchController.java @@ -53,14 +53,22 @@ public class WorkbenchController { @PostMapping("getCard") public ResponseEntity card1(@RequestBody WorkbenchCard workbench, @AuthenticationPrincipal Admin admin) throws Exception{ - if (admin != null) { - String account = admin.getAccount(); - List markets = generalService.getRoleMarket(account); - WorkbenchCard result = workbenchService.getCard(markets); - return ResponseEntity.ok(result); - } else { - return ResponseEntity.status(HttpStatus.UNAUTHORIZED).body(null); - } + if (admin == null) { + return ResponseEntity.status(HttpStatus.UNAUTHORIZED).body(null); + } + + String account = admin.getAccount(); + //获取当前用户的市场列表 + List markets = generalService.getRoleMarket(account); + WorkbenchCard result; + //判断是否是总部 + if (markets != null && markets.contains("总部")) { + result = workbenchService.getCardCache(markets);//走缓存，拿全部市场的缓存数据 + } else { + result = workbenchService.getCard(markets);//不走缓存，计算卡片属性 + } + + return ResponseEntity.ok(result); } /* 获取各地区工作台图表的数据 diff --git a/src/main/java/com/example/demo/domain/vo/RoleVo.java b/src/main/java/com/example/demo/domain/vo/RoleVo.java index fbb111f..ad9915c 100644 --- a/src/main/java/com/example/demo/domain/vo/RoleVo.java +++ b/src/main/java/com/example/demo/domain/vo/RoleVo.java @@ -32,6 +32,7 @@ public class RoleVo implements Serializable { private Integer fatherId;//上级角色id private String fatherName;//上级角色名称 private String market;//所属市场 + private String fatherMarket;//父级角色市场 @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "Asia/Shanghai") private Date createTime; // 创建时间 diff --git a/src/main/java/com/example/demo/serviceImpl/StatisticsServiceImpl.java b/src/main/java/com/example/demo/serviceImpl/StatisticsServiceImpl.java index 8794abe..8c8fb40 100644 --- a/src/main/java/com/example/demo/serviceImpl/StatisticsServiceImpl.java +++ b/src/main/java/com/example/demo/serviceImpl/StatisticsServiceImpl.java @@ -39,10 +39,10 @@ public class StatisticsServiceImpl implements StatisticsService { private WorkbenchService workbenchService; /* - 每小时执行定时任务更新当天part1数据 + 每小时第十分执行定时任务更新当天part1数据 */ @Override - @Scheduled(cron = "0 0 * * * ?") // 每小时执行一次 + @Scheduled(cron = "0 10 * * * ?") // 每小时执行一次 public void runHourlyTaskPart1() { Date today = new Date(); //取当天日期 for(String market : generalService.getMarket()){ @@ -54,7 +54,7 @@ public class StatisticsServiceImpl implements StatisticsService { 每小时执行定时任务更新当天part2数据 */ @Override - @Scheduled(cron = "0 0 * * * ?") // 每小时执行一次 + @Scheduled(cron = "0 10 * * * ?") // 每小时执行一次 public void runHourlyTaskPart2() { Date today = new Date(); //取当天日期 for(String market : generalService.getMarket()){ @@ -65,7 +65,7 @@ public class StatisticsServiceImpl implements StatisticsService { 每小时执行定时任务更新年度数据 */ @Override - @Scheduled(cron = "0 0 * * * ?") // 每小时执行一次 + @Scheduled(cron = "0 10 * * * ?") // 每小时执行一次 public void runHourlyTaskYear() { Date today = new Date(); // 获取当前日期 @@ -86,7 +86,7 @@ public class StatisticsServiceImpl implements StatisticsService { 0点执行定时任务更新近一周part2数据 */ @Override - @Scheduled(cron = "0 0 0 * * ?") + @Scheduled(cron = "0 30 0 * * ?") // 修改为每天 00:30 执行 public void runDailyTaskPart2() { Calendar cal = Calendar.getInstance(); cal.add(Calendar.DAY_OF_YEAR, -7); // 一周前 diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml index 6af4432..b02b7e9 100644 --- a/src/main/resources/application.yml +++ b/src/main/resources/application.yml @@ -67,9 +67,9 @@ spring: data: redis: database: 0 - host: localhost + host: 18.143.76.3 port: 6379 - password: 123456 + password: Ngc0FYUTA6h3wC5J lettuce: pool: diff --git a/src/main/resources/mapper/RoleMapper.xml b/src/main/resources/mapper/RoleMapper.xml index bf5a640..11d38d6 100644 --- a/src/main/resources/mapper/RoleMapper.xml +++ b/src/main/resources/mapper/RoleMapper.xml @@ -80,8 +80,16 @@ \ No newline at end of file