Browse Source

地区接口修改

sunjiabei/feature-20250710132313-二期模块
lijianlin 4 weeks ago
parent
commit
089f036a2b
  1. 2
      src/main/java/com/example/demo/controller/WorkbenchController.java
  2. 3
      src/main/java/com/example/demo/serviceImpl/GeneralServiceImpl.java
  3. 4
      src/main/java/com/example/demo/serviceImpl/StatisticsServiceImpl.java

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

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

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

@ -131,7 +131,8 @@ public class GeneralServiceImpl implements GeneralService {
List<String> list = Arrays.asList(market.split(",")); List<String> list = Arrays.asList(market.split(","));
//判断是否是总部 //判断是否是总部
if (list != null && list.contains("总部")) { if (list != null && list.contains("总部")) {
list=getALLAdminMarket();//总部有所有地区的权限
list=getMarket();//总部有所有地区的权限
list.add("总部"); //添加总部
} }
return list; return list;
} catch (Exception e) { } catch (Exception e) {

4
src/main/java/com/example/demo/serviceImpl/StatisticsServiceImpl.java

@ -96,7 +96,7 @@ public class StatisticsServiceImpl implements StatisticsService {
Calendar calendar = Calendar.getInstance(); Calendar calendar = Calendar.getInstance();
calendar.setTime(yesterday); calendar.setTime(yesterday);
// 设置时间为昨天的23:55
// 设置时间为昨天的23:5955
calendar.set(Calendar.HOUR_OF_DAY, 23); calendar.set(Calendar.HOUR_OF_DAY, 23);
calendar.set(Calendar.MINUTE, 59); calendar.set(Calendar.MINUTE, 59);
calendar.set(Calendar.SECOND, 55); calendar.set(Calendar.SECOND, 55);
@ -195,7 +195,7 @@ public class StatisticsServiceImpl implements StatisticsService {
} }
} }
//根据地区与日期获取part1(余量属性)统计数据
@Override @Override
public Statistics getStatisticsPart1(String market, Date date) { public Statistics getStatisticsPart1(String market, Date date) {
//获取日期 //获取日期

Loading…
Cancel
Save