删除

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

@@ -86,24 +86,6 @@ public class ResourceController {
         return new ResultVo(0,"获取列表成功",pageResult);
     }
 
-    @PostMapping("/share_school")
-    public ResultVo shareSchool(@RequestBody TResource tResource) {
-        String resourceid = tResource.getResourceid();
-        String lsbid = tResource.getLsbid();
-        String directorid = tResource.getDirectorid();
-        Integer resourcetype = tResource.getResourcetype();
-        Integer createid = tResource.getCreateid();
-        N_Utils.validation(new Object[]{resourceid,"资源id",2,lsbid,"教材关系表id",2,directorid,"章节id",2
-                ,resourcetype,"资源归类",1,createid,"教师id",1});
-        tResource.setLevel(1);//资源级别1校本
-        String id = resourceService.share(tResource);
-        if(id.equals("99")){
-            return new ResultVo(0,"该资源已分享过校本");
-        }else{
-            return new ResultVo(0,"分享成功",id);
-        }
-    }
-
     @PostMapping("/update_downcount")
     public ResultVo updateDownCount(@RequestBody TResource tResource) {
         String resourceid = tResource.getResourceid();
@@ -112,30 +94,6 @@ public class ResourceController {
         return new ResultVo(0,"更新下载次数成功");
     }
 
-    @PostMapping("/my_list")
-    public ResultVo myList(@RequestBody TResource tResource) {
-        Integer page = tResource.getPage();
-        Integer pageSize = tResource.getPageSize();
-        Integer createid = tResource.getCreateid();
-        Integer level = tResource.getLevel();
-        N_Utils.validation(new Object[]{page,"显示页码",1,pageSize,"显示条数",1,createid,"教师id",1
-                ,level,"资源级别",1});
-        PageHelper.startPage(page, pageSize);
-        List<TResource> list = resourceService.listMyResource(tResource);
-        PageResult pageResult = PageUtil.getPageResult(new PageInfo(list));
-        return new ResultVo(0,"获取教师备课资源列表成功",pageResult);
-    }
-
-    @PostMapping("/my_list2")
-    public ResultVo myList2(@RequestBody TResource tResource) {
-        Integer createid = tResource.getCreateid();
-        N_Utils.validation(new Object[]{createid,"教师id",1});
-        tResource.setLevel(2);
-        List<TResource> list = resourceService.listMyResource(tResource);
-        return new ResultVo(0,"获取我的备课列表成功",list);
-    }
-
-
     @PostMapping("/student_video_list")
     public ResultVo studentVideoList(@RequestBody TResource tResource) {
         Integer page = tResource.getPage();

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

@@ -4,9 +4,11 @@ import com.xhkjedu.sstudy.base.TkMapper;
 import com.xhkjedu.sstudy.model.resource.TResource;
 import com.xhkjedu.sstudy.vo.resource.ResourceVo;
 import org.apache.ibatis.annotations.Param;
+import org.springframework.stereotype.Repository;
 
 import java.util.List;
 
+@Repository
 public interface ResourceMapper extends TkMapper<TResource> {
     //删除
     Integer deleteById(@Param("resourceid") String resourceid);
@@ -23,9 +25,6 @@ public interface ResourceMapper extends TkMapper<TResource> {
     //更新下载次数
     void updateDownCount(@Param("resourceid") String resourceid);
 
-    //判断资源是否已经分享到校本
-    Integer getLevelResourceForxb(@Param("resource") TResource resource);
-
     //学生同步视频资源列表
     List<TResource> studentVideoList(@Param("resource") TResource resource);
 
@@ -38,15 +37,6 @@ public interface ResourceMapper extends TkMapper<TResource> {
      **/
     Integer updateReadCount(String resourceid);
 
-    /**
-     * 教师备课、预习导学资源列表
-     * @Param [resource]
-     * @Author ywx
-     * @Date 2020/7/9 11:44
-     * @return java.util.List<com.xhkjedu.model.resource.TResource>
-     **/
-    List<TResource> listMyResource(@Param("resource") TResource resource);
-
     /**
      * 获取资源分享到预习导学的资源id
      * @Param [resourceid, createid]

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

@@ -142,58 +142,6 @@ public class ResourceService {
         return resourceMapper.findAll(tResource);
     }
 
-    //分享
-    public String share(TResource model) {
-        String resourceid = model.getResourceid();
-
-        //判断该资源是否已经分享过该章节，如果已经分享过直接返回
-        Integer count = resourceMapper.getLevelResourceForxb(model);
-        if(count>0){
-            return "99";
-        }else{
-            return saveShare(model, resourceid);
-        }
-    }
-
-    /**
-     * 分享资源保存
-     * @Param [model, resourceid]
-     * @Author ywx
-     * @Date 2020/7/1 10:18
-     * @return java.lang.Integer
-     **/
-    private String saveShare(TResource model, String resourceid) {
-        if (N_Utils.isNotEmpty(resourceid)) {
-            ResourceVo r = findById(resourceid);
-            model.setResourcename(r.getResourcename());
-            model.setResourceclass(r.getResourceclass());
-            model.setResourceurl(r.getResourceurl());
-            model.setSuffix(r.getSuffix());
-            model.setResourcesize(r.getResourcesize());
-            model.setResourcecover(r.getResourcecover());
-            model.setConverted(r.getConverted());
-            model.setPdfurl(r.getPdfurl());
-            model.setComm(r.getComm());
-            model.setDuration(r.getDuration());
-            model.setMp4code(r.getMp4code());
-            if(model.getLevel()==1){
-                model.setBelong(3);
-            }else{
-                model.setBelong(r.getBelong());
-            }
-
-            if (model.getResourcetype() == null) {
-                model.setResourcetype(r.getResourcetype());
-            }
-
-            if(r.getResourceclass()==7 && N_Utils.isNotEmpty(r.getPdfurl())){
-                //压缩包，用costtime替代分享时的压缩包，设置为7
-                model.setCosttime(7);
-            }
-        }
-        return save(model);
-    }
-
     //更新下载次数
     public void updateDownCount(String resourceid) {
         resourceMapper.updateDownCount(resourceid);
@@ -215,17 +163,6 @@ public class ResourceService {
         return resourceMapper.updateReadCount(resourceid);
     }
 
-    /**
-     * 教师备课、预习导学资源列表
-     * @Param [resource]
-     * @Author ywx
-     * @Date 2020/7/9 11:45
-     * @return java.util.List<com.xhkjedu.model.resource.TResource>
-     **/
-    public List<TResource> listMyResource(TResource resource) {
-        return resourceMapper.listMyResource(resource);
-    }
-
     /**
      * 资源收藏
      * @Param [collect]

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

@@ -9,7 +9,7 @@
         delete from t_resource where resourceid=#{resourceid}
     </delete>
     <!--列表-->
-    <select id="findAll" resultType="com.xhkjedu.sstudy.vo.resource.ResourceVo">
+    <select id="findAll" resultType="com.xhkjedu.sstudy.model.resource.TResource">
         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,r.createid,r.belong
@@ -79,40 +79,6 @@
         </choose>
         ,r.resourcename asc,r.resourceid asc
     </select>
-    <!--教师备课、预习导学资源列表-->
-    <!--2020.11.16 教师备课只获取自己上传到个人空间文件，不获取收藏的文件-->
-    <select id="listMyResource" resultType="com.xhkjedu.sstudy.vo.resource.ResourceVo">
-        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
-        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.level==2">
-            left join t_resource_collect rc on r.resourceid = rc.resourceid
-        </if>-->
-        where r.resourcestate=1 and r.level=#{resource.level} and r.createid=#{resource.createid}
-       <!-- and ((r.level=#{resource.level} and r.resourcetype=0 and r.createid=#{resource.createid})
-        <if test="resource.level==2">
-            or rc.userid=#{resource.createid}
-        </if>
-        )-->
-        <if test="resource.resourcename!=null and resource.resourcename!=''">
-            and r.resourcename like '%${resource.resourcename}%'
-        </if>
-        <if test="resource.resourceclass!=null and resource.resourceclass!=0">
-            and r.resourceclass=#{resource.resourceclass}
-        </if>
-        <if test="resource.subjectid!=null and resource.subjectid!='0'.toString() and resource.subjectid!=''">
-            and r.subjectid=#{resource.subjectid}
-        </if>
-        <if test="resource.lsbid!=null and resource.lsbid!='0'.toString() and resource.lsbid!=''">
-            and rd.lsbid=#{resource.lsbid}
-        </if>
-        <if test="resource.directorid!=null and resource.directorid!='0'.toString() and resource.directorid!=''">
-            and rd.directorid=#{resource.directorid}
-        </if>
-        order by r.createtime desc,r.resourcename asc,r.resourceid asc
-    </select>
     <!--详情-->
     <resultMap id="resourceResult" type="com.xhkjedu.sstudy.vo.resource.ResourceVo">
         <result property="resourceid" column="resourceid"></result>
@@ -196,14 +162,6 @@
         group by r.resourceid order by r.createtime desc,r.resourcename asc,r.resourceid asc limit #{resource.page},#{resource.pageSize}
     </select>
 
-    <!-- 获取资源是否已经分享到校本 -->
-    <select id="getLevelResourceForxb" resultType="java.lang.Integer">
-        SELECT COUNT(*) FROM t_resource r left join t_resource_director rd on r.resourceid=rd.resourceid
-        LEFT JOIN t_resource r2 ON r.resourceurl=r2.resourceurl
-        left join t_resource_director rd2 on r2.resourceid=rd2.resourceid and rd.lsbid=rd2.lsbid
-        WHERE r2.resourceid=#{resource.resourceid} AND r.level=1 AND rd.directorid=#{resource.directorid} and r.resourcestate=1
-        AND (r.belong IN(1,2) OR r.schoolid=#{resource.schoolid})
-    </select>
     <!--更新阅读次数-->
     <update id="updateReadCount">
         update t_resource set readcount=readcount+1 where resourceid=#{resourceid}
@@ -220,7 +178,7 @@
 
     <!--//////////////////////////////////////////////学生WEB端//////////////////////////////////////////////-->
     <!--学生同步视频资源列表-->
-    <select id="studentVideoWebList" resultType="com.xhkjedu.sstudy.vo.resource.ResourceVo">
+    <select id="studentVideoWebList" resultType="com.xhkjedu.sstudy.model.resource.TResource">
         select r.resourceid,r.resourcename,r.createtime,r.suffix,u.username createname
         ,r.readcount,r.comm,r.resourceurl,r.resourcecover,r.duration,r.resourcesize,r.mp4code
         ,r.resourcegrade,r.source,r.year,r.region,r.schoolname,r.converted