系统接口部分内容

sapi/pom.xml

@@ -46,6 +46,12 @@
             <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>
@@ -54,9 +60,19 @@
         </dependency>
 
         <dependency>
-            <groupId>com.xhkjedu</groupId>
-            <artifactId>scommons</artifactId>
-            <version>0.0.1-SNAPSHOT</version>
+            <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>
+
+        <dependency>
+            <groupId>com.alibaba</groupId>
+            <artifactId>fastjson</artifactId>
+            <version>1.2.56</version>
         </dependency>
 
     </dependencies>

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

@@ -3,9 +3,11 @@ package com.xhkjedu.sapi;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.cloud.client.discovery.EnableDiscoveryClient;
+import tk.mybatis.spring.annotation.MapperScan;
 
 @SpringBootApplication
 @EnableDiscoveryClient
+@MapperScan(basePackages = {"com.xhkjedu.sapi.mapper"})
 public class SapiApplication {
 
     public static void main(String[] args) {

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

@@ -45,4 +45,36 @@ public class ConfigKey {
     public void setSecretKey(String secretKey) {
         ConfigKey.secretKey = secretKey;
     }
+
+    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;
+    }
+
 }

sapi/src/main/java/com/xhkjedu/sapi/controller/cloud/CloudController.java

@@ -0,0 +1,56 @@
+package com.xhkjedu.sapi.controller.cloud;
+
+import com.xhkjedu.sapi.model.cloud.TCloud;
+import com.xhkjedu.sapi.service.cloud.CloudService;
+import com.xhkjedu.utils.N_Utils;
+import com.xhkjedu.vo.ResultVo;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.annotation.Resource;
+import java.util.List;
+
+/**
+ * @author ywx
+ * @classname CloudController
+ * @description 
+ * @date 2021/6/30 14:48
+ **/
+@RestController
+@RequestMapping("cloud")
+public class CloudController {
+    @Resource
+    private CloudService cloudService;
+
+    @PostMapping("/detail")
+    public ResultVo detail() {
+        TCloud tCloud = cloudService.findById();
+        return new ResultVo(0,"获取平台详情成功",tCloud);
+    }
+
+    //修改主题色
+    @PostMapping("/update")
+    public ResultVo update(@RequestBody TCloud cloud) {
+        N_Utils.validation(new Object[]{cloud.getCloudid(), "平台id", 1
+        ,cloud.getTheme(),"主题色",2,cloud.getLoginbg(),"登录背景图片",2
+        ,cloud.getLoginname(),"登录页面字体图片",2,cloud.getLoginico(),"区域设置的ico",2});
+        cloudService.updateTheme(cloud);
+        return new ResultVo(0,"修改成功");
+    }
+
+    //修改区域基础信息
+    @PostMapping("/upinfo")
+    public ResultVo updateInfo(@RequestBody TCloud cloud) {
+        N_Utils.validation(new Object[]{cloud.getCloudid(), "平台id", 1,cloud.getCloudname(),"平台名称",2});
+        cloudService.updateInfo(cloud);
+        return new ResultVo(0,"修改成功");
+    }
+
+    @PostMapping("/list_level")
+    public ResultVo listLevel() {
+        List<Integer> list = cloudService.listLevel();
+        return new ResultVo(0,"获取区域学段列表成功",list);
+    }
+}

sapi/src/main/java/com/xhkjedu/sapi/controller/cloud/CloudSyncController.java

@@ -0,0 +1,49 @@
+package com.xhkjedu.sapi.controller.cloud;
+
+import com.github.pagehelper.PageHelper;
+import com.github.pagehelper.PageInfo;
+import com.xhkjedu.sapi.model.cloud.TCloudSync;
+import com.xhkjedu.sapi.service.cloud.CloudSyncService;
+import com.xhkjedu.utils.N_Utils;
+import com.xhkjedu.utils.PageUtil;
+import com.xhkjedu.vo.PageResult;
+import com.xhkjedu.vo.ResultVo;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.annotation.Resource;
+import java.util.List;
+import java.util.Map;
+
+/**
+* @author ywx
+* @classname TCloudSyncController
+* @description
+* @date 2021/05/06 15:42
+**/
+@RestController
+@RequestMapping("csync")
+public class CloudSyncController {
+    @Resource
+    private CloudSyncService cloudSyncService;
+
+    @PostMapping("/list")
+    public ResultVo list(@RequestBody TCloudSync sync) {
+        Integer page = sync.getPage();
+        Integer pageSize = sync.getPageSize();
+        N_Utils.validation(new Object[]{page,"显示页码",1,pageSize,"显示条数",1});
+        PageHelper.startPage(page, pageSize);
+        List<Map> list = cloudSyncService.findAll(sync);
+        PageResult pageResult = PageUtil.getPageResult(new PageInfo<>(list));
+        return new ResultVo(0,"获取同步任务列表成功",pageResult);
+    }
+
+    @PostMapping("/sync")
+    public ResultVo sync(@RequestBody TCloudSync sync) {
+        N_Utils.validation(new Object[]{sync.getCreateid(), "创建人id", 1
+                ,sync.getCloudcode(),"平台码",2,sync.getSyncnum(),"一次同步数量",1});
+        return cloudSyncService.sync(sync);
+    }
+}

sapi/src/main/java/com/xhkjedu/sapi/controller/system/AreazoneController.java

@@ -0,0 +1,56 @@
+package com.xhkjedu.sapi.controller.system;
+
+import com.xhkjedu.sapi.model.system.TAreazone;
+import com.xhkjedu.sapi.service.system.AreazoneService;
+import com.xhkjedu.vo.ResultVo;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.annotation.Resource;
+import java.util.List;
+import java.util.Map;
+
+/**
+* @author ywx
+* @classname TAreazoneController
+* @description
+* @date 2021/04/08 09:20
+**/
+@RestController
+@RequestMapping("/areazone")
+public class AreazoneController {
+    @Resource
+    private AreazoneService areazoneService;
+
+    @PostMapping("/add")
+    public ResultVo add(@RequestBody TAreazone areazone) {
+        areazoneService.save(areazone);
+        return new ResultVo(0, "保存成功");
+    }
+
+    @PostMapping("/delete")
+    public ResultVo delete(@RequestBody TAreazone areazone) {
+        areazoneService.deleteById(areazone.getAreaid());
+        return new ResultVo(0,"删除成功");
+    }
+
+    @PostMapping("/update")
+    public ResultVo update(@RequestBody TAreazone areazone) {
+        areazoneService.update(areazone);
+        return new ResultVo(0,"修改成功");
+    }
+
+    @PostMapping("/list")
+    public ResultVo list() {
+        List<Map> list = areazoneService.listAll();
+        return new ResultVo(0,"获取地区列表成功",list);
+    }
+
+    @PostMapping("/list_sel")
+    public ResultVo listForSel() {
+        List<Map> list = areazoneService.listForSel();
+        return new ResultVo(0,"获取地区选择列表成功",list);
+    }
+}

sapi/src/main/java/com/xhkjedu/sapi/controller/system/ModuleController.java

@@ -0,0 +1,163 @@
+package com.xhkjedu.sapi.controller.system;
+
+import com.xhkjedu.sapi.model.system.TModule;
+import com.xhkjedu.sapi.service.system.ModuleService;
+import com.xhkjedu.utils.N_Utils;
+import com.xhkjedu.vo.ResultVo;
+import com.xhkjedu.sapi.vo.system.ModuleSelVo;
+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 ModuleController
+ * Description TODO
+ * Author WN
+ * Date 2020/6/11 16:24
+ **/
+@RequestMapping("module")
+@RestController
+public class ModuleController {
+    @Autowired
+    private ModuleService moduleService;
+
+    /**
+     *功能描述 列表
+     * @author WN
+     * @date 2020/6/11
+     * @param  * @param module
+     * @return com.xhkjedu.vo.ResultVo
+     */
+    @PostMapping("/list")
+    public ResultVo listModules(@RequestBody TModule module){
+        N_Utils.validation(new Object[]{module.getSchoolid(),"学校id",1,module.getModuletype(),"模块归属",1});
+        List<TModule> lst = moduleService.listModules(module.getSchoolid(), module.getModuletype(), 1);
+        return new ResultVo(0,"获取应用集合成功",lst);
+    }
+
+    @PostMapping("/list2")
+    public ResultVo listModules2(@RequestBody TModule module){
+        N_Utils.validation(new Object[]{module.getSchoolid(),"学校id",1,module.getModuletype(),"模块归属",1});
+        List<TModule> lst = moduleService.listModules(module.getSchoolid(), module.getModuletype(), 1);
+        return new ResultVo(0,"获取应用集合成功",lst);
+    }
+
+    @PostMapping("/list_stu")
+    public ResultVo listStuModules(@RequestBody TModule module){
+        N_Utils.validation(new Object[]{module.getSchoolid(),"学校id",1,module.getModuletype(),"模块归属",1});
+        List<TModule> lst = moduleService.listModules(module.getSchoolid(),module.getModuletype(),1);
+        return new ResultVo(0,"获取应用集合成功",lst);
+    }
+
+    /**
+     *功能描述 所有模块树形结构
+     * @author WN
+     * @date 2020/6/15
+     * @param  * @param module
+     * @return com.xhkjedu.vo.ResultVo
+     */
+    @PostMapping("/treelst")
+    public ResultVo listTree(@RequestBody TModule module){
+        N_Utils.validation(new Object[]{module.getSchoolid(),"学校id",1,module.getModuletype(),"模块归属",1});
+        List<TModule> lst = moduleService.listModulesTree(module.getSchoolid(),module.getModuletype(), 1);
+        return new ResultVo(0,"获取应用集合成功",lst);
+    }
+
+
+    /**
+     *功能描述 保存
+     * @author WN
+     * @date 2020/6/11
+     * @param  * @param module
+     * @return com.xhkjedu.vo.ResultVo
+     */
+    @PostMapping("/add")
+    public ResultVo add(@RequestBody TModule module){
+        N_Utils.validation(new Object[]{
+                module.getModulename(),"应用名称",2,
+                module.getMinout(),"应用分类",1,
+                module.getMclass(),"应用分组",1,
+                module.getModuletype(),"模块归属",1
+        });
+        int result = moduleService.add(module);
+        if (result > 0) {
+            return new ResultVo(0, "保存成功");
+        }else{
+            return new ResultVo(1, "保存失败");
+        }
+    }
+
+    /**
+     *功能描述 修改
+     * @author WN
+     * @date 2020/6/11
+     * @param  * @param module
+     * @return com.xhkjedu.vo.ResultVo
+     */
+    @PostMapping("/up")
+    public ResultVo update(@RequestBody TModule module){
+        N_Utils.validation(new Object[]{
+                module.getModuleid(),"应用id",1,
+                module.getModulename(),"应用名称",2,
+                module.getMinout(),"应用分类",1,
+                module.getMclass(),"应用分组",1
+        });
+        int result = moduleService.update(module);
+        if (result > 0) return new ResultVo(0,"修改成功");
+        else return new ResultVo(1,"修改失败");
+    }
+
+    /**
+     *功能描述  删除
+     * @author WN
+     * @date 2020/6/11
+     * @param  * @param module
+     * @return com.xhkjedu.vo.ResultVo
+     */
+    @PostMapping("/del")
+    public ResultVo del(@RequestBody TModule module) {
+        if (N_Utils.isEmpty(module.getModuleid()))
+            return new ResultVo(1,"未选择删除的应用");
+        int result = moduleService.del(module.getModuleid());
+        if (result > 0) return new ResultVo(0,"删除成功");
+        else return new ResultVo(1,"删除失败");
+    }
+
+    /**
+     *功能描述  首层模块
+     * @author WN
+     * @date 2020/6/15
+     * @param  * @param module
+     * @return com.xhkjedu.vo.ResultVo
+     */
+    @PostMapping("/listsel")
+    public ResultVo listForSel(@RequestBody TModule module){
+        N_Utils.validation(new Object[]{module.getSchoolid(),"学校id",1,module.getModuletype(),"模块归属",1});
+        List<ModuleSelVo> lst = moduleService.listLevelModule(module.getSchoolid(),module.getModuletype());
+        return new ResultVo(0,"获取一级应用成功",lst);
+    }
+
+    @PostMapping("/move_up")
+    public ResultVo moveUp(@RequestBody List<TModule> modules){
+        if (N_Utils.isListEmpty(modules)) {
+            return new ResultVo(1,"要移动的模块信息不能为空");
+        }
+        moduleService.moveUp(modules);
+        return new ResultVo(0,"上移成功");
+    }
+
+    @PostMapping("/listsel2")
+    public ResultVo listForSel2(@RequestBody TModule module){
+        Integer schoolid = module.getSchoolid();
+        Integer moduletype = module.getModuletype();
+        N_Utils.validation(new Object[]{schoolid,"学校id",1,moduletype,"模块归属",1});
+        List<Map> list = moduleService.listForSel2(schoolid, moduletype);
+        return new ResultVo(0,"获取模块选择列表成功", list);
+    }
+}

sapi/src/main/java/com/xhkjedu/sapi/controller/system/ModuledefaultController.java

@@ -0,0 +1,76 @@
+package com.xhkjedu.sapi.controller.system;
+
+import com.xhkjedu.sapi.model.system.TModuledefault;
+import com.xhkjedu.sapi.service.system.ModuledefaultService;
+import com.xhkjedu.utils.N_Utils;
+import com.xhkjedu.vo.ResultVo;
+import com.xhkjedu.sapi.vo.system.ModuleSelVo;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.annotation.Resource;
+import java.util.List;
+
+/**
+* @author ywx
+* @classname TModuledefaultController
+* @description
+* @date 2020/07/02 10:20
+**/
+@RestController
+@RequestMapping("/moduledefault")
+public class ModuledefaultController {
+    @Resource
+    private ModuledefaultService moduledefaultService;
+
+    @PostMapping("/add")
+    public ResultVo add(@RequestBody TModuledefault tModuledefault) {
+        N_Utils.validation(new Object[]{tModuledefault.getModuletype(),"模块归属",1});
+        return moduledefaultService.save(tModuledefault);
+    }
+
+    @PostMapping("/delete")
+    public ResultVo delete(@RequestBody TModuledefault tModuledefault) {
+        N_Utils.validation(new Object[]{tModuledefault.getModuleid(),"模块id",2});
+        moduledefaultService.deleteById(tModuledefault.getModuleid());
+        return new ResultVo(0,"删除成功");
+    }
+
+    @PostMapping("/update")
+    public ResultVo update(@RequestBody TModuledefault tModuledefault) {
+        moduledefaultService.update(tModuledefault);
+        return new ResultVo(0,"修改成功");
+    }
+
+    @PostMapping("/detail")
+    public ResultVo detail(@RequestBody TModuledefault tModuledefault) {
+        N_Utils.validation(new Object[]{tModuledefault.getModuleid(),"模块id",2});
+        TModuledefault moduledefault = moduledefaultService.findById(tModuledefault.getModuleid());
+        return new ResultVo(0,"获取详情成功",moduledefault);
+    }
+
+    @PostMapping("/list")
+    public ResultVo list(@RequestBody TModuledefault tModuledefault) {
+        Integer moduletype = tModuledefault.getModuletype();
+        N_Utils.validation(new Object[]{moduletype,"模块归属",1});
+        List<TModuledefault> list = moduledefaultService.listAll(moduletype,tModuledefault.getDisplay());
+        return new ResultVo(0,"获取列表成功",list);
+    }
+
+    /**
+     *功能描述  首层模块
+     * @author WN
+     * @date 2020/6/15
+     * @param  * @param module
+     * @return com.xhkjedu.vo.ResultVo
+     */
+    @PostMapping("/listsel")
+    public ResultVo listForSel(@RequestBody TModuledefault tModuledefault){
+        Integer moduletype = tModuledefault.getModuletype();
+        N_Utils.validation(new Object[]{moduletype,"模块归属",1});
+        List<ModuleSelVo> lst = moduledefaultService.listLevelModule(moduletype);
+        return new ResultVo(0,"获取一级应用成功",lst);
+    }
+}

sapi/src/main/java/com/xhkjedu/sapi/controller/system/SchoolController.java

@@ -0,0 +1,108 @@
+package com.xhkjedu.sapi.controller.system;
+
+import com.github.pagehelper.PageHelper;
+import com.github.pagehelper.PageInfo;
+import com.xhkjedu.sapi.model.system.TSchool;
+import com.xhkjedu.sapi.service.system.SchoolService;
+import com.xhkjedu.utils.N_Utils;
+import com.xhkjedu.utils.PageUtil;
+import com.xhkjedu.vo.PageResult;
+import com.xhkjedu.vo.ResultVo;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.annotation.Resource;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * @author ywx
+ * @classname TSchoolController
+ * @description
+ * @date 2020/6/2 15:06
+ **/
+@RestController
+@RequestMapping("/school")
+public class SchoolController {
+    @Resource
+    private SchoolService schoolService;
+
+    @PostMapping("/add")
+    public ResultVo add(@RequestBody TSchool tSchool) {
+        try {
+            String schoolname = tSchool.getSchoolname();
+            N_Utils.validation(new Object[]{schoolname,"学校名称",2});
+            Integer num = schoolService.countBySchoolName(schoolname);
+            if (num != 0) return new ResultVo(1,"该学校名称已存在");
+            Integer id = schoolService.save(tSchool);
+            return new ResultVo(0, "保存成功",id);
+        } catch (Exception e) {
+            return new ResultVo(1,e.getMessage());
+        }
+    }
+
+    @PostMapping("/delete")
+    public ResultVo delete(@RequestBody TSchool tSchool) {
+        N_Utils.validation(new Object[]{tSchool.getSchoolid(),"学校id",1});
+        schoolService.deleteById(tSchool.getSchoolid());
+        return new ResultVo(0,"删除成功");
+    }
+
+    @PostMapping("/update")
+    public ResultVo update(@RequestBody TSchool tSchool) {
+        N_Utils.validation(new Object[]{tSchool.getSchoolid(),"学校id",1});
+        schoolService.update(tSchool);
+        return new ResultVo(0,"修改成功");
+    }
+
+    @PostMapping("/list")
+    public ResultVo list(@RequestBody TSchool tSchool) {
+        Integer page = tSchool.getPage();
+        Integer pageSize = tSchool.getPageSize();
+        N_Utils.validation(new Object[]{page,"显示页码",1,pageSize,"显示条数",1});
+        PageHelper.startPage(page, pageSize);
+        List<TSchool> list = schoolService.findAll();
+        PageResult pageResult = PageUtil.getPageResult(new PageInfo(list));
+        return new ResultVo(0,"获取列表成功",pageResult);
+    }
+
+    @PostMapping("/upgrade")
+    public ResultVo upgrade(@RequestBody TSchool tSchool) {
+        Integer schoolid = tSchool.getSchoolid();
+        Integer year = schoolService.getYearById(schoolid);
+        N_Utils.validation(new Object[]{schoolid,"学校id",1});
+        Integer nowYear = N_Utils.getNodeDateTime("year");//当前年份
+        if (year >= nowYear) return new ResultVo(1,"当前学年不用升级");
+        try {
+            schoolService.upgrade(schoolid, year);
+            return new ResultVo(0,"学年升级成功");
+        } catch (Exception e) {
+            return new ResultVo(1,e.getMessage());
+        }
+    }
+
+    @PostMapping("/downgrade")
+    public ResultVo downgrade(@RequestBody TSchool tSchool) {
+        Integer schoolid = tSchool.getSchoolid();
+        Integer year = schoolService.getYearById(schoolid);
+        N_Utils.validation(new Object[]{schoolid,"学校id",1});
+        schoolService.downgrade(schoolid, year);
+        return new ResultVo(0,"学年降级成功");
+    }
+
+    @PostMapping("/detail")
+    public ResultVo detail(@RequestBody TSchool tSchool) {
+        Integer schoolid = tSchool.getSchoolid();
+        N_Utils.validation(new Object[]{schoolid,"学校id",1});
+        TSchool school = schoolService.finById(schoolid);
+        return new ResultVo(0,"获取学校详情成功", school);
+    }
+
+    @PostMapping("/list_sel")
+    public ResultVo listForSel() {
+        List<Map> list = schoolService.listForSel();
+        return new ResultVo(0,"获取学校选择列表成功", list);
+    }
+}

sapi/src/main/java/com/xhkjedu/sapi/controller/system/SchoolStypeController.java

@@ -0,0 +1,51 @@
+package com.xhkjedu.sapi.controller.system;
+
+import com.xhkjedu.sapi.model.system.TSchoolStype;
+import com.xhkjedu.sapi.service.system.SchoolStypeService;
+import com.xhkjedu.utils.N_Utils;
+import com.xhkjedu.vo.ResultVo;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.annotation.Resource;
+import java.util.List;
+
+/**
+* @author ywx
+* @classname TSchoolStypeController
+* @description
+* @date 2021/02/23 09:50
+**/
+@RestController
+@RequestMapping("/stype")
+public class SchoolStypeController {
+    @Resource
+    private SchoolStypeService schoolStypeService;
+
+    @PostMapping("/add")
+    public ResultVo add(@RequestBody List<TSchoolStype> list) {
+        return schoolStypeService.batchSave(list);
+    }
+
+    @PostMapping("/list")
+    public ResultVo list(@RequestBody TSchoolStype stype) {
+        N_Utils.validation(new Object[]{stype.getSchooldomain(),"域名",2});
+        List<TSchoolStype> list = schoolStypeService.listAll(stype);
+        return new ResultVo(0,"获取学校样式列表成功",list);
+    }
+
+    @PostMapping("/add2")
+    public ResultVo add2(@RequestBody List<TSchoolStype> list) {
+        if (N_Utils.isListEmpty(list)) return new ResultVo(1,"学校样式不能为空");
+        return schoolStypeService.batchSave2(list);
+    }
+
+    @PostMapping("/list2")
+    public ResultVo list2(@RequestBody TSchoolStype stype) {
+        N_Utils.validation(new Object[]{stype.getSchoolid(),"学校id",1});
+        List<TSchoolStype> list = schoolStypeService.listAll2(stype);
+        return new ResultVo(0,"获取学校样式列表成功",list);
+    }
+}

sapi/src/main/java/com/xhkjedu/sapi/controller/system/SyserrorController.java

@@ -0,0 +1,43 @@
+package com.xhkjedu.sapi.controller.system;
+
+import com.github.pagehelper.PageHelper;
+import com.github.pagehelper.PageInfo;
+import com.xhkjedu.sapi.model.system.TSyserror;
+import com.xhkjedu.sapi.service.system.SyserrorService;
+import com.xhkjedu.utils.PageUtil;
+import com.xhkjedu.vo.PageResult;
+import com.xhkjedu.vo.ResultVo;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.annotation.Resource;
+import java.util.List;
+
+/**
+* @author ywx
+* @classname TSyserrorController
+* @description
+* @date 2020/10/09 15:13
+**/
+@RestController
+@RequestMapping("/syserror")
+public class SyserrorController {
+    @Resource
+    private SyserrorService syserrorService;
+
+    @PostMapping("/add")
+    public ResultVo add(@RequestBody TSyserror error) {
+        Integer id = syserrorService.save(error);
+        return new ResultVo(0, "保存成功",id);
+    }
+
+    @PostMapping("/list")
+    public ResultVo list(@RequestBody TSyserror error) {
+        PageHelper.startPage(error.getPage(), error.getPageSize());
+        List<TSyserror> list = syserrorService.listAll(error);
+        PageResult pageResult = PageUtil.getPageResult(new PageInfo(list));
+        return new ResultVo(0,"获取系统错误列表成功",pageResult);
+    }
+}

sapi/src/main/java/com/xhkjedu/sapi/controller/system/UserLogController.java

@@ -0,0 +1,48 @@
+package com.xhkjedu.sapi.controller.system;
+
+import com.github.pagehelper.PageHelper;
+import com.github.pagehelper.PageInfo;
+import com.xhkjedu.sapi.model.system.TUserLog;
+import com.xhkjedu.sapi.service.system.UserLogService;
+import com.xhkjedu.utils.N_Utils;
+import com.xhkjedu.utils.PageUtil;
+import com.xhkjedu.vo.PageResult;
+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;
+
+/**
+ * @author ywx
+ * @classname UserLogController
+ * @description 
+ * @date 2020/6/17 17:38
+ **/
+@RestController
+@RequestMapping("log")
+public class UserLogController {
+    @Autowired
+    private UserLogService userLogService;
+
+    /**
+     * 登录日志列表
+     * @Param [log]
+     * @Author ywx
+     * @Date 2020/6/17 17:22
+     * @return com.xhkjedu.vo.ResultVo
+     **/
+    @PostMapping("/list_log")
+    public ResultVo listLog(@RequestBody TUserLog log){
+        Integer page = log.getPage();
+        Integer pageSize = log.getPageSize();
+        N_Utils.validation(new Object[]{page,"显示页码",1,pageSize,"显示条数",1});
+        PageHelper.startPage(page, pageSize);
+        List<TUserLog> logs = userLogService.listLog(log);
+        PageResult pageResult = PageUtil.getPageResult(new PageInfo(logs));
+        return new ResultVo(0, "获取登录日志列表成功", pageResult);
+    }
+}

sapi/src/main/java/com/xhkjedu/sapi/mapper/cloud/CloudMapper.java

@@ -0,0 +1,21 @@
+package com.xhkjedu.sapi.mapper.cloud;
+
+import com.xhkjedu.sapi.base.TkMapper;
+import com.xhkjedu.sapi.model.cloud.TCloud;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+public interface CloudMapper extends TkMapper<TCloud> {
+    //修改主题
+    void updateTheme(@Param("cloud") TCloud cloud);
+
+    //修改区域基本信息
+    void updateInfo(@Param("cloud") TCloud cloud);
+
+    //获取详情
+    TCloud getCloud();
+
+    //区域学段列表
+    List<Integer> listLevel();
+}

sapi/src/main/java/com/xhkjedu/sapi/mapper/cloud/CloudSyncDetailMapper.java

@@ -0,0 +1,21 @@
+package com.xhkjedu.sapi.mapper.cloud;
+
+import com.xhkjedu.sapi.base.TkMapper;
+import com.xhkjedu.sapi.model.cloud.TCloudSyncDetail;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+public interface CloudSyncDetailMapper extends TkMapper<TCloudSyncDetail> {
+    //批量添加
+    void batchSave(@Param("list") List<TCloudSyncDetail> details, @Param("csid") Integer csid, @Param("createid") Integer createid);
+
+    //获取未执行完的同步任务详情列表
+    List<TCloudSyncDetail> listByCsId(@Param("csid") Integer csid);
+
+    //更新已同步数量
+    void updateRealNum(@Param("detail") TCloudSyncDetail detail);
+
+    //获取未执行完成的任务详情数量
+    Integer countNoEndByCsId(@Param("csid") Integer csid);
+}

sapi/src/main/java/com/xhkjedu/sapi/mapper/cloud/CloudSyncMapper.java

@@ -0,0 +1,73 @@
+package com.xhkjedu.sapi.mapper.cloud;
+
+import com.xhkjedu.sapi.base.TkMapper;
+import com.xhkjedu.sapi.model.cloud.TCloudSync;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+import java.util.Map;
+
+public interface CloudSyncMapper extends TkMapper<TCloudSync> {
+    //列表
+    List<Map> findAll(@Param("sync") TCloudSync sync);
+
+    //添加
+    void save(@Param("sync") TCloudSync sync);
+
+    //获取最后一条同步任务
+    TCloudSync getLastSync();
+
+    //更新同步状态
+    void updateState(@Param("csid") Integer csid, @Param("syncstate") int syncstate);
+
+    //同步科目
+    void syncSubject(@Param("list") List<Map> list);
+
+    //同步版本
+    void syncVersion(@Param("list") List<Map> list);
+
+    //同步教材
+    void syncSubjectBook(@Param("list") List<Map> list);
+
+    //同步题型
+    void syncSubjectQuestionType(@Param("list") List<Map> list);
+
+    //同步章节
+    void syncDirector(@Param("list") List<Map> list);
+
+    //同步知识点
+    void syncPoint(@Param("list") List<Map> list);
+
+    //同步试题
+    void syncQuestion(@Param("m") Map list);
+
+    //同步试题章节
+    void syncQuestionDirector(@Param("list") List<Map> list);
+
+    //同步试题知识点
+    void syncQuestionPoint(@Param("list") List<Map> list);
+
+    //同步资源
+    void syncResource(@Param("m") Map list);
+
+    //同步资源章节
+    void syncResourceDirector(@Param("list") List<Map> list);
+
+    //平台基础信息
+    TCloudSync getCloudInfo();
+
+    //外键是否存在
+    Integer getFkExisted(@Param("fkname") String fkname, @Param("dbname") String dbname);
+
+    //删除章节外键
+    void delDirectorFk();
+
+    //添加章节外键
+    void addDirectorFk();
+
+    //删除知识点外键
+    void delPointFk();
+
+    //添加知识点外键
+    void addPointFk();
+}

sapi/src/main/java/com/xhkjedu/sapi/mapper/system/AreazoneMapper.java

@@ -0,0 +1,19 @@
+package com.xhkjedu.sapi.mapper.system;
+
+import com.xhkjedu.sapi.base.TkMapper;
+import com.xhkjedu.sapi.model.system.TAreazone;
+
+import java.util.List;
+import java.util.Map;
+
+public interface AreazoneMapper extends TkMapper<TAreazone> {
+    //获取地区列表
+    List<Map> listAll();
+
+    //获取地区选择列表
+    List<Map> listForSel();
+
+    //修改区域全名称
+    void updateAreaAll(Integer areaid, String areaall);
+    void updateAreaAll2(Integer areaid, String areaall);
+}

sapi/src/main/java/com/xhkjedu/sapi/mapper/system/ModuleMapper.java

@@ -0,0 +1,58 @@
+package com.xhkjedu.sapi.mapper.system;
+
+import com.xhkjedu.sapi.base.TkMapper;
+import com.xhkjedu.sapi.model.system.TModule;
+import com.xhkjedu.sapi.vo.system.ModuleSelVo;
+import org.apache.ibatis.annotations.Param;
+import org.springframework.stereotype.Repository;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * @ClassName ModuleMapper
+ * Description 模块
+ * Author WN
+ * Date 2020/6/11 16:13
+ **/
+@Repository
+public interface ModuleMapper extends TkMapper<TModule> {
+
+    /**
+     *功能描述 所有模块
+     * @author WN
+     * @date 2020/6/11
+     * @param  * @param schoolid
+     * @param display
+     * @return java.util.List<com.xhkjedu.model.system.TModule>
+     */
+    List<TModule> listModules(@Param("schoolid") Integer schoolid, @Param("moduletype") Integer moduletype, @Param("display") Integer display);
+
+    //获取第一层模块
+    List<ModuleSelVo> listLevelModule(@Param("schoolid") Integer schoolid, @Param("moduletype") Integer moduletype);
+
+
+    /**
+     * 修改模块排序
+     * @Param [module]
+     * @Author ywx
+     * @Date 2020/8/31 16:24
+     * @return void
+     **/
+    void updateOrder(@Param("module") TModule module);
+
+    /**
+     * 模块上移
+     * @Param [modules]
+     * @Author ywx
+     * @Date 2020/8/31 16:28
+     * @return void
+     **/
+    void moveUp(@Param("list") List<TModule> modules);
+
+    //模块选择列表
+    List<Map> listForSel2(@Param("schoolid") Integer schoolid, @Param("moduletype") Integer moduletype);
+
+    //删除默认模块关联的学校模块
+    void deleteByDefaultId(String defaultid);
+}

sapi/src/main/java/com/xhkjedu/sapi/mapper/system/ModuledefaultMapper.java

@@ -0,0 +1,28 @@
+package com.xhkjedu.sapi.mapper.system;
+
+import com.xhkjedu.sapi.base.TkMapper;
+import com.xhkjedu.sapi.model.system.TModule;
+import com.xhkjedu.sapi.model.system.TModuledefault;
+import com.xhkjedu.sapi.vo.system.ModuleSelVo;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+public interface ModuledefaultMapper extends TkMapper<TModuledefault> {
+    //所有模块
+    List<TModule> listModules(@Param("moduletype") Integer moduletype, @Param("display") Integer display);
+
+    //首层模块
+    List<ModuleSelVo> listLevelModule(@Param("moduletype") Integer moduletype);
+
+    //获取学校id集合
+    List<Integer> listSchoolId();
+
+    //模块地址对应模块数量
+    Integer countByUrl(String moduleurl, Integer moduletype);
+
+    //更新学校模块信息
+    void updateByDefaultId(String moduleid);
+
+    String getModuleIdByDefaultId(@Param("moduleid") String moduleid, @Param("schoolid") Integer schoolid, @Param("moduletype") Integer moduletype);
+}

sapi/src/main/java/com/xhkjedu/sapi/mapper/system/SchoolMapper.java

@@ -0,0 +1,60 @@
+package com.xhkjedu.sapi.mapper.system;
+
+import com.xhkjedu.sapi.base.TkMapper;
+import com.xhkjedu.sapi.model.system.TSchool;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+import java.util.Map;
+
+public interface SchoolMapper extends TkMapper<TSchool> {
+    //删除
+    Integer deleteById(@Param("schoolid") Integer schoolid);
+
+    //列表
+    List<TSchool> findAll();
+
+    /**
+     * 学年升级
+     * @Param [schoolid]
+     * @Author ywx
+     * @Date 2020/6/12 13:54
+     * @return java.lang.Integer
+     **/
+    Integer upgrade(@Param("schoolid") Integer schoolid);
+
+    /**
+     * 学年降级
+     * @Param [schoolid, year]
+     * @Author ywx
+     * @Date 2020/6/16 13:51
+     * @return java.lang.Integer
+     **/
+    Integer downgrade(@Param("schoolid") Integer schoolid, @Param("year") Integer year);
+
+    //学校选择列表
+    List<Map> listForSel();
+
+    TSchool getSchoolDetailById(@Param("schoolid") Integer schoolid);//获取区域码
+
+    //更改学校是否绑定状态
+    Integer updateSchoolDock(@Param("schoolid") Integer schoolid, @Param("docklc") Integer docklc);
+
+    //根据学校名称查找学校数量
+    Integer countBySchoolName(String schoolname);
+
+    //获取学校当前年份
+    Integer getYearById(Integer schoolid);
+
+    //获取用户当前年份
+    Integer getYearByUserId(Integer userid);
+
+    //获取学校账号数量
+    Integer getUserNumById(Integer schoolid);
+
+    //修改
+    Integer updateById(@Param("school") TSchool school);
+
+    //根据域名获取学校id
+    Integer getSchoolIdByDomain(String schooldomain, Integer schoolid);
+}

sapi/src/main/java/com/xhkjedu/sapi/mapper/system/SchoolStypeMapper.java

@@ -0,0 +1,17 @@
+package com.xhkjedu.sapi.mapper.system;
+
+import com.xhkjedu.sapi.base.TkMapper;
+import com.xhkjedu.sapi.model.system.TSchoolStype;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+public interface SchoolStypeMapper extends TkMapper<TSchoolStype> {
+    //通过域名获取学校样式列表
+    List<TSchoolStype> findAll(@Param("stype") TSchoolStype stype);
+    //通过学校id获取学校样式列表
+    List<TSchoolStype> findAll2(@Param("stype") TSchoolStype stype);
+
+    //批量添加
+    void batchSave(@Param("list") List<TSchoolStype> list);
+}

sapi/src/main/java/com/xhkjedu/sapi/mapper/system/SyserrorMapper.java

@@ -0,0 +1,11 @@
+package com.xhkjedu.sapi.mapper.system;
+
+import com.xhkjedu.sapi.base.TkMapper;
+import com.xhkjedu.sapi.model.system.TSyserror;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+public interface SyserrorMapper extends TkMapper<TSyserror> {
+    List<TSyserror> listAll(@Param("error") TSyserror error);
+}

sapi/src/main/java/com/xhkjedu/sapi/mapper/system/UserLogMapper.java

@@ -0,0 +1,21 @@
+package com.xhkjedu.sapi.mapper.system;
+
+import com.xhkjedu.sapi.model.system.TUserLog;
+import org.apache.ibatis.annotations.Param;
+import org.springframework.stereotype.Repository;
+import tk.mybatis.mapper.additional.insert.InsertListMapper;
+import tk.mybatis.mapper.common.Mapper;
+
+import java.util.List;
+
+@Repository
+public interface UserLogMapper extends Mapper<TUserLog>, InsertListMapper<TUserLog> {
+    /**
+     * 登录日志列表
+     * @Param [log]
+     * @Author ywx
+     * @Date 2020/6/17 17:21
+     * @return java.util.List<com.xhkjedu.model.system.TUserLog>
+     **/
+    List<TUserLog> listLog(@Param("log") TUserLog log);
+}

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

@@ -0,0 +1,26 @@
+package com.xhkjedu.sapi.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;
+}

sapi/src/main/java/com/xhkjedu/sapi/model/cloud/TCloud.java

@@ -0,0 +1,65 @@
+package com.xhkjedu.sapi.model.cloud;
+
+import com.xhkjedu.sapi.model.BaseBean;
+import lombok.Data;
+
+import javax.persistence.Id;
+import javax.persistence.Table;
+
+@Table(name = "t_cloud")
+@Data
+public class TCloud extends BaseBean {
+    @Id
+    //云平台管理表
+    private Integer cloudid;
+
+    //云平台名称
+    private String cloudname;
+
+    private String cloudshort;//简称
+
+    //云平台码
+    private String cloudcode;
+
+    //联系人
+    private String account;
+
+    //联系人手机号
+    private String phone;
+
+    //备注
+    private String comm;
+
+    //是否绑定手机号0不绑定1绑定
+    private Integer bindphone;
+
+    //是否有学生网页端0没有1有
+    private Integer stuweb;
+
+    //主题色
+    private String theme;
+
+    //登录背景图片
+    private String loginbg;
+
+    //登录页面字体图片
+    private String loginname;
+
+    //区域设置的ico
+    private String loginico;
+
+    //技术支持
+    private String tesupport;
+
+    //备案号
+    private String recordno;
+
+    //创建人id
+    private Integer createid;
+
+    //创建时间
+    private Integer createtime;
+
+    //区地区显示json
+    private String cloudmap;
+}

sapi/src/main/java/com/xhkjedu/sapi/model/cloud/TCloudSync.java

@@ -0,0 +1,53 @@
+package com.xhkjedu.sapi.model.cloud;
+
+import com.xhkjedu.sapi.model.BaseBean;
+import lombok.Data;
+
+import javax.persistence.Id;
+import javax.persistence.Table;
+import javax.persistence.Transient;
+import java.util.List;
+
+@Table(name = "t_cloud_sync")
+@Data
+public class TCloudSync extends BaseBean {
+    @Id
+    //同步任务表
+    private Integer csid;
+
+    //同步起始
+    private Integer begintime;
+
+    //同步结束
+    private Integer endtime;
+
+    //实际同步开始时间
+    private Integer starttime;
+
+    //实际同步结束时间
+    private Integer stoptime;
+
+    //同步任务0不需要同步1需要同步
+    private Integer synctask;
+
+    //同步状态0进行中1成功2失败
+    private Integer syncstate;
+
+    //创建人id
+    private Integer createid;
+
+    //创建时间
+    private Integer createtime;
+
+    @Transient
+    //云平台码
+    private String cloudcode;
+
+    @Transient
+    //一次同步数量
+    private Integer syncnum;
+
+    @Transient
+    //详情列表
+    private List<TCloudSyncDetail> syncdetails;
+}

sapi/src/main/java/com/xhkjedu/sapi/model/cloud/TCloudSyncDetail.java

@@ -0,0 +1,60 @@
+package com.xhkjedu.sapi.model.cloud;
+
+import com.xhkjedu.sapi.model.BaseBean;
+import lombok.Data;
+
+import javax.persistence.Id;
+import javax.persistence.Table;
+
+@Table(name = "t_cloud_sync_detail")
+@Data
+public class TCloudSyncDetail extends BaseBean {
+    @Id
+    //同步任务详情表
+    private Integer csdid;
+
+    //同步任务表
+    private Integer csid;
+
+    //同步表名
+    private String synctable;
+
+    //需要同步条数
+    private Integer plannum;
+
+    //起始id
+    private String beginid;
+
+    //结束id
+    private String endid;
+
+    //一次同步数量
+    private Integer syncnum;
+
+    //已同步数量
+    private Integer realnum;
+
+    //正在处理的最大id
+    private String handleid;
+
+    //同步开始时间
+    private Integer begintime;
+
+    //同步结束时间
+    private Integer endtime;
+
+    //实际开始时间
+    private Integer starttime;
+
+    //实际结束时间
+    private Integer stoptime;
+
+    //教材id
+    private String lsbid;
+
+    //创建人id
+    private Integer createid;
+
+    //创建时间
+    private Integer createtime;
+}

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

@@ -0,0 +1,54 @@
+package com.xhkjedu.sapi.model.subjectbook;
+
+import com.xhkjedu.sapi.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<>();
+}

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

@@ -0,0 +1,53 @@
+package com.xhkjedu.sapi.model.subjectbook;
+
+import com.xhkjedu.sapi.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<>();
+}

sapi/src/main/java/com/xhkjedu/sapi/model/subjectbook/TQuestion.java

@@ -0,0 +1,110 @@
+package com.xhkjedu.sapi.model.subjectbook;
+
+import com.xhkjedu.sapi.model.BaseBean;
+import lombok.Data;
+
+import javax.persistence.Id;
+import javax.persistence.Table;
+import javax.persistence.Transient;
+import java.util.List;
+
+@Table(name = "t_question")
+@Data
+public class TQuestion extends BaseBean {
+    //试题表
+    @Id
+    private String questionid;
+
+    //试题分值
+    private Double score;
+
+    //试题难易度
+    private Integer complexity;
+
+    //处理题型1单选题2多选题3主观题4判断对错5判断✔6判断TF7完形填空8阅读理解
+    private Integer ctype;
+
+    //试题题型id
+    private String qtypeid;
+
+    //试题题型名称
+    private String qtypename;
+
+    @Transient
+    //教材关联id
+    private String lsbid;
+
+    @Transient
+    //章节id
+    private String directorid;
+
+    //科目id
+    private String subjectid;
+
+    //组题次数
+    private Integer count;
+
+    //资源归属1平台1区平台3学校4个人(搜索时5我的收藏 6我的上传)
+    private Integer belong;
+
+    //试题类型0母题1子题
+    private Integer qlevel;
+
+    //试题状态0默认1正常（上架）2下架10已删除
+    private Integer qstate;
+
+    //来源
+    private String source;
+
+    //年份
+    private Integer year;
+
+    //归属省份
+    private String region;
+
+    //资源归属地学校名称
+    private String schoolname;
+
+    //同步时间戳
+    private Integer timeunix;
+
+    //创建人id
+    private Integer createid;
+
+    //创建时间
+    private Integer createtime;
+
+    //学校id
+    private Integer schoolid;
+
+    //试题题干
+    private String qstem;
+
+    //题干纯文本
+    private String qstemtxt;
+
+    //试题选项
+    private String qoption;
+
+    //试题答案
+    private String qanswer;
+
+    //试题分析
+    private String qanalyze;
+
+    //上传试卷id
+    @Transient
+    private Integer upid;
+
+    //试题关联知识点
+    @Transient
+    private List<TQuestionPoint> questionPoints;
+
+    //试题关联章节
+    @Transient
+    private List<TQuestionDirector> directors;
+
+    //知识点id
+    @Transient
+    private String pointid;
+}

sapi/src/main/java/com/xhkjedu/sapi/model/subjectbook/TQuestionDirector.java

@@ -0,0 +1,32 @@
+package com.xhkjedu.sapi.model.subjectbook;
+
+import lombok.Data;
+
+import javax.persistence.Id;
+import javax.persistence.Table;
+
+@Table(name = "t_question_director")
+@Data
+public class TQuestionDirector {
+    @Id
+    //试题关联章节表
+    private String qdid;
+
+    //试题id
+    private String questionid;
+
+    //教材id
+    private String lsbid;
+
+    //章节id
+    private String directorid;
+
+    //创建人id
+    private Integer createid;
+
+    //创建时间
+    private Integer createtime;
+
+    //同步时间戳
+    private Integer timeunix;
+}

sapi/src/main/java/com/xhkjedu/sapi/model/subjectbook/TQuestionPoint.java

@@ -0,0 +1,33 @@
+package com.xhkjedu.sapi.model.subjectbook;
+
+import com.xhkjedu.sapi.model.BaseBean;
+import lombok.Data;
+
+import javax.persistence.Id;
+import javax.persistence.Table;
+
+@Table(name = "t_question_point")
+@Data
+public class TQuestionPoint extends BaseBean {
+    //试题关联知识点表
+    @Id
+    private String qpid;
+
+    //试题id
+    private String questionid;
+
+    //知识点id
+    private String pointid;
+
+    //创建人id
+    private Integer createid;
+
+    //创建时间
+    private Integer createtime;
+
+    //学校id
+    private Integer schoolid;
+
+    //同步时间戳
+    private Integer timeunix;
+}

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

@@ -0,0 +1,120 @@
+package com.xhkjedu.sapi.model.subjectbook;
+
+import com.xhkjedu.sapi.model.BaseBean;
+import lombok.Data;
+
+import javax.persistence.Id;
+import javax.persistence.Table;
+import javax.persistence.Transient;
+import java.util.List;
+
+@Table(name = "t_resource")
+@Data
+public class TResource extends BaseBean {
+    //资源表
+    @Id
+    private String resourceid;
+
+    //资源名称
+    private String resourcename;
+
+    @Transient
+    //教材关系表id
+    private String lsbid;
+
+    @Transient
+    //章节id
+    private String directorid;
+
+    //阅读次数
+    private Integer readcount;
+
+    //下载次数
+    private Integer downcount;
+
+    //资源分类1word,2ppt,3pdf,4图片,5视频,6音频,7压缩包,10其他
+    private Integer resourceclass;
+
+    //资源类型1习题2教案3课件4素材5视频6学案7压缩包10其他
+    private Integer resourcetype;
+
+    //资源级别1校本2个人(备课)3导学案4视频库
+    private Integer level;
+
+    //资源归属1平台1区平台3学校4个人(搜索时5我的收藏 6我的上传)
+    private Integer belong;
+
+    //资源等级：1普通2精品3特供4第三方
+    private Integer resourcegrade;
+
+    //来源
+    private String source;
+
+    //资源所属年份
+    private Integer year;
+
+    //地区
+    private String region;
+
+    //学校
+    private String schoolname;
+
+    //同步时间戳
+    private Integer timeunix;
+
+    //是否转换0未转换1已转换2转换失败3加密
+    private Integer converted;
+
+    //转换失败原因
+    private String convertmsg;
+
+    //转换后的pdf文件地址
+    private String pdfurl;
+
+    //资源地址
+    private String resourceurl;
+
+    //封面图地址
+    private String resourcecover;
+
+    //资源状态1正常10删除
+    private Integer resourcestate;
+
+    //文件后缀
+    private String suffix;
+
+    //mp4文件编码：mpeg4网页端不能播放，h264网页端能播放
+    private String mp4code;
+
+    //文件大小
+    private Integer resourcesize;
+
+    //视频时长（秒）
+    private Integer duration;
+
+    //创建人id
+    private Integer createid;
+
+    //创建时间
+    private Integer createtime;
+
+    //学校id
+    private Integer schoolid;
+
+    //备注
+    private String comm;
+
+    //班级id
+    @Transient
+    private Integer classid;
+
+    //科目id
+    private String subjectid;
+
+    @Transient
+    //状态0全部1未查看1已查看
+    private Integer costtime;
+
+    @Transient
+    private List<TResourceDirector> directors;//资源教材章节
+}

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

@@ -0,0 +1,37 @@
+package com.xhkjedu.sapi.model.subjectbook;
+
+import com.xhkjedu.sapi.model.BaseBean;
+import lombok.Data;
+
+import javax.persistence.Id;
+import javax.persistence.Table;
+
+/**
+ * @ClassName TResourceDirector
+ * Description TODO 资源教材章节关联表
+ * Author WN
+ * Date 2021/1/4 16:38
+ **/
+@Table(name = "t_resource_director")
+@Data
+public class TResourceDirector extends BaseBean {
+    @Id
+    private String rdid;//资源教材章节表id
+
+    private String resourceid;//资源id
+
+    private String lsbid;//教材id
+
+    //章节id
+    private String directorid;
+
+    //创建人id
+    private Integer createid;
+
+    //创建时间
+    private Integer createtime;
+
+    //同步时间戳
+    private Integer timeunix;
+
+}

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

@@ -0,0 +1,39 @@
+package com.xhkjedu.sapi.model.subjectbook;
+
+import com.xhkjedu.sapi.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;
+}

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

@@ -0,0 +1,57 @@
+package com.xhkjedu.sapi.model.subjectbook;
+
+import com.xhkjedu.sapi.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;
+}

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

@@ -0,0 +1,42 @@
+package com.xhkjedu.sapi.model.subjectbook;
+
+import com.xhkjedu.sapi.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;
+}

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

@@ -0,0 +1,36 @@
+package com.xhkjedu.sapi.model.subjectbook;
+
+import com.xhkjedu.sapi.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;
+}

sapi/src/main/java/com/xhkjedu/sapi/model/system/TAreazone.java

@@ -0,0 +1,39 @@
+package com.xhkjedu.sapi.model.system;
+
+import com.xhkjedu.sapi.model.BaseBean;
+import lombok.Data;
+
+import javax.persistence.Id;
+import javax.persistence.Table;
+
+@Table(name = "t_areazone")
+@Data
+public class TAreazone extends BaseBean {
+    @Id
+    //地区表主键id
+    private Integer areaid;
+
+    //地区名称
+    private String areaname;
+
+    //区域全名称
+    private String areaall;
+
+    //归属地区
+    private Integer areapid;
+
+    //地区编码
+    private String areacode;
+
+    //层级1省份层2市层3区、县层
+    private Integer level;
+
+    //对应领创地区id
+    private Integer lcregion;
+
+    //创建人
+    private Integer createid;
+
+    //创建时间
+    private Integer createtime;
+}

sapi/src/main/java/com/xhkjedu/sapi/model/system/TModule.java

@@ -0,0 +1,69 @@
+package com.xhkjedu.sapi.model.system;
+
+import com.xhkjedu.sapi.model.BaseBean;
+import lombok.Data;
+
+import javax.persistence.Id;
+import javax.persistence.Table;
+import java.util.ArrayList;
+import java.util.List;
+
+@Table(name = "t_module")
+@Data
+public class TModule extends BaseBean {
+    //模块表
+    @Id
+    private String moduleid;
+
+    //模块名称
+    private String modulename;
+
+    //模块简称
+    private String mabbrevname;
+
+    //模块地址
+    private String moduleurl;
+
+    //图标地址
+    private String moduleico;
+
+    //所属父模块id
+    private String modulepid;
+
+    private Integer moduletype;//模块归属1教师网页2学生网页3学生平板
+
+    //排序
+    private Integer morder;
+
+    //模块备注
+    private String comm;
+
+    //内外部应用1内容应用2外部应用
+    private Integer minout;
+
+    //模块分组或应用1分组2应用
+    private Integer mclass;
+
+    //级别1一级2二级
+    private Integer level;
+
+    //是否是默认分类0不是1是
+    private Integer mdefault;
+
+    //是否显示：1显示10不显示
+    private Integer display;
+
+    //默认模块表id
+    private String defaultid;
+
+    //创建人id
+    private Integer createid;
+
+    //创建时间
+    private Integer createtime;
+
+    //学校id
+    private Integer schoolid;
+
+    List<TModule> modulechilds = new ArrayList<>();
+}

sapi/src/main/java/com/xhkjedu/sapi/model/system/TModuledefault.java

@@ -0,0 +1,56 @@
+package com.xhkjedu.sapi.model.system;
+
+import com.xhkjedu.sapi.model.BaseBean;
+import lombok.Data;
+
+import javax.persistence.Id;
+import javax.persistence.Table;
+
+@Table(name = "t_moduledefault")
+@Data
+public class TModuledefault extends BaseBean {
+    @Id
+    //默认功能模块表
+    private String moduleid;
+
+    //模块名称
+    private String modulename;
+
+    //模块简称
+    private String mabbrevname;
+
+    //模块地址
+    private String moduleurl;
+
+    //图标地址
+    private String moduleico;
+
+    //所属父模块
+    private String modulepid;
+
+    private Integer moduletype;//模块归属1教师网页2学生网页3学生平板
+
+    //排序
+    private Integer morder;
+
+    //内外部应用1内部应用2外部应用
+    private Integer minout;
+
+    //模块分组或应用1分组2应用
+    private Integer mclass;
+
+    //级别1一级2二级
+    private Integer level;
+
+    //是否是默认分类0不是1是
+    private Integer mdefault;
+
+    //是否显示：1显示10不显示
+    private Integer display;
+
+    //模块备注
+    private String comm;
+
+    //创建时间
+    private Integer createtime;
+}

sapi/src/main/java/com/xhkjedu/sapi/model/system/TSchool.java

@@ -0,0 +1,67 @@
+package com.xhkjedu.sapi.model.system;
+
+import com.xhkjedu.sapi.model.BaseBean;
+import lombok.Data;
+
+import javax.persistence.Id;
+import javax.persistence.Table;
+import javax.persistence.Transient;
+
+@Table(name = "t_school")
+@Data
+public class TSchool extends BaseBean {
+    //学校表
+    @Id
+    private Integer schoolid;
+
+    //学校名称
+    private String schoolname;
+
+    //学校简称
+    private String shortname;
+
+    //学校状态1正常10删除
+    private Integer schoolstate;
+
+    //学校阶段1小学2初中3高中4大学
+    private Integer schoollevel;
+
+    //是否绑定硬件地址0不绑定1绑定
+    private Integer bindmac;
+
+    //当前年份
+    private Integer year;
+
+    //错误率%
+    private Integer errorrate;
+
+    //学校域名地址
+    private String schooldomain;
+
+    //直播授权数量
+    private Integer livenum;
+
+    //直播授权有效期
+    private Integer livetime;
+
+    //坐标数组
+    private String coordinate;
+
+    private Integer docklc;//是否对接领创0不对接1未对接2对接完成
+
+    private Integer usernum;//账号数量
+
+    //创建人
+    private Integer createid;
+
+    //创建时间
+    private Integer createtime;
+
+
+    @Transient
+    //管理员登录账号
+    private String loginname;
+
+    @Transient
+    private String cloudcode;//区域码
+}

sapi/src/main/java/com/xhkjedu/sapi/model/system/TSchoolStype.java

@@ -0,0 +1,37 @@
+package com.xhkjedu.sapi.model.system;
+
+import lombok.Data;
+
+import javax.persistence.Id;
+import javax.persistence.Table;
+import javax.persistence.Transient;
+
+@Table(name = "t_school_stype")
+@Data
+public class TSchoolStype {
+    @Id
+    //学校样式表
+    private Integer stid;
+
+    //学校域名
+    private String schooldomain;
+
+    //图片分类：theme主色调loginname登录页名称loginbg登录也背景mainname主页面名称mainlogo主页面logo
+    private String schooltype;
+
+    //图片地址
+    private String stypeaddr;
+
+    //创建人id
+    private Integer createid;
+
+    //创建时间
+    private Integer createtime;
+
+    //学校id
+    private Integer schoolid;
+
+    @Transient
+    //学校名称
+    private String schoolname;
+}

sapi/src/main/java/com/xhkjedu/sapi/model/system/TSyserror.java

@@ -0,0 +1,24 @@
+package com.xhkjedu.sapi.model.system;
+
+import com.xhkjedu.sapi.model.BaseBean;
+import lombok.Data;
+
+import javax.persistence.Id;
+import javax.persistence.Table;
+
+@Table(name = "t_syserror")
+@Data
+public class TSyserror extends BaseBean {
+    @Id
+    //系统错误主键id
+    private Integer errid;
+
+    //设备web android pc
+    private String device;
+
+    //创建时间
+    private Integer createtime;
+
+    //错误信息
+    private String errmsg;
+}

sapi/src/main/java/com/xhkjedu/sapi/model/system/TUserLog.java

@@ -0,0 +1,53 @@
+package com.xhkjedu.sapi.model.system;
+
+import com.xhkjedu.sapi.model.BaseBean;
+import lombok.Data;
+
+import javax.persistence.Id;
+import javax.persistence.Table;
+import javax.persistence.Transient;
+
+@Table(name = "t_user_log")
+@Data
+public class TUserLog extends BaseBean {
+    //登录日志主键id
+    @Id
+    private Integer ulid;
+
+    //用户id
+    private Integer userid;
+
+    //姓名
+    private String username;
+
+    //登录名
+    private String loginname;
+
+    //登录状态1成功2失败
+    private Integer loginstate;
+
+    //登录时间
+    private Integer logtime;
+
+    //登录ip
+    private String logip;
+
+    //登录地址
+    private String logaddress;
+
+    //登录终端设备
+    private String ultype;
+
+    //版本号
+    private String versionnum;
+
+    //备注
+    private String logtxt;
+
+    //学校id
+    private Integer schoolid;
+
+    @Transient
+    //截止时间
+    private Integer endtime;
+}

sapi/src/main/java/com/xhkjedu/sapi/service/cloud/CloudService.java

@@ -0,0 +1,40 @@
+package com.xhkjedu.sapi.service.cloud;
+
+import com.xhkjedu.sapi.mapper.cloud.CloudMapper;
+import com.xhkjedu.sapi.model.cloud.TCloud;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+import java.util.List;
+
+/**
+ * @author ywx
+ * @classname CloudService
+ * @description
+ * @date 2021/6/30 14:49
+ **/
+@Service
+public class CloudService {
+    @Resource
+    private CloudMapper cloudMapper;
+
+    //详情
+    public TCloud findById(){
+        return cloudMapper.getCloud();
+    }
+
+    //修改主题
+    public void updateTheme(TCloud cloud) {
+        cloudMapper.updateTheme(cloud);
+    }
+
+    //修改基础信息
+    public void updateInfo(TCloud cloud){
+        cloudMapper.updateInfo(cloud);
+    }
+
+    //区域学段列表
+    public List<Integer> listLevel() {
+        return cloudMapper.listLevel();
+    }
+}

sapi/src/main/java/com/xhkjedu/sapi/service/cloud/CloudSyncService.java

@@ -0,0 +1,268 @@
+package com.xhkjedu.sapi.service.cloud;
+
+import com.alibaba.fastjson.JSON;
+import com.xhkjedu.sapi.config.ConfigKey;
+import com.xhkjedu.sapi.mapper.cloud.CloudSyncDetailMapper;
+import com.xhkjedu.sapi.mapper.cloud.CloudSyncMapper;
+import com.xhkjedu.sapi.model.cloud.TCloudSync;
+import com.xhkjedu.sapi.model.cloud.TCloudSyncDetail;
+import com.xhkjedu.sapi.utils.ApiUtil;
+import com.xhkjedu.sapi.utils.CopyURL;
+import com.xhkjedu.utils.N_Utils;
+import com.xhkjedu.vo.ResultVo;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Service;
+import org.springframework.util.LinkedMultiValueMap;
+import org.springframework.util.MultiValueMap;
+
+import javax.annotation.Resource;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * @author ywx
+ * @classname CloudSyncService
+ * @description 
+ * @date 2021/5/6 15:48
+ **/
+@Service
+@Slf4j
+public class CloudSyncService {
+    @Resource
+    private CloudSyncMapper cloudSyncMapper;
+    @Resource
+    private CloudSyncDetailMapper cloudSyncDetailMapper;
+
+    //列表
+    public List<Map> findAll(TCloudSync sync) {
+        return cloudSyncMapper.findAll(sync);
+    }
+
+    //添加
+    public void save(TCloudSync model) {
+        model.setCreatetime(N_Utils.getSecondTimestamp());
+        cloudSyncMapper.insertSelective(model);
+    }
+
+    //同步基础信息、试题、资源
+    public synchronized ResultVo sync(TCloudSync sync) {
+        TCloudSync lastSync = cloudSyncMapper.getLastSync();
+        Integer csid;
+        List<TCloudSyncDetail> details = null;
+        if (lastSync == null || lastSync.getSyncstate() == 1 || lastSync.getSynctask() == 0) {
+            String cloudcode = sync.getCloudcode();
+            Integer begintime = lastSync==null?null:lastSync.getEndtime();
+            String param = "{\"cloudcode\": \""+cloudcode+"\",\"begintime\":"+begintime+"}";
+            //同步任务
+            ResultVo vo = getResultVo("csync/g",param);
+            if (vo.getCode() != 0) return vo;
+            TCloudSync cloudSync = JSON.parseObject(JSON.toJSONString(vo.getObj()),TCloudSync.class);
+            csid = cloudSync.getCsid();
+            cloudSync.setCreateid(sync.getCreateid());
+            if (cloudSync.getSynctask() == 1) {
+                cloudSync.setStarttime(N_Utils.getSecondTimestamp());
+            }
+            cloudSyncMapper.save(cloudSync);
+
+            //同步任务详情
+            details = cloudSync.getSyncdetails();
+            if (N_Utils.isListNotEmpty(details)) {
+                cloudSyncDetailMapper.batchSave(details,csid,sync.getCreateid());
+            }
+        } else {
+            csid = lastSync.getCsid();
+            if (lastSync.getSynctask() == 1) {
+                details = cloudSyncDetailMapper.listByCsId(csid);
+            }
+        }
+
+        ResultVo vo = syncDetail(details, csid, sync.getSyncnum());
+        if (vo != null) return vo;
+
+        return new ResultVo(0,"同步成功");
+    }
+
+    //调用云平台接口
+    private ResultVo getResultVo(String url, String param) {
+        String result = N_Utils.sendJsonPost(ConfigKey.cloudapi + url, param);
+        ResultVo vo = JSON.parseObject(result, ResultVo.class);
+        return vo;
+    }
+
+    //同步任务详情
+    private ResultVo syncDetail(List<TCloudSyncDetail> details, Integer csid, Integer syncnum) {
+        if (N_Utils.isListEmpty(details)) return null;
+        for (TCloudSyncDetail detail : details) {
+            detail.setSyncnum(syncnum);
+            Integer realnum = detail.getRealnum();
+            ResultVo vo = getResultVo("csync/s",JSON.toJSONString(detail));//获取同步数据
+            if (vo.getCode() != 0) return vo;
+            String endid = detail.getEndid();
+            List<Map> list = (List<Map>) vo.getObj();
+            realnum += list.size();
+            String synctable = detail.getSynctable();
+            if (synctable.equals("t_director")) {
+                Integer fkExisted = cloudSyncMapper.getFkExisted("fk_directorpid", ConfigKey.dbname);
+                if (!N_Utils.isEmptyInteger(fkExisted)) {
+                    cloudSyncMapper.delDirectorFk();//删除章节外键
+                }
+            } else if (synctable.equals("t_point")) {
+                Integer fkExisted = cloudSyncMapper.getFkExisted("fk_pointpid", ConfigKey.dbname);
+                if (!N_Utils.isEmptyInteger(fkExisted)) {
+                    cloudSyncMapper.delPointFk();//删除知识点外键
+                }
+            }
+            String handleid = syncList(detail, list);
+            while (handleid != null && !endid.equals(handleid)) {
+                detail.setHandleid(handleid);
+                detail.setRealnum(realnum);
+                vo = getResultVo("csync/s",JSON.toJSONString(detail));//获取同步数据
+                if (vo.getCode() != 0) return vo;
+                list = (List<Map>) vo.getObj();
+                realnum += list.size();
+                handleid = syncList(detail,list);
+            }
+            if (synctable.equals("t_director")) {
+                cloudSyncMapper.addDirectorFk();//添加章节外键
+            } else if (synctable.equals("t_point")) {
+                cloudSyncMapper.addPointFk();//添加知识点外键
+            }
+        }
+
+        Integer num = cloudSyncDetailMapper.countNoEndByCsId(csid);//获取未执行完成的任务详情数量
+        if (num == 0) cloudSyncMapper.updateState(csid, 1);
+        return null;
+    }
+
+    //同步任务详情数据
+    private String syncList(TCloudSyncDetail detail, List<Map> list) {
+        String synctable = detail.getSynctable();
+        String handleid = null;
+        int syncnum = list.size();
+        List<String> files = new ArrayList<>();
+        try {
+            if (synctable.equals("t_subject")) {//同步科目
+                handleid = (String) list.get(list.size()-1).get("subjectid");
+                cloudSyncMapper.syncSubject(list);
+            } else if (synctable.equals("t_version")) {//同步版本
+                handleid = (String) list.get(list.size()-1).get("versionid");
+                cloudSyncMapper.syncVersion(list);
+            } else if (synctable.equals("t_subject_book")) {//同步教材
+                handleid = (String) list.get(list.size()-1).get("lsbid");
+                for (Map sb : list) {
+                    String coverpath = (String) sb.get("coverpath");
+                    files.add(coverpath);//教材封面图
+                }
+                cloudSyncMapper.syncSubjectBook(list);
+            } else if (synctable.equals("t_subject_questiontype")) {//同步题型
+                handleid = (String) list.get(list.size()-1).get("qtypeid");
+                cloudSyncMapper.syncSubjectQuestionType(list);
+            } else if (synctable.equals("t_director")) {//同步章节
+                handleid = (String) list.get(list.size()-1).get("directorid");
+                cloudSyncMapper.syncDirector(list);
+            } else if (synctable.equals("t_point")) {//同步知识点
+                handleid = (String) list.get(list.size()-1).get("pointid");
+                cloudSyncMapper.syncPoint(list);
+            } else if (synctable.equals("t_question")) {//同步试题
+                handleid = (String) list.get(list.size()-1).get("questionid");
+                for (Map question : list) {
+                    Integer ctype = (Integer) question.get("ctype");
+                    String qstem = (String) question.get("qstem");
+                    String questionid = (String) question.get("questionid");
+                    question.put("qstate",1);
+                    try {
+                        files.addAll(CopyURL.getImgSrc2(qstem));//题干图片
+                        question.put("qstem",qstem.replaceAll(ConfigKey.oldshowurl,ConfigKey.showurl));
+                        if (ctype == 1 || ctype == 2) {//单选题、多选题
+                            String qoption = (String) question.get("qoption");
+                            files.addAll(CopyURL.getImgSrc2(qoption));//选项图片
+                            question.put("qoption",qoption.replaceAll(ConfigKey.oldshowurl,ConfigKey.showurl));
+                        }
+                        if (ctype == 3) {//主观题
+                            String qanswer = (String) question.get("qanswer");
+                            files.addAll(CopyURL.getImgSrc2(qanswer));//答案图片
+                            question.put("qanswer",qanswer.replaceAll(ConfigKey.oldshowurl,ConfigKey.showurl));
+                        }
+                        String qanalyze = (String) question.get("qanalyze");
+                        files.addAll(CopyURL.getImgSrc2(qanalyze));//解析图片
+                        question.put("qanalyze",qanalyze.replaceAll(ConfigKey.oldshowurl,ConfigKey.showurl));
+                        cloudSyncMapper.syncQuestion(question);
+                        try {
+                            List<Map> points = (List<Map>) question.get("pointlist");
+                            if (N_Utils.isListNotEmpty(points)) cloudSyncMapper.syncQuestionPoint(points);
+                        } catch (Exception e) {
+                            log.error("同步【t_question_point "+questionid+"】失败",e.getMessage());
+                        }
+                        try {
+                            List<Map> directors = (List<Map>) question.get("dirlist");
+                            if (N_Utils.isListNotEmpty(directors)) cloudSyncMapper.syncQuestionDirector(directors);
+                        } catch (Exception e) {
+                            log.error("同步【t_question_director "+questionid+"】失败",e.getMessage());
+                        }
+                    } catch (Exception e) {
+                        syncnum--;
+                        log.error("同步【"+synctable+" "+questionid+"】失败",e.getMessage());
+                    }
+                }
+            } else if (synctable.equals("t_resource")) {//同步资源
+                handleid = (String) list.get(list.size()-1).get("resourceid");
+                for (Map resource : list) {
+                    String resourceid = (String) resource.get("resourceid");
+                    String resourceurl = (String) resource.get("resourceurl");
+                    String pdfurl = (String) resource.get("pdfurl");
+                    String resourcecover = (String) resource.get("resourcecover");
+                    resource.put("resourcestate",1);
+                    try {
+                        if (N_Utils.isNotEmpty(resourceurl)) {//资源文件
+                            files.add(resourceurl);
+                        }
+                        if (N_Utils.isNotEmpty(pdfurl)) {//pdf文件
+                            files.add(pdfurl);
+                        }
+                        if (N_Utils.isNotEmpty(resourcecover)) {//视频封面图
+                            files.add(resourcecover);
+                        }
+                        cloudSyncMapper.syncResource(resource);
+                        try {
+                            List<Map> directors = (List<Map>) resource.get("dirlist");
+                            if (N_Utils.isListNotEmpty(directors)) cloudSyncMapper.syncResourceDirector(directors);
+                        } catch (Exception e) {
+                            log.error("同步【t_resource_director "+resourceid+"】失败",e.getMessage());
+                        }
+                    } catch (Exception e) {
+                        syncnum--;
+                        log.error("同步【"+synctable+" "+resourceid+"】失败",e.getMessage());
+                    }
+                }
+            }
+
+        } catch (Exception e) {
+            syncnum--;
+            log.error("同步【"+synctable+"】失败",e.getMessage());
+        }
+
+        if (N_Utils.isListNotEmpty(files)) {//复制文件
+            MultiValueMap<String, String> map = new LinkedMultiValueMap<>();
+            map.add("filepaths",JSON.toJSONString(files));
+            String apiUrl = ConfigKey.fileapi + "dn/down_files";
+            ApiUtil.sendFormData(apiUrl,map);
+        }
+
+        //更新已同步数量
+        if (N_Utils.isEmpty(detail.getHandleid())) {
+            detail.setStarttime(N_Utils.getSecondTimestamp());
+        }
+        if (detail.getEndid().equals(handleid)) {
+            detail.setStoptime(N_Utils.getSecondTimestamp());
+        }
+        detail.setRealnum(syncnum);
+        detail.setHandleid(handleid);
+        cloudSyncDetailMapper.updateRealNum(detail);
+        return handleid;
+    }
+
+    public TCloudSync getCloudInfo() {
+        return cloudSyncMapper.getCloudInfo();
+    }
+}

sapi/src/main/java/com/xhkjedu/sapi/service/system/AreazoneService.java

@@ -0,0 +1,65 @@
+package com.xhkjedu.sapi.service.system;
+
+import com.xhkjedu.sapi.mapper.system.AreazoneMapper;
+import com.xhkjedu.sapi.model.system.TAreazone;
+import com.xhkjedu.utils.N_Utils;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * @author ywx
+ * @classname AreazoneService
+ * @description 
+ * @date 2021/4/8 9:28
+ **/
+@Service
+public class AreazoneService {
+    @Resource
+    private AreazoneMapper areazoneMapper;
+
+    //添加
+    public void save(TAreazone model) {
+        model.setCreatetime(N_Utils.getSecondTimestamp());
+        areazoneMapper.insertSelective(model);
+    }
+
+    //删除
+    public Integer deleteById(Integer id) {
+        return areazoneMapper.deleteByPrimaryKey(id);
+    }
+
+    //修改
+    public Integer update(TAreazone model) {
+        TAreazone areazone = findById(model.getAreaid());
+        if (!areazone.getAreaname().equals(model.getAreaname())) {//省份、市地区名称修改
+            Integer level = model.getLevel();
+            Integer areaid = model.getAreaid();
+            String areaall = model.getAreaall();
+            if (level == 1) {//省份地区名称修改
+                areazoneMapper.updateAreaAll(areaid, areaall);//修改市地区全名称
+                areazoneMapper.updateAreaAll2(areaid, areaall);//修改区、县地区全名称
+            } else if (level == 2) {//市地区名称修改
+                areazoneMapper.updateAreaAll(areaid, areaall);//修改区、县地区全名称
+            }
+        }
+        return areazoneMapper.updateByPrimaryKeySelective(model);
+    }
+
+    //获取详情
+    public TAreazone findById(Integer id) {
+        return areazoneMapper.selectByPrimaryKey(id);
+    }
+
+    //获取地区列表
+    public List <Map> listAll() {
+        return areazoneMapper.listAll();
+    }
+
+    //获取地区选择列表
+    public List<Map> listForSel() {
+        return areazoneMapper.listForSel();
+    }
+}

sapi/src/main/java/com/xhkjedu/sapi/service/system/ModuleService.java

@@ -0,0 +1,185 @@
+package com.xhkjedu.sapi.service.system;
+
+import com.xhkjedu.sapi.mapper.system.ModuleMapper;
+import com.xhkjedu.sapi.model.system.TModule;
+import com.xhkjedu.sapi.utils.ApiUtil;
+import com.xhkjedu.utils.N_Utils;
+import com.xhkjedu.sapi.vo.system.ModuleSelVo;
+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 ModuleService
+ * Description TODO
+ * Author WN
+ * Date 2020/6/11 16:16
+ **/
+@Service
+public class ModuleService {
+    @Autowired
+    private ModuleMapper moduleMapper;
+
+    /**
+     *功能描述 添加
+     * @author WN
+     * @date 2020/6/11
+     * @param  * @param module
+     * @return java.lang.Integer
+     */
+    public Integer add(TModule module){
+        String id = ApiUtil.getId();
+        module.setModuleid(id);
+        module.setCreatetime(N_Utils.getSecondTimestamp());
+        return moduleMapper.insertSelective(module);
+    }
+
+    /**
+     * 添加并返回主键
+     * @Param [module]
+     * @Author ywx
+     * @Date 2020/7/2 11:20
+     * @return java.lang.Integer
+     **/
+    public String addAndReturnKey(TModule module){
+        String id = ApiUtil.getId();
+        module.setModuleid(id);
+        module.setCreatetime(N_Utils.getSecondTimestamp());
+        moduleMapper.insertSelective(module);
+        return id;
+    }
+
+    /**
+     *功能描述 修改
+     * @author WN
+     * @date 2020/6/11
+     * @param  * @param module
+     * @return java.lang.Integer
+     */
+    public Integer update(TModule module){
+        return moduleMapper.updateByPrimaryKeySelective(module);
+    }
+
+    /**
+     *功能描述  删除
+     * @author WN
+     * @date 2020/6/11
+     * @param  * @param moduleid
+     * @return java.lang.Integer
+     */
+    public Integer del(String moduleid){
+        return moduleMapper.deleteByPrimaryKey(moduleid);
+    }
+
+
+    /**
+     *功能描述 所有模块
+     * @author WN
+     * @date 2020/6/11
+     * @param  * @param schoolid
+     * @param display
+     * @return java.util.List<com.xhkjedu.model.system.TModule>
+     */
+    public List<TModule> listModules(Integer schoolid, Integer moduletype, Integer display){
+//        return moduleMapper.listModules(schoolid);
+        List<TModule> modules = new ArrayList<>();
+        List<TModule> lst = listModulesTree(schoolid,moduletype, display);
+        lst.forEach(m->{
+            List<TModule> twomodules = m.getModulechilds();
+            m.setModulechilds(null);
+            modules.add(m);
+            twomodules.forEach(m2->{
+                List<TModule> threemodules = m2.getModulechilds();
+                m2.setModulechilds(null);
+                modules.add(m2);
+                threemodules.forEach(m3->{
+                    modules.add(m3);
+                });
+            });
+        });
+        return modules;
+    }
+
+    //获取第一层模块
+    public List<ModuleSelVo> listLevelModule(Integer schoolid,Integer moduletype){
+        return moduleMapper.listLevelModule(schoolid,moduletype);
+    }
+
+    /**
+     *功能描述  所有模块树形结构
+     * @author WN
+     * @date 2020/6/15
+     * @param  * @param schoolid
+     * @param display
+     * @return java.util.List<com.xhkjedu.model.system.TModule>
+     */
+    public List<TModule> listModulesTree(Integer schoolid, Integer moduletype, Integer display){
+        List<TModule> lst = moduleMapper.listModules(schoolid,moduletype, display);
+
+        List<TModule> rtnlst = new ArrayList<>();
+
+        for(TModule m : lst){
+            if(m.getLevel()==1){
+                rtnlst.add(m);
+            }
+        }
+
+        for(TModule m : rtnlst){
+            List<TModule> childs = m.getModulechilds();
+            for(TModule mc: lst){
+                if(m.getModuleid().equals(mc.getModulepid())){
+                    if(!isExistModule(childs,m.getModuleid())){
+                        childs.add(mc);
+                    }
+                }
+            }
+        }
+
+        return rtnlst;
+    }
+
+    //判断集合中是否存在模块
+    private boolean isExistModule(List<TModule> lst,String moduleid){
+        for(TModule m: lst){
+            if(m.getModuleid().equals(moduleid)){
+                return true;
+            }
+        }
+        return false;
+    }
+
+    /**
+     * 模块上移
+     * @Param [modules]
+     * @Author ywx
+     * @Date 2020/8/31 16:24
+     * @return void
+     **/
+    public void moveUp(List<TModule> modules) {
+        for (int i = 0; i < modules.size(); i++) {
+            TModule module = modules.get(i);
+            if (module.getModulepid() == null){
+                return;
+            }
+            if (i == 0) {
+                if (module.getMorder() == 1){
+                    return;
+                }
+                moduleMapper.updateOrder(module);
+                Integer morder = modules.get(1).getMorder();
+                module.setMorder(morder);
+            } else {
+                module.setMorder(module.getMorder()+1);
+            }
+        }
+        moduleMapper.moveUp(modules);
+    }
+
+    //模块选择列表
+    public List<Map> listForSel2(Integer schoolid, Integer moduletype) {
+        return moduleMapper.listForSel2(schoolid, moduletype);
+    }
+}

sapi/src/main/java/com/xhkjedu/sapi/service/system/ModuledefaultService.java

@@ -0,0 +1,177 @@
+package com.xhkjedu.sapi.service.system;
+
+import com.xhkjedu.sapi.mapper.system.ModuleMapper;
+import com.xhkjedu.sapi.mapper.system.ModuledefaultMapper;
+import com.xhkjedu.sapi.model.system.TModule;
+import com.xhkjedu.sapi.model.system.TModuledefault;
+import com.xhkjedu.sapi.utils.ApiUtil;
+import com.xhkjedu.utils.N_Utils;
+import com.xhkjedu.vo.ResultVo;
+import com.xhkjedu.sapi.vo.system.ModuleSelVo;
+import org.springframework.beans.BeanUtils;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import javax.annotation.Resource;
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * @author ywx
+ * @classname ModuledefaultService
+ * @description 
+ * @date 2020/7/2 10:36
+ **/
+@Service
+public class ModuledefaultService {
+    @Resource
+    private ModuledefaultMapper moduledefaultMapper;
+    @Resource
+    private ModuleMapper moduleMapper;
+
+    //添加
+    @Transactional(rollbackFor = Exception.class)
+    public ResultVo save(TModuledefault model) {
+        if (model.getLevel() != 1) {
+            if (N_Utils.isNotEmpty(model.getModuleurl())) {
+                Integer num = moduledefaultMapper.countByUrl(model.getModuleurl(), model.getModuletype());
+                if (num != 0) {
+                    return new ResultVo(1, "该模块地址已存在，禁止添加");
+                }
+            }
+        }
+
+        String id = ApiUtil.getId();
+        model.setModuleid(id);
+        model.setCreatetime(N_Utils.getSecondTimestamp());
+        moduledefaultMapper.insertSelective(model);
+
+        //获取学校id集合
+        List<Integer> schoolids = moduledefaultMapper.listSchoolId();
+        for (Integer schoolid : schoolids) {
+            TModule m = new TModule();
+            BeanUtils.copyProperties(model,m);
+            m.setModuleid(ApiUtil.getId());
+            m.setDefaultid(id);
+            m.setSchoolid(schoolid);
+            String modulepid = model.getModulepid();
+            if (N_Utils.isNotEmpty(modulepid)) {
+                TModuledefault mp = findById(modulepid);
+                String moduleid = moduledefaultMapper.getModuleIdByDefaultId(modulepid, schoolid, mp.getModuletype());
+                m.setModulepid(moduleid);
+            }
+            moduleMapper.insertSelective(m);
+        }
+
+        return new ResultVo(0, "保存成功",id);
+    }
+
+    //删除
+    @Transactional(rollbackFor = Exception.class)
+    public Integer deleteById(String id) {
+        moduleMapper.deleteByDefaultId(id);
+        return moduledefaultMapper.deleteByPrimaryKey(id);
+    }
+
+    //修改
+    @Transactional(rollbackFor = Exception.class)
+    public void update(TModuledefault model) {
+        moduledefaultMapper.updateByPrimaryKeySelective(model);//更新默认模块信息
+        moduledefaultMapper.updateByDefaultId(model.getModuleid());//更新学校模块信息
+    }
+
+    //获取详情
+    public TModuledefault findById(String id) {
+        return moduledefaultMapper.selectByPrimaryKey(id);
+    }
+
+    //获取列表
+    public List <TModuledefault> listAll(Integer moduletype, Integer display) {
+        List<TModuledefault> modules = new ArrayList<>();
+        List<TModule> lst = listModulesTree(moduletype,display);
+        lst.forEach(m->{
+            List<TModule> twomodules = m.getModulechilds();
+            m.setModulechilds(null);
+            TModuledefault d = copyProperties(m);
+            modules.add(d);
+            twomodules.forEach(m2->{
+                List<TModule> threemodules = m2.getModulechilds();
+                m2.setModulechilds(null);
+                TModuledefault d2 = copyProperties(m2);
+                modules.add(d2);
+                threemodules.forEach(m3->{
+                    TModuledefault d3 = copyProperties(m3);
+                    modules.add(d3);
+                });
+            });
+        });
+        return modules;
+    }
+
+    /**
+     * 复制模块信息
+     * @Param [m]
+     * @Author ywx
+     * @Date 2020/7/2 15:16
+     * @return com.xhkjedu.model.system.TModuledefault
+     **/
+    private TModuledefault copyProperties(TModule m) {
+        TModuledefault moduledefault = new TModuledefault();
+        moduledefault.setModuleid(m.getModuleid());
+        moduledefault.setModulename(m.getModulename());
+        moduledefault.setMabbrevname(m.getMabbrevname());
+        moduledefault.setModuleurl(m.getModuleurl());
+        moduledefault.setModuleico(m.getModuleico());
+        moduledefault.setModulepid(m.getModulepid());
+        moduledefault.setMorder(m.getMorder());
+        moduledefault.setMinout(m.getMinout());
+        moduledefault.setMclass(m.getMclass());
+        moduledefault.setLevel(m.getLevel());
+        moduledefault.setComm(m.getComm());
+        moduledefault.setCreatetime(m.getCreatetime());
+        moduledefault.setMdefault(m.getMdefault());
+        moduledefault.setModuletype(m.getModuletype());
+        moduledefault.setDisplay(m.getDisplay());
+        return moduledefault;
+    }
+
+    public List<TModule> listModulesTree(Integer moduletype, Integer display){
+        List<TModule> lst = moduledefaultMapper.listModules(moduletype,display);
+
+        List<TModule> rtnlst = new ArrayList<>();
+
+        for(TModule m : lst){
+            if(m.getLevel()==1){
+                rtnlst.add(m);
+            }
+        }
+
+        for(TModule m : rtnlst){
+            List<TModule> childs = m.getModulechilds();
+            for(TModule mc: lst){
+                if(m.getModuleid().equals(mc.getModulepid())){
+                    if(!isExistModule(childs,m.getModuleid())){
+                        childs.add(mc);
+                    }
+                }
+            }
+        }
+
+        return rtnlst;
+    }
+
+    //判断集合中是否存在模块
+    private boolean isExistModule(List<TModule> lst,String moduleid){
+        for(TModule m: lst){
+            if(m.getModuleid().equals(moduleid)){
+                return true;
+            }
+        }
+        return false;
+    }
+
+    //首层模块
+    public List<ModuleSelVo> listLevelModule(Integer moduletype) {
+        return moduledefaultMapper.listLevelModule(moduletype);
+    }
+}

sapi/src/main/java/com/xhkjedu/sapi/service/system/SchoolService.java

@@ -0,0 +1,403 @@
+package com.xhkjedu.sapi.service.system;
+
+import com.xhkjedu.sapi.mapper.system.SchoolMapper;
+import com.xhkjedu.sapi.model.system.TSchool;
+import com.xhkjedu.utils.MD5;
+import com.xhkjedu.utils.N_Utils;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.dao.DuplicateKeyException;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+import org.springframework.transaction.interceptor.TransactionAspectSupport;
+
+import javax.annotation.Resource;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * @author ywx
+ * @classname TSchoolService
+ * @description 
+ * @date 2020/6/2 15:07
+ **/
+@Service
+@Slf4j
+public class SchoolService {
+    @Resource
+    private SchoolMapper schoolMapper;
+    @Resource
+    private ModuledefaultService moduledefaultService;
+    @Resource
+    private ModuleService moduleService;
+   /* @Resource
+    private ClassMapper classMapper;
+    @Resource
+    private ClassStudentMapper classStudentMapper;
+    @Resource
+    private ClassTeacherMapper classTeacherMapper;
+    @Resource
+    private GroupMapper groupMapper;
+    @Resource
+    private GroupStudentMapper groupStudentMapper;
+    @Resource
+    private UserMapper userMapper;
+    @Autowired
+    private RoleMapper roleMapper;
+    @Autowired
+    private RoleModuleMapper roleModuleMapper;
+    @Autowired
+    private UserRoleMapper userRoleMapper;*/
+
+    //添加
+    @Transactional(rollbackFor = Exception.class)
+    public Integer save(TSchool model) throws Exception {
+        //添加学校信息
+        model.setSchoolstate(1);
+        model.setCreatetime(N_Utils.getSecondTimestamp());
+        Integer schoolid = null;
+        try {
+            schoolMapper.insertUseGeneratedKeys(model);
+            schoolid = model.getId();
+
+           /* //添加管理员信息
+            Integer userid = saveUser(model, schoolid);
+
+            //添加角色信息
+            Integer roleid = saveRole(schoolid, userid);
+
+            //添加用户角色
+            saveUserRole(userid, roleid);
+
+            //添加模块信息
+            List<TRoleModule> roleModules = new ArrayList<>();
+            List <TModule> modules = moduledefaultService.listModulesTree(null, null);//给学校网页复制模块
+            for (TModule module : modules) {
+                saveModuleSetRoleModule(schoolid, userid, roleid, roleModules, module);
+            }
+
+            //添加角色模块
+            roleModuleMapper.insertList(roleModules);*/
+        } catch (DuplicateKeyException e) {
+            log.error("添加学校失败",e.getMessage());
+            TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
+            throw new Exception("该管理员账号已存在");
+        } catch (Exception e) {
+            log.error("添加学校失败",e.getMessage());
+            TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
+            throw new Exception("添加学校失败");
+        }
+
+        return schoolid;
+    }
+
+    /**
+     * 添加用户角色
+     * @Param [userid, roleid]
+     * @Author ywx
+     * @Date 2020/7/2 11:52
+     * @return java.lang.Integer
+     **/
+   /* private Integer saveUserRole(Integer userid, Integer roleid) {
+        TUserRole userRole = new TUserRole();
+        userRole.setUserid(userid);
+        userRole.setRoleid(roleid);
+        userRole.setCreateid(userid);
+        userRole.setCreatetime(N_Utils.getSecondTimestamp());
+        userRoleMapper.insertUseGeneratedKeys(userRole);
+        return userRole.getId();
+    }*/
+
+    /**
+     * 添加角色信息
+     * @Param [schoolid, userid]
+     * @Author ywx
+     * @Date 2020/7/2 11:51
+     * @return java.lang.Integer
+     **/
+   /* private Integer saveRole(Integer schoolid, Integer userid) {
+        TRole role = new TRole();
+        role.setRolename("管理员");
+        role.setComm("拥有高权限");
+        role.setCreateid(userid);
+        role.setCreatetime(N_Utils.getSecondTimestamp());
+        role.setSchoolid(schoolid);
+        roleMapper.insertUseGeneratedKeys(role);
+        return role.getId();
+    }*/
+
+    /**
+     * 添加管理员信息
+     * @Param [model, schoolid]
+     * @Author ywx
+     * @Date 2020/7/2 11:49
+     * @return java.lang.Integer
+     **/
+   /* private Integer saveUser(TSchool model, Integer schoolid) {
+        TUser user = new TUser();
+        user.setLoginname(model.getLoginname());
+        user.setUsername("管理员");
+        user.setUsersex(1);
+        MD5 m = new MD5();
+        String loginpwd = m.getMD5ofStr(m.getMD5ofStr(m.getMD5ofStr("123456")));
+        user.setLoginpwd(loginpwd);
+        user.setUsertype(0);
+        user.setUserstate(1);
+        user.setCreateid(model.getCreateid());
+        user.setCreatetime(N_Utils.getSecondTimestamp());
+        user.setSchoolid(schoolid);
+        userMapper.insertUseGeneratedKeys(user);
+        return user.getId();
+    }*/
+
+    /**
+     * 保存子模块信息并设置角色模块信息
+     * @Param [schoolid, userid, roleid, roleModules, module]
+     * @Author ywx
+     * @Date 2020/7/2 11:47
+     * @return void
+     **/
+   /* private void saveModuleSetRoleModule(Integer schoolid, Integer userid, Integer roleid, List<TRoleModule> roleModules, TModule module) {
+        module.setCreateid(userid);
+        module.setCreatetime(N_Utils.getSecondTimestamp());
+        module.setSchoolid(schoolid);
+        module.setDefaultid(module.getModuleid());
+        String moduleid = moduleService.addAndReturnKey(module);
+        module.setModuleid(moduleid);
+        saveModuleChild(schoolid, userid, module, roleModules, roleid);
+
+        if (module.getModuletype() == 1) {
+            //角色模块信息
+            TRoleModule roleModule = new TRoleModule();
+            roleModule.setRoleid(roleid);
+            roleModule.setModuleid(moduleid);
+            roleModule.setCreateid(userid);
+            roleModule.setCreatetime(N_Utils.getSecondTimestamp());
+            roleModule.setSchoolid(schoolid);
+            roleModules.add(roleModule);
+        }
+    }*/
+
+    /**
+     * 保存子模块信息
+     * @Param [schoolid, userid, module, roleModules, roleid]
+     * @Author ywx
+     * @Date 2020/7/2 11:46
+     * @return void
+     **/
+   /* private void saveModuleChild(Integer schoolid, Integer userid, TModule module, List<TRoleModule> roleModules, Integer roleid) {
+        String moduleid = module.getModuleid();
+        List<TModule> modulechilds = module.getModulechilds();
+        if (N_Utils.isListNotEmpty(modulechilds)) {
+            for (TModule modulechild : modulechilds) {
+                modulechild.setModulepid(moduleid);
+                saveModuleSetRoleModule(schoolid, userid, roleid, roleModules, modulechild);
+            }
+        }
+    }*/
+
+    //删除
+    public Integer deleteById(Integer schoolid) {
+        //删除系统学校
+        return schoolMapper.deleteById(schoolid);
+    }
+
+    //修改
+    @Transactional(rollbackFor = Exception.class)
+    public Integer update(TSchool model) {
+        Integer bindmac = model.getBindmac();
+        TSchool school = finById(model.getSchoolid());
+        /*if (bindmac != null && !bindmac.equals(school.getBindmac())) {
+            userMapper.delBindmac(model.getSchoolid());//删除学生绑定信息
+        }*/
+        return schoolMapper.updateById(model);
+    }
+
+    //获取列表
+    public List <TSchool> findAll() {
+        return schoolMapper.findAll();
+    }
+
+    /**
+     * 学年升级
+     * @Param [schoolid, year]
+     * @Author ywx
+     * @Date 2020/6/12 13:50
+     * @return void
+     **/
+    @Transactional(rollbackFor = Exception.class)
+    public void upgrade(Integer schoolid, Integer year) throws Exception {
+        try {
+           /* List<TClass> classes = classMapper.listClassBySchoolId(schoolid, year);//要升级的班级列表
+            if (N_Utils.isListNotEmpty(classes)){
+                String classIds = classMapper.listClassIdBySchoolId(schoolid, year);
+                List<TClassStudent> cStudents = classStudentMapper.listStudentByClassIds(classIds);//要升级的学生列表
+                List<TClassTeacher> cTeachers = classTeacherMapper.listTeacherByClassIds(classIds);//要升级的教师列表
+
+                List<TGroup> groups = groupMapper.listStudentByClassIds(classIds);//要升级的全体分组列表
+                StringBuilder sb = new StringBuilder();
+                groups.forEach(g->{sb.append(g.getGroupid()).append(",");});
+                String groupIds = sb.toString().substring(0,sb.toString().length()-1);
+                List<TGroupStudent> gStudents = groupStudentMapper.listStudentByGroupIds(groupIds);//要升级的学生列表
+
+                List<TClassStudent> classStudents = new ArrayList<>();//升级后的班级学生
+                List<TClassTeacher> classTeachers = new ArrayList<>();//升级后的班级教师
+                List<TGroupStudent> groupStudents = new ArrayList<>();//升级后的分组学生
+                for (TClass c : classes) {
+                    //复制班级信息
+                    c.setYear(c.getYear()+1);
+                    c.setGradeid(c.getGradeid()+1);
+                    c.setClassstate(1);
+                    c.setCreatetime(N_Utils.getSecondTimestamp());
+                    classMapper.insertUseGeneratedKeys(c);
+                    Integer oldClassId = c.getClassid();
+                    Integer classid = c.getId();
+
+                    //复制班级学生信息
+                    boolean rtn = false;
+                    for (TClassStudent s : cStudents) {
+                        if (oldClassId.equals(s.getClassid())){
+                            s.setClassid(classid);
+                            s.setCreatetime(N_Utils.getSecondTimestamp());
+                            classStudents.add(s);
+                            rtn = true;
+                        } else if (!oldClassId.equals(s.getClassid()) && rtn){
+                            break;
+                        }
+                    }
+
+                    //复制班级教师信息
+                    rtn = false;
+                    for (TClassTeacher t : cTeachers) {
+                        if (oldClassId.equals(t.getClassid())){
+                            t.setClassid(classid);
+                            t.setCreatetime(N_Utils.getSecondTimestamp());
+                            classTeachers.add(t);
+                            rtn = true;
+                        } else if (!oldClassId.equals(t.getClassid()) && rtn){
+                            break;
+                        }
+                    }
+
+                    for (TGroup g : groups) {
+                        if (oldClassId.equals(g.getClassid())){
+                            //复制班级分组信息
+                            g.setClassid(classid);
+                            g.setCreatetime(N_Utils.getSecondTimestamp());
+                            groupMapper.insertUseGeneratedKeys(g);
+                            Integer oldGroupId = g.getGroupid();
+                            Integer groupid = g.getId();
+
+                            //复制分组学生信息
+                            rtn = false;
+                            for (TGroupStudent s : gStudents) {
+                                if (oldGroupId.equals(s.getGroupid())){
+                                    s.setClassid(classid);
+                                    s.setGroupid(groupid);
+                                    s.setCreatetime(N_Utils.getSecondTimestamp());
+                                    groupStudents.add(s);
+                                    rtn = true;
+                                } else if (!oldGroupId.equals(s.getGroupid()) && rtn){
+                                    break;
+                                }
+                            }
+                            break;
+                        }
+                    }
+                }
+                classStudentMapper.insertList(classStudents);//保存升级后的班级学生信息
+                classTeacherMapper.insertList(classTeachers);//保存升级后的班级教师信息
+                groupStudentMapper.insertList(groupStudents);//保存升级后的分组学生信息
+            }
+
+            //不需要升级，需要标识毕业的班级，学生
+            List<TClass> biyeclass = classMapper.listClassBiyeBySchoolId(schoolid,year,1);
+
+
+            if(N_Utils.isListNotEmpty(biyeclass)){
+                String byclassIds = "";
+                for(int i=0;i<biyeclass.size();i++){
+                    TClass c = biyeclass.get(i);
+                    if(i>0){
+                        byclassIds = byclassIds + "," + c.getClassid();
+                    }else{
+                        byclassIds = c.getClassid().toString();
+                    }
+                }
+
+                List<TClassStudent> bystudents = classStudentMapper.listStudentByClassIds(byclassIds);//要毕业的学生列表
+
+                if (N_Utils.isNotEmpty(byclassIds)) {
+                    classMapper.updateClassState(3, byclassIds);//修改班级状态
+                }
+                if (N_Utils.isListNotEmpty(bystudents)) {
+                    userMapper.batchUpdateState(bystudents, 3);   //修改学生状态为已毕业状态
+                }
+            }*/
+
+            schoolMapper.upgrade(schoolid);//学校年份升级
+        }catch (Exception e){
+            log.error("学年升级失败：" + e.getMessage());
+            TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
+            throw new Exception("学年升级失败");
+        }
+    }
+
+    /**
+     * 学年降级
+     * @Param [schoolid, year]
+     * @Author ywx
+     * @Date 2020/6/16 13:51
+     * @return void
+     **/
+    public void downgrade(Integer schoolid, Integer year) {
+
+        schoolMapper.downgrade(schoolid, year);
+        //之前已毕业的班级进行恢复
+        /*List<TClass> biyeclass = classMapper.listClassBiyeBySchoolId(schoolid,year,3);
+
+        if(N_Utils.isListNotEmpty(biyeclass)){
+            String byclassIds = "";
+            for(int i=0;i<biyeclass.size();i++){
+                TClass c = biyeclass.get(i);
+                if(i>0){
+                    byclassIds = "," + c.getClassid();
+                }else{
+                    byclassIds = c.getClassid().toString();
+                }
+            }
+
+            List<TClassStudent> bystudents = classStudentMapper.listStudentByClassIds(byclassIds);//要毕业的学生列表
+
+            classMapper.updateClassState(1,byclassIds);//修改班级状态
+            userMapper.batchUpdateState(bystudents,1);   //修改学生状态
+        }*/
+    }
+
+    /**
+     * 获取学校详情
+     * @Param [schoolid]
+     * @Author ywx
+     * @Date 2020/9/21 16:12
+     * @return com.xhkjedu.model.gradeclass.TSchool
+     **/
+    public TSchool finById(Integer schoolid) {
+        return schoolMapper.selectByPrimaryKey(schoolid);
+    }
+
+    //学校选择列表
+    public List<Map> listForSel() {
+        return schoolMapper.listForSel();
+    }
+
+    //根据学校名称查找学校数量
+    public Integer countBySchoolName(String schoolname) {
+        return schoolMapper.countBySchoolName(schoolname);
+    }
+
+    //获取学校当前年份
+    public Integer getYearById(Integer schoolid) {
+        return schoolMapper.getYearById(schoolid);
+    }
+}

sapi/src/main/java/com/xhkjedu/sapi/service/system/SchoolStypeService.java

@@ -0,0 +1,115 @@
+package com.xhkjedu.sapi.service.system;
+
+import com.xhkjedu.sapi.mapper.cloud.CloudMapper;
+import com.xhkjedu.sapi.mapper.system.SchoolMapper;
+import com.xhkjedu.sapi.mapper.system.SchoolStypeMapper;
+import com.xhkjedu.sapi.model.cloud.TCloud;
+import com.xhkjedu.sapi.model.system.TSchool;
+import com.xhkjedu.sapi.model.system.TSchoolStype;
+import com.xhkjedu.utils.N_Utils;
+import com.xhkjedu.vo.ResultVo;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.stream.Collectors;
+
+/**
+ * @author ywx
+ * @classname TSchoolStypeService
+ * @description
+ * @date 2021/2/23 9:51
+ **/
+@Service
+public class SchoolStypeService {
+    @Resource
+    private SchoolStypeMapper schoolStypeMapper;
+    @Resource
+    private SchoolMapper schoolMapper;
+    @Resource
+    private CloudMapper cloudMapper;
+
+    //添加
+    public ResultVo batchSave(List<TSchoolStype> list) {
+        TSchoolStype stype = list.get(0);
+        Integer schoolid = stype.getSchoolid();
+        String schooldomain = stype.getSchooldomain();
+        N_Utils.validation(new Object[]{schoolid, "学校id", 1});
+        TSchool school = new TSchool();
+        school.setSchoolid(schoolid);
+        if (schooldomain == null) schooldomain = "";
+        school.setSchooldomain(schooldomain);
+        schoolMapper.updateByPrimaryKeySelective(school);
+        list.forEach(model -> {
+            model.setCreatetime(N_Utils.getSecondTimestamp());
+        });
+        schoolStypeMapper.batchSave(list);
+        return new ResultVo(0, "保存成功");
+    }
+
+    //获取列表
+    public List <TSchoolStype> listAll(TSchoolStype stype) {
+        List<TSchoolStype> list = schoolStypeMapper.findAll(stype);
+        if (list == null) {
+            list = new ArrayList<>();
+        }
+        TCloud cloud = cloudMapper.getCloud();
+        String schooldomain = stype.getSchooldomain();
+        //登录页面字体图片
+        int size = list.stream().filter(t -> t.getSchooltype().equals("loginname")).collect(Collectors.toList()).size();
+        if (size == 0) {
+            TSchoolStype type = new TSchoolStype();
+            type.setSchooldomain(schooldomain);
+            type.setSchooltype("loginname");
+            type.setStypeaddr(cloud.getLoginname());
+            list.add(type);
+        }
+
+        //登录背景图片
+        size = list.stream().filter(t -> t.getSchooltype().equals("loginbg")).collect(Collectors.toList()).size();
+        if (size == 0) {
+            TSchoolStype type = new TSchoolStype();
+            type.setSchooldomain(schooldomain);
+            type.setSchooltype("loginbg");
+            type.setStypeaddr(cloud.getLoginbg());
+            list.add(type);
+        }
+
+        //技术支持
+        size = list.stream().filter(t -> t.getSchooltype().equals("tesupport")).collect(Collectors.toList()).size();
+        if (size == 0) {
+            TSchoolStype type = new TSchoolStype();
+            type.setSchooldomain(schooldomain);
+            type.setSchooltype("tesupport");
+            type.setStypeaddr(cloud.getTesupport());
+            list.add(type);
+        }
+
+        //备案号
+        size = list.stream().filter(t -> t.getSchooltype().equals("recordno")).collect(Collectors.toList()).size();
+        if (size == 0) {
+            TSchoolStype type = new TSchoolStype();
+            type.setSchooldomain(schooldomain);
+            type.setSchooltype("recordno");
+            type.setStypeaddr(cloud.getRecordno());
+            list.add(type);
+        }
+        return list;
+    }
+
+    //添加
+    public ResultVo batchSave2(List<TSchoolStype> list) {
+        TSchoolStype stype = list.get(0);
+        Integer schoolid = stype.getSchoolid();
+        N_Utils.validation(new Object[]{schoolid,"学校id",1});
+        list.forEach(model->{model.setCreatetime(N_Utils.getSecondTimestamp());});
+        schoolStypeMapper.batchSave(list);
+        return new ResultVo(0, "保存成功");
+    }
+
+    //根据学校id获取列表
+    public List <TSchoolStype> listAll2(TSchoolStype stype) {
+        return schoolStypeMapper.findAll2(stype);
+    }
+}

sapi/src/main/java/com/xhkjedu/sapi/service/system/SyserrorService.java

@@ -0,0 +1,33 @@
+package com.xhkjedu.sapi.service.system;
+
+import com.xhkjedu.sapi.mapper.system.SyserrorMapper;
+import com.xhkjedu.sapi.model.system.TSyserror;
+import com.xhkjedu.utils.N_Utils;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+import java.util.List;
+
+/**
+ * @author ywx
+ * @classname SyserrorService
+ * @description 
+ * @date 2020/10/9 15:17
+ **/
+@Service
+public class SyserrorService {
+    @Resource
+    private SyserrorMapper syserrorMapper;
+
+    //添加
+    public Integer save(TSyserror model) {
+        model.setCreatetime(N_Utils.getSecondTimestamp());
+        syserrorMapper.insertUseGeneratedKeys(model);
+        return model.getId();
+    }
+
+    //获取列表
+    public List <TSyserror> listAll(TSyserror error) {
+        return syserrorMapper.listAll(error);
+    }
+}

sapi/src/main/java/com/xhkjedu/sapi/service/system/UserLogService.java

@@ -0,0 +1,28 @@
+package com.xhkjedu.sapi.service.system;
+
+import com.xhkjedu.sapi.mapper.system.UserLogMapper;
+import com.xhkjedu.sapi.model.system.TUserLog;
+import com.xhkjedu.utils.N_Utils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.net.UnknownHostException;
+import java.util.List;
+
+@Service
+public class UserLogService {
+
+    @Autowired
+    private UserLogMapper userLogMapper;
+
+    /**
+     * 登录日志列表
+     * @Param [log]
+     * @Author ywx
+     * @Date 2020/6/17 17:22
+     * @return java.util.List<com.xhkjedu.model.system.TUserLog>
+     **/
+    public List<TUserLog> listLog(TUserLog log) {
+        return userLogMapper.listLog(log);
+    }
+}

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

@@ -1,6 +1,17 @@
 package com.xhkjedu.sapi.utils;
 
 import com.xhkjedu.sapi.config.ConfigKey;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.http.HttpEntity;
+import org.springframework.http.HttpHeaders;
+import org.springframework.http.MediaType;
+import org.springframework.http.ResponseEntity;
+import org.springframework.util.MultiValueMap;
+import org.springframework.web.client.RestClientException;
+import org.springframework.web.client.RestTemplate;
+
+import java.util.ArrayList;
+import java.util.List;
 
 import static com.xhkjedu.utils.N_Utils.getSecondTimestamp;
 
@@ -10,7 +21,7 @@ import static com.xhkjedu.utils.N_Utils.getSecondTimestamp;
  * Author WN
  * Date 2022/2/21 11:08
  **/
-
+@Slf4j
 public class ApiUtil {
     public static Integer id = 0;
 
@@ -27,4 +38,28 @@ public class ApiUtil {
         long num = Long.parseLong(_num);
         return Long.toString(num,36).toUpperCase();
     }
+
+    /**
+     * 发送form-data请求返回json结果
+     * @Param [apiUrl, param]
+     * @Author ywx
+     * @Date 2021/5/14 17:41
+     * @return java.lang.String
+     **/
+    public static String sendFormData(String apiUrl, MultiValueMap<String, String> param) {
+        try {
+            HttpHeaders headers = new HttpHeaders();
+            headers.setContentType(MediaType.APPLICATION_FORM_URLENCODED);
+            List<MediaType> acceptableMediaTypes = new ArrayList<>();
+            acceptableMediaTypes.add(MediaType.APPLICATION_FORM_URLENCODED);
+            acceptableMediaTypes.add(MediaType.APPLICATION_PROBLEM_JSON_UTF8);
+            HttpEntity<MultiValueMap<String, String>> requestParams = new HttpEntity<>(param, headers);
+            ResponseEntity<String> response = new RestTemplate().postForEntity(apiUrl, requestParams, String.class);
+            String result = response.getBody();
+            return result;
+        } catch (RestClientException e) {
+            log.error("发送form-data请求失败",e.getMessage());
+            return null;
+        }
+    }
 }

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

@@ -0,0 +1,164 @@
+package com.xhkjedu.sapi.utils;
+
+import com.xhkjedu.sapi.config.ConfigKey;
+import lombok.extern.slf4j.Slf4j;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
+/**
+ * @author ywx
+ * @className CopyURL
+ * @description
+ * @date 2020/8/5 9:52
+ **/
+@Slf4j
+public class CopyURL {
+
+    /**
+     * 把试题中的网络图片复制到本地
+     * @Param [qstem]
+     * @Author ywx
+     * @Date 2020/8/5 11:20
+     * @return java.lang.String
+     **/
+    /*public static String copyImg(String qstem, String questionid) {
+        List<String> imgs = getImgSrc(qstem);
+        for (String img : imgs) {
+            String imgPath = copy(img, questionid);
+            qstem = qstem.replace(img, imgPath);
+        }
+        return qstem;
+    };*/
+    
+    /**
+     * 获取字符串中的img标签中的src地址
+     * @Param [str]
+     * @Author ywx
+     * @Date 2020/8/5 10:11
+     * @return java.util.List<java.lang.String>
+     **/
+    /*public static List<String> getImgSrc(String str) {
+        if( str == null ){
+            return null;
+        }
+
+        String img = "";
+        Pattern p_image;
+        Matcher m_image;
+        List<String> pics = new ArrayList<>();
+
+        String regEx_img = "<img.*src\\s*=\\s*(.*?)[^>]*?>";
+        p_image = Pattern.compile(regEx_img, Pattern.CASE_INSENSITIVE);
+        m_image = p_image.matcher(str);
+        while (m_image.find()) {
+            img = img + "," + m_image.group();
+            img = img.replaceAll("\"","").replaceAll("\\\\","");
+            Matcher m = Pattern.compile("src\\s*=\\s*\"?(.*?)(\"|>|\\s+)").matcher(img);
+            while (m.find()) {
+                String imgUrl = m.group(1);
+                if (!imgUrl.contains("data:image/")) {//排除base64图片
+                    pics.add(imgUrl);
+                }
+            }
+        }
+        return pics;
+    }*/
+
+    //获取试题图片相对地址
+    public static List<String> getImgSrc2(String str) {
+        if( str == null ){
+            return null;
+        }
+
+        String img = "";
+        Pattern p_image;
+        Matcher m_image;
+        List<String> pics = new ArrayList<>();
+
+        String regEx_img = "<img.*src\\s*=\\s*(.*?)[^>]*?>";
+        p_image = Pattern.compile(regEx_img, Pattern.CASE_INSENSITIVE);
+        m_image = p_image.matcher(str);
+        while (m_image.find()) {
+            img = img + "," + m_image.group();
+            img = img.replaceAll("\"","").replaceAll("\\\\","");
+            Matcher m = Pattern.compile("src\\s*=\\s*\"?(.*?)(\"|>|\\s+)").matcher(img);
+            while (m.find()) {
+                String imgUrl = m.group(1);
+                if (!imgUrl.contains("data:image/") && imgUrl.contains(ConfigKey.oldshowurl)) {//排除base64图片
+                    pics.add(imgUrl.replaceAll(ConfigKey.oldshowurl,""));
+                }
+            }
+        }
+        return pics;
+    }
+    
+    //保存网络图片到本地
+    /*public static String copy(String imgUrl, String questionid) {
+        String imgPath = imgUrl.replaceAll(ConfigKey.oldshowurl,"");
+        String filepath = ConfigKey.uploadfolder + imgPath;
+        String showpath = ConfigKey.showurl + imgPath;
+        try {
+            createFile(filepath, imgUrl);
+        } catch (IOException e) {
+            log.error("保存网络图片失败【"+questionid+"】",e.getMessage());
+        }
+        return showpath.replaceAll("\\\\", "/");
+    }
+
+    //保存网络文件到本地
+    public static void copyFile(String fileUrl, String id) {
+        String filepath = ConfigKey.uploadfolder + fileUrl;
+        final ExecutorService exec = Executors.newFixedThreadPool(1);
+        try {
+            Callable<String> call = new Callable<String>() {
+                @Override
+                public String call() throws IOException {
+                    createFile(filepath, ConfigKey.oldshowurl + fileUrl);
+                    return "执行完成!";
+                }
+            };
+            Future<String> future = exec.submit(call);
+            future.get(ConfigKey.timeout, TimeUnit.MINUTES); //任务处理超时时间
+        } catch (Exception e) {
+            log.error("保存网络文件失败【"+id+"】",e.getMessage());
+        }
+        // 关闭线程池
+        exec.shutdown();
+    }
+
+    *//**
+     * 复制网络文件到本地
+     * @Param [filepath, urlpath]
+     * @Author ywx
+     * @Date 2021/5/7 13:42
+     * @return void
+     **//*
+    private static void createFile(String filepath, String urlpath) throws IOException {
+        File outFile = new File(filepath);
+        if (outFile.exists()) return;//存在则不复制
+        File directory = new File(outFile.getParent());
+        directory.setWritable(true, false);
+        if (!directory.exists()) {
+            directory.mkdirs();
+        }
+        OutputStream os = new FileOutputStream(outFile);
+        URL url = new URL(urlpath);
+        InputStream is = url.openStream();
+        byte[] buff = new byte[1024];
+        while (true) {
+            int readed = is.read(buff);
+            if (readed == -1) {
+                break;
+            }
+            byte[] temp = new byte[readed];
+            System.arraycopy(buff, 0, temp, 0, readed);
+            os.write(temp);
+        }
+        is.close();
+        os.close();
+    }*/
+
+}

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

@@ -0,0 +1,106 @@
+package com.xhkjedu.sapi.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);
+	}
+
+}

sapi/src/main/java/com/xhkjedu/sapi/vo/system/AreazoneVo.java

@@ -0,0 +1,18 @@
+package com.xhkjedu.sapi.vo.system;
+
+import lombok.Data;
+
+@Data
+public class AreazoneVo {
+    //地区名称
+    private String areaname;
+
+    //区域全名称
+    private String areaall;
+
+    //地区编码
+    private String areacode;
+
+    //对应领创地区id
+    private Integer lcregion;
+}

sapi/src/main/java/com/xhkjedu/sapi/vo/system/ModuleSelVo.java

@@ -0,0 +1,21 @@
+package com.xhkjedu.sapi.vo.system;
+
+import lombok.Data;
+
+/**
+ * @ClassName ModuleSelVo
+ * Description 选择模块
+ * Author WN
+ * Date 2020/6/15 15:29
+ **/
+@Data
+public class ModuleSelVo {
+
+    private String moduleid;
+
+    //模块名称
+    private String modulename;
+
+    //模块层级
+    private Integer level;
+}

sapi/src/main/resources/application.properties

@@ -29,7 +29,7 @@ spring.datasource.hikari.connection-test-query=SELECT 1
 # 所有Entity别名类所在包
 mybatis.type-aliases-package=com.xhkjedu.sapi.model,com.xhkjedu.sapi.vo
 mybatis.mapper-Locations=classpath*:mapper/**/*.xml
-#mapper.mappers=com.xhkjedu.sapi.base.TkMapper
+mapper.mappers=com.xhkjedu.sapi.base.TkMapper
 mapper.identity=MYSQL
 #打印日志的两种方式第一种可以指定包名，第二种都可以打印
 logging.level.com.xhkjedu.mapper=debug
@@ -57,3 +57,14 @@ secretKey=nanhuakaizhangjianwangni
 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

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

@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.xhkjedu.sapi.mapper.cloud.CloudMapper">
+    <!--修改主题-->
+    <update id="updateTheme">
+        update t_cloud set theme=#{cloud.theme},loginbg=#{cloud.loginbg},loginname=#{cloud.loginname},loginico=#{cloud.loginico}
+        ,tesupport=#{cloud.tesupport},recordno=#{cloud.recordno}
+        where cloudid=#{cloud.cloudid}
+    </update>
+    <!--修改基础信息-->
+    <update id="updateInfo">
+      update t_cloud
+      <trim prefix="set" suffixOverrides=",">
+          <if test="cloud.cloudname!=null and cloud.cloudname!=''">cloudname=#{cloud.cloudname},</if>
+          <if test="cloud.cloudshort!=null and cloud.cloudshort!=''">cloudshort=#{cloud.cloudshort},</if>
+          <if test="cloud.account!=null and cloud.account!=''">account=#{cloud.account},</if>
+          <if test="cloud.phone!=null and cloud.phone!=''">phone=#{cloud.phone},</if>
+          <if test="cloud.cloudmap!=null and cloud.cloudmap!=''">cloudmap=#{cloud.cloudmap},</if>
+          <if test="cloud.comm!=null and cloud.comm!=''">comm=#{cloud.comm},</if>
+          <if test="cloud.bindphone!=null">bindphone=#{cloud.bindphone},</if>
+          <if test="cloud.stuweb!=null">stuweb=#{cloud.stuweb},</if>
+          <if test="cloud.tesupport!=null">tesupport=#{cloud.tesupport},</if>
+          <if test="cloud.recordno!=null">recordno=#{cloud.recordno},</if>
+      </trim>
+        WHERE cloudid=#{cloud.cloudid}
+    </update>
+    <!--获取详情-->
+    <select id="getCloud" resultType="com.xhkjedu.sapi.model.cloud.TCloud">
+        select * from t_cloud limit 1
+    </select>
+    <!--区域学段列表-->
+    <select id="listLevel" resultType="java.lang.Integer">
+        select schoollevel from t_school where schoolstate=1 group by schoollevel order by schoollevel
+    </select>
+</mapper>

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

@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.xhkjedu.sapi.mapper.cloud.CloudSyncDetailMapper">
+  <!--批量添加-->
+  <insert id="batchSave">
+    insert into t_cloud_sync_detail (csdid,csid,synctable,plannum,beginid,endid
+    ,syncnum,handleid,createid,createtime,begintime,endtime,lsbid)
+    values
+    <foreach collection ="list" item="d" index= "index" separator =",">
+      (#{d.csdid},#{csid},#{d.synctable},#{d.plannum},#{d.beginid},#{d.endid}
+      ,#{d.syncnum},#{d.handleid},#{createid},#{d.createtime},#{d.begintime},#{d.endtime},#{d.lsbid})
+    </foreach>
+  </insert>
+  <!--获取未执行完的同步任务详情列表-->
+  <select id="listByCsId" resultType="com.xhkjedu.sapi.model.cloud.TCloudSyncDetail">
+    select csdid,csid,synctable,beginid,endid,handleid,syncnum,realnum,lsbid
+    from t_cloud_sync_detail where csid=#{csid} and endid!=IFNULL(handleid,0)
+  </select>
+  <!--更新已同步数量-->
+  <update id="updateRealNum">
+    update t_cloud_sync_detail set handleid=#{detail.handleid}
+    <if test="detail.realnum!=null">,realnum=realnum+#{detail.realnum}</if>
+    <if test="detail.starttime!=null">,starttime=#{detail.starttime},syncnum=#{detail.syncnum}</if>
+    <if test="detail.stoptime!=null">,stoptime=#{detail.stoptime}</if>
+    where csid=#{detail.csid} and synctable=#{detail.synctable}
+    <if test="detail.lsbid!=null">and lsbid=#{detail.lsbid}</if>
+  </update>
+  <!--获取未执行完成的任务详情数量-->
+  <select id="countNoEndByCsId" resultType="java.lang.Integer">
+    select count(*) from t_cloud_sync_detail where csid=#{csid} and endid!=IFNULL(handleid,0)
+  </select>
+</mapper>

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

@@ -0,0 +1,168 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.xhkjedu.mapper.sapi.cloud.CloudSyncMapper">
+  <!--列表-->
+  <resultMap id="syncResult" type="java.util.Map">
+    <id column="csid" property="csid"></id>
+    <collection property="details" javaType="java.util.List" select="listDetail" column="csid">
+    </collection>
+  </resultMap>
+  <select id="listDetail" resultType="java.util.Map">
+    select csdid,csid,plannum,beginid,endid,syncnum,realnum,handleid,starttime,stoptime
+    ,begintime,endtime,d.createid,d.createtime,sb.lsbname
+    ,(select s.subjectname from t_subject s where s.subjectid=sb.subjectid)subjectname
+    ,(select v.versionname from t_version v where v.versionid=sb.versionid)versionname
+    ,(case synctable when 't_subject' then '科目' when 't_version' then '版本' when 't_subject_book' then '教材'
+    when 't_director' then '章节' when 't_point' then '知识点' when 't_subject_questiontype' then '题型'
+    when 't_resource' then '资源' when 't_question' then '试题' else synctable end)synctable
+    from t_cloud_sync_detail d left join t_subject_book sb on d.lsbid=sb.lsbid
+    where csid=#{csid}
+  </select>
+  <select id="findAll" resultMap="syncResult">
+    select csid,begintime,endtime,starttime,stoptime,synctask,syncstate,createid,createtime
+    from t_cloud_sync order by csid desc
+  </select>
+  <!--添加-->
+  <insert id="save">
+    insert into t_cloud_sync(csid,begintime,endtime,starttime,stoptime,synctask,syncstate,createid,createtime)
+    values (#{sync.csid},#{sync.begintime},#{sync.endtime},#{sync.starttime},#{sync.stoptime}
+    ,#{sync.synctask},#{sync.syncstate},#{sync.createid},#{sync.createtime})
+  </insert>
+  <!--获取最后一条同步任务-->
+  <select id="getLastSync" resultType="com.xhkjedu.sapi.model.cloud.TCloudSync">
+    select csid, begintime, endtime, starttime, stoptime, synctask, syncstate, createid, createtime
+    from t_cloud_sync order by csid desc limit 1
+  </select>
+  <!--更新同步状态-->
+  <update id="updateState">
+    update t_cloud_sync set syncstate=#{syncstate},stoptime=UNIX_TIMESTAMP(now()) where csid=#{csid}
+  </update>
+  <select id="getCloudInfo" resultType="com.xhkjedu.sapi.model.cloud.TCloudSync">
+      select (select userid from t_user where usertype=999)createid
+      ,(select cloudcode from t_cloud limit 1)cloudcode
+  </select>
+    <!--同步科目-->
+  <insert id="syncSubject" parameterType="com.xhkjedu.sapi.model.subjectbook.TSubject">
+    <foreach collection ="list" item="m" index= "index" separator =";">
+      INSERT INTO t_subject (subjectid,subjectname,level,subjectorder,createtime,timeunix,belong)
+      VALUES (#{m.subjectid},#{m.subjectname},#{m.level},#{m.subjectorder},#{m.handletime},UNIX_TIMESTAMP(now()),1)
+      ON DUPLICATE KEY UPDATE subjectname=#{m.subjectname},subjectorder=#{m.subjectorder}
+    </foreach>
+  </insert>
+  <!--同步版本-->
+  <insert id="syncVersion" parameterType="com.xhkjedu.sapi.model.subjectbook.TVersion">
+    <foreach collection ="list" item="m" index= "index" separator =";">
+      INSERT INTO t_version (versionid,versionname,versionorder,createtime,timeunix,belong)
+      VALUES (#{m.versionid},#{m.versionname},#{m.versionorder},#{m.handletime},UNIX_TIMESTAMP(now()),1)
+      ON DUPLICATE KEY UPDATE versionname=#{m.versionname},versionorder=#{m.versionorder}
+    </foreach>
+  </insert>
+  <!--同步教材-->
+  <insert id="syncSubjectBook" parameterType="com.xhkjedu.sapi.model.subjectbook.TSubjectBook">
+    <foreach collection ="list" item="m" index= "index" separator =";">
+      INSERT INTO t_subject_book (lsbid,level,subjectid,versionid,lsbname,lsborder,coverpath,createtime,timeunix,belong)
+      VALUES (#{m.lsbid},#{m.level},#{m.subjectid},#{m.versionid},#{m.lsbname},#{m.lsborder},#{m.coverpath}
+      ,#{m.handletime},UNIX_TIMESTAMP(now()),1)
+      ON DUPLICATE KEY UPDATE lsbname=#{m.lsbname},lsborder=#{m.lsborder},coverpath=#{m.coverpath}
+    </foreach>
+  </insert>
+  <!--同步题型-->
+  <insert id="syncSubjectQuestionType" parameterType="com.xhkjedu.sapi.model.subjectbook.TSubjectQuestiontype">
+    <foreach collection ="list" item="m" index= "index" separator =";">
+      INSERT INTO t_subject_questiontype (qtypeid,qtypename,qtypeorder,subjectid,ctype,createtime,timeunix,belong)
+      VALUES (#{m.qtypeid},#{m.qtypename},#{m.qtypeorder},#{m.subjectid},#{m.ctype}
+      ,#{m.handletime},UNIX_TIMESTAMP(now()),1)
+      ON DUPLICATE KEY UPDATE qtypename=#{m.qtypename},qtypeorder=#{m.qtypeorder},ctype=#{m.ctype}
+    </foreach>
+  </insert>
+  <!--同步章节-->
+  <insert id="syncDirector" parameterType="com.xhkjedu.sapi.model.subjectbook.TDirector">
+    <foreach collection ="list" item="m" index= "index" separator =";">
+      INSERT INTO t_director (directorid,directorname,directorpid,directororder,leaf
+      ,lsbid,directorlevel,directorall,createtime,timeunix,belong)
+      VALUES (#{m.directorid},#{m.directorname},#{m.directorpid},#{m.directororder},#{m.leaf}
+      ,#{m.lsbid},#{m.directorlevel},#{m.directorall},#{m.handletime},UNIX_TIMESTAMP(now()),1)
+      ON DUPLICATE KEY UPDATE directorname=#{m.directorname},directororder=#{m.directororder}
+      ,leaf=#{m.leaf},directorall=#{m.directorall}
+    </foreach>
+  </insert>
+  <!--同步知识点-->
+  <insert id="syncPoint" parameterType="com.xhkjedu.sapi.model.subjectbook.TPoint">
+    <foreach collection ="list" item="m" index= "index" separator =";">
+      INSERT INTO t_point (pointid,pointname,pointorder,pointpid,subjectid
+      ,pointlevel,createtime,timeunix,belong)
+      VALUES (#{m.pointid},#{m.pointname},#{m.pointorder},#{m.pointpid},#{m.subjectid}
+      ,#{m.pointlevel},#{m.handletime},UNIX_TIMESTAMP(now()),1)
+      ON DUPLICATE KEY UPDATE pointname=#{m.pointname},pointorder=#{m.pointorder}
+    </foreach>
+  </insert>
+  <!--同步试题-->
+  <insert id="syncQuestion" parameterType="com.xhkjedu.sapi.model.subjectbook.TQuestion">
+      INSERT INTO t_question (questionid,qstem,qstemtxt,qoption,qanswer,qanalyze,score
+      ,complexity,ctype,qtypeid,qtypename,subjectid,qlevel,qstate,createtime,timeunix
+      ,source,year,region,schoolname,belong)
+      VALUES (#{m.questionid},#{m.qstem},#{m.qstemtxt},#{m.qoption},#{m.qanswer},#{m.qanalyze},#{m.score},#{m.complexity}
+      ,#{m.ctype},#{m.qtypeid},#{m.qtypename},#{m.subjectid},#{m.qlevel},#{m.qstate}
+      ,#{m.handletime},UNIX_TIMESTAMP(now()),#{m.source},#{m.year},#{m.region},#{m.schoolname},1)
+      ON DUPLICATE KEY UPDATE qstem=#{m.qstem},qstemtxt=#{m.qstemtxt},qoption=#{m.qoption}
+      ,qanswer=#{m.qanswer},qanalyze=#{m.qanalyze},score=#{m.score},complexity=#{m.complexity},qstate=#{m.qstate}
+      ,source=#{m.source},year=#{m.year},region=#{m.region},schoolname=#{m.schoolname}
+  </insert>
+  <!--同步试题章节-->
+  <insert id="syncQuestionDirector" parameterType="com.xhkjedu.sapi.model.subjectbook.TQuestionDirector">
+      <foreach collection ="list" item="m" index= "index" separator =";">
+      INSERT INTO t_question_director (qdid,questionid,lsbid,directorid,createtime,timeunix)
+      VALUES (#{m.qdid},#{m.questionid},#{m.lsbid},#{m.directorid},#{m.handletime},UNIX_TIMESTAMP(now()))
+      ON DUPLICATE KEY UPDATE questionid=#{m.questionid},lsbid=#{m.lsbid},directorid=#{m.directorid}
+      </foreach>
+  </insert>
+  <!--同步试题知识点-->
+  <insert id="syncQuestionPoint" parameterType="com.xhkjedu.sapi.model.subjectbook.TQuestionPoint">
+      <foreach collection ="list" item="m" index= "index" separator =";">
+      INSERT INTO t_question_point (qpid,questionid,pointid,createtime,timeunix)
+      VALUES (#{m.qpid},#{m.questionid},#{m.pointid},#{m.handletime},UNIX_TIMESTAMP(now()))
+      ON DUPLICATE KEY UPDATE questionid=#{m.questionid},pointid=#{m.pointid}
+      </foreach>
+  </insert>
+  <!--同步资源-->
+  <insert id="syncResource" parameterType="com.xhkjedu.sapi.model.subjectbook.TResource">
+      INSERT INTO t_resource (resourceid,resourcename,subjectid,resourceclass,resourcetype,level
+      ,resourceurl,resourcecover,converted,pdfurl,resourcestate,suffix,mp4code,resourcesize,duration,comm
+      ,createtime,timeunix,resourcegrade,source,year,region,schoolname,belong)
+      VALUES (#{m.resourceid},#{m.resourcename},#{m.subjectid},#{m.resourceclass},#{m.resourcetype},#{m.level}
+      ,#{m.resourceurl},#{m.resourcecover},#{m.converted},#{m.pdfurl},#{m.resourcestate},#{m.suffix}
+      ,#{m.mp4code},#{m.resourcesize},#{m.duration},#{m.comm},#{m.handletime},UNIX_TIMESTAMP(now())
+      ,#{m.resourcegrade},#{m.source},#{m.year},#{m.region},#{m.schoolname},1)
+      ON DUPLICATE KEY UPDATE resourcename=#{m.resourcename},resourcestate=#{m.resourcestate},comm=#{m.comm}
+  </insert>
+  <!--同步资源章节-->
+  <insert id="syncResourceDirector" parameterType="com.xhkjedu.sapi.model.subjectbook.TResourceDirector">
+      <foreach collection ="list" item="m" index= "index" separator =";">
+      INSERT INTO t_resource_director (rdid,resourceid,lsbid,directorid,createtime,timeunix)
+      VALUES (#{m.rdid},#{m.resourceid},#{m.lsbid},#{m.directorid},#{m.handletime},UNIX_TIMESTAMP(now()))
+      ON DUPLICATE KEY UPDATE resourceid=#{m.resourceid},lsbid=#{m.lsbid},directorid=#{m.directorid}
+      </foreach>
+  </insert>
+    <!--外键是否存在-->
+    <select id="getFkExisted" resultType="java.lang.Integer">
+        SELECT 1 FROM information_schema.KEY_COLUMN_USAGE WHERE CONSTRAINT_NAME=#{fkname} and CONSTRAINT_SCHEMA=#{dbname}
+    </select>
+    <!--删除章节外键-->
+    <update id="delDirectorFk">
+        ALTER TABLE t_director DROP FOREIGN KEY fk_directorpid;
+    </update>
+    <!--添加章节外键-->
+    <update id="addDirectorFk">
+        ALTER TABLE t_director ADD CONSTRAINT fk_directorpid
+        FOREIGN KEY (directorpid) REFERENCES t_director(directorid) ON DELETE CASCADE ON UPDATE CASCADE;
+    </update>
+    <!--删除知识点外键-->
+    <update id="delPointFk">
+        ALTER TABLE t_point DROP FOREIGN KEY fk_pointpid;
+    </update>
+    <!--添加知识点外键-->
+    <update id="addPointFk">
+        ALTER TABLE t_point ADD CONSTRAINT fk_pointpid
+        FOREIGN KEY (pointpid) REFERENCES t_point(pointid) ON DELETE CASCADE ON UPDATE CASCADE;
+    </update>
+</mapper>

sapi/src/main/resources/mapper/system/AreazoneMapper.xml

@@ -0,0 +1,79 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.xhkjedu.sapi.mapper.system.AreazoneMapper">
+  <!--获取地区列表-->
+  <resultMap id="areazoneResult" type="java.util.Map">
+    <result property="areaid" column="areaid"></result>
+    <result property="areaname" column="areaname"></result>
+    <result property="areapid" column="areapid"></result>
+    <result property="areacode" column="areacode"></result>
+    <result property="level" column="level"></result>
+    <result property="createtime" column="createtime"></result>
+    <result property="createname" column="createname"></result>
+    <collection property="cities" javaType="java.util.List" select="listCity1" column="areaid">
+    </collection>
+  </resultMap>
+  <resultMap id="areazoneResult2" type="java.util.Map">
+    <result property="areaid" column="areaid"></result>
+    <result property="areaname" column="areaname"></result>
+    <result property="areapid" column="areapid"></result>
+    <result property="areacode" column="areacode"></result>
+    <result property="level" column="level"></result>
+    <result property="createtime" column="createtime"></result>
+    <result property="createname" column="createname"></result>
+    <collection property="zones" javaType="java.util.List" select="listZone1" column="areaid">
+    </collection>
+  </resultMap>
+  <select id="listCity1" resultMap="areazoneResult2">
+    select a.areaid, a.areaname, a.areapid, a.areacode, a.level, a.createid, a.createtime,a.lcregion,a.areaall,u.username createname
+    from t_areazone a left join t_user u on a.createid=u.userid
+    where a.areapid=#{areaid} order by a.areacode
+  </select>
+  <select id="listZone1" resultType="java.util.Map">
+    select a.areaid, a.areaname, a.areapid, a.areacode, a.level, a.createid, a.createtime,a.lcregion,a.areaall,u.username createname
+    from t_areazone a left join t_user u on a.createid=u.userid
+    where a.areapid=#{areaid} order by a.areacode
+  </select>
+  <select id="listAll" resultMap="areazoneResult">
+    select a.areaid, a.areaname, a.areapid, a.areacode, a.level, a.createid, a.createtime,a.lcregion,a.areaall,u.username createname
+    from t_areazone a left join t_user u on a.createid=u.userid
+    where a.level=1 order by a.areacode
+  </select>
+  <!--获取地区选择列表-->
+  <resultMap id="areaResult" type="java.util.Map">
+    <result property="areaname" column="areaname"></result>
+    <result property="areacode" column="areacode"></result>
+    <collection property="cities" ofType="com.xhkjedu.sapi.vo.system.AreazoneVo" javaType="java.util.List" select="listCity" column="areaid">
+    </collection>
+  </resultMap>
+  <resultMap id="areaResult2" type="java.util.Map">
+    <result property="areaname" column="areaname"></result>
+    <result property="areacode" column="areacode"></result>
+    <result property="lcregion" column="lcregion"></result>
+    <collection property="zones" ofType="com.xhkjedu.sapi.vo.system.AreazoneVo" javaType="java.util.List" select="listZone" column="areaid">
+    </collection>
+  </resultMap>
+  <select id="listCity" resultMap="areaResult2">
+    select areaid,areaname,areacode,lcregion,areaall
+    from t_areazone where areapid=#{areaid} order by areacode
+  </select>
+  <select id="listZone" resultType="com.xhkjedu.sapi.vo.system.AreazoneVo">
+    select areaid,areaname,areacode,lcregion,areaall
+    from t_areazone where areapid=#{areaid} order by areacode
+  </select>
+  <select id="listForSel" resultMap="areaResult">
+    select areaid,areaname,areacode,lcregion,areaall
+    from t_areazone where level=1 order by areacode
+  </select>
+
+  <!--修改区域全名称-->
+  <update id="updateAreaAll">
+    update t_areazone a1 set a1.areaall=concat(#{areaall},a1.areaname)
+    where a1.areapid=#{areaid}
+  </update>
+  <update id="updateAreaAll2">
+    update t_areazone a1 left join t_areazone a2 on a1.areapid=a2.areaid
+    set a1.areaall=concat(#{areaall},a2.areaname,a1.areaname)
+    where a2.areapid=#{areaid}
+  </update>
+</mapper>

sapi/src/main/resources/mapper/system/ModuleMapper.xml

@@ -0,0 +1,67 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.xhkjedu.sapi.mapper.system.ModuleMapper">
+
+    <!-- 获取所有应用 -->
+    <select id="listModules" resultType="com.xhkjedu.sapi.model.system.TModule">
+        SELECT m.moduleid,m.modulename,m.moduleurl,m.moduleico,m.modulepid,m.morder,m.minout,m.comm,
+        m.mclass,m.level,m.createid,m.createtime,m.schoolid,u.username AS createname,m.mabbrevname
+        ,m.defaultid,m.mdefault,m.moduletype,m.display
+        FROM t_module m LEFT JOIN t_user u ON m.createid=u.userid
+        WHERE m.schoolid=#{schoolid}
+        <choose>
+            <when test="moduletype==2 or moduletype==3">and m.moduletype in(#{moduletype},4)</when>
+            <when test="moduletype==5">and m.moduletype between 2 and 4</when>
+            <otherwise>and m.moduletype=#{moduletype}</otherwise>
+        </choose>
+        <if test="display!=null">and m.display=#{display}</if>
+        ORDER BY m.morder
+    </select>
+
+    <!-- 获取供第一层模块 -->
+    <select id="listLevelModule" resultType="com.xhkjedu.sapi.vo.system.ModuleSelVo">
+        SELECT moduleid,modulename,LEVEL FROM t_module
+        WHERE schoolid=#{schoolid} and LEVEL=1 and display=1
+        <choose>
+            <when test="moduletype==2 or moduletype==3">and moduletype in(#{moduletype},4)</when>
+            <when test="moduletype==5">and moduletype between 2 and 4</when>
+            <otherwise>and moduletype=#{moduletype}</otherwise>
+        </choose>
+    </select>
+
+    <update id="updateOrder">
+        update t_module set morder=morder+1
+        where modulepid=#{module.modulepid} and morder>=#{module.morder} and moduleid!=#{module.moduleid}
+    </update>
+    <!--模块上移-->
+    <update id="moveUp">
+        UPDATE t_module
+        <trim prefix="set" suffixOverrides=",">
+            <trim prefix="morder = CASE " suffix="END,">
+                <foreach collection="list" index="index" item="item">
+                    when moduleid=#{item.moduleid} then #{item.morder}
+                </foreach>
+            </trim>
+        </trim>
+        where
+        <foreach collection="list" item="item" index="index" separator="or">
+            moduleid=#{item.moduleid}
+        </foreach>
+    </update>
+
+    <!--模块选择列表-->
+    <select id="listForSel2" resultType="java.util.Map">
+        SELECT m.moduleid,m.modulename,m.mabbrevname,m.moduletype
+        FROM t_module m WHERE m.schoolid=#{schoolid} and m.level!=1
+        <choose>
+            <when test="moduletype==2 or moduletype==3">and m.moduletype in(#{moduletype},4)</when>
+            <when test="moduletype==5">and m.moduletype between 2 and 4</when>
+            <otherwise>and m.moduletype=#{moduletype}</otherwise>
+        </choose>
+        and m.display=1 ORDER BY m.morder
+    </select>
+    <!--删除默认模块关联的学校模块-->
+    <delete id="deleteByDefaultId">
+        delete from t_module where defaultid=#{defaultid}
+    </delete>
+</mapper>

sapi/src/main/resources/mapper/system/ModuledefaultMapper.xml

@@ -0,0 +1,47 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.xhkjedu.sapi.mapper.system.ModuledefaultMapper">
+    <!-- 获取所有模块 -->
+    <select id="listModules" resultType="com.xhkjedu.sapi.model.system.TModule">
+        SELECT m.moduleid,m.modulename,m.moduleurl,m.moduleico,m.modulepid
+        ,m.morder,m.minout,m.comm,m.mclass,m.level,m.mabbrevname,m.mdefault,m.moduletype,m.display
+        FROM t_moduledefault m
+        <choose>
+            <when test="moduletype==null"></when>
+            <when test="moduletype==2 or moduletype==3">where m.moduletype in(#{moduletype},4)</when>
+            <when test="moduletype==5">where m.moduletype between 2 and 4</when>
+            <otherwise>where m.moduletype=#{moduletype}</otherwise>
+        </choose>
+        <if test="display!=null">and m.display=#{display}</if>
+        ORDER BY m.morder
+    </select>
+    <!-- 获取供第一层模块 -->
+    <select id="listLevelModule" resultType="com.xhkjedu.sapi.vo.system.ModuleSelVo">
+        SELECT moduleid,modulename,LEVEL FROM t_moduledefault WHERE LEVEL=1 and display=1
+        <choose>
+            <when test="moduletype==2 or moduletype==3">and moduletype in(#{moduletype},4)</when>
+            <when test="moduletype==5">and moduletype between 2 and 4</when>
+            <otherwise>and moduletype=#{moduletype}</otherwise>
+        </choose>
+    </select>
+    <!--获取学校id集合-->
+    <select id="listSchoolId" resultType="java.lang.Integer">
+        select schoolid from t_school where schoolstate=1
+    </select>
+    <!--模块地址对应模块数量-->
+    <select id="countByUrl" resultType="java.lang.Integer">
+        select count(*) from t_moduledefault where moduleurl=#{moduleurl} and moduletype=#{moduletype}
+    </select>
+    <!--更新学校模块信息-->
+    <update id="updateByDefaultId">
+        update t_module m left join t_moduledefault d on m.defaultid=d.moduleid
+        set m.modulename=d.modulename,m.mabbrevname=d.mabbrevname,m.moduleurl=d.moduleurl,m.moduleico=d.moduleico
+        ,m.morder=d.morder,m.minout=d.minout,m.mclass=d.mclass,m.mdefault=d.mdefault,m.comm=d.comm,m.display=d.display
+        where m.defaultid=#{moduleid}
+    </update>
+    <!--获取系统模块id-->
+    <select id="getModuleIdByDefaultId" resultType="java.lang.String">
+        select moduleid from t_module where level=1 and schoolid=#{schoolid} and moduletype=#{moduletype} and
+        defaultid=#{moduleid} limit 1
+    </select>
+</mapper>

sapi/src/main/resources/mapper/system/SchoolMapper.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.sapi.mapper.system.SchoolMapper">
+    <!--删除-->
+    <update id="deleteById">
+        update t_school set schoolstate=10 where schoolid=#{schoolid}
+    </update>
+    <select id="findAll" resultType="com.xhkjedu.sapi.model.system.TSchool">
+        select s.*,tu.username createname
+        ,(select u.loginname from t_user u where u.schoolid=s.schoolid and u.usertype=0 and u.userstate=1
+        ORDER BY u.userid ASC LIMIT 1)loginname
+        from t_school s left join t_user tu on s.createid = tu.userid
+        where s.schoolstate=1 order by s.createtime desc
+    </select>
+    <!--学年升级-->
+    <update id="upgrade">
+        update t_school set year=year+1 where schoolid=#{schoolid};
+    </update>
+    <!--学年降级-->
+    <update id="downgrade">
+        delete gs.*,g.*,cs.*,ct.*,c.*
+        from t_class c left join t_class_student cs on cs.classid=c.classid
+        left join t_class_teacher ct on ct.classid=c.classid
+        left join t_group g on c.classid=g.classid
+        left join t_group_student gs on gs.groupid=g.groupid
+        where c.schoolid=#{schoolid} and c.year=#{year};
+        update t_school set year=year-1 where schoolid=#{schoolid}
+    </update>
+    <!--学校选择列表-->
+    <select id="listForSel" resultType="java.util.Map">
+        select schoolid,schoolname from t_school where schoolstate=1
+    </select>
+
+    <!--获取区域码-->
+    <select id="getSchoolDetailById" resultType="com.xhkjedu.sapi.model.system.TSchool">
+      select * ,(select cloudcode from t_cloud limit 1) cloudcode
+      from t_school where schoolid=#{schoolid}
+    </select>
+    <update id="updateSchoolDock">
+        update t_school set docklc=#{docklc} where schoolid=#{schoolid}
+    </update>
+    <!--根据学校名称查找学校数量-->
+    <select id="countBySchoolName" resultType="java.lang.Integer">
+        select count(*) from t_school where schoolstate=1 and schoolname=#{schoolname}
+    </select>
+    <!--获取学校当前年份-->
+    <select id="getYearById" resultType="java.lang.Integer">
+        select year from t_school where schoolid=#{schoolid}
+    </select>
+    <!--获取用户当前年份-->
+    <select id="getYearByUserId" resultType="java.lang.Integer">
+        select s.year from t_user u left join t_school s on u.schoolid=s.schoolid
+        where u.userid=#{userid}
+    </select>
+    <!--获取学校账号数量-->
+    <select id="getUserNumById" resultType="java.lang.Integer">
+        select usernum from t_school where schoolid=#{schoolid}
+    </select>
+    <!--修改-->
+    <update id="updateById">
+        update t_school set schoolname=#{school.schoolname},shortname=#{school.shortname},errorrate=#{school.errorrate}
+        ,bindmac=#{school.bindmac},docklc=#{school.docklc},usernum=#{school.usernum},livenum=#{school.livenum}
+        ,livetime=#{school.livetime},coordinate=#{school.coordinate}
+        where schoolid=#{school.schoolid}
+    </update>
+    <!--根据域名获取学校id-->
+    <select id="getSchoolIdByDomain" resultType="java.lang.Integer">
+        select schoolid from t_school where schoolid=#{schoolid} and schooldomain=#{schooldomain}
+    </select>
+</mapper>

sapi/src/main/resources/mapper/system/SchoolStypeMapper.xml

@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.xhkjedu.sapi.mapper.system.SchoolStypeMapper">
+    <!--通过域名获取学校样式列表-->
+    <select id="findAll" resultType="com.xhkjedu.sapi.model.system.TSchoolStype">
+        select stid, s.schooldomain, st.schoolid, schooltype, stypeaddr, createid, createtime
+        ,s.schoolname
+        from (select schoolid,schoolname,schooldomain from t_school where schooldomain=#{stype.schooldomain}
+        limit 1)s left join t_school_stype st on s.schoolid=st.schoolid
+    </select>
+    <!--通过学校id获取学校样式列表-->
+    <select id="findAll2" resultType="com.xhkjedu.sapi.model.system.TSchoolStype">
+        select st.stid, s.schooldomain, st.schoolid, st.schooltype, st.stypeaddr, st.createid, st.createtime
+        ,s.schoolname
+        from t_school s left join t_school_stype st on s.schoolid=st.schoolid where s.schoolid=#{stype.schoolid}
+    </select>
+    <!--批量添加-->
+    <insert id="batchSave" parameterType="com.xhkjedu.sapi.model.system.TSchoolStype">
+        <foreach collection ="list" item="s" index= "index" separator =";">
+            INSERT INTO t_school_stype (schooldomain, schoolid, schooltype, stypeaddr, createid, createtime)
+            VALUES (#{s.schooldomain},#{s.schoolid},#{s.schooltype},#{s.stypeaddr},#{s.createid},#{s.createtime})
+            ON DUPLICATE KEY UPDATE schooldomain=#{s.schooldomain},stypeaddr=#{s.stypeaddr},createid=#{s.createid}
+        </foreach>
+    </insert>
+</mapper>

sapi/src/main/resources/mapper/system/SyserrorMapper.xml

@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.xhkjedu.sapi.mapper.system.SyserrorMapper">
+    <select id="listAll" resultType="com.xhkjedu.sapi.model.system.TSyserror">
+        select errid,device,errmsg,createtime from t_syserror
+        <where>
+            <if test="error.device!=null and error.device!=''"> and device=#{error.device}</if>
+            <if test="error.errmsg!=null and error.errmsg!=''"> and errmsg like '%${error.errmsg}%'</if>
+        </where>
+        order by createtime desc
+    </select>
+</mapper>

sapi/src/main/resources/mapper/system/UserLogMapper.xml

@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.xhkjedu.sapi.mapper.system.UserLogMapper">
+    <!-- 登录日志列表 -->
+    <select id="listLog" resultType="com.xhkjedu.sapi.model.system.TUserLog" >
+        select * from t_user_log
+        <where>
+            <if test="log.schoolid!=null">
+                and schoolid=#{log.schoolid}
+            </if>
+            <if test="log.loginname!=null and log.loginname!=''">
+                and (loginname like '%${log.loginname}%' or username like '%${log.loginname}%')
+            </if>
+            <if test="log.logtime!=null and log.logtime!=0">
+                and UNIX_TIMESTAMP(FROM_UNIXTIME(logtime, '%Y%m%d'))>=#{log.logtime}
+            </if>
+            <if test="log.endtime!=null and log.endtime!=0">
+                and UNIX_TIMESTAMP(FROM_UNIXTIME(logtime, '%Y%m%d')) &lt;= #{log.endtime}
+            </if>
+            <if test="log.ultype!=null and log.ultype!=''">
+                and ultype=#{log.ultype}
+            </if>
+            <if test="log.versionnum!=null and log.versionnum!=''">
+                and versionnum=#{log.versionnum}
+            </if>
+        </where>
+        order by ulid desc
+    </select>
+</mapper>