Merge branch 'master' of http://111.203.232.171:8888/lee/chnmuseum-party into master

src/main/java/cn/wisenergy/chnmuseum/party/common/log/SystemOperationLogService.java

@@ -2,17 +2,17 @@ package cn.wisenergy.chnmuseum.party.common.log;
 
 
 import cn.wisenergy.chnmuseum.party.auth.util.JwtTokenUtil;
-import cn.wisenergy.chnmuseum.party.common.enums.AuditStatusEnum;
-import cn.wisenergy.chnmuseum.party.common.enums.AuditTypeEnum;
-import cn.wisenergy.chnmuseum.party.common.enums.RESPONSE_CODE_ENUM;
-import cn.wisenergy.chnmuseum.party.common.enums.RESULT_INFO_ENUM;
+import cn.wisenergy.chnmuseum.party.common.enums.*;
 import cn.wisenergy.chnmuseum.party.common.util.DateUtil80;
 import cn.wisenergy.chnmuseum.party.common.vo.AuditStatusParam;
+import cn.wisenergy.chnmuseum.party.common.vo.GenericPageParam;
 import cn.wisenergy.chnmuseum.party.core.annotations.OperationLog;
 import cn.wisenergy.chnmuseum.party.mapper.SysLogMapper;
 import cn.wisenergy.chnmuseum.party.model.*;
+import cn.wisenergy.chnmuseum.party.service.CopyrightOwnerService;
 import cn.wisenergy.chnmuseum.party.service.TOperationLogService;
 import cn.wisenergy.chnmuseum.party.service.impl.AuditServiceImpl;
+import cn.wisenergy.chnmuseum.party.service.impl.CopyrightOwnerServiceImpl;
 import cn.wisenergy.chnmuseum.party.service.impl.TUserServiceImpl;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import javassist.util.HotSwapper;
@@ -42,6 +42,8 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
+import static cn.wisenergy.chnmuseum.party.common.enums.CopyrightOwnerTypeEnum.*;
+
 
 @Service
 @Aspect
@@ -57,6 +59,9 @@ class SystemOperationLogService extends ServiceImpl<SysLogMapper, SysLog> {
     @Autowired
     private AuditServiceImpl auditService;
 
+    @Autowired
+    private CopyrightOwnerServiceImpl copyrightOwnerService;
+
     @Autowired
     private TOperationLogService operationLogService;
 
@@ -150,7 +155,7 @@ class SystemOperationLogService extends ServiceImpl<SysLogMapper, SysLog> {
 //        sysLog.setOperationContent(methodName);
         sysLog.setOperationTime(DateUtil80.getDateTimeOfTimestamp(System.currentTimeMillis()));
         // 处理设置注解上的参数
-        getControllerMethodDescription(user,methodLog, sysLog,method_param);
+        getControllerMethodDescription(user, methodLog, sysLog, method_param);
 
         int insert = sysLogMapper.insert(sysLog);
         return object;
@@ -163,7 +168,7 @@ class SystemOperationLogService extends ServiceImpl<SysLogMapper, SysLog> {
      * @param
      * @throws Exception
      */
-    public void getControllerMethodDescription(TUser user,MethodLog methodLog, SysLog sysLog,Object[] method_param) throws Exception {
+    public void getControllerMethodDescription(TUser user, MethodLog methodLog, SysLog sysLog, Object[] method_param) throws Exception {
         // 设置action动作
         sysLog.setOperationType(methodLog.operType().getMsg());
         sysLog.setOperationContent(methodLog.operType().getMsg());
@@ -174,17 +179,17 @@ class SystemOperationLogService extends ServiceImpl<SysLogMapper, SysLog> {
             String type = null;
             if (methodLog.operType().getCode() == OperType.ADD.getCode() || methodLog.operType().getCode() == OperType.UPDATE.getCode()) {
                 u = (TUser) method_param[0];
-                type=u.getType();
+                type = u.getType();
             } else if (methodLog.operType().getCode() == OperType.CHANGE_PASSWORD.getCode()) {
                 u = user;
-                type=u.getType();
+                type = u.getType();
             } else if (methodLog.operType().getCode() == OperType.SELECT.getCode()) {
                 String s = (String) method_param[0];
-                type=s;
-            }else {
+                type = s;
+            } else {
                 String s = (String) method_param[0];
                 u = userService.getById(s);
-                type=u.getType();
+                type = u.getType();
             }
             switch (type) {
                 case "1":
@@ -213,10 +218,10 @@ class SystemOperationLogService extends ServiceImpl<SysLogMapper, SysLog> {
                 AuditStatusParam auditStatusParam = (AuditStatusParam) method_param[0];
                 Audit byId = auditService.getById(auditStatusParam.getId());
                 type = byId.getType();
-                status=auditStatusParam.getStatus();
-                if (AuditStatusEnum.REFUSED.name().equals(status)){
+                status = auditStatusParam.getStatus();
+                if (AuditStatusEnum.REFUSED.name().equals(status)) {
                     sysLog.setOperationContent(AuditStatusEnum.REFUSED.getMsg());
-                }else {
+                } else {
                     sysLog.setOperationContent(AuditStatusEnum.APPROVED_FINAL.getMsg());
                 }
             } else if (methodLog.operType().getCode() == OperType.DETAILS.getCode()) {
@@ -231,13 +236,59 @@ class SystemOperationLogService extends ServiceImpl<SysLogMapper, SysLog> {
             } else if (AuditTypeEnum.VIDEO_CONTENT.name().equals(type)) {
                 sysLog.setOperationObject(OperModule.CHECKVIDEO.getMsg());
             }
-        }else if(methodLog.operModule().getCode() == OperModule.STBOPERATION.getCode()&&methodLog.operType().getCode()==OperType.ACTIVATION.getCode()){
+        } else if (methodLog.operModule().getCode() == OperModule.STBOPERATION.getCode() && methodLog.operType().getCode() == OperType.ACTIVATION.getCode()) {
             TBoxOperation o = (TBoxOperation) method_param[0];
-            if (o.getStatus()==2){
+            if (o.getStatus() == 2) {
                 sysLog.setOperationType(OperType.ACTIVATION.getMsg());
-            }else {
+            } else {
                 sysLog.setOperationType(OperType.FAULT.getMsg());
             }
+        } else if (methodLog.operModule().getCode() == OperModule.LEARNCONTENT.getCode() && methodLog.operType().getCode() == OperType.ENABLE.getCode()) {
+            Boolean o = (Boolean) method_param[1];
+            if (o) {
+                sysLog.setOperationType(OperType.ENABLE.getMsg());
+            } else {
+                sysLog.setOperationType(OperType.DISABLE.getMsg());
+            }
+        } else if (methodLog.operModule().getCode() == OperModule.DISPLAYCONTENT.getCode() && methodLog.operType().getCode() == OperType.UPDATE.getCode()) {
+            Boolean o = (Boolean) method_param[1];
+            if (o) {
+                sysLog.setOperationType(OperType.UPDATE.getMsg());
+            } else {
+                sysLog.setOperationType(OperType.LOWER.getMsg());
+            }
+
+        }  else if (methodLog.operModule().getCode() == OperModule.VIDEOCOPYRIGHT.getCode()) {
+            GenericPageParam g = (GenericPageParam) method_param[0];
+            if (VIDEO_CONTENT.name().equals(g.getOwnerType())) {
+                sysLog.setOperationObject(OperModule.VIDEOCOPYRIGHT.getMsg());
+            } else {
+                sysLog.setOperationObject(OperModule.DISPLAYCOPYRIGHT.getMsg());
+            }
+
+        } else if (methodLog.operModule().getCode() == OperModule.DISPLAYCOPYRIGHT.getCode()) {
+            CopyrightOwner c = null;
+            String type = null;
+            if (methodLog.operType().getCode() == OperType.ADD.getCode() || methodLog.operType().getCode() == OperType.UPDATE.getCode()) {
+                c = (CopyrightOwner) method_param[0];
+                type = c.getOwnerType();
+            } else if (methodLog.operType().getCode() == OperType.DETAILS.getCode() || methodLog.operType().getCode() == OperType.DELETE.getCode()) {
+                String id = (String) method_param[0];
+                CopyrightOwner byId = copyrightOwnerService.getById(id);
+                type = byId.getOwnerType();
+            } else if (methodLog.operType().getCode() == OperType.SELECT.getCode()) {
+                CopyrightOwnerTypeEnum s = (CopyrightOwnerTypeEnum) method_param[0];
+                type = s.name();
+            }
+            switch (type) {
+                case "EXHIBITION_BOARD":
+                    // 设置标题
+                    sysLog.setOperationObject(OperModule.DISPLAYCOPYRIGHT.getMsg());
+                    break;
+                case "VIDEO_CONTENT":
+                    sysLog.setOperationObject(OperModule.VIDEOCOPYRIGHT.getMsg());
+                    break;
+            }
         }
 
     }

src/main/java/cn/wisenergy/chnmuseum/party/web/controller/AssetController.java

@@ -4,6 +4,9 @@ import cn.hutool.core.io.IoUtil;
 import cn.hutool.core.util.RandomUtil;
 import cn.hutool.core.util.ZipUtil;
 import cn.wisenergy.chnmuseum.party.common.dfs.FastDFSUtils;
+import cn.wisenergy.chnmuseum.party.common.log.MethodLog;
+import cn.wisenergy.chnmuseum.party.common.log.OperModule;
+import cn.wisenergy.chnmuseum.party.common.log.OperType;
 import cn.wisenergy.chnmuseum.party.common.util.RSAUtils;
 import cn.wisenergy.chnmuseum.party.common.video.VideoEncryptUtil;
 import cn.wisenergy.chnmuseum.party.common.vo.GenericPageParam;
@@ -74,6 +77,7 @@ public class AssetController extends BaseController {
     @PostMapping("/getPageList")
     @RequiresAuthentication  //@RequiresPermissions("asset:page")
     @ApiOperation(value = "获取视频汇出分页列表", notes = "获取视频汇出分页列表")
+    @MethodLog(operModule = OperModule.VIDEOREMIT, operType = OperType.SELECT)
     public Map<String, Object> getAssetPageList(GenericPageParam genericPageParam,
                                                 @RequestParam(value = "videoContentCatId", required = false) String videoContentCatId,
                                                 @RequestParam(value = "videoContentCopyrightOwnerId", required = false) String videoContentCopyrightOwnerId) {
@@ -94,6 +98,7 @@ public class AssetController extends BaseController {
     })
     @GetMapping("/get/{id}")
     @RequiresAuthentication  //@RequiresPermissions("asset:get:id")
+    @MethodLog(operModule = OperModule.VIDEOREMIT, operType = OperType.SELECT)
     public Map<String, Object> getById(@PathVariable("id") String id) {
         Asset asset = assetService.getById(id);
         return getResult(asset);
@@ -105,6 +110,7 @@ public class AssetController extends BaseController {
     })
     @PostMapping("/download")
     @RequiresAuthentication
+    @MethodLog(operModule = OperModule.VIDEOREMIT, operType = OperType.VIDEO_EXPORT)
     public void download(@RequestParam("idList") List<String> idList, HttpServletResponse response) throws IOException {
         response.setContentType(MediaType.APPLICATION_OCTET_STREAM_VALUE);
         response.addHeader(HttpHeaders.CONTENT_DISPOSITION, "attachment; filename=" + URLEncoder.encode("video.zip", "UTF-8"));

src/main/java/cn/wisenergy/chnmuseum/party/web/controller/CopyrightOwnerController.java

 package cn.wisenergy.chnmuseum.party.web.controller;
 
 import cn.wisenergy.chnmuseum.party.common.enums.CopyrightOwnerTypeEnum;
+import cn.wisenergy.chnmuseum.party.common.log.MethodLog;
+import cn.wisenergy.chnmuseum.party.common.log.OperModule;
+import cn.wisenergy.chnmuseum.party.common.log.OperType;
 import cn.wisenergy.chnmuseum.party.common.util.TimeUtils;
 import cn.wisenergy.chnmuseum.party.common.validator.groups.Add;
 import cn.wisenergy.chnmuseum.party.common.validator.groups.Update;
@@ -66,6 +69,7 @@ public class CopyrightOwnerController extends BaseController {
     @PostMapping("/save")
     @RequiresAuthentication  //@RequiresPermissions("copyright:owner:save")
     @ApiOperation(value = "添加版权方", notes = "添加版权方")
+    @MethodLog(operModule = OperModule.DISPLAYCOPYRIGHT, operType = OperType.ADD)
     public Map<String, Object> saveCopyrightOwner(@Validated(value = {Add.class}) CopyrightOwner copyrightOwner) {
         // 保存业务节点信息
         boolean result = copyrightOwnerService.save(copyrightOwner);
@@ -106,6 +110,7 @@ public class CopyrightOwnerController extends BaseController {
     @PutMapping("/update")
     @RequiresAuthentication  //@RequiresPermissions("copyright:owner:update")
     @ApiOperation(value = "修改版权方信息", notes = "修改版权方信息")
+    @MethodLog(operModule = OperModule.DISPLAYCOPYRIGHT, operType = OperType.UPDATE)
     public Map<String, Object> updateCopyrightOwner(@Validated(value = {Update.class}) CopyrightOwner copyrightOwner) {
         boolean flag = copyrightOwnerService.updateById(copyrightOwner);
 
@@ -151,6 +156,7 @@ public class CopyrightOwnerController extends BaseController {
     @GetMapping("/getList")
     @RequiresAuthentication  //@RequiresPermissions("copyright:owner:list")
     @ApiOperation(value = "获取版权方全部列表(无分页)", notes = "获取版权方全部列表(无分页)")
+    @MethodLog(operModule = OperModule.DISPLAYCOPYRIGHT, operType = OperType.SELECT)
     public Map<String, Object> getCopyrightOwnerList(@RequestParam("copyrightOwnerType") CopyrightOwnerTypeEnum copyrightOwnerTypeEnum) {
         LambdaQueryWrapper<CopyrightOwner> lambdaQueryWrapper = Wrappers.<CopyrightOwner>lambdaQuery().eq(CopyrightOwner::getOwnerType, copyrightOwnerTypeEnum.name());
         lambdaQueryWrapper.le(CopyrightOwner::getExpireDateStart, TimeUtils.getDateTimeOfTimestamp(System.currentTimeMillis())).ge(CopyrightOwner::getExpireDateEnd, TimeUtils.getDateTimeOfTimestamp(System.currentTimeMillis()));
@@ -170,6 +176,7 @@ public class CopyrightOwnerController extends BaseController {
     @PostMapping("/getPageList")
     @RequiresAuthentication  //@RequiresPermissions("copyright:owner:page")
     @ApiOperation(value = "获取版权方分页列表", notes = "获取版权方分页列表")
+    @MethodLog(operModule = OperModule.VIDEOCOPYRIGHT, operType = OperType.SELECT)
     public Map<String, Object> getCopyrightOwnerPageList(GenericPageParam genericPageParam) {
         LambdaQueryWrapper<CopyrightOwner> queryWrapper = new LambdaQueryWrapper<>();
         queryWrapper.eq(CopyrightOwner::getOwnerType, genericPageParam.getOwnerType());
@@ -223,6 +230,7 @@ public class CopyrightOwnerController extends BaseController {
     })
     @GetMapping("/get/{id}")
     @RequiresAuthentication  //@RequiresPermissions("copyright:owner:get:id")
+    @MethodLog(operModule = OperModule.DISPLAYCOPYRIGHT, operType = OperType.DETAILS)
     public Map<String, Object> getById(@PathVariable("id") String id) {
         CopyrightOwner copyrightOwner = copyrightOwnerService.getById(id);
         String ownerType = copyrightOwner.getOwnerType();
@@ -261,6 +269,7 @@ public class CopyrightOwnerController extends BaseController {
     @ApiImplicitParams(value = {
             @ApiImplicitParam(name = "id", value = "标识ID", paramType = "path", dataType = "String")
     })
+    @MethodLog(operModule = OperModule.DISPLAYCOPYRIGHT, operType = OperType.DELETE)
     public Map<String, Object> deleteCopyrightOwner(@PathVariable("id") String id) {
         this.copyrightOwnerService.removeById(id);
 

src/main/java/cn/wisenergy/chnmuseum/party/web/controller/ExhibitionBoardCatController.java

 package cn.wisenergy.chnmuseum.party.web.controller;
 
 import cn.wisenergy.chnmuseum.party.common.enums.AuditStatusEnum;
+import cn.wisenergy.chnmuseum.party.common.log.MethodLog;
+import cn.wisenergy.chnmuseum.party.common.log.OperModule;
+import cn.wisenergy.chnmuseum.party.common.log.OperType;
 import cn.wisenergy.chnmuseum.party.common.validator.groups.Add;
 import cn.wisenergy.chnmuseum.party.common.validator.groups.Update;
 import cn.wisenergy.chnmuseum.party.common.vo.GenericPageParam;
@@ -61,6 +64,7 @@ public class ExhibitionBoardCatController extends BaseController {
     @PostMapping("/save")
     @RequiresAuthentication  //@RequiresPermissions("exhibition:board:cat:save")
     @ApiOperation(value = "添加展板分类", notes = "添加展板分类")
+    @MethodLog(operModule = OperModule.DISPLAYCLASSIFY, operType = OperType.ADD)
     public Map<String, Object> saveExhibitionBoardCat(@Validated(value = {Add.class}) ExhibitionBoardCat exhibitionBoardCat) {
         // 保存业务节点信息
         boolean result = exhibitionBoardCatService.save(exhibitionBoardCat);
@@ -76,6 +80,7 @@ public class ExhibitionBoardCatController extends BaseController {
     @PutMapping("/update")
     @RequiresAuthentication  //@RequiresPermissions("exhibition:board:cat:update")
     @ApiOperation(value = "修改展板分类信息", notes = "修改展板分类信息")
+    @MethodLog(operModule = OperModule.DISPLAYCLASSIFY, operType = OperType.UPDATE)
     public Map<String, Object> updateExhibitionBoardCat(@Validated(value = {Update.class}) ExhibitionBoardCat exhibitionBoardCat) {
         boolean flag = exhibitionBoardCatService.updateById(exhibitionBoardCat);
         if (flag) {
@@ -91,6 +96,7 @@ public class ExhibitionBoardCatController extends BaseController {
             @ApiImplicitParam(name = "id", value = "标识ID", dataType = "String", paramType = "path"),
             @ApiImplicitParam(name = "status", value = "状态", paramType = "query", dataType = "String")
     })
+    @MethodLog(operModule = OperModule.DISPLAYCLASSIFY, operType = OperType.SELECT)
     public Map<String, Object> updateStatus(@NotNull(message = "展板分类ID不能为空") @PathVariable("id") String id, @RequestParam("auditStatus") AuditStatusEnum status) {
         UpdateWrapper<ExhibitionBoardCat> updateWrapper = new UpdateWrapper<>();
         updateWrapper.eq("id", id);
@@ -108,6 +114,7 @@ public class ExhibitionBoardCatController extends BaseController {
     @ApiImplicitParams(value = {
             @ApiImplicitParam(name = "id", value = "标识ID", paramType = "path", dataType = "String")
     })
+    @MethodLog(operModule = OperModule.DISPLAYCLASSIFY, operType = OperType.DELETE)
     public Map<String, Object> deleteExhibitionBoardCat(@PathVariable("id") String id) {
         this.exhibitionBoardCatService.removeById(id);
 
@@ -139,6 +146,7 @@ public class ExhibitionBoardCatController extends BaseController {
     @PostMapping("/getList")
     @RequiresAuthentication  //@RequiresPermissions("exhibition:board:cat:list")
     @ApiOperation(value = "获取展板分类全部列表(无分页)", notes = "获取展板分类全部列表(无分页)")
+    @MethodLog(operModule = OperModule.DISPLAYCLASSIFY, operType = OperType.SELECT)
     public Map<String, Object> getExhibitionBoardCatList(@RequestParam(value = "copyrightOwnerId", required = false) List<String> copyrightOwnerIdList) {
         final LambdaQueryWrapper<ExhibitionBoardCat> exhibitionBoardCatLambdaQueryWrapper = Wrappers.<ExhibitionBoardCat>lambdaQuery().orderByDesc(ExhibitionBoardCat::getCreateTime);
         if (copyrightOwnerIdList != null && !copyrightOwnerIdList.isEmpty()) {
@@ -164,6 +172,7 @@ public class ExhibitionBoardCatController extends BaseController {
     @PostMapping("/getPageList")
     @RequiresAuthentication  //@RequiresPermissions("exhibition:board:cat:page")
     @ApiOperation(value = "获取展板分类分页列表", notes = "获取展板分类分页列表")
+    @MethodLog(operModule = OperModule.DISPLAYCLASSIFY, operType = OperType.SELECT)
     public Map<String, Object> getExhibitionBoardCatPageList(GenericPageParam genericPageParam) {
         LambdaQueryWrapper<ExhibitionBoardCat> queryWrapper = new LambdaQueryWrapper<>();
         // 对名称或编码模糊查询
@@ -204,6 +213,7 @@ public class ExhibitionBoardCatController extends BaseController {
     })
     @GetMapping("/get/{id}")
     @RequiresAuthentication  //@RequiresPermissions("exhibition:board:cat:get:id")
+    @MethodLog(operModule = OperModule.DISPLAYCLASSIFY, operType = OperType.SELECT)
     public Map<String, Object> getById(@PathVariable("id") String id) {
         ExhibitionBoardCat exhibitionBoardCat = exhibitionBoardCatService.getById(id);
         return getResult(exhibitionBoardCat);

src/main/java/cn/wisenergy/chnmuseum/party/web/controller/ExhibitionBoardController.java

 package cn.wisenergy.chnmuseum.party.web.controller;
 
 import cn.wisenergy.chnmuseum.party.common.enums.*;
+import cn.wisenergy.chnmuseum.party.common.log.MethodLog;
+import cn.wisenergy.chnmuseum.party.common.log.OperModule;
+import cn.wisenergy.chnmuseum.party.common.log.OperType;
 import cn.wisenergy.chnmuseum.party.common.validator.groups.Add;
 import cn.wisenergy.chnmuseum.party.common.validator.groups.Update;
 import cn.wisenergy.chnmuseum.party.common.vo.GenericPageParam;
@@ -55,6 +58,7 @@ public class ExhibitionBoardController extends BaseController {
     @PostMapping("/save")
     @RequiresAuthentication  //@RequiresPermissions("exhibition:board:save")
     @ApiOperation(value = "添加展板", notes = "添加展板")
+    @MethodLog(operModule = OperModule.DISPLAYCONTENT, operType = OperType.ADD)
     public Map<String, Object> saveExhibitionBoard(@Validated(value = {Add.class}) ExhibitionBoard exhibitionBoard) {
         TUser user = getcurUser();
         final List<String> audioIdList = exhibitionBoard.getAudioIdList();
@@ -107,6 +111,7 @@ public class ExhibitionBoardController extends BaseController {
     @PutMapping("/update")
     @RequiresAuthentication  //@RequiresPermissions("exhibition:board:update")
     @ApiOperation(value = "修改展板信息", notes = "修改展板信息")
+    @MethodLog(operModule = OperModule.DISPLAYCONTENT, operType = OperType.UPDATE)
     public Map<String, Object> updateExhibitionBoard(@Validated(value = {Update.class}) ExhibitionBoard exhibitionBoard) {
         TUser user = getcurUser();
         final VideoContent videoContent = this.videoContentService.getById(exhibitionBoard.getVideoContentId());
@@ -170,6 +175,7 @@ public class ExhibitionBoardController extends BaseController {
     @ApiImplicitParams(value = {
             @ApiImplicitParam(name = "id", value = "标识ID", paramType = "path", dataType = "String")
     })
+    @MethodLog(operModule = OperModule.DISPLAYCONTENT, operType = OperType.DELETE)
     public Map<String, Object> deleteExhibitionBoard(@PathVariable("id") String id) {
         TUser user = getcurUser();
         final Audit audit = Audit.builder()
@@ -192,6 +198,7 @@ public class ExhibitionBoardController extends BaseController {
     @PostMapping("/getList")
     @RequiresAuthentication  //@RequiresPermissions("exhibition:board:list")
     @ApiOperation(value = "获取展板全部列表(无分页)", notes = "获取展板全部列表(无分页)")
+    @MethodLog(operModule = OperModule.DISPLAYCONTENT, operType = OperType.SELECT)
     public Map<String, Object> getExhibitionBoardList(
             @RequestParam(value = "exhibitionBoardCatIdList", required = false) List<String> exhibitionBoardCatIdList,
             @RequestParam(value = "boardCopyrightOwnerIdList", required = false) List<String> boardCopyrightOwnerIdList) {
@@ -244,6 +251,7 @@ public class ExhibitionBoardController extends BaseController {
     @PostMapping("/getPageList")
     @RequiresAuthentication  //@RequiresPermissions("exhibition:board:page")
     @ApiOperation(value = "获取展板分页列表", notes = "获取展板分页列表")
+    @MethodLog(operModule = OperModule.DISPLAYCONTENT, operType = OperType.SELECT)
     public Map<String, Object> getExhibitionBoardPageList(GenericPageParam genericPageParam) {
         LambdaQueryWrapper<ExhibitionBoard> queryWrapper = new LambdaQueryWrapper<>();
         // 对名称或编码模糊查询
@@ -327,6 +335,7 @@ public class ExhibitionBoardController extends BaseController {
     })
     @GetMapping("/get/{id}")
     @RequiresAuthentication  //@RequiresPermissions("exhibition:board:get:id")
+    @MethodLog(operModule = OperModule.DISPLAYCONTENT, operType = OperType.SELECT)
     public Map<String, Object> getById(@PathVariable("id") String id) {
         ExhibitionBoard exhibitionBoard = exhibitionBoardService.getById(id);
         String exhibitionBoardCatId = exhibitionBoard.getExhibitionBoardCatId();
@@ -389,6 +398,7 @@ public class ExhibitionBoardController extends BaseController {
     })
     @PutMapping("/publish/{id}")
     @RequiresAuthentication  //@RequiresPermissions("exhibition:board:publish")
+    @MethodLog(operModule = OperModule.DISPLAYCONTENT, operType = OperType.UPPER)
     public Map<String, Object> enableExhibitionBoard(@PathVariable("id") String id, @RequestParam("isPublish") Boolean isPublish) {
         TUser user = getcurUser();
         final Audit audit = Audit.builder()

src/main/java/cn/wisenergy/chnmuseum/party/web/controller/LearningContentController.java

@@ -4,6 +4,9 @@ import cn.wisenergy.chnmuseum.party.common.enums.AuditOperationEnum;
 import cn.wisenergy.chnmuseum.party.common.enums.AuditStatusEnum;
 import cn.wisenergy.chnmuseum.party.common.enums.AuditTypeEnum;
 import cn.wisenergy.chnmuseum.party.common.enums.FileCatEnum;
+import cn.wisenergy.chnmuseum.party.common.log.MethodLog;
+import cn.wisenergy.chnmuseum.party.common.log.OperModule;
+import cn.wisenergy.chnmuseum.party.common.log.OperType;
 import cn.wisenergy.chnmuseum.party.common.validator.groups.Add;
 import cn.wisenergy.chnmuseum.party.common.validator.groups.Update;
 import cn.wisenergy.chnmuseum.party.common.vo.GenericPageParam;
@@ -70,6 +73,7 @@ public class LearningContentController extends BaseController {
     @PostMapping("/save")
     @RequiresAuthentication  //@RequiresPermissions("learning:content:save")
     @ApiOperation(value = "添加学习内容", notes = "添加学习内容")
+    @MethodLog(operModule = OperModule.LEARNCONTENT, operType = OperType.ADD)
     public Map<String, Object> saveLearningContent(@Validated(value = {Add.class}) LearningContent learningContent) {
         final TUser tUser = getcurUser();
         if (tUser != null) {
@@ -138,6 +142,7 @@ public class LearningContentController extends BaseController {
     @PutMapping("/update")
     @RequiresAuthentication  //@RequiresPermissions("learning:content:update")
     @ApiOperation(value = "修改学习内容信息", notes = "修改学习内容信息")
+    @MethodLog(operModule = OperModule.LEARNCONTENT, operType = OperType.UPDATE)
     public Map<String, Object> updateLearningContent(@Validated(value = {Update.class}) LearningContent learningContent) {
         TUser user = getcurUser();
         learningContent.setAuditStatus(AuditStatusEnum.TBC.name());
@@ -204,6 +209,7 @@ public class LearningContentController extends BaseController {
             @ApiImplicitParam(name = "auditStatus", value = "审核状态", paramType = "query", dataType = "String"),
             @ApiImplicitParam(name = "learningProjectId", value = "学习项目ID", paramType = "query", dataType = "String")
     })
+    @MethodLog(operModule = OperModule.LEARNCONTENT, operType = OperType.SELECT)
     public Map<String, Object> getLearningContentList(@RequestParam(value = "auditStatus", defaultValue = "APPROVED_FINAL", required = false) AuditStatusEnum auditStatus,
                                                       @RequestParam(value = "learningProjectId", required = false) String learningProjectId) {
         final LambdaQueryWrapper<LearningContent> lambdaQueryWrapper = Wrappers.<LearningContent>lambdaQuery().eq(LearningContent::getAuditStatus, auditStatus.name());
@@ -226,6 +232,7 @@ public class LearningContentController extends BaseController {
     @PostMapping("/getPageList")
     @RequiresAuthentication  //@RequiresPermissions("learning:content:page")
     @ApiOperation(value = "获取学习内容分页列表", notes = "获取学习内容分页列表")
+    @MethodLog(operModule = OperModule.LEARNCONTENT, operType = OperType.SELECT)
     public Map<String, Object> getLearningContentPageList(GenericPageParam genericPageParam, @RequestParam(value = "learningProjectId", required = false) String learningProjectId) {
         LambdaQueryWrapper<LearningContent> queryWrapper = new LambdaQueryWrapper<>();
         // 根据创建时间区间检索
@@ -289,6 +296,7 @@ public class LearningContentController extends BaseController {
     })
     @GetMapping("/get/{id}")
     @RequiresAuthentication  //@RequiresPermissions("learning:content:get:id")
+    @MethodLog(operModule = OperModule.LEARNCONTENT, operType = OperType.SELECT)
     public Map<String, Object> getById(@PathVariable("id") String id) {
         LearningContent learningContent = learningContentService.getById(id);
 
@@ -467,6 +475,7 @@ public class LearningContentController extends BaseController {
     })
     @PutMapping("/enable/{id}")
     @RequiresAuthentication  //@RequiresPermissions("learning:content:enable")
+    @MethodLog(operModule = OperModule.LEARNCONTENT, operType = OperType.ENABLE)
     public Map<String, Object> enableLearningContent(@PathVariable("id") String id, @RequestParam("isPublish") Boolean isPublish) {
         TUser user = getcurUser();
         final Audit audit = Audit.builder()

src/main/java/cn/wisenergy/chnmuseum/party/web/controller/LearningProjectController.java

 package cn.wisenergy.chnmuseum.party.web.controller;
 
+import cn.wisenergy.chnmuseum.party.common.log.MethodLog;
+import cn.wisenergy.chnmuseum.party.common.log.OperModule;
+import cn.wisenergy.chnmuseum.party.common.log.OperType;
 import cn.wisenergy.chnmuseum.party.common.validator.groups.Add;
 import cn.wisenergy.chnmuseum.party.common.validator.groups.Update;
 import cn.wisenergy.chnmuseum.party.common.vo.GenericPageParam;
@@ -47,6 +50,7 @@ public class LearningProjectController extends BaseController {
     @PostMapping("/save")
     @RequiresAuthentication  //@RequiresPermissions("learning:project:save")
     @ApiOperation(value = "添加", notes = "添加")
+    @MethodLog(operModule = OperModule.LEARNPROJECT, operType = OperType.ADD)
     public Map<String, Object> saveLearningProject(@Validated(value = {Add.class}) LearningProject learningProject) {
         // 保存业务节点信息
         boolean result = learningProjectService.save(learningProject);
@@ -62,6 +66,7 @@ public class LearningProjectController extends BaseController {
     @PutMapping("/update")
     @RequiresAuthentication  //@RequiresPermissions("learning:project:update")
     @ApiOperation(value = "修改信息", notes = "修改信息")
+    @MethodLog(operModule = OperModule.LEARNPROJECT, operType = OperType.UPDATE)
     public Map<String, Object> updateLearningProject(@Validated(value = {Update.class}) LearningProject learningProject) {
         boolean flag = learningProjectService.updateById(learningProject);
         if (flag) {
@@ -76,6 +81,7 @@ public class LearningProjectController extends BaseController {
     @ApiImplicitParams(value = {
             @ApiImplicitParam(name = "id", value = "标识ID", paramType = "path", dataType = "String")
     })
+    @MethodLog(operModule = OperModule.LEARNPROJECT, operType = OperType.DELETE)
     public Map<String, Object> deleteLearningProject(@PathVariable("id") String id) {
         return getSuccessResult();
     }
@@ -83,6 +89,7 @@ public class LearningProjectController extends BaseController {
     @GetMapping("/getList")
     @RequiresAuthentication  //@RequiresPermissions("learning:project:list")
     @ApiOperation(value = "获取全部列表(无分页)", notes = "获取全部列表(无分页)")
+    @MethodLog(operModule = OperModule.LEARNPROJECT, operType = OperType.SELECT)
     public Map<String, Object> getLearningProjectList() {
         List<LearningProject> learningProjectList = learningProjectService.list(Wrappers.<LearningProject>lambdaQuery().orderByDesc(LearningProject::getCreateTime));
         return getResult(learningProjectList);
@@ -98,6 +105,7 @@ public class LearningProjectController extends BaseController {
     @PostMapping("/getPageList")
     @RequiresAuthentication  //@RequiresPermissions("learning:project:page")
     @ApiOperation(value = "获取分页列表", notes = "获取分页列表")
+    @MethodLog(operModule = OperModule.LEARNPROJECT, operType = OperType.SELECT)
     public Map<String, Object> getLearningProjectPageList(GenericPageParam genericPageParam) {
         LambdaQueryWrapper<LearningProject> queryWrapper = new LambdaQueryWrapper<>();
         // 对名称或编码模糊查询
@@ -135,6 +143,7 @@ public class LearningProjectController extends BaseController {
     })
     @GetMapping("/get/{id}")
     @RequiresAuthentication  //@RequiresPermissions("learning:project:get:id")
+    @MethodLog(operModule = OperModule.LEARNPROJECT, operType = OperType.SELECT)
     public Map<String, Object> getById(@PathVariable("id") String id) {
         LearningProject learningProject = learningProjectService.getById(id);
         return getResult(learningProject);

src/main/java/cn/wisenergy/chnmuseum/party/web/controller/TAppDirPicController.java

 package cn.wisenergy.chnmuseum.party.web.controller;
 
+import cn.wisenergy.chnmuseum.party.common.log.MethodLog;
+import cn.wisenergy.chnmuseum.party.common.log.OperModule;
+import cn.wisenergy.chnmuseum.party.common.log.OperType;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
@@ -66,6 +69,7 @@ public class TAppDirPicController extends BaseController {
     @PostMapping("/save")
 		@RequiresAuthentication  //@RequiresPermissions("t:app:dir:pic:save")
 		@ApiOperation(value = "添加", notes = "添加")
+    @MethodLog(operModule = OperModule.PAGECUSTOM, operType = OperType.ADD)
 	public Map<String, Object> saveTAppDirPic(@Validated(value = {Add.class}) TAppDirPic tAppDirPic) {
         // 默认不为当前版本
         if (tAppDirPic.getIsCurrent() == null){
@@ -96,6 +100,7 @@ public class TAppDirPicController extends BaseController {
     @PutMapping("/update")
 		@RequiresAuthentication  //@RequiresPermissions("t:app:dir:pic:update")
 	    @ApiOperation(value = "修改信息", notes = "修改信息")
+    @MethodLog(operModule = OperModule.PAGECUSTOM, operType = OperType.UPDATE)
     public Map<String, Object> updateTAppDirPic(@Validated(value = {Update.class}) TAppDirPic tAppDirPic) {
         // 默认不为当前版本
         if (tAppDirPic.getIsCurrent() == null){
@@ -157,6 +162,7 @@ public class TAppDirPicController extends BaseController {
 	@ApiImplicitParams(value = {
 			@ApiImplicitParam(name = "isCurrent", value = "是否为当前界面 0：否 1：是", paramType = "query", dataType = "String")
 	})
+    @MethodLog(operModule = OperModule.PAGECUSTOM, operType = OperType.SELECT)
     public Map<String, Object> getTAppDirPicList(Integer isCurrent) {
 
         List<TAppDirPic> tAppDirPicList = tAppDirPicService.list(Wrappers.<TAppDirPic>lambdaQuery().eq(isCurrent != null,TAppDirPic::getIsCurrent, isCurrent).orderByDesc(TAppDirPic::getCreateTime));
@@ -171,6 +177,7 @@ public class TAppDirPicController extends BaseController {
     @PostMapping("/getPageList")
 		@RequiresAuthentication  //@RequiresPermissions("t:app:dir:pic:page")
 		@ApiOperation(value = "获取分页列表", notes = "获取分页列表")
+    @MethodLog(operModule = OperModule.PAGECUSTOM, operType = OperType.SELECT)
     public Map<String, Object> getTAppDirPicPageList(String isCurrent) {
 		LambdaQueryWrapper<TAppDirPic> queryWrapper = new LambdaQueryWrapper<>();
 		// 对是否为当前界面
@@ -192,6 +199,7 @@ public class TAppDirPicController extends BaseController {
     })
     @GetMapping("/get/{id}")
 		@RequiresAuthentication  //@RequiresPermissions("t:app:dir:pic:get:id")
+    @MethodLog(operModule = OperModule.PAGECUSTOM, operType = OperType.SELECT)
 	    public Map<String, Object> getById(@PathVariable("id") String id) {
         TAppDirPic tAppDirPic = tAppDirPicService.getById(id);
 		return getResult(tAppDirPic);

src/main/java/cn/wisenergy/chnmuseum/party/web/controller/TAppRunPicController.java

 package cn.wisenergy.chnmuseum.party.web.controller;
 
+import cn.wisenergy.chnmuseum.party.common.log.MethodLog;
+import cn.wisenergy.chnmuseum.party.common.log.OperModule;
+import cn.wisenergy.chnmuseum.party.common.log.OperType;
 import cn.wisenergy.chnmuseum.party.model.TAppDirPic;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
@@ -67,6 +70,7 @@ public class TAppRunPicController extends BaseController {
     @PostMapping("/save")
 		@RequiresAuthentication  //@RequiresPermissions("t:app:run:pic:save")
 		@ApiOperation(value = "添加", notes = "添加")
+	@MethodLog(operModule = OperModule.PAGECUSTOM, operType = OperType.ADD)
 	public Map<String, Object> saveTAppRunPic(@Validated(value = {Add.class}) TAppRunPic tAppRunPic) {
 		// 默认不为当前版本
 		if (tAppRunPic.getIsCurrent() == null){
@@ -99,6 +103,7 @@ public class TAppRunPicController extends BaseController {
     @PutMapping("/update")
 		@RequiresAuthentication  //@RequiresPermissions("t:app:run:pic:update")
 	    @ApiOperation(value = "修改信息", notes = "修改信息")
+	@MethodLog(operModule = OperModule.PAGECUSTOM, operType = OperType.UPDATE)
     public Map<String, Object> updateTAppRunPic(@Validated(value = {Update.class}) TAppRunPic tAppRunPic) {
 		// 默认不为当前版本
 		if (tAppRunPic.getIsCurrent() == null){
@@ -145,6 +150,7 @@ public class TAppRunPicController extends BaseController {
 	@ApiImplicitParams(value = {
 			@ApiImplicitParam(name = "id", value = "标识ID", paramType = "path", dataType = "String")
 	})
+	@MethodLog(operModule = OperModule.PAGECUSTOM, operType = OperType.DELETE)
     public Map<String, Object> deleteTAppRunPic(@PathVariable("id") String id) {
         boolean result = tAppRunPicService.removeById(id);
         if (result) {
@@ -159,6 +165,7 @@ public class TAppRunPicController extends BaseController {
 	@ApiImplicitParams(value = {
 			@ApiImplicitParam(name = "isCurrent", value = "是否为当前界面 0：否 1：是", paramType = "query", dataType = "int")
 	})
+	@MethodLog(operModule = OperModule.PAGECUSTOM, operType = OperType.SELECT)
     public Map<String, Object> getTAppRunPicList(Integer isCurrent) {
         List<TAppRunPic> tAppRunPicList = tAppRunPicService.list(Wrappers.<TAppRunPic>lambdaQuery().eq(isCurrent!= null,TAppRunPic::getIsCurrent, isCurrent).orderByDesc(TAppRunPic::getCreateTime));
         return getResult(tAppRunPicList);
@@ -174,6 +181,7 @@ public class TAppRunPicController extends BaseController {
     @PostMapping("/getPageList")
 		@RequiresAuthentication  //@RequiresPermissions("t:app:run:pic:page")
 		@ApiOperation(value = "获取分页列表", notes = "获取分页列表")
+	@MethodLog(operModule = OperModule.PAGECUSTOM, operType = OperType.SELECT)
     public Map<String, Object> getTAppRunPicPageList(String isCurrent) {
 		LambdaQueryWrapper<TAppRunPic> queryWrapper = new LambdaQueryWrapper<>();
 		// 对名称或编码模糊查询
@@ -194,6 +202,7 @@ public class TAppRunPicController extends BaseController {
     })
     @GetMapping("/get/{id}")
 		@RequiresAuthentication  //@RequiresPermissions("t:app:run:pic:get:id")
+	@MethodLog(operModule = OperModule.PAGECUSTOM, operType = OperType.SELECT)
 	    public Map<String, Object> getById(@PathVariable("id") String id) {
         TAppRunPic tAppRunPic = tAppRunPicService.getById(id);
 		return getResult(tAppRunPic);

src/main/java/cn/wisenergy/chnmuseum/party/web/controller/TAppVersionController.java

 package cn.wisenergy.chnmuseum.party.web.controller;
 
+import cn.wisenergy.chnmuseum.party.common.log.MethodLog;
+import cn.wisenergy.chnmuseum.party.common.log.OperModule;
+import cn.wisenergy.chnmuseum.party.common.log.OperType;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -59,6 +62,7 @@ public class TAppVersionController extends BaseController {
     @PostMapping("/save")
 		@RequiresAuthentication  //@RequiresPermissions("t:app:version:save")
 		@ApiOperation(value = "添加", notes = "添加")
+	@MethodLog(operModule = OperModule.APPVERSION, operType = OperType.ADD)
 	public Map<String, Object> saveTAppVersion(@Validated(value = {Add.class}) TAppVersion tAppVersion) {
     	// 默认不为当前版本
     	if (tAppVersion.getIsCurrent() == null){
@@ -88,6 +92,7 @@ public class TAppVersionController extends BaseController {
     @PutMapping("/update")
 		@RequiresAuthentication  //@RequiresPermissions("t:app:version:update")
 	    @ApiOperation(value = "修改信息", notes = "修改信息")
+	@MethodLog(operModule = OperModule.APPVERSION, operType = OperType.UPDATE)
     public Map<String, Object> updateTAppVersion(@Validated(value = {Update.class}) TAppVersion tAppVersion) {
 		// 默认不为当前版本
 		if (tAppVersion.getIsCurrent() == null){
@@ -118,6 +123,7 @@ public class TAppVersionController extends BaseController {
 	@ApiImplicitParams(value = {
 			@ApiImplicitParam(name = "id", value = "标识ID", paramType = "path", dataType = "String")
 	})
+	@MethodLog(operModule = OperModule.APPVERSION, operType = OperType.DELETE)
     public Map<String, Object> deleteTAppVersion(@PathVariable("id") String id) {
         boolean result = tAppVersionService.removeById(id);
         if (result) {
@@ -132,6 +138,7 @@ public class TAppVersionController extends BaseController {
 	@ApiImplicitParams(value = {
 			@ApiImplicitParam(name = "isCurrent", value = "是否为当前版本 0：否 1：是", paramType = "query", dataType = "String")
 	})
+	@MethodLog(operModule = OperModule.APPVERSION, operType = OperType.SELECT)
     public Map<String, Object> getTAppVersionList(String isCurrent) {
 		QueryWrapper qw  = new QueryWrapper();
 		qw.eq(StringUtils.isNotEmpty(isCurrent),"is_current",isCurrent).orderByDesc("update_time");
@@ -149,6 +156,7 @@ public class TAppVersionController extends BaseController {
     @PostMapping("/getPageList")
 		@RequiresAuthentication  //@RequiresPermissions("t:app:version:page")
 		@ApiOperation(value = "获取分页列表", notes = "获取分页列表")
+	@MethodLog(operModule = OperModule.APPVERSION, operType = OperType.SELECT)
     public Map<String, Object> getTAppVersionPageList(LocalDate startDate, LocalDate endDate, String isCurrent) {
 		LambdaQueryWrapper<TAppVersion> queryWrapper = new LambdaQueryWrapper<>();
 		// 查询是否为当前版本
@@ -172,6 +180,7 @@ public class TAppVersionController extends BaseController {
     })
     @GetMapping("/get/{id}")
 		@RequiresAuthentication  //@RequiresPermissions("t:app:version:get:id")
+	@MethodLog(operModule = OperModule.APPVERSION, operType = OperType.SELECT)
 	    public Map<String, Object> getById(@PathVariable("id") String id) {
         TAppVersion tAppVersion = tAppVersionService.getById(id);
 		return getResult(tAppVersion);

src/main/java/cn/wisenergy/chnmuseum/party/web/controller/VideoContentCatController.java

 package cn.wisenergy.chnmuseum.party.web.controller;
 
+import cn.wisenergy.chnmuseum.party.common.log.MethodLog;
+import cn.wisenergy.chnmuseum.party.common.log.OperModule;
+import cn.wisenergy.chnmuseum.party.common.log.OperType;
 import cn.wisenergy.chnmuseum.party.common.validator.groups.Add;
 import cn.wisenergy.chnmuseum.party.common.vo.GenericPageParam;
 import cn.wisenergy.chnmuseum.party.model.CopyrightOwner;
@@ -63,6 +66,7 @@ public class VideoContentCatController extends BaseController {
     @PostMapping(value = "/save")
     @RequiresAuthentication  //@RequiresPermissions("video:content:cat:save")
     @ApiOperation(value = "添加视频内容分类", notes = "添加视频内容分类")
+    @MethodLog(operModule = OperModule.VIDEOCLASSIFY, operType = OperType.ADD)
     public Map<String, Object> saveVideoContentCat(@Validated(value = {Add.class}) VideoContentCat videoContentCat) {
         // 保存业务节点信息
         boolean result = videoContentCatService.save(videoContentCat);
@@ -77,6 +81,7 @@ public class VideoContentCatController extends BaseController {
 
     @PutMapping(value = "/update")
     @ApiOperation(value = "修改视频内容分类信息", notes = "修改视频内容分类信息")
+    @MethodLog(operModule = OperModule.VIDEOCLASSIFY, operType = OperType.UPDATE)
     public Map<String, Object> updateVideoContentCat(@Validated VideoContentCat videoContentCat) {
         boolean flag = videoContentCatService.updateById(videoContentCat);
         if (flag) {
@@ -91,6 +96,7 @@ public class VideoContentCatController extends BaseController {
     @GetMapping("/getList")
     @RequiresAuthentication  //@RequiresPermissions("video:content:cat:list")
     @ApiOperation(value = "获取视频内容分类全部列表(无分页)", notes = "获取视频内容分类全部列表(无分页)")
+    @MethodLog(operModule = OperModule.VIDEOCLASSIFY, operType = OperType.SELECT)
     public Map<String, Object> getVideoContentCatList(@RequestParam(value = "copyrightOwnerId", required = false) String copyrightOwnerId) {
         final LambdaQueryWrapper<VideoContentCat> videoContentCatLambdaQueryWrapper = Wrappers.<VideoContentCat>lambdaQuery().orderByDesc(VideoContentCat::getCreateTime);
         if (StringUtils.isNotBlank(copyrightOwnerId)) {
@@ -114,6 +120,7 @@ public class VideoContentCatController extends BaseController {
     @PostMapping("/getPageList")
     @RequiresAuthentication  //@RequiresPermissions("video:content:cat:page")
     @ApiOperation(value = "获取视频内容分类分页列表", notes = "获取视频内容分类分页列表")
+    @MethodLog(operModule = OperModule.VIDEOCLASSIFY, operType = OperType.SELECT)
     public Map<String, Object> getVideoContentCatPageList(GenericPageParam genericPageParam) {
         LambdaQueryWrapper<VideoContentCat> queryWrapper = new LambdaQueryWrapper<>();
         // 对名称或编码模糊查询
@@ -154,6 +161,7 @@ public class VideoContentCatController extends BaseController {
     })
     @GetMapping("/get/{id}")
     @RequiresAuthentication  //@RequiresPermissions("video:content:cat:get:id")
+    @MethodLog(operModule = OperModule.VIDEOCLASSIFY, operType = OperType.SELECT)
     public Map<String, Object> getById(@PathVariable("id") String id) {
         VideoContentCat videoContentCat = videoContentCatService.getById(id);
         return getResult(videoContentCat);
@@ -165,6 +173,7 @@ public class VideoContentCatController extends BaseController {
     @ApiImplicitParams(value = {
             @ApiImplicitParam(name = "id", value = "标识ID", paramType = "path", dataType = "String")
     })
+    @MethodLog(operModule = OperModule.VIDEOCLASSIFY, operType = OperType.DELETE)
     public Map<String, Object> deleteVideoContentCat(@PathVariable("id") String id) {
         this.videoContentCatService.removeById(id);
 

src/main/java/cn/wisenergy/chnmuseum/party/web/controller/VideoContentController.java

 package cn.wisenergy.chnmuseum.party.web.controller;
 
 import cn.wisenergy.chnmuseum.party.common.enums.*;
+import cn.wisenergy.chnmuseum.party.common.log.MethodLog;
+import cn.wisenergy.chnmuseum.party.common.log.OperModule;
+import cn.wisenergy.chnmuseum.party.common.log.OperType;
 import cn.wisenergy.chnmuseum.party.common.validator.groups.Add;
 import cn.wisenergy.chnmuseum.party.common.validator.groups.Update;
 import cn.wisenergy.chnmuseum.party.common.vo.GenericPageParam;
@@ -55,6 +58,7 @@ public class VideoContentController extends BaseController {
     @PostMapping(value = "/save")
     @RequiresAuthentication  //@RequiresPermissions("video:content:save")
     @ApiOperation(value = "添加视频内容", notes = "添加视频内容")
+    @MethodLog(operModule = OperModule.VIDEOCONTENT, operType = OperType.ADD)
     public Map<String, Object> saveVideoContent(@Validated(value = {Add.class}) VideoContent videoContent) {
         TUser user = getcurUser();
         final List<String> videoFileIdList = videoContent.getVideoFileIdList();
@@ -96,6 +100,7 @@ public class VideoContentController extends BaseController {
     @PutMapping("/update")
     @RequiresAuthentication  //@RequiresPermissions("video:content:update")
     @ApiOperation(value = "修改视频内容信息", notes = "修改视频内容信息")
+    @MethodLog(operModule = OperModule.VIDEOCONTENT, operType = OperType.UPDATE)
     public Map<String, Object> updateVideoContent(@Validated(value = {Update.class}) VideoContent videoContent) {
         TUser user = getcurUser();
         videoContent.setAuditStatus(AuditStatusEnum.TBC.name());
@@ -143,6 +148,7 @@ public class VideoContentController extends BaseController {
     @ApiImplicitParams(value = {
             @ApiImplicitParam(name = "id", value = "标识ID", paramType = "path", dataType = "String", required = true)
     })
+    @MethodLog(operModule = OperModule.VIDEOCONTENT, operType = OperType.SELECT)
     public Map<String, Object> getExhibitionBoardById(@PathVariable("id") String id) {
         final List<ExhibitionBoard> exhibitionBoardList = this.exhibitionBoardService.list(Wrappers.<ExhibitionBoard>lambdaQuery().eq(ExhibitionBoard::getVideoContentId, id));
         if (!exhibitionBoardList.isEmpty()) {
@@ -158,6 +164,7 @@ public class VideoContentController extends BaseController {
     @ApiImplicitParams(value = {
             @ApiImplicitParam(name = "id", value = "标识ID", paramType = "path", dataType = "String", required = true)
     })
+    @MethodLog(operModule = OperModule.VIDEOCONTENT, operType = OperType.DELETE)
     public Map<String, Object> deleteVideoContent(@PathVariable("id") String id) {
         TUser user = getcurUser();
         final Audit audit = Audit.builder()
@@ -185,6 +192,7 @@ public class VideoContentController extends BaseController {
             @ApiImplicitParam(name = "videoContentCatId", value = "视频内容分类ID", paramType = "query", dataType = "String"),
             @ApiImplicitParam(name = "videoContentCopyrightOwnerId", value = "视频内容版权方ID", paramType = "query", dataType = "String")
     })
+    @MethodLog(operModule = OperModule.VIDEOCONTENT, operType = OperType.SELECT)
     public Map<String, Object> getVideoContentList(@RequestParam(value = "auditStatus", required = false) AuditStatusEnum auditStatus,
                                                    @RequestParam(value = "videoContentCatId", required = false) String videoContentCatId,
                                                    @RequestParam(value = "videoContentCopyrightOwnerId", required = false) String videoContentCopyrightOwnerId) {
@@ -216,6 +224,7 @@ public class VideoContentController extends BaseController {
     @PostMapping("/getPageList")
     @RequiresAuthentication  //@RequiresPermissions("video:content:page")
     @ApiOperation(value = "获取视频内容分页列表", notes = "获取视频内容分页列表")
+    @MethodLog(operModule = OperModule.VIDEOCONTENT, operType = OperType.SELECT)
     public Map<String, Object> getAssetPageList(GenericPageParam genericPageParam) {
         LambdaQueryWrapper<VideoContent> queryWrapper = new LambdaQueryWrapper<>();
         // 对名称或编码模糊查询
@@ -266,6 +275,7 @@ public class VideoContentController extends BaseController {
     })
     @GetMapping("/get/{id}")
     @RequiresAuthentication  //@RequiresPermissions("video:content:get:id")
+    @MethodLog(operModule = OperModule.VIDEOCONTENT, operType = OperType.SELECT)
     public Map<String, Object> getById(@PathVariable("id") String id) {
         VideoContent videoContent = videoContentService.getById(id);
         if (videoContent.getVideoContentCatId() != null) {

src/main/resources/mapper/RunLogMapper.xml

@@ -34,6 +34,7 @@
         <if test=" runLog.endDate != null">
             and r.start_time <![CDATA[<=]]> #{runLog.endDate}
         </if>
+        order by r.start_time desc
     </select>
 
 </mapper>

src/main/resources/mapper/TOperationLogMapper.xml

@@ -34,5 +34,6 @@
         <if test=" operationLog.endDate != null">
             and o.create_time <![CDATA[<=]]> #{operationLog.endDate}
         </if>
+        order by o.create_time desc
     </select>
 </mapper>