优化

sapi/pom.xml

@@ -30,7 +30,6 @@
             <groupId>org.springframework.cloud</groupId>
             <artifactId>spring-cloud-starter-netflix-eureka-client</artifactId>
         </dependency>
-
         <dependency>
             <groupId>mysql</groupId>
             <artifactId>mysql-connector-java</artifactId>

sapi/src/main/java/com/xhkjedu/sapi/SapiApplication.java

@@ -2,7 +2,6 @@ package com.xhkjedu.sapi;
 
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
-import org.springframework.cloud.client.discovery.EnableDiscoveryClient;
 import org.springframework.cloud.netflix.eureka.EnableEurekaClient;
 import tk.mybatis.spring.annotation.MapperScan;
 

sapi/src/main/java/com/xhkjedu/sapi/config/RabbitConfig.java

@@ -0,0 +1,52 @@
+package com.xhkjedu.sapi.config;
+
+import org.springframework.amqp.core.Queue;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+
+/**
+ * @author ywx
+ * @classname RabbitConfig
+ * @description
+ * @date 2021/6/18 12:51
+ **/
+@Configuration
+public class RabbitConfig {
+    @Value("${rabbitmq.resourceToPdfQueue}")
+    private String resourceToPdfQueue;
+    @Value("${rabbitmq.resourceTransferQueue}")
+    private String resourceTransferQueue;
+    @Value("${rabbitmq.resourceUnZipQueue}")
+    private String resourceUnZipQueue;
+    @Value("${rabbitmq.resourceDelQueue}")
+    private String resourceDelQueue;
+    @Value("${rabbitmq.resourceHandleQueue}")
+    private String resourceHandleQueue;
+
+    @Bean
+    public Queue resourceToPdfQueue() {
+        return new Queue(resourceToPdfQueue);
+    }
+
+    @Bean
+    public Queue resourceTransferQueue() {
+        return new Queue(resourceTransferQueue);
+    }
+
+    @Bean
+    public Queue resourceUnZipQueue() {
+        return new Queue(resourceUnZipQueue);
+    }
+
+    @Bean
+    public Queue resourceDelQueue() {
+        return new Queue(resourceDelQueue);
+    }
+
+    @Bean
+    public Queue resourceHandleQueue() {
+        return new Queue(resourceHandleQueue);
+    }
+
+}

sapi/src/main/java/com/xhkjedu/sapi/config/ScheduledConfig.java

@@ -0,0 +1,30 @@
+package com.xhkjedu.sapi.config;
+
+import org.springframework.context.annotation.*;
+import org.springframework.core.type.AnnotatedTypeMetadata;
+import org.springframework.scheduling.annotation.ScheduledAnnotationBeanPostProcessor;
+
+/**
+ * @author ywx
+ * @className ScheduledConfig
+ * @description @Scheduled 注解，是被一个叫做 ScheduledAnnotationBeanPostProcessor 的类所拦截的，
+ * 所以我们可以根据配置，决定是否创建这个 bean，如果没有这个 bean，@Scheduled 就不会被拦截，那么定时任务肯定不会执行了，
+ * 需要注意的是：这种方式，启动类上面的 @EnableScheduling 需要去掉。
+ * @date 2021/5/18 9:15
+ **/
+@Configuration
+public class ScheduledConfig {
+    @Conditional(ScheduledCondition.class)
+    @Bean
+    public ScheduledAnnotationBeanPostProcessor processor(){
+        return new ScheduledAnnotationBeanPostProcessor();
+    }
+}
+
+class ScheduledCondition implements Condition {
+
+    @Override
+    public boolean matches(ConditionContext context, AnnotatedTypeMetadata metadata) {
+        return Boolean.valueOf(context.getEnvironment().getProperty("enable.scheduled"));
+    }
+}

sapi/src/main/java/com/xhkjedu/sapi/controller/analyze/SchoolResourceController.java

@@ -2,7 +2,7 @@ package com.xhkjedu.sapi.controller.analyze;
 
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
-import com.xhkjedu.sapi.model.subjectbook.TResource;
+import com.xhkjedu.sapi.model.space.TResource;
 import com.xhkjedu.sapi.service.analyze.SchoolResourceService;
 import com.xhkjedu.utils.N_Utils;
 import com.xhkjedu.utils.PageUtil;
@@ -38,7 +38,7 @@ public class SchoolResourceController {
      * @return com.xhkjedu.vo.ResultVo
      */
     @PostMapping("/allnum")
-    public ResultVo getSchoolAllNum(@RequestBody TResource  tResource){
+    public ResultVo getSchoolAllNum(@RequestBody TResource tResource){
         N_Utils.validation(new Object[]{tResource.getSchoolid(),"学校id",1});
         SchoolResourceNumVo sr = schoolResourceService.getSchoolResourceNum(tResource.getSchoolid());
         return  new ResultVo(0,"",sr);

sapi/src/main/java/com/xhkjedu/sapi/controller/space/ResourceController.java

@@ -0,0 +1,68 @@
+package com.xhkjedu.sapi.controller.space;
+
+import com.github.pagehelper.PageHelper;
+import com.github.pagehelper.PageInfo;
+import com.xhkjedu.sapi.model.space.TResource;
+import com.xhkjedu.sapi.service.space.ResourceService;
+import com.xhkjedu.sapi.vo.subjectbook.ResourceVo;
+import com.xhkjedu.utils.N_Utils;
+import com.xhkjedu.utils.PageUtil;
+import com.xhkjedu.vo.PageResult;
+import com.xhkjedu.vo.ResultVo;
+import org.springframework.util.CollectionUtils;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.annotation.Resource;
+import java.util.List;
+
+/**
+ * @ClassName ResourceController
+ * Description 个人空间
+ * Author WN
+ * Date 2022/2/22 15:48
+ **/
+@RestController
+@RequestMapping("/spr")
+public class ResourceController {
+    @Resource
+    private ResourceService resourceService;
+
+    //我的空间--网页端
+    @PostMapping("/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("/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);
+        }
+    }
+
+
+}

sapi/src/main/java/com/xhkjedu/sapi/listener/MessageConsumer.java

@@ -0,0 +1,52 @@
+package com.xhkjedu.sapi.listener;
+
+import com.alibaba.fastjson.JSON;
+import com.xhkjedu.sapi.mapper.research.ResearchMapper;
+import com.xhkjedu.sapi.model.research.TResearch;
+import com.xhkjedu.sapi.model.space.TResource;
+import com.xhkjedu.sapi.service.space.ResourceService;
+import com.xhkjedu.sapi.vo.subjectbook.ResourceVo;
+import com.xhkjedu.utils.N_Utils;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.amqp.core.Message;
+import org.springframework.amqp.rabbit.annotation.RabbitHandler;
+import org.springframework.amqp.rabbit.annotation.RabbitListener;
+import org.springframework.stereotype.Component;
+
+import javax.annotation.Resource;
+import java.time.LocalDateTime;
+
+/**
+ * 消息到达消费者监听类
+ */
+@Component
+@Slf4j
+public class MessageConsumer {
+
+    @Resource
+    private ResearchMapper researchMapper;
+
+    //资源转换完处理资源文件
+    @RabbitHandler
+    @RabbitListener(queues = "${rabbitmq.resourceHandleQueue}")
+    public void resourceHandleQueue(Message message) {
+        try {
+            String msg = new String(message.getBody(), "UTF-8");
+            System.out.println(LocalDateTime.now()+" 资源处理接收消息内容："+msg);
+            TResource resource = JSON.parseObject(msg, TResource.class);
+            String resourceid = resource.getResourceid();
+            String resourceurl = resource.getResourceurl();
+            String mp4code = resource.getMp4code();
+            String source = resource.getSource();
+            if ("research".equals(source)) {
+                TResearch research = new TResearch();
+                research.setResearchid(N_Utils.str2Int(resourceid));
+                research.setResearchpath(resourceurl);
+                research.setMp4code(mp4code);
+                researchMapper.updateResourceMp4code(research);
+            }
+        } catch (Exception e) {
+            log.error("资源转换失败："+e.getMessage());
+        }
+    }
+}

sapi/src/main/java/com/xhkjedu/sapi/mapper/space/ResourceDirectorMapper.java

@@ -0,0 +1,19 @@
+package com.xhkjedu.sapi.mapper.space;
+
+import com.xhkjedu.sapi.base.TkMapper;
+import com.xhkjedu.sapi.model.space.TResourceDirector;
+import org.apache.ibatis.annotations.Param;
+import org.springframework.stereotype.Repository;
+
+import java.util.List;
+
+/**
+ * @ClassName ResourceDirectorMapper
+ * Description TODO 资源教材章节关系
+ * Author WN
+ * Date 2021/1/4 16:49
+ **/
+@Repository
+public interface ResourceDirectorMapper extends TkMapper<TResourceDirector> {
+    void batchSave(@Param("list") List<TResourceDirector> directors);
+}

sapi/src/main/java/com/xhkjedu/sapi/mapper/space/ResourceFileMapper.java

@@ -0,0 +1,11 @@
+package com.xhkjedu.sapi.mapper.space;
+
+import com.xhkjedu.sapi.base.TkMapper;
+import com.xhkjedu.sapi.model.space.TResourceFile;
+
+import java.util.List;
+import java.util.Map;
+
+public interface ResourceFileMapper extends TkMapper<TResourceFile> {
+    List<Map> listFile(String resourceid);
+}

sapi/src/main/java/com/xhkjedu/sapi/mapper/space/ResourceMapper.java

@@ -0,0 +1,33 @@
+package com.xhkjedu.sapi.mapper.space;
+
+
+import com.xhkjedu.sapi.base.TkMapper;
+import com.xhkjedu.sapi.model.space.TResource;
+import com.xhkjedu.sapi.model.space.TResourceDirector;
+import com.xhkjedu.sapi.vo.subjectbook.ResourceVo;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+public interface ResourceMapper extends TkMapper<TResource> {
+    //详情
+    ResourceVo findById(@Param("resourceid") String resourceid);
+
+//    ResourceVo findById2(@Param("resourceid") String resourceid);
+
+
+    //判断资源是否已经分享到校本
+    Integer getLevelResourceForxb(@Param("resource") TResource resource);
+
+    /**
+     * 个人空间
+     * @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);
+
+    void batchSaveResourceDirector(@Param("list") List<TResourceDirector> directors);
+
+}

sapi/src/main/java/com/xhkjedu/sapi/mapper/subjectbook/SubjectBookMapper.java

@@ -0,0 +1,13 @@
+package com.xhkjedu.sapi.mapper.subjectbook;
+
+import com.xhkjedu.sapi.base.TkMapper;
+import com.xhkjedu.sapi.model.subjectbook.TSubjectBook;
+
+/**
+ * @ClassName SubjectBookMapper
+ * Description 教材
+ * Author WN
+ * Date 2022/2/22 15:55
+ **/
+public interface SubjectBookMapper extends TkMapper<TSubjectBook> {
+}

sapi/src/main/java/com/xhkjedu/sapi/model/subjectbook/TResource.java → sapi/src/main/java/com/xhkjedu/sapi/model/space/TResource.java

@@ -1,4 +1,4 @@
-package com.xhkjedu.sapi.model.subjectbook;
+package com.xhkjedu.sapi.model.space;
 
 import com.xhkjedu.sapi.model.BaseBean;
 import lombok.Data;
@@ -104,10 +104,6 @@ public class TResource extends BaseBean {
     //备注
     private String comm;
 
-    //班级id
-    @Transient
-    private Integer classid;
-
     //科目id
     private String subjectid;
 
@@ -115,6 +111,9 @@ public class TResource extends BaseBean {
     //状态0全部1未查看1已查看
     private Integer costtime;
 
+
     @Transient
     private List<TResourceDirector> directors;//资源教材章节
+    @Transient
+    private List<TResourceFile> files;//资源附件
 }

sapi/src/main/java/com/xhkjedu/sapi/model/subjectbook/TResourceDirector.java → sapi/src/main/java/com/xhkjedu/sapi/model/space/TResourceDirector.java

@@ -1,4 +1,4 @@
-package com.xhkjedu.sapi.model.subjectbook;
+package com.xhkjedu.sapi.model.space;
 
 import com.xhkjedu.sapi.model.BaseBean;
 import lombok.Data;

sapi/src/main/java/com/xhkjedu/sapi/model/space/TResourceFile.java

@@ -0,0 +1,51 @@
+package com.xhkjedu.sapi.model.space;
+
+import com.xhkjedu.sapi.model.BaseBean;
+import lombok.Data;
+
+import javax.persistence.Id;
+import javax.persistence.Table;
+
+@Table(name = "t_resource_file")
+@Data
+public class TResourceFile extends BaseBean {
+    @Id
+    //资源附件表
+    private Integer rfid;
+
+    //资源表
+    private String resourceid;
+
+    //资源名称
+    private String resourcename;
+
+    //资源分类1word,2ppt,3pdf,4图片,5视频,6音频,7压缩包,10其他
+    private Integer resourceclass;
+
+    //资源地址
+    private String resourceurl;
+
+    //封面图地址
+    private String resourcecover;
+
+    //是否转换0未转换1已转换2转换失败3加密
+    private Integer converted;
+
+    //转换失败原因
+    private String convertmsg;
+
+    //转换后的pdf文件地址
+    private String pdfurl;
+
+    //文件后缀
+    private String suffix;
+
+    //文件大小
+    private Integer resourcesize;
+
+    //视频时长（秒）
+    private Integer duration;
+
+    //创建时间
+    private Integer createtime;
+}

sapi/src/main/java/com/xhkjedu/sapi/service/space/ResourceService.java

@@ -0,0 +1,168 @@
+package com.xhkjedu.sapi.service.space;
+
+import com.alibaba.fastjson.JSON;
+import com.xhkjedu.sapi.mapper.space.ResourceDirectorMapper;
+import com.xhkjedu.sapi.mapper.space.ResourceFileMapper;
+import com.xhkjedu.sapi.mapper.space.ResourceMapper;
+import com.xhkjedu.sapi.mapper.subjectbook.SubjectBookMapper;
+import com.xhkjedu.sapi.model.space.TResource;
+import com.xhkjedu.sapi.model.space.TResourceDirector;
+import com.xhkjedu.sapi.model.space.TResourceFile;
+import com.xhkjedu.sapi.model.subjectbook.TSubjectBook;
+import com.xhkjedu.sapi.utils.ApiUtil;
+import com.xhkjedu.sapi.utils.ConvertUtil;
+import com.xhkjedu.sapi.vo.subjectbook.ResourceVo;
+import com.xhkjedu.utils.N_Utils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+import javax.annotation.Resource;
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * @author ywx
+ * @classname ResourceService
+ * @description 
+ * @date 2020/6/5 9:50
+ **/
+@Service
+public class ResourceService {
+    @Resource
+    private ResourceMapper resourceMapper;
+    @Resource
+    private ResourceFileMapper resourceFileMapper;
+    @Resource
+    private ResourceDirectorMapper resourceDirectorMapper;
+    @Resource
+    private SubjectBookMapper subjectBookMapper;
+    @Autowired
+    private ConvertUtil convertUtil;
+
+    @Transactional
+    public String save(TResource model) {
+        model.setReadcount(0);
+        model.setDowncount(0);
+        model.setResourcestate(1);
+        model.setCreatetime(N_Utils.getSecondTimestamp());
+        String directorid = model.getDirectorid();
+        if (directorid != null && (directorid.equals("0") || directorid.equals(""))) {
+            model.setDirectorid(null);
+        }
+        String resourceid = ApiUtil.getId();
+        model.setResourceid(resourceid);
+        if (N_Utils.isEmpty(model.getSubjectid())) {//科目为空根据教材id取科目
+            TSubjectBook book = subjectBookMapper.selectByPrimaryKey(model.getLsbid());
+            model.setSubjectid(book.getSubjectid());
+        }
+
+        List<TResourceFile> ziplist = new ArrayList<>();
+        if(model.getResourceclass()==7 && model.getCosttime()!=null && model.getCosttime()==7){
+            ziplist = JSON.parseArray(model.getPdfurl(),TResourceFile.class);
+            for(TResourceFile rf : ziplist){
+                rf.setResourceid(resourceid);
+            }
+
+            model.setPdfurl(null);
+        }
+
+        resourceMapper.insertSelective(model);//保存资源
+
+        List<TResourceDirector> directors = model.getDirectors();
+        if(N_Utils.isListEmpty(directors)){//兼容以前添加单个章节模式
+            directors = new ArrayList<>();
+            TResourceDirector rd = new TResourceDirector();
+            rd.setLsbid(model.getLsbid());
+            rd.setDirectorid(model.getDirectorid());
+            directors.add(rd);
+        }
+        for(TResourceDirector rd : directors){
+            rd.setRdid(ApiUtil.getId());
+            rd.setResourceid(resourceid);
+            rd.setCreateid(model.getCreateid());
+            rd.setCreatetime(model.getCreatetime());
+        }
+
+        //如果是分享的压缩包并且已经解压
+        if(model.getResourceclass()==7 && model.getCosttime()!=null && model.getCosttime()==7 && ziplist!=null && ziplist.size()>0){
+            resourceFileMapper.insertList(ziplist);//批量保存压缩文件的集合
+        }
+
+        resourceMapper.batchSaveResourceDirector(directors);//保存资源教材章节关系
+
+        convertUtil.convertResource(model);
+        return resourceid;
+    }
+    //获取详情
+    public ResourceVo findById(String resourceid) {
+        ResourceVo resource = resourceMapper.findById(resourceid);
+        convertUtil.getResourceUrl(resource);
+        return resource;
+    }
+
+    //分享
+    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);
+            }
+        }
+        save(model);
+        //需要条用资源内保存方法
+        return "";
+    }
+
+
+    /**
+     *功能描述 我的空间列表
+     * @author WN
+     * @date 2022/2/22
+     * @param  * @param resource
+     * @return java.util.List<com.xhkjedu.sapi.model.space.TResource>
+     */
+    public List<TResource> listMyResource(TResource resource) {
+        return resourceMapper.listMyResource(resource);
+    }
+}

sapi/src/main/java/com/xhkjedu/sapi/task/ClassReportTask.java

@@ -0,0 +1,39 @@
+package com.xhkjedu.sapi.task;
+
+import com.xhkjedu.sapi.model.classreport.TReportClasstype;
+import com.xhkjedu.sapi.service.classreport.ClassReportService;
+import org.springframework.scheduling.annotation.Scheduled;
+import org.springframework.stereotype.Component;
+
+import javax.annotation.Resource;
+
+/**
+ * @author ywx
+ * @classname ClassReportTask
+ * @description 班级报告定时任务
+ * @date 2021/5/31 16:23
+ **/
+@Component
+public class ClassReportTask {
+
+    @Resource
+    private ClassReportService classReportService;
+
+    //生成上周班级报告
+    @Scheduled(cron = "${cron.classReportWeek}")
+    public void classReportWeek(){
+        TReportClasstype type = new TReportClasstype();
+        type.setReporttype(1);
+        type.setBasenum(1);
+        classReportService.generateClassReport(type);
+    }
+
+    //生成上月班级报告
+    @Scheduled(cron = "${cron.classReportMonth}")
+    public void classReportMonth(){
+        TReportClasstype type = new TReportClasstype();
+        type.setReporttype(2);
+        type.setBasenum(1);
+        classReportService.generateClassReport(type);
+    }
+}

sapi/src/main/java/com/xhkjedu/sapi/task/CloudSyncTask.java

@@ -0,0 +1,29 @@
+package com.xhkjedu.sapi.task;
+
+import com.xhkjedu.sapi.config.ConfigKey;
+import com.xhkjedu.sapi.model.cloud.TCloudSync;
+import com.xhkjedu.sapi.service.cloud.CloudSyncService;
+import org.springframework.scheduling.annotation.Scheduled;
+import org.springframework.stereotype.Component;
+
+import javax.annotation.Resource;
+
+/**
+ * @author ywx
+ * @className CloudSyncTask
+ * @description
+ * @date 2021/6/5 14:13
+ **/
+@Component
+public class CloudSyncTask {
+    @Resource
+    private CloudSyncService cloudSyncService;
+
+    //生成上周班级报告
+    @Scheduled(cron = "${cron.synctime}")
+    public void classReportWeek(){
+        TCloudSync sync = cloudSyncService.getCloudInfo();
+        sync.setSyncnum(ConfigKey.syncnum);
+        cloudSyncService.sync(sync);
+    }
+}

sapi/src/main/java/com/xhkjedu/sapi/utils/ConvertUtil.java

@@ -0,0 +1,87 @@
+package com.xhkjedu.sapi.utils;
+
+import com.alibaba.fastjson.JSON;
+import com.xhkjedu.sapi.listener.MessageSender;
+import com.xhkjedu.sapi.mapper.space.ResourceFileMapper;
+import com.xhkjedu.sapi.model.space.TResource;
+import com.xhkjedu.sapi.vo.subjectbook.ResourceVo;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+import javax.annotation.Resource;
+import java.util.Arrays;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * @author ywx
+ * @classname ConvertUtil
+ * @description 文件转换工具类
+ * @date 2021/10/27 9:32
+ **/
+@Component
+public class ConvertUtil {
+    @Resource
+    private ResourceFileMapper resourceFileMapper;
+    @Autowired
+    private MessageSender messageSender;
+    private static Integer[] CLASS = {1,2,5,7};//资源分类1word,2ppt,3pdf,4图片,5视频,6音频,7压缩包,10其他
+
+    //资源转换（word或ppt转为pdf，视频非h264编码转码，压缩包解压）
+    public void convertResource(TResource model) {
+        Integer resourceclass = model.getResourceclass();
+        //flv的视频不转换
+        if ("flv".equals(model.getSuffix())) return;
+        if (Arrays.asList(CLASS).contains(resourceclass) && model.getConverted() == 0) {
+            ResourceVo resource = new ResourceVo();
+            resource.setResourceid(model.getResourceid());
+            resource.setResourceclass(resourceclass);
+            resource.setResourceurl(model.getResourceurl());
+            resource.setSuffix(model.getSuffix());
+            messageSender.convertResource(resource);
+        }
+    }
+
+    //获取资源预览路径
+    public String getResourceUrl(ResourceVo resource) {
+        String pdfurl = resource.getPdfurl();
+        Integer resourceclass = resource.getResourceclass();
+        Integer converted = resource.getConverted();
+        if ((resourceclass == 1 || resourceclass == 2) && converted == 0) {
+            //需要把word或ppt转为pdf
+            pdfurl = messageSender.convertResource(resource);
+        } else if (resourceclass == 5) {
+            pdfurl = videoTransfer(resource);
+        } else if (resourceclass == 7) {
+            pdfurl = unzip(resource);
+        }
+        resource.setPdfurl(pdfurl);
+        return pdfurl;
+    }
+
+    //视频转换
+    public String videoTransfer(ResourceVo resource) {
+        String resourceurl = resource.getResourceurl();
+        String suffix = resource.getSuffix();
+        if (suffix.equals("mp4") && !resource.getMp4code().equals("h264")) {
+            resourceurl = messageSender.convertResource(resource);
+        }
+        return resourceurl;
+    }
+
+    //解压zip
+    public String unzip(ResourceVo resource) {
+        String resourceid = resource.getResourceid();
+        String pdfurl = null;
+        Integer converted = resource.getConverted();
+        if (converted == 0) {
+            //获取压缩包文件
+            pdfurl = messageSender.convertResource(resource);
+        } else {
+            List<Map> files = resourceFileMapper.listFile(resourceid);
+            pdfurl = JSON.toJSONString(files);
+        }
+        return pdfurl;
+    }
+
+}

sapi/src/main/resources/application.properties

@@ -59,6 +59,15 @@ nummax=50000
 numadd=100000000
 #一次同步数量
 cron.syncnum=100
+#默认为false，不开启定时任务
+enable.scheduled=false
+#周一的凌晨2:00触发生成班级周报
+cron.classReportWeek=0 0 2 ? * MON
+#1号的凌晨3:00触发生成班级月报
+cron.classReportMonth=0 0 3 1 * ?
+#周日的凌晨3:00同步基础信息
+cron.synctime=0 0 3 ? * SUN
+#一次同步数量
 
 #云平台接口地址
 cloudapi=http://scapitest.xhkjedu.com/
@@ -77,9 +86,23 @@ lc.lc_app_id=xinghuodashuju_qa_20210524
 lc.lc_security_key=d802d29c7e0c79bdecea3a10c419231a
 lc.lc_school_prefix=henanxinghuoliaoyuankejiyouxiangongsi_
 
-rabbitmq.queue=xhkjedu.xhschool.livequeue_dev_bd
-rabbitmq.resourceToPdfQueue=xhkjedu.xhschool.resourceToPdfQueue
-rabbitmq.resourceTransferQueue=xhkjedu.xhschool.resourceTransferQueue
-rabbitmq.resourceUnZipQueue=xhkjedu.xhschool.resourceUnZipQueue
-rabbitmq.resourceDelQueue=xhkjedu.xhschool.resourceDelQueue
+rabbitmq.resourceToPdfQueue=xhkjedu.xhschool.resourceToPdfQueue_dev
+rabbitmq.resourceTransferQueue=xhkjedu.xhschool.resourceTransferQueue_dev
+rabbitmq.resourceUnZipQueue=xhkjedu.xhschool.resourceUnZipQueue_dev
+rabbitmq.resourceDelQueue=xhkjedu.xhschool.resourceDelQueue_dev
 rabbitmq.resourceHandleQueue=xhkjedu.xhschool.resourceHandleQueue_dev
+spring.rabbitmq.host=116.63.199.166
+spring.rabbitmq.port=5672
+spring.rabbitmq.username=xhkjedu
+spring.rabbitmq.password=xhkjedud07
+spring.rabbitmq.connection-timeout=15000
+#rabbitmq自动签收
+spring.rabbitmq.listener.simple.acknowledge-mode=auto
+# 是否开启消费者重试（为false时关闭消费者重试）
+spring.rabbitmq.listener.simple.retry.enabled=true
+# 最大重试重新投递消息次数
+spring.rabbitmq.listener.simple.retry.max-attempts=3
+# 重试重新投递消息的间隔时间（单位毫秒）
+spring.rabbitmq.listener.simple.retry.initial-interval=30000ms
+#重试次数超过上面的设置之后，是否丢弃(消费者listener抛出异常，是否重回队列（默认true：重回队列，false：不重回队列（可结合死信交换机））
+spring.rabbitmq.listener.simple.default-requeue-rejected=false

sapi/src/main/resources/mapper/cloud/CloudSyncMapper.xml

@@ -1,6 +1,6 @@
 <?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.mapper.sapi.cloud.CloudSyncMapper">
+<mapper namespace="com.xhkjedu.sapi.mapper.cloud.CloudSyncMapper">
   <!--列表-->
   <resultMap id="syncResult" type="java.util.Map">
     <id column="csid" property="csid"></id>
@@ -125,7 +125,7 @@
       </foreach>
   </insert>
   <!--同步资源-->
-  <insert id="syncResource" parameterType="com.xhkjedu.sapi.model.subjectbook.TResource">
+  <insert id="syncResource" parameterType="com.xhkjedu.sapi.model.space.TResource">
       INSERT INTO t_resource (resourceid,resourcename,subjectid,resourceclass,resourcetype,level
       ,resourceurl,resourcecover,converted,pdfurl,resourcestate,suffix,mp4code,resourcesize,duration,comm
       ,createtime,timeunix,resourcegrade,source,year,region,schoolname,belong)
@@ -136,7 +136,7 @@
       ON DUPLICATE KEY UPDATE resourcename=#{m.resourcename},resourcestate=#{m.resourcestate},comm=#{m.comm}
   </insert>
   <!--同步资源章节-->
-  <insert id="syncResourceDirector" parameterType="com.xhkjedu.sapi.model.subjectbook.TResourceDirector">
+  <insert id="syncResourceDirector" parameterType="com.xhkjedu.sapi.model.space.TResourceDirector">
       <foreach collection ="list" item="m" index= "index" separator =";">
       INSERT INTO t_resource_director (rdid,resourceid,lsbid,directorid,createtime,timeunix)
       VALUES (#{m.rdid},#{m.resourceid},#{m.lsbid},#{m.directorid},#{m.handletime},UNIX_TIMESTAMP(now()))

sapi/src/main/resources/mapper/space/ResourceMapper.xml

@@ -0,0 +1,106 @@
+<?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.space.ResourceMapper">
+
+    <!--2020.11.16 教师备课只获取自己上传到个人空间文件-->
+    <select id="listMyResource" resultType="com.xhkjedu.sapi.model.space.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
+        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
+        where r.resourcestate=1 and r.level=2 and r.createid=#{resource.createid}
+        <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.sapi.vo.subjectbook.ResourceVo">
+        <result property="resourceid" column="resourceid"></result>
+        <result property="resourcename" column="resourcename"></result>
+        <result property="readcount" column="readcount"></result>
+        <result property="downcount" column="downcount"></result>
+        <result property="resourceclass" column="resourceclass"></result>
+        <result property="resourcetype" column="resourcetype"></result>
+        <result property="belong" column="belong"></result>
+        <result property="resourcegrade" column="resourcegrade"></result>
+        <result property="source" column="source"></result>
+        <result property="year" column="year"></result>
+        <result property="region" column="region"></result>
+        <result property="schoolname" column="schoolname"></result>
+        <result property="converted" column="converted"></result>
+        <result property="pdfurl" column="pdfurl"></result>
+        <result property="resourceurl" column="resourceurl"></result>
+        <result property="resourcecover" column="resourcecover"></result>
+        <result property="suffix" column="suffix"></result>
+        <result property="mp4code" column="mp4code"></result>
+        <result property="resourcesize" column="resourcesize"></result>
+        <result property="duration" column="duration"></result>
+        <result property="createid" column="createid"></result>
+        <result property="createname" column="createname"></result>
+        <result property="createtime" column="createtime"></result>
+        <result property="comm" column="comm"></result>
+        <result property="lsbnum" column="lsbnum"></result>
+        <result property="directornum" column="directornum"></result>
+        <result property="areaall" column="areaall"></result>
+        <collection property="directors" ofType="com.xhkjedu.sapi.vo.subjectbook.DirectorVo" javaType="java.util.List">
+            <result property="lsbid" column="lsbid"></result>
+            <result property="directorid" column="directorid"></result>
+            <result property="directorname" column="directorname"></result>
+            <result property="level" column="level"></result>
+            <result property="subjectid" column="subjectid"></result>
+            <result property="subjectname" column="subjectname"></result>
+            <result property="versionname" column="versionname"></result>
+            <result property="lsbname" column="lsbname"></result>
+        </collection>
+    </resultMap>
+    <select id="findById" resultMap="resourceResult">
+        select r.*,u.username createname,rd.lsbid,rd.directorid,d.directorall directorname
+        ,sb.level,sb.subjectid,s.subjectname,v.versionname,sb.lsbname
+        ,(select a.areaall from t_areazone a where a.areacode=r.region)areaall
+        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
+        left join t_director d on rd.directorid = d.directorid
+        left join t_subject_book sb on d.lsbid = sb.lsbid
+        left join t_subject s on sb.subjectid = s.subjectid
+        left join t_version v on sb.versionid = v.versionid
+        where r.resourceid=#{resourceid};
+        update t_resource r set r.readcount=r.readcount+1 where r.resourceid=#{resourceid}
+    </select>
+    <!--<select id="findById2" resultType="com.xhkjedu.sapi.vo.subjectbook.ResourceVo">
+        select r.resourceid,r.resourceclass,r.resourceurl,r.pdfurl,r.converted,r.suffix,r.mp4code
+        from t_resource r where r.resourceid=#{resourceid}
+    </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>
+
+    <!--批量添加-->
+    <insert id="batchSaveResourceDirector" parameterType="com.xhkjedu.sapi.model.space.TResourceDirector">
+        INSERT INTO t_resource_director (rdid,resourceid,lsbid,directorid,createid,createtime)
+        VALUES
+        <foreach collection ="list" item="d" index= "index" separator =",">
+            (#{d.rdid},#{d.resourceid},#{d.lsbid},#{d.directorid},#{d.createid},#{d.createtime})
+        </foreach>
+    </insert>
+
+</mapper>

sstudy/src/main/java/com/xhkjedu/sstudy/config/RabbitConfig.java

@@ -0,0 +1,53 @@
+package com.xhkjedu.sstudy.config;
+
+import org.springframework.amqp.core.Queue;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+
+/**
+ * @author ywx
+ * @classname RabbitConfig
+ * @description
+ * @date 2021/6/18 12:51
+ **/
+@Configuration
+public class RabbitConfig {
+
+    @Value("${rabbitmq.resourceToPdfQueue}")
+    private String resourceToPdfQueue;
+    @Value("${rabbitmq.resourceTransferQueue}")
+    private String resourceTransferQueue;
+    @Value("${rabbitmq.resourceUnZipQueue}")
+    private String resourceUnZipQueue;
+    @Value("${rabbitmq.resourceDelQueue}")
+    private String resourceDelQueue;
+    @Value("${rabbitmq.resourceHandleQueue}")
+    private String resourceHandleQueue;
+
+    @Bean
+    public Queue resourceToPdfQueue() {
+        return new Queue(resourceToPdfQueue);
+    }
+
+    @Bean
+    public Queue resourceTransferQueue() {
+        return new Queue(resourceTransferQueue);
+    }
+
+    @Bean
+    public Queue resourceUnZipQueue() {
+        return new Queue(resourceUnZipQueue);
+    }
+
+    @Bean
+    public Queue resourceDelQueue() {
+        return new Queue(resourceDelQueue);
+    }
+
+    @Bean
+    public Queue resourceHandleQueue() {
+        return new Queue(resourceHandleQueue);
+    }
+
+}

sstudy/src/main/java/com/xhkjedu/sstudy/config/ScheduledConfig.java

@@ -0,0 +1,30 @@
+package com.xhkjedu.sstudy.config;
+
+import org.springframework.context.annotation.*;
+import org.springframework.core.type.AnnotatedTypeMetadata;
+import org.springframework.scheduling.annotation.ScheduledAnnotationBeanPostProcessor;
+
+/**
+ * @author ywx
+ * @className ScheduledConfig
+ * @description @Scheduled 注解，是被一个叫做 ScheduledAnnotationBeanPostProcessor 的类所拦截的，
+ * 所以我们可以根据配置，决定是否创建这个 bean，如果没有这个 bean，@Scheduled 就不会被拦截，那么定时任务肯定不会执行了，
+ * 需要注意的是：这种方式，启动类上面的 @EnableScheduling 需要去掉。
+ * @date 2021/5/18 9:15
+ **/
+@Configuration
+public class ScheduledConfig {
+    @Conditional(ScheduledCondition.class)
+    @Bean
+    public ScheduledAnnotationBeanPostProcessor processor(){
+        return new ScheduledAnnotationBeanPostProcessor();
+    }
+}
+
+class ScheduledCondition implements Condition {
+
+    @Override
+    public boolean matches(ConditionContext context, AnnotatedTypeMetadata metadata) {
+        return Boolean.valueOf(context.getEnvironment().getProperty("enable.scheduled"));
+    }
+}

sstudy/src/main/java/com/xhkjedu/sstudy/config/ThreadPoolTaskExecutorConfig.java

@@ -0,0 +1,62 @@
+package com.xhkjedu.sstudy.config;
+
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.scheduling.concurrent.ThreadPoolTaskExecutor;
+import org.springframework.scheduling.concurrent.ThreadPoolTaskScheduler;
+
+import java.util.concurrent.ThreadPoolExecutor;
+
+/**
+ * @描述 :配置线程池
+ * @创建人 :zj
+ * @创建时间 2019/9/30
+ * @修改人和其它信息
+ */
+@Configuration
+public class ThreadPoolTaskExecutorConfig {
+    /**
+     * 配置执行任务线程池
+     * 应用此池： @Async("asyncPoolTaskExecutor")
+     *
+     * @return
+     */
+    @Bean(name = "asyncPoolTaskExecutor")
+    public ThreadPoolTaskExecutor getAsyncThreadPoolTaskExecutor() {
+        ThreadPoolTaskExecutor taskExecutor = new ThreadPoolTaskExecutor();
+        taskExecutor.setCorePoolSize(20);
+        taskExecutor.setMaxPoolSize(200);
+        taskExecutor.setQueueCapacity(25);
+        taskExecutor.setKeepAliveSeconds(200);
+        //定义线程池名字
+        taskExecutor.setThreadNamePrefix("asyncPoolTaskExecutor。");
+        //该方法就是这里的关键，用来设置线程池关闭的时候等待所有任务都完成再继续销毁其他的Bean，这样这些异步任务的销毁就会先于Redis线程池的销毁。
+        // 同时，这里还设置了setAwaitTerminationSeconds(60)，该方法用来设置线程池中任务的等待时间，如果超过这个时候还没有销毁就强制销毁，
+        // 以确保应用最后能够被关闭，而不是阻塞住。
+        taskExecutor.setWaitForTasksToCompleteOnShutdown(true);
+        taskExecutor.setAwaitTerminationSeconds(60);
+        // 线程池对拒绝任务（无线程可用）的处理策略，目前只支持AbortPolicy、CallerRunsPolicy；默认为后者
+        taskExecutor.setRejectedExecutionHandler(new ThreadPoolExecutor.CallerRunsPolicy());
+        taskExecutor.initialize();
+        return taskExecutor;
+    }
+
+    /** 
+    * @Description: 配置调度任务线程池
+    * @Author: lgq 
+    * @Date: 2020-03-11 16:15:27
+    */ 
+    @Bean
+    public ThreadPoolTaskScheduler threadPoolTaskScheduler() {
+        ThreadPoolTaskScheduler threadPoolTaskScheduler = new ThreadPoolTaskScheduler();
+        threadPoolTaskScheduler.setPoolSize(500);
+        threadPoolTaskScheduler.setThreadNamePrefix("taskExecutor-");
+        threadPoolTaskScheduler.setWaitForTasksToCompleteOnShutdown(true);
+        threadPoolTaskScheduler.setRemoveOnCancelPolicy(true);
+        threadPoolTaskScheduler.setWaitForTasksToCompleteOnShutdown(true);
+        threadPoolTaskScheduler.setAwaitTerminationSeconds(60);
+        threadPoolTaskScheduler.setRejectedExecutionHandler(new ThreadPoolExecutor.CallerRunsPolicy());
+        return threadPoolTaskScheduler;
+    }
+
+}

sstudy/src/main/java/com/xhkjedu/sstudy/task/PaperStudentTask.java

@@ -0,0 +1,29 @@
+package com.xhkjedu.sstudy.task;
+
+import com.xhkjedu.sstudy.service.paperstudent.PaperStudentService;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.scheduling.annotation.Async;
+import org.springframework.scheduling.annotation.Scheduled;
+import org.springframework.stereotype.Component;
+
+/**
+ * @ClassName PaperStudentTask
+ * Description 学生作业，如果是截至时间到时显示答案，定时任务处理
+ * Author WN
+ * Date 2020/10/13 15:32
+ **/
+@Slf4j
+@Component
+public class PaperStudentTask {
+
+    @Autowired
+    private PaperStudentService paperStudentService;
+
+    @Async("threadPoolTaskScheduler")
+    @Scheduled(cron = "${cron.updatePaperStuShowanswer}")
+    public void updatePaperStuShowanswer(){
+        paperStudentService.updateShowanswer();
+    }
+
+}

sstudy/src/main/resources/application.properties

@@ -58,12 +58,12 @@ secretKey=nanhuakaizhangjianwangni
 nummin=10000
 nummax=50000
 numadd=100000000
-#默认为false，不开启定时任务
-enable.scheduled=false
-#周日的凌晨3:00同步基础信息
-cron.synctime=0 0 3 ? * SUN
 #一次同步数量
 cron.syncnum=100
+#默认为false，不开启定时任务
+enable.scheduled=false
+#每隔1分钟修改学生作业是否显示答案
+cron.updatePaperStuShowanswer=* */1 * * * ?
 
 #云平台接口地址
 cloudapi=http://scapitest.xhkjedu.com/
@@ -77,10 +77,10 @@ file.showurl=http://schoolstatictest.xhkjedu.com/static/
 dbname=xhkjedu_school_test
 
 
-rabbitmq.resourceToPdfQueue=xhkjedu.xhschool.resourceToPdfQueue
-rabbitmq.resourceTransferQueue=xhkjedu.xhschool.resourceTransferQueue
-rabbitmq.resourceUnZipQueue=xhkjedu.xhschool.resourceUnZipQueue
-rabbitmq.resourceDelQueue=xhkjedu.xhschool.resourceDelQueue
+rabbitmq.resourceToPdfQueue=xhkjedu.xhschool.resourceToPdfQueue_dev
+rabbitmq.resourceTransferQueue=xhkjedu.xhschool.resourceTransferQueue_dev
+rabbitmq.resourceUnZipQueue=xhkjedu.xhschool.resourceUnZipQueue_dev
+rabbitmq.resourceDelQueue=xhkjedu.xhschool.resourceDelQueue_dev
 rabbitmq.resourceHandleQueue=xhkjedu.xhschool.resourceHandleQueue_dev
 spring.rabbitmq.host=116.63.199.166
 spring.rabbitmq.port=5672