删除数据时只取文件地址

sapi/src/main/java/com/xhkjedu/sapi/mapper/appversion/AppRecordMapper.java

@@ -49,5 +49,5 @@ public interface AppRecordMapper extends TkMapper<TAppRecord> {
      * @Date 2021/10/26 15:58
      * @return java.util.List<java.lang.String>
      **/
-    List<String> listFolder(Integer versionid);
+    List<String> listApppath(Integer versionid);
 }

sapi/src/main/java/com/xhkjedu/sapi/mapper/appversion/AppStuappMapper.java

@@ -40,11 +40,11 @@ public interface AppStuappMapper extends TkMapper<TAppStuapp> {
     List<Map> listNews();
 
     /**
-     * 获取APP文件夹
+     * 获取APP文件
      * @Param [versionid]
      * @Author ywx
      * @Date 2021/10/26 15:58
      * @return java.util.List<java.lang.String>
      **/
-    List<String> listFolder(Integer versionid);
+    List<String> listApppath(Integer versionid);
 }

sapi/src/main/java/com/xhkjedu/sapi/mapper/appversion/AppStuliveMapper.java

@@ -36,11 +36,11 @@ public interface AppStuliveMapper extends TkMapper<TAppStulive> {
     TAppStulive findById(@Param("versionid") Integer versionid);
 
     /**
-     * 获取APP文件夹
+     * 获取APP文件
      * @Param [versionid]
      * @Author ywx
      * @Date 2021/10/26 15:58
      * @return java.util.List<java.lang.String>
      **/
-    List<String> listFolder(Integer versionid);
+    List<String> listApppath(Integer versionid);
 }

sapi/src/main/java/com/xhkjedu/sapi/mapper/appversion/AppTeacherappMapper.java

@@ -36,11 +36,11 @@ public interface AppTeacherappMapper extends TkMapper<TAppTeacherapp> {
     TAppTeacherapp findById(@Param("versionid") Integer versionid);
 
     /**
-     * 获取APP文件夹
+     * 获取APP文件
      * @Param [versionid]
      * @Author ywx
      * @Date 2021/10/26 15:58
      * @return java.util.List<java.lang.String>
      **/
-    List<String> listFolder(Integer versionid);
+    List<String> listApppath(Integer versionid);
 }

sapi/src/main/java/com/xhkjedu/sapi/mapper/appversion/AppTeacherclientMapper.java

@@ -42,5 +42,5 @@ public interface AppTeacherclientMapper extends TkMapper<TAppTeacherclient> {
      * @Date 2021/10/26 15:58
      * @return java.util.List<java.lang.String>
      **/
-    List<String> listFolder(Integer versionid);
+    List<String> listApppath(Integer versionid);
 }

sapi/src/main/java/com/xhkjedu/sapi/mapper/appversion/AppTeacherliveMapper.java

@@ -36,11 +36,11 @@ public interface AppTeacherliveMapper extends TkMapper<TAppTeacherlive> {
     TAppTeacherlive findById(@Param("versionid") Integer versionid);
 
     /**
-     * 获取APP文件夹
+     * 获取APP文件
      * @Param [versionid]
      * @Author ywx
      * @Date 2021/10/26 15:58
      * @return java.util.List<java.lang.String>
      **/
-    List<String> listFolder(Integer versionid);
+    List<String> listApppath(Integer versionid);
 }

sapi/src/main/java/com/xhkjedu/sapi/mapper/appversion/AppthirdHistoryMapper.java

@@ -7,20 +7,20 @@ import java.util.List;
 
 public interface AppthirdHistoryMapper extends TkMapper<TAppthirdHistory> {
     /**
-     * 获取APP文件夹
+     * 获取APP文件
      * @Param [appid]
      * @Author ywx
      * @Date 2021/10/26 16:15
      * @return java.util.List<java.lang.String>
      **/
-    List<String> listFolder(Integer appid);
+    List<String> listApppath(Integer appid);
 
     /**
-     * 获取APP文件夹
+     * 获取APP文件
      * @Param [apphid]
      * @Author ywx
      * @Date 2021/10/26 16:29
      * @return java.util.List<java.lang.String>
      **/
-    List<String> listFolder2(Integer apphid);
+    List<String> listApppath2(Integer apphid);
 }

sapi/src/main/java/com/xhkjedu/sapi/mapper/itemtool/ReadMapper.java

@@ -87,7 +87,7 @@ public interface ReadMapper extends TkMapper<TRead> {
      * @Date 2021/10/26 16:25
      * @return java.util.List<java.lang.String>
      **/
-    List<String> listFolder(Integer readid);
+    List<TRead> listReadPath(Integer readid);
 
     //////////////////////////////////////////////学生WEB端//////////////////////////////////////////////
     /**

sapi/src/main/java/com/xhkjedu/sapi/mapper/research/ResearchMapper.java

@@ -63,11 +63,11 @@ public interface ResearchMapper extends TkMapper<TResearch> {
     Integer updateResourceMp4code(@Param("research") TResearch research);
 
     /**
-     * 获取教研文件夹
+     * 获取教研文件
      * @Param [researchid]
      * @Author ywx
      * @Date 2021/10/26 15:41
      * @return java.util.List<java.lang.String>
      **/
-    List<String> listFolder(Integer researchid);
+    List<TResearch> listResarchpath(Integer researchid);
 }

sapi/src/main/java/com/xhkjedu/sapi/service/appversion/AppRecordService.java

@@ -33,9 +33,12 @@ public class AppRecordService {
 
     //删除
     public Integer deleteById(Integer versionid) {
-        List<String> resourceUrls = appRecordMapper.listFolder(versionid);//获取APP文件夹
-        messageSender.resourceDel(resourceUrls);//给文件服务器发送mq删除文件
-        return appRecordMapper.deleteByPrimaryKey(versionid);
+        Integer result = appRecordMapper.deleteByPrimaryKey(versionid);
+        List<String> resourceUrls = appRecordMapper.listApppath(versionid);//获取APP文件夹
+        if(N_Utils.isListNotEmpty(resourceUrls)){
+            messageSender.resourceDel(resourceUrls);//给文件服务器发送mq删除文件
+        }
+        return result;
     }
 
     //修改

sapi/src/main/java/com/xhkjedu/sapi/service/appversion/AppStuappService.java

@@ -34,9 +34,12 @@ public class AppStuappService {
 
     //删除
     public Integer deleteById(Integer versionid) {
-        List<String> resourceUrls = appStuappMapper.listFolder(versionid);//获取APP文件夹
-        messageSender.resourceDel(resourceUrls);//给文件服务器发送mq删除文件
-        return appStuappMapper.deleteByPrimaryKey(versionid);
+        Integer result = appStuappMapper.deleteByPrimaryKey(versionid);
+        List<String> resourceUrls = appStuappMapper.listApppath(versionid);//获取APP文件
+        if(N_Utils.isListNotEmpty(resourceUrls)){
+            messageSender.resourceDel(resourceUrls);//给文件服务器发送mq删除文件
+        }
+        return result;
     }
 
     //修改

sapi/src/main/java/com/xhkjedu/sapi/service/appversion/AppStuliveService.java

@@ -33,9 +33,12 @@ public class AppStuliveService {
 
     //删除
     public Integer deleteById(Integer versionid) {
-        List<String> resourceUrls = appStuliveMapper.listFolder(versionid);//获取APP文件夹
-        messageSender.resourceDel(resourceUrls);//给文件服务器发送mq删除文件
-        return appStuliveMapper.deleteByPrimaryKey(versionid);
+        Integer result = appStuliveMapper.deleteByPrimaryKey(versionid);
+        List<String> resourceUrls = appStuliveMapper.listApppath(versionid);//获取APP文件
+        if(N_Utils.isListNotEmpty(resourceUrls)){
+            messageSender.resourceDel(resourceUrls);//给文件服务器发送mq删除文件
+        }
+        return result;
     }
 
     //修改

sapi/src/main/java/com/xhkjedu/sapi/service/appversion/AppTeacherappService.java

@@ -33,9 +33,12 @@ public class AppTeacherappService {
 
     //删除
     public Integer deleteById(Integer versionid) {
-        List<String> resourceUrls = appTeacherappMapper.listFolder(versionid);//获取APP文件夹
-        messageSender.resourceDel(resourceUrls);//给文件服务器发送mq删除文件
-        return appTeacherappMapper.deleteByPrimaryKey(versionid);
+        Integer result = appTeacherappMapper.deleteByPrimaryKey(versionid);
+        List<String> resourceUrls = appTeacherappMapper.listApppath(versionid);//获取APP文件夹
+        if(N_Utils.isListNotEmpty(resourceUrls)){
+            messageSender.resourceDel(resourceUrls);//给文件服务器发送mq删除文件
+        }
+        return result;
     }
 
     //修改

sapi/src/main/java/com/xhkjedu/sapi/service/appversion/AppTeacherclientService.java

@@ -33,9 +33,12 @@ public class AppTeacherclientService {
 
     //删除
     public Integer deleteById(Integer versionid) {
-        List<String> resourceUrls = appTeacherclientMapper.listFolder(versionid);//获取APP文件夹
-        messageSender.resourceDel(resourceUrls);//给文件服务器发送mq删除文件
-        return appTeacherclientMapper.deleteByPrimaryKey(versionid);
+        Integer result = appTeacherclientMapper.deleteByPrimaryKey(versionid);
+        List<String> resourceUrls = appTeacherclientMapper.listApppath(versionid);//获取APP文件夹
+        if(N_Utils.isListNotEmpty(resourceUrls)){
+            messageSender.resourceDel(resourceUrls);//给文件服务器发送mq删除文件
+        }
+        return result;
     }
 
     //修改

sapi/src/main/java/com/xhkjedu/sapi/service/appversion/AppTeacherliveService.java

@@ -33,9 +33,12 @@ public class AppTeacherliveService {
 
     //删除
     public Integer deleteById(Integer versionid) {
-        List<String> resourceUrls = appTeacherliveMapper.listFolder(versionid);//获取APP文件夹
-        messageSender.resourceDel(resourceUrls);//给文件服务器发送mq删除文件
-        return appTeacherliveMapper.deleteByPrimaryKey(versionid);
+        Integer result = appTeacherliveMapper.deleteByPrimaryKey(versionid);
+        List<String> resourceUrls = appTeacherliveMapper.listApppath(versionid);//获取APP文件夹
+        if(N_Utils.isListNotEmpty(resourceUrls)){
+            messageSender.resourceDel(resourceUrls);//给文件服务器发送mq删除文件
+        }
+        return result;
     }
 
     //修改

sapi/src/main/java/com/xhkjedu/sapi/service/appversion/AppthirdService.java

@@ -46,10 +46,13 @@ public class AppthirdService {
     //删除
     @Transactional(rollbackFor = Exception.class)
     public Integer deleteById(Integer appid) {
-        List<String> resourceUrls = appthirdHistoryMapper.listFolder(appid);//获取APP文件夹
-        messageSender.resourceDel(resourceUrls);//给文件服务器发送mq删除文件
+        Integer result = appthirdMapper.deleteByPrimaryKey(appid);
         handleThirdManager(appid, 2);//处理应用白名单
-        return appthirdMapper.deleteByPrimaryKey(appid);
+        List<String> resourceUrls = appthirdHistoryMapper.listApppath(appid);//获取APP文件夹
+        if(N_Utils.isListNotEmpty(resourceUrls)){
+            messageSender.resourceDel(resourceUrls);//给文件服务器发送mq删除文件
+        }
+        return result;
     }
 
     //修改
@@ -147,9 +150,11 @@ public class AppthirdService {
      * @return void
      **/
     public void deleteByApphId(Integer apphid) {
-        List<String> resourceUrls = appthirdHistoryMapper.listFolder2(apphid);//获取APP文件夹
-        messageSender.resourceDel(resourceUrls);//给文件服务器发送mq删除文件
         appthirdHistoryMapper.deleteByPrimaryKey(apphid);
+        List<String> resourceUrls = appthirdHistoryMapper.listApppath2(apphid);//获取APP文件
+        if(N_Utils.isListNotEmpty(resourceUrls)){
+            messageSender.resourceDel(resourceUrls);//给文件服务器发送mq删除文件
+        }
     }
 
     /**

sapi/src/main/java/com/xhkjedu/sapi/service/itemtool/ReadService.java

@@ -99,9 +99,23 @@ public class ReadService {
      * @return java.lang.Integer
      */
     public Integer del(Integer readid){
-        List<String> resourceUrls = readMapper.listFolder(readid);//获取电子书文件夹
-        messageSender.resourceDel(resourceUrls);//给文件服务器发送mq删除文件
-        return readMapper.deleteByPrimaryKey(readid);
+        Integer result = readMapper.deleteByPrimaryKey(readid);
+        List<TRead> readlist = readMapper.listReadPath(readid);//获取电子书文件
+        if(N_Utils.isListNotEmpty(readlist)){
+            List<String> resourceUrls = new ArrayList<>();
+            for(TRead r : readlist){
+                if(N_Utils.isNotEmpty(r.getReadthumb())){
+                    resourceUrls.add(r.getReadthumb());
+                }
+                if(N_Utils.isNotEmpty(r.getReadpath())){
+                    resourceUrls.add(r.getReadpath());
+                }
+            }
+            if(N_Utils.isNotEmpty(resourceUrls)){
+                messageSender.resourceDel(resourceUrls);//给文件服务器发送mq删除文件
+            }
+        }
+        return result;
     }
 
     /**

sapi/src/main/java/com/xhkjedu/sapi/service/research/ResearchService.java

@@ -144,9 +144,24 @@ public class ResearchService {
      * @date 2020/6/11
      */
     public Integer del(Integer researchid) {
-        List<String> resourceUrls = researchMapper.listFolder(researchid);//获取教研文件夹
-        messageSender.resourceDel(resourceUrls);//给文件服务器发送mq删除文件
-        return researchMapper.deleteByPrimaryKey(researchid);
+        Integer result = researchMapper.deleteByPrimaryKey(researchid);
+        List<TResearch> relist = researchMapper.listResarchpath(researchid);//获取教研文件
+        if(N_Utils.isListNotEmpty(relist)){
+            List<String> resourceUrls = new ArrayList<>();
+            for(TResearch r : relist){
+                if(N_Utils.isNotEmpty(r.getResearchcover())){
+                    resourceUrls.add(r.getResearchcover());
+                }
+                if(N_Utils.isNotEmpty(r.getResearchpath())){
+                    resourceUrls.add(r.getResearchpath());
+                }
+            }
+
+            if(N_Utils.isListNotEmpty(resourceUrls)){
+                messageSender.resourceDel(resourceUrls);//给文件服务器发送mq删除文件
+            }
+        }
+        return result;
     }
 
     /**

sapi/src/main/resources/mapper/appversion/AppRecordMapper.xml

@@ -16,8 +16,8 @@
         from t_app_record v left join t_user u on v.createid=u.userid
         where v.versionid=#{versionid} limit 1
     </select>
-    <!--获取APP文件夹-->
-    <select id="listFolder" resultType="java.lang.String">
-        SELECT SUBSTRING_INDEX(versionpath,'/',5) FROM t_app_record WHERE versionid=#{versionid}
+    <!--获取APP文件-->
+    <select id="listApppath" resultType="java.lang.String">
+        SELECT versionpath FROM t_app_record WHERE versionid=#{versionid}
     </select>
 </mapper>

sapi/src/main/resources/mapper/appversion/AppStuappMapper.xml

@@ -36,8 +36,8 @@
         (SELECT 23 apptype,versionname,versioncode,appsize,versionpath apppath,versioncomm
         FROM t_app_record ORDER BY versioncode DESC LIMIT 1)
     </select>
-    <!--获取APP文件夹-->
-    <select id="listFolder" resultType="java.lang.String">
-        SELECT SUBSTRING_INDEX(versionpath,'/',5) FROM t_app_stuapp WHERE versionid=#{versionid}
+    <!--获取APP文件-->
+    <select id="listApppath" resultType="java.lang.String">
+        SELECT versionpath FROM t_app_stuapp WHERE versionid=#{versionid}
     </select>
 </mapper>

sapi/src/main/resources/mapper/appversion/AppStuliveMapper.xml

@@ -16,8 +16,8 @@
         from t_app_stulive v left join t_user u on v.createid=u.userid
         where v.versionid=#{versionid} limit 1
     </select>
-    <!--获取APP文件夹-->
-    <select id="listFolder" resultType="java.lang.String">
-        SELECT SUBSTRING_INDEX(versionpath,'/',5) FROM t_app_stulive WHERE versionid=#{versionid}
+    <!--获取APP文件-->
+    <select id="listApppath" resultType="java.lang.String">
+        SELECT versionpath FROM t_app_stulive WHERE versionid=#{versionid}
     </select>
 </mapper>

sapi/src/main/resources/mapper/appversion/AppTeacherappMapper.xml

@@ -16,8 +16,8 @@
         from t_app_teacherapp v left join t_user u on v.createid=u.userid
         where v.versionid=#{versionid} limit 1
     </select>
-    <!--获取APP文件夹-->
-    <select id="listFolder" resultType="java.lang.String">
-        SELECT SUBSTRING_INDEX(versionpath,'/',5) FROM t_app_teacherapp WHERE versionid=#{versionid}
+    <!--获取APP文件-->
+    <select id="listApppath" resultType="java.lang.String">
+        SELECT versionpath FROM t_app_teacherapp WHERE versionid=#{versionid}
     </select>
 </mapper>

sapi/src/main/resources/mapper/appversion/AppTeacherclientMapper.xml

@@ -16,8 +16,8 @@
         from t_app_teacherclient v left join t_user u on v.createid=u.userid
         where v.versionid=#{versionid} limit 1
     </select>
-    <!--获取APP文件夹-->
-    <select id="listFolder" resultType="java.lang.String">
-        SELECT SUBSTRING_INDEX(versionpath,'/',5) FROM t_app_teacherclient WHERE versionid=#{versionid}
+    <!--获取APP文件-->
+    <select id="listApppath" resultType="java.lang.String">
+        SELECT versionpath FROM t_app_teacherclient WHERE versionid=#{versionid}
     </select>
 </mapper>

sapi/src/main/resources/mapper/appversion/AppTeacherliveMapper.xml

@@ -16,8 +16,8 @@
         from t_app_teacherlive v left join t_user u on v.createid=u.userid
         where v.versionid=#{versionid} limit 1
     </select>
-    <!--获取APP文件夹-->
-    <select id="listFolder" resultType="java.lang.String">
-        SELECT SUBSTRING_INDEX(versionpath,'/',5) FROM t_app_teacherlive WHERE versionid=#{versionid}
+    <!--获取APP文件-->
+    <select id="listApppath" resultType="java.lang.String">
+        SELECT versionpath FROM t_app_teacherlive WHERE versionid=#{versionid}
     </select>
 </mapper>

sapi/src/main/resources/mapper/appversion/AppthirdHistoryMapper.xml

@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.xhkjedu.sapi.mapper.appversion.AppthirdHistoryMapper">
-    <!--获取APP文件夹-->
-    <select id="listFolder" resultType="java.lang.String">
+    <!--获取APP文件-->
+    <select id="listApppath" resultType="java.lang.String">
         SELECT apphpath FROM t_appthird_history WHERE appid=#{appid}
         UNION SELECT applogo FROM t_appthird WHERE appid=#{appid}
     </select>
     <!--获取APP文件夹-->
-    <select id="listFolder2" resultType="java.lang.String">
+    <select id="listApppath2" resultType="java.lang.String">
         SELECT apphpath FROM t_appthird_history WHERE apphid=#{apphid}
     </select>
 </mapper>

sapi/src/main/resources/mapper/itemtool/ReadMapper.xml

@@ -92,8 +92,8 @@
         update t_read set readstate=#{readstate} where readstate=#{readstate2}
     </update>
     <!--获取电子书文件夹-->
-    <select id="listFolder" resultType="java.lang.String">
-        SELECT SUBSTRING_INDEX(readpath,'/',5) FROM t_read WHERE readid=#{readid}
+    <select id="listReadPath" resultType="com.xhkjedu.sapi.model.itemtool.TRead">
+        SELECT readthumb,readpath FROM t_read WHERE readid=#{readid}
     </select>
 
     <!--//////////////////////////////////////////////学生WEB端//////////////////////////////////////////////-->

sapi/src/main/resources/mapper/research/ResearchMapper.xml

@@ -43,8 +43,8 @@
     <update id="updateResourceMp4code">
         UPDATE t_research SET researchpath=#{research.researchpath},mp4code=#{research.mp4code} WHERE researchid=#{research.researchid}
     </update>
-    <!--获取教研文件夹-->
-    <select id="listFolder" resultType="java.lang.String">
-        SELECT SUBSTRING_INDEX(researchpath,'/',5) FROM t_research WHERE researchid=#{researchid}
+    <!--获取教研文件-->
+    <select id="listResarchpath" resultType="com.xhkjedu.sapi.model.research.TResearch">
+        SELECT researchcover,researchpath FROM t_research WHERE researchid=#{researchid}
     </select>
 </mapper>

sstudy/src/main/java/com/xhkjedu/sstudy/mapper/paper/PaperFileMapper.java

@@ -34,12 +34,4 @@ public interface PaperFileMapper extends TkMapper<TPaperFile> {
      */
     List<TPaperFile> listObjsByPaperid(@Param("paperid") Integer paperid);
 
-    /**
-     * 获取作业文件夹
-     * @Param [paperid]
-     * @Author ywx
-     * @Date 2021/10/26 15:29
-     * @return java.util.List<java.lang.String>
-     **/
-    List<String> listFolder(Integer paperid);
 }

sstudy/src/main/java/com/xhkjedu/sstudy/service/paper/PaperFileService.java

@@ -58,7 +58,7 @@ public class PaperFileService {
      * @Date 2021/10/26 15:30
      * @return java.util.List<java.lang.String>
      **/
-    public List<String> listFolder(Integer paperid) {
-        return paperFileMapper.listFolder(paperid);
-    }
+  /*  public List<String> listFolder(Integer paperid) {
+        return paperFileMapper.listObjsByPaperid(paperid);
+    }*/
 }

sstudy/src/main/java/com/xhkjedu/sstudy/service/paper/PaperService.java

@@ -93,7 +93,7 @@ public class PaperService {
 
             //答题卡中试题
             List<TPaperScantron> scanlist = new ArrayList<>();
-            qtypes.forEach(t->{
+            qtypes.forEach(t -> {
                 scanlist.addAll(t.getScantrons());
             });
             paper.setPapernum(scanlist.size());
@@ -104,17 +104,17 @@ public class PaperService {
 
             //保存作业关联信息
             List<TPaperFile> lst = paper.getPfiles();
-            if(lst==null || lst.size()==0 || scanlist ==null || scanlist.size()==0){
-            }else{
+            if (lst == null || lst.size() == 0 || scanlist == null || scanlist.size() == 0) {
+            } else {
                 //保存作业附件
                 savePaperScantronFile(paper);
                 //保存答题卡信息
-                savePaperScantronQtype(paper,qtypes);
+                savePaperScantronQtype(paper, qtypes);
                 //保存分析
                 //savePaperScantronAnalyze(paperid,paper.getSchoolid());
             }
 
-        }catch (Exception e){
+        } catch (Exception e) {
             log.error("保存答题卡作业失败：" + e.getMessage());
             TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
             throw new Exception("保存答题卡作业失败");
@@ -124,12 +124,13 @@ public class PaperService {
     }
 
     /**
-     *功能描述  答题卡作业--修改
-     * @author WN
-     * @date 2020/6/11
-     * @param  * @param paper
+     * 功能描述  答题卡作业--修改
+     *
+     * @param *      @param paper
      * @param qtypes
      * @return boolean
+     * @author WN
+     * @date 2020/6/11
      */
     @Transactional(rollbackFor = Exception.class)
     public boolean updateScantronPaper(TPaper paper, List<TPaperScantronQtype> qtypes) throws Exception {
@@ -138,7 +139,7 @@ public class PaperService {
 
             //答题卡中试题
             List<TPaperScantron> scanlist = new ArrayList<>();
-            qtypes.forEach(t->{
+            qtypes.forEach(t -> {
                 scanlist.addAll(t.getScantrons());
             });
             paper.setPapernum(scanlist.size());
@@ -167,7 +168,7 @@ public class PaperService {
             }
 
 
-        }catch (Exception e){
+        } catch (Exception e) {
             log.error("修改答题卡作业失败：" + e.getMessage());
             TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
             throw new Exception("修改答题卡作业失败");
@@ -176,13 +177,13 @@ public class PaperService {
     }
 
 
-
     /**
      * 保存作业
+     *
+     * @return void
      * @Param [paper]
      * @Author ywx
      * @Date 2020/6/10 10:29
-     * @return void
      **/
     private Integer savePaper(TPaper paper) {
         paper.setPaperstate(21);//作业状态：21未布置 22 已布置
@@ -197,10 +198,10 @@ public class PaperService {
     }
 
     //答题卡--保存作业附件信息
-    private void savePaperScantronFile(TPaper paper){
+    private void savePaperScantronFile(TPaper paper) {
         int fileorder = 1;
         List<TPaperFile> lst = paper.getPfiles();
-        for(TPaperFile pf : lst){
+        for (TPaperFile pf : lst) {
             pf.setCreateid(paper.getCreateid());
             pf.setCreatetime(N_Utils.getSecondTimestamp());
             pf.setSchoolid(paper.getSchoolid());
@@ -247,7 +248,7 @@ public class PaperService {
     }
 
     //保存答题卡分析
-    private Integer savePaperScantronAnalyze(Integer paperid,Integer schoolid){
+    private Integer savePaperScantronAnalyze(Integer paperid, Integer schoolid) {
         List<Map<String, Object>> list = paperScantronMapper.listQtypeAnalyze(paperid);
 
         TPaperAnalyze paperAnalyze = new TPaperAnalyze();
@@ -260,24 +261,37 @@ public class PaperService {
     }
 
     /**
-     *功能描述  删除作业
+     * 功能描述  删除作业
+     *
+     * @param * @param paper
+     * @return void
      * @author WN
      * @date 2020/6/9
-     * @param  * @param paper
-     * @return void
      */
-    public Integer delPaper(TPaper paper){
-        List<String> resourceUrls = paperFileService.listFolder(paper.getPaperid());//获取作业文件夹
-        messageSender.resourceDel(resourceUrls);//给文件服务器发送mq删除文件
+    public Integer delPaper(TPaper paper) {
+        List<TPaperFile> pfilelist = paperFileService.listObjsByPaperid(paper.getPaperid());//获取作业文件夹
+        if (N_Utils.isListNotEmpty(pfilelist)) {
+            List<String> resourceUrls = new ArrayList<>();
+            for (int i = 0; i < pfilelist.size(); i++) {
+                TPaperFile pf = pfilelist.get(i);
+                resourceUrls.add(pf.getFilepath());
+                if (i == 0) {
+                    resourceUrls.add(pf.getSourcepath());
+                }
+            }
+            messageSender.resourceDel(resourceUrls);//给文件服务器发送mq删除文件
+        }
+
         return paperMapper.delPaper(paper.getPaperid());
     }
 
     /**
      * 结构性试题作业--保存
+     *
+     * @return boolean
      * @Param [paper, qtypes]
      * @Author ywx
      * @Date 2020/6/10 8:11
-     * @return boolean
      **/
     @Transactional(rollbackFor = Exception.class)
     public Integer saveQuestionPaper(TPaper paper, List<TPaperQtype> qtypes) throws Exception {
@@ -288,20 +302,21 @@ public class PaperService {
             paper.setPaperid(paperid);
             savePaperQtype(paper, qtypes);//保存作业题型信息
             //generatePaperAnalyze(paperid, paper.getSchoolid());//生成作业分析
-        }catch (Exception e){
+        } catch (Exception e) {
             log.error("保存结构性试题作业失败：" + e.getMessage());
             TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
             throw new Exception("保存结构性试题作业失败");
-       }
+        }
         return paperid;
     }
 
     /**
      * 设置作业分值和试题数量
+     *
+     * @return void
      * @Param [paper, qtypes]
      * @Author ywx
      * @Date 2020/6/28 18:05
-     * @return void
      **/
     private void setPaperScoreAndNum(TPaper paper, List<TPaperQtype> qtypes) {
         List<QuestionVo> questionList = new ArrayList<>();
@@ -325,7 +340,7 @@ public class PaperService {
             //paperAnalyzeMapper.deleteByPaperid(paper.getPaperid());//删除分析信息
             //generatePaperAnalyze(paper.getPaperid(), paper.getSchoolid());//生成作业分析
             rtn = true;
-        }catch (Exception e){
+        } catch (Exception e) {
             log.error("保存结构性试题作业失败：" + e.getMessage());
             TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
             throw new Exception("保存结构性试题作业失败");
@@ -335,10 +350,11 @@ public class PaperService {
 
     /**
      * 保存作业题型信息
+     *
+     * @return void
      * @Param [paper, qtypes]
      * @Author ywx
      * @Date 2020/6/28 17:58
-     * @return void
      **/
     private void savePaperQtype(TPaper paper, List<TPaperQtype> qtypes) {
         Integer paperid = paper.getPaperid();
@@ -382,10 +398,11 @@ public class PaperService {
 
     /**
      * 生成作业分析
+     *
+     * @return java.lang.Integer
      * @Param [paperid, schoolid]
      * @Author ywx
      * @Date 2020/6/10 9:57
-     * @return java.lang.Integer
      **/
     private Integer generatePaperAnalyze(Integer paperid, Integer schoolid) {
         //1.题型统计
@@ -405,13 +422,14 @@ public class PaperService {
     }
 
     /**
-     *功能描述  详情--答题卡
+     * 功能描述  详情--答题卡
+     *
+     * @param * @param paperid
+     * @return com.xhkjedu.vo.paper.PaperScantronVo
      * @author WN
      * @date 2020/6/11
-     * @param  * @param paperid
-     * @return com.xhkjedu.vo.paper.PaperScantronVo
      */
-    public PaperScantronVo getPaperScantronDetial(Integer paperid){
+    public PaperScantronVo getPaperScantronDetial(Integer paperid) {
         PaperVo paper = paperMapper.findById(paperid);
         PaperScantronVo ps = new PaperScantronVo();
         ps.setPaperid(paperid);
@@ -439,10 +457,11 @@ public class PaperService {
 
     /**
      * 作业详情--结构性试题
+     *
+     * @return com.xhkjedu.vo.paper.PaperVo
      * @Param [paperid]
      * @Author ywx
      * @Date 2020/6/10 14:33
-     * @return com.xhkjedu.vo.paper.PaperVo
      **/
     public PaperVo findById(Integer paperid) {
         PaperVo paper = paperMapper.findById(paperid);
@@ -457,7 +476,7 @@ public class PaperService {
                 for (QuestionVo question : questions) {
                     String questionid = question.getQuestionid();
                     List<Map> qsList = students.stream().filter(s -> s.get("questionids").toString().contains(questionid))
-                            .collect(Collectors.toList());
+                                               .collect(Collectors.toList());
                     Map<Integer, List<Map>> classCollect = qsList.stream().collect(Collectors.groupingBy(m -> (Integer) m.get("classid")
                             , LinkedHashMap::new, Collectors.toList()));
                     List<Map> classes = new ArrayList<>();
@@ -480,28 +499,30 @@ public class PaperService {
 
     /**
      * 作业列表
+     *
+     * @return java.util.List<com.xhkjedu.vo.paper.PaperListVo>
      * @Param [paper]
      * @Author ywx
      * @Date 2020/6/11 16:30
-     * @return java.util.List<com.xhkjedu.vo.paper.PaperListVo>
      **/
     public List<PaperListVo> findAll(PaperSearchVo paper) {
-        if(paper.getPsstate()!=null && paper.getPsstate() == 21){
+        if (paper.getPsstate() != null && paper.getPsstate() == 21) {
             //未布置作业
             return paperMapper.listWfbPapers(paper);
-        }else{
+        } else {
             //全部作业
-            List<PaperListVo>  list = paperMapper.listAll(paper);
+            List<PaperListVo> list = paperMapper.listAll(paper);
             return getPaperListVo(list);
         }
     }
 
     /**
      * 设置批改方式
+     *
+     * @return void
      * @Param [param]
      * @Author ywx
      * @Date 2020/6/12 7:57
-     * @return void
      **/
     @Transactional(rollbackFor = Exception.class)
     public void setCheckType(PaperParam param) throws Exception {
@@ -510,12 +531,12 @@ public class PaperService {
 
         try {
             paperMapper.updateCheckType(paperid, checktype);//设置批改方式
-            if (checktype == 1){//教师批阅
+            if (checktype == 1) {//教师批阅
                 if (N_Utils.isEmptyInteger(param.getTeacherid())) {//不同班级分别指定教师
                     List<PaperCheckParam> checkParams = JSON.parseArray(param.getClassids(), PaperCheckParam.class);
                     paperStudentMapper.updateCheckId2(paperid, checkParams);
                 } else {//不同班级指定同一个教师
-                    paperStudentMapper.updateCheckId(paperid,param.getTeacherid());//设置批改人
+                    paperStudentMapper.updateCheckId(paperid, param.getTeacherid());//设置批改人
                 }
             } else {
                 List<PaperCheckParam> checkParams = JSON.parseArray(param.getClassids(), PaperCheckParam.class);
@@ -525,7 +546,7 @@ public class PaperService {
                 for (int i = 0; i < checkParams.size(); i++) {
                     PaperCheckParam gs = checkParams.get(i);
                     List<Integer> studentids = classStudents.stream().filter(cs -> cs.getClassid().equals(gs.getClassid()))
-                            .map(PaperCheckParam::getCheckid).collect(Collectors.toList());
+                                                            .map(PaperCheckParam::getCheckid).collect(Collectors.toList());
                     gs.setStudentids(studentids);
                     if (checktype == 2) {
                         //学生互改
@@ -563,38 +584,39 @@ public class PaperService {
             }
         } catch (Exception e) {
             TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
-            log.error("设置批改方式失败："+e.getMessage());
+            log.error("设置批改方式失败：" + e.getMessage());
             throw new Exception("设置批改方式失败");
         }
     }
 
     /**
      * 设置学生批改人对应关系
+     *
+     * @return java.util.List<com.xhkjedu.model.paperstudent.TPaperStudent>
      * @Param [paperid, checkParams, checktype, map]
      * @Author ywx
      * @Date 2020/6/12 9:05
-     * @return java.util.List<com.xhkjedu.model.paperstudent.TPaperStudent>
      **/
     private List<TPaperStudent> setStudentCheckId(Integer paperid, List<PaperCheckParam> checkParams, Integer checktype, Map<Integer, Integer> map) {
         List<TPaperStudent> list = new ArrayList<>();
-        for(int i=0;i<checkParams.size();i++){
+        for (int i = 0; i < checkParams.size(); i++) {
             PaperCheckParam cp = checkParams.get(i);
-            for(int j=0;j<cp.getStudentids().size();j++){
+            for (int j = 0; j < cp.getStudentids().size(); j++) {
                 TPaperStudent ps = new TPaperStudent();
                 ps.setPaperid(paperid);
                 ps.setClassid(cp.getClassid());
                 Integer studentid = cp.getStudentids().get(j);
                 ps.setStudentid(studentid);
                 Integer checkid;
-                if(checktype==1){
+                if (checktype == 1) {
                     checkid = cp.getCheckids().get(0);
-                } else if(checktype==2){
+                } else if (checktype == 2) {
                     checkid = cp.getCheckids().get(j);
-                }else{
+                } else {
                     //第一种只有一个批改人的
-                    if(cp.getCheckids().size()==1){
+                    if (cp.getCheckids().size() == 1) {
                         checkid = cp.getCheckids().get(0);
-                    }else{
+                    } else {
                         checkid = map.get(studentid);
                     }
                 }
@@ -606,32 +628,32 @@ public class PaperService {
     }
 
     //设置作业批改人（选择指定学生）
-    private Map<Integer,Integer> setStudentIdCheckerId(PaperCheckParam gs){
-        Map<Integer,Integer> map = new HashMap<>();
+    private Map<Integer, Integer> setStudentIdCheckerId(PaperCheckParam gs) {
+        Map<Integer, Integer> map = new HashMap<>();
         //选择学生批改
         List<Integer> allstudents = new ArrayList<>();//所有有作业的学生
         allstudents.addAll(gs.getStudentids());
         //去除选中的是批改人的作业
-        for(int k=0;k<gs.getCheckids().size();k++){
+        for (int k = 0; k < gs.getCheckids().size(); k++) {
             allstudents.remove(gs.getCheckids().get(k));//把批改人的作业去除
         }
 
         List<List<Integer>> result = N_Utils.averageAssignList(allstudents, gs.getCheckids().size());
         Collections.shuffle(gs.getCheckids());//重置批改作业人顺序
 
-        for(int l=0;l<result.size();l++){
+        for (int l = 0; l < result.size(); l++) {
             List<Integer> groupstu = new ArrayList<>();
             groupstu.addAll(result.get(l));
 
-            if(l==0){
+            if (l == 0) {
                 //把最有一个用户的作业插入这个集合中（避免数据自己批改自己的作业）
-                groupstu.add(gs.getCheckids().get(result.size()-1));
-            }else{
+                groupstu.add(gs.getCheckids().get(result.size() - 1));
+            } else {
                 //否则把上一个加入到作业集合中（避免数据自己批改自己的作业）
-                int n = l-1;
+                int n = l - 1;
                 groupstu.add(gs.getCheckids().get(n));
             }
-            for(int m=0;m<groupstu.size();m++){
+            for (int m = 0; m < groupstu.size(); m++) {
                 map.put(groupstu.get(m), gs.getCheckids().get(l));//设置批改人
             }
         }
@@ -639,23 +661,24 @@ public class PaperService {
     }
 
     /**
-     *获取批改学生列表
+     * 获取批改学生列表
+     *
+     * @return com.xhkjedu.vo.paper.CheckClassVo
      * @Param [paperid, checkid, classid]
      * @Author ywx
      * @Date 2020/6/12 11:00
-     * @return com.xhkjedu.vo.paper.CheckClassVo
      **/
     public CheckClassVo listStudentsByPaperIdCheckId(Integer paperid, Integer checkid, Integer classid) {
         CheckClassVo checkVo = paperMapper.listStudentsByPaperIdCheckId(paperid, checkid, classid);
         Integer ytjnum = checkVo.getYtjnum();
-        checkVo.setWtjnum(checkVo.getClassnum()-ytjnum);
-        if (!N_Utils.isEmptyInteger(ytjnum)){
-            double scale = N_Utils.getIntegerDivideAndMulitiply(checkVo.getYpynum(),ytjnum);
+        checkVo.setWtjnum(checkVo.getClassnum() - ytjnum);
+        if (!N_Utils.isEmptyInteger(ytjnum)) {
+            double scale = N_Utils.getIntegerDivideAndMulitiply(checkVo.getYpynum(), ytjnum);
             checkVo.setScale(scale);
         } else {
             checkVo.setScale(0);
         }
-        if(checkVo.getYpynum() == null){
+        if (checkVo.getYpynum() == null) {
             checkVo.setYpynum(0);
         }
         return checkVo;
@@ -663,10 +686,11 @@ public class PaperService {
 
     /**
      * 教师批阅列表
+     *
+     * @return java.util.List<com.xhkjedu.vo.paper.PaperListVo>
      * @Param [checkid]
      * @Author ywx
      * @Date 2020/6/18 14:55
-     * @return java.util.List<com.xhkjedu.vo.paper.PaperListVo>
      **/
     public List<PaperListVo> correctList(Integer checkid) {
         List<PaperListVo> list = paperMapper.correctList(checkid);
@@ -675,14 +699,15 @@ public class PaperService {
 
     /**
      * 作业列表
+     *
+     * @return java.util.List<com.xhkjedu.vo.paper.PaperListVo>
      * @Param [list]
      * @Author ywx
      * @Date 2020/6/18 15:09
-     * @return java.util.List<com.xhkjedu.vo.paper.PaperListVo>
      **/
     private List<PaperListVo> getPaperListVo(List<PaperListVo> list) {
         for (PaperListVo p : list) {
-            if (p.getPaperstate() == 21){//未布置
+            if (p.getPaperstate() == 21) {//未布置
                 p.setClasses(null);
             } else {
                 List<PaperClassVo> classes = p.getClasses();
@@ -698,10 +723,11 @@ public class PaperService {
 
     /**
      * 作业附件列表
+     *
+     * @return java.util.List<com.xhkjedu.model.paper.TPaperFile>
      * @Param [paperid]
      * @Author ywx
      * @Date 2020/6/23 21:53
-     * @return java.util.List<com.xhkjedu.model.paper.TPaperFile>
      **/
     public List<TPaperFile> listPaperFile(Integer paperid, Integer fileclass) {
         return paperMapper.listPaperFile(paperid, fileclass);
@@ -715,7 +741,7 @@ public class PaperService {
     //获取今天布置作业数量
     public String getPaperNum(String subjectid, Integer createid, Integer createtime) {
         Integer num = paperMapper.getPaperNum(subjectid, createid, createtime);
-        String paperNum = "("+ N_Utils.NumberToChn(num)+")";
+        String paperNum = "(" + N_Utils.NumberToChn(num) + ")";
         return paperNum;
     }
 

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

@@ -239,8 +239,15 @@ public class GuideService {
                 resourceMapper.deleteByIdReal(resourceid);
                 Map resource = resources.get(i);
                 String resourceurl = resource.get("resourceurl").toString();
-                resourceurl = resourceurl.substring(0,resourceurl.lastIndexOf("/"));
                 resourceUrls.add(resourceurl);
+                if(N_Utils.isNotEmpty(resource.get("pdfurl"))){
+                    String pdfurl = resource.get("pdfurl").toString();
+                    resourceUrls.add(pdfurl);
+                }
+                if(N_Utils.isNotEmpty(resource.get("resourcecover"))){
+                    String resourcecover = resource.get("resourcecover").toString();
+                    resourceUrls.add(resourcecover);
+                }
             }
         }
 

sstudy/src/main/resources/mapper/paper/PaperFileMapper.xml

@@ -9,11 +9,7 @@
 
     <!-- 根据作业id获取作业附件 -->
     <select id="listObjsByPaperid" resultType="com.xhkjedu.sstudy.model.paper.TPaperFile">
-        SELECT pfid,paperid,filepath,fileclass,fileorder,createtime
+        SELECT pfid,paperid,filepath,sourcepath,fileclass,fileorder,createtime
         FROM t_paper_file WHERE paperid=#{paperid} ORDER BY fileorder asc
     </select>
-    <!--获取作业文件夹-->
-    <select id="listFolder" resultType="java.lang.String">
-        SELECT SUBSTRING_INDEX(sourcepath,'/',5) FROM t_paper_file WHERE paperid=#{paperid} GROUP BY fileclass
-    </select>
 </mapper>