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

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

@@ -63,7 +63,6 @@ public class Audit implements Serializable {
 
     @ApiModelProperty("操作类型")
     @TableField("operation")
-    @NotBlank(message = "操作类型不能为空", groups = {Update.class})
     private String operation;
 
     @ApiModelProperty(value = "审核状态", allowableValues = "TBC,REFUSED,TBCA,APPROVED_FINAL")

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

@@ -79,14 +79,14 @@ public class AuditController extends BaseController {
                 user.setAuditStatus(level);
             }
             //如果是账号禁用初审员，设置层级为初审
-            if (user1.getRoleList().contains("15")) {
-                user.setAuditStatus(AuditStatusEnum.TBC.name());
-            } else if (user1.getRoleList().contains("16")) {
-                user.setAuditStatus(AuditStatusEnum.TBCA.name());
-            } else {
-                //不存在的层级
-                user.setAuditStatus("1");
-            }
+//            if (user1.getRoleList().contains("15")) {
+//                user.setAuditStatus(AuditStatusEnum.TBC.name());
+//            } else if (user1.getRoleList().contains("16")) {
+//                user.setAuditStatus(AuditStatusEnum.TBCA.name());
+//            } else {
+//                //不存在的层级
+//                user.setAuditStatus("1");
+//            }
             auditList = auditService.getUserList(getPage(), user);
             return getResult(auditList);
         } catch (Exception e) {

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

@@ -5,10 +5,7 @@ import cn.wisenergy.chnmuseum.party.common.enums.*;
 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;
-import cn.wisenergy.chnmuseum.party.model.Asset;
-import cn.wisenergy.chnmuseum.party.model.Audit;
-import cn.wisenergy.chnmuseum.party.model.ExhibitionBoard;
-import cn.wisenergy.chnmuseum.party.model.VideoContent;
+import cn.wisenergy.chnmuseum.party.model.*;
 import cn.wisenergy.chnmuseum.party.service.*;
 import cn.wisenergy.chnmuseum.party.web.controller.base.BaseController;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
@@ -61,6 +58,7 @@ public class ExhibitionBoardController extends BaseController {
     @RequiresAuthentication  //@RequiresPermissions("exhibition:board:save")
     @ApiOperation(value = "添加展板", notes = "添加展板")
     public Map<String, Object> saveExhibitionBoard(@Validated(value = {Add.class}) ExhibitionBoard exhibitionBoard) {
+        TUser user = getcurUser();
         final List<String> audioIdList = exhibitionBoard.getAudioIdList();
         if (audioIdList == null || audioIdList.isEmpty()) {
             return getFailResult("400", "导览音频文件必须上传");
@@ -93,6 +91,7 @@ public class ExhibitionBoardController extends BaseController {
             final Audit audit = Audit.builder()
                     .content(exhibitionBoard.getName())
                     .refItemId(exhibitionBoard.getId())
+                    .userId(user.getId())
                     .type(AuditTypeEnum.EXHIBITION_BOARD.name())
                     .operation(AuditOperationEnum.ADD.name())
                     .status(AuditStatusEnum.TBC.name())
@@ -111,6 +110,7 @@ public class ExhibitionBoardController extends BaseController {
     @RequiresAuthentication  //@RequiresPermissions("exhibition:board:update")
     @ApiOperation(value = "修改展板信息", notes = "修改展板信息")
     public Map<String, Object> updateExhibitionBoard(@Validated(value = {Update.class}) ExhibitionBoard exhibitionBoard) {
+        TUser user = getcurUser();
         final VideoContent videoContent = this.videoContentService.getById(exhibitionBoard.getVideoContentId());
         exhibitionBoard.setVideoContentName(videoContent.getName());
         exhibitionBoard.setAuditStatus(AuditStatusEnum.TBC.name());
@@ -163,6 +163,7 @@ public class ExhibitionBoardController extends BaseController {
             final Audit audit = Audit.builder()
                     .content(exhibitionBoard.getName())
                     .refItemId(exhibitionBoard.getId())
+                    .userId(user.getId())
                     .type(AuditTypeEnum.EXHIBITION_BOARD.name())
                     .operation(AuditOperationEnum.EDIT.name())
                     .status(AuditStatusEnum.TBC.name())
@@ -182,8 +183,10 @@ public class ExhibitionBoardController extends BaseController {
             @ApiImplicitParam(name = "id", value = "标识ID", paramType = "path", dataType = "String")
     })
     public Map<String, Object> deleteExhibitionBoard(@PathVariable("id") String id) {
+        TUser user = getcurUser();
         final Audit audit = Audit.builder()
                 .content(this.exhibitionBoardService.getById(id).getName())
+                .userId(user.getId())
                 .refItemId(id)
                 .type(AuditTypeEnum.EXHIBITION_BOARD.name())
                 .operation(AuditOperationEnum.REMOVE.name())
@@ -362,7 +365,9 @@ public class ExhibitionBoardController extends BaseController {
     @PutMapping("/publish/{id}")
     @RequiresAuthentication  //@RequiresPermissions("exhibition:board:publish")
     public Map<String, Object> enableExhibitionBoard(@PathVariable("id") String id, @RequestParam("isPublish") Boolean isPublish) {
+        TUser user = getcurUser();
         final Audit audit = Audit.builder()
+                .userId(user.getId())
                 .content(this.exhibitionBoardService.getById(id).getName())
                 .refItemId(id)
                 .type(AuditTypeEnum.EXHIBITION_BOARD.name())

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

@@ -70,6 +70,7 @@ public class LearningContentController extends BaseController {
     @Resource
     private AssetService assetService;
 
+
     @PostMapping("/save")
     @RequiresAuthentication  //@RequiresPermissions("learning:content:save")
     @ApiOperation(value = "添加学习内容", notes = "添加学习内容")
@@ -124,6 +125,7 @@ public class LearningContentController extends BaseController {
                     .content(learningContent.getName())
                     .refItemId(learningContent.getId())
                     .type(AuditTypeEnum.LEARNING_CONTENT.name())
+                    .userId(tUser.getId())
                     .operation(AuditOperationEnum.ADD.name())
                     .status(AuditStatusEnum.TBC.name())
                     .deleted(false)
@@ -141,6 +143,7 @@ public class LearningContentController extends BaseController {
     @RequiresAuthentication  //@RequiresPermissions("learning:content:update")
     @ApiOperation(value = "修改学习内容信息", notes = "修改学习内容信息")
     public Map<String, Object> updateLearningContent(@Validated(value = {Update.class}) LearningContent learningContent) {
+        TUser user = getcurUser();
         learningContent.setAuditStatus(AuditStatusEnum.TBC.name());
         learningContent.setPublished(false);
         // 保存业务节点信息
@@ -183,6 +186,7 @@ public class LearningContentController extends BaseController {
         if (flag) {
             final Audit audit = Audit.builder()
                     .content(learningContent.getName())
+                    .userId(user.getId())
                     .refItemId(learningContent.getId())
                     .type(AuditTypeEnum.LEARNING_CONTENT.name())
                     .operation(AuditOperationEnum.EDIT.name())
@@ -465,9 +469,11 @@ public class LearningContentController extends BaseController {
     @PutMapping("/enable/{id}")
     @RequiresAuthentication  //@RequiresPermissions("learning:content:enable")
     public Map<String, Object> enableLearningContent(@PathVariable("id") String id, @RequestParam("isPublish") Boolean isPublish) {
+        TUser user = getcurUser();
         final Audit audit = Audit.builder()
                 .content(this.learningContentService.getById(id).getName())
                 .refItemId(id)
+                .userId(user.getId())
                 .type(AuditTypeEnum.LEARNING_CONTENT.name())
                 .operation(isPublish ? AuditOperationEnum.ENABLE.name() : AuditOperationEnum.DISABLE.name())
                 .status(AuditStatusEnum.TBC.name())

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

@@ -56,6 +56,7 @@ public class VideoContentController extends BaseController {
     @RequiresAuthentication  //@RequiresPermissions("video:content:save")
     @ApiOperation(value = "添加视频内容", notes = "添加视频内容")
     public Map<String, Object> saveAsset(@Validated(value = {Add.class}) VideoContent videoContent) {
+        TUser user = getcurUser();
         final List<String> videoFileIdList = videoContent.getVideoFileIdList();
         if (videoFileIdList == null || videoFileIdList.isEmpty()) {
             return getFailResult("400", "视频文件必须上传");
@@ -78,6 +79,7 @@ public class VideoContentController extends BaseController {
 
             final Audit audit = Audit.builder()
                     .content(videoContent.getName())
+                    .userId(user.getId())
                     .refItemId(videoContent.getId())
                     .type(AuditTypeEnum.VIDEO_CONTENT.name())
                     .operation(AuditOperationEnum.ADD.name())
@@ -95,6 +97,7 @@ public class VideoContentController extends BaseController {
     @RequiresAuthentication  //@RequiresPermissions("video:content:update")
     @ApiOperation(value = "修改视频内容信息", notes = "修改视频内容信息")
     public Map<String, Object> updateAsset(@Validated(value = {Update.class}) VideoContent videoContent) {
+        TUser user = getcurUser();
         videoContent.setAuditStatus(AuditStatusEnum.TBC.name());
         videoContent.setPublished(false);
         videoContent.setDeleted(false);
@@ -124,6 +127,7 @@ public class VideoContentController extends BaseController {
 
             final Audit audit = Audit.builder()
                     .content(videoContent.getName())
+                    .userId(user.getId())
                     .refItemId(videoContent.getId())
                     .type(AuditTypeEnum.VIDEO_CONTENT.name())
                     .operation(AuditOperationEnum.EDIT.name())
@@ -145,9 +149,11 @@ public class VideoContentController extends BaseController {
             @ApiImplicitParam(name = "id", value = "标识ID", paramType = "path", dataType = "String")
     })
     public Map<String, Object> deleteAsset(@PathVariable("id") String id) {
+        TUser user = getcurUser();
         final Audit audit = Audit.builder()
                 .content(this.videoContentService.getById(id).getName())
                 .refItemId(id)
+                .userId(user.getId())
                 .type(AuditTypeEnum.VIDEO_CONTENT.name())
                 .operation(AuditOperationEnum.REMOVE.name())
                 .status(AuditStatusEnum.TBC.name())