处理删除顺序

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

@@ -43,7 +43,7 @@ public interface AppRecordMapper extends TkMapper<TAppRecord> {
     TAppRecord findById(@Param("versionid") Integer versionid);
 
     /**
-     * 获取APP文件夹
+     * 获取APP文件
      * @Param [versionid]
      * @Author ywx
      * @Date 2021/10/26 15:58

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<TRead> listReadPath(Integer readid);
+    TRead getReadPath(Integer readid);
 
     //////////////////////////////////////////////学生WEB端//////////////////////////////////////////////
     /**

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

@@ -69,5 +69,5 @@ public interface ResearchMapper extends TkMapper<TResearch> {
      * @Date 2021/10/26 15:41
      * @return java.util.List<java.lang.String>
      **/
-    List<TResearch> listResarchpath(Integer researchid);
+    TResearch getResarchpath(Integer researchid);
 }

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

@@ -99,21 +99,17 @@ public class ReadService {
      * @return java.lang.Integer
      */
     public Integer del(Integer readid){
+        TRead read = readMapper.getReadPath(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删除文件
-            }
+        List<String> resourceUrls = new ArrayList<>();
+        if(read != null && N_Utils.isNotEmpty(read.getReadthumb())){
+            resourceUrls.add(read.getReadthumb());
+        }
+        if(read != null && N_Utils.isNotEmpty(read.getReadpath())){
+            resourceUrls.add(read.getReadpath());
+        }
+        if(N_Utils.isNotEmpty(resourceUrls)){
+            messageSender.resourceDel(resourceUrls);//给文件服务器发送mq删除文件
         }
         return result;
     }

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

@@ -144,22 +144,18 @@ public class ResearchService {
      * @date 2020/6/11
      */
     public Integer del(Integer researchid) {
+        TResearch research = researchMapper.getResarchpath(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删除文件
-            }
+        List<String> resourceUrls = new ArrayList<>();
+        if(research != null && N_Utils.isNotEmpty(research.getResearchcover())){
+            resourceUrls.add(research.getResearchcover());
+        }
+        if(research != null &&N_Utils.isNotEmpty(research.getResearchpath())){
+            resourceUrls.add(research.getResearchpath());
+        }
+
+        if(N_Utils.isListNotEmpty(resourceUrls)){
+            messageSender.resourceDel(resourceUrls);//给文件服务器发送mq删除文件
         }
         return result;
     }

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

@@ -92,7 +92,7 @@
         update t_read set readstate=#{readstate} where readstate=#{readstate2}
     </update>
     <!--获取电子书文件夹-->
-    <select id="listReadPath" resultType="com.xhkjedu.sapi.model.itemtool.TRead">
+    <select id="getReadPath" resultType="com.xhkjedu.sapi.model.itemtool.TRead">
         SELECT readthumb,readpath FROM t_read WHERE readid=#{readid}
     </select>
 

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

@@ -44,7 +44,7 @@
         UPDATE t_research SET researchpath=#{research.researchpath},mp4code=#{research.mp4code} WHERE researchid=#{research.researchid}
     </update>
     <!--获取教研文件-->
-    <select id="listResarchpath" resultType="com.xhkjedu.sapi.model.research.TResearch">
+    <select id="getResarchpath" 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/service/paper/PaperService.java

@@ -269,8 +269,8 @@ public class PaperService {
      * @date 2020/6/9
      */
     public Integer delPaper(TPaper paper) {
-        Integer result = paperMapper.delPaper(paper.getPaperid());
         List<TPaperFile> pfilelist = paperFileService.listObjsByPaperid(paper.getPaperid());//获取作业文件夹
+        Integer result = paperMapper.delPaper(paper.getPaperid());
         if (N_Utils.isListNotEmpty(pfilelist)) {
             List<String> resourceUrls = new ArrayList<>();
             for (int i = 0; i < pfilelist.size(); i++) {
@@ -282,7 +282,6 @@ public class PaperService {
             }
             messageSender.resourceDel(resourceUrls);//给文件服务器发送mq删除文件
         }
-
         return result;
     }