mq删除文件

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

@@ -50,15 +50,4 @@ public class PaperFileService {
     public List<TPaperFile> listObjsByPaperid(Integer paperid){
         return paperFileMapper.listObjsByPaperid(paperid);
     }
-
-    /**
-     * 获取作业文件夹
-     * @Param [paperid]
-     * @Author ywx
-     * @Date 2021/10/26 15:30
-     * @return java.util.List<java.lang.String>
-     **/
-    public List<String> listFolder(Integer paperid) {
-        return paperFileMapper.listFolder(paperid);
-    }
 }

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

@@ -267,9 +267,19 @@ public class PaperService {
      * @return void
      */
     public Integer delPaper(TPaper paper){
-        List<String> resourceUrls = paperFileService.listFolder(paper.getPaperid());//获取作业文件夹
         int result =  paperMapper.delPaper(paper.getPaperid());
-        messageSender.resourceDel(resourceUrls);//给文件服务器发送mq删除文件
+        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 result;
     }
 

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

@@ -240,8 +240,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

@@ -12,8 +12,10 @@
         SELECT pfid,paperid,filepath,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
+
+    <!-- 根据作业id获取作业附件 -->
+    <select id="listObjsByPaperid" resultType="com.xhkjedu.sstudy.model.paper.TPaperFile">
+        SELECT pfid,paperid,filepath,sourcepath,fileclass,fileorder,createtime
+        FROM t_paper_file WHERE paperid=#{paperid} ORDER BY fileorder asc
     </select>
 </mapper>