阶段性提交

snowy-plugin/snowy-plugin-disk/snowy-plugin-disk-func/src/main/java/vip/xiaonuo/disk/controller/CourseInfoController.java

@@ -95,6 +95,7 @@ public class CourseInfoController {
         param.put("collegeTwoId", req.getParameter("collegeTwoId"));
         param.put("collegeThreeId", req.getParameter("collegeThreeId"));
         param.put("majorId", req.getParameter("majorId"));
+        param.put("gradeName", req.getParameter("gradeName"));
         param.put("courseType", req.getParameter("courseType"));
         param.put("beginTime", req.getParameter("beginTime"));
         param.put("endTime", req.getParameter("endTime"));

snowy-plugin/snowy-plugin-disk/snowy-plugin-disk-func/src/main/java/vip/xiaonuo/disk/controller/CourseOpenController.java

@@ -74,7 +74,7 @@ public class CourseOpenController {
         param.put("semesterId", req.getParameter("semesterId"));
         param.put("weekType", req.getParameter("weekType"));
         param.put("status", req.getParameter("status"));
-        param.put("gradesIdName", req.getParameter("gradesIdName"));
+        param.put("gradeName", req.getParameter("gradeName"));
         Page<Map<String,Object>> list=courseOpenService.queryList(param);
         return CommonResult.data(list);
     }

snowy-plugin/snowy-plugin-disk/snowy-plugin-disk-func/src/main/java/vip/xiaonuo/disk/controller/CourseStudentRelateController.java

@@ -92,6 +92,7 @@ public class CourseStudentRelateController {
     @GetMapping("/disk/coursestudentrelate/page")
     public CommonResult<Page<Map<String,Object>>> page(CourseStudentRelatePageParam courseStudentRelatePageParam, HttpServletRequest req) {
         Map param =new HashMap();
+        param.put("gradeName", req.getParameter("gradeName"));
         param.put("courseId", req.getParameter("courseId"));
         param.put("queryInfo", req.getParameter("queryInfo"));
         param.put("studentNum", req.getParameter("studentNum"));

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

@@ -32,6 +32,19 @@
         IFNULL(s.NAME ,'') as semesterIdName,
         IFNULL(ci.HOUR_COUNT ,'') as hourCount
         FROM COURSE_INFO ci
+        <if test="param.gradeName !=null and param.gradeName != ''">
+        JOIN (
+            SELECT ci1.COURSE_ID
+            FROM COURSE_INFO ci1
+            LEFT JOIN COURSE_OPEN cop ON ci1.COURSE_ID =cop.COURSE_ID AND cop.DELETE_FLAG='NOT_DELETE'
+            LEFT JOIN "grades" g ON g."grades_id" =cop.GRADES_ID AND g.DELETE_FLAG ='NOT_DELETE'
+            WHERE ci1.DELETE_FLAG ='NOT_DELETE'
+            <if test="param.gradeName !=null and param.gradeName != ''">
+                AND g."grades_name" LIKE concat('%',#{param.gradeName},'%')
+            </if>
+            GROUP BY ci1.COURSE_ID
+        )gs ON ci.COURSE_ID=gs.COURSE_ID
+        </if>
         LEFT JOIN SYS_ORG co ON ci.COLLEGE_ID=co.ID AND co.DELETE_FLAG ='NOT_DELETE'
         LEFT JOIN SYS_ORG co2 ON ci.COLLEGE_TWO_ID=co2.id AND co2.DELETE_FLAG ='NOT_DELETE'
         LEFT JOIN SYS_ORG co3 ON ci.COLLEGE_THREE_ID=co3.id AND co3.DELETE_FLAG ='NOT_DELETE'

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

@@ -48,8 +48,8 @@
         <if test="param.status !=null and param.status != ''">
             and co.STATUS=#{param.status}
         </if>
-        <if test="param.gradesIdName !=null and param.gradesIdName != ''">
-            and gr.grades_name like CONCAT('%', #{param.gradesIdName}, '%')
+        <if test="param.gradeName !=null and param.gradeName != ''">
+            and gr.grades_name like CONCAT('%', #{param.gradeName}, '%')
         </if>
         order by co.CREATE_TIME desc
     </select>

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

@@ -24,8 +24,12 @@
             IFNULL (su.LATEST_LOGIN_TIME,'') AS latestLoginTime
         FROM COURSE_STUDENT_RELATE csr
         LEFT JOIN SYS_USER su ON csr.USER_ID =su.ID
+        LEFT JOIN "grades" g ON g."grades_id" =su.GRADES_ID AND g.DELETE_FLAG ='NOT_DELETE'
         WHERE csr.DELETE_FLAG ='NOT_DELETE'
         AND su.DELETE_FLAG ='NOT_DELETE'
+        <if test="param.gradeName !=null and param.gradeName != ''">
+            AND g."grades_name" LIKE concat('%',#{param.gradeName},'%')
+        </if>
         <if test="param.courseId !=null and param.courseId != ''">
             and csr.COURSE_ID=#{param.courseId}
         </if>

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

@@ -431,6 +431,7 @@
             </if>
         )t1
         GROUP by t1.createTime
+        ORDER BY t1.createTime
     </select>
     <select id="getCourseVisitHeatRank" resultType="java.util.Map">
         SELECT

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

@@ -755,8 +755,8 @@
         SELECT
             postInfo.postId AS postId,
             IFNULL(postInfo.postTitle,'')AS postTitle,
-            IFNULL(postInfo.postCreateTime,'')AS postCreateTime,
-            IFNULL(postInfo.postLastReplyTime,'')AS postLastReplyTime,
+            IFNULL(TO_CHAR(postInfo.postCreateTime, 'YYYY-MM-DD'),'')AS postCreateTime,
+            IFNULL(TO_CHAR(postInfo.postLastReplyTime, 'YYYY-MM-DD'),'')AS postLastReplyTime,
             IFNULL(finalOne.postCount,'0')AS postCount
         FROM(
             SELECT

snowy-plugin/snowy-plugin-disk/snowy-plugin-disk-func/src/main/java/vip/xiaonuo/disk/param/UserCommentAddParam.java

@@ -16,6 +16,7 @@ import io.swagger.annotations.ApiModelProperty;
 import lombok.Getter;
 import lombok.Setter;
 
+import javax.validation.constraints.NotBlank;
 import java.util.Date;
 
 /**
@@ -34,6 +35,7 @@ public class UserCommentAddParam {
 
     /** 评论名称 */
     @ApiModelProperty(value = "评论名称", position = 3)
+    @NotBlank(message = "评论内容不能为空")
     private String commentName;
 
     /** 用户id */

snowy-plugin/snowy-plugin-disk/snowy-plugin-disk-func/src/main/java/vip/xiaonuo/disk/service/impl/KeyWordServiceImpl.java

@@ -61,7 +61,7 @@ public class KeyWordServiceImpl extends ServiceImpl<KeyWordMapper, KeyWord> impl
             queryWrapper.orderBy(true, keyWordPageParam.getSortOrder().equals(CommonSortOrderEnum.ASC.getValue()),
                     StrUtil.toUnderlineCase(keyWordPageParam.getSortField()));
         } else {
-            queryWrapper.lambda().orderByAsc(KeyWord::getId);
+            queryWrapper.lambda().orderByDesc(KeyWord::getId);
         }
         return this.page(CommonPageRequest.defaultPage(), queryWrapper);
     }

snowy-plugin/snowy-plugin-disk/snowy-plugin-disk-func/src/main/java/vip/xiaonuo/disk/util/MinioUtil.java

@@ -292,6 +292,7 @@ public class MinioUtil {
 
         fileSuffix=fileSuffix.substring(1, fileSuffix.length());
 
+        //预先获取转换后的文件minio中地址，这个必须和回头要实际存储的转换后的minio地址相同
         String fileUrl = UFOPUtils.getUploadFileUrl(md5, fileSuffix);
         logger.info("开始合并");
         // 获取所有分块
@@ -332,7 +333,9 @@ public class MinioUtil {
 
         String url = fileUrl;
         logger.info("插入的的url是：" + url);
+        //文件分片没有问题，并且已经执行完合并，合并到指定地址之后，插入数据库信息，并对特定格式执行预览转换
         Map<String,Object> map = this.insertUrl(url, fileSize,md5,fileName,affiliationFuncType);
+        //分片合并，插入进数据库之后，执行删除分片
         Boolean deleteResult = this.deleteChunks(md5);
         logger.info(map.toString());
         logger.info(deleteResult.toString());
@@ -399,6 +402,7 @@ public class MinioUtil {
                 resourceUserFileMapper.insert(resourceUserFile);
             }
         }
+        //文件数据插入完毕，创建一个新线程，来执行发送消息给kafka，进行转码任务
         ExecutorService threadPool = CheckThreadPool.getExecutor();
         String userId = StpLoginUserUtil.getLoginUser().getId();
         try {