diff --git a/src/main/java/com/example/demo/controller/WorkbenchController.java b/src/main/java/com/example/demo/controller/WorkbenchController.java index f6fcf8c..bad46b7 100644 --- a/src/main/java/com/example/demo/controller/WorkbenchController.java +++ b/src/main/java/com/example/demo/controller/WorkbenchController.java @@ -54,18 +54,14 @@ public class WorkbenchController { WorkbenchCard result =workbenchService.getGraph(workbench.getToken(),workbench.getStartDate(),workbench.getEndDate(),workbench.getMarkets()); return ResponseEntity.ok(result); } - /* - 测试一段时间内的统计数据 - */ - /* @PostMapping("testSum") - public Statistics testSum( @RequestBody TestRequest request){ - String market = request.getMarket(); - Date date = request.getDate(); - - - //获取传入日期所在周的周一 - Date thisWeekStart = workbenchService.getStartOfWeek(date); - - return statisticsMapper.selectSumByMarketAndDate(market, thisWeekStart, date); - }*/ + /* + 更新统计表并获取卡片数据 + */ + @PostMapping("updateCard") + public ResponseEntity updateCard(@RequestBody WorkbenchCard workbench){ + statisticsService.runHourlyTaskPart1(); //更新余量数据 + statisticsService.runHourlyTaskPart2(); //更新余量外数据 + WorkbenchCard result =workbenchService.getCard(workbench.getToken()); //获取卡片数据 + return ResponseEntity.ok(result); + } } diff --git a/src/main/java/com/example/demo/service/StatisticsService.java b/src/main/java/com/example/demo/service/StatisticsService.java index fe06f8e..dc86550 100644 --- a/src/main/java/com/example/demo/service/StatisticsService.java +++ b/src/main/java/com/example/demo/service/StatisticsService.java @@ -15,9 +15,9 @@ import java.util.Date; public interface StatisticsService { - //1点,12点,18点,23点30分执行定时任务更新当天part1数据 + //每小时执行定时任务更新当天part1数据 public void runHourlyTaskPart1(); - //12点,18点执行定时任务更新当天part2数据 + //每小时执行定时任务更新当天part2数据 public void runHourlyTaskPart2(); //0点执行定时任务更新近一周part2数据 public void runDailyTaskPart2(); diff --git a/src/main/java/com/example/demo/serviceImpl/AuditServiceImpl.java b/src/main/java/com/example/demo/serviceImpl/AuditServiceImpl.java index 851fc95..cc44907 100644 --- a/src/main/java/com/example/demo/serviceImpl/AuditServiceImpl.java +++ b/src/main/java/com/example/demo/serviceImpl/AuditServiceImpl.java @@ -78,6 +78,7 @@ public class AuditServiceImpl implements AuditService { update.setCurrentFreeJune(order.getFreeJune()); //当前六月免费金币 update.setCurrentFreeDecember(order.getFreeDecember()); //当前十二月免费金币 update.setCurrentTaskGold(order.getTaskGold()); //当前任务金币 + update.setRechargeNum(update.getRechargeNum()+1); //充值次数加一 auditMapper.updateUserGold(update); //erp增加充值数据 if(update.getJwcode().equals(94226013)){