试题、资源列表sharenum获取完善

sstudy/src/main/java/com/xhkjedu/sstudy/controller/resource/ResourceController.java

@@ -165,6 +165,13 @@ public class ResourceController {
         return new ResultVo(0,"更新下载次数成功");
     }
 
+    /**
+     * @Description 我的空间（网页、app端）
+     * @Date 2023/9/1 15:39
+     * @Author YWX
+     * @Param [tResource]
+     * @Return com.xhkjedu.vo.ResultVo
+     **/
     @PostMapping("/my_list")
     public ResultVo myList(@RequestBody TResource tResource) {
         Integer page = tResource.getPage();
@@ -179,6 +186,13 @@ public class ResourceController {
         return new ResultVo(0,"获取教师备课资源列表成功",pageResult);
     }
 
+    /**
+     * @Description 我的空间（课堂端）
+     * @Date 2023/9/1 15:38
+     * @Author YWX
+     * @Param [tResource]
+     * @Return com.xhkjedu.vo.ResultVo
+     **/
     @PostMapping("/my_list2")
     public ResultVo myList2(@RequestBody TResource tResource) {
         Integer createid = tResource.getCreateid();

sstudy/src/main/java/com/xhkjedu/sstudy/mapper/question/QuestionMapper.java

@@ -101,4 +101,7 @@ public interface QuestionMapper extends TkMapper<TQuestion> {
     //更新分享过伙伴校试题的时间
     void batchUpdateTime(@Param("list") List<Integer> schoolIds, @Param("shareqid") String shareqid
             ,@Param("timestamp") int timestamp);
+
+    //试题是否分享过
+    List<Map<String, String>> listShareNumByIds(@Param("shareqids") String shareqids);
 }

sstudy/src/main/java/com/xhkjedu/sstudy/mapper/resource/ResourceMapper.java

@@ -87,4 +87,7 @@ public interface ResourceMapper extends TkMapper<TResource> {
     //更新分享过伙伴校资源的时间
     void batchUpdateTime(@Param("list") List<Integer> schoolIds,@Param("resourceid") String resourceid
             ,@Param("timestamp") int timestamp);
+
+    //资源是否分享过
+    List<Map<String, String>> listShareNumByIds(@Param("shareqids") String shareqids);
 }

sstudy/src/main/java/com/xhkjedu/sstudy/service/question/QuestionService.java

@@ -15,7 +15,6 @@ import com.xhkjedu.sstudy.vo.subjectbook.DirectorVo;
 import com.xhkjedu.utils.N_Utils;
 import com.xhkjedu.vo.ResultVo;
 import org.springframework.beans.BeanUtils;
-import org.springframework.scheduling.annotation.Async;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.CollectionUtils;
@@ -89,7 +88,16 @@ public class QuestionService {
 
     //获取列表
     public List <Map<String, Object>> findAll(TQuestion question) {
-        return questionMapper.findAll(question);
+        List<Map<String, Object>> list = questionMapper.findAll(question);
+        Integer schoolid = question.getSchoolid();
+        if(N_Utils.isEmptyInteger(schoolid)) return list;
+        String shareqids = list.stream().filter(m -> schoolid.equals(m.get("schoolid")) && !m.get("belong").equals(10))
+                               .map(m -> m.get("questionid").toString()).collect(Collectors.joining("','"));
+        List<Map<String, String>> shareList = questionMapper.listShareNumByIds(shareqids);
+        for (Map<String, Object> map : list) {
+            setShareNum(shareList, map);
+        }
+        return list;
     }
 
     /**
@@ -272,15 +280,49 @@ public class QuestionService {
         List<Map<String, Object>> list = questionMapper.listForSelect(question);
         String questionids = list.stream().filter(m -> m.get("qlevel").toString().equals("2")).map(
                 m -> m.get("questionid").toString()).collect(Collectors.joining("','"));
+        boolean rtn = false;
+        List<Map<String, String>> sonList;
         if (N_Utils.isNotEmpty(questionids)) {
-            List<Map<String, String>> sonList = questionMapper.listSonQuestionForSelect(questionids);
-            for (Map<String, Object> map : list) {
+            sonList = questionMapper.listSonQuestionForSelect(questionids);
+            rtn = true;
+        } else {
+            sonList = null;
+        }
+
+        Integer createid = question.getCreateid();
+        String shareqids = list.stream().filter(m -> createid.equals(m.get("createid")) && !m.get("belong").equals(10))
+                               .map(m -> m.get("questionid").toString()).collect(Collectors.joining("','"));
+        List<Map<String, String>> shareList = questionMapper.listShareNumByIds(shareqids);
+        for (Map<String, Object> map : list) {
+            setShareNum(shareList, map);
+            if (rtn) {
                 setSonQList(sonList, map);
             }
         }
         return list;
     }
 
+    /**
+     * @Description 试题是否分享过
+     * @Date 2023/9/1 14:28
+     * @Author YWX
+     * @Param [shareList, map]
+     * @Return void
+     **/
+    private void setShareNum(List<Map<String, String>> shareList, Map<String, Object> map) {
+        Object shareqid = map.get("questionid");
+        Object sharenum = 0;
+        if (N_Utils.isListNotEmpty(shareList)) {
+            for (Map<String, String> s : shareList) {
+                if (s.get("shareqid").equals(shareqid)) {
+                    sharenum = s.get("sharenum");
+                    break;
+                }
+            }
+        }
+        map.put("sharenum", sharenum);
+    }
+
     /**
      * @Description 处理试题子题
      * @Date 2023/8/16 8:38
@@ -288,7 +330,6 @@ public class QuestionService {
      * @Param [sonList, map]
      * @Return void
      **/
-    @Async("asyncPoolTaskExecutor")
     public void setSonQList(List<Map<String, String>> sonList, Map<String, Object> map) {
         if (map.get("qlevel").toString().equals("2")) {
             Object questionid = map.get("questionid");

sstudy/src/main/java/com/xhkjedu/sstudy/service/resource/ResourceService.java

@@ -147,7 +147,16 @@ public class ResourceService {
 
     //获取列表
     public List <Map> findAll(TResource tResource) {
-        return resourceMapper.findAll(tResource);
+        List<Map> list = resourceMapper.findAll(tResource);
+        Integer schoolid = tResource.getSchoolid();
+        if(N_Utils.isEmptyInteger(schoolid)) return list;
+        String shareqids = list.stream().filter(m -> schoolid.equals(m.get("schoolid")) && !m.get("belong").equals(10))
+                               .map(m -> m.get("resourceid").toString()).collect(Collectors.joining("','"));
+        List<Map<String, String>> shareList = resourceMapper.listShareNumByIds(shareqids);
+        for (Map map : list) {
+            setShareNum(shareList, map);
+        }
+        return list;
     }
 
     //分享
@@ -230,7 +239,34 @@ public class ResourceService {
      * @return java.util.List<com.xhkjedu.model.resource.TResource>
      **/
     public List<Map> listMyResource(TResource resource) {
-        return resourceMapper.listMyResource(resource);
+        List<Map> list = resourceMapper.listMyResource(resource);
+        String shareqids = list.stream().map(m -> m.get("resourceid").toString()).collect(Collectors.joining("','"));
+        List<Map<String, String>> shareList = resourceMapper.listShareNumByIds(shareqids);
+        for (Map map : list) {
+            setShareNum(shareList, map);
+        }
+        return list;
+    }
+
+    /**
+     * @Description 资源是否分享过
+     * @Date 2023/9/1 15:12
+     * @Author YWX
+     * @Param [shareList, map]
+     * @Return void
+     **/
+    private void setShareNum(List<Map<String, String>> shareList, Map<String, Object> map) {
+        Object shareqid = map.get("resourceid");
+        Object sharenum = 0;
+        if (N_Utils.isListNotEmpty(shareList)) {
+            for (Map<String, String> s : shareList) {
+                if (s.get("resourcepid").equals(shareqid)) {
+                    sharenum = s.get("sharenum");
+                    break;
+                }
+            }
+        }
+        map.put("sharenum", sharenum);
     }
 
     /**

sstudy/src/main/resources/mapper/question/QuestionMapper.xml

@@ -199,7 +199,6 @@
         select q.questionid,q.score,q.complexity,q.qstem,q.qstemtxt,q.qoption,q.qanswer,q.qanalyze
         ,q.qtypeid,q.qtypename,q.count,q.ctype,q.source,q.year,q.region,q.schoolname
         ,q.qlevel,q.hearfile,q.hashear,q.belong,q.createid,q.schoolid
-        ,(select count(*) from t_question q2 where q2.shareqid=q.questionid and q2.qstate=1 and q.schoolid=#{question.schoolid})sharenum
         from t_question q
         <if test="question.pointid!=null and question.pointid!='0'.toString() and question.pointid!=''">
             left join t_question_point qp on q.questionid = qp.questionid
@@ -265,6 +264,12 @@
         and q.qlevel &lt; 3
         group by q.questionid order by q.createtime desc
     </select>
+    <!--试题是否分享过-->
+    <select id="listShareNumByIds" resultType="java.util.Map">
+        select shareqid,count(*) as sharenum
+        from t_question where qstate=1 and shareqid in('${shareqids}')
+        group by shareqid
+    </select>
 
     <select id="listSonQuestionForSelect" resultType="java.util.Map">
         select q.questionid,q.questionpid,q.score,q.complexity,q.qstem,q.qstemtxt,q.qoption,q.qanswer,q.qanalyze

sstudy/src/main/resources/mapper/resource/ResourceMapper.xml

@@ -14,7 +14,6 @@
         rd.directorid,r.resourceclass,r.resourcetype,r.readcount,r.downcount,r.pdfurl,r.converted,r.resourcecover
         ,r.comm,r.duration,r.resourcesize,r.mp4code,r.createid,r.belong,r.schoolid
         ,r.resourcegrade,r.source,r.year,r.region,r.schoolname
-        ,(select count(*) from t_resource r2 where r2.resourcepid=r.resourceid and r.resourcestate=1)sharenum
         from t_resource r left join t_user u on u.userid=r.createid
         left join t_resource_director rd on r.resourceid=rd.resourceid
         <if test="resource.belong!=null and resource.belong==5">
@@ -89,7 +88,6 @@
         select r.resourceid,r.resourcename,r.createtime,r.suffix,u.username createname,r.resourceurl,rd.lsbid,
         rd.directorid,r.resourceclass,r.resourcetype,r.readcount,r.downcount,r.pdfurl,r.converted,r.resourcecover
         ,r.comm,r.duration,r.resourcesize,r.mp4code
-        ,(select count(*) from t_resource r2 where r2.resourcepid=r.resourceid and r.resourcestate=1)sharenum
         from t_resource r left join t_user u on u.userid=r.createid
         left join t_resource_director rd on r.resourceid=rd.resourceid
         where r.resourcestate=1 and r.level=#{resource.level} and r.createid=#{resource.createid}
@@ -110,6 +108,12 @@
         </if>
         order by r.createtime desc,r.resourcename,r.resourceid
     </select>
+    <!--资源是否分享过-->
+    <select id="listShareNumByIds" resultType="java.util.Map">
+        select resourcepid,count(*) as sharenum
+        from t_resource where resourcestate=1 and resourcepid in('${shareqids}')
+        group by resourcepid
+    </select>
 
     <!--详情-->
     <resultMap id="resourceResult" type="com.xhkjedu.sstudy.vo.resource.ResourceVo">