Browse Source

工作台图表地区接口优化

sunjiabei/feature-20250710132313-二期模块
lijianlin 4 weeks ago
parent
commit
386ce06dde
  1. 2
      src/main/java/com/example/demo/controller/WorkbenchController.java
  2. 2
      src/main/java/com/example/demo/service/GeneralService.java
  3. 23
      src/main/java/com/example/demo/serviceImpl/GeneralServiceImpl.java

2
src/main/java/com/example/demo/controller/WorkbenchController.java

@ -72,7 +72,7 @@ public class WorkbenchController {
@PostMapping("getGraph")
public ResponseEntity<WorkbenchCard> graph1(@RequestBody WorkbenchCard workbench, @AuthenticationPrincipal Admin admin) {
String account = admin.getAccount();
List<String> markets = generalService.getAdminMarket(account);
List<String> markets = generalService.getAdminMarket1(account);
workbench.setMarkets(markets);

2
src/main/java/com/example/demo/service/GeneralService.java

@ -36,6 +36,8 @@ public interface GeneralService {
List<Date> getAllDatesBetween(Date start, Date end);
//获取用户的地区权限列表
List<String> getAdminMarket(String account) ;
//获取用户的地区权限列表(工作台图表专用)
List<String> getAdminMarket1(String account) ;
//获取角色的地区
String getRoleMarket(Integer roleId);
}

23
src/main/java/com/example/demo/serviceImpl/GeneralServiceImpl.java

@ -143,6 +143,29 @@ public class GeneralServiceImpl implements GeneralService {
}
@Override
public List<String> getAdminMarket1(String account) {
try {
String market = generalMapper.getAdminMarket(account);
if (market == null) {
throw new Exception("没有地区权限");
}
List<String> list = Arrays.asList(market.split(","));
//判断是否是总部
if (list != null && list.contains("总部")) {
list=getMarket();//总部有所有地区的权限
}
return list;
} catch (Exception e) {
// 记录日志
log.error("获取地区权限失败", e);
// 重新抛出异常或者根据需要返回一个默认值或空列表
throw new RuntimeException("获取地区权限失败", e);
}
}
/*
获取觉得的地区列表
*/

Loading…
Cancel
Save