bug fixed

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

 package cn.wisenergy.chnmuseum.party.web.controller;
 
 import cn.wisenergy.chnmuseum.party.common.dfs.FastDFSUtils;
+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.FileTypeEnum;
 import cn.wisenergy.chnmuseum.party.common.validator.groups.Add;
 import cn.wisenergy.chnmuseum.party.common.validator.groups.Update;
@@ -9,6 +11,7 @@ import cn.wisenergy.chnmuseum.party.common.vo.GenericPageParam;
 import cn.wisenergy.chnmuseum.party.common.vo.VideoVo;
 import cn.wisenergy.chnmuseum.party.model.Asset;
 import cn.wisenergy.chnmuseum.party.model.AssetType;
+import cn.wisenergy.chnmuseum.party.model.Audit;
 import cn.wisenergy.chnmuseum.party.model.CopyrightOwner;
 import cn.wisenergy.chnmuseum.party.service.AssetService;
 import cn.wisenergy.chnmuseum.party.service.AssetTypeService;
@@ -92,10 +95,15 @@ public class AssetController extends BaseController {
         asset.setPublished(false);
         // 保存业务节点信息
         boolean result = assetService.save(asset);
-
-
         // 返回操作结果
         if (result) {
+            final Audit audit = Audit.builder().content("")
+                    .isDeleted(false)
+                    .operation(AuditOperationEnum.ADD.name())
+                    .refItemId(asset.getId())
+                    .status(AuditStatusEnum.TBC.name())
+                    .type(AuditTypeEnum.ASSET.name()).build();
+            this.auditService.save(audit);
             return getSuccessResult();
         }
         return getFailResult();
@@ -128,6 +136,15 @@ public class AssetController extends BaseController {
         asset.setPublished(false);
         boolean flag = assetService.updateById(asset);
         if (flag) {
+            final Audit audit = Audit.builder().content("")
+                    .isDeleted(false)
+                    .operation(AuditOperationEnum.EDIT.name())
+                    .refItemId(asset.getId())
+                    .status(AuditStatusEnum.TBC.name())
+                    .type(AuditTypeEnum.ASSET.name())
+                    .build();
+            this.auditService.save(audit);
+
             return getSuccessResult();
         }
         return getFailResult();
@@ -156,8 +173,14 @@ public class AssetController extends BaseController {
             @ApiImplicitParam(name = "id", value = "标识ID", paramType = "path", dataType = "String")
     })
     public Map<String, Object> deleteAsset(@PathVariable("id") String id) {
-        Asset asset = Asset.builder().id(id).published(false).auditStatus(AuditStatusEnum.TBC.name()).build();
-        boolean result = assetService.updateById(asset);
+        final Audit audit = Audit.builder().content("")
+                .isDeleted(false)
+                .operation(AuditOperationEnum.REMOVE.name())
+                .refItemId(id)
+                .status(AuditStatusEnum.TBC.name())
+                .type(AuditTypeEnum.ASSET.name())
+                .build();
+        final boolean result = this.auditService.save(audit);
         if (result) {
             return getSuccessResult();
         }
@@ -254,7 +277,8 @@ public class AssetController extends BaseController {
         }
 
         final String videoUrl = asset.getVideoUrl();
-        final List<VideoVo> videoVoList = JSONObject.parseObject(videoUrl, new TypeReference<List<VideoVo>>() {}, Feature.OrderedField);
+        final List<VideoVo> videoVoList = JSONObject.parseObject(videoUrl, new TypeReference<List<VideoVo>>() {
+        }, Feature.OrderedField);
         asset.setVideoUrlList(videoVoList.stream().map(VideoVo::getFileUrl).collect(Collectors.toList()));
         return getResult(asset);
     }

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

 package cn.wisenergy.chnmuseum.party.web.controller;
 
 import cn.wisenergy.chnmuseum.party.common.dfs.FastDFSUtils;
+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.FileTypeEnum;
 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.AudioVo;
 import cn.wisenergy.chnmuseum.party.common.vo.GenericPageParam;
+import cn.wisenergy.chnmuseum.party.model.Audit;
 import cn.wisenergy.chnmuseum.party.model.ExhibitionBoard;
+import cn.wisenergy.chnmuseum.party.service.AuditService;
 import cn.wisenergy.chnmuseum.party.service.CopyrightOwnerService;
 import cn.wisenergy.chnmuseum.party.service.ExhibitionBoardCatService;
 import cn.wisenergy.chnmuseum.party.service.ExhibitionBoardService;
@@ -54,6 +58,8 @@ public class ExhibitionBoardController extends BaseController {
     private ExhibitionBoardCatService exhibitionBoardCatService;
     @Resource
     private CopyrightOwnerService copyrightOwnerService;
+    @Resource
+    private AuditService auditService;
 
     @PostMapping("/save")
     @RequiresPermissions("exhibition:board:save")
@@ -97,13 +103,19 @@ public class ExhibitionBoardController extends BaseController {
                     .build());
         }
         exhibitionBoard.setRefMaterialUrl(JSONObject.toJSONString(filesMetadata));
-
         exhibitionBoard.setAuditStatus(AuditStatusEnum.TBC.name());
         exhibitionBoard.setPublished(false);
         // 保存业务节点信息
         boolean result = exhibitionBoardService.save(exhibitionBoard);
         // 返回操作结果
         if (result) {
+            final Audit audit = Audit.builder().content("")
+                    .isDeleted(false)
+                    .operation(AuditOperationEnum.ADD.name())
+                    .refItemId(exhibitionBoard.getId())
+                    .status(AuditStatusEnum.TBC.name())
+                    .type(AuditTypeEnum.EXHIBITION_BOARD.name()).build();
+            this.auditService.save(audit);
             return getSuccessResult();
         } else {
             // 保存失败
@@ -153,11 +165,19 @@ public class ExhibitionBoardController extends BaseController {
                     .build());
         }
         exhibitionBoard.setRefMaterialUrl(JSONObject.toJSONString(filesMetadata));
-
         exhibitionBoard.setAuditStatus(AuditStatusEnum.TBC.name());
         exhibitionBoard.setPublished(false);
         boolean flag = exhibitionBoardService.updateById(exhibitionBoard);
         if (flag) {
+            final Audit audit = Audit.builder().content("")
+                    .isDeleted(false)
+                    .operation(AuditOperationEnum.EDIT.name())
+                    .refItemId(exhibitionBoard.getId())
+                    .status(AuditStatusEnum.TBC.name())
+                    .type(AuditTypeEnum.EXHIBITION_BOARD.name())
+                    .build();
+            this.auditService.save(audit);
+
             return getSuccessResult();
         }
         return getFailResult();
@@ -188,9 +208,14 @@ public class ExhibitionBoardController extends BaseController {
             @ApiImplicitParam(name = "id", value = "标识ID", paramType = "path", dataType = "String")
     })
     public Map<String, Object> deleteExhibitionBoard(@PathVariable("id") String id) {
-
-
-        boolean result = exhibitionBoardService.removeById(id);
+        final Audit audit = Audit.builder().content("")
+                .isDeleted(false)
+                .operation(AuditOperationEnum.REMOVE.name())
+                .refItemId(id)
+                .status(AuditStatusEnum.TBC.name())
+                .type(AuditTypeEnum.EXHIBITION_BOARD.name())
+                .build();
+        final boolean result = this.auditService.save(audit);
         if (result) {
             return getSuccessResult();
         }
@@ -203,8 +228,18 @@ public class ExhibitionBoardController extends BaseController {
     @ApiImplicitParams(value = {
             @ApiImplicitParam(name = "auditStatus", value = "审核状态", paramType = "query", dataType = "String")
     })
-    public Map<String, Object> getExhibitionBoardList(@RequestParam(value = "auditStatus", defaultValue = "APPROVED_FINAL", required = false) AuditStatusEnum auditStatus) {
-        List<ExhibitionBoard> exhibitionBoardList = exhibitionBoardService.list(Wrappers.<ExhibitionBoard>lambdaQuery().eq(ExhibitionBoard::getAuditStatus, auditStatus.name()).eq(ExhibitionBoard::getPublished, true));
+    public Map<String, Object> getExhibitionBoardList(
+            @RequestParam(value = "exhibitionBoardCatIdList", required = false) List<String> exhibitionBoardCatIdList,
+            @RequestParam(value = "boardCopyrightOwnerIdList", required = false) List<String> boardCopyrightOwnerIdList,
+            @RequestParam(value = "auditStatus", defaultValue = "APPROVED_FINAL", required = false) AuditStatusEnum auditStatus) {
+        final LambdaQueryWrapper<ExhibitionBoard> lambdaQueryWrapper = Wrappers.<ExhibitionBoard>lambdaQuery().eq(ExhibitionBoard::getAuditStatus, auditStatus.name()).eq(ExhibitionBoard::getPublished, true);
+        if (exhibitionBoardCatIdList != null && !exhibitionBoardCatIdList.isEmpty()) {
+            lambdaQueryWrapper.in(ExhibitionBoard::getExhibitionBoardCatId, exhibitionBoardCatIdList);
+        }
+        if (boardCopyrightOwnerIdList != null && !boardCopyrightOwnerIdList.isEmpty()) {
+            lambdaQueryWrapper.in(ExhibitionBoard::getBoardCopyrightOwnerId, boardCopyrightOwnerIdList);
+        }
+        List<ExhibitionBoard> exhibitionBoardList = exhibitionBoardService.list();
         return getResult(exhibitionBoardList);
     }
 

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

@@ -76,7 +76,7 @@ public class LearningContentBoardController extends BaseController {
     @PutMapping(value = "/sort")
     @RequiresPermissions("learning:content:board:sort")
     public Map<String, Object> sort(String sourceId, String targetId) {
-        String moveType = null;
+        String moveType;
         LearningContentBoard theSource = this.learningContentBoardService.getById(sourceId);
         LearningContentBoard theTarget = this.learningContentBoardService.getById(targetId);
 

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

 package cn.wisenergy.chnmuseum.party.web.controller;
 
+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.validator.groups.Add;
 import cn.wisenergy.chnmuseum.party.common.validator.groups.Update;
 import cn.wisenergy.chnmuseum.party.common.vo.GenericPageParam;
@@ -50,6 +52,8 @@ public class LearningContentController extends BaseController {
     private LearningContentCopyrightOwnerService learningContentCopyrightOwnerService;
     @Resource
     private LearningProjectService learningProjectService;
+    @Resource
+    private AuditService auditService;
 
     @PostMapping("/save")
     @RequiresPermissions("learning:content:save")
@@ -89,6 +93,13 @@ public class LearningContentController extends BaseController {
 
         // 返回操作结果
         if (result) {
+            final Audit audit = Audit.builder().content("")
+                    .isDeleted(false)
+                    .operation(AuditOperationEnum.ADD.name())
+                    .refItemId(learningContent.getId())
+                    .status(AuditStatusEnum.TBC.name())
+                    .type(AuditTypeEnum.LEARNING_CONTENT.name()).build();
+            this.auditService.save(audit);
             return getSuccessResult();
         } else {
             // 保存失败
@@ -140,6 +151,15 @@ public class LearningContentController extends BaseController {
 
         boolean flag = learningContentService.updateById(learningContent);
         if (flag) {
+            final Audit audit = Audit.builder().content("")
+                    .isDeleted(false)
+                    .operation(AuditOperationEnum.EDIT.name())
+                    .refItemId(learningContent.getId())
+                    .status(AuditStatusEnum.TBC.name())
+                    .type(AuditTypeEnum.LEARNING_CONTENT.name())
+                    .build();
+            this.auditService.save(audit);
+
             return getSuccessResult();
         }
         return getFailResult();
@@ -152,7 +172,14 @@ public class LearningContentController extends BaseController {
             @ApiImplicitParam(name = "id", value = "标识ID", paramType = "path", dataType = "String")
     })
     public Map<String, Object> deleteLearningContent(@PathVariable("id") String id) {
-        boolean result = learningContentService.removeById(id);
+        final Audit audit = Audit.builder().content("")
+                .isDeleted(false)
+                .operation(AuditOperationEnum.REMOVE.name())
+                .refItemId(id)
+                .status(AuditStatusEnum.TBC.name())
+                .type(AuditTypeEnum.LEARNING_CONTENT.name())
+                .build();
+        final boolean result = this.auditService.save(audit);
         if (result) {
             return getSuccessResult();
         }