diff --git a/src/main/java/com/example/demo/controller/AuditController.java b/src/main/java/com/example/demo/controller/AuditController.java index 349df97..4506952 100644 --- a/src/main/java/com/example/demo/controller/AuditController.java +++ b/src/main/java/com/example/demo/controller/AuditController.java @@ -23,7 +23,7 @@ import org.springframework.web.bind.annotation.*; @RequestMapping("/audit") @RequiredArgsConstructor @Slf4j -@Transactional + @CrossOrigin public class AuditController { diff --git a/src/main/java/com/example/demo/controller/WorkbenchController.java b/src/main/java/com/example/demo/controller/WorkbenchController.java index 5d02ba9..93778f9 100644 --- a/src/main/java/com/example/demo/controller/WorkbenchController.java +++ b/src/main/java/com/example/demo/controller/WorkbenchController.java @@ -61,6 +61,7 @@ public class WorkbenchController { public ResponseEntity updateCard(@RequestBody WorkbenchCard workbench){ statisticsService.runHourlyTaskPart1(); //更新余量数据 statisticsService.runHourlyTaskPart2(); //更新余量外数据 + WorkbenchCard result =workbenchService.getCard(); //获取卡片数据 return ResponseEntity.ok(result); } diff --git a/src/main/java/com/example/demo/mapper/StatisticsMapper.java b/src/main/java/com/example/demo/mapper/StatisticsMapper.java index d54f350..c684fc1 100644 --- a/src/main/java/com/example/demo/mapper/StatisticsMapper.java +++ b/src/main/java/com/example/demo/mapper/StatisticsMapper.java @@ -59,4 +59,5 @@ public interface StatisticsMapper { Statistics selectSumByMarketAndDate(@Param("market") String market, @Param("startDate") Date startDate, @Param("endDate") Date endDate); + } diff --git a/src/main/java/com/example/demo/serviceImpl/StatisticsServiceImpl.java b/src/main/java/com/example/demo/serviceImpl/StatisticsServiceImpl.java index 0cc29bd..47222e8 100644 --- a/src/main/java/com/example/demo/serviceImpl/StatisticsServiceImpl.java +++ b/src/main/java/com/example/demo/serviceImpl/StatisticsServiceImpl.java @@ -141,6 +141,8 @@ public class StatisticsServiceImpl implements StatisticsService { if (!isSameStatisticsPart2(existStats,newStats)){ statisticsMapper.updatePart2(newStats); }else{ + // existStats.setUpdateTime(date); + // statisticsMapper.updatePart2(existStats); System.out.println("数据未发生改变"); } } diff --git a/src/main/resources/mapper/StatisticsMapper.xml b/src/main/resources/mapper/StatisticsMapper.xml index 99398d7..5b2cee6 100644 --- a/src/main/resources/mapper/StatisticsMapper.xml +++ b/src/main/resources/mapper/StatisticsMapper.xml @@ -53,6 +53,9 @@ refund_task = #{refundTask}, recharge_num = #{rechargeNum}, first_recharge = #{firstRecharge} + + ,update_time = #{updateTime} + WHERE market = #{market} and current_datetime = #{currentDatetime} @@ -67,6 +70,7 @@ current_task = #{currentTask} WHERE market = #{market} and current_datetime = #{currentDatetime} +