1.资源管理修改资源类型，加收藏数

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

@@ -40,6 +40,7 @@ import vip.xiaonuo.disk.dto.courseauditrecord.CourseAuditRecordEditParam;
 import vip.xiaonuo.disk.dto.courseauditrecord.CourseAuditRecordIdParam;
 import vip.xiaonuo.disk.dto.courseauditrecord.CourseAuditRecordPageParam;
 import vip.xiaonuo.disk.service.*;
+import vip.xiaonuo.disk.vo.collect.ResourceCollectVo;
 import vip.xiaonuo.disk.vo.comment.UserCommentVo;
 
 import javax.annotation.Resource;
@@ -370,6 +371,9 @@ public class CourseAuditRecordController {
         //评论数
         List<UserCommentVo> commentList=userCommentService.queryList(req.getParameter("id"));
         result.put("commentNum",commentList.size());
+        //收藏数
+        List<ResourceCollectVo> resourceCollectList=resourceCollectService.queryResourceCollectVoList(req.getParameter("id"));
+        result.put("collectNum",resourceCollectList.size());
         //是否收藏
         Boolean isCollet=resourceCollectService.queryList(req.getParameter("id"));
         result.put("isCollet",isCollet);

snowy-plugin/snowy-plugin-disk/snowy-plugin-disk-func/src/main/java/vip/xiaonuo/disk/mapper/ResourceCollectMapper.java

@@ -18,6 +18,9 @@ import org.apache.ibatis.annotations.Param;
 import vip.xiaonuo.disk.domain.ResourceCollect;
 import vip.xiaonuo.disk.param.ResourceCollectPageParam;
 import vip.xiaonuo.disk.vo.collect.ResourceCollectVo;
+import vip.xiaonuo.disk.vo.comment.UserCommentVo;
+
+import java.util.List;
 
 
 /**
@@ -32,4 +35,6 @@ public interface ResourceCollectMapper extends BaseMapper<ResourceCollect> {
     void cancel(ResourceCollect resourceCollect);
 
     Page<ResourceCollectVo> selectPageList(@Param("page") Page<Object> objectPage, @Param("resourceCollectPageParam") ResourceCollectPageParam resourceCollectPageParam);
+
+    List<ResourceCollectVo> queryResourceCollectVoList(String resourceId);
 }

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

@@ -23,12 +23,13 @@
             IFNULL (t1.MAJOR_ID,'') AS majorId,
             IFNULL (t5.major_name,'') AS majorIdName,
             IFNULL (t1.RESOURCE_TYPE,'') AS resourceType,
-            IFNULL(( SELECT dd1.DICT_LABEL FROM (SELECT d1.DICT_LABEL,d1.DICT_VALUE  FROM  DEV_DICT d1 WHERE PARENT_ID = (SELECT d2.ID  FROM  DEV_DICT d2 WHERE d2.DICT_VALUE='RESOURCE_TYPE') )dd1 WHERE dd1.DICT_VALUE = TRIM(t1.RESOURCE_TYPE) ),'') AS resourceTypeName,
+            IFNULL (rt.NAME,'') AS resourceTypeName,
             IFNULL (t1.COURSE_ID,'') as courseId,
             IFNULL (t3.COURSE_NAME,'') AS courseIdName
         FROM COURSE_AUDIT_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'
         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'
         LEFT JOIN major t5 ON t1.MAJOR_ID=t5.id AND t5.DELETE_FLAG ='NOT_DELETE'
@@ -165,7 +166,7 @@
             IFNULL (t1.MAJOR_ID,'') AS majorId,
             IFNULL (t5.major_name,'') AS majorIdName,
             IFNULL (t1.RESOURCE_TYPE,'') AS resourceType,
-            IFNULL(( SELECT dd1.DICT_LABEL FROM (SELECT d1.DICT_LABEL,d1.DICT_VALUE  FROM  DEV_DICT d1 WHERE PARENT_ID = (SELECT d2.ID  FROM  DEV_DICT d2 WHERE d2.DICT_VALUE='RESOURCE_TYPE') )dd1 WHERE dd1.DICT_VALUE = TRIM(t1.RESOURCE_TYPE) ),'') AS resourceTypeName,
+            IFNULL (rt.NAME,'') AS resourceTypeName,
             IFNULL (t1.KEYWORD ,'') as keyword,
             IFNULL (t1.KEYWORD_VALUE  ,'') as keywordValue,
             IFNULL (t1.COURSE_ID,'') as courseId,
@@ -177,6 +178,7 @@
         FROM COURSE_AUDIT_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'
         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'
         LEFT JOIN major t5 ON t1.MAJOR_ID=t5.id AND t5.DELETE_FLAG ='NOT_DELETE'
@@ -204,10 +206,11 @@
             IFNULL (t1.MAJOR_ID,'') AS majorId,
             IFNULL (t5.major_name,'') AS majorIdName,
             IFNULL (t1.RESOURCE_TYPE,'') AS resourceType,
-            IFNULL(( SELECT dd1.DICT_LABEL FROM (SELECT d1.DICT_LABEL,d1.DICT_VALUE  FROM  DEV_DICT d1 WHERE PARENT_ID = (SELECT d2.ID  FROM  DEV_DICT d2 WHERE d2.DICT_VALUE='RESOURCE_TYPE') )dd1 WHERE dd1.DICT_VALUE = TRIM(t1.RESOURCE_TYPE) ),'') AS resourceTypeName,
+            IFNULL (rt.NAME,'') AS resourceTypeName,
             IFNULL (t1.KEYWORD ,'') as keyword,
             IFNULL (t1.KEYWORD_VALUE  ,'') as keywordValue
         FROM COURSE_AUDIT_RECORD t1
+        LEFT JOIN resource_type rt  ON t1.RESOURCE_TYPE =rt.ID AND rt.DELETE_FLAG ='NOT_DELETE'
         LEFT JOIN college t4 ON t1.COLLEGE_ID=t4.id AND t4.DELETE_FLAG ='NOT_DELETE'
         LEFT JOIN major t5 ON t1.MAJOR_ID=t5.id AND t5.DELETE_FLAG ='NOT_DELETE'
         LEFT JOIN college t42 ON t1.COLLEGE_TWO_ID=t42.id AND t42.DELETE_FLAG ='NOT_DELETE'

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

@@ -40,4 +40,20 @@
        </where>
        order by a.CREATE_TIME desc
    </select>
+    <select id="queryResourceCollectVoList" resultType="vip.xiaonuo.disk.vo.collect.ResourceCollectVo">
+        SELECT
+            a."id",
+            a."resource_id" resourceId,
+            a."user_id" userId,
+            a.DELETE_FLAG,
+            a.UPDATE_TIME,
+            a.CREATE_TIME,
+            a.CREATE_USER,
+            a.UPDATE_USER
+        FROM
+            SYSDBA."resource_collect" a
+        <if test="resourceId!=null and resourceId != ''">
+            and a.resource_id =#{resourceId}
+        </if>
+    </select>
 </mapper>

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

@@ -18,8 +18,10 @@ import vip.xiaonuo.disk.domain.ResourceCollect;
 import vip.xiaonuo.disk.param.ResourceCollectAddParam;
 import vip.xiaonuo.disk.param.ResourceCollectPageParam;
 import vip.xiaonuo.disk.vo.collect.ResourceCollectVo;
+import vip.xiaonuo.disk.vo.comment.UserCommentVo;
 
 import javax.validation.Valid;
+import java.util.List;
 
 /**
  * resource_collectService接口
@@ -32,6 +34,9 @@ public interface ResourceCollectService extends IService<ResourceCollect> {
 
     Boolean queryList(String resourceId);
 
+
+    List<ResourceCollectVo> queryResourceCollectVoList(String resourceId);
+
     void add(@Valid ResourceCollectAddParam resourceCollectAddParam);
 
     void cancel(@Valid ResourceCollectAddParam resourceCollectAddParam);

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

@@ -25,6 +25,9 @@ import vip.xiaonuo.disk.param.ResourceCollectAddParam;
 import vip.xiaonuo.disk.param.ResourceCollectPageParam;
 import vip.xiaonuo.disk.service.ResourceCollectService;
 import vip.xiaonuo.disk.vo.collect.ResourceCollectVo;
+import vip.xiaonuo.disk.vo.comment.UserCommentVo;
+
+import java.util.List;
 
 /**
  * resource_collectService接口实现类
@@ -51,6 +54,13 @@ public class ResourceCollectServiceImpl extends ServiceImpl<ResourceCollectMappe
         return false;
     }
 
+    @Override
+    public List<ResourceCollectVo> queryResourceCollectVoList(String resourceId)
+    {
+        List<ResourceCollectVo> list=resourceCollectMapper.queryResourceCollectVoList(resourceId);
+        return list;
+    }
+
     @Override
     public void add(ResourceCollectAddParam resourceCollectAddParam) {
         ResourceCollect resourceCollect = BeanUtil.toBean(resourceCollectAddParam, ResourceCollect.class);