教材基础信息

sstudy/pom.xml

@@ -22,10 +22,10 @@
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-web</artifactId>
         </dependency>
-        <dependency>
+        <!--<dependency>
             <groupId>org.springframework.cloud</groupId>
             <artifactId>spring-cloud-starter-config</artifactId>
-        </dependency>
+        </dependency>-->
         <dependency>
             <groupId>org.springframework.cloud</groupId>
             <artifactId>spring-cloud-starter-netflix-eureka-client</artifactId>
@@ -35,6 +35,12 @@
             <groupId>mysql</groupId>
             <artifactId>mysql-connector-java</artifactId>
         </dependency>
+        <!-- Druid连接池 -->
+        <dependency>
+            <groupId>com.alibaba</groupId>
+            <artifactId>druid</artifactId>
+            <version>1.1.12</version>
+        </dependency>
         <dependency>
             <groupId>org.projectlombok</groupId>
             <artifactId>lombok</artifactId>
@@ -45,6 +51,36 @@
             <artifactId>spring-boot-starter-test</artifactId>
             <scope>test</scope>
         </dependency>
+
+        <dependency>
+            <groupId>com.xhkjedu</groupId>
+            <artifactId>scommons</artifactId>
+            <version>0.0.1-SNAPSHOT</version>
+        </dependency>
+
+        <!--mybatis通用mapper依赖-->
+        <dependency>
+            <groupId>tk.mybatis</groupId>
+            <artifactId>mapper-spring-boot-starter</artifactId>
+            <version>2.0.2</version>
+        </dependency>
+
+        <dependency>
+            <groupId>com.alibaba</groupId>
+            <artifactId>fastjson</artifactId>
+            <version>1.2.56</version>
+        </dependency>
+
+        <dependency>
+            <groupId>redis.clients</groupId>
+            <artifactId>jedis</artifactId>
+            <version>2.9.3</version>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-data-redis</artifactId>
+        </dependency>
+
     </dependencies>
     <dependencyManagement>
         <dependencies>

sstudy/src/main/java/com/xhkjedu/sstudy/SstudyApplication.java

@@ -2,8 +2,10 @@ package com.xhkjedu.sstudy;
 
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
+import tk.mybatis.spring.annotation.MapperScan;
 
 @SpringBootApplication
+@MapperScan(basePackages = {"com.xhkjedu.sstudy.mapper"})
 public class SstudyApplication {
 
     public static void main(String[] args) {

sstudy/src/main/java/com/xhkjedu/sstudy/base/TkMapper.java

@@ -0,0 +1,9 @@
+package com.xhkjedu.sstudy.base;
+
+import tk.mybatis.mapper.common.IdsMapper;
+import tk.mybatis.mapper.common.Mapper;
+import tk.mybatis.mapper.common.MySqlMapper;
+
+public interface TkMapper<T> extends Mapper<T>, MySqlMapper<T>, IdsMapper<T> {
+
+}

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

@@ -0,0 +1,86 @@
+package com.xhkjedu.sstudy.config;
+
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.stereotype.Component;
+
+import java.io.UnsupportedEncodingException;
+
+/**
+ * @author ywx
+ * @classname ConfigKey
+ * @description 读取配置文件类
+ * @date 2020/10/16 9:19
+ **/
+@Component
+public class ConfigKey {
+
+    public static Integer nummin;
+    public static Integer nummax;
+    public static Integer numadd;
+
+    @Value("${nummin}")
+    public void setNummin(Integer nummin) {
+        ConfigKey.nummin = nummin;
+    }
+
+    @Value("${nummax}")
+    public void setNummax(Integer nummax) {
+        ConfigKey.nummax = nummax;
+    }
+
+    @Value("${numadd}")
+    public void setNumadd(Integer numadd) {
+        ConfigKey.numadd = numadd;
+    }
+
+    public static String cloudapi;//云平台接口
+    public static String showurl;//文件访问路径
+    public static String oldshowurl;//原文件访问路径
+    public static String fileapi;//文件服务接口地址
+    public static String dbname;//数据库名
+
+    @Value("${cloudapi}")
+    public void setCloudapi(String cloudapi) {
+        this.cloudapi = cloudapi;
+    }
+
+    @Value("${file.showurl}")
+    public void setShowurl(String showurl) {
+        this.showurl = showurl;
+    }
+
+    @Value("${file.oldshowurl}")
+    public void setOldshowurl(String oldshowurl) {
+        this.oldshowurl = oldshowurl;
+    }
+
+    @Value("${fileapi}")
+    public void setFileapi(String fileapi) {
+        this.fileapi = fileapi;
+    }
+
+    @Value("${dbname}")
+    public void setDbname(String dbname) {
+        ConfigKey.dbname = dbname;
+    }
+
+    public static Integer syncnum;//一次同步数量
+
+    @Value("${cron.syncnum}")
+    public void setSyncnum(Integer syncnum) {
+        ConfigKey.syncnum = syncnum;
+    }
+
+    public static Integer redisdatatime;//缓存访问数据有效时长
+    public static String secretKey;//secretKey必须为24位
+
+    @Value("${redisdatatime}")
+    public void setRedisdatatime(Integer redisdatatime) {
+        ConfigKey.redisdatatime = redisdatatime;
+    }
+
+    @Value("${secretKey}")
+    public void setSecretKey(String secretKey) {
+        ConfigKey.secretKey = secretKey;
+    }
+}

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

@@ -0,0 +1,34 @@
+package com.xhkjedu.sstudy.config;
+
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.web.cors.CorsConfiguration;
+import org.springframework.web.cors.UrlBasedCorsConfigurationSource;
+import org.springframework.web.filter.CorsFilter;
+
+/**
+ * @ClassName CorsConfig
+ * Description 请求跨域支持
+ * Author WN
+ * Date 2020/6/5 16:29
+ **/
+@Configuration
+public class CorsConfig {
+    private CorsConfiguration corsConfiguration() {
+        CorsConfiguration corsConfiguration = new CorsConfiguration();
+        // 1允许任何域名使用
+        corsConfiguration.addAllowedOrigin("*");
+        // 2允许任何头
+        corsConfiguration.addAllowedHeader("*");
+        // 3允许任何方法（post、get等）
+        corsConfiguration.addAllowedMethod("*");
+        return corsConfiguration;
+    }
+
+    @Bean
+    public CorsFilter corsFilter() {
+        UrlBasedCorsConfigurationSource source = new UrlBasedCorsConfigurationSource();
+        source.registerCorsConfiguration("/**", corsConfiguration());
+        return new CorsFilter(source);
+    }
+}

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

@@ -0,0 +1,68 @@
+package com.xhkjedu.sstudy.config;
+import com.alibaba.fastjson.JSON;
+import com.xhkjedu.config.MissingParametersException;
+import com.xhkjedu.utils.N_Utils;
+import com.xhkjedu.vo.ResultVo;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.dao.DataIntegrityViolationException;
+import org.springframework.web.bind.annotation.ControllerAdvice;
+import org.springframework.web.bind.annotation.ExceptionHandler;
+import org.springframework.web.bind.annotation.ResponseBody;
+
+import javax.servlet.http.HttpServletRequest;
+
+
+/**
+ * @创建人 :zj
+ * @创建时间 2019/11/7
+ * @修改人和其它信息
+ * @描述 :项目异常处理类:
+ * 项目中所有controller层抛出的异常信息都会被拦截。
+ * 方便我们查看异常原因，减少开发中大量的try catch。
+ * 拦截异常后，打印异常信息，返回前端约定参数对象。
+ */
+@Slf4j
+@ResponseBody
+@ControllerAdvice
+public class ErrorAdivceController {
+    @ExceptionHandler(MissingParametersException.class)
+    public ResultVo missingParametersException(MissingParametersException ex) {
+        log.error("参数异常:   -------> " + ex.getMessage());
+        return new ResultVo(1, ex.getMessage());
+    }
+
+    @ExceptionHandler(DataIntegrityViolationException.class)
+    public ResultVo DataIntegrityViolationException(DataIntegrityViolationException ex){
+        log.error("数据库异常:   -------> " + ex.getMessage());
+        String msg = ex.getMessage();
+        if (N_Utils.isNotEmpty(msg) && msg.indexOf("SQLIntegrityConstraintViolationException") != -1){
+            return new ResultVo(1,"存在关联信息");
+        }
+        return new ResultVo(1,"数据库处理异常");
+    }
+
+    @ExceptionHandler(Exception.class)
+    public ResultVo exceptionHandler(Exception ex) {
+        log.error("程序运行异常:   -------> " + ex.getMessage());
+        String msg = ex.getMessage();
+        if (N_Utils.isNotEmpty(msg) && msg.indexOf("JSON parse error") != -1){
+            return new ResultVo(1,"json格式不对");
+        }
+        return new ResultVo(1, "程序处理异常");
+    }
+
+    @ExceptionHandler(NullPointerException.class)
+    public ResultVo nullPointerException(NullPointerException ex) {
+        StackTraceElement element = ex.getStackTrace()[0];
+        log.error("参数为空异常:   -------> " + JSON.toJSONString(element));
+        return new ResultVo(1, "参数为空异常");
+    }
+
+    @ExceptionHandler(value = IllegalArgumentException.class)
+    public ResultVo illegalArgumentExceptionHandler(HttpServletRequest request, IllegalArgumentException ex) {
+        log.error("请求参数错误 URL : {}，Exception : {}", request.getRequestURL(),ex.getMessage());
+        return new ResultVo(1, "请求参数错误");
+    }
+
+
+}

sstudy/src/main/java/com/xhkjedu/sstudy/controller/subjectbook/DirectorController.java

@@ -0,0 +1,105 @@
+package com.xhkjedu.sstudy.controller.subjectbook;
+
+import com.xhkjedu.sstudy.model.subjectbook.TDirector;
+import com.xhkjedu.sstudy.service.subjectbook.DirectorService;
+import com.xhkjedu.utils.N_Utils;
+import com.xhkjedu.vo.ResultVo;
+import org.springframework.beans.factory.annotation.Autowired;
+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 java.util.List;
+
+
+/**
+ * @ClassName DirectorController
+ * Description 章节
+ * Author WN
+ * Date 2020/6/3 11:58
+ **/
+@RestController
+@RequestMapping("director")
+public class DirectorController {
+    @Autowired
+    private DirectorService directorService;
+
+    /**
+     *功能描述  教材下章节树形结构
+     * @author WN
+     * @date 2020/6/3
+     * @param  * @param director
+     * @return com.xhkjedu.vo.ResultVo
+     */
+    @PostMapping("/list")
+    public ResultVo list(@RequestBody TDirector director){
+        N_Utils.validation(new Object[]{director.getLsbid(),"教材id",1});
+        List<TDirector> lst = directorService.lisTDirectors(director);
+        return new ResultVo(0,"获取教材下章节成功",lst);
+    }
+
+    /**
+     *功能描述  添加
+     * @author WN
+     * @date 2020/6/3
+     * @param  * @param director
+     * @return com.xhkjedu.vo.ResultVo
+     */
+    @PostMapping("/add")
+    public ResultVo add(@RequestBody TDirector director){
+        N_Utils.validation(new Object[]{director.getDirectorname(),"章节名称",2,director.getLsbid(),"教材id",1,
+        director.getBelong(),"章节归属",1,director.getDirectorlevel(),"归属层级",1});
+        if (director.getDirectorlevel() > 4) {
+            return new ResultVo(1,"超过层级限制");
+        }
+        int result = directorService.addDirector(director);
+        if (result > 0) {
+            return new ResultVo(0, "保存成功");
+        }else{
+            return new ResultVo(1, "保存失败");
+        }
+    }
+
+    /**
+     *功能描述  修改章节
+     * @author WN
+     * @date 2020/6/1
+     * @param  * @param director
+     * @return com.xhkjedu.vo.ResultVo
+     */
+    @PostMapping("/update")
+    public ResultVo update(@RequestBody TDirector director){
+        N_Utils.validation(new Object[]{director.getDirectorid(),"章节id",2,director.getDirectorname(),"章节名称",2});
+        int result = directorService.updateDirector(director);
+        if (result > 0) return new ResultVo(0,"修改成功");
+        else return new ResultVo(1,"修改失败");
+    }
+
+    /**
+     *功能描述 删除
+     * @author WN
+     * @date 2020/6/3
+     * @param  * @param director
+     * @return com.xhkjedu.vo.ResultVo
+     */
+    @PostMapping("/del")
+    public ResultVo del(@RequestBody TDirector director){
+        N_Utils.validation(new Object[]{director.getDirectorid(),"章节id",2});
+        String useModule = directorService.findUseModule(director.getDirectorid());
+        if (N_Utils.isNotEmpty(useModule)) {
+//            return new ResultVo(1,"使用章节模块【"+useModule+"】，禁止删除");
+            String[] strs = useModule.split(",");
+            for (String str : strs) {
+                if (N_Utils.isNotEmpty(str)){
+                    useModule = str;
+                    break;
+                }
+            }
+            return new ResultVo(1,"此章节下已有"+useModule+"，禁止删除");
+        }
+        int result = directorService.delDirector(director);
+        if (result > 0) return new ResultVo(0,"删除成功");
+        else return new ResultVo(1,"删除失败");
+    }
+}

sstudy/src/main/java/com/xhkjedu/sstudy/controller/subjectbook/PointController.java

@@ -0,0 +1,122 @@
+package com.xhkjedu.sstudy.controller.subjectbook;
+
+import com.xhkjedu.sstudy.model.subjectbook.TPoint;
+import com.xhkjedu.sstudy.service.subjectbook.PointService;
+import com.xhkjedu.utils.N_Utils;
+import com.xhkjedu.vo.ResultVo;
+import com.xhkjedu.sstudy.vo.subjectbook.PointVo;
+import org.springframework.beans.factory.annotation.Autowired;
+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 java.util.List;
+
+
+/**
+ * @ClassName PointController
+ * Description 知识点
+ * Author WN
+ * Date 2020/6/3 11:58
+ **/
+@RestController
+@RequestMapping("point")
+public class PointController {
+    @Autowired
+    private PointService pointService;
+
+    /**
+     *功能描述  科目下知识点列表
+     * @author WN
+     * @date 2020/6/3
+     * @param  * @param point
+     * @return com.xhkjedu.vo.ResultVo
+     */
+    @PostMapping("/list")
+    public ResultVo list(@RequestBody TPoint point){
+        N_Utils.validation(new Object[]{point.getSubjectid(),"科目id",2});
+        List<TPoint> lst = pointService.listPoints(point);
+        return new ResultVo(0,"获取科目下知识点成功",lst);
+    }
+
+    /**
+     *功能描述  添加
+     * @author WN
+     * @date 2020/6/3
+     * @param  * @param point
+     * @return com.xhkjedu.vo.ResultVo
+     */
+    @PostMapping("/add")
+    public ResultVo add(@RequestBody TPoint point){
+        N_Utils.validation(new Object[]{point.getPointname(),"知识点名称",2,point.getSubjectid(),"科目",1
+        ,point.getPointlevel(),"归属层级",1});
+        if (point.getPointlevel() > 5) {
+            return new ResultVo(1,"超过层级限制");
+        }
+        int result = pointService.addPoint(point);
+        if (result > 0) {
+            return new ResultVo(0, "保存成功");
+        }else{
+            return new ResultVo(1, "保存失败");
+        }
+    }
+
+    /**
+     *功能描述  修改知识点
+     * @author WN
+     * @date 2020/6/1
+     * @param  * @param point
+     * @return com.xhkjedu.vo.ResultVo
+     */
+    @PostMapping("/update")
+    public ResultVo update(@RequestBody TPoint point){
+        N_Utils.validation(new Object[]{point.getPointid(),"知识点id",2,point.getPointname(),"知识点名称",2});
+        int result = pointService.updatePoint(point);
+        if (result > 0) return new ResultVo(0,"修改成功");
+        else return new ResultVo(1,"修改失败");
+    }
+
+    /**
+     *功能描述 删除
+     * @author WN
+     * @date 2020/6/3
+     * @param  * @param point
+     * @return com.xhkjedu.vo.ResultVo
+     */
+    @PostMapping("/del")
+    public ResultVo del(@RequestBody TPoint point){
+        N_Utils.validation(new Object[]{point.getPointid(),"知识点id",2});
+        String useModule = pointService.findUseModule(point.getPointid());
+        if (N_Utils.isNotEmpty(useModule)) {
+//            return new ResultVo(1,"使用知识点模块【"+useModule+"】，禁止删除");
+            String[] strs = useModule.split(",");
+            for (String str : strs) {
+                if (N_Utils.isNotEmpty(str)){
+                    useModule = str;
+                    break;
+                }
+            }
+            return new ResultVo(1,"此知识点下有"+useModule+"，禁止删除");
+        }
+        int result = pointService.delPoint(point);
+        if (result > 0) return new ResultVo(0,"删除成功");
+        else return new ResultVo(1,"删除失败");
+    }
+
+    /**
+     *功能描述  搜索知识点
+     * @author WN
+     * @date 2020/6/19
+     * @param  * @param point
+     * @return com.xhkjedu.vo.ResultVo
+     */
+    @PostMapping("/search")
+    public ResultVo search(@RequestBody TPoint point){
+        N_Utils.validation(new Object[]{point.getSubjectid(),"科目id",2});
+        List<PointVo> lst = pointService.listPointsForSearch(point);
+        return new ResultVo(0,"搜索科目下知识点成功",lst);
+    }
+
+
+}

sstudy/src/main/java/com/xhkjedu/sstudy/controller/subjectbook/SubjectBookController.java

@@ -0,0 +1,124 @@
+package com.xhkjedu.sstudy.controller.subjectbook;
+
+import com.xhkjedu.sstudy.model.subjectbook.TSubjectBook;
+import com.xhkjedu.sstudy.service.subjectbook.SubjectBookService;
+import com.xhkjedu.utils.N_Utils;
+import com.xhkjedu.vo.ResultVo;
+import com.xhkjedu.sstudy.vo.subjectbook.LsbSubjectVo;
+import org.springframework.beans.factory.annotation.Autowired;
+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 java.util.List;
+import java.util.Map;
+
+/**
+ * @ClassName SubjectBookController
+ * Description 教材
+ * Author WN
+ * Date 2020/6/2 18:10
+ **/
+@RestController
+@RequestMapping("lsb")
+public class SubjectBookController {
+    @Autowired
+    private SubjectBookService subjectBookService;
+
+    /**
+     *功能描述 添加教材
+     * @author WN
+     * @date 2020/6/2
+     * @param  * @param subjectBook
+     * @return com.xhkjedu.vo.ResultVo
+     */
+    @PostMapping("/add")
+    public ResultVo add(@RequestBody TSubjectBook subjectBook){
+        N_Utils.validation(new Object[]{subjectBook.getLevel(),"阶段",1,subjectBook.getSubjectid(),"科目",1,subjectBook.getVersionid(),"版本",1});
+        int result = subjectBookService.addSubjectBook(subjectBook);
+        if (result > 0) {
+            return new ResultVo(0, "保存成功");
+        }else{
+            return new ResultVo(1, "保存失败");
+        }
+    }
+
+   /**
+    *功能描述 教材
+    * @author WN
+    * @date 2020/6/2
+    * @param  * @param subjectBook
+    * @return com.xhkjedu.vo.ResultVo
+    */
+    @PostMapping("/update")
+    public ResultVo update(@RequestBody TSubjectBook subjectBook){
+        N_Utils.validation(new Object[]{subjectBook.getLsbid(),"教材id",1});
+        return subjectBookService.updateSubjectBook(subjectBook);
+    }
+
+    /**
+     *功能描述 教材--删除
+     * @author WN
+     * @date 2020/6/17
+     * @param  * @param subjectBook
+     * @return com.xhkjedu.vo.ResultVo
+     */
+    @PostMapping("/del")
+    public ResultVo del(@RequestBody TSubjectBook subjectBook){
+        N_Utils.validation(new Object[]{subjectBook.getLsbid(),"教材id",1});
+        String useModule = subjectBookService.findUseModule(subjectBook.getLsbid());
+        if (N_Utils.isNotEmpty(useModule)) {
+//            return new ResultVo(1,"使用教材模块【"+useModule+"】，禁止删除");
+            String[] strs = useModule.split(",");
+            for (String str : strs) {
+                if (N_Utils.isNotEmpty(str)){
+                    useModule = str;
+                    break;
+                }
+            }
+            return new ResultVo(1,"此教材下已有"+useModule+"，禁止删除");
+        }
+        int result = subjectBookService.delSubjectBook(subjectBook);
+        if (result > 0) return new ResultVo(0,"删除成功");
+        else return new ResultVo(1,"删除失败");
+    }
+
+    /**
+     *功能描述  教材--树形结构
+     * @author WN
+     * @date 2020/6/3
+     * @param  * @param subjectBook
+     * @return com.xhkjedu.vo.ResultVo
+     */
+    @PostMapping("/tree")
+    public ResultVo listSubjectBooks(@RequestBody TSubjectBook subjectBook){
+        N_Utils.validation(new Object[]{
+                subjectBook.getLevel(),"阶段",1,
+        });
+        List<LsbSubjectVo> lst = subjectBookService.listSubjectBooksForTree(subjectBook);
+        return new ResultVo(0,"获取教材树形结构成功",lst);
+    }
+
+    /**
+     *功能描述  获取教材集合
+     * @author WN
+     * @date 2020/6/7
+     * @param  * @param subjectBook
+     * @return com.xhkjedu.vo.ResultVo
+     */
+    @PostMapping("/list")
+    public ResultVo list(@RequestBody TSubjectBook subjectBook){
+        N_Utils.validation(new Object[]{
+                subjectBook.getLevel(),"阶段",1
+        });
+        List<TSubjectBook> lst = subjectBookService.listSubjectBooks(subjectBook);
+        return new ResultVo(0,"获取所有教材集合",lst);
+    }
+
+    @PostMapping("/list_sel")
+    public ResultVo listForSel() {
+        List<Map> list = subjectBookService.listForSel();
+        return new ResultVo(0,"获取教材选择列表成功",list);
+    }
+}

sstudy/src/main/java/com/xhkjedu/sstudy/controller/subjectbook/SubjectController.java

@@ -0,0 +1,126 @@
+package com.xhkjedu.sstudy.controller.subjectbook;
+
+import com.xhkjedu.sstudy.model.subjectbook.TSubject;
+import com.xhkjedu.sstudy.service.subjectbook.SubjectService;
+import com.xhkjedu.utils.N_Utils;
+import com.xhkjedu.sstudy.vo.subjectbook.SubjectVo;
+import com.xhkjedu.vo.ResultVo;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+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 java.util.List;
+
+/**
+ * @ClassName SubjectController
+ * Description TODO
+ * Author WN
+ * Date 2020/6/1 12:03
+ **/
+@Slf4j
+@RestController
+@RequestMapping("/subject")
+public class SubjectController {
+    @Autowired
+    private SubjectService subjectService;
+
+    /**
+     *功能描述  获取阶段下所有科目信息
+     * @author WN
+     * @date 2020/6/1
+     * @param  * @param subject
+     * @return com.xhkjedu.vo.ResultVo
+     */
+    @PostMapping("/list")
+    public ResultVo listSubjects(@RequestBody TSubject subject){
+        List<TSubject> lst = subjectService.listSubjects(subject);
+        return new ResultVo(0,"查询科目集合成功",lst);
+    }
+
+    @PostMapping("/teacher_list")
+    public ResultVo listTeacherSubjects(@RequestBody TSubject subject){
+        Integer teacherid = subject.getCreateid();
+        N_Utils.validation(new Object[]{teacherid,"教师id",1});
+        List<TSubject> lst = subjectService.listTeacherSubjects(teacherid);
+        return new ResultVo(0,"查询教师科目集合成功",lst);
+    }
+
+    /**
+     *功能描述 用户选择学科
+     * @author WN
+     * @date 2020/6/2
+     * @param  * @param subject
+     * @return com.xhkjedu.vo.ResultVo
+     */
+    @PostMapping("/listsel")
+    public ResultVo listSubjectsForSel(@RequestBody TSubject subject){
+        List<SubjectVo> lst = subjectService.listSubjectsForSel(subject);
+        return new ResultVo(0,"查询科目集合成功",lst);
+    }
+
+    /**
+     *功能描述  添加科目
+     * @author WN
+     * @date 2020/6/1
+     * @param  * @param subject
+     * @return com.xhkjedu.vo.ResultVo
+     */
+    @PostMapping("/add")
+    public ResultVo add(@RequestBody TSubject subject){
+        N_Utils.validation(new Object[]{subject.getSubjectname(),"科目名称",2,subject.getLevel(),"阶段",1});
+        int result = subjectService.addSubject(subject);
+        if (result > 0) {
+            return new ResultVo(0, "保存成功");
+        }else{
+            return new ResultVo(1, "保存失败");
+        }
+    }
+
+    /**
+     *功能描述  修改科目
+     * @author WN
+     * @date 2020/6/1
+     * @param  * @param subject
+     * @return com.xhkjedu.vo.ResultVo
+     */
+    @PostMapping("/update")
+    public ResultVo update(@RequestBody TSubject subject){
+        N_Utils.validation(new Object[]{subject.getSubjectid(),"科目id",2,subject.getSubjectname(),"科目名称",2});
+        int result = subjectService.updateSubject(subject);
+        if (result > 0) return new ResultVo(0,"修改成功");
+        else return new ResultVo(1,"修改失败");
+    }
+
+    /**
+     *功能描述 删除科目
+     * @author WN
+     * @date 2020/6/1
+     * @param  * @param subject
+     * @return com.xhkjedu.vo.ResultVo
+     */
+    @PostMapping("/del")
+    public ResultVo del(@RequestBody TSubject subject) {
+        if (N_Utils.isEmpty(subject.getSubjectid()))
+            return new ResultVo(1,"未选择删除的科目");
+        String useModule = subjectService.findUseModule(subject.getSubjectid());
+        if (N_Utils.isNotEmpty(useModule)) {
+//            return new ResultVo(1,"使用科目模块【"+useModule+"】，禁止删除");
+            String[] strs = useModule.split(",");
+            for (String str : strs) {
+                if (N_Utils.isNotEmpty(str)){
+                    useModule = str;
+                    break;
+                }
+            }
+            return new ResultVo(1,"此科目下已有"+useModule+"，禁止删除");
+        }
+        int result = subjectService.delSubject(subject);
+        if (result > 0) return new ResultVo(0,"删除成功");
+        else return new ResultVo(1,"删除失败");
+    }
+
+
+}

sstudy/src/main/java/com/xhkjedu/sstudy/controller/subjectbook/SubjectQuestiontypeController.java

@@ -0,0 +1,118 @@
+package com.xhkjedu.sstudy.controller.subjectbook;
+
+import com.xhkjedu.sstudy.model.subjectbook.TSubjectQuestiontype;
+import com.xhkjedu.sstudy.service.subjectbook.SubjectQuestiontypeService;
+import com.xhkjedu.utils.N_Utils;
+import com.xhkjedu.vo.ResultVo;
+import com.xhkjedu.sstudy.vo.subjectbook.SubjectQuestiontypeVo;
+import org.springframework.beans.factory.annotation.Autowired;
+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 java.util.List;
+
+/**
+ * @ClassName SubjectQuestiontypeController
+ * Description 题型
+ * Author WN
+ * Date 2020/6/2 14:19
+ **/
+@RestController
+@RequestMapping("qtype")
+public class SubjectQuestiontypeController {
+    @Autowired
+    private SubjectQuestiontypeService subjectQuestiontypeService;
+
+    /**
+     *功能描述 科目下题型列表
+     * @author WN
+     * @date 2020/6/2
+     * @param  * @param qtype
+     * @return com.xhkjedu.vo.ResultVo
+     */
+    @PostMapping("/list")
+    public ResultVo listSubjects(@RequestBody TSubjectQuestiontype qtype){
+        N_Utils.validation(new Object[]{qtype.getSubjectid(),"科目",1});
+        List<TSubjectQuestiontype> lst = subjectQuestiontypeService.listQuestiontypes(qtype);
+        return new ResultVo(0,"查询题型集合成功",lst);
+    }
+
+
+    /**
+     *功能描述  科目下题型列表用于选择数据
+     * @author WN
+     * @date 2020/6/2
+     * @param  * @param subject
+     * @return com.xhkjedu.vo.ResultVo
+     */
+    @PostMapping("/listsel")
+    public ResultVo listSubjectsForSel(@RequestBody TSubjectQuestiontype qtype){
+        N_Utils.validation(new Object[]{qtype.getSubjectid(),"科目",1});
+        List<SubjectQuestiontypeVo> lst = subjectQuestiontypeService.listQuestiontypesForSel(qtype);
+        return new ResultVo(0,"查询科目集合成功",lst);
+    }
+
+    /**
+     *功能描述 添加题型
+     * @author WN
+     * @date 2020/6/2
+     * @param  * @param subject
+     * @return com.xhkjedu.vo.ResultVo
+     */
+    @PostMapping("/add")
+    public ResultVo add(@RequestBody TSubjectQuestiontype qtype){
+        N_Utils.validation(new Object[]{qtype.getSubjectid(),"科目",1,qtype.getQtypename(),"题型名称",2});
+
+        int result = subjectQuestiontypeService.addQuestiontype(qtype);
+        if (result > 0) {
+            return new ResultVo(0, "保存成功");
+        }else{
+            return new ResultVo(1, "保存失败");
+        }
+    }
+
+   /**
+    *功能描述  修改题型
+    * @author WN
+    * @date 2020/6/2
+    * @param  * @param qtype
+    * @return com.xhkjedu.vo.ResultVo
+    */
+    @PostMapping("/update")
+    public ResultVo update(@RequestBody TSubjectQuestiontype qtype){
+        N_Utils.validation(new Object[]{qtype.getQtypeid(),"题型id",2,qtype.getQtypename(),"题型名称",2});
+        int result = subjectQuestiontypeService.updateQuestiontype(qtype);
+        if (result > 0) return new ResultVo(0,"修改成功");
+        else return new ResultVo(1,"修改失败");
+    }
+
+    /**
+     *功能描述  删除题型
+     * @author WN
+     * @date 2020/6/2
+     * @param  * @param qtype
+     * @return com.xhkjedu.vo.ResultVo
+     */
+    @PostMapping("/del")
+    public ResultVo del(@RequestBody TSubjectQuestiontype qtype){
+        if (N_Utils.isEmpty(qtype.getQtypeid()))
+            return new ResultVo(1,"未选择删除的题型");
+        String useModule = subjectQuestiontypeService.findUseModule(qtype.getQtypeid());
+        if (N_Utils.isNotEmpty(useModule)) {
+//            return new ResultVo(1,"使用题型模块【"+useModule+"】，禁止删除");
+            String[] strs = useModule.split(",");
+            for (String str : strs) {
+                if (N_Utils.isNotEmpty(str)){
+                    useModule = str;
+                    break;
+                }
+            }
+            return new ResultVo(1,"此题型下已有"+useModule+"，禁止删除");
+        }
+        int result = subjectQuestiontypeService.delQuestiontype(qtype);
+        if (result > 0) return new ResultVo(0,"删除成功");
+        else return new ResultVo(1,"删除失败");
+    }
+}

sstudy/src/main/java/com/xhkjedu/sstudy/controller/subjectbook/VersionController.java

@@ -0,0 +1,95 @@
+package com.xhkjedu.sstudy.controller.subjectbook;
+
+import com.xhkjedu.sstudy.model.subjectbook.TVersion;
+import com.xhkjedu.sstudy.service.subjectbook.VersionService;
+import com.xhkjedu.utils.N_Utils;
+import com.xhkjedu.vo.ResultVo;
+import org.springframework.beans.factory.annotation.Autowired;
+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 java.util.List;
+
+/**
+ * @ClassName VersionController
+ * Description TODO  教材版本
+ * Author WN
+ * Date 2020/6/1 12:03
+ **/
+@RestController
+@RequestMapping("/version")
+public class VersionController {
+    @Autowired
+    private VersionService versionService;
+
+    /**
+     *功能描述 列表
+     * @author WN
+     * @date 2020/6/2
+     * @param  * @param version
+     * @return com.xhkjedu.vo.ResultVo
+     */
+    @PostMapping("/list")
+    public ResultVo listBooks(@RequestBody TVersion version){
+        List<TVersion> lst = versionService.listVersions(version);
+        return new ResultVo(0,"查询教材版本集合成功",lst);
+    }
+
+   /**
+    *功能描述  添加
+    * @author WN
+    * @date 2020/6/2
+    * @param  * @param version
+    * @return com.xhkjedu.vo.ResultVo
+    */
+    @PostMapping("/add")
+    public ResultVo add(@RequestBody TVersion version){
+        N_Utils.validation(new Object[]{version.getVersionname(),"教材版本名称",2});
+        int result = versionService.addVersion(version);
+        if (result > 0) {
+            return new ResultVo(0, "保存成功");
+        }else{
+            return new ResultVo(1, "保存失败");
+        }
+    }
+
+    /**
+     *功能描述  修改教材版本
+     * @author WN
+     * @date 2020/6/2
+     * @param  * @param version
+     * @return com.xhkjedu.vo.ResultVo
+     */
+    @PostMapping("/update")
+    public ResultVo update(@RequestBody TVersion version){
+        N_Utils.validation(new Object[]{version.getVersionid(),"教材版本id",2,version.getVersionname(),"教材版本名称",2});
+        int result = versionService.updateVersion(version);
+        if (result > 0) return new ResultVo(0,"修改成功");
+        else return new ResultVo(1,"修改失败");
+    }
+
+    /**
+     *功能描述 删除教材版本
+     * @author WN
+     * @date 2020/6/2
+     * @param  * @param version
+     * @return com.xhkjedu.vo.ResultVo
+     */
+    @PostMapping("/del")
+    public ResultVo del(@RequestBody TVersion version) {
+        if (N_Utils.isEmpty(version.getVersionid()))
+            return new ResultVo(1,"未选择删除的教材版本");
+        String useModule = versionService.findUseModule(version.getVersionid());
+        if (N_Utils.isNotEmpty(useModule)) {
+//            return new ResultVo(1,"使用版本模块【"+useModule+"】，禁止删除");
+            return new ResultVo(1,"此版本下已有教材，禁止删除");
+        }
+        int result = versionService.delVersion(version);
+        if (result > 0) return new ResultVo(0,"删除成功");
+        else return new ResultVo(1,"删除失败");
+    }
+
+
+}

sstudy/src/main/java/com/xhkjedu/sstudy/interceptors/DecryptRequestBodyAdvice.java

@@ -0,0 +1,109 @@
+package com.xhkjedu.sstudy.interceptors;
+
+
+import com.xhkjedu.utils.AES;
+import com.xhkjedu.utils.N_Utils;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.core.MethodParameter;
+import org.springframework.http.HttpHeaders;
+import org.springframework.http.HttpInputMessage;
+import org.springframework.http.converter.HttpMessageConverter;
+import org.springframework.util.StreamUtils;
+import org.springframework.web.bind.annotation.ControllerAdvice;
+import org.springframework.web.servlet.mvc.method.annotation.RequestBodyAdvice;
+
+import javax.crypto.BadPaddingException;
+import javax.crypto.IllegalBlockSizeException;
+import javax.crypto.NoSuchPaddingException;
+import java.io.ByteArrayInputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.UnsupportedEncodingException;
+import java.lang.reflect.Type;
+import java.security.InvalidKeyException;
+import java.security.NoSuchAlgorithmException;
+import java.util.List;
+
+/**
+ * @ClassName DecryptRequestBodyAdvice
+ * Description TODO AES解密
+ * Author WN
+ * Date 2021/5/12 11:34
+ **/
+@Slf4j
+@ControllerAdvice
+public class DecryptRequestBodyAdvice implements RequestBodyAdvice {
+
+    private static String AES_KEY = "XINGHUOLIAOYUAN7";
+
+    /** 此处如果返回false , 则不执行当前Advice的业务 */
+    @Override
+    public boolean supports(MethodParameter methodParameter, Type type, Class<? extends HttpMessageConverter<?>> aClass) {
+//       log.info("----support----");
+        return true;
+    }
+
+    /**
+     * @title 读取参数前执行
+     * @description 在此做些编码 / 解密 / 封装参数为对象的操作
+     **/
+    @Override
+    public HttpInputMessage beforeBodyRead(HttpInputMessage httpInputMessage, MethodParameter methodParameter, Type type, Class<? extends HttpMessageConverter<?>> aClass) throws IOException {
+//        log.info("----beforeBodyRead----");
+
+        //AES解密，false不需要解密
+        List<String> decrypts = httpInputMessage.getHeaders().get("st");
+        String decrypt = N_Utils.isListNotEmpty(decrypts)?decrypts.get(0):"false";
+        if (!decrypt.equals("true")) {
+            return httpInputMessage;
+        }
+        // 读取加密的请求体
+        byte[] body = StreamUtils.copyToByteArray(httpInputMessage.getBody());
+        String str = new String(body,"utf-8");
+
+        try {
+            // 使用AES解密
+            body = AES.decryptForByte(str, AES_KEY);
+        } catch (InvalidKeyException | NoSuchAlgorithmException | NoSuchPaddingException | IllegalBlockSizeException |
+                BadPaddingException | UnsupportedEncodingException e) {
+            e.printStackTrace();
+            throw new RuntimeException(e);
+        } catch (Exception e){
+            e.printStackTrace();
+            throw new RuntimeException(e);
+        }
+
+        // 使用解密后的数据，构造新的读取流
+        InputStream rawInputStream = new ByteArrayInputStream(body);
+        return new HttpInputMessage() {
+            @Override
+            public HttpHeaders getHeaders() {
+                return httpInputMessage.getHeaders();
+            }
+
+            @Override
+            public InputStream getBody() throws IOException {
+                return rawInputStream;
+            }
+        };
+    }
+
+    /**
+     * @title 读取参数后执行
+     * @author Xingbz
+     */
+    @Override
+    public Object afterBodyRead(Object o, HttpInputMessage httpInputMessage, MethodParameter methodParameter, Type type, Class<? extends HttpMessageConverter<?>> aClass) {
+//        log.info("afterBodyRead:----");
+        return o;
+    }
+
+    /**
+     * @title 无请求时的处理
+     */
+    @Override
+    public Object handleEmptyBody(Object o, HttpInputMessage httpInputMessage, MethodParameter methodParameter, Type type, Class<? extends HttpMessageConverter<?>> aClass) {
+//        log.info("handleEmptyBody:----");
+        return o;
+    }
+}

sstudy/src/main/java/com/xhkjedu/sstudy/interceptors/HttpServletFilter.java

@@ -0,0 +1,31 @@
+package com.xhkjedu.sstudy.interceptors;
+
+import org.springframework.stereotype.Component;
+
+import javax.servlet.*;
+import javax.servlet.http.HttpServletRequest;
+import java.io.IOException;
+
+/**
+ * @author ywx
+ * @classname HttpServletFilter
+ * @description 过滤器 以便http post请求body输入流可多次读取
+ * @date 2020/11/9 11:25
+ **/
+@Component
+public class HttpServletFilter implements Filter {
+
+    @Override
+    public void doFilter(ServletRequest request, ServletResponse response, FilterChain chain) throws IOException, ServletException {
+        ServletRequest requestWrapper = null;
+        if (request instanceof HttpServletRequest) {
+            requestWrapper = new RequestWrapper((HttpServletRequest) request);
+        }
+        if (requestWrapper == null) {
+            chain.doFilter(request, response);
+        } else {
+            chain.doFilter(requestWrapper, response);
+        }
+    }
+
+}

sstudy/src/main/java/com/xhkjedu/sstudy/interceptors/RequestInterceptor.java

@@ -0,0 +1,147 @@
+package com.xhkjedu.sstudy.interceptors;
+
+import com.alibaba.fastjson.JSON;
+import com.xhkjedu.config.MissingParametersException;
+import com.xhkjedu.sstudy.utils.JedisUtil;
+import com.xhkjedu.utils.N_Utils;
+import com.xhkjedu.vo.ResultVo;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.web.servlet.HandlerInterceptor;
+import org.springframework.web.servlet.ModelAndView;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
+
+@Configuration
+@Slf4j
+public class RequestInterceptor extends JedisUtil implements HandlerInterceptor {
+    @Override
+    public void afterCompletion(HttpServletRequest arg0, HttpServletResponse arg1, Object arg2, Exception arg3)
+            throws Exception {
+        // 请求结束时间
+        Long endTime = System.currentTimeMillis();
+        // 从HttpServletRequest获取开始时间
+        Long startTime = (Long) arg0.getAttribute("_startTime");
+        double time = ((endTime - startTime) * 1.000) / 1000;
+        // 打印接口信息及耗时
+        if (time > 1) {
+            log.error(" {}；耗时：{}s", arg0.getRequestURI(), time);
+        }
+    }
+
+    @Override
+    public void postHandle(HttpServletRequest arg0, HttpServletResponse arg1, Object arg2, ModelAndView arg3)
+            throws Exception {
+
+    }
+
+    /**
+     * 在调用controller具体方法前拦截
+     */
+    @Override
+    public boolean preHandle(HttpServletRequest request, HttpServletResponse response, Object handler) throws Exception {
+//        log.info("请求的uri:" + request.getRequestURI());
+        response.setHeader("Access-Control-Allow-Origin", "*");
+        //response.setHeader("Access-Control-Allow-Methods", "POST, GET, OPTIONS, DELETE");
+        response.setContentType("application/json;charset=UTF-8");
+
+        // 记录请求开始时间
+        request.setAttribute("_startTime", System.currentTimeMillis());
+        String requestURI = request.getRequestURI();
+        String key = request.getHeader("Token-Key");
+        String token = request.getHeader("Token-Value");
+        if (!requestURI.contains("user/login") && !requestURI.endsWith("/get_new")
+                && N_Utils.isNotEmpty(key) && N_Utils.isNotEmpty(token)) {//非登录和获取最新版本相关接口验证token
+            String redis_token = get(key);//系统缓存中保存的token
+            if (!token.equals(redis_token)) {
+                ResultVo result = new ResultVo();
+                result.setCode(2);
+                result.setMsg("登录失效");
+
+                response.getWriter().print(JSON.toJSONString(result));
+                return false;
+            }
+        }
+
+        if (interceptorApi(requestURI)) {//需要拦截的请求
+            String encoding = request.getCharacterEncoding();
+            int contentLength = request.getContentLength();
+            byte buffer[] = new byte[request.getContentLength()];
+            request.getInputStream();
+            for (int i = 0;i < contentLength;) {
+
+                int readLen = request.getInputStream().read(buffer, i, contentLength - i);
+                if (readLen == -1) {
+                    break;
+                }
+                i += readLen;
+            }
+            if (encoding == null) {
+                encoding = "UTF-8";
+            }
+            String params = new String(buffer, encoding);
+            Map<String, String> uriMap =new ConcurrentHashMap<>();
+            String params2 = uriMap.get(requestURI);
+            if (N_Utils.isNotEmpty(params2) && params2.equals(params)) {
+                log.error("地址：{}，参数：{}",requestURI,params);
+                throw new MissingParametersException("提交过快，请稍后重试");
+            } else {
+                uriMap.put(requestURI, params);
+            }
+        }
+       /* if("dev".equals(ConfigKey.env)){//开发环境接口不拦截
+            return true;
+        }*/
+        return true;
+    }
+
+    /**
+     * 需要拦截的请求
+     * @Param [uri]
+     * @Author ywx
+     * @Date 2020/5/20 14:14
+     * @return java.lang.Boolean
+     **/
+    private Boolean interceptorApi(String uri) {
+        boolean rtn = false;
+        String[] url = new String[]{
+                "/ps/start_paper",//题库作业--开始做作业
+                "/ps/sstart_paper",//图片作业--开始做作业
+                "/psw/sstart_paper",//图片作业--开始做作业
+                "/psw/start_paper",//题库作业--开始做作业
+                "/croom/saveclass",//课堂--保存数据
+                "/resource/add",//资源--添加
+                "/recite/save",//背诵--添加
+                "/read/savers",//阅读--保存阅读记录
+                "/ps/submit_question",//作业--提交单题
+                "/ps/submit_paper",//作业--提交
+                "/ps/ssubmit_question",//图片作业--提交单题
+                "/ps/ssubmit_paper",//图片作业--提交
+                "/ps/scorrect",//答题卡--批改
+                "/ps/correc",//试题库--批改
+                "/paper/saves",//答题卡--保存
+                "/paper/saveq",//试题库--保存
+                "/pg/save",//作业--发布
+                "/question/add",//试题--添加
+                "/basket/add",//试题篮--添加
+                "/recites/up",//背诵--学生保存
+                "/question_class/end_correct",//试题--批阅完成
+                "/research/save",//教研管理--添加
+                "/researchu/up",//教研教师--保存评价
+                "/notice/add",//通知--添加
+        };
+
+        for (int i = 0; i < url.length; i++) {
+            if (uri.equals(url[i])) {
+                rtn = true;
+                break;
+            }
+        }
+
+        return rtn;
+    }
+
+}

sstudy/src/main/java/com/xhkjedu/sstudy/interceptors/RequestWrapper.java

@@ -0,0 +1,78 @@
+package com.xhkjedu.sstudy.interceptors;
+
+import lombok.extern.slf4j.Slf4j;
+
+import javax.servlet.ReadListener;
+import javax.servlet.ServletInputStream;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletRequestWrapper;
+import java.io.*;
+
+/**
+ * @author ywx
+ * @classname RequestWrapper
+ * @description 解决POST请求中的BODY参数不能重复读取多次的问题
+ * @date 2020/11/9 11:24
+ **/
+@Slf4j
+public class RequestWrapper extends HttpServletRequestWrapper {
+    private static final int BUFFER_LEN = 128;
+
+    private final String body;
+
+    public RequestWrapper(HttpServletRequest request) throws IOException {
+        super(request);
+        StringBuilder stringBuilder = new StringBuilder();
+        BufferedReader bufferedReader = null;
+        try {
+            InputStream inputStream = request.getInputStream();
+            if (inputStream != null) {
+                bufferedReader = new BufferedReader(new InputStreamReader(inputStream));
+                char[] charBuffer = new char[BUFFER_LEN];
+                int bytesRead;
+                while ((bytesRead = bufferedReader.read(charBuffer)) > 0) {
+                    stringBuilder.append(charBuffer, 0, bytesRead);
+                }
+            }
+        } catch (IOException ex) {
+            throw ex;
+        } finally {
+            if (bufferedReader != null) {
+                try {
+                    bufferedReader.close();
+                } catch (IOException ex) {
+                    throw ex;
+                }
+            }
+        }
+        body = stringBuilder.toString();
+    }
+
+    @Override
+    public ServletInputStream getInputStream() throws IOException {
+        final ByteArrayInputStream byteArrayInputStream = new ByteArrayInputStream(body.getBytes());
+        ServletInputStream servletInputStream = new ServletInputStream() {
+            public boolean isFinished() {
+                return false;
+            }
+            public boolean isReady() {
+                return false;
+            }
+            public void setReadListener(ReadListener readListener) {}
+            public int read() throws IOException {
+                return byteArrayInputStream.read();
+            }
+        };
+        return servletInputStream;
+
+    }
+    @Override
+    public BufferedReader getReader() throws IOException {
+        return new BufferedReader(new InputStreamReader(this.getInputStream()));
+    }
+
+    public String getBody() {
+        return this.body;
+    }
+
+}

sstudy/src/main/java/com/xhkjedu/sstudy/interceptors/WebMvcConfg.java

@@ -0,0 +1,62 @@
+package com.xhkjedu.sstudy.interceptors;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.web.servlet.FilterRegistrationBean;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.web.servlet.config.annotation.CorsRegistry;
+import org.springframework.web.servlet.config.annotation.InterceptorRegistry;
+import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
+
+import javax.annotation.Resource;
+
+/**
+ * @author WN
+ * @description
+ * @date 2019/4/3 15:50
+ **/
+@Configuration
+public class WebMvcConfg implements WebMvcConfigurer {
+
+    @Autowired
+    private RequestInterceptor requestInterceptor;
+    @Resource
+    private HttpServletFilter httpServletFilter;
+
+    /**
+     * 拦截器addPathPatterns用于添加拦截规则 excludePathPatterns 用于排除拦截
+     * @Param: registry
+     * @return void
+     * @author wn
+     * @date 2019/4/8
+     */
+    @Override
+    public void addInterceptors(InterceptorRegistry registry) {
+        registry.addInterceptor(requestInterceptor).addPathPatterns("/**");
+    }
+
+    /**
+     * 允许跨域
+     * @Param: registry
+     * @return void
+     * @author wn
+     * @date 2019/4/8
+     */
+    @Override
+    public void addCorsMappings(CorsRegistry registry){
+        registry.addMapping("/**")
+                .allowedOrigins("*")
+                .allowCredentials(true)
+                .allowedMethods("GET","POST")
+                .maxAge(3600);
+    }
+
+    @Bean
+    public FilterRegistrationBean registerFilter() {
+        FilterRegistrationBean registration = new FilterRegistrationBean();
+        registration.setFilter(httpServletFilter);
+        registration.addUrlPatterns("/*");
+        registration.setOrder(1);
+        return registration;
+    }
+}

sstudy/src/main/java/com/xhkjedu/sstudy/mapper/subjectbook/DirectorMapper.java

@@ -0,0 +1,39 @@
+package com.xhkjedu.sstudy.mapper.subjectbook;
+
+import com.xhkjedu.sstudy.base.TkMapper;
+import com.xhkjedu.sstudy.model.subjectbook.TDirector;
+import org.apache.ibatis.annotations.Param;
+import org.springframework.stereotype.Repository;
+
+import java.util.List;
+
+/**
+ * @ClassName DirectorMapper
+ * Description TODO
+ * Author WN
+ * Date 2020/6/3 15:44
+ **/
+@Repository
+public interface DirectorMapper extends TkMapper<TDirector> {
+
+    /**
+     *功能描述  教材下章节集合
+     * @author WN
+     * @date 2020/6/3
+     * @param director
+     * @return java.util.List<com.xhkjedu.model.subjectbook.TDirector>
+     */
+    List<TDirector> listDirectors(@Param("director") TDirector director);
+
+    /**
+     * 教师收藏教材下的章节数量
+     * @Param [teacherid, lsbid]
+     * @Author ywx
+     * @Date 2020/7/8 14:48
+     * @return java.lang.Integer
+     **/
+    Integer countByTeacherIdLsbId(@Param("teacherid") Integer teacherid, @Param("lsbid") String lsbid);
+
+    //查找使用章节的模块
+    String findUseModule(String directorid);
+}

sstudy/src/main/java/com/xhkjedu/sstudy/mapper/subjectbook/PointMapper.java

@@ -0,0 +1,27 @@
+package com.xhkjedu.sstudy.mapper.subjectbook;
+
+import com.xhkjedu.sstudy.base.TkMapper;
+import com.xhkjedu.sstudy.model.subjectbook.TPoint;
+import com.xhkjedu.sstudy.vo.subjectbook.PointVo;
+import org.apache.ibatis.annotations.Param;
+import org.springframework.stereotype.Repository;
+
+import java.util.List;
+
+/**
+ * @ClassName PointMapper
+ * Description TODO
+ * Author WN
+ * Date 2020/6/3 11:53
+ **/
+@Repository
+public interface PointMapper extends TkMapper<TPoint> {
+    //获取所有知识点
+    List<TPoint> listPoints(@Param("point") TPoint point);
+
+    //搜索知识点
+    List<PointVo> listPointsForSearch(@Param("point") TPoint point);
+
+    //查找使用知识点的模块
+    String findUseModule(String pointid);
+}

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

@@ -0,0 +1,37 @@
+package com.xhkjedu.sstudy.mapper.subjectbook;
+
+import com.xhkjedu.sstudy.base.TkMapper;
+import com.xhkjedu.sstudy.model.subjectbook.TSubjectBook;
+import org.apache.ibatis.annotations.Param;
+import org.springframework.stereotype.Repository;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * @ClassName SubjectBookMapper
+ * Description TODO
+ * Author WN
+ * Date 2020/6/2 17:56
+ **/
+@Repository
+public interface SubjectBookMapper extends TkMapper<TSubjectBook> {
+
+    /**
+     *功能描述 获取数据库表中所有教材关联信息
+     * @author WN
+     * @date 2020/6/3
+     * @param  * @param schoolid
+     * @return java.util.List<com.xhkjedu.model.subjectbook.TSubjectBook>
+     */
+    List<TSubjectBook> listSubjectBooks(@Param("book") TSubjectBook book);
+
+    //查找使用教材的模块
+    String findUseModule(String lsbid);
+
+    //教材选择列表
+    List<Map> listForSel();
+
+    //查询教材名称是否存在
+    Integer checkExisted(@Param("book") TSubjectBook book);
+}

sstudy/src/main/java/com/xhkjedu/sstudy/mapper/subjectbook/SubjectMapper.java

@@ -0,0 +1,65 @@
+package com.xhkjedu.sstudy.mapper.subjectbook;
+
+import com.xhkjedu.sstudy.base.TkMapper;
+import com.xhkjedu.sstudy.model.subjectbook.TSubject;
+import com.xhkjedu.sstudy.vo.subjectbook.SubjectVo;
+import org.apache.ibatis.annotations.Param;
+import org.springframework.stereotype.Repository;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * @ClassName SubjectMapper
+ * Description 科目
+ * Author WN
+ * Date 2020/6/1 11:43
+ **/
+@Repository
+public interface SubjectMapper extends TkMapper<TSubject> {
+
+    /**
+     *功能描述  获取阶段下所有科目
+     * @author WN
+     * @date 2020/6/1
+     * @param  * @param level
+     * @return java.util.List<com.xhkjedu.model.subjectbook.TSubject>
+     */
+    List<TSubject> listSubjects(@Param("subject") TSubject subject);
+
+    /**
+     *功能描述 获取阶段下所有科目--为选择框使用
+     * @author WN
+     * @date 2020/6/1
+     * @param  * @param schoolid
+     * @return java.util.List<com.xhkjedu.vo.subjectbook.SubjectVo>
+     */
+    List<SubjectVo> listSubjectsForSel(@Param("subject") TSubject subject);
+
+    /**
+     * 根据学段id获取科目id集合
+     * @Param [level]
+     * @Author ywx
+     * @Date 2020/6/8 9:59
+     * @return java.lang.String
+     **/
+    String getSubjectIds(@Param("level") Integer level);
+
+    /**
+     * 教师科目集合
+     * @Param [teacherid]
+     * @Author ywx
+     * @Date 2020/6/28 9:32
+     * @return java.util.List<com.xhkjedu.model.subjectbook.TSubject>
+     **/
+    List<TSubject> listTeacherSubjects(Integer teacherid);
+
+    //查找使用科目的模块
+    String findUseModule(String subjectid);
+
+    //获取科目名称
+    String getNameById(String subjectid);
+
+    //获取科目id名称列表
+    List<Map> listSubject(Integer schoolid, Integer level);
+}

sstudy/src/main/java/com/xhkjedu/sstudy/mapper/subjectbook/SubjectQuestiontypeMapper.java

@@ -0,0 +1,26 @@
+package com.xhkjedu.sstudy.mapper.subjectbook;
+
+import com.xhkjedu.sstudy.base.TkMapper;
+import com.xhkjedu.sstudy.model.subjectbook.TSubjectQuestiontype;
+import com.xhkjedu.sstudy.vo.subjectbook.SubjectQuestiontypeVo;
+import org.apache.ibatis.annotations.Param;
+import org.springframework.stereotype.Repository;
+
+import java.util.List;
+
+/**
+ * @ClassName SubjectQuestiontype
+ * Description 科目题型
+ * Author WN
+ * Date 2020/6/2 10:52
+ **/
+@Repository
+public interface SubjectQuestiontypeMapper extends TkMapper<TSubjectQuestiontype> {
+
+    List<TSubjectQuestiontype> listQuestiontypes(@Param("type") TSubjectQuestiontype type);
+
+    List<SubjectQuestiontypeVo> listQuestiontypesForSel(@Param("type") TSubjectQuestiontype type);
+
+    //查找使用题型的模块
+    String findUseModule(String qtypeid);
+}

sstudy/src/main/java/com/xhkjedu/sstudy/mapper/subjectbook/VersionMapper.java

@@ -0,0 +1,22 @@
+package com.xhkjedu.sstudy.mapper.subjectbook;
+
+import com.xhkjedu.sstudy.base.TkMapper;
+import com.xhkjedu.sstudy.model.subjectbook.TVersion;
+import org.apache.ibatis.annotations.Param;
+import org.springframework.stereotype.Repository;
+
+import java.util.List;
+
+/**
+ * @ClassName VersionMapper
+ * Description TODO 教材版本
+ * Author WN
+ * Date 2021/3/10 15:06
+ **/
+@Repository
+public interface VersionMapper extends TkMapper<TVersion> {
+    List<TVersion> listVersions(@Param("version") TVersion version);
+
+    //查找使用版本的模块
+    String findUseModule(String versionid);
+}

sstudy/src/main/java/com/xhkjedu/sstudy/model/BaseBean.java

@@ -0,0 +1,26 @@
+package com.xhkjedu.sstudy.model;
+
+import lombok.Data;
+
+import javax.persistence.Transient;
+
+/**
+ * @author lgq
+ * @date 2019/11/8 9:29
+ * @description: 添加时返回主键绑定id
+ */
+@Data
+public class BaseBean {
+    //添加时返回主键
+    @Transient
+    private Integer id;
+    //创建人姓名
+    @Transient
+    private String createname;
+    //分页显示页码
+    @Transient
+    private Integer page;
+    //分页显示条数
+    @Transient
+    private Integer pageSize;
+}

sstudy/src/main/java/com/xhkjedu/sstudy/model/subjectbook/TDirector.java

@@ -0,0 +1,54 @@
+package com.xhkjedu.sstudy.model.subjectbook;
+
+import com.xhkjedu.sstudy.model.BaseBean;
+import lombok.Data;
+
+import javax.persistence.Id;
+import javax.persistence.Table;
+import javax.persistence.Transient;
+import java.util.ArrayList;
+import java.util.List;
+
+@Table(name = "t_director")
+@Data
+public class TDirector extends BaseBean {
+    //章节表
+    @Id
+    private String directorid;
+
+    //章节名称
+    private String directorname;
+
+    //所属章节id
+    private String directorpid;
+
+    //章节排序
+    private Integer directororder;
+
+    //是否是叶子节点0不是1是
+    private Integer leaf;
+
+    //所属科目册别关联关系id
+    private String lsbid;
+
+    //章节归属层级
+    private Integer directorlevel;
+
+    //创建人
+    private Integer createid;
+
+    //创建时间
+    private Integer createtime;
+
+    //归属1平台3学校4个人
+    private Integer belong;
+
+    //学校id
+    private Integer schoolid;
+
+    //同步时间戳
+    private Integer timeunix;
+
+    @Transient
+    private List<TDirector> children = new ArrayList<>();
+}

sstudy/src/main/java/com/xhkjedu/sstudy/model/subjectbook/TPoint.java

@@ -0,0 +1,53 @@
+package com.xhkjedu.sstudy.model.subjectbook;
+
+import com.xhkjedu.sstudy.model.BaseBean;
+import lombok.Data;
+
+import javax.persistence.Id;
+import javax.persistence.Table;
+import javax.persistence.Transient;
+import java.util.ArrayList;
+import java.util.List;
+
+@Table(name = "t_point")
+@Data
+public class TPoint extends BaseBean {
+    //知识点表
+    @Id
+    private String pointid;
+
+    //知识点名称
+    private String pointname;
+
+    //知识点排序
+    private Integer pointorder;
+
+    //所属知识点id
+    private String pointpid;
+
+    //科目id
+    private String subjectid;
+
+    //知识点所属层级
+    private Integer pointlevel;
+
+    //创建人
+    private Integer createid;
+
+    //创建时间
+    private Integer createtime;
+
+    //归属1平台3学校
+    private Integer belong;
+
+    //学校id
+    private Integer schoolid;
+
+    //同步时间戳
+    private Integer timeunix;
+
+    @Transient
+    private String createformat;
+
+    private List<TPoint> children = new ArrayList<>();
+}

sstudy/src/main/java/com/xhkjedu/sstudy/model/subjectbook/TSubject.java

@@ -0,0 +1,39 @@
+package com.xhkjedu.sstudy.model.subjectbook;
+
+import com.xhkjedu.sstudy.model.BaseBean;
+import lombok.Data;
+
+import javax.persistence.Id;
+import javax.persistence.Table;
+
+@Table(name = "t_subject")
+@Data
+public class TSubject extends BaseBean {
+    //科目表主键id
+    @Id
+    private String subjectid;
+
+    //科目名称
+    private String subjectname;
+
+    //所属学段1小学2初中3高中4大学
+    private Integer level;
+
+    //科目排序
+    private Integer subjectorder;
+
+    //创建人id
+    private Integer createid;
+
+    //创建时间
+    private Integer createtime;
+
+    //归属1平台3学校
+    private Integer belong;
+
+    //学校id
+    private Integer schoolid;
+
+    //同步时间戳
+    private Integer timeunix;
+}

sstudy/src/main/java/com/xhkjedu/sstudy/model/subjectbook/TSubjectBook.java

@@ -0,0 +1,57 @@
+package com.xhkjedu.sstudy.model.subjectbook;
+
+import com.xhkjedu.sstudy.model.BaseBean;
+import lombok.Data;
+
+import javax.persistence.Id;
+import javax.persistence.Table;
+import javax.persistence.Transient;
+
+@Table(name = "t_subject_book")
+@Data
+public class TSubjectBook extends BaseBean {
+    //科目教材表
+    @Id
+    private String lsbid;
+
+    //所属学段1小学2初中3高中4大学
+    private Integer level;
+
+    //科目id
+    private String subjectid;
+
+    @Transient
+    //科目名称
+    private String subjectname;
+
+    //教材名称
+    private String lsbname;
+
+    //教材排序
+    private Integer lsborder;
+
+    //封面图地址
+    private String coverpath;
+
+    //创建时间
+    private Integer createid;
+
+    //创建时间
+    private Integer createtime;
+
+    //版本id
+    private String versionid;
+
+    //归属1平台3学校
+    private Integer belong;
+
+    //同步时间戳
+    private Integer timeunix;
+
+    @Transient
+    //版本名称
+    private String versionname;
+
+    //学校id
+    private Integer schoolid;
+}

sstudy/src/main/java/com/xhkjedu/sstudy/model/subjectbook/TSubjectQuestiontype.java

@@ -0,0 +1,42 @@
+package com.xhkjedu.sstudy.model.subjectbook;
+
+import com.xhkjedu.sstudy.model.BaseBean;
+import lombok.Data;
+
+import javax.persistence.Id;
+import javax.persistence.Table;
+
+@Table(name = "t_subject_questiontype")
+@Data
+public class TSubjectQuestiontype extends BaseBean {
+    //题型id
+    @Id
+    private String qtypeid;
+
+    //题型名称
+    private String qtypename;
+
+    //题型排序
+    private Integer qtypeorder;
+
+    //科目id
+    private String subjectid;
+
+    //处理题型1单选题2多选题3主观题4判断对错5判断✔6判断TF7完形填空8阅读理解
+    private Integer ctype;
+
+    //创建人id
+    private Integer createid;
+
+    //创建时间
+    private Integer createtime;
+
+    //归属1平台3学校
+    private Integer belong;
+
+    //学校id
+    private Integer schoolid;
+
+    //同步时间戳
+    private Integer timeunix;
+}

sstudy/src/main/java/com/xhkjedu/sstudy/model/subjectbook/TVersion.java

@@ -0,0 +1,36 @@
+package com.xhkjedu.sstudy.model.subjectbook;
+
+import com.xhkjedu.sstudy.model.BaseBean;
+import lombok.Data;
+
+import javax.persistence.Id;
+import javax.persistence.Table;
+
+@Table(name = "t_version")
+@Data
+public class TVersion extends BaseBean {
+    @Id
+    //版本id
+    private String versionid;
+
+    //版本名称
+    private String versionname;
+
+    //版本排序
+    private Integer versionorder;
+
+    //创建人
+    private Integer createid;
+
+    //创建时间
+    private Integer createtime;
+
+    //归属1平台3学校
+    private Integer belong;
+
+    //学校id
+    private Integer schoolid;
+
+    //同步时间戳
+    private Integer timeunix;
+}

sstudy/src/main/java/com/xhkjedu/sstudy/service/subjectbook/DirectorService.java

@@ -0,0 +1,134 @@
+package com.xhkjedu.sstudy.service.subjectbook;
+
+
+import com.xhkjedu.sstudy.mapper.subjectbook.DirectorMapper;
+import com.xhkjedu.sstudy.model.subjectbook.TDirector;
+import com.xhkjedu.sstudy.utils.StudyUtil;
+import com.xhkjedu.utils.N_Utils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * @ClassName DirectorService
+ * Description TODO
+ * Author WN
+ * Date 2020/6/3 15:59
+ **/
+@Service
+public class DirectorService {
+    @Autowired
+    private DirectorMapper directorMapper;
+
+    /**
+     *功能描述 新增
+     * @author WN
+     * @date 2020/6/3
+     * @param  * @param director
+     * @return java.lang.Integer
+     */
+    public Integer addDirector(TDirector director){
+        String id = StudyUtil.getId();
+        director.setDirectorid(id);
+        if ("".equals(director.getDirectorpid())) {
+            director.setDirectorpid(null);
+        }
+        director.setCreatetime(N_Utils.getSecondTimestamp());
+        return directorMapper.insertSelective(director);
+    }
+
+    /**
+     * 添加并返回主键
+     * @Param [director]
+     * @Author ywx
+     * @Date 2020/7/6 15:00
+     * @return java.lang.Integer
+     **/
+    public String addAndReturnKey(TDirector director){
+        String id = StudyUtil.getId();
+        director.setDirectorid(id);
+        director.setCreatetime(N_Utils.getSecondTimestamp());
+        directorMapper.insertSelective(director);
+        return id;
+    }
+
+    /**
+     *功能描述 修改
+     * @author WN
+     * @date 2020/6/3
+     * @param  * @param director
+     * @return java.lang.Integer
+     */
+    public Integer updateDirector(TDirector director){
+        director.setCreatetime(N_Utils.getSecondTimestamp());
+        return directorMapper.updateByPrimaryKeySelective(director);
+    }
+
+    /**
+     *功能描述  删除
+     * @author WN
+     * @date 2020/6/3
+     * @param  * @param director
+     * @return java.lang.Integer
+     */
+    public Integer delDirector(TDirector director){
+        return directorMapper.deleteByPrimaryKey(director.getDirectorid());
+    }
+
+    /**
+     *功能描述  章节树形结构
+     * @author WN
+     * @date 2020/6/3
+     * @param  * @param director
+     * @return java.util.List<com.xhkjedu.model.subjectbook.TDirector>
+     */
+    public List<TDirector> lisTDirectors(TDirector director){
+        List<TDirector> lst = directorMapper.listDirectors(director);
+
+        List<TDirector> directors = new ArrayList<>();
+        for (TDirector d:lst){
+            if(d.getDirectorpid() == null){
+                List<TDirector> childDirectors = listChildedirector(d,lst);
+                d.setChildren(childDirectors);
+                directors.add(d);
+            }
+        }
+
+        return directors;
+    }
+
+    //获取子章节
+    private List<TDirector> listChildedirector(TDirector director,List<TDirector> directors){
+        List<TDirector> rtndirectors = new ArrayList<>();
+        for(TDirector d : directors){
+            if(director.getDirectorid().equals(d.getDirectorpid())){
+                List<TDirector> childDirectors = listChildedirector(d,directors);
+                d.setChildren(childDirectors);
+                rtndirectors.add(d);
+            }
+        }
+        return rtndirectors;
+    }
+
+    /**
+     * 教师收藏教材下的章节数量
+     * @Param [teacherid, lsbid]
+     * @Author ywx
+     * @Date 2020/7/8 14:49
+     * @return java.lang.Integer
+     **/
+    public Integer countByTeacherIdLsbId(Integer teacherid, String lsbid) {
+        return directorMapper.countByTeacherIdLsbId(teacherid, lsbid);
+    }
+
+    //查找使用章节的模块
+    public String findUseModule(String directorid) {
+        String useModule = directorMapper.findUseModule(directorid);
+        if (useModule.startsWith(",")) {
+            useModule = useModule.substring(1);
+        }
+        return useModule;
+    }
+}

sstudy/src/main/java/com/xhkjedu/sstudy/service/subjectbook/PointService.java

@@ -0,0 +1,109 @@
+package com.xhkjedu.sstudy.service.subjectbook;
+
+import com.xhkjedu.sstudy.mapper.subjectbook.PointMapper;
+import com.xhkjedu.sstudy.model.subjectbook.TPoint;
+import com.xhkjedu.sstudy.utils.StudyUtil;
+import com.xhkjedu.utils.N_Utils;
+import com.xhkjedu.sstudy.vo.subjectbook.PointVo;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * @ClassName PointService
+ * Description TODO
+ * Author WN
+ * Date 2020/6/3 11:56
+ **/
+@Service
+public class PointService {
+    @Autowired
+    private PointMapper pointMapper;
+
+    /**
+     *功能描述 新增
+     * @author WN
+     * @date 2020/6/3
+     * @param  * @param point
+     * @return java.lang.Integer
+     */
+    public Integer addPoint(TPoint point){
+        String id = StudyUtil.getId();
+        point.setPointid(id);
+        if ("".equals(point.getPointpid())) {
+            point.setPointpid(null);
+        }
+        point.setCreatetime(N_Utils.getSecondTimestamp());
+        return pointMapper.insertSelective(point);
+    }
+
+    /**
+     *功能描述 修改
+     * @author WN
+     * @date 2020/6/3
+     * @param  * @param point
+     * @return java.lang.Integer
+     */
+    public Integer updatePoint(TPoint point){
+        point.setCreatetime(N_Utils.getSecondTimestamp());
+        return pointMapper.updateByPrimaryKeySelective(point);
+    }
+
+    /**
+     *功能描述  删除
+     * @author WN
+     * @date 2020/6/3
+     * @param  * @param point
+     * @return java.lang.Integer
+     */
+    public Integer delPoint(TPoint point){
+        return pointMapper.deleteByPrimaryKey(point.getPointid());
+    }
+
+    //获取科目下知识点数
+    public List<TPoint> listPoints(TPoint point){
+        List<TPoint> lst = pointMapper.listPoints(point);
+
+        List<TPoint> points = new ArrayList<>();
+        for (TPoint p:lst){
+            if(p.getPointpid() == null){
+                List<TPoint> childPoints = listChildePoint(p,lst);
+                p.setChildren(childPoints);
+                points.add(p);
+
+            }
+        }
+
+        return points;
+    }
+
+    //获取子知识点
+    private List<TPoint> listChildePoint(TPoint point,List<TPoint> points){
+        List<TPoint> rtnPoints = new ArrayList<>();
+        for(TPoint p : points){
+            if(point.getPointid().equals(p.getPointpid())){
+                List<TPoint> childPoints = listChildePoint(p,points);
+                p.setChildren(childPoints);
+                rtnPoints.add(p);
+            }
+        }
+        return rtnPoints;
+    }
+
+    //搜索知识点
+    public List<PointVo> listPointsForSearch(TPoint point){
+        return pointMapper.listPointsForSearch(point);
+    }
+
+    //查找使用知识点的模块
+    public String findUseModule(String pointid) {
+        String useModule = pointMapper.findUseModule(pointid);
+        if (useModule.startsWith(",")) {
+            useModule = useModule.substring(1);
+        }
+        return useModule;
+    }
+}
+

sstudy/src/main/java/com/xhkjedu/sstudy/service/subjectbook/SubjectBookService.java

@@ -0,0 +1,161 @@
+package com.xhkjedu.sstudy.service.subjectbook;
+
+import com.xhkjedu.sstudy.mapper.subjectbook.SubjectBookMapper;
+import com.xhkjedu.sstudy.model.subjectbook.TSubjectBook;
+import com.xhkjedu.sstudy.utils.StudyUtil;
+import com.xhkjedu.utils.N_Utils;
+import com.xhkjedu.vo.ResultVo;
+import com.xhkjedu.sstudy.vo.subjectbook.LsbBookVo;
+import com.xhkjedu.sstudy.vo.subjectbook.LsbSubjectVo;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * @ClassName SubjectBookService
+ * Description 教材表
+ * Author WN
+ * Date 2020/6/2 17:59
+ **/
+@Service
+public class SubjectBookService {
+    @Autowired
+    private SubjectBookMapper subjectBookMapper;
+
+    /**
+     *功能描述 添加教材
+     * @author WN
+     * @date 2020/6/2
+     * @param  * @param subjectBook
+     * @return java.lang.Integer
+     */
+    public Integer addSubjectBook(TSubjectBook subjectBook){
+        String id = StudyUtil.getId();
+        subjectBook.setLsbid(id);
+        subjectBook.setCreatetime(N_Utils.getSecondTimestamp());
+        return subjectBookMapper.insertSelective(subjectBook);
+    }
+
+    /**
+     *功能描述 修改教材
+     * @author WN
+     * @date 2020/6/2
+     * @param  * @param subjectBook
+     * @return java.lang.Integer
+     */
+    public ResultVo updateSubjectBook(TSubjectBook subjectBook){
+        TSubjectBook book = subjectBookMapper.selectByPrimaryKey(subjectBook.getLsbid());
+        String lsbname = subjectBook.getLsbname();
+        if (N_Utils.isNotEmpty(lsbname) && !lsbname.equals(book.getLsbname())) {
+            book.setLsbname(lsbname);
+            Integer num = subjectBookMapper.checkExisted(book);
+            if (num != 0) return new ResultVo(1,"教材不能重复");
+        }
+        subjectBook.setCreatetime(N_Utils.getSecondTimestamp());
+        subjectBookMapper.updateByPrimaryKeySelective(subjectBook);
+        return new ResultVo(0,"修改成功");
+    }
+
+    /**
+     *功能描述 删除教材
+     * @author WN
+     * @date 2020/6/17
+     * @param  * @param subjectBook
+     * @return java.lang.Integer
+     */
+    public Integer delSubjectBook(TSubjectBook subjectBook){
+        return subjectBookMapper.deleteByPrimaryKey(subjectBook.getLsbid());
+    }
+
+    /**
+     *功能描述  获取教材集合
+     * @author WN
+     * @date 2020/6/7
+     * @param  * @param subjectBook
+     * @return java.util.List<com.xhkjedu.model.subjectbook.TSubjectBook>
+     */
+    public List<TSubjectBook> listSubjectBooks(TSubjectBook subjectBook) {
+        List<TSubjectBook> sbooks = subjectBookMapper.listSubjectBooks(subjectBook);
+        return sbooks;
+    }
+
+    /**
+     *功能描述 所有教材--树形结构
+     * @author WN
+     * @date 2020/6/3
+     * @param  * @param subjectBook
+     * @return java.util.List<com.xhkjedu.vo.subjectbook.LsbLevelVo>
+     */
+    public List<LsbSubjectVo> listSubjectBooksForTree(TSubjectBook subjectBook){
+        List<TSubjectBook> sbooks = subjectBookMapper.listSubjectBooks(subjectBook);
+
+        List<LsbSubjectVo> lst = new ArrayList<>();
+        for(TSubjectBook sb : sbooks){
+            if(!isExistSubject(lst,sb.getSubjectid())){
+                LsbSubjectVo s = new LsbSubjectVo();
+                s.setLsbid(sb.getLsbid());
+                s.setSubjectid(sb.getSubjectid());
+                s.setSubjectname(sb.getSubjectname());
+                lst.add(s);
+
+                LsbBookVo b = new LsbBookVo();
+                b.setLsbid(sb.getLsbid());
+                b.setLsbname(sb.getLsbname());
+                b.setVersionid(sb.getVersionid());
+                b.setVersionname(sb.getVersionname());
+
+                s.getBooks().add(b);
+            }else{
+                LsbSubjectVo s = lst.get(lst.size()-1);
+                if(!isExistBook(s.getBooks(),sb.getLsbid())){
+                    LsbBookVo b = new LsbBookVo();
+                    b.setLsbid(sb.getLsbid());
+                    b.setLsbname(sb.getLsbname());
+                    b.setVersionid(sb.getVersionid());
+                    b.setVersionname(sb.getVersionname());
+
+                    s.getBooks().add(b);
+                }
+            }
+        }
+
+        return lst;
+
+    }
+    //判断是否存在科目
+    private boolean isExistSubject(List<LsbSubjectVo> subjects,String subjectid){
+        for(int i=0;i<subjects.size();i++){
+            if(subjects.get(i).getSubjectid().equals(subjectid)){
+                return true;
+            }
+        }
+        return false;
+    }
+
+    //判断结合中是否存在册别
+    private boolean isExistBook(List<LsbBookVo> books, String lsbid){
+        for(int i=0;i<books.size();i++){
+            if(books.get(i).getLsbid().equals(lsbid)){
+                return true;
+            }
+        }
+        return false;
+    }
+
+    //查找使用教材的模块
+    public String findUseModule(String lsbid) {
+        String useModule = subjectBookMapper.findUseModule(lsbid);
+        if (useModule.startsWith(",")) {
+            useModule = useModule.substring(1);
+        }
+        return useModule;
+    }
+
+    //教材选择列表
+    public List<Map> listForSel() {
+        return subjectBookMapper.listForSel();
+    }
+}

sstudy/src/main/java/com/xhkjedu/sstudy/service/subjectbook/SubjectQuestiontypeService.java

@@ -0,0 +1,92 @@
+package com.xhkjedu.sstudy.service.subjectbook;
+
+import com.xhkjedu.sstudy.mapper.subjectbook.SubjectQuestiontypeMapper;
+import com.xhkjedu.sstudy.model.subjectbook.TSubjectQuestiontype;
+import com.xhkjedu.sstudy.utils.StudyUtil;
+import com.xhkjedu.utils.N_Utils;
+import com.xhkjedu.sstudy.vo.subjectbook.SubjectQuestiontypeVo;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+/**
+ * @ClassName SubjectQuestiontypeService
+ * Description TODO
+ * Author WN
+ * Date 2020/6/2 11:57
+ **/
+@Service
+public class SubjectQuestiontypeService {
+    @Autowired
+    private SubjectQuestiontypeMapper subjectQuestiontypeMapper;
+
+    /**
+     *功能描述 获取科目下所有题型
+     * @author WN
+     * @date 2020/6/2
+     * @param  * @param sqtype
+     * @return java.util.List<com.xhkjedu.model.subjectbook.TSubjectQuestiontype>
+     */
+    public List<TSubjectQuestiontype> listQuestiontypes(TSubjectQuestiontype sqtype){
+        return subjectQuestiontypeMapper.listQuestiontypes(sqtype);
+    }
+
+    /**
+     *功能描述 获取科目下所有题型用于选择数据
+     * @author WN
+     * @date 2020/6/2
+     * @param  * @param sqtype
+     * @return java.util.List<com.xhkjedu.vo.subjectbook.SubjectQuestiontypeVo>
+     */
+    public List<SubjectQuestiontypeVo> listQuestiontypesForSel(TSubjectQuestiontype sqtype){
+        return subjectQuestiontypeMapper.listQuestiontypesForSel(sqtype);
+    }
+
+    /**
+     *功能描述 添加题型
+     * @author WN
+     * @date 2020/6/2
+     * @param  * @param sqtype
+     * @return java.lang.Integer
+     */
+    public Integer addQuestiontype(TSubjectQuestiontype sqtype){
+        String id = StudyUtil.getId();
+        sqtype.setQtypeid(id);
+        sqtype.setCreatetime(N_Utils.getSecondTimestamp());
+        return subjectQuestiontypeMapper.insertSelective(sqtype);
+    }
+
+   /**
+    *功能描述 修改题型
+    * @author WN
+    * @date 2020/6/2
+    * @param  * @param sqtype
+    * @return java.lang.Integer
+    */
+    public Integer updateQuestiontype(TSubjectQuestiontype sqtype){
+        sqtype.setCreatetime(N_Utils.getSecondTimestamp());
+        return subjectQuestiontypeMapper.updateByPrimaryKeySelective(sqtype);
+    }
+
+    /**
+     *功能描述 修改题型
+     * @author WN
+     * @date 2020/6/2
+     * @param  * @param sqtype
+     * @return java.lang.Integer
+     */
+    public Integer delQuestiontype(TSubjectQuestiontype sqtype){
+        int result = subjectQuestiontypeMapper.deleteByPrimaryKey(sqtype.getQtypeid());
+        return result;
+    }
+
+    //查找使用题型的模块
+    public String findUseModule(String qtypeid) {
+        String useModule = subjectQuestiontypeMapper.findUseModule(qtypeid);
+        if (useModule.startsWith(",")) {
+            useModule = useModule.substring(1);
+        }
+        return useModule;
+    }
+}

sstudy/src/main/java/com/xhkjedu/sstudy/service/subjectbook/SubjectService.java

@@ -0,0 +1,116 @@
+package com.xhkjedu.sstudy.service.subjectbook;
+
+import com.xhkjedu.sstudy.mapper.subjectbook.SubjectMapper;
+import com.xhkjedu.sstudy.model.subjectbook.TSubject;
+import com.xhkjedu.sstudy.utils.StudyUtil;
+import com.xhkjedu.utils.N_Utils;
+import com.xhkjedu.sstudy.vo.subjectbook.SubjectVo;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+
+/**
+ * @ClassName SubjectService
+ * Description
+ * Author WN
+ * Date 2020/6/1 11:44
+ **/
+@Service
+public class SubjectService {
+    @Autowired
+    private SubjectMapper subjectMapper;
+
+
+    /**
+     *功能描述  获取阶段下科目
+     * @author WN
+     * @date 2020/6/1
+     * @param  * @param subject
+     * @return java.util.List<com.xhkjedu.model.subjectbook.TSubject>
+     */
+    public List<TSubject> listSubjects(TSubject subject){
+        return subjectMapper.listSubjects(subject);
+    }
+
+    /**
+     *功能描述 获取阶段下科目--选择框
+     * @author WN
+     * @date 2020/6/1
+     * @param  * @param subject
+     * @return java.util.List<com.xhkjedu.vo.subjectbook.SubjectVo>
+     */
+    public List<SubjectVo> listSubjectsForSel(TSubject subject){
+        return subjectMapper.listSubjectsForSel(subject);
+    }
+
+    /**
+     *功能描述  保存科目
+     * @author WN
+     * @date 2020/6/1
+     * @param  * @param subject
+     * @return java.lang.Integer
+     */
+    public Integer addSubject(TSubject subject){
+        String id = StudyUtil.getId();
+        subject.setSubjectid(id);
+        subject.setCreatetime(N_Utils.getSecondTimestamp());
+        return subjectMapper.insertSelective(subject);
+    }
+
+    /**
+     *功能描述 修改科目
+     * @author WN
+     * @date 2020/6/1
+     * @param  * @param subject
+     * @return java.lang.Integer
+     */
+    public Integer updateSubject(TSubject subject){
+        subject.setCreatetime(N_Utils.getSecondTimestamp());
+        return subjectMapper.updateByPrimaryKeySelective(subject);
+    }
+
+    /**
+     *功能描述 删除科目
+     * @author WN
+     * @date 2020/6/1
+     * @param  * @param subject
+     * @return java.lang.Integer
+     */
+    public Integer delSubject(TSubject subject){
+        int result = subjectMapper.deleteByPrimaryKey(subject.getSubjectid());
+        return result;
+    }
+
+    /**
+     * 根据学段id获取科目id集合
+     * @Param [level]
+     * @Author ywx
+     * @Date 2020/6/8 9:59
+     * @return java.lang.String
+     **/
+    public String getSubjectIds(Integer level) {
+        return subjectMapper.getSubjectIds(level);
+    }
+
+    /**
+     * 教师科目集合
+     * @Param [teacherid]
+     * @Author ywx
+     * @Date 2020/6/28 9:33
+     * @return java.util.List<com.xhkjedu.model.subjectbook.TSubject>
+     **/
+    public List<TSubject> listTeacherSubjects(Integer teacherid) {
+        return subjectMapper.listTeacherSubjects(teacherid);
+    }
+
+    //查找使用科目的模块
+    public String findUseModule(String subjectid) {
+        String useModule = subjectMapper.findUseModule(subjectid);
+        if (useModule.startsWith(",")) {
+            useModule = useModule.substring(1);
+        }
+        return useModule;
+    }
+}

sstudy/src/main/java/com/xhkjedu/sstudy/service/subjectbook/VersionService.java

@@ -0,0 +1,76 @@
+package com.xhkjedu.sstudy.service.subjectbook;
+
+import com.xhkjedu.sstudy.mapper.subjectbook.VersionMapper;
+import com.xhkjedu.sstudy.model.subjectbook.TVersion;
+import com.xhkjedu.sstudy.utils.StudyUtil;
+import com.xhkjedu.utils.N_Utils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+
+/**
+ * @ClassName SubjectService
+ * Description TODO 教材版本
+ * Author WN
+ * Date 2020/6/1 11:44
+ **/
+@Service
+public class VersionService {
+    @Autowired
+    private VersionMapper versionMapper;
+
+   /**
+    *功能描述 版本--列表
+    * @author WN
+    * @date 2020/6/2
+    * @param version
+    */
+    public List<TVersion> listVersions(TVersion version){
+        return versionMapper.listVersions(version);
+    }
+
+   /**
+    *功能描述 版本--添加
+    * @author WN
+    * @date 2020/6/2
+    * @param  * @param version
+    * @return java.lang.Integer
+    */
+    public Integer addVersion(TVersion version){
+        String id = StudyUtil.getId();
+        version.setVersionid(id);
+        version.setCreatetime(N_Utils.getSecondTimestamp());
+        return versionMapper.insertSelective(version);
+    }
+
+    /**
+     *功能描述 版本--修改
+     * @author WN
+     * @date 2020/6/2
+     * @param  * @param version
+     * @return java.lang.Integer
+     */
+    public Integer updateVersion(TVersion version){
+        version.setCreatetime(N_Utils.getSecondTimestamp());
+        return versionMapper.updateByPrimaryKeySelective(version);
+    }
+
+   /**
+    *功能描述  版本--删除
+    * @author WN
+    * @date 2020/6/2
+    * @param  * @param version
+    * @return java.lang.Integer
+    */
+    public Integer delVersion(TVersion version){
+        return versionMapper.deleteByPrimaryKey(version.getVersionid());
+    }
+
+    //查找使用版本的模块
+    public String findUseModule(String versionid) {
+        return versionMapper.findUseModule(versionid);
+    }
+
+}

sstudy/src/main/java/com/xhkjedu/sstudy/utils/JedisUtil.java

@@ -0,0 +1,106 @@
+package com.xhkjedu.sstudy.utils;
+
+import com.alibaba.fastjson.JSON;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.data.redis.core.StringRedisTemplate;
+import org.springframework.data.redis.core.ValueOperations;
+import org.springframework.stereotype.Component;
+
+import javax.annotation.PostConstruct;
+import java.util.concurrent.TimeUnit;
+
+/**
+ * @author ywx
+ * @classname JedisUtil
+ * @description Redis工具类
+ * @date 2019/8/2 16:48
+ **/
+@Component
+public class JedisUtil {
+	@Autowired
+	private StringRedisTemplate stringRedisTemplate;
+	private ValueOperations<String, String> valueOperations;
+
+	@PostConstruct
+	public void init(){
+		this.valueOperations = stringRedisTemplate.opsForValue();
+	}
+
+	/**  默认过期时长，单位：秒 */
+	//redis失效时间
+	@Value("${redisdatatime}")
+	private Integer redisdatatime;
+	/**  不设置过期时长 */
+	public final static long NOT_EXPIRE = -1;
+
+	public boolean set(String key, Object value, Integer expire){
+		boolean rtn = false;
+		valueOperations.set(key, toJson(value));
+		if(expire != NOT_EXPIRE){
+			rtn = stringRedisTemplate.expire(key, expire, TimeUnit.SECONDS);
+		}
+		return rtn;
+	}
+
+	public void set(String key, Object value){
+		set(key, value, redisdatatime);
+	}
+
+	public Boolean setObject(String key, Object value, int cacheSeconds) {
+		String val = toJson(value);
+		return set(key,val,cacheSeconds);
+	}
+
+	public <T> T get(String key, Class<T> clazz, long expire) {
+		String value = valueOperations.get(key);
+		if(expire != NOT_EXPIRE){
+			stringRedisTemplate.expire(key, expire, TimeUnit.SECONDS);
+		}
+		return value == null ? null : fromJson(value, clazz);
+	}
+
+	public <T> T get(String key, Class<T> clazz) {
+		return get(key, clazz, NOT_EXPIRE);
+	}
+
+	public String get(String key, long expire) {
+		String value = valueOperations.get(key);
+		if(expire != NOT_EXPIRE){
+			stringRedisTemplate.expire(key, expire, TimeUnit.SECONDS);
+		}
+		return value;
+	}
+
+	public String get(String key) {
+		return get(key, NOT_EXPIRE);
+	}
+
+	public Object getObject(String key,Class<?> clazz) {
+		String value = get(key);
+		return fromJson(value,clazz);
+	}
+
+	public boolean delete(String key) {
+		return stringRedisTemplate.delete(key);
+	}
+
+	/**
+	 * Object转成JSON数据
+	 */
+	private String toJson(Object object){
+		if(object instanceof Integer || object instanceof Long || object instanceof Float ||
+				object instanceof Double || object instanceof Boolean || object instanceof String){
+			return String.valueOf(object);
+		}
+		return JSON.toJSONString(object);
+	}
+
+	/**
+	 * JSON数据，转成Object
+	 */
+	private <T> T fromJson(String json, Class<T> clazz){
+		return JSON.parseObject(json, clazz);
+	}
+
+}

sstudy/src/main/java/com/xhkjedu/sstudy/utils/StudyUtil.java

@@ -0,0 +1,29 @@
+package com.xhkjedu.sstudy.utils;
+
+import com.xhkjedu.sstudy.config.ConfigKey;
+import lombok.extern.slf4j.Slf4j;
+
+import static com.xhkjedu.utils.N_Utils.getSecondTimestamp;
+
+/**
+ * @ClassName StudyUtil
+ * Description study模块用到的工具类
+ * Author WN
+ * Date 2022/2/21 10:01
+ **/
+@Slf4j
+public class StudyUtil {
+    public static Integer id = 0;
+    public static String getId(){
+        Integer nummin = ConfigKey.nummin;
+        Integer nummax = ConfigKey.nummax;
+        if (id == 0 || id.equals(nummax)) {
+            id = nummin;
+        } else {
+            id ++;
+        }
+        String _num = (getSecondTimestamp() + ConfigKey.numadd) +"" + id;
+        long num = Long.parseLong(_num);
+        return Long.toString(num,36).toUpperCase();
+    }
+}

sstudy/src/main/java/com/xhkjedu/sstudy/vo/subjectbook/DirectorVo.java

@@ -0,0 +1,30 @@
+package com.xhkjedu.sstudy.vo.subjectbook;
+
+import lombok.Data;
+
+@Data
+public class DirectorVo {
+    //章节id
+    private String directorid;
+
+    //章节名称
+    private String directorname;
+
+    //所属学段1小学2初中3高中4大学
+    private Integer level;
+
+    //科目id
+    private String subjectid;
+
+    //科目名称
+    private String subjectname;
+
+    //版本名称
+    private String versionname;
+
+    //教材名称
+    private String lsbname;
+
+    //教材id
+    private String lsbid;
+}

sstudy/src/main/java/com/xhkjedu/sstudy/vo/subjectbook/LevelSubjectVo.java

@@ -0,0 +1,24 @@
+package com.xhkjedu.sstudy.vo.subjectbook;
+
+import lombok.Data;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * @ClassName LevelSubjectVo
+ * Description 学段科目
+ * Author WN
+ * Date 2020/6/2 16:54
+ **/
+@Data
+public class LevelSubjectVo {
+    //学段
+    private Integer level;
+
+    //学段名称
+    private String levelname;
+
+    //学段下科目
+    private List<SubjectVo> subjects = new ArrayList<>();
+}

sstudy/src/main/java/com/xhkjedu/sstudy/vo/subjectbook/LsbBookVo.java

@@ -0,0 +1,26 @@
+package com.xhkjedu.sstudy.vo.subjectbook;
+
+import lombok.Data;
+
+/**
+ * @ClassName LsbBookVo
+ * Description 教材--册别
+ * Author WN
+ * Date 2020/6/3 10:17
+ **/
+@Data
+public class LsbBookVo {
+
+    //教材id
+    private String lsbid;
+
+    //教材名称
+    private String lsbname;
+
+    //版本id
+    private String versionid;
+
+    //版本名称
+    private String versionname;
+
+}

sstudy/src/main/java/com/xhkjedu/sstudy/vo/subjectbook/LsbLevelVo.java

@@ -0,0 +1,25 @@
+package com.xhkjedu.sstudy.vo.subjectbook;
+
+import lombok.Data;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * @ClassName LsbLevelVo
+ * Description 教材--阶段
+ * Author WN
+ * Date 2020/6/3 10:16
+ **/
+@Data
+public class LsbLevelVo {
+    //阶段
+    private Integer Level;
+
+    //阶段名称
+    private String levelname;
+
+    //阶段下科目
+    private List<LsbSubjectVo> subjects = new ArrayList<>();
+
+}

sstudy/src/main/java/com/xhkjedu/sstudy/vo/subjectbook/LsbSubjectVo.java

@@ -0,0 +1,28 @@
+package com.xhkjedu.sstudy.vo.subjectbook;
+
+import lombok.Data;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * @ClassName LsbSubjectVo
+ * Description 教材--科目
+ * Author WN
+ * Date 2020/6/3 10:19
+ **/
+@Data
+public class LsbSubjectVo {
+
+    //教材id
+    private String lsbid;
+
+    //科目id
+    private String subjectid;
+
+    //科目名称
+    private String subjectname;
+
+    //册别
+    private List<LsbBookVo> books = new ArrayList<>();
+}

sstudy/src/main/java/com/xhkjedu/sstudy/vo/subjectbook/LsbVo.java

@@ -0,0 +1,12 @@
+package com.xhkjedu.sstudy.vo.subjectbook;
+
+/**
+ * @ClassName LsbVo
+ * Description TODO
+ * Author WN
+ * Date 2020/6/18 16:39
+ **/
+public class LsbVo {
+    private String lsbid;//教材id
+    private String lsbname;//教材名称
+}

sstudy/src/main/java/com/xhkjedu/sstudy/vo/subjectbook/PointVo.java

@@ -0,0 +1,12 @@
+package com.xhkjedu.sstudy.vo.subjectbook;
+
+import lombok.Data;
+
+@Data
+public class PointVo {
+    //知识点id
+    private String pointid;
+
+    //知识点名称
+    private String pointname;
+}

sstudy/src/main/java/com/xhkjedu/sstudy/vo/subjectbook/SubjectQuestiontypeVo.java

@@ -0,0 +1,27 @@
+package com.xhkjedu.sstudy.vo.subjectbook;
+
+import lombok.Data;
+
+/**
+ * @ClassName SubjectQuestiontypeVo
+ * Description 科目题型
+ * Author WN
+ * Date 2020/6/2 11:48
+ **/
+@Data
+public class SubjectQuestiontypeVo {
+    //题型id
+    private String qtypeid;
+
+    //题型名称
+    private String qtypename;
+
+    //题型排序
+    private Integer qtypeorder;
+
+    //处理题型1单选题2多选题3主观题4判断对错5判断✔6判断TF7完形填空8阅读理解
+    private Integer ctype;
+
+    //归属1平台3学校
+    private Integer belong;
+}

sstudy/src/main/java/com/xhkjedu/sstudy/vo/subjectbook/SubjectVo.java

@@ -0,0 +1,22 @@
+package com.xhkjedu.sstudy.vo.subjectbook;
+
+import lombok.Data;
+
+/**
+ * @ClassName SubjectVo
+ * Description
+ * Author WN
+ * Date 2020/6/1 17:58
+ **/
+@Data
+public class SubjectVo {
+    //科目id
+    private String subjectid;
+
+    //科目名称
+    private String subjectname;
+
+    //归属1平台3学校
+    private Integer belong;
+
+}

sstudy/src/main/java/com/xhkjedu/sstudy/vo/subjectbook/TeacherClassVo.java

@@ -0,0 +1,19 @@
+package com.xhkjedu.sstudy.vo.subjectbook;
+
+import lombok.Data;
+
+/**
+ * @author ywx
+ * @classname TeacherClassVo
+ * @description
+ * @date 2021/1/29 16:49
+ **/
+@Data
+public class TeacherClassVo {
+    //班级id
+    private Integer classid;
+
+    //班级名称
+    private String classname;
+
+}

sstudy/src/main/java/com/xhkjedu/sstudy/vo/subjectbook/TeacherSClassVo.java

@@ -0,0 +1,27 @@
+package com.xhkjedu.sstudy.vo.subjectbook;
+
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * @author ywx
+ * @classname TeacherSClassVo
+ * @description
+ * @date 2021/1/29 16:43
+ **/
+@Data
+public class TeacherSClassVo {
+    //科目id
+    private String subjectid;
+
+    //年级id
+    private Integer gradeid;
+
+    //教材列表
+    private List<LsbBookVo> books;
+
+    //班级列表
+    private List<TeacherClassVo> classes;
+
+}

sstudy/src/main/resources/application.properties

@@ -3,7 +3,7 @@ server.port=8087
 
 spring.application.name=sstudy
 #注册到我们本地的eureka注册中心，端口8081
-eureka.client.service-url.defaultZone=http://localhost:8081/eureka/
+#eureka.client.service-url.defaultZone=http://localhost:8081/eureka/
 
 spring.datasource.url=jdbc:mysql://dbtest.xhkjedu.com:13306/xhkjedu_school_test?characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&rewriteBatchedStatements=true&allowMultiQueries=true
 spring.datasource.username=root
@@ -29,13 +29,14 @@ spring.datasource.hikari.connection-test-query=SELECT 1
 # 所有Entity别名类所在包
 mybatis.type-aliases-package=com.xhkjedu.model,com.xhkjedu.vo
 mybatis.mapper-Locations=classpath*:mapper/**/*.xml
-mapper.mappers=com.xhkjedu.base.TkMapper
+mapper.mappers=com.xhkjedu.sstudy.base.TkMapper
 mapper.identity=MYSQL
 #打印日志的两种方式第一种可以指定包名，第二种都可以打印
 logging.level.com.xhkjedu.mapper=debug
 #mybatis.configuration.log-impl=org.apache.ibatis.logging.stdout.StdOutImpl
 #分页
 spring.pagehelper.helper-dialect=mysql
+spring.datasource.initialize=false
 
 #redis配置
 spring.redis.host=cachetest.xhkjedu.com
@@ -52,3 +53,22 @@ spring.redis.jedis.pool.max-active=60000
 redisdatatime=604800
 #secretKey必须为24位
 secretKey=nanhuakaizhangjianwangni
+
+#生成id的数值区间
+nummin=10000
+nummax=50000
+numadd=100000000
+
+#云平台接口地址
+cloudapi=http://scapitest.xhkjedu.com/
+#云平台文件访问路径
+file.oldshowurl=http://scstatictest.xhkjedu.com/static/
+#区平台文件服务接口地址
+fileapi=https://schoolfiletest.xhkjedu.com/
+#区平台文件访问路径
+file.showurl=http://schoolstatictest.xhkjedu.com/static/
+#数据库名
+dbname=xhkjedu_school_test
+
+#一次同步数量
+cron.syncnum=100

sstudy/src/main/resources/mapper/subjectbook/DirectorMapper.xml

@@ -0,0 +1,34 @@
+<?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.sstudy.mapper.subjectbook.DirectorMapper">
+
+    <!-- 根据科目获取章节-->
+    <select id="listDirectors" resultType="com.xhkjedu.sstudy.model.subjectbook.TDirector">
+       SELECT d.directorid,d.directorname,d.directorpid,d.directororder,d.leaf,d.lsbid,d.belong,
+        d.directorlevel,d.createid,d.createtime,u.username AS createname
+        FROM t_director d LEFT JOIN t_user u ON d.createid=u.userid
+        WHERE d.lsbid=#{director.lsbid}
+        <if test="director.belong!=null and director.belong==1">
+            and d.belong=1
+        </if>
+        <if test="director.belong!=null and director.belong==3">
+            and (d.belong=1 or (d.belong=3 and d.schoolid=#{director.schoolid}))
+        </if>
+        <if test="director.belong!=null and director.belong==4">
+            and d.belong=4 and d.createid=#{director.createid}
+        </if>
+        ORDER BY d.directororder ASC,d.createtime asc
+    </select>
+    <!--教师收藏教材下的章节数量-->
+    <select id="countByTeacherIdLsbId" resultType="java.lang.Integer">
+        select count(*) from t_director where createid=#{teacherid} and lsbid=#{lsbid} and belong=4
+    </select>
+    <!--查找使用章节的模块-->
+    <select id="findUseModule" resultType="java.lang.String">
+        SELECT CONCAT(
+        (select (case when count(*)>0 then '子章节' else '' end) from t_director where directorpid=#{directorid})
+        ,(select (case when count(*)>0 then ',试题' else '' end) from t_question_director where directorid=#{directorid})
+        ,(select (case when count(*)>0 then ',资源' else '' end) from t_resource_director where directorid=#{directorid})
+        )
+    </select>
+</mapper>

sstudy/src/main/resources/mapper/subjectbook/PointMapper.xml

@@ -0,0 +1,38 @@
+<?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.sstudy.mapper.subjectbook.PointMapper">
+
+    <!-- 根据科目获取知识点 -->
+    <select id="listPoints" resultType="com.xhkjedu.sstudy.model.subjectbook.TPoint">
+        SELECT p.pointid,p.pointname,p.pointorder,p.pointpid,p.subjectid,p.pointlevel,p.createid,
+        p.createtime,u.username AS createname,p.belong
+        FROM t_point p LEFT JOIN t_user u ON p.createid=u.userid
+        WHERE p.subjectid=#{point.subjectid} and (p.belong=1
+        <if test="point.schoolid!=null">
+            or p.schoolid=#{point.schoolid}
+        </if>)
+        ORDER BY p.pointorder asc,p.createtime asc
+    </select>
+
+    <!-- 根据知识点名称搜索知识点，用户选择 -->
+    <select id="listPointsForSearch" resultType="com.xhkjedu.sstudy.vo.subjectbook.PointVo">
+        select p.pointid,p.pointname from t_point p left join t_point p1 on p1.pointpid=p.pointid
+        where p.subjectid=#{point.subjectid} and p1.pointid is null
+        and (p.belong=1
+        <if test="point.schoolid!=null">
+            or p.schoolid=#{point.schoolid}
+        </if>)
+         <if test="point.pointname!='' and point.pointname!=null">
+             and p.pointname like '%${point.pointname}%'
+         </if>
+    </select>
+
+    <!--查找使用知识点的模块-->
+    <select id="findUseModule" resultType="java.lang.String">
+        SELECT CONCAT(
+        (select (case when count(*)>0 then '子知识点' else '' end) from t_point where pointpid=#{pointid})
+        ,(select (case when count(*)>0 then ',试题' else '' end) from t_question_point where pointid=#{pointid})
+        )
+    </select>
+
+</mapper>

sstudy/src/main/resources/mapper/subjectbook/SubjectBookMapper.xml

@@ -0,0 +1,65 @@
+<?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.sstudy.mapper.subjectbook.SubjectBookMapper">
+
+    <select id="listSubjectBooks" resultType="com.xhkjedu.sstudy.model.subjectbook.TSubjectBook">
+        SELECT sb.lsbid,sb.level,sb.subjectid,sb.coverpath,s.subjectname,sb.lsbname,sb.createtime
+        ,sb.versionid,v.versionname,sb.lsborder,sb.belong
+        ,(select u.username from t_user u where u.userid=sb.createid)createname
+        FROM t_subject_book sb LEFT JOIN t_subject s ON sb.subjectid=s.subjectid
+        LEFT JOIN t_version v ON sb.versionid=v.versionid
+        WHERE sb.level=#{book.level} and (sb.belong=1
+        <if test="book.schoolid!=null">
+            or sb.schoolid=#{book.schoolid}
+        </if>
+        )
+        <if test="book.subjectid!=null and book.subjectid!='0'.toString() and book.subjectid!=''">
+            and sb.subjectid=#{book.subjectid}
+        </if>
+        <if test="book.versionid!=null and book.versionid!='0'.toString() and book.versionid!=''">
+            and sb.versionid=#{book.versionid}
+        </if>
+        ORDER BY s.subjectorder ASC,v.versionorder,sb.lsborder
+    </select>
+
+    <!--查找使用教材的模块-->
+    <select id="findUseModule" resultType="java.lang.String">
+        SELECT CONCAT(
+        (select (case when count(*)>0 then '章节' else '' end) from t_director where lsbid=#{lsbid})
+        ,(select (case when count(*)>0 then ',试题' else '' end) from t_question_director where lsbid=#{lsbid})
+        ,(select (case when count(*)>0 then ',资源' else '' end) from t_resource_director where lsbid=#{lsbid})
+        ,(select (case when count(*)>0 then ',作业' else '' end) from t_paper where lsbid=#{lsbid})
+        ,(select (case when count(*)>0 then ',课堂' else '' end) from t_classroom where lsbid=#{lsbid})
+        ,(select (case when count(*)>0 then ',课堂考试' else '' end) from t_classroom_paper where lsbid=#{lsbid})
+        )
+    </select>
+
+    <!--教材选择列表-->
+    <resultMap id="lsbResult" type="java.util.Map">
+        <result property="level" column="level"></result>
+        <collection property="subjects" ofType="java.util.Map" javaType="java.util.List">
+            <result property="subjectid" column="subjectid"></result>
+            <result property="subjectname" column="subjectname"></result>
+            <collection property="versions" ofType="java.util.Map" javaType="java.util.List">
+                <result property="versionid" column="versionid"></result>
+                <result property="versionname" column="versionname"></result>
+                <collection property="lsbs" ofType="java.util.Map" javaType="java.util.List">
+                    <result property="lsbid" column="lsbid"></result>
+                    <result property="lsbname" column="lsbname"></result>
+                    <result property="coverpath" column="coverpath"></result>
+                </collection>
+            </collection>
+        </collection>
+    </resultMap>
+    <select id="listForSel" resultMap="lsbResult">
+        select sb.level,sb.subjectid,s.subjectname,sb.versionid,v.versionname,sb.lsbname,sb.lsbid,sb.coverpath
+        from t_subject_book sb left join t_subject s on sb.subjectid=s.subjectid
+        left join t_version v on sb.versionid=v.versionid
+        order by sb.level,s.subjectorder asc,v.versionorder asc,sb.lsborder
+    </select>
+    <!--查询教材名称是否存在-->
+    <select id="checkExisted" resultType="java.lang.Integer">
+        select count(*) from t_subject_book where level=#{book.level} and subjectid=#{book.subjectid}
+        and versionid=#{book.versionid} and lsbname=#{book.lsbname}
+    </select>
+</mapper>

sstudy/src/main/resources/mapper/subjectbook/SubjectMapper.xml

@@ -0,0 +1,70 @@
+<?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.sstudy.mapper.subjectbook.SubjectMapper">
+
+    <!-- 根据阶段获取科目 -->
+    <select id="listSubjects" resultType="com.xhkjedu.sstudy.model.subjectbook.TSubject">
+        SELECT s.subjectid,s.subjectname,s.level,s.subjectorder,s.createid,s.createtime,
+        u.username AS createname,s.belong
+        FROM t_subject s LEFT JOIN t_user u ON s.createid=u.userid
+        WHERE s.level=#{subject.level} and (s.belong=1
+        <if test="subject.schoolid!=null">
+            or s.schoolid=#{subject.schoolid}
+        </if>
+        )
+        order by s.subjectorder asc
+    </select>
+
+    <!-- 根据阶段获取科目用于选择学科 -->
+    <select id="listSubjectsForSel" resultType="com.xhkjedu.sstudy.vo.subjectbook.SubjectVo">
+        SELECT subjectid,subjectname,belong from t_subject
+        WHERE level=#{subject.level} and (belong=1
+        <if test="subject.schoolid!=null">
+            or schoolid=#{subject.schoolid}
+        </if>
+        ) order by subjectorder asc
+    </select>
+    <!--获取科目名称-->
+    <select id="getNameById" resultType="java.lang.String">
+        select subjectname from t_subject where subjectid=#{subjectid}
+    </select>
+
+    <!--根据学段id获取科目id集合-->
+    <select id="getSubjectIds" resultType="java.lang.String">
+        select group_concat(subjectid) from t_subject where level=#{level}
+    </select>
+    <!--教师科目集合-->
+    <select id="listTeacherSubjects" resultType="com.xhkjedu.sstudy.model.subjectbook.TSubject">
+        select sb.subjectid,s.subjectname,sb.belong
+        from t_teacher_powersb ts left join t_subject_book sb on ts.lsbid=sb.lsbid
+        left join t_subject s on sb.subjectid=s.subjectid
+        where ts.teacherid=#{teacherid} and (sb.belong=1 or sb.schoolid=ts.schoolid)
+        group by sb.subjectid order by s.subjectorder
+    </select>
+
+    <!--查找使用科目的模块-->
+    <select id="findUseModule" resultType="java.lang.String">
+        SELECT CONCAT(
+        (select (case when count(*)>0 then '教材' else '' end) from t_subject_book where subjectid=#{subjectid})
+        ,(select (case when count(*)>0 then ',知识点' else '' end) from t_point where subjectid=#{subjectid})
+        ,(select (case when count(*)>0 then ',题型' else '' end) from t_subject_questiontype where subjectid=#{subjectid})
+        ,(select (case when count(*)>0 then ',试题' else '' end) from t_question where subjectid=#{subjectid})
+        ,(select (case when count(*)>0 then ',资源' else '' end) from t_resource where subjectid=#{subjectid})
+        ,(select (case when count(*)>0 then ',作业' else '' end) from t_paper where subjectid=#{subjectid})
+        ,(select (case when count(*)>0 then ',背诵' else '' end) from t_recite where subjectid=#{subjectid})
+        ,(select (case when count(*)>0 then ',学生错题' else '' end) from t_question_student where subjectid=#{subjectid})
+        ,(select (case when count(*)>0 then ',直播' else '' end) from l_course where subjectid=#{subjectid})
+        ,(select (case when count(*)>0 then ',课堂考试' else '' end) from t_classroom_paper where subjectid=#{subjectid})
+        )
+    </select>
+    <!--获取科目id名称列表-->
+    <resultMap id="subjectResult" type="java.util.Map">
+        <result column="subjectname" property="key"></result>
+        <result column="subjectid" property="value"></result>
+    </resultMap>
+    <select id="listSubject" resultMap="subjectResult">
+        SELECT s.subjectname,s.subjectid
+        FROM t_subject s WHERE s.level=#{level} and (s.belong=1 or s.schoolid=#{schoolid})
+        order by s.subjectorder asc
+    </select>
+</mapper>

sstudy/src/main/resources/mapper/subjectbook/SubjectQuestiontypeMapper.xml

@@ -0,0 +1,38 @@
+<?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.sstudy.mapper.subjectbook.SubjectQuestiontypeMapper">
+
+    <!-- 根据科目下题型列表 -->
+    <select id="listQuestiontypes" resultType="com.xhkjedu.sstudy.model.subjectbook.TSubjectQuestiontype">
+        SELECT s.qtypeid,s.qtypename,s.subjectid,s.qtypeorder,s.ctype,s.createid,s.createtime,
+        u.username AS createname,s.belong
+        FROM t_subject_questiontype s LEFT JOIN t_user u ON s.createid=u.userid
+        WHERE s.subjectid=#{type.subjectid} and (s.belong=1
+        <if test="type.schoolid!=null">
+            or s.schoolid=#{type.schoolid}
+        </if>)
+        order by s.qtypeorder asc
+    </select>
+
+    <!-- 根据科目下题型列表用于选择题型 -->
+    <select id="listQuestiontypesForSel" resultType="com.xhkjedu.sstudy.vo.subjectbook.SubjectQuestiontypeVo">
+        SELECT qtypeid,qtypename,qtypeorder,ctype,belong from t_subject_questiontype
+        WHERE subjectid=#{type.subjectid} and (belong=1
+        <if test="type.schoolid!=null">
+            or schoolid=#{type.schoolid}
+        </if>)
+        order by qtypeorder asc
+    </select>
+
+    <!--查找使用题型的模块-->
+    <select id="findUseModule" resultType="java.lang.String">
+        SELECT CONCAT((select (case when count(*)>0 then '试题' else '' end) from t_question where qtypeid=#{qtypeid})
+        ,(select (case when count(*)>0 then ',班级错题' else '' end) from t_question_class where qtypeid=#{qtypeid})
+        ,(select (case when count(*)>0 then ',试题收藏' else '' end) from t_question_collect where qtypeid=#{qtypeid})
+        ,(select (case when count(*)>0 then ',学生错题' else '' end) from t_question_student where qtypeid=#{qtypeid})
+        ,(select (case when count(*)>0 then ',题库作业' else '' end) from t_paper_qtype where qtypeid=#{qtypeid})
+        ,(select (case when count(*)>0 then ',附件作业' else '' end) from t_paper_scantron where qtypeid=#{qtypeid})
+        )
+    </select>
+
+</mapper>

sstudy/src/main/resources/mapper/subjectbook/VersionMapper.xml

@@ -0,0 +1,21 @@
+<?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.sstudy.mapper.subjectbook.VersionMapper">
+
+    <!-- 根据阶段获取册别 -->
+    <select id="listVersions" resultType="com.xhkjedu.sstudy.model.subjectbook.TVersion">
+        select v.versionid,v.versionname,v.versionorder,v.createid,v.createtime,v.belong,u.username createname
+        from t_version v left join t_user u on u.userid=v.createid
+        where (v.belong=1
+        <if test="version.schoolid!=null">
+            or v.schoolid=#{version.schoolid}
+        </if>)
+        order by v.versionorder asc
+    </select>
+
+    <!--查找使用版本的模块-->
+    <select id="findUseModule" resultType="java.lang.String">
+        select (case when count(*)>0 then ',教材' else '' end) from t_subject_book where versionid=#{versionid}
+    </select>
+
+</mapper>