资源管理检索条件修改，表修改

snowy-plugin/snowy-plugin-disk/snowy-plugin-disk-func/src/main/java/vip/xiaonuo/disk/controller/CourseAuditRecordController.java → snowy-plugin/snowy-plugin-disk/snowy-plugin-disk-func/src/main/java/vip/xiaonuo/disk/controller/ResourceRecordController.java

@@ -57,7 +57,7 @@ import java.util.stream.Collectors;
 @ApiSupport(author = "SNOWY_TEAM", order = 1)
 @RestController
 @Validated
-public class CourseAuditRecordController {
+public class ResourceRecordController {
 
 
     @Resource
@@ -97,7 +97,9 @@ public class CourseAuditRecordController {
         //默认不传情况，列表查询的是未审核的
         String verifyStatus="0";
         if(StringUtils.isNotEmpty(req.getParameter("verifyStatus")))verifyStatus=req.getParameter("verifyStatus");
-        param.put("verifyStatus", verifyStatus);
+//        param.put("verifyStatus", verifyStatus);
+        //改良，审核状态可以查多个
+        param.put("verifyStatusList", Arrays.asList(verifyStatus.split(",")));
         //是否是个人资源库，0否1是，默认为0
         String isSelf="0";
         if(StringUtils.isNotEmpty(req.getParameter("isSelf")))isSelf=req.getParameter("isSelf");
@@ -181,7 +183,8 @@ public class CourseAuditRecordController {
     @SaCheckPermission("/disk/courseauditrecord/add")
     @PostMapping("/disk/courseauditrecord/add")
     public CommonResult<String> add(@RequestBody @Valid CourseAuditRecordAddParam courseAuditRecordAddParam) {
-
+        //生成统一的上传批次号
+        String uploadBatchNum = UUID.randomUUID().toString();
         //该次上传附件信息
         String userFileIdsStr=courseAuditRecordAddParam.getUserfileIds();
         String[] userFileIdList = userFileIdsStr.split(",");
@@ -193,6 +196,7 @@ public class CourseAuditRecordController {
 //            courseAuditRecord.setFileName(resourceUserFile.getFileName());
             courseAuditRecord.setUserfileId(userFileId);
             courseAuditRecord.setVerifyStatus("0");
+            courseAuditRecord.setUploadBatchNum(uploadBatchNum);
             if(StringUtils.isNotEmpty(courseAuditRecordAddParam.getKeywordValue()))courseAuditRecord.setKeywordPinyin(StringUtils.deleteWhitespace(pinyinUtils.toPinyin(courseAuditRecordAddParam.getKeywordValue(),false)));
             courseAuditRecordList.add(courseAuditRecord);
         }

snowy-plugin/snowy-plugin-disk/snowy-plugin-disk-func/src/main/java/vip/xiaonuo/disk/domain/CourseAuditRecord.java

@@ -30,7 +30,7 @@ import java.util.Date;
  **/
 @Getter
 @Setter
-@TableName("COURSE_AUDIT_RECORD")
+@TableName("RESOURCE_RECORD")
 public class CourseAuditRecord extends CommonEntity {
 
     /** 主键ID */
@@ -109,4 +109,8 @@ public class CourseAuditRecord extends CommonEntity {
     /** 浏览次数 */
     @ApiModelProperty(value = "浏览次数", position = 13)
     private String viewCount;
+
+    /** 统一上传批次号 */
+    @ApiModelProperty(value = "统一上传批次号", position = 13)
+    private String uploadBatchNum;
 }

snowy-plugin/snowy-plugin-disk/snowy-plugin-disk-func/src/main/java/vip/xiaonuo/disk/mapper/mapping/CourseAuditRecordMapper.xml

@@ -30,7 +30,7 @@
             CONCAT(rt.NAME,',',rt2.NAME) AS resourceALLTypeName,
             IFNULL (t1.COURSE_ID,'') as courseId,
             IFNULL (t3.COURSE_NAME,'') AS courseIdName
-        FROM COURSE_AUDIT_RECORD t1
+        FROM RESOURCE_RECORD t1
         LEFT JOIN RESOURCE_USERFILE t2 ON t2.USER_FILE_ID = t1.USERFILE_ID AND t2.DELETE_FLAG ='NOT_DELETE'
         LEFT JOIN RESOURCE_FILE rf ON t2.FILE_ID= rf.FILE_ID
         LEFT JOIN resource_type rt  ON t1.RESOURCE_TYPE =rt.ID AND rt.DELETE_FLAG ='NOT_DELETE'
@@ -94,7 +94,7 @@
         t1.VIEW_COUNT as viewCount,
         IFNULL (t7.NAME,'') AS resourceCreaterUserName,
         IFNULL (CAST(t6.DOWNLOAD_PATH AS VARCHAR),'') AS coverImagePath
-        FROM COURSE_AUDIT_RECORD t1
+        FROM RESOURCE_RECORD t1
         LEFT JOIN RESOURCE_USERFILE t2 ON t2.USER_FILE_ID = t1.USERFILE_ID AND t2.DELETE_FLAG ='NOT_DELETE'
         LEFT JOIN COURSE_INFO t3 ON t1.COURSE_ID =t3.COURSE_ID AND t3.DELETE_FLAG ='NOT_DELETE'
         LEFT JOIN college t4 ON t1.COLLEGE_ID=t4.id AND t4.DELETE_FLAG ='NOT_DELETE'
@@ -190,7 +190,7 @@
             IFNULL (t7.NAME,'') AS resourceCreaterUserName,
             IFNULL (t1.COVER_IMAGE,'') AS coverImage,
             IFNULL (CAST(t6.DOWNLOAD_PATH AS VARCHAR),'') AS coverImagePath
-        FROM COURSE_AUDIT_RECORD t1
+        FROM RESOURCE_RECORD t1
         LEFT JOIN RESOURCE_USERFILE t2 ON t2.USER_FILE_ID = t1.USERFILE_ID AND t2.DELETE_FLAG ='NOT_DELETE'
         LEFT JOIN RESOURCE_FILE rf ON t2.FILE_ID= rf.FILE_ID
         LEFT JOIN resource_type rt  ON t1.RESOURCE_TYPE =rt.ID AND rt.DELETE_FLAG ='NOT_DELETE'
@@ -229,7 +229,7 @@
             CONCAT(rt.NAME,',',rt2.NAME) AS resourceALLTypeName,
             IFNULL (t1.KEYWORD ,'') as keyword,
             IFNULL (t1.KEYWORD_VALUE  ,'') as keywordValue
-        FROM COURSE_AUDIT_RECORD t1
+        FROM RESOURCE_RECORD t1
         LEFT JOIN resource_type rt  ON t1.RESOURCE_TYPE =rt.ID AND rt.DELETE_FLAG ='NOT_DELETE'
         LEFT JOIN resource_type rt2  ON t1.RESOURCE_TWO_TYPE =rt2.ID AND rt2.DELETE_FLAG ='NOT_DELETE'
         LEFT JOIN college t4 ON t1.COLLEGE_ID=t4.id AND t4.DELETE_FLAG ='NOT_DELETE'