mq删除文件

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

@@ -43,11 +43,11 @@ public interface AppRecordMapper extends TkMapper<TAppRecord> {
     TAppRecord 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/AppScanMapper.java

@@ -36,11 +36,11 @@ public interface AppScanMapper extends TkMapper<TAppScan> {
     TAppScan 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/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

@@ -36,11 +36,11 @@ public interface AppTeacherclientMapper extends TkMapper<TAppTeacherclient> {
     TAppTeacherclient 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/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,13 +7,13 @@ 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文件夹
@@ -22,5 +22,5 @@ public interface AppthirdHistoryMapper extends TkMapper<TAppthirdHistory> {
      * @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

@@ -81,13 +81,13 @@ public interface ReadMapper extends TkMapper<TRead> {
     Integer updateTaskState(@Param("readstate") int readstate, @Param("readstate2") int readstate2);
 
     /**
-     * 获取电子书文件夹
+     * 获取电子书文件
      * @Param [readid]
      * @Author ywx
      * @Date 2021/10/26 16:25
      * @return java.util.List<java.lang.String>
      **/
-    List<String> listFolder(Integer readid);
+    TRead getReadPath(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);
+    TResearch getResarchpath(Integer researchid);
 }

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

@@ -33,9 +33,11 @@ public class AppRecordService {
 
     //删除
     public Integer deleteById(Integer versionid) {
-        List<String> resourceUrls = appRecordMapper.listFolder(versionid);//获取APP文件夹
         int result = appRecordMapper.deleteByPrimaryKey(versionid);
-        messageSender.resourceDel(resourceUrls);//给文件服务器发送mq删除文件
+        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/AppScanService.java

@@ -33,9 +33,11 @@ public class AppScanService {
 
     //删除
     public Integer deleteById(Integer versionid) {
-        List<String> resourceUrls = AppScanMapper.listFolder(versionid);//获取APP文件夹
         Integer result = AppScanMapper.deleteByPrimaryKey(versionid);
-        messageSender.resourceDel(resourceUrls);//给文件服务器发送mq删除文件
+        List<String> resourceUrls = AppScanMapper.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,11 @@ public class AppStuappService {
 
     //删除
     public Integer deleteById(Integer versionid) {
-        List<String> resourceUrls = appStuappMapper.listFolder(versionid);//获取APP文件夹
         Integer result = appStuappMapper.deleteByPrimaryKey(versionid);
-        messageSender.resourceDel(resourceUrls);//给文件服务器发送mq删除文件
+        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,11 @@ public class AppStuliveService {
 
     //删除
     public Integer deleteById(Integer versionid) {
-        List<String> resourceUrls = appStuliveMapper.listFolder(versionid);//获取APP文件夹
         Integer result = appStuliveMapper.deleteByPrimaryKey(versionid);
-        messageSender.resourceDel(resourceUrls);//给文件服务器发送mq删除文件
+        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,11 @@ public class AppTeacherappService {
 
     //删除
     public Integer deleteById(Integer versionid) {
-        List<String> resourceUrls = appTeacherappMapper.listFolder(versionid);//获取APP文件夹
         int result = appTeacherappMapper.deleteByPrimaryKey(versionid);
-        messageSender.resourceDel(resourceUrls);//给文件服务器发送mq删除文件
+        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,11 @@ public class AppTeacherclientService {
 
     //删除
     public Integer deleteById(Integer versionid) {
-        List<String> resourceUrls = appTeacherclientMapper.listFolder(versionid);//获取APP文件夹
         Integer result = appTeacherclientMapper.deleteByPrimaryKey(versionid);
-        messageSender.resourceDel(resourceUrls);//给文件服务器发送mq删除文件
+        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,11 @@ public class AppTeacherliveService {
 
     //删除
     public Integer deleteById(Integer versionid) {
-        List<String> resourceUrls = appTeacherliveMapper.listFolder(versionid);//获取APP文件夹
         Integer result = appTeacherliveMapper.deleteByPrimaryKey(versionid);
-        messageSender.resourceDel(resourceUrls);//给文件服务器发送mq删除文件
+        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,12 @@ public class AppthirdService {
     //删除
     @Transactional(rollbackFor = Exception.class)
     public Integer deleteById(Integer appid) {
-        List<String> resourceUrls = appthirdHistoryMapper.listFolder(appid);//获取APP文件夹
         Integer result = appthirdMapper.deleteByPrimaryKey(appid);
         handleThirdManager(appid, 2);//处理应用白名单
-        messageSender.resourceDel(resourceUrls);//给文件服务器发送mq删除文件
+        List<String> resourceUrls = appthirdHistoryMapper.listApppath(appid);//获取APP文件
+        if(N_Utils.isListNotEmpty(resourceUrls)){
+            messageSender.resourceDel(resourceUrls);//给文件服务器发送mq删除文件
+        }
         return result;
     }
 
@@ -148,9 +150,11 @@ public class AppthirdService {
      * @return void
      **/
     public void deleteByApphId(Integer apphid) {
-        List<String> resourceUrls = appthirdHistoryMapper.listFolder2(apphid);//获取APP文件夹
         appthirdHistoryMapper.deleteByPrimaryKey(apphid);
-        messageSender.resourceDel(resourceUrls);//给文件服务器发送mq删除文件
+        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

@@ -92,16 +92,26 @@ public class ReadService {
     }
 
     /**
-     *功能描述  删除
+     * 功能描述  删除
+     *
+     * @param * @param readid
+     * @return java.lang.Integer
      * @author WN
      * @date 2020/6/9
-     * @param  * @param readid
-     * @return java.lang.Integer
      */
-    public Integer del(Integer readid){
-        List<String> resourceUrls = readMapper.listFolder(readid);//获取电子书文件夹
+    public Integer del(Integer readid) {
         Integer result = readMapper.deleteByPrimaryKey(readid);
-        messageSender.resourceDel(resourceUrls);//给文件服务器发送mq删除文件
+        TRead read = readMapper.getReadPath(readid);//获取电子书文件
+        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;
     }
 
@@ -149,13 +159,14 @@ public class ReadService {
     }
 
     /**
-     *功能描述  阅读详情（android）
+     * 功能描述  阅读详情（android）
+     *
+     * @param * @param readid
+     * @return com.xhkjedu.model.itemtool.TRead
      * @author WN
      * @date 2020/6/17
-     * @param  * @param readid
-     * @return com.xhkjedu.model.itemtool.TRead
      */
-    public TRead getObjByReandidForAndr(Integer readid){
+    public TRead getObjByReandidForAndr(Integer readid) {
         //修改阅读次数
         readMapper.updateReadcount(readid);
 
@@ -163,13 +174,14 @@ public class ReadService {
     }
 
     /**
-     *功能描述 阅读历史保存
+     * 功能描述 阅读历史保存
+     *
+     * @param * @param readStudent
+     * @return java.lang.Integer
      * @author WN
      * @date 2020/6/17
-     * @param  * @param readStudent
-     * @return java.lang.Integer
      */
-    public Integer saveReadStudent(TReadStudent readStudent){
+    public Integer saveReadStudent(TReadStudent readStudent) {
         //修改阅读次数
         readMapper.updateReadcount(readStudent.getReadid());
         readStudent.setReadtime(N_Utils.getSecondTimestamp());
@@ -177,42 +189,44 @@ public class ReadService {
     }
 
     /**
-     *功能描述  获取学生阅读历史
+     * 功能描述  获取学生阅读历史
+     *
+     * @param * @param readStudent
+     * @return java.util.List<com.xhkjedu.model.itemtool.TReadStudent>
      * @author WN
      * @date 2020/6/17
-     * @param  * @param readStudent
-     * @return java.util.List<com.xhkjedu.model.itemtool.TReadStudent>
      */
-    public List<ReadStudentVo> listReadStudents(TReadStudent readStudent){
+    public List<ReadStudentVo> listReadStudents(TReadStudent readStudent) {
         Integer begintime = readStudent.getBegintime();
         Integer endtime = 0;
         if (begintime == 0) {//全部
             endtime = 0;
         } else if (begintime == 1) {//5分钟以内
             begintime = 0;
-            endtime = 5*60;
+            endtime = 5 * 60;
         } else if (begintime == 2) {//5~10分钟
-            begintime = 5*60;
-            endtime = 10*60;
+            begintime = 5 * 60;
+            endtime = 10 * 60;
         } else if (begintime == 3) {//10~30分钟
-            begintime = 10*60;
-            endtime = 30*60;
+            begintime = 10 * 60;
+            endtime = 30 * 60;
         } else if (begintime == 4) {//10~1小时
-            begintime = 10*60;
-            endtime = 60*60;
+            begintime = 10 * 60;
+            endtime = 60 * 60;
         } else if (begintime == 5) {//1小时以上
-            begintime = 60*60;
+            begintime = 60 * 60;
             endtime = 0;
         }
-        return readMapper.listReadStudents(readStudent.getSchoolid(),readStudent.getReadid(),begintime,endtime);
+        return readMapper.listReadStudents(readStudent.getSchoolid(), readStudent.getReadid(), begintime, endtime);
     }
 
     /**
      * 修改上架状态
+     *
+     * @return java.lang.Integer
      * @Param [readid, readstate]
      * @Author ywx
      * @Date 2020/6/26 11:50
-     * @return java.lang.Integer
      **/
     public Integer updateState(Integer readid, Integer readstate) {
         return readMapper.updateState(readid, readstate);
@@ -220,10 +234,11 @@ public class ReadService {
 
     /**
      * 定时任务修改阅读状态
+     *
+     * @return java.lang.Integer
      * @Param [readstate, readstate2]
      * @Author ywx
      * @Date 2020/9/1 9:52
-     * @return java.lang.Integer
      **/
     public Integer updateTaskState(int readstate, int readstate2) {
         return readMapper.updateTaskState(readstate, readstate2);
@@ -231,10 +246,11 @@ public class ReadService {
 
     /**
      * 获取学校阅读历史
+     *
+     * @return java.util.List<com.xhkjedu.vo.itemtool.ReadStudentVo>
      * @Param [readStudent]
      * @Author ywx
      * @Date 2021/7/31 17:20
-     * @return java.util.List<com.xhkjedu.vo.itemtool.ReadStudentVo>
      **/
     public List<ReadStudentVo> listReadSchool(TReadStudent readStudent) {
         Integer begintime = readStudent.getBegintime();
@@ -243,29 +259,30 @@ public class ReadService {
             endtime = 0;
         } else if (begintime == 1) {//5分钟以内
             begintime = 0;
-            endtime = 5*60;
+            endtime = 5 * 60;
         } else if (begintime == 2) {//5~10分钟
-            begintime = 5*60;
-            endtime = 10*60;
+            begintime = 5 * 60;
+            endtime = 10 * 60;
         } else if (begintime == 3) {//10~30分钟
-            begintime = 10*60;
-            endtime = 30*60;
+            begintime = 10 * 60;
+            endtime = 30 * 60;
         } else if (begintime == 4) {//10~1小时
-            begintime = 10*60;
-            endtime = 60*60;
+            begintime = 10 * 60;
+            endtime = 60 * 60;
         } else if (begintime == 5) {//1小时以上
-            begintime = 60*60;
+            begintime = 60 * 60;
             endtime = 0;
         }
-        return readMapper.listReadSchool(readStudent.getReadid(),begintime,endtime);
+        return readMapper.listReadSchool(readStudent.getReadid(), begintime, endtime);
     }
 
     /**
-     *功能描述  电子书学生--网页-列表
+     * 功能描述  电子书学生--网页-列表
+     *
+     * @param * @param read
+     * @return java.util.List<com.xhkjedu.sapi.model.itemtool.TRead>
      * @author WN
      * @date 2022/2/22
-     * @param  * @param read
-     * @return java.util.List<com.xhkjedu.sapi.model.itemtool.TRead>
      */
     public List<TRead> listReadStuWeb(TRead read) {
         List<TRead> reads = readMapper.listReadForStuWeb(read);
@@ -275,10 +292,11 @@ public class ReadService {
 
     /**
      * 获取电子书是否可读
+     *
+     * @return java.lang.Integer
      * @Param [read]
      * @Author ywx
      * @Date 2022/3/14 10:52
-     * @return java.lang.Integer
      **/
     public Integer getReadable(TRead read) {
         return readDateService.setRead(read);

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

@@ -144,9 +144,18 @@ public class ResearchService {
      * @date 2020/6/11
      */
     public Integer del(Integer researchid) {
-        List<String> resourceUrls = researchMapper.listFolder(researchid);//获取教研文件夹
+        TResearch research = researchMapper.getResarchpath(researchid);
         Integer result = researchMapper.deleteByPrimaryKey(researchid);
-        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/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/AppScanMapper.xml

@@ -16,8 +16,8 @@
         from t_app_scan 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_scan WHERE versionid=#{versionid}
+    <!--获取APP文件-->
+    <select id="listApppath" resultType="java.lang.String">
+        SELECT versionpath FROM t_app_scan 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">
+    <!--获取APP文件-->
+    <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

@@ -91,9 +91,9 @@
     <update id="updateTaskState">
         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="getReadPath" 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="getResarchpath" resultType="com.xhkjedu.sapi.model.research.TResearch">
+        SELECT researchcover,researchpath FROM t_research WHERE researchid=#{researchid}
     </select>
 </mapper>