소스 검색

fix(log):修正业务日志标题描述不准确问题

- 统一修正 App 版本管理相关操作的日志标题
- 更新创建方案模块的操作日志标题
- 完善道具管理功能的操作日志描述- 补充新闻分类与新闻信息模块的操作日志标题
- 优化参赛用户记录相关操作的日志标题
- 完善支付订单与道具使用记录模块的日志描述- 更新协议相关模块的操作日志标题- 修正充值商品管理的操作日志描述
- 补充排期配置模块的详细操作日志- 修正赛事模板管理的操作日志标题- 完善用户核销记录与用户申诉模块的日志描述
- 更新头像图片管理相关操作的日志标题- 补充定时任务相关接口的日志注解
- 移除冗余代码逻辑,优化统计服务实现
fugui001 2 달 전
부모
커밋
53a727975d
20개의 변경된 파일73개의 추가작업 그리고 66개의 파일을 삭제
  1. 4 4
      ruoyi-modules/ruoyi-system/src/main/java/org/dromara/business/controller/AppVersionManagementController.java
  2. 1 1
      ruoyi-modules/ruoyi-system/src/main/java/org/dromara/business/controller/BusinessCardToolsController.java
  3. 4 5
      ruoyi-modules/ruoyi-system/src/main/java/org/dromara/business/controller/CreationSchemeController.java
  4. 1 1
      ruoyi-modules/ruoyi-system/src/main/java/org/dromara/business/controller/HandHistoryController.java
  5. 4 4
      ruoyi-modules/ruoyi-system/src/main/java/org/dromara/business/controller/ItemsController.java
  6. 5 0
      ruoyi-modules/ruoyi-system/src/main/java/org/dromara/business/controller/JobController.java
  7. 3 3
      ruoyi-modules/ruoyi-system/src/main/java/org/dromara/business/controller/NewsCategoryController.java
  8. 4 4
      ruoyi-modules/ruoyi-system/src/main/java/org/dromara/business/controller/NewsInfoController.java
  9. 4 4
      ruoyi-modules/ruoyi-system/src/main/java/org/dromara/business/controller/ParticipantsController.java
  10. 4 4
      ruoyi-modules/ruoyi-system/src/main/java/org/dromara/business/controller/PayOrderController.java
  11. 4 4
      ruoyi-modules/ruoyi-system/src/main/java/org/dromara/business/controller/PlayersItemsLogController.java
  12. 4 4
      ruoyi-modules/ruoyi-system/src/main/java/org/dromara/business/controller/PrivacyPolicyController.java
  13. 4 4
      ruoyi-modules/ruoyi-system/src/main/java/org/dromara/business/controller/RechargeProductsController.java
  14. 2 2
      ruoyi-modules/ruoyi-system/src/main/java/org/dromara/business/controller/RewardClaimsController.java
  15. 9 5
      ruoyi-modules/ruoyi-system/src/main/java/org/dromara/business/controller/ScheduleConfigController.java
  16. 4 4
      ruoyi-modules/ruoyi-system/src/main/java/org/dromara/business/controller/TournamentsTemplateController.java
  17. 4 4
      ruoyi-modules/ruoyi-system/src/main/java/org/dromara/business/controller/UserCheckRecordController.java
  18. 4 4
      ruoyi-modules/ruoyi-system/src/main/java/org/dromara/business/controller/UserComplaintsController.java
  19. 4 4
      ruoyi-modules/ruoyi-system/src/main/java/org/dromara/business/controller/UserPicController.java
  20. 0 1
      ruoyi-modules/ruoyi-system/src/main/java/org/dromara/business/service/impl/StatisticsServiceImpl.java

+ 4 - 4
ruoyi-modules/ruoyi-system/src/main/java/org/dromara/business/controller/AppVersionManagementController.java

@@ -49,7 +49,7 @@ public class AppVersionManagementController extends BaseController {
      * 导出App版本管理列表
      */
     @SaCheckPermission("business:versionManagement:export")
-    @Log(title = "App版本管理", businessType = BusinessType.EXPORT)
+    @Log(title = "导出App版本管理", businessType = BusinessType.EXPORT)
     @PostMapping("/export")
     public void export(AppVersionManagementBo bo, HttpServletResponse response) {
         List<AppVersionManagementVo> list = appVersionManagementService.queryList(bo);
@@ -72,7 +72,7 @@ public class AppVersionManagementController extends BaseController {
      * 新增App版本管理
      */
     @SaCheckPermission("business:versionManagement:add")
-    @Log(title = "App版本管理", businessType = BusinessType.INSERT)
+    @Log(title = "新增App版本管理", businessType = BusinessType.INSERT)
     @RepeatSubmit()
     @PostMapping()
     public R<Void> add(@Validated(AddGroup.class) @RequestBody AppVersionManagementBo bo) {
@@ -83,7 +83,7 @@ public class AppVersionManagementController extends BaseController {
      * 修改App版本管理
      */
     @SaCheckPermission("business:versionManagement:edit")
-    @Log(title = "App版本管理", businessType = BusinessType.UPDATE)
+    @Log(title = "修改App版本管理", businessType = BusinessType.UPDATE)
     @RepeatSubmit()
     @PutMapping()
     public R<Void> edit(@Validated(EditGroup.class) @RequestBody AppVersionManagementBo bo) {
@@ -96,7 +96,7 @@ public class AppVersionManagementController extends BaseController {
      * @param ids 主键串
      */
     @SaCheckPermission("business:versionManagement:remove")
-    @Log(title = "App版本管理", businessType = BusinessType.DELETE)
+    @Log(title = "删除App版本管理", businessType = BusinessType.DELETE)
     @DeleteMapping("/{ids}")
     public R<Void> remove(@NotEmpty(message = "主键不能为空")
                           @PathVariable Long[] ids) {

+ 1 - 1
ruoyi-modules/ruoyi-system/src/main/java/org/dromara/business/controller/BusinessCardToolsController.java

@@ -121,7 +121,7 @@ public class BusinessCardToolsController extends BaseController {
     }
 
     @SaCheckPermission("business:cardTools:removeRedisPokerHands")
-    @Log(title = "【请填写功能名称】")
+    @Log(title = "【移除配牌记录】")
     @RepeatSubmit()
     @GetMapping("removeRedisPokerHands")
     public R<Void> updateDelStatus() {

+ 4 - 5
ruoyi-modules/ruoyi-system/src/main/java/org/dromara/business/controller/CreationSchemeController.java

@@ -9,7 +9,6 @@ import cn.dev33.satoken.annotation.SaCheckPermission;
 import org.dromara.business.domain.bo.CreationSchemeBo;
 import org.dromara.business.domain.bo.TournamentsBo;
 import org.dromara.business.domain.vo.CreationSchemeVo;
-import org.dromara.business.domain.vo.TournamentsVo;
 import org.dromara.business.service.ICreationSchemeService;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.validation.annotation.Validated;
@@ -51,7 +50,7 @@ public class CreationSchemeController extends BaseController {
      * 导出创建方案:用于定义排期生成规则模板列表
      */
     @SaCheckPermission("business:scheme:export")
-    @Log(title = "创建方案:用于定义排期生成规则模板", businessType = BusinessType.EXPORT)
+    @Log(title = "导出创建方案:用于定义排期生成规则模板", businessType = BusinessType.EXPORT)
     @PostMapping("/export")
     public void export(CreationSchemeBo bo, HttpServletResponse response) {
         List<CreationSchemeVo> list = creationSchemeService.queryList(bo);
@@ -74,7 +73,7 @@ public class CreationSchemeController extends BaseController {
      * 新增创建方案:用于定义排期生成规则模板
      */
     @SaCheckPermission("business:scheme:add")
-    @Log(title = "创建方案:用于定义排期生成规则模板", businessType = BusinessType.INSERT)
+    @Log(title = "新增创建方案:用于定义排期生成规则模板", businessType = BusinessType.INSERT)
     @RepeatSubmit()
     @PostMapping()
     public R<Void> add(@Validated(AddGroup.class) @RequestBody CreationSchemeBo bo) {
@@ -85,7 +84,7 @@ public class CreationSchemeController extends BaseController {
      * 修改创建方案:用于定义排期生成规则模板
      */
     @SaCheckPermission("business:scheme:edit")
-    @Log(title = "创建方案:用于定义排期生成规则模板", businessType = BusinessType.UPDATE)
+    @Log(title = "修改创建方案:用于定义排期生成规则模板", businessType = BusinessType.UPDATE)
     @RepeatSubmit()
     @PutMapping()
     public R<Void> edit(@Validated(EditGroup.class) @RequestBody CreationSchemeBo bo) {
@@ -98,7 +97,7 @@ public class CreationSchemeController extends BaseController {
      * @param ids 主键串
      */
     @SaCheckPermission("business:scheme:remove")
-    @Log(title = "创建方案:用于定义排期生成规则模板", businessType = BusinessType.DELETE)
+    @Log(title = "删除创建方案:用于定义排期生成规则模板", businessType = BusinessType.DELETE)
     @DeleteMapping("/{ids}")
     public R<Void> remove(@NotEmpty(message = "主键不能为空")
                           @PathVariable Long[] ids) {

+ 1 - 1
ruoyi-modules/ruoyi-system/src/main/java/org/dromara/business/controller/HandHistoryController.java

@@ -49,7 +49,7 @@ public class HandHistoryController extends BaseController {
      * 导出【请填写功能名称】列表
      */
     @SaCheckPermission("business:history:export")
-    @Log(title = "【请填写功能名称】", businessType = BusinessType.EXPORT)
+    @Log(title = "【导出】", businessType = BusinessType.EXPORT)
     @PostMapping("/export")
     public void export(HandHistoryBo bo, HttpServletResponse response) {
         List<HandHistoryVo> list = handHistoryService.queryList(bo);

+ 4 - 4
ruoyi-modules/ruoyi-system/src/main/java/org/dromara/business/controller/ItemsController.java

@@ -49,7 +49,7 @@ public class ItemsController extends BaseController {
      * 导出道具列表
      */
     @SaCheckPermission("business:items:export")
-    @Log(title = "道具", businessType = BusinessType.EXPORT)
+    @Log(title = "导出道具列表", businessType = BusinessType.EXPORT)
     @PostMapping("/export")
     public void export(ItemsBo bo, HttpServletResponse response) {
         List<ItemsVo> list = itemsService.queryList(bo);
@@ -72,7 +72,7 @@ public class ItemsController extends BaseController {
      * 新增道具
      */
     @SaCheckPermission("business:items:add")
-    @Log(title = "道具", businessType = BusinessType.INSERT)
+    @Log(title = "新增道具", businessType = BusinessType.INSERT)
     @RepeatSubmit()
     @PostMapping()
     public R<Void> add(@Validated(AddGroup.class) @RequestBody ItemsBo bo) {
@@ -83,7 +83,7 @@ public class ItemsController extends BaseController {
      * 修改道具
      */
     @SaCheckPermission("business:items:edit")
-    @Log(title = "道具", businessType = BusinessType.UPDATE)
+    @Log(title = "修改道具", businessType = BusinessType.UPDATE)
     @RepeatSubmit()
     @PutMapping()
     public R<Void> edit(@Validated(EditGroup.class) @RequestBody ItemsBo bo) {
@@ -96,7 +96,7 @@ public class ItemsController extends BaseController {
      * @param ids 主键串
      */
     @SaCheckPermission("business:items:remove")
-    @Log(title = "道具", businessType = BusinessType.DELETE)
+    @Log(title = "删除道具", businessType = BusinessType.DELETE)
     @DeleteMapping("/{ids}")
     public R<Void> remove(@NotEmpty(message = "主键不能为空")
                           @PathVariable Long[] ids) {

+ 5 - 0
ruoyi-modules/ruoyi-system/src/main/java/org/dromara/business/controller/JobController.java

@@ -1,5 +1,7 @@
 package org.dromara.business.controller;
 import lombok.RequiredArgsConstructor;
+import org.dromara.common.log.annotation.Log;
+import org.dromara.common.log.enums.BusinessType;
 import org.dromara.common.web.core.BaseController;
 import org.dromara.job.business.ScheduleTask;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -25,6 +27,7 @@ public class JobController extends BaseController {
     /**
      * 生成今日比赛
      */
+    @Log(title = "生成今日比赛", businessType = BusinessType.INSERT)
     @PostMapping("/generateMatchesForToday")
     public void generateMatchesForToday() {
         scheduleTask.generateMatchesForToday();
@@ -33,6 +36,7 @@ public class JobController extends BaseController {
    /**
      * 批量生成比赛 下一周
      */
+    @Log(title = "批量生成比赛-下一周", businessType = BusinessType.INSERT)
     @PostMapping("/generateMatchesForNextWeek")
     public void generateMatchesForNextWeek() {
         scheduleTask.generateMatchesForNextWeek();
@@ -41,6 +45,7 @@ public class JobController extends BaseController {
     /**
      * 批量生成比赛 未来7天
      */
+    @Log(title = "批量生成比赛-未来7天", businessType = BusinessType.INSERT)
     @PostMapping("/generateMatchesForNextSevenDays")
     public void generateMatchesForNextSevenDays() {
         scheduleTask.generateMatchesForNextSevenDays();

+ 3 - 3
ruoyi-modules/ruoyi-system/src/main/java/org/dromara/business/controller/NewsCategoryController.java

@@ -73,7 +73,7 @@ public class NewsCategoryController extends BaseController {
      * 新增新闻分类
      */
     @SaCheckPermission("business:category:add")
-    @Log(title = "新闻分类", businessType = BusinessType.INSERT)
+    @Log(title = "新增新闻分类", businessType = BusinessType.INSERT)
     @RepeatSubmit()
     @PostMapping()
     public R<Void> add(@Validated(AddGroup.class) @RequestBody NewsCategoryBo bo) {
@@ -84,7 +84,7 @@ public class NewsCategoryController extends BaseController {
      * 修改新闻分类
      */
     @SaCheckPermission("business:category:edit")
-    @Log(title = "新闻分类", businessType = BusinessType.UPDATE)
+    @Log(title = "修改新闻分类", businessType = BusinessType.UPDATE)
     @RepeatSubmit()
     @PutMapping()
     public R<Void> edit(@Validated(EditGroup.class) @RequestBody NewsCategoryBo bo) {
@@ -97,7 +97,7 @@ public class NewsCategoryController extends BaseController {
      * @param ids 主键串
      */
     @SaCheckPermission("business:category:remove")
-    @Log(title = "新闻分类", businessType = BusinessType.DELETE)
+    @Log(title = "删除新闻分类", businessType = BusinessType.DELETE)
     @DeleteMapping("/{ids}")
     public R<Void> remove(@NotEmpty(message = "主键不能为空")
                           @PathVariable Long[] ids) {

+ 4 - 4
ruoyi-modules/ruoyi-system/src/main/java/org/dromara/business/controller/NewsInfoController.java

@@ -50,7 +50,7 @@ public class NewsInfoController extends BaseController {
      * 导出新闻信息列表
      */
     @SaCheckPermission("business:info:export")
-    @Log(title = "新闻信息", businessType = BusinessType.EXPORT)
+    @Log(title = "导出新闻信息", businessType = BusinessType.EXPORT)
     @PostMapping("/export")
     public void export(NewsInfoBo bo, HttpServletResponse response) {
         List<NewsInfoVo> list = newsInfoService.queryList(bo);
@@ -73,7 +73,7 @@ public class NewsInfoController extends BaseController {
      * 新增新闻信息
      */
     @SaCheckPermission("business:info:add")
-    @Log(title = "新闻信息", businessType = BusinessType.INSERT)
+    @Log(title = "新增新闻信息", businessType = BusinessType.INSERT)
     @RepeatSubmit()
     @PostMapping()
     public R<Void> add(@Validated(AddGroup.class) @RequestBody NewsInfoBo bo) {
@@ -84,7 +84,7 @@ public class NewsInfoController extends BaseController {
      * 修改新闻信息
      */
     @SaCheckPermission("business:info:edit")
-    @Log(title = "新闻信息", businessType = BusinessType.UPDATE)
+    @Log(title = "修改新闻信息", businessType = BusinessType.UPDATE)
     @RepeatSubmit()
     @PutMapping()
     public R<Void> edit(@Validated(EditGroup.class) @RequestBody NewsInfoBo bo) {
@@ -97,7 +97,7 @@ public class NewsInfoController extends BaseController {
      * @param ids 主键串
      */
     @SaCheckPermission("business:info:remove")
-    @Log(title = "新闻信息", businessType = BusinessType.DELETE)
+    @Log(title = "删除新闻信息", businessType = BusinessType.DELETE)
     @DeleteMapping("/{ids}")
     public R<Void> remove(@NotEmpty(message = "主键不能为空")
                           @PathVariable Long[] ids) {

+ 4 - 4
ruoyi-modules/ruoyi-system/src/main/java/org/dromara/business/controller/ParticipantsController.java

@@ -49,7 +49,7 @@ public class ParticipantsController extends BaseController {
      * 导出【请填写功能名称】列表
      */
     @SaCheckPermission("business:participants:export")
-    @Log(title = "【请填写功能名称】", businessType = BusinessType.EXPORT)
+    @Log(title = "【导出参赛用户记录】", businessType = BusinessType.EXPORT)
     @PostMapping("/export")
     public void export(ParticipantsBo bo, HttpServletResponse response) {
         List<ParticipantsVo> list = participantsService.queryList(bo);
@@ -72,7 +72,7 @@ public class ParticipantsController extends BaseController {
      * 新增【请填写功能名称】
      */
     @SaCheckPermission("business:participants:add")
-    @Log(title = "【请填写功能名称】", businessType = BusinessType.INSERT)
+    @Log(title = "【新增参赛用户记录】", businessType = BusinessType.INSERT)
     @RepeatSubmit()
     @PostMapping()
     public R<Void> add(@Validated(AddGroup.class) @RequestBody ParticipantsBo bo) {
@@ -83,7 +83,7 @@ public class ParticipantsController extends BaseController {
      * 修改【请填写功能名称】
      */
     @SaCheckPermission("business:participants:edit")
-    @Log(title = "【请填写功能名称】", businessType = BusinessType.UPDATE)
+    @Log(title = "【修改参赛用户记录】", businessType = BusinessType.UPDATE)
     @RepeatSubmit()
     @PutMapping()
     public R<Void> edit(@Validated(EditGroup.class) @RequestBody ParticipantsBo bo) {
@@ -96,7 +96,7 @@ public class ParticipantsController extends BaseController {
      * @param ids 主键串
      */
     @SaCheckPermission("business:participants:remove")
-    @Log(title = "【请填写功能名称】", businessType = BusinessType.DELETE)
+    @Log(title = "【删除参赛用户记录】", businessType = BusinessType.DELETE)
     @DeleteMapping("/{ids}")
     public R<Void> remove(@NotEmpty(message = "主键不能为空")
                           @PathVariable Long[] ids) {

+ 4 - 4
ruoyi-modules/ruoyi-system/src/main/java/org/dromara/business/controller/PayOrderController.java

@@ -47,7 +47,7 @@ public class PayOrderController extends BaseController {
      * 导出支付订单列表
      */
     @SaCheckPermission("business:order:export")
-    @Log(title = "充值订单", businessType = BusinessType.EXPORT)
+    @Log(title = "导出充值订单", businessType = BusinessType.EXPORT)
     @PostMapping("/export")
     public void export(PayOrderBo bo, HttpServletResponse response) {
         List<PayOrderVo> list = payOrderService.queryList(bo);
@@ -70,7 +70,7 @@ public class PayOrderController extends BaseController {
      * 新增支付订单
      */
     @SaCheckPermission("business:order:add")
-    @Log(title = "支付订单", businessType = BusinessType.INSERT)
+    @Log(title = "新增支付订单", businessType = BusinessType.INSERT)
     @RepeatSubmit()
     @PostMapping()
     public R<Void> add(@Validated(AddGroup.class) @RequestBody PayOrderBo bo) {
@@ -81,7 +81,7 @@ public class PayOrderController extends BaseController {
      * 修改支付订单
      */
     @SaCheckPermission("business:order:edit")
-    @Log(title = "支付订单", businessType = BusinessType.UPDATE)
+    @Log(title = "修改支付订单", businessType = BusinessType.UPDATE)
     @RepeatSubmit()
     @PutMapping()
     public R<Void> edit(@Validated(EditGroup.class) @RequestBody PayOrderBo bo) {
@@ -94,7 +94,7 @@ public class PayOrderController extends BaseController {
      * @param ids 主键串
      */
     @SaCheckPermission("business:order:remove")
-    @Log(title = "支付订单", businessType = BusinessType.DELETE)
+    @Log(title = "删除支付订单", businessType = BusinessType.DELETE)
     @DeleteMapping("/{ids}")
     public R<Void> remove(@NotEmpty(message = "主键不能为空")
                           @PathVariable Long[] ids) {

+ 4 - 4
ruoyi-modules/ruoyi-system/src/main/java/org/dromara/business/controller/PlayersItemsLogController.java

@@ -49,7 +49,7 @@ public class PlayersItemsLogController extends BaseController {
      * 导出道具使用记录列表
      */
     @SaCheckPermission("business:itemsLog:export")
-    @Log(title = "道具使用记录", businessType = BusinessType.EXPORT)
+    @Log(title = "导出道具使用记录", businessType = BusinessType.EXPORT)
     @PostMapping("/export")
     public void export(PlayersItemsLogBo bo, HttpServletResponse response) {
         List<PlayersItemsLogVo> list = playersItemsLogService.queryList(bo);
@@ -72,7 +72,7 @@ public class PlayersItemsLogController extends BaseController {
      * 新增道具使用记录
      */
     @SaCheckPermission("business:itemsLog:add")
-    @Log(title = "道具使用记录", businessType = BusinessType.INSERT)
+    @Log(title = "新增道具使用记录", businessType = BusinessType.INSERT)
     @RepeatSubmit()
     @PostMapping()
     public R<Void> add(@Validated(AddGroup.class) @RequestBody PlayersItemsLogBo bo) {
@@ -83,7 +83,7 @@ public class PlayersItemsLogController extends BaseController {
      * 修改道具使用记录
      */
     @SaCheckPermission("business:itemsLog:edit")
-    @Log(title = "道具使用记录", businessType = BusinessType.UPDATE)
+    @Log(title = "修改道具使用记录", businessType = BusinessType.UPDATE)
     @RepeatSubmit()
     @PutMapping()
     public R<Void> edit(@Validated(EditGroup.class) @RequestBody PlayersItemsLogBo bo) {
@@ -96,7 +96,7 @@ public class PlayersItemsLogController extends BaseController {
      * @param ids 主键串
      */
     @SaCheckPermission("business:itemsLog:remove")
-    @Log(title = "道具使用记录", businessType = BusinessType.DELETE)
+    @Log(title = "删除道具使用记录", businessType = BusinessType.DELETE)
     @DeleteMapping("/{ids}")
     public R<Void> remove(@NotEmpty(message = "主键不能为空")
                           @PathVariable Long[] ids) {

+ 4 - 4
ruoyi-modules/ruoyi-system/src/main/java/org/dromara/business/controller/PrivacyPolicyController.java

@@ -51,7 +51,7 @@ public class PrivacyPolicyController extends BaseController {
      * 导出隐私声明列表
      */
     @SaCheckPermission("business:policy:export")
-    @Log(title = "隐私声明", businessType = BusinessType.EXPORT)
+    @Log(title = "导出协议相关", businessType = BusinessType.EXPORT)
     @PostMapping("/export")
     public void export(PrivacyPolicyBo bo, HttpServletResponse response) {
         List<PrivacyPolicyVo> list = privacyPolicyService.queryList(bo);
@@ -74,7 +74,7 @@ public class PrivacyPolicyController extends BaseController {
      * 新增隐私声明
      */
     @SaCheckPermission("business:policy:add")
-    @Log(title = "隐私声明", businessType = BusinessType.INSERT)
+    @Log(title = "新增协议相关", businessType = BusinessType.INSERT)
     @RepeatSubmit()
     @PostMapping()
     public R<Void> add(@Validated(AddGroup.class) @RequestBody PrivacyPolicyBo bo) {
@@ -85,7 +85,7 @@ public class PrivacyPolicyController extends BaseController {
      * 修改隐私声明
      */
     @SaCheckPermission("business:policy:edit")
-    @Log(title = "隐私声明", businessType = BusinessType.UPDATE)
+    @Log(title = "修改协议相关", businessType = BusinessType.UPDATE)
     @RepeatSubmit()
     @PutMapping()
     public R<Void> edit(@Validated(EditGroup.class) @RequestBody PrivacyPolicyBo bo) {
@@ -98,7 +98,7 @@ public class PrivacyPolicyController extends BaseController {
      * @param ids 主键串
      */
     @SaCheckPermission("business:policy:remove")
-    @Log(title = "隐私声明", businessType = BusinessType.DELETE)
+    @Log(title = "删除协议相关", businessType = BusinessType.DELETE)
     @DeleteMapping("/{ids}")
     public R<Void> remove(@NotEmpty(message = "主键不能为空")
                           @PathVariable Long[] ids) {

+ 4 - 4
ruoyi-modules/ruoyi-system/src/main/java/org/dromara/business/controller/RechargeProductsController.java

@@ -49,7 +49,7 @@ public class RechargeProductsController extends BaseController {
      * 导出充值商品列表
      */
     @SaCheckPermission("business:products:export")
-    @Log(title = "充值管理项目", businessType = BusinessType.EXPORT)
+    @Log(title = "导出充值管理项目", businessType = BusinessType.EXPORT)
     @PostMapping("/export")
     public void export(RechargeProductsBo bo, HttpServletResponse response) {
         List<RechargeProductsVo> list = rechargeProductsService.queryList(bo);
@@ -72,7 +72,7 @@ public class RechargeProductsController extends BaseController {
      * 新增充值商品
      */
     @SaCheckPermission("business:products:add")
-    @Log(title = "充值商品", businessType = BusinessType.INSERT)
+    @Log(title = "新增充值商品", businessType = BusinessType.INSERT)
     @RepeatSubmit()
     @PostMapping()
     public R<Void> add(@Validated(AddGroup.class) @RequestBody RechargeProductsBo bo) {
@@ -83,7 +83,7 @@ public class RechargeProductsController extends BaseController {
      * 修改充值商品
      */
     @SaCheckPermission("business:products:edit")
-    @Log(title = "充值商品", businessType = BusinessType.UPDATE)
+    @Log(title = "修改充值商品", businessType = BusinessType.UPDATE)
     @RepeatSubmit()
     @PutMapping()
     public R<Void> edit(@Validated(EditGroup.class) @RequestBody RechargeProductsBo bo) {
@@ -96,7 +96,7 @@ public class RechargeProductsController extends BaseController {
      * @param ids 主键串
      */
     @SaCheckPermission("business:products:remove")
-    @Log(title = "充值商品", businessType = BusinessType.DELETE)
+    @Log(title = "删除充值商品", businessType = BusinessType.DELETE)
     @DeleteMapping("/{ids}")
     public R<Void> remove(@NotEmpty(message = "主键不能为空")
                           @PathVariable Long[] ids) {

+ 2 - 2
ruoyi-modules/ruoyi-system/src/main/java/org/dromara/business/controller/RewardClaimsController.java

@@ -97,7 +97,7 @@ public class RewardClaimsController extends BaseController {
      * @param ids 主键串
      */
     @SaCheckPermission("business:claims:remove")
-    @Log(title = "用户参赛", businessType = BusinessType.DELETE)
+    @Log(title = "删除用户参赛", businessType = BusinessType.DELETE)
     @DeleteMapping("/{ids}")
     public R<Void> remove(@NotEmpty(message = "主键不能为空")
                           @PathVariable Long[] ids) {
@@ -107,7 +107,7 @@ public class RewardClaimsController extends BaseController {
 
 
     @SaCheckPermission("business:claims:remove")
-    @Log(title = "移除", businessType = BusinessType.INSERT)
+    @Log(title = "移除审核奖励", businessType = BusinessType.INSERT)
     @RepeatSubmit()
     @PostMapping("/deleteByCriteria")
     public R<Void> deleteByCriteria(@RequestBody RewardClaimsBo bo) {

+ 9 - 5
ruoyi-modules/ruoyi-system/src/main/java/org/dromara/business/controller/ScheduleConfigController.java

@@ -65,7 +65,7 @@ public class ScheduleConfigController extends BaseController {
      * 导出排期配置:用于保存具体的排期实例配置列表
      */
     @SaCheckPermission("business:config:export")
-    @Log(title = "排期配置:用于保存具体的排期实例配置", businessType = BusinessType.EXPORT)
+    @Log(title = "导出排期配置:用于保存具体的排期实例配置", businessType = BusinessType.EXPORT)
     @PostMapping("/export")
     public void export(ScheduleConfigBo bo, HttpServletResponse response) {
         List<ScheduleConfigVo> list = scheduleConfigService.queryList(bo);
@@ -88,7 +88,7 @@ public class ScheduleConfigController extends BaseController {
      * 新增排期配置:用于保存具体的排期实例配置
      */
     @SaCheckPermission("business:config:add")
-    @Log(title = "排期配置:用于保存具体的排期实例配置", businessType = BusinessType.INSERT)
+    @Log(title = "新增排期配置:用于保存具体的排期实例配置", businessType = BusinessType.INSERT)
     @RepeatSubmit()
     @PostMapping()
     public R<Void> add(@Validated(AddGroup.class) @RequestBody ScheduleConfigBo bo) {
@@ -99,7 +99,7 @@ public class ScheduleConfigController extends BaseController {
      * 修改排期配置:用于保存具体的排期实例配置
      */
     @SaCheckPermission("business:config:edit")
-    @Log(title = "排期配置:用于保存具体的排期实例配置", businessType = BusinessType.UPDATE)
+    @Log(title = "修改排期配置:用于保存具体的排期实例配置", businessType = BusinessType.UPDATE)
     @RepeatSubmit()
     @PutMapping()
     public R<Void> edit(@Validated(EditGroup.class) @RequestBody ScheduleConfigBo bo) {
@@ -112,7 +112,7 @@ public class ScheduleConfigController extends BaseController {
      * @param ids 主键串
      */
     @SaCheckPermission("business:config:remove")
-    @Log(title = "排期配置:用于保存具体的排期实例配置", businessType = BusinessType.DELETE)
+    @Log(title = "删除排期配置:用于保存具体的排期实例配置", businessType = BusinessType.DELETE)
     @DeleteMapping("/{ids}")
     public R<Void> remove(@NotEmpty(message = "主键不能为空")
                           @PathVariable Long[] ids) {
@@ -120,6 +120,7 @@ public class ScheduleConfigController extends BaseController {
     }
 
 
+    @Log(title = "创建排期配置:用于保存具体的排期实例配置", businessType = BusinessType.INSERT)
     @PostMapping("/createSchedule")
     public R<String> createSchedule(@Valid @RequestBody ScheduleConfigRequestBo request) {
         // 🌟 1. 记录请求进入(建议用 MDC 添加 traceId)
@@ -144,6 +145,7 @@ public class ScheduleConfigController extends BaseController {
         }
      }
 
+    @Log(title = "修改排期配置:用于保存具体的排期实例配置", businessType = BusinessType.UPDATE)
     @PostMapping("/updateScheduleConfig")
     public R<String> updateScheduleConfig(@Valid @RequestBody ScheduleConfigRequestBo request) {
         // 🌟 1. 记录请求进入(建议用 MDC 添加 traceId)
@@ -168,18 +170,20 @@ public class ScheduleConfigController extends BaseController {
         }
     }
 
+    @Log(title = "删除排期配置:用于保存具体的排期实例配置", businessType = BusinessType.DELETE)
     @DeleteMapping("/deleteScheduleConfig/{id}")
     public R<String> deleteScheduleConfig(@NotNull(message = "主键不能为空")
                                     @PathVariable Long id) {
         return scheduleConfigService.deleteScheduleConfig(id);
     }
 
+    @Log(title = "停止排期配置:用于保存具体的排期实例配置", businessType = BusinessType.UPDATE)
     @PostMapping("/stopScheduleConfig/{id}")
     public R<Void> stopScheduleConfig(@PathVariable Long id) {
         return toAjax(scheduleConfigService.stopScheduleConfig(id,0));
     }
 
-
+    @Log(title = "开始排期配置:用于保存具体的排期实例配置", businessType = BusinessType.UPDATE)
     @PostMapping("/startScheduleConfig/{id}")
     public R<Void> startScheduleConfig(@PathVariable Long id) {
         return toAjax(scheduleConfigService.stopScheduleConfig(id,1));

+ 4 - 4
ruoyi-modules/ruoyi-system/src/main/java/org/dromara/business/controller/TournamentsTemplateController.java

@@ -57,7 +57,7 @@ public class TournamentsTemplateController extends BaseController {
      * 导出【赛事管理】列表
      */
     @SaCheckPermission("business:tournamentsTemplate:export")
-    @Log(title = "【赛事管理-导出】", businessType = BusinessType.EXPORT)
+    @Log(title = "【模版赛事管理-导出】", businessType = BusinessType.EXPORT)
     @PostMapping("/export")
     public void export(TournamentsBo bo, HttpServletResponse response) {
         List<TournamentsVo> list = tournamentsService.queryList(bo);
@@ -82,7 +82,7 @@ public class TournamentsTemplateController extends BaseController {
      * 新增【赛事管理】
      */
     @SaCheckPermission("business:tournamentsTemplate:add")
-    @Log(title = "【赛事管理-新增】", businessType = BusinessType.INSERT)
+    @Log(title = "【模版赛事管理-新增】", businessType = BusinessType.INSERT)
     @RepeatSubmit()
     @PostMapping()
     public R<Void> add(@Validated(AddGroup.class) @RequestBody  TournamentsDto dto) {
@@ -93,7 +93,7 @@ public class TournamentsTemplateController extends BaseController {
      * 修改【赛事管理】
      */
     @SaCheckPermission("business:tournamentsTemplate:edit")
-    @Log(title = "【赛事管理-修改】", businessType = BusinessType.UPDATE)
+    @Log(title = "【模版赛事管理-修改】", businessType = BusinessType.UPDATE)
     @RepeatSubmit()
     @PutMapping()
     public R<Void> edit(@Validated(EditGroup.class) @RequestBody  TournamentsDto bo) {
@@ -106,7 +106,7 @@ public class TournamentsTemplateController extends BaseController {
      * @param ids 主键串
      */
     @SaCheckPermission("business:tournamentsTemplate:remove")
-    @Log(title = "【赛事管理-删除】", businessType = BusinessType.DELETE)
+    @Log(title = "【模版赛事管理-删除】", businessType = BusinessType.DELETE)
     @DeleteMapping("/{ids}")
     public R<Void> remove(@NotEmpty(message = "主键不能为空")
                           @PathVariable Long[] ids) {

+ 4 - 4
ruoyi-modules/ruoyi-system/src/main/java/org/dromara/business/controller/UserCheckRecordController.java

@@ -50,7 +50,7 @@ public class UserCheckRecordController extends BaseController {
      * 导出用户核销记录列表
      */
     @SaCheckPermission("business:checkRecord:export")
-    @Log(title = "用户核销记录", businessType = BusinessType.EXPORT)
+    @Log(title = "导出用户核销记录", businessType = BusinessType.EXPORT)
     @PostMapping("/export")
     public void export(UserCheckRecordBo bo, HttpServletResponse response) {
         List<UserCheckRecordVo> list = userCheckRecordService.queryList(bo);
@@ -73,7 +73,7 @@ public class UserCheckRecordController extends BaseController {
      * 新增用户核销记录
      */
     @SaCheckPermission("business:checkRecord:add")
-    @Log(title = "用户核销记录", businessType = BusinessType.INSERT)
+    @Log(title = "新增用户核销记录", businessType = BusinessType.INSERT)
     @RepeatSubmit()
     @PostMapping()
     public R<Void> add(@Validated(AddGroup.class) @RequestBody UserCheckRecordBo bo) {
@@ -84,7 +84,7 @@ public class UserCheckRecordController extends BaseController {
      * 修改用户核销记录
      */
     @SaCheckPermission("business:checkRecord:edit")
-    @Log(title = "用户核销记录", businessType = BusinessType.UPDATE)
+    @Log(title = "修改用户核销记录", businessType = BusinessType.UPDATE)
     @RepeatSubmit()
     @PutMapping()
     public R<Void> edit(@Validated(EditGroup.class) @RequestBody UserCheckRecordBo bo) {
@@ -97,7 +97,7 @@ public class UserCheckRecordController extends BaseController {
      * @param ids 主键串
      */
     @SaCheckPermission("business:checkRecord:remove")
-    @Log(title = "用户核销记录", businessType = BusinessType.DELETE)
+    @Log(title = "删除用户核销记录", businessType = BusinessType.DELETE)
     @DeleteMapping("/{ids}")
     public R<Void> remove(@NotEmpty(message = "主键不能为空")
                           @PathVariable Long[] ids) {

+ 4 - 4
ruoyi-modules/ruoyi-system/src/main/java/org/dromara/business/controller/UserComplaintsController.java

@@ -50,7 +50,7 @@ public class UserComplaintsController extends BaseController {
      * 导出用户申诉列表
      */
     @SaCheckPermission("business:complaints:export")
-    @Log(title = "用户申诉", businessType = BusinessType.EXPORT)
+    @Log(title = "导出用户申诉", businessType = BusinessType.EXPORT)
     @PostMapping("/export")
     public void export(UserComplaintsBo bo, HttpServletResponse response) {
         List<UserComplaintsVo> list = userComplaintsService.queryList(bo);
@@ -73,7 +73,7 @@ public class UserComplaintsController extends BaseController {
      * 新增用户申诉
      */
     @SaCheckPermission("business:complaints:add")
-    @Log(title = "用户申诉", businessType = BusinessType.INSERT)
+    @Log(title = "新增用户申诉", businessType = BusinessType.INSERT)
     @RepeatSubmit()
     @PostMapping()
     public R<Void> add(@Validated(AddGroup.class) @RequestBody UserComplaintsBo bo) {
@@ -84,7 +84,7 @@ public class UserComplaintsController extends BaseController {
      * 修改用户申诉
      */
     @SaCheckPermission("business:complaints:edit")
-    @Log(title = "用户申诉", businessType = BusinessType.UPDATE)
+    @Log(title = "修改用户申诉", businessType = BusinessType.UPDATE)
     @RepeatSubmit()
     @PutMapping()
     public R<Void> edit(@Validated(EditGroup.class) @RequestBody UserComplaintsBo bo) {
@@ -97,7 +97,7 @@ public class UserComplaintsController extends BaseController {
      * @param ids 主键串
      */
     @SaCheckPermission("business:complaints:remove")
-    @Log(title = "用户申诉", businessType = BusinessType.DELETE)
+    @Log(title = "删除用户申诉", businessType = BusinessType.DELETE)
     @DeleteMapping("/{ids}")
     public R<Void> remove(@NotEmpty(message = "主键不能为空")
                           @PathVariable Long[] ids) {

+ 4 - 4
ruoyi-modules/ruoyi-system/src/main/java/org/dromara/business/controller/UserPicController.java

@@ -49,7 +49,7 @@ public class UserPicController extends BaseController {
      * 导出【请填写功能名称】列表
      */
     @SaCheckPermission("business:pic:export")
-    @Log(title = "【请填写功能名称】", businessType = BusinessType.EXPORT)
+    @Log(title = "【导出头像图片】", businessType = BusinessType.EXPORT)
     @PostMapping("/export")
     public void export(UserPicBo bo, HttpServletResponse response) {
         List<UserPicVo> list = userPicService.queryList(bo);
@@ -72,7 +72,7 @@ public class UserPicController extends BaseController {
      * 新增【请填写功能名称】
      */
     @SaCheckPermission("business:pic:add")
-    @Log(title = "【请填写功能名称】", businessType = BusinessType.INSERT)
+    @Log(title = "【新增头像图片】", businessType = BusinessType.INSERT)
     @RepeatSubmit()
     @PostMapping()
     public R<Void> add(@Validated(AddGroup.class) @RequestBody UserPicBo bo) {
@@ -83,7 +83,7 @@ public class UserPicController extends BaseController {
      * 修改【请填写功能名称】
      */
     @SaCheckPermission("business:pic:edit")
-    @Log(title = "【请填写功能名称】", businessType = BusinessType.UPDATE)
+    @Log(title = "【修改头像图片】", businessType = BusinessType.UPDATE)
     @RepeatSubmit()
     @PutMapping()
     public R<Void> edit(@Validated(EditGroup.class) @RequestBody UserPicBo bo) {
@@ -96,7 +96,7 @@ public class UserPicController extends BaseController {
      * @param ids 主键串
      */
     @SaCheckPermission("business:pic:remove")
-    @Log(title = "【请填写功能名称】", businessType = BusinessType.DELETE)
+    @Log(title = "【删除头像图片】", businessType = BusinessType.DELETE)
     @DeleteMapping("/{ids}")
     public R<Void> remove(@NotEmpty(message = "主键不能为空")
                           @PathVariable Long[] ids) {

+ 0 - 1
ruoyi-modules/ruoyi-system/src/main/java/org/dromara/business/service/impl/StatisticsServiceImpl.java

@@ -78,7 +78,6 @@ public class StatisticsServiceImpl implements IStatisticsService {
         if(flagType.equals("day") || flagType.equals("week") || flagType.equals("month") || flagType.equals("three")){
             startDate = DateTimeRangeUtils.getStartString(flagType);
             endDate = DateTimeRangeUtils.getEndString(flagType);
-            flag=false;
         } else {
             startDate = startTime;
             endDate = endTime;