bug fixed

src/main/java/cn/wisenergy/chnmuseum/party/model/Audit.java

@@ -86,7 +86,7 @@ public class Audit implements Serializable {
 
     @ApiModelProperty("0：未删除，1：已删除")
     @TableField("is_deleted")
-    private Boolean isDeleted;
+    private Boolean deleted;
 
     @ApiModelProperty("初审意见")
     @TableField("first_remarks")

src/main/java/cn/wisenergy/chnmuseum/party/service/impl/AuditServiceImpl.java

@@ -364,7 +364,7 @@ public class AuditServiceImpl extends ServiceImpl<AuditMapper, Audit> implements
         //
         audit.setLevel(AuditStatusEnum.TBC.name());
         audit.setStatus(AuditStatusEnum.TBC.name());
-        audit.setIsDeleted(false);
+        audit.setDeleted(false);
         audit.setCreateTime(LocalDateTime.now());
         //
         Object principal = SecurityUtils.getSubject().getPrincipal();

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

@@ -89,12 +89,15 @@ public class ExhibitionBoardController extends BaseController {
                 this.assetService.updateById(asset);
             }
 
-            final Audit audit = Audit.builder().content("")
-                    .isDeleted(false)
-                    .operation(AuditOperationEnum.ADD.name())
+            final Audit audit = Audit.builder()
+                    .content(exhibitionBoard.getName())
                     .refItemId(exhibitionBoard.getId())
+                    .type(AuditTypeEnum.EXHIBITION_BOARD.name())
+                    .operation(AuditOperationEnum.ADD.name())
                     .status(AuditStatusEnum.TBC.name())
-                    .type(AuditTypeEnum.EXHIBITION_BOARD.name()).build();
+                    .deleted(false)
+                    .level(AuditStatusEnum.TBC.name())
+                    .build();
             this.auditService.save(audit);
             return getSuccessResult();
         } else {
@@ -156,15 +159,16 @@ public class ExhibitionBoardController extends BaseController {
                 });
             }
 
-            final Audit audit = Audit.builder().content("")
-                    .isDeleted(false)
-                    .operation(AuditOperationEnum.EDIT.name())
+            final Audit audit = Audit.builder()
+                    .content(exhibitionBoard.getName())
                     .refItemId(exhibitionBoard.getId())
-                    .status(AuditStatusEnum.TBC.name())
                     .type(AuditTypeEnum.EXHIBITION_BOARD.name())
+                    .operation(AuditOperationEnum.EDIT.name())
+                    .status(AuditStatusEnum.TBC.name())
+                    .deleted(false)
+                    .level(AuditStatusEnum.TBC.name())
                     .build();
             this.auditService.save(audit);
-
             return getSuccessResult();
         }
         return getFailResult();
@@ -177,12 +181,14 @@ public class ExhibitionBoardController extends BaseController {
             @ApiImplicitParam(name = "id", value = "标识ID", paramType = "path", dataType = "String")
     })
     public Map<String, Object> deleteExhibitionBoard(@PathVariable("id") String id) {
-        final Audit audit = Audit.builder().content("")
-                .isDeleted(false)
-                .operation(AuditOperationEnum.REMOVE.name())
+        final Audit audit = Audit.builder()
+                .content(this.exhibitionBoardService.getById(id).getName())
                 .refItemId(id)
-                .status(AuditStatusEnum.TBC.name())
                 .type(AuditTypeEnum.EXHIBITION_BOARD.name())
+                .operation(AuditOperationEnum.REMOVE.name())
+                .status(AuditStatusEnum.TBC.name())
+                .deleted(false)
+                .level(AuditStatusEnum.TBC.name())
                 .build();
         final boolean result = this.auditService.save(audit);
         if (result) {
@@ -261,6 +267,7 @@ public class ExhibitionBoardController extends BaseController {
                 ExhibitionBoard::getName,
                 ExhibitionBoard::getAuditStatus,
                 ExhibitionBoard::getPublished,
+                ExhibitionBoard::getDeleted,
                 ExhibitionBoard::getVideoContentCopyrightOwnerId,
                 ExhibitionBoard::getExhibitionBoardCatId,
                 ExhibitionBoard::getCreateTime,
@@ -354,17 +361,15 @@ public class ExhibitionBoardController extends BaseController {
     @PutMapping("/publish/{id}")
     @RequiresPermissions("exhibition:board:publish")
     public Map<String, Object> enableExhibitionBoard(@PathVariable("id") String id, @RequestParam("isPublish") Boolean isPublish) {
-        final Audit audit = Audit.builder().content("")
-                .isDeleted(false)
+        final Audit audit = Audit.builder()
+                .content(this.exhibitionBoardService.getById(id).getName())
                 .refItemId(id)
+                .type(AuditTypeEnum.EXHIBITION_BOARD.name())
+                .operation(isPublish ? AuditOperationEnum.ENABLE.name() : AuditOperationEnum.DISABLE.name())
                 .status(AuditStatusEnum.TBC.name())
+                .deleted(false)
                 .level(AuditStatusEnum.TBC.name())
-                .type(AuditTypeEnum.EXHIBITION_BOARD.name()).build();
-        if (isPublish) {
-            audit.setOperation(AuditOperationEnum.ENABLE.name());
-        } else {
-            audit.setOperation(AuditOperationEnum.DISABLE.name());
-        }
+                .build();
         this.auditService.save(audit);
         return getSuccessResult();
     }

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

@@ -119,12 +119,15 @@ public class LearningContentController extends BaseController {
 
         // 返回操作结果
         if (result) {
-            final Audit audit = Audit.builder().content("")
-                    .isDeleted(false)
-                    .operation(AuditOperationEnum.ADD.name())
+            final Audit audit = Audit.builder()
+                    .content(learningContent.getName())
                     .refItemId(learningContent.getId())
+                    .type(AuditTypeEnum.LEARNING_CONTENT.name())
+                    .operation(AuditOperationEnum.ADD.name())
                     .status(AuditStatusEnum.TBC.name())
-                    .type(AuditTypeEnum.LEARNING_CONTENT.name()).build();
+                    .deleted(false)
+                    .level(AuditStatusEnum.TBC.name())
+                    .build();
             this.auditService.save(audit);
             return getSuccessResult();
         } else {
@@ -177,12 +180,14 @@ public class LearningContentController extends BaseController {
 
         boolean flag = learningContentService.updateById(learningContent);
         if (flag) {
-            final Audit audit = Audit.builder().content("")
-                    .isDeleted(false)
-                    .operation(AuditOperationEnum.EDIT.name())
+            final Audit audit = Audit.builder()
+                    .content(learningContent.getName())
                     .refItemId(learningContent.getId())
-                    .status(AuditStatusEnum.TBC.name())
                     .type(AuditTypeEnum.LEARNING_CONTENT.name())
+                    .operation(AuditOperationEnum.EDIT.name())
+                    .status(AuditStatusEnum.TBC.name())
+                    .deleted(false)
+                    .level(AuditStatusEnum.TBC.name())
                     .build();
             this.auditService.save(audit);
 
@@ -191,27 +196,6 @@ public class LearningContentController extends BaseController {
         return getFailResult();
     }
 
-    @DeleteMapping("/delete/{id}")
-    @RequiresPermissions("learning:content:delete")
-    @ApiOperation(value = "根据ID下架学习内容", notes = "根据ID下架学习内容")
-    @ApiImplicitParams(value = {
-            @ApiImplicitParam(name = "id", value = "标识ID", paramType = "path", dataType = "String")
-    })
-    public Map<String, Object> deleteLearningContent(@PathVariable("id") String 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();
-        }
-        return getFailResult();
-    }
-
     @GetMapping("/getList")
     @RequiresPermissions("learning:content:list")
     @ApiOperation(value = "获取学习内容全部列表(无分页)", notes = "获取学习内容全部列表(无分页)")
@@ -475,22 +459,20 @@ public class LearningContentController extends BaseController {
     @ApiOperation(value = "启用/禁用学习内容", notes = "启用/禁用学习内容")
     @ApiImplicitParams({
             @ApiImplicitParam(name = "id", value = "标识ID", dataType = "String", paramType = "path"),
-            @ApiImplicitParam(name = "isPublish", value = "是否上架", dataType = "boolean", paramType = "query", allowableValues = "True, False")
+            @ApiImplicitParam(name = "isPublish", value = "是否启用", dataType = "boolean", paramType = "query", allowableValues = "True, False")
     })
     @PutMapping("/enable/{id}")
     @RequiresPermissions("learning:content:enable")
     public Map<String, Object> enableLearningContent(@PathVariable("id") String id, @RequestParam("isPublish") Boolean isPublish) {
-        final Audit audit = Audit.builder().content("")
-                .isDeleted(false)
+        final Audit audit = Audit.builder()
+                .content(this.learningContentService.getById(id).getName())
                 .refItemId(id)
+                .type(AuditTypeEnum.LEARNING_CONTENT.name())
+                .operation(isPublish ? AuditOperationEnum.ENABLE.name() : AuditOperationEnum.DISABLE.name())
                 .status(AuditStatusEnum.TBC.name())
+                .deleted(false)
                 .level(AuditStatusEnum.TBC.name())
-                .type(AuditTypeEnum.LEARNING_CONTENT.name()).build();
-        if (isPublish) {
-            audit.setOperation(AuditOperationEnum.ENABLE.name());
-        } else {
-            audit.setOperation(AuditOperationEnum.DISABLE.name());
-        }
+                .build();
         this.auditService.save(audit);
         return getSuccessResult();
     }

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

@@ -19,7 +19,6 @@ import cn.wisenergy.chnmuseum.party.service.impl.AuditServiceImpl;
 import cn.wisenergy.chnmuseum.party.service.impl.TBoxOperationServiceImpl;
 import cn.wisenergy.chnmuseum.party.web.controller.base.BaseController;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;
@@ -34,7 +33,6 @@ import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
-import javax.validation.constraints.NotNull;
 import java.time.LocalDateTime;
 import java.util.*;
 
@@ -451,7 +449,7 @@ public class TUserController extends BaseController {
             audit.setType(AuditTypeEnum.ACCOUNT.name());
             audit.setOperation(AuditOperationEnum.DISABLE.name());
             audit.setStatus(AuditStatusEnum.TBC.name());
-            audit.setIsDeleted(false);
+            audit.setDeleted(false);
             audit.setLevel(AuditStatusEnum.TBC.name());
             audit.setCreateTime(LocalDateTime.now());
             auditService.save(audit);

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

@@ -75,12 +75,15 @@ public class VideoContentController extends BaseController {
                 this.assetService.updateById(asset);
             }
 
-            final Audit audit = Audit.builder().content("")
-                    .isDeleted(false)
-                    .operation(AuditOperationEnum.ADD.name())
+            final Audit audit = Audit.builder()
+                    .content(videoContent.getName())
                     .refItemId(videoContent.getId())
+                    .type(AuditTypeEnum.VIDEO_CONTENT.name())
+                    .operation(AuditOperationEnum.ADD.name())
                     .status(AuditStatusEnum.TBC.name())
-                    .type(AuditTypeEnum.VIDEO_CONTENT.name()).build();
+                    .deleted(false)
+                    .level(AuditStatusEnum.TBC.name())
+                    .build();
             this.auditService.save(audit);
             return getSuccessResult();
         }
@@ -118,12 +121,14 @@ public class VideoContentController extends BaseController {
                 });
             }
 
-            final Audit audit = Audit.builder().content("")
-                    .isDeleted(false)
-                    .operation(AuditOperationEnum.EDIT.name())
+            final Audit audit = Audit.builder()
+                    .content(videoContent.getName())
                     .refItemId(videoContent.getId())
-                    .status(AuditStatusEnum.TBC.name())
                     .type(AuditTypeEnum.VIDEO_CONTENT.name())
+                    .operation(AuditOperationEnum.EDIT.name())
+                    .status(AuditStatusEnum.TBC.name())
+                    .deleted(false)
+                    .level(AuditStatusEnum.TBC.name())
                     .build();
             this.auditService.save(audit);
 
@@ -134,17 +139,19 @@ public class VideoContentController extends BaseController {
 
     @DeleteMapping("/delete/{id}")
     @RequiresPermissions("video:content:delete")
-    @ApiOperation(value = "根据ID下架视频内容", notes = "根据ID下架视频内容")
+    @ApiOperation(value = "根据ID删除视频内容", notes = "根据ID删除视频内容")
     @ApiImplicitParams(value = {
             @ApiImplicitParam(name = "id", value = "标识ID", paramType = "path", dataType = "String")
     })
     public Map<String, Object> deleteAsset(@PathVariable("id") String id) {
-        final Audit audit = Audit.builder().content("")
-                .isDeleted(false)
-                .operation(AuditOperationEnum.REMOVE.name())
+        final Audit audit = Audit.builder()
+                .content(this.videoContentService.getById(id).getName())
                 .refItemId(id)
-                .status(AuditStatusEnum.TBC.name())
                 .type(AuditTypeEnum.VIDEO_CONTENT.name())
+                .operation(AuditOperationEnum.REMOVE.name())
+                .status(AuditStatusEnum.TBC.name())
+                .deleted(false)
+                .level(AuditStatusEnum.TBC.name())
                 .build();
         final boolean result = this.auditService.save(audit);
         if (result) {
@@ -217,6 +224,7 @@ public class VideoContentController extends BaseController {
                 VideoContent::getName,
                 VideoContent::getAuditStatus,
                 VideoContent::getPublished,
+                VideoContent::getDeleted,
                 VideoContent::getVideoContentCatId,
                 VideoContent::getVideoContentCopyrightOwnerId,
                 VideoContent::getCreateTime,

src/main/resources/mapper/AuditMapper.xml

@@ -15,7 +15,7 @@
         <result column="create_time" property="createTime"/>
         <result column="first_time" property="firstTime"/>
         <result column="second_time" property="secondTime"/>
-        <result column="is_deleted" property="isDeleted"/>
+        <result column="is_deleted" property="deleted"/>
         <result column="first_remarks" property="firstRemarks"/>
         <result column="second_remarks" property="secondRemarks"/>
         <result column="level" property="level"/>