diff --git a/src/main/java/com/zh/project0512/controller/manage/StatisticsController.java b/src/main/java/com/zh/project0512/controller/manage/StatisticsController.java index 9871d4c..5310cfa 100644 --- a/src/main/java/com/zh/project0512/controller/manage/StatisticsController.java +++ b/src/main/java/com/zh/project0512/controller/manage/StatisticsController.java @@ -96,8 +96,6 @@ public class StatisticsController { DateTimeFormatter df = DateTimeFormatter.ofPattern("yyyy-MM-dd"); LocalDate dat = LocalDate.parse((CharSequence) first.get("dat"), df); LocalDate dat2 = LocalDate.parse((CharSequence) last.get("dat"), df); - System.out.println(dat + "" + dat2); - System.out.println(ChronoUnit.DAYS.between(dat, dat2)); for (int i = 0; i <= ChronoUnit.DAYS.between(dat, dat2); i++) { LocalDate today = dat.plusDays(i); JSONObject obj = null; diff --git a/src/main/java/com/zh/project0512/controller/manage/VideoController.java b/src/main/java/com/zh/project0512/controller/manage/VideoController.java index 14fc14d..45e5c0d 100644 --- a/src/main/java/com/zh/project0512/controller/manage/VideoController.java +++ b/src/main/java/com/zh/project0512/controller/manage/VideoController.java @@ -7,8 +7,10 @@ import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper; import com.zh.project0512.annotation.AdminCheckAuthorityAnnotation; import com.zh.project0512.annotation.AdminTokenValid; import com.zh.project0512.model.AppMessage; +import com.zh.project0512.model.UserEffectRecords; import com.zh.project0512.model.Video; import com.zh.project0512.model.VideoEffectSetting; +import com.zh.project0512.service.IUserEffectRecordsService; import com.zh.project0512.service.IUserService; import com.zh.project0512.service.IVideoEffectSettingService; import com.zh.project0512.service.IVideoService; @@ -49,6 +51,8 @@ public class VideoController { private IUserService userService; @Autowired private IVideoEffectSettingService videoEffectSettingService; + @Autowired + private IUserEffectRecordsService userEffectRecordsService; @Data static class VParam { @@ -115,10 +119,11 @@ public class VideoController { Integer effectResult = cal(param.getPlayNum(), list.get(0).getEffectTimes()) + cal(param.getCommendNum(), list.get(1).getEffectTimes()) + cal(param.getCollectionNum(), list.get(2).getEffectTimes()) + cal(param.getCommentNum(), list.get(3).getEffectTimes()) + cal(param.getReSendNum(), list.get(4).getEffectTimes()) + cal(param.getRecommendNum(), list.get(5).getEffectTimes()); - jsonObject.put("effectResult",effectResult); + jsonObject.put("effectResult", effectResult); - return Result.success(jsonObject,"计算完成"); + return Result.success(jsonObject, "计算完成"); } + @Operation(summary = "视频审核") @PostMapping("/valid") @Transactional @@ -127,6 +132,7 @@ public class VideoController { public Result valid(@Validated @RequestBody VVParam param) { int id = param.getId(); Video video = videoService.getById(id); + Integer originEffectResult = video.getEffectResult() == null ? 0 : video.getEffectResult(); if (param.getStatus() == 3) { String reason = param.getReason(); if (reason == null) { @@ -135,21 +141,21 @@ public class VideoController { UpdateWrapper