diff --git a/src/main/java/com/example/demo/Util/CacheRefreshTask.java b/src/main/java/com/example/demo/Util/CacheRefreshTask.java index d9e10f8..87aef3b 100644 --- a/src/main/java/com/example/demo/Util/CacheRefreshTask.java +++ b/src/main/java/com/example/demo/Util/CacheRefreshTask.java @@ -24,8 +24,8 @@ public class CacheRefreshTask { this.workbenchService = workbenchService; } - // 每小时执行一次(1分0秒) - @Scheduled(cron = "0 1 * * * ?") + // 每小时执行一次(15分0秒) + @Scheduled(cron = "0 15 * * * ?") public void refreshCache() { List markets = generalService.getMarket(); try { diff --git a/src/main/java/com/example/demo/Util/StringToListTypeHandler.java b/src/main/java/com/example/demo/Util/StringToListTypeHandler.java deleted file mode 100644 index cd5fcf0..0000000 --- a/src/main/java/com/example/demo/Util/StringToListTypeHandler.java +++ /dev/null @@ -1,43 +0,0 @@ -package com.example.demo.Util; - -import org.apache.ibatis.type.BaseTypeHandler; -import org.apache.ibatis.type.JdbcType; -import org.apache.ibatis.type.TypeHandler; - -import java.sql.CallableStatement; -import java.sql.PreparedStatement; -import java.sql.ResultSet; -import java.sql.SQLException; -import java.util.Arrays; -import java.util.List; - -public class StringToListTypeHandler extends BaseTypeHandler> { - - @Override - public void setNonNullParameter(PreparedStatement ps, int i, List parameter, JdbcType jdbcType) throws SQLException { - // 将 List 转换为字符串 - ps.setString(i, String.join(",", parameter)); - } - - @Override - public List getNullableResult(ResultSet rs, String columnName) throws SQLException { - return parseStringToList(rs.getString(columnName)); - } - - @Override - public List getNullableResult(ResultSet rs, int columnIndex) throws SQLException { - return parseStringToList(rs.getString(columnIndex)); - } - - @Override - public List getNullableResult(CallableStatement cs, int columnIndex) throws SQLException { - return parseStringToList(cs.getString(columnIndex)); - } - - private List parseStringToList(String str) { - if (str == null || str.isEmpty()) { - return null; - } - return Arrays.asList(str.split(",")); - } -} \ No newline at end of file diff --git a/src/main/java/com/example/demo/controller/WorkbenchController.java b/src/main/java/com/example/demo/controller/WorkbenchController.java index b08baba..6916b77 100644 --- a/src/main/java/com/example/demo/controller/WorkbenchController.java +++ b/src/main/java/com/example/demo/controller/WorkbenchController.java @@ -52,7 +52,7 @@ public class WorkbenchController { */ @PostMapping("getCard") public ResponseEntity card1(@RequestBody WorkbenchCard workbench, - @AuthenticationPrincipal Admin admin) throws Exception{ + @AuthenticationPrincipal Admin admin) { if (admin == null) { return ResponseEntity.status(HttpStatus.UNAUTHORIZED).body(null); } @@ -74,7 +74,15 @@ public class WorkbenchController { 获取各地区工作台图表的数据 */ @PostMapping("getGraph") - public ResponseEntity graph1(@RequestBody WorkbenchCard workbench){ + public ResponseEntity graph1(@RequestBody WorkbenchCard workbench, @AuthenticationPrincipal Admin admin) { + String account = admin.getAccount(); + List markets = generalService.getRoleMarket(account); + + //判断是否是总部 + if (markets != null && markets.contains("总部")) { + markets=generalService.getMarket();//总部有所有地区的权限 + } + workbench.setMarkets(markets); WorkbenchCard result =workbenchService.getGraph(workbench.getStartDate(),workbench.getEndDate(),workbench.getMarkets()); return ResponseEntity.ok(result); }