不报错版本

suser/pom.xml

@@ -22,10 +22,10 @@
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-web</artifactId>
         </dependency>
-        <dependency>
-            <groupId>org.springframework.cloud</groupId>
-            <artifactId>spring-cloud-starter-config</artifactId>
-        </dependency>
+        <!--<dependency>-->
+        <!--    <groupId>org.springframework.cloud</groupId>-->
+        <!--    <artifactId>spring-cloud-starter-config</artifactId>-->
+        <!--</dependency>-->
 
         <dependency>
             <groupId>mysql</groupId>
@@ -41,6 +41,50 @@
             <artifactId>spring-boot-starter-test</artifactId>
             <scope>test</scope>
         </dependency>
+        <!--mybatis通用mapper依赖-->
+        <!--<dependency>-->
+        <!--    <groupId>tk.mybatis</groupId>-->
+        <!--    <artifactId>mapper-spring-boot-starter</artifactId>-->
+        <!--    <version>2.1.5</version>-->
+        <!--</dependency>-->
+        <dependency>
+            <groupId>com.xhkjedu</groupId>
+            <artifactId>scommons</artifactId>
+            <version>0.0.1-SNAPSHOT</version>
+        </dependency>
+        <dependency>
+            <groupId>com.alibaba</groupId>
+            <artifactId>fastjson</artifactId>
+            <version>1.2.56</version>
+        </dependency>
+        <!-- redis -->
+        <dependency>
+            <groupId>redis.clients</groupId>
+            <artifactId>jedis</artifactId>
+            <version>2.9.3</version>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-data-redis</artifactId>
+        </dependency>
+        <!--  导入和导出excel时需要的jar包 -->
+        <dependency>
+            <groupId>org.apache.poi</groupId>
+            <artifactId>poi-ooxml</artifactId>
+            <version>3.17</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.poi</groupId>
+            <artifactId>poi</artifactId>
+            <version>3.17</version>
+        </dependency>
+        <!-- https://mvnrepository.com/artifact/tk.mybatis/mapper-spring-boot-starter -->
+        <dependency>
+            <groupId>tk.mybatis</groupId>
+            <artifactId>mapper-spring-boot-starter</artifactId>
+            <version>2.0.2</version>
+        </dependency>
+
     </dependencies>
     <dependencyManagement>
         <dependencies>
@@ -72,6 +116,7 @@
                 <!--编译跳过测试文件检查的生命周期-->
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-surefire-plugin</artifactId>
+                <version>2.22.2</version>
                 <configuration>
                     <skip>true</skip>
                 </configuration>

suser/src/main/java/com/xhkjedu/suser/SuserApplication.java

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

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

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

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

@@ -0,0 +1,54 @@
+package com.xhkjedu.suser.config;
+
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.stereotype.Component;
+
+import java.io.UnsupportedEncodingException;
+
+/**
+ * @author ywx
+ * @classname ConfigKey
+ * @description 读取配置文件类
+ * @date 2020/10/16 9:19
+ **/
+@Component
+public class ConfigKey {
+    public static String username;
+    public static String password;
+    public static String url;
+    public static String signName;
+
+    @Value("${zt.username}")
+    public void setUsername(String username) {
+        ConfigKey.username = username;
+    }
+
+    @Value("${zt.password}")
+    public void setPassword(String password) {
+        ConfigKey.password = password;
+    }
+
+    @Value("${zt.url}")
+    public void setUrl(String url) {
+        ConfigKey.url = url;
+    }
+
+    @Value("${signName}")
+    private void setSignName(String signName) throws UnsupportedEncodingException {
+        //Spring Boot注解读取application.properties或者application-{profile}.properties文件时默认的是ISO_8859_1编码,中文会乱码
+        ConfigKey.signName = new String(signName.getBytes("ISO_8859_1"),"UTF-8");;
+    }
+
+    public static Integer redisdatatime;//缓存访问数据有效时长
+    public static String secretKey;//secretKey必须为24位
+
+    @Value("${redisdatatime}")
+    public void setRedisdatatime(Integer redisdatatime) {
+        ConfigKey.redisdatatime = redisdatatime;
+    }
+
+    @Value("${secretKey}")
+    public void setSecretKey(String secretKey) {
+        ConfigKey.secretKey = secretKey;
+    }
+}

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

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

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

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

suser/src/main/java/com/xhkjedu/suser/controller/gradeclass/ClassController.java

@@ -0,0 +1,72 @@
+package com.xhkjedu.suser.controller.gradeclass;
+
+import com.xhkjedu.suser.model.gradeclass.TClass;
+import com.xhkjedu.suser.service.gradeclass.ClassService;
+import com.xhkjedu.utils.N_Utils;
+import com.xhkjedu.vo.ResultVo;
+import com.xhkjedu.suser.vo.gradeclass.ClassVo;
+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 TClassController
+ * @description
+ * @date 2020/6/2 14:53
+ **/
+@RestController
+@RequestMapping("/class")
+public class ClassController {
+    @Resource
+    private ClassService classService;
+
+    @PostMapping("/add")
+    public ResultVo add(@RequestBody TClass tClass) {
+        N_Utils.validation(new Object[]{tClass.getGradeid(), "年级id", 1});
+        TClass c = classService.getByName(tClass);
+        if (c != null) {
+            return new ResultVo(1, "班级名称不能重复");
+        }
+        Integer id = classService.save(tClass);
+        return new ResultVo(0, "保存成功", id);
+    }
+
+    @PostMapping("/delete")
+    public ResultVo delete(@RequestBody TClass tClass) {
+        N_Utils.validation(new Object[]{tClass.getClassid(), "班级id", 1});
+        return classService.deleteById(tClass.getClassid());
+    }
+
+    @PostMapping("/update")
+    public ResultVo update(@RequestBody TClass tClass) {
+        N_Utils.validation(new Object[]{tClass.getClassid(), "班级id", 1});
+        TClass c = classService.getByName(tClass);
+        if (c != null && !c.getClassname().equals(tClass.getClassname())) {
+            return new ResultVo(1, "班级名称不能重复");
+        }
+        classService.update(tClass);
+        return new ResultVo(0, "修改成功");
+    }
+
+    @PostMapping("/list")
+    public ResultVo list(@RequestBody TClass tClass) {
+        Integer schoolid = tClass.getSchoolid();
+        Integer year = tClass.getYear();
+        N_Utils.validation(new Object[]{schoolid, "学校id", 1, year, "当前年份", 1});
+        List<ClassVo> list = classService.findAll(tClass);
+        return new ResultVo(0, "获取列表成功", list);
+    }
+
+    @PostMapping("/list_teacher")
+    public ResultVo listTeacher(@RequestBody TClass tClass) {
+        Integer classid = tClass.getClassid();
+        N_Utils.validation(new Object[]{classid, "班级id", 1});
+        List<String> list = classService.listTeacher(classid);
+        return new ResultVo(0, "获取任教老师列表成功", list);
+    }
+}

suser/src/main/java/com/xhkjedu/suser/controller/gradeclass/ClassStudentController.java

@@ -0,0 +1,193 @@
+package com.xhkjedu.suser.controller.gradeclass;
+
+import com.github.pagehelper.PageHelper;
+import com.github.pagehelper.PageInfo;
+import com.xhkjedu.vo.PageResult;
+import com.xhkjedu.suser.model.gradeclass.TClassStudent;
+import com.xhkjedu.suser.service.gradeclass.ClassStudentService;
+import com.xhkjedu.utils.N_Utils;
+import com.xhkjedu.utils.PageUtil;
+import com.xhkjedu.vo.ResultVo;
+import com.xhkjedu.suser.vo.gradeclass.ClassImportVo;
+import com.xhkjedu.suser.vo.gradeclass.ClassStudentVo;
+import com.xhkjedu.suser.vo.gradeclass.ClassVo;
+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 org.springframework.web.multipart.MultipartFile;
+
+import javax.annotation.Resource;
+import java.util.List;
+
+/**
+ * @author ywx
+ * @classname TClassStudentController
+ * @description 
+ * @date 2020/6/2 15:53
+ **/
+@RestController
+@RequestMapping("/class_student")
+public class ClassStudentController {
+    @Resource
+    private ClassStudentService classStudentService;
+
+    @PostMapping("/batch_add")
+    public ResultVo batchAdd(@RequestBody List<TClassStudent> students) {
+        try {
+            classStudentService.batchAdd(students);
+            return new ResultVo(0, "保存成功");
+        } catch (Exception e) {
+            return new ResultVo(1,e.getMessage());
+        }
+    }
+
+    //班级学生批量添加-取消的删除
+    @PostMapping("/batch_add2")
+    public ResultVo batchAdd2(@RequestBody ClassImportVo vo) {
+        try {
+            Integer classid = vo.getClassid();
+            List<Integer> studentIds = vo.getStudentIds();
+            classStudentService.batchAdd2(classid, studentIds);
+            return new ResultVo(0, "保存成功");
+        } catch (Exception e) {
+            return new ResultVo(1,e.getMessage());
+        }
+    }
+
+    @PostMapping("/add")
+    public ResultVo add(@RequestBody TClassStudent tClassStudent) {
+        Integer classid = tClassStudent.getClassid();
+        N_Utils.validation(new Object[]{classid,"班级id",1});
+        try {
+            Integer id = classStudentService.save(tClassStudent);
+            return new ResultVo(0, "保存成功",id);
+        } catch (Exception e) {
+            return new ResultVo(1,e.getMessage());
+        }
+    }
+
+    @PostMapping("/delete")
+    public ResultVo delete(@RequestBody TClassStudent tClassStudent) {
+        Integer classid = tClassStudent.getClassid();
+        Integer studentid = tClassStudent.getStudentid();
+        N_Utils.validation(new Object[]{studentid,"学生id",1,classid,"班级id",1});
+        classStudentService.deleteById(classid, studentid);
+        return new ResultVo(0,"移除成功");
+    }
+
+    @PostMapping("/update")
+    public ResultVo update(@RequestBody TClassStudent tClassStudent) {
+        N_Utils.validation(new Object[]{tClassStudent.getStudentid(),"学生id",1,tClassStudent.getStudentno(),"学号",2});
+        return classStudentService.update(tClassStudent);
+    }
+
+    @PostMapping("/list")
+    public ResultVo list(@RequestBody TClassStudent tClassStudent) {
+        Integer classid = tClassStudent.getClassid();
+        N_Utils.validation(new Object[]{classid, "班级id", 1});
+        Integer page = tClassStudent.getPage();
+        if (N_Utils.isEmptyInteger(page)) {
+            List<ClassStudentVo> list = classStudentService.findAll(tClassStudent);
+            return new ResultVo(0,"获取列表成功",list);
+        } else {
+            Integer pageSize = tClassStudent.getPageSize();
+            N_Utils.validation(new Object[]{pageSize, "显示条数", 1});
+            PageHelper.startPage(page, pageSize);
+            List<ClassStudentVo> list = classStudentService.findAll(tClassStudent);
+            PageResult pageResult = PageUtil.getPageResult(new PageInfo<>(list));
+            return new ResultVo(0, "获取列表成功", pageResult);
+        }
+    }
+
+    @PostMapping("/import_user")
+    public ResultVo importUser(MultipartFile file,TClassStudent tClassStudent) {
+        return classStudentService.importUser(file, tClassStudent);
+    }
+
+    //提高班学生导入
+    @PostMapping("/import_user2")
+    public ResultVo importUser2(MultipartFile file,TClassStudent tClassStudent) {
+        return classStudentService.importUser2(file, tClassStudent);
+    }
+
+    @PostMapping("/move_class")
+    public ResultVo moveClass(@RequestBody TClassStudent tClassStudent) {
+        Integer oldclassid = tClassStudent.getOldclassid();
+        Integer classid = tClassStudent.getClassid();
+        Integer studentid = tClassStudent.getStudentid();
+        N_Utils.validation(new Object[]{oldclassid,"原班级id",1,classid,"新班级id",1,studentid,"学生id",1});
+        try {
+            classStudentService.moveClass(oldclassid, classid, studentid);
+            return new ResultVo(0,"转班成功");
+        } catch (Exception e) {
+            return new ResultVo(1,e.getMessage());
+        }
+    }
+
+    @PostMapping("/remove_bind")
+    public ResultVo moveBind(@RequestBody TClassStudent tClassStudent) {
+        Integer studentid = tClassStudent.getStudentid();
+        N_Utils.validation(new Object[]{studentid,"学生id",1});
+        classStudentService.removeBind(studentid);
+        return new ResultVo(0,"解除mac绑定成功");
+    }
+
+    /**
+     *功能描述 获取学生所在班级
+     * @author WN
+     * @date 2020/10/20
+     * @param  * @param cs
+     * @return com.xhkjedu.vo.ResultVo
+     */
+    @PostMapping("/stu_class")
+    public ResultVo stuClass(@RequestBody ClassStudentVo cs) {
+        Integer studentid = cs.getStudentid();
+        N_Utils.validation(new Object[]{studentid,"学生id",1});
+        List<ClassVo> classlst = classStudentService.listClassByStudentId(studentid);
+        return new ResultVo(0,"获取学生所在班级成功",classlst);
+    }
+
+    @PostMapping("/list_no_class_stu")
+    public ResultVo listNoClassStu(@RequestBody TClassStudent student) {
+        Integer page = student.getPage();
+        Integer pageSize = student.getPageSize();
+        Integer schoolid = student.getSchoolid();
+        N_Utils.validation(new Object[]{page,"显示页码",1,pageSize,"显示条数",1,schoolid,"学校id",1});
+        PageHelper.startPage(page, pageSize);
+        List<ClassStudentVo> list = classStudentService.listNoClassStu(student);
+        PageResult pageResult = PageUtil.getPageResult(new PageInfo<>(list));
+        return new ResultVo(0,"获取没有班级学生列表成功",pageResult);
+    }
+
+    @PostMapping("/list_grade")
+    public ResultVo listGrade(@RequestBody ClassStudentVo student) {
+        Integer studentid = student.getStudentid();
+        N_Utils.validation(new Object[]{studentid,"学生id",1});
+        List<Integer> list = classStudentService.listGrade(studentid);
+        return new ResultVo(0,"获取学生所在年级列表成功",list);
+    }
+
+    //获取全校学生列表
+    @PostMapping("/all")
+    public ResultVo listAllSchool(@RequestBody TClassStudent student) {
+        Integer page = student.getPage();
+        Integer pageSize = student.getPageSize();
+        Integer schoolid = student.getSchoolid();
+        Integer classtype = student.getClasstype();
+        N_Utils.validation(new Object[]{page, "显示页码", 1, pageSize, "显示条数", 1, schoolid, "学校id", 1, classtype, "班级类型", 1});
+        classStudentService.setYear(student);
+        PageHelper.startPage(page, pageSize);
+        List<ClassStudentVo> list = classStudentService.listAllStudents(student);
+        PageResult pageResult = PageUtil.getPageResult(new PageInfo<>(list));
+        return new ResultVo(0, "获取全校学生列表成功", pageResult);
+    }
+
+    @PostMapping("/del_tgStu")
+    public ResultVo delTgStu(@RequestBody ClassStudentVo student) {
+        String loginname = student.getLoginname();
+        N_Utils.validation(new Object[]{loginname, "学生ids", 2});
+        classStudentService.delTgStu(loginname);
+        return new ResultVo(0, "删除学生所有提高班和所在提高班直播课成功");
+    }
+}

suser/src/main/java/com/xhkjedu/suser/controller/gradeclass/ClassTeacherController.java

@@ -0,0 +1,128 @@
+package com.xhkjedu.suser.controller.gradeclass;
+
+import com.github.pagehelper.PageHelper;
+import com.github.pagehelper.PageInfo;
+import com.xhkjedu.vo.PageResult;
+import com.xhkjedu.suser.model.gradeclass.TClass;
+import com.xhkjedu.suser.model.gradeclass.TClassTeacher;
+import com.xhkjedu.suser.service.gradeclass.ClassTeacherService;
+import com.xhkjedu.utils.N_Utils;
+import com.xhkjedu.utils.PageUtil;
+import com.xhkjedu.vo.ResultVo;
+import com.xhkjedu.suser.vo.gradeclass.ClassTeacherParams;
+import com.xhkjedu.suser.vo.gradeclass.ClassTeacherVo;
+import com.xhkjedu.suser.vo.gradeclass.ClassVo;
+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 TClassTeacherController
+ * @description 
+ * @date 2020/6/2 16:27
+ **/
+@RestController
+@RequestMapping("/class_teacher")
+public class ClassTeacherController {
+    @Resource
+    private ClassTeacherService classTeacherService;
+
+    @PostMapping("/add")
+    public ResultVo add(@RequestBody TClassTeacher tClassTeacher) {
+        Integer id = classTeacherService.save(tClassTeacher);
+        return new ResultVo(0, "保存成功",id);
+    }
+
+    @PostMapping("/update")
+    public ResultVo update(@RequestBody TClassTeacher tClassTeacher) {
+        N_Utils.validation(new Object[]{tClassTeacher.getTeacherid(),"教师id",1});
+        classTeacherService.update(tClassTeacher);
+        return new ResultVo(0,"修改成功");
+    }
+
+    @PostMapping("/detail")
+    public ResultVo detail(@RequestBody TClassTeacher tClassTeacher) {
+        N_Utils.validation(new Object[]{tClassTeacher.getCtid(),"班级教师id",1});
+        TClassTeacher classTeacher = classTeacherService.findById(tClassTeacher.getCtid());
+        return new ResultVo(0,"获取详情成功",classTeacher);
+    }
+
+    @PostMapping("/list")
+    public ResultVo list(@RequestBody TClassTeacher tClassTeacher) {
+        Integer schoolid = tClassTeacher.getSchoolid();
+        N_Utils.validation(new Object[]{tClassTeacher.getPage(),"显示页码",1,
+                tClassTeacher.getPageSize(),"显示条数",1,schoolid,"学校id",1});
+        Integer year = classTeacherService.getYear(schoolid);
+        PageHelper.startPage(tClassTeacher.getPage(),tClassTeacher.getPageSize());
+        List<ClassTeacherVo> list = classTeacherService.findAll(tClassTeacher, year);
+        PageResult pageResult = PageUtil.getPageResult(new PageInfo(list));
+        return new ResultVo(0,"获取列表成功",pageResult);
+    }
+
+    /**
+     *功能描述  获取教师当前年份任教班级
+     * @author WN
+     * @date 2020/6/13
+     * @param  * @param cl
+     */
+    @PostMapping("/tclist")
+    public ResultVo teacherClass(@RequestBody TClass cl) {
+        N_Utils.validation(new Object[]{cl.getCreateid(),"教师id",1});
+        List<ClassVo> list = classTeacherService.listTeacherClass(cl.getCreateid(),cl.getClasstype());
+        return new ResultVo(0,"获取教师任教班级",list);
+    }
+
+    @PostMapping("/tclist2")
+    public ResultVo teacherClass2(@RequestBody TClass cl) {
+        N_Utils.validation(new Object[]{cl.getCreateid(),"教师id",1});
+        List<ClassVo> list = classTeacherService.listTeacherClass2(cl.getCreateid());
+        return new ResultVo(0,"获取教师任教班级",list);
+    }
+
+    @PostMapping("/paper_student_list")
+    public ResultVo listPaperStudent(@RequestBody Map paper) {
+        Integer paperid = (Integer) paper.get("paperid");
+        N_Utils.validation(new Object[]{paperid,"作业id",1});
+        List<ClassVo> list = classTeacherService.listPaperStudent(paperid);
+        return new ResultVo(0,"获取作业学生列表成功",list);
+    }
+
+    @PostMapping("/paper_teacher_list")
+    public ResultVo listPaperTeacher(@RequestBody Map paper) {
+        Integer paperid = (Integer) paper.get("paperid");
+        String subjectid = paper.get("subjectid").toString();
+        N_Utils.validation(new Object[]{paperid,"作业id",1,subjectid,"科目id",2});
+        List<Map> list = classTeacherService.listPaperTeacher(paperid, subjectid);
+        return new ResultVo(0,"获取作业教师列表成功",list);
+    }
+
+    //获取当前年份年级下教师
+    @PostMapping("/listteachers")
+    public ResultVo listTeachers(@RequestBody TClass cl){
+        N_Utils.validation(new Object[]{cl.getSchoolid(),"学校id",1,cl.getGradeid(),"年级",1});
+        List<ClassTeacherVo> list = classTeacherService.listTeachersByGradeid(cl.getSchoolid(),cl.getGradeid());
+        return new ResultVo(0,"获取教师任教班级",list);
+    }
+
+    /**
+     *功能描述  获取年级科目下老师
+     * @author WN
+     * @date 2021/1/29
+     * @param  * @param
+     * @return com.xhkjedu.vo.ResultVo
+     */
+    @PostMapping("/tsc")
+    public ResultVo listTeachersBySubjectClass(@RequestBody ClassTeacherParams ctp){
+
+        N_Utils.validation(new Object[]{ctp.getSchoolid(),"学校id",1,
+                ctp.getGradeid(),"年级",1,ctp.getSubjectid(),"科目",1});
+        List<ClassTeacherVo> lst = classTeacherService.listTeahcersBySubjectGrade(ctp);
+        return  new ResultVo(0,"获取年级科目下教师",lst);
+    }
+}

suser/src/main/java/com/xhkjedu/suser/controller/gradeclass/GradeController.java

@@ -0,0 +1,87 @@
+package com.xhkjedu.suser.controller.gradeclass;
+
+import com.xhkjedu.suser.model.gradeclass.TGrade;
+import com.xhkjedu.suser.service.gradeclass.GradeService;
+import com.xhkjedu.utils.N_Utils;
+import com.xhkjedu.vo.ResultVo;
+import com.xhkjedu.suser.vo.gradeclass.GradeVo;
+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 TGradeController
+ * @description
+ * @date 2020/6/2 14:47
+ **/
+@RestController
+@RequestMapping("/grade")
+public class GradeController {
+    @Resource
+    private GradeService gradeService;
+
+    @PostMapping("/add")
+    public ResultVo add(@RequestBody TGrade tGrade) {
+        Integer id = gradeService.save(tGrade);
+        return new ResultVo(0, "保存成功",id);
+    }
+
+    @PostMapping("/delete")
+    public ResultVo delete(@RequestBody TGrade tGrade) {
+        N_Utils.validation(new Object[]{tGrade.getGradeid(),"年级id",1});
+        gradeService.deleteById(tGrade.getGradeid());
+        return new ResultVo(0,"删除成功");
+    }
+
+    @PostMapping("/update")
+    public ResultVo update(@RequestBody TGrade tGrade) {
+        N_Utils.validation(new Object[]{tGrade.getGradeid(),"年级id",1});
+        gradeService.update(tGrade);
+        return new ResultVo(0,"修改成功");
+    }
+
+    @PostMapping("/detail")
+    public ResultVo detail(@RequestBody TGrade tGrade) {
+        N_Utils.validation(new Object[]{tGrade.getGradeid(),"年级id",1});
+        TGrade grade = gradeService.findById(tGrade.getGradeid());
+        return new ResultVo(0,"获取详情成功",grade);
+    }
+
+    @PostMapping("/list")
+    public ResultVo list(@RequestBody TGrade tGrade) {
+        Integer schoolid = tGrade.getSchoolid();
+        N_Utils.validation(new Object[]{schoolid,"学校id",1});
+        List<TGrade> list = gradeService.findAll(schoolid);
+        return new ResultVo(0,"获取列表成功",list);
+    }
+
+    @PostMapping("/list_class")
+    public ResultVo listClass(@RequestBody TGrade tGrade) {
+        Integer schoolid = tGrade.getSchoolid();
+        N_Utils.validation(new Object[]{schoolid,"学校id",1});
+        List<GradeVo> list = gradeService.listClass(schoolid,tGrade.getClasstype());
+        return new ResultVo(0,"获取通知班级列表成功",list);
+    }
+
+    //教师设置班级权限
+    @PostMapping("/lct")
+    public ResultVo listClassForTeacher(@RequestBody TGrade tGrade) {
+        Integer schoolid = tGrade.getSchoolid();
+        N_Utils.validation(new Object[]{schoolid,"学校id",1});
+        List<GradeVo> list = gradeService.listClassForTeacher(schoolid);
+        return new ResultVo(0,"获取通知班级列表成功",list);
+    }
+
+    @PostMapping("/list_teacher")
+    public ResultVo listTeacher(@RequestBody TGrade tGrade) {
+        Integer schoolid = tGrade.getSchoolid();
+        N_Utils.validation(new Object[]{schoolid,"学校id",1});
+        List<GradeVo> list = gradeService.listTeacher(schoolid);
+        return new ResultVo(0,"获取通知教师列表成功",list);
+    }
+}

suser/src/main/java/com/xhkjedu/suser/controller/gradeclass/GroupController.java

@@ -0,0 +1,68 @@
+package com.xhkjedu.suser.controller.gradeclass;
+
+import com.xhkjedu.suser.model.gradeclass.TGroup;
+import com.xhkjedu.suser.service.gradeclass.GroupService;
+import com.xhkjedu.utils.N_Utils;
+import com.xhkjedu.vo.ResultVo;
+import com.xhkjedu.suser.vo.gradeclass.ClassGroupVo;
+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 TGroupController
+ * @description
+ * @date 2020/6/2 14:58
+ **/
+@RestController
+@RequestMapping("/group")
+public class GroupController {
+    @Resource
+    private GroupService groupService;
+
+    @PostMapping("/add")
+    public ResultVo add(@RequestBody TGroup tGroup) {
+        if (N_Utils.isListEmpty(tGroup.getStudents())){
+            return new ResultVo(1,"分组学生不能为空");
+        }
+        Integer id = groupService.save(tGroup);
+        return new ResultVo(0, "保存成功",id);
+    }
+
+    @PostMapping("/delete")
+    public ResultVo delete(@RequestBody TGroup tGroup) {
+        Integer grouptype = tGroup.getGrouptype();
+        N_Utils.validation(new Object[]{tGroup.getGroupid(),"班级分组id",1,grouptype,"班级分组类型",1});
+        if (grouptype == 1){
+            return new ResultVo(1,"全体分组禁止删除");
+        }
+        groupService.deleteById(tGroup.getGroupid());
+        return new ResultVo(0,"删除成功");
+    }
+
+    @PostMapping("/update")
+    public ResultVo update(@RequestBody TGroup tGroup) {
+        N_Utils.validation(new Object[]{tGroup.getGroupid(),"班级分组id",1});
+        groupService.update(tGroup);
+        return new ResultVo(0,"修改成功");
+    }
+
+    @PostMapping("/list")
+    public ResultVo list(@RequestBody TGroup tGroup) {
+        N_Utils.validation(new Object[]{tGroup.getClassid(),"班级id",1});
+        List<TGroup> list = groupService.findAll(tGroup.getClassid(), tGroup.getCreateid());
+        return new ResultVo(0,"获取列表成功",list);
+    }
+
+    @PostMapping("/teacher_list")
+    public ResultVo teacherList(@RequestBody TGroup tGroup) {
+        N_Utils.validation(new Object[]{tGroup.getCreateid(),"教师id",1});
+        List<ClassGroupVo> list = groupService.teacherList(tGroup.getCreateid());
+        return new ResultVo(0,"获取列表成功",list);
+    }
+}

suser/src/main/java/com/xhkjedu/suser/controller/gradeclass/GroupStudentController.java

@@ -0,0 +1,49 @@
+package com.xhkjedu.suser.controller.gradeclass;
+
+import com.xhkjedu.suser.model.gradeclass.TGroup;
+import com.xhkjedu.suser.model.gradeclass.TGroupStudent;
+import com.xhkjedu.suser.service.gradeclass.GroupStudentService;
+import com.xhkjedu.utils.N_Utils;
+import com.xhkjedu.vo.ResultVo;
+import com.xhkjedu.suser.vo.gradeclass.GroupStudentVo;
+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 TGroupStudentController
+ * @description 
+ * @date 2020/6/2 16:49
+ **/
+@RestController
+@RequestMapping("/group_student")
+public class GroupStudentController {
+    @Resource
+    private GroupStudentService groupStudentService;
+
+    @PostMapping("/add")
+    public ResultVo add(@RequestBody TGroup group) {
+        groupStudentService.batchSave(group);
+        return new ResultVo(0, "保存成功");
+    }
+
+    @PostMapping("/delete")
+    public ResultVo delete(@RequestBody TGroupStudent group) {
+        N_Utils.validation(new Object[]{group.getGroupid(),"分组id",1});
+        groupStudentService.deleteById(group);
+        return new ResultVo(0,"删除成功");
+    }
+
+    @PostMapping("/list")
+    public ResultVo list(@RequestBody TGroupStudent tGroupStudent) {
+        Integer groupid = tGroupStudent.getGroupid();
+        N_Utils.validation(new Object[]{groupid,"分组id",1});
+        List<GroupStudentVo> list = groupStudentService.findAll(groupid);
+        return new ResultVo(0,"获取列表成功",list);
+    }
+}

suser/src/main/java/com/xhkjedu/suser/controller/system/RoleController.java

@@ -0,0 +1,136 @@
+package com.xhkjedu.suser.controller.system;
+
+import com.github.pagehelper.PageHelper;
+import com.github.pagehelper.PageInfo;
+import com.xhkjedu.suser.model.system.TRole;
+import com.xhkjedu.suser.model.system.TUserRole;
+import com.xhkjedu.suser.service.system.RoleService;
+import com.xhkjedu.suser.vo.system.RoleModuleVo;
+import com.xhkjedu.suser.vo.system.RoleVo;
+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;
+
+/**
+ * @ClassName RoleController
+ * Description TODO
+ * Author WN
+ * Date 2020/6/13 17:46
+ **/
+@RestController
+@RequestMapping("role")
+public class RoleController {
+    @Autowired
+    private RoleService roleService;
+
+    //列表
+    @PostMapping("/list")
+    public ResultVo list(@RequestBody TRole role){
+        N_Utils.validation(new Object[]{
+                role.getSchoolid(),"学校id",1,
+                role.getPage(),"显示页数",1,
+                role.getPageSize(),"显示条数",1
+        });
+        PageHelper.startPage(role.getPage(),role.getPageSize());
+        List<TRole> roles = roleService.listAllRoles(role.getSchoolid());
+        PageResult pageResult = PageUtil.getPageResult(new PageInfo<>(roles));
+        return new ResultVo(0,"获取角色分页列表成功",pageResult);
+    }
+
+    //保存
+    @PostMapping("/save")
+    public ResultVo save(@RequestBody TRole role){
+        N_Utils.validation(new Object[]{
+                role.getRolename(),"角色名称",2,
+                role.getSchoolid(),"学校id",1
+        });
+        try {
+            Integer result = roleService.save(role);
+            if(result>0){
+                return new ResultVo(0,"保存成功");
+            }else{
+                return new ResultVo(1,"保存失败");
+            }
+        } catch (Exception e) {
+            return new ResultVo(1,"保存失败");
+        }
+    }
+
+    //修改
+    @PostMapping("/up")
+    public ResultVo up(@RequestBody TRole role){
+        N_Utils.validation(new Object[]{
+                role.getRoleid(),"角色id",1,
+                role.getRolename(),"角色名称",2
+        });
+        try {
+            Integer result = roleService.update(role);
+            if(result>0){
+                return new ResultVo(0,"修改成功");
+            }else{
+                return new ResultVo(1,"修改失败");
+            }
+        } catch (Exception e) {
+            return new ResultVo(1,"修改失败");
+        }
+    }
+
+    //删除
+    @PostMapping("/del")
+    public ResultVo del(@RequestBody TRole role){
+        N_Utils.validation(new Object[]{
+                role.getRoleid(),"角色id",1
+        });
+        Integer result = roleService.del(role.getRoleid());
+        if(result>0){
+            return new ResultVo(0,"删除成功");
+        }else{
+            return new ResultVo(1,"删除失败");
+        }
+    }
+
+    //角色详情
+    @PostMapping("/detail")
+    public ResultVo detail(@RequestBody TRole role){
+        N_Utils.validation(new Object[]{
+                role.getRoleid(),"角色id",1
+        });
+        RoleVo roleVo = roleService.getRoleDetail(role.getRoleid());
+        return new ResultVo(0,"获取角色详情成功",roleVo);
+    }
+
+    //获取用户角色权限
+    @PostMapping("/rmlst")
+    public ResultVo roleModule(@RequestBody TUserRole userRole){
+        N_Utils.validation(new Object[]{
+                userRole.getUserid(),"用户id",1
+        });
+        List<RoleModuleVo> lst = roleService.listModulesByUserid(userRole.getUserid());
+        return new ResultVo(0,"获取用户权限成功",lst);
+    }
+
+    /**
+     *功能描述 获取所有角色列表
+     * @author WN
+     * @date 2020/6/17
+     * @param  * @param role
+     * @return com.xhkjedu.vo.ResultVo
+     */
+    @PostMapping("/listall")
+    public ResultVo listAll(@RequestBody TRole role){
+        N_Utils.validation(new Object[]{
+                role.getSchoolid(),"学校id",1
+        });
+        List<TRole> roles = roleService.listAllRoles(role.getSchoolid());
+        return new ResultVo(0,"获取所有角色列表成功",roles);
+    }
+
+}

suser/src/main/java/com/xhkjedu/suser/controller/system/TeacherRoleController.java

@@ -0,0 +1,130 @@
+package com.xhkjedu.suser.controller.system;
+
+import com.xhkjedu.suser.service.system.TeacherRoleService;
+import com.xhkjedu.utils.N_Utils;
+import com.xhkjedu.vo.ResultVo;
+import com.xhkjedu.suser.vo.gradeclass.GradeVo;
+import com.xhkjedu.suser.vo.subjectbook.LsbBookVo;
+import com.xhkjedu.suser.vo.subjectbook.SubjectVo;
+import com.xhkjedu.suser.vo.system.TeacherRoleParam;
+import com.xhkjedu.suser.vo.system.TeacherRoleVo;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.List;
+
+/**
+ * @ClassName TeacherRoleController
+ * Description 教师设置权限
+ * Author WN
+ * Date 2020/6/18 9:43
+ **/
+@RestController
+@RequestMapping("/trole")
+public class TeacherRoleController {
+
+    @Autowired
+    private TeacherRoleService teacherRoleService;
+
+    /**
+     *功能描述  保存教师权限
+     * @author WN
+     * @date 2020/6/18
+     * @param  * @param trole
+     * @return com.xhkjedu.vo.ResultVo
+     */
+    @PostMapping("/save")
+    public ResultVo saveTeacherRole(@RequestBody TeacherRoleParam trole){
+        N_Utils.validation(new Object[]{
+                trole.getTeacherid(),"用户id",1
+        });
+        try {
+            teacherRoleService.save(trole);
+        } catch (Exception e) {
+            return new ResultVo(1,"保存失败");
+        }
+        return new ResultVo(0,"保存成功");
+    }
+
+    /**
+     *功能描述 修改时获取已有权限
+     * @author WN
+     * @date 2020/6/18
+     * @param  * @param trole
+     * @return com.xhkjedu.vo.ResultVo
+     */
+    @PostMapping("/toup")
+    public ResultVo toUpdate(@RequestBody TeacherRoleParam trole){
+        N_Utils.validation(new Object[]{
+                trole.getTeacherid(),"用户id",1
+        });
+        TeacherRoleVo trvo = teacherRoleService.getTeacherRoles(trole);
+        return new ResultVo(0,"获取教师权限成功",trvo);
+    }
+
+    /**
+     * 教师权限教材列表
+     * @Param [trole]
+     * @Author ywx
+     * @Date 2020/7/1 10:42
+     * @return com.xhkjedu.vo.ResultVo
+     **/
+    @PostMapping("/list_book")
+    public ResultVo listBook(@RequestBody TeacherRoleParam trole){
+        Integer teacherid = trole.getTeacherid();
+        N_Utils.validation(new Object[]{teacherid,"教师id",1});
+        TeacherRoleVo trvo = teacherRoleService.listBook(teacherid);
+        return new ResultVo(0,"获取教师权限教材列表成功",trvo);
+    }
+
+    /**
+     * 教师权限科目
+     * @Param [trole]
+     * @Author ywx
+     * @Date 2020/7/24 9:27
+     * @return com.xhkjedu.vo.ResultVo
+     **/
+    @PostMapping("/list_subject")
+    public ResultVo listSubject(@RequestBody TeacherRoleParam trole){
+        Integer teacherid = trole.getTeacherid();
+        N_Utils.validation(new Object[]{teacherid,"教师id",1});
+        List<SubjectVo> subject = teacherRoleService.listSubject(teacherid);
+        return new ResultVo(0,"获取教师权限科目列表成功",subject);
+    }
+
+    /**
+     *功能描述 教师权限科目下教材
+     * @author WN
+     * @date 2020/8/11
+     * @param  * @param trole
+     * @return com.xhkjedu.vo.ResultVo
+     */
+    @PostMapping("/list_sbook")
+    public ResultVo listSubjectBook(@RequestBody TeacherRoleParam trole){
+        Integer teacherid = trole.getTeacherid();
+        String subjectid = trole.getSubjectid();
+        N_Utils.validation(new Object[]{teacherid,"教师id",1,subjectid,"科目id",2});
+        List<LsbBookVo> subject = teacherRoleService.listBookBySubjectid(teacherid,subjectid);
+        return new ResultVo(0,"获取科目下权限教材列表成功",subject);
+    }
+
+    @PostMapping("/list_class")
+    public ResultVo listClass(@RequestBody TeacherRoleParam trole){
+        Integer teacherid = trole.getTeacherid();
+        N_Utils.validation(new Object[]{teacherid,"教师id",1});
+        List<GradeVo> list = teacherRoleService.listGradeClassesByUserid(trole);
+        return new ResultVo(0,"获取教师权限班级列表成功",list);
+    }
+
+    @PostMapping("/list_class2")
+    public ResultVo listClass2(@RequestBody TeacherRoleParam trole){
+        Integer teacherid = trole.getTeacherid();
+        N_Utils.validation(new Object[]{teacherid,"教师id",1});
+        List<GradeVo> list = teacherRoleService.listGradeClassesByUserid2(trole);
+        return new ResultVo(0,"获取教师权限班级列表成功",list);
+    }
+
+}

suser/src/main/java/com/xhkjedu/suser/controller/system/UserController.java

@@ -0,0 +1,378 @@
+package com.xhkjedu.suser.controller.system;
+
+import com.alibaba.fastjson.JSON;
+import com.xhkjedu.suser.model.system.TUser;
+import com.xhkjedu.suser.service.system.UserService;
+import com.xhkjedu.suser.utils.UserUtil;
+import com.xhkjedu.utils.N_Utils;
+import com.xhkjedu.vo.ResultVo;
+import com.xhkjedu.suser.vo.assess.AssessParams;
+import com.xhkjedu.suser.vo.system.TeacherVo;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.util.LinkedMultiValueMap;
+import org.springframework.util.MultiValueMap;
+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 org.springframework.web.multipart.MultipartFile;
+
+import javax.servlet.http.HttpServletRequest;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * @ClassName UserController
+ * Description
+ * Author WN
+ * Date 2020/5/29 16:29
+ **/
+@RestController
+@RequestMapping("user")
+public class UserController {
+    @Autowired
+    private UserService userService;
+    @Value("${ssourl}")
+    private String ssourl;
+
+    /**
+     *功能描述 登录接口--非学生
+     * @author WN
+     * @date 2020/6/1
+     * @param  * @param user
+     * @return com.xhkjedu.vo.ResultVo
+     */
+    @PostMapping("/login")
+    public ResultVo login(@RequestBody TUser user,HttpServletRequest request){
+//        if (N_Utils.isEmpty(user.getUltype())) return new ResultVo(1,"请更新新版本");
+        N_Utils.validation(new Object[]{user.getLoginname(),"登录名",2,user.getLoginpwd(),"登录密码",2});
+        if (user.getLoginname().length() > 18) return new ResultVo(1, "账号长度超过18个字符");
+        Integer usertype = user.getUsertype();
+        if (usertype != null && usertype == 2) {//学生登录
+            return userService.loginStudent(user, request);
+        } else {//教师、管理员登录
+            return userService.getUserByLoginnameAndPwd(user,request);
+        }
+    }
+
+    //教师登录
+    @PostMapping("/login_teacher")
+    public ResultVo loginTeacher(@RequestBody TUser user,HttpServletRequest request){
+//        if (N_Utils.isEmpty(user.getUltype())) return new ResultVo(1,"请更新新版本");
+        N_Utils.validation(new Object[]{user.getLoginname(),"登录名",2,user.getLoginpwd(),"登录密码",2});
+        if (user.getLoginname().length() > 18) return new ResultVo(1, "账号长度超过18个字符");
+        return userService.loginTeacher(user,request);
+    }
+
+    /**
+     *功能描述  登录--学生登录
+     * @author WN
+     * @date 2020/6/1
+     * @param  * @param user
+     * @return com.xhkjedu.vo.ResultVo
+     */
+    @PostMapping("/loginstu")
+    public ResultVo loginStudent(@RequestBody TUser user,HttpServletRequest request){
+        N_Utils.validation(new Object[]{user.getLoginname(),"登录名",2,user.getLoginpwd(),"登录密码",2});
+        if (user.getLoginname().length() > 18) return new ResultVo(1, "账号长度超过18个字符");
+        return userService.loginStudent(user,request);
+    }
+
+    /**
+     * 添加用户信息
+     * @Param [user]
+     * @Author ywx
+     * @Date 2020/6/2 9:44
+     * @return com.xhkjedu.vo.ResultVo
+     **/
+    @PostMapping("/add")
+    public ResultVo add(@RequestBody TUser user){
+        return userService.save(user);
+    }
+
+    /**
+     * 修改用户信息
+     * @Param [user]
+     * @Author ywx
+     * @Date 2020/6/2 9:51
+     * @return com.xhkjedu.vo.ResultVo
+     **/
+    @PostMapping("/update")
+    public ResultVo update(@RequestBody TUser user){
+        N_Utils.validation(new Object[]{user.getUserid(),"用户id",1});
+        return userService.update(user);
+    }
+
+    /**
+     * 删除用户
+     * @Param [user]
+     * @Author ywx
+     * @Date 2020/6/2 9:59
+     * @return com.xhkjedu.vo.ResultVo
+     **/
+    @PostMapping("/delete")
+    public ResultVo delete(@RequestBody TUser user){
+        N_Utils.validation(new Object[]{user.getUserid(),"用户id",1,user.getDeleteid(),"删除人id",1});
+        return userService.deleteById(user);
+    }
+
+    /**
+     * 获取用户列表
+     * @Param [user]
+     * @Author ywx
+     * @Date 2020/6/2 10:06
+     * @return com.xhkjedu.vo.ResultVo
+     **/
+    @PostMapping("/list")
+    public ResultVo list(@RequestBody TUser user){
+        N_Utils.validation(new Object[]{user.getPage(),"显示页码",1,user.getPageSize(),"显示条数",1,user.getSchoolid(),"学校id",1});
+        return userService.findAll(user);
+    }
+
+    /**
+     * 获取用户详情
+     * @Param [user]
+     * @Author ywx
+     * @Date 2020/6/2 10:23
+     * @return com.xhkjedu.vo.ResultVo
+     **/
+    @PostMapping("/detail")
+    public ResultVo detail(@RequestBody TUser user){
+        Integer userid = user.getUserid();
+        N_Utils.validation(new Object[]{userid,"用户id",1});
+        return userService.findById(userid);
+    }
+
+    /**
+     * 修改用户密码
+     * @Param [user]
+     * @Author ywx
+     * @Date 2020/6/2 10:30
+     * @return com.xhkjedu.vo.ResultVo
+     **/
+    @PostMapping("/update_pwd")
+    public ResultVo updatePwd(@RequestBody TUser user){
+        N_Utils.validation(new Object[]{user.getUserid(),"用户id",1,user.getOldpwd(),"原密码",2,user.getLoginpwd(),"新密码",2});
+        return userService.updatePwd(user);
+    }
+
+    /**
+     * 修改用户头像
+     * @Param [user]
+     * @Author ywx
+     * @Date 2020/6/2 10:37
+     * @return com.xhkjedu.vo.ResultVo
+     **/
+    @PostMapping("/update_headpic")
+    public ResultVo updateHeadPic(@RequestBody TUser user){
+        N_Utils.validation(new Object[]{user.getUserid(),"用户id",1});
+        return userService.updateHeadPic(user);
+    }
+
+    /**
+     * 检查登录账号是否存在
+     * @Param [user]
+     * @Author ywx
+     * @Date 2020/6/2 10:43
+     * @return com.xhkjedu.vo.ResultVo
+     **/
+    @PostMapping("/check_loginname")
+    public ResultVo checkLoginName(@RequestBody TUser user){
+        String loginname = user.getLoginname();
+        N_Utils.validation(new Object[]{loginname,"登录名",2});
+        return userService.checkLoginName(loginname);
+    }
+
+    /**
+     * 导入教师
+     * @Param [file, user]
+     * @Author ywx
+     * @Date 2020/6/5 8:42
+     * @return com.xhkjedu.vo.ResultVo
+     **/
+    @PostMapping("/import_teacher")
+    public ResultVo importTeacher(MultipartFile file, TUser user) {
+        return userService.importTeacher(file, user);
+    }
+
+    /**
+     *功能描述  设置操作密码
+     * @author WN
+     * @date 2020/6/17
+     * @param  * @param user
+     * @return com.xhkjedu.vo.ResultVo
+     */
+    @PostMapping("/update_opepass")
+    public ResultVo updateOpepass(@RequestBody TUser user){
+        N_Utils.validation(new Object[]{
+                user.getUserid(),"用户id",1,
+                user.getOpepassword(),"操作密码",2
+        });
+        userService.updateOpepasswordByUserId(user);
+        return new ResultVo(0,"设置操作密码成功");
+    }
+
+    /**
+     *功能描述  验证操作密码是否正确
+     * @author WN
+     * @date 2020/6/17
+     * @param  * @param user
+     * @return com.xhkjedu.vo.ResultVo
+     */
+    @PostMapping("/validate_opepass")
+    public ResultVo validateOpepass(@RequestBody TUser user){
+        N_Utils.validation(new Object[]{
+                user.getUserid(),"用户id",1,
+                user.getOpepassword(),"操作密码",2
+        });
+        Integer result = userService.getUserIdByOpepassword(user);
+        if(result==1){
+            return new ResultVo(0,"操作密码验证成功");
+        }else{
+            return new ResultVo(1,"操作密码输入有误");
+        }
+
+    }
+
+    /**
+     * 教师基本信息
+     * @Param [user]
+     * @Author ywx
+     * @Date 2020/6/29 16:23
+     * @return com.xhkjedu.vo.ResultVo
+     **/
+    @PostMapping("/teacher_info")
+    public ResultVo teacherInfo(@RequestBody TUser user){
+        Integer userid = user.getUserid();
+        N_Utils.validation(new Object[]{userid,"用户id",1});
+        TeacherVo teacherVo = userService.getTeacherInfo(userid, user.getClasstype());
+        return new ResultVo(0,"获取教师基本信息成功",teacherVo);
+    }
+
+    /**
+     * 重置密码
+     * @Param [user]
+     * @Author ywx
+     * @Date 2020/7/30 14:25
+     * @return com.xhkjedu.vo.ResultVo
+     **/
+    @PostMapping("/reset_pwd")
+    public ResultVo resetPwd(@RequestBody TUser user){
+        N_Utils.validation(new Object[]{user.getUserid(),"用户id",1,user.getLoginpwd(),"密码",2});
+        return userService.resetPwd(user);
+    }
+
+    /**
+     * 生成修改码
+     * @Param [user]
+     * @Author ywx
+     * @Date 2020/10/13 15:08
+     * @return com.xhkjedu.vo.ResultVo
+     **/
+    @PostMapping("/update_code")
+    public ResultVo updateCode(@RequestBody TUser user) {
+        String userphone = user.getUserphone();
+        N_Utils.validation(new Object[]{userphone,"手机号",2});
+        return userService.updateCode(userphone);
+    }
+
+    /**
+     * 通过短信修改密码
+     * @Param [user]
+     * @Author ywx
+     * @Date 2020/10/13 15:12
+     * @return com.xhkjedu.vo.ResultVo
+     **/
+    @PostMapping("/update_pwd_byCode")
+    public ResultVo updatePwdByCode(@RequestBody TUser user) {
+        String userphone = user.getUserphone();
+        String loginpwd = user.getLoginpwd();
+        Integer msgcode = user.getMsgcode();
+        N_Utils.validation(new Object[]{userphone,"手机号",2,loginpwd,"密码",2,msgcode,"验证码",1});
+        return userService.updatePwdByCode(user);
+    }
+
+    /**
+     * 生成登录确认码
+     * @Param [user]
+     * @Author ywx
+     * @Date 2020/10/13 15:18
+     * @return com.xhkjedu.vo.ResultVo
+     **/
+    @PostMapping("/login_code")
+    public ResultVo loginCode(@RequestBody TUser user) {
+        String userphone = user.getUserphone();
+        N_Utils.validation(new Object[]{userphone,"手机号",2});
+        return userService.loginCode(userphone);
+    }
+
+    /**
+     * 验证码登录
+     * @Param [user]
+     * @Author ywx
+     * @Date 2020/10/13 15:35
+     * @return com.xhkjedu.vo.ResultVo
+     **/
+    @PostMapping("/login_byCode")
+    public ResultVo loginByCode(@RequestBody TUser user,HttpServletRequest request) {
+        if (N_Utils.isEmpty(user.getUltype())) return new ResultVo(1,"请更新新版本");
+        String userphone = user.getUserphone();
+        Integer msgcode = user.getMsgcode();
+        N_Utils.validation(new Object[]{userphone,"手机号",2,msgcode,"验证码",1});
+        return userService.loginByCode(user, request);
+    }
+
+    /**
+     * 批量修改用户密码
+     * @Param [user]
+     * @Author ywx
+     * @Date 2020/10/30 16:04
+     * @return com.xhkjedu.vo.ResultVo
+     **/
+    @PostMapping("/batch_update_pwd")
+    public ResultVo batchUpdatePwd(@RequestBody TUser user){
+        N_Utils.validation(new Object[]{user.getSchoolid(),"学校id",1,user.getLoginpwd(),"新密码",2});
+        if (N_Utils.isListEmpty(user.getUsertypes())) return new ResultVo(1,"用户类型集合不能为空");
+        return userService.batchUpdatePwd(user);
+    }
+
+    //校验登录状态成功
+    @PostMapping("/check_login")
+    public ResultVo checkLogin(@RequestBody TUser user){
+        Integer userid = user.getUserid();
+        String loginpwd = user.getLoginpwd();
+        N_Utils.validation(new Object[]{userid,"用户id",1,loginpwd,"登录密码",2});
+        return userService.checkLogin(userid, loginpwd);
+    }
+
+    @PostMapping("/list_sel")
+    public ResultVo listForSel(@RequestBody AssessParams user) {
+        Integer schoolid = user.getSchoolid();
+        N_Utils.validation(new Object[]{schoolid, "学校id", 1, user.getGradeid(), "年级id", 1
+                , user.getClassid(), "班级id", 1, user.getSubjectid(), "科目id", 2});
+        List<Map> list = userService.listForSel(user);
+        return new ResultVo(0, "获取用户选择列表成功", list);
+    }
+
+    /**
+     * 用户名登录
+     * @Param [user, request]
+     * @Author ywx
+     * @Date 2021/11/18 9:52
+     * @return com.xhkjedu.vo.ResultVo
+     **/
+    @PostMapping("/login_byName")
+    public ResultVo loginByName(@RequestBody TUser user,HttpServletRequest request) {
+        String loginname = user.getLoginname();
+        N_Utils.validation(new Object[]{loginname,"token",2});
+        MultiValueMap<String, String> param = new LinkedMultiValueMap<>();
+        param.add("token",loginname);
+        String str = UserUtil.sendFormData(ssourl, param);
+        ResultVo result = JSON.parseObject(str, ResultVo.class);
+        if (result.getCode() != 0) return result;
+        Map map = JSON.parseObject(result.getObj().toString(),Map.class);
+        user.setLoginname(map.get("loginname").toString());
+        return userService.loginByName(user, request);
+    }
+}

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

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

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

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

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

@@ -0,0 +1,66 @@
+package com.xhkjedu.suser.interceptors;
+
+import com.alibaba.fastjson.JSON;
+import com.xhkjedu.suser.utils.JedisUtil;
+import com.xhkjedu.utils.N_Utils;
+import com.xhkjedu.vo.ResultVo;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.web.servlet.HandlerInterceptor;
+import org.springframework.web.servlet.ModelAndView;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+@Configuration
+@Slf4j
+public class RequestInterceptor extends JedisUtil implements HandlerInterceptor {
+    @Override
+    public void afterCompletion(HttpServletRequest arg0, HttpServletResponse arg1, Object arg2, Exception arg3)
+            throws Exception {
+        // 请求结束时间
+        Long endTime = System.currentTimeMillis();
+        // 从HttpServletRequest获取开始时间
+        Long startTime = (Long) arg0.getAttribute("_startTime");
+        double time = ((endTime - startTime) * 1.000) / 1000;
+        // 打印接口信息及耗时
+        if (time > 1) {
+            log.error(" {}；耗时：{}s", arg0.getRequestURI(), time);
+        }
+    }
+
+    @Override
+    public void postHandle(HttpServletRequest arg0, HttpServletResponse arg1, Object arg2, ModelAndView arg3)
+            throws Exception {
+
+    }
+
+    /**
+     * 在调用controller具体方法前拦截
+     */
+    @Override
+    public boolean preHandle(HttpServletRequest request, HttpServletResponse response, Object handler) throws Exception {
+//        log.info("请求的uri:" + request.getRequestURI());
+        response.setHeader("Access-Control-Allow-Origin", "*");
+        response.setContentType("application/json;charset=UTF-8");
+
+        // 记录请求开始时间
+        request.setAttribute("_startTime", System.currentTimeMillis());
+        String requestURI = request.getRequestURI();
+        String key = request.getHeader("Token-Key");
+        String token = request.getHeader("Token-Value");
+        if (!requestURI.contains("user/login") && !requestURI.endsWith("/get_new")
+                && N_Utils.isNotEmpty(key) && N_Utils.isNotEmpty(token)) {//非登录和获取最新版本相关接口验证token
+            String redis_token = get(key);//系统缓存中保存的token
+            if (!token.equals(redis_token)) {
+                ResultVo result = new ResultVo();
+                result.setCode(2);
+                result.setMsg("登录失效");
+
+                response.getWriter().print(JSON.toJSONString(result));
+                return false;
+            }
+        }
+        return true;
+    }
+}

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

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

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

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

suser/src/main/java/com/xhkjedu/suser/mapper/gradeclass/ClassMapper.java

@@ -0,0 +1,54 @@
+package com.xhkjedu.suser.mapper.gradeclass;
+
+import com.xhkjedu.suser.base.TkMapper;
+import com.xhkjedu.suser.model.gradeclass.TClass;
+import com.xhkjedu.suser.vo.gradeclass.ClassVo;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+public interface ClassMapper extends TkMapper<TClass> {
+    //获取学校班级列表
+    List<ClassVo> findAll(@Param("tClass") TClass tClass);
+
+    //更新学生数量
+    void updateNum(@Param("classid") Integer classid);
+
+    //更新班级、分组学生数量
+    void updateNum2(@Param("classid") Integer classid);
+
+    //要升级的班级列表
+    List<TClass> listClassBySchoolId(@Param("schoolid") Integer schoolid,@Param("year") Integer year);
+    //升级时要毕业的班级列表
+    List<TClass> listClassBiyeBySchoolId(@Param("schoolid") Integer schoolid,@Param("year") Integer year,@Param("classstate") Integer classstate);
+
+    //要升级的班级id字符串
+    String listClassIdBySchoolId(@Param("schoolid") Integer schoolid,@Param("year") Integer year);
+
+    //基本信息
+    ClassVo getById(Integer classid);
+
+    //年级下班级id集合
+    List<Integer> listClassidsByGradeid(@Param("gradeid") Integer gradeid,@Param("schoolid") Integer schoolid);
+
+    //根据班级名称获取班级信息
+    TClass getByName(@Param("tClass") TClass tClass);
+
+    //获取任教老师列表
+    List<String> listTeacher(@Param("classid") Integer classid);
+
+    //修改班级状态
+    void updateClassState(@Param("classstate") Integer classstate, @Param("classids") String classids);
+
+    //修改单个班级状态
+    Integer updateClassstateByClassid(@Param("classid") Integer classid, @Param("classstate") Integer classstate);
+
+    //修改的那个班级类型
+    Integer updateClasstype(@Param("classid") Integer classid, @Param("classtype") Integer classtype);
+
+    //获取班级当前年份
+    Integer getYearById(Integer classid);
+
+    //根据班级名称获取班级id
+    Integer getClassIdByName(String classname, Integer schoolid, Integer gradeid, Integer year);
+}

suser/src/main/java/com/xhkjedu/suser/mapper/gradeclass/ClassStudentMapper.java

@@ -0,0 +1,63 @@
+package com.xhkjedu.suser.mapper.gradeclass;
+
+import com.xhkjedu.suser.base.TkMapper;
+import com.xhkjedu.suser.model.gradeclass.TClassStudent;
+import com.xhkjedu.suser.vo.gradeclass.ClassStudentVo;
+import com.xhkjedu.suser.vo.gradeclass.ClassVo;
+import com.xhkjedu.suser.vo.gradeclass.ImportStudentVo;
+import com.xhkjedu.suser.vo.paper.AStudentPaperVo;
+import com.xhkjedu.suser.vo.paper.AnalyzeSearchVo;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+public interface ClassStudentMapper extends TkMapper<TClassStudent> {
+    //班级学生列表
+    List<ClassStudentVo> findAll(@Param("student") TClassStudent student);
+
+    //删除班级、分组对应学生
+    void deleteById(@Param("classid") Integer classid,@Param("studentid") Integer studentid);
+
+    //班级学生数量
+    ImportStudentVo getNumById(@Param("classid") Integer classid, @Param("studentid") Integer studentid, @Param("year") Integer year);
+
+    //获取学生行政班id
+    Integer getClassIdByStuId(@Param("studentid") Integer studentid);
+
+    //获取要升级的学生列表
+    List<TClassStudent> listStudentByClassIds(@Param("classIds") String classIds);
+
+    /**
+     * 根据班级id和学生id获取班级学生信息
+     * @Param [classid, studentid]
+     * @Author ywx
+     * @Date 2020/6/19 10:08
+     * @return com.xhkjedu.model.gradeclass.TClassStudent
+     **/
+    TClassStudent getByClassIdStudentId(@Param("classid") Integer classid,@Param("studentid") Integer studentid);
+
+    List<ClassVo> listClassByStudentId(Integer year,Integer studentid);
+
+    List<ClassStudentVo> listNoClassStu(@Param("student") TClassStudent student);
+
+    //获取学生所在年级列表
+    List<Integer> listGrade(@Param("studentid") Integer studentid,@Param("year") Integer year);
+
+    //获取全校学生
+    List<ClassStudentVo> listAllStudents(@Param("student") TClassStudent student);
+
+    //获取班级学生id列表
+    List<Integer> listStudentIdByClassId(@Param("classid") Integer classid);
+
+    //添加
+    void save(@Param("student") TClassStudent student);
+
+    //学生所在行政班
+    ClassVo getClassByStuId(@Param("studentid") Integer studentid);
+
+    //作业/预习统计--学生列表
+    List<AStudentPaperVo> listStu(@Param("paper") AnalyzeSearchVo paper);
+
+    //获取学生所有提高班
+    List<Integer> listTgClassid(Integer studentid);
+}

suser/src/main/java/com/xhkjedu/suser/mapper/gradeclass/ClassTeacherMapper.java

@@ -0,0 +1,90 @@
+package com.xhkjedu.suser.mapper.gradeclass;
+
+import com.xhkjedu.suser.base.TkMapper;
+import com.xhkjedu.suser.model.gradeclass.TClassTeacher;
+import com.xhkjedu.suser.vo.gradeclass.ClassTeacherParams;
+import com.xhkjedu.suser.vo.gradeclass.ClassTeacherVo;
+import com.xhkjedu.suser.vo.gradeclass.ClassVo;
+import com.xhkjedu.suser.vo.gradeclass.GradeVo;
+import com.xhkjedu.suser.vo.system.TeacherRoleParam;
+import org.apache.ibatis.annotations.Param;
+import org.springframework.stereotype.Repository;
+
+import java.util.List;
+import java.util.Map;
+
+@Repository
+public interface ClassTeacherMapper extends TkMapper<TClassTeacher> {
+    //学校教师列表
+    List<ClassTeacherVo> findAll(@Param("teacher") TClassTeacher teacher);
+
+    /**
+     *功能描述  当前年份教师任教班级
+     * @author WN
+     * @date 2020/6/13
+     * @param  * @param teacherid
+     * @param year
+     * @return java.util.List<com.xhkjedu.suser.vo.gradeclass.ClassVo>
+     */
+    List<ClassVo> listTeacherClass(@Param("teacherid") Integer teacherid,@Param("year") Integer year,@Param("classtype") Integer classtype);
+
+    //当前年份教师任教班级
+    List<ClassVo> listTeacherClass2(@Param("teacherid") Integer teacherid,@Param("year") Integer year);
+
+    /**
+     * 要升级的教师列表
+     * @Param [classIds]
+     * @Author ywx
+     * @Date 2020/6/16 14:04
+     * @return java.util.List<com.xhkjedu.model.gradeclass.TClassTeacher>
+     **/
+    List<TClassTeacher> listTeacherByClassIds(@Param("classIds") String classIds);
+
+    //删除教师任教班级
+    void deleteByUserid(Integer userid,Integer year);
+
+    //教师任教班级id集合
+    List<ClassVo> listClassesByUserid(Integer userid, Integer year, Integer classtype);
+
+    //教师任教班级年级层级
+    List<GradeVo> listGradeClassesByUserid(@Param("role") TeacherRoleParam role);
+
+    /**
+     * 获取作业学生列表
+     * @Param [paperid]
+     * @Author ywx
+     * @Date 2020/7/10 15:51
+     * @return java.util.List<com.xhkjedu.suser.vo.gradeclass.ClassVo>
+     **/
+    List<ClassVo> listPaperStudent(Integer paperid);
+
+    //获取作业教师列表
+    List<Map> listPaperTeacher(@Param("paperid") Integer paperid,@Param("subjectid") String subjectid);
+
+    /**
+     *功能描述 年级下教师集合
+     * @author WN
+     * @date 2021/1/23
+     * @param  * @param schoolid
+     * @param gradeid
+     * @return java.util.List<com.xhkjedu.model.gradeclass.TClassTeacher>
+     */
+    List<ClassTeacherVo> listTeachersByGradeid(Integer schoolid,Integer gradeid,Integer year);
+
+    /**
+     *功能描述 获取年级科目下教师集合
+     * @author WN
+     * @date 2021/1/29
+     * @param  * @param ctp
+     * @return java.util.List<com.xhkjedu.suser.vo.gradeclass.ClassTeacherVo>
+     */
+    List<ClassTeacherVo> listTeahcersBySubjectGrade(@Param("ctp") ClassTeacherParams ctp);
+
+    List<GradeVo> listGradeClassesByUserid2(@Param("role") TeacherRoleParam role);
+
+    //删除班级下所有教师
+    void deleteByClassId(Integer classid);
+
+    //获取教师任教行政和提高班id
+    String getClassIds(Integer teacherid);
+}

suser/src/main/java/com/xhkjedu/suser/mapper/gradeclass/GradeMapper.java

@@ -0,0 +1,36 @@
+package com.xhkjedu.suser.mapper.gradeclass;
+
+import com.xhkjedu.suser.base.TkMapper;
+import com.xhkjedu.suser.model.gradeclass.TGrade;
+import com.xhkjedu.suser.vo.gradeclass.GradeVo;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+public interface GradeMapper extends TkMapper<TGrade> {
+    //学校年级列表
+    List<TGrade> findAll(@Param("schoolid") Integer schoolid,@Param("year") Integer year);
+
+    //详情
+    TGrade findById(@Param("gradeid") Integer gradeid);
+
+    /**
+     * 获取通知班级列表
+     * @Param [schoolid, year]
+     * @Author ywx
+     * @Date 2020/6/13 15:41
+     * @return java.util.List<com.xhkjedu.suser.vo.gradeclass.GradeVo>
+     **/
+    List<GradeVo> listClass(@Param("schoolid") Integer schoolid, @Param("year") Integer year,@Param("classtype") Integer classtype);
+
+    /**
+     * 获取通知教师列表
+     * @Param [schoolid, year]
+     * @Author ywx
+     * @Date 2020/6/13 15:43
+     * @return java.util.List<com.xhkjedu.suser.vo.gradeclass.GradeVo>
+     **/
+    List<GradeVo> listTeacher(@Param("schoolid") Integer schoolid, @Param("year") Integer year);
+
+    List<GradeVo> listClassForTeacher(Integer schoolid, Integer year);
+}

suser/src/main/java/com/xhkjedu/suser/mapper/gradeclass/GroupMapper.java

@@ -0,0 +1,26 @@
+package com.xhkjedu.suser.mapper.gradeclass;
+
+import com.xhkjedu.suser.base.TkMapper;
+import com.xhkjedu.suser.model.gradeclass.TGroup;
+import com.xhkjedu.suser.vo.gradeclass.ClassGroupVo;
+import org.apache.ibatis.annotations.Param;
+import org.springframework.stereotype.Repository;
+
+import java.util.List;
+
+@Repository
+public interface GroupMapper extends TkMapper<TGroup> {
+    //更新分组人数
+    void updateNum(@Param("groupid") Integer groupid);
+
+    //获取列表
+    List<TGroup> findAll(@Param("classid") Integer classid,@Param("createid") Integer createid);
+
+    //教师分组列表
+    List<ClassGroupVo> teacherList(@Param("teacherid") Integer teacherid,@Param("year") Integer year);
+
+    List<Integer> listStudentidsByGroupids(@Param("groupids") String groupids);
+
+    //要升级的全体分组列表
+    List<TGroup> listStudentByClassIds(@Param("classIds") String classIds);
+}

suser/src/main/java/com/xhkjedu/suser/mapper/gradeclass/GroupStudentMapper.java

@@ -0,0 +1,22 @@
+package com.xhkjedu.suser.mapper.gradeclass;
+
+import com.xhkjedu.suser.base.TkMapper;
+import com.xhkjedu.suser.model.gradeclass.TGroupStudent;
+import com.xhkjedu.suser.vo.gradeclass.GroupStudentVo;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+public interface GroupStudentMapper extends TkMapper<TGroupStudent> {
+    //列表
+    List<GroupStudentVo> findAll(Integer groupid);
+
+    //获取要升级的学生列表
+    List<TGroupStudent> listStudentByGroupIds(@Param("groupIds") String groupIds);
+
+    //删除分组学生
+    Integer deleteByGroupId(Integer groupid);
+
+    //添加
+    void save(@Param("student") TGroupStudent student);
+}

suser/src/main/java/com/xhkjedu/suser/mapper/system/RoleMapper.java

@@ -0,0 +1,36 @@
+package com.xhkjedu.suser.mapper.system;
+
+import com.xhkjedu.suser.base.TkMapper;
+import com.xhkjedu.suser.model.system.TRole;
+import com.xhkjedu.suser.vo.system.RoleVo;
+import org.apache.ibatis.annotations.Param;
+import org.springframework.stereotype.Repository;
+
+import java.util.List;
+
+/**
+ * @ClassName RoleMapper
+ * Description TODO
+ * Author WN
+ * Date 2020/6/13 17:40
+ **/
+@Repository
+public interface RoleMapper extends TkMapper<TRole> {
+    /**
+     *功能描述  获取所有角色
+     * @author WN
+     * @date 2020/6/15
+     * @param  * @param schoolid
+     * @return java.util.List<com.xhkjedu.model.system.TRole>
+     */
+    List<TRole> listAllRoles (@Param("schoolid")Integer schoolid);
+
+    /**
+     *功能描述 获取角色详情，包含用户
+     * @author WN
+     * @date 2020/6/15
+     * @param  * @param roleid
+     * @return RoleVo
+     */
+    RoleVo getRoleDetail(@Param("roleid")Integer roleid);
+}

suser/src/main/java/com/xhkjedu/suser/mapper/system/RoleModuleMapper.java

@@ -0,0 +1,55 @@
+package com.xhkjedu.suser.mapper.system;
+
+import com.xhkjedu.suser.base.TkMapper;
+import com.xhkjedu.suser.model.system.TRoleModule;
+import com.xhkjedu.suser.vo.system.RoleModuleVo;
+import org.apache.ibatis.annotations.Param;
+import org.springframework.stereotype.Repository;
+
+import java.util.List;
+
+/**
+ * @ClassName RoleModuleMapper
+ * Description 角色模块
+ * Author WN
+ * Date 2020/6/15 9:32
+ **/
+@Repository
+public interface RoleModuleMapper extends TkMapper<TRoleModule> {
+
+    /**
+     *功能描述  获取角色下素有权限
+     * @author WN
+     * @date 2020/6/15
+     * @param  * @param roleid
+     * @return java.util.List<com.xhkjedu.suser.vo.system.RoleModuleVo>
+     */
+    List<RoleModuleVo> listRoleModules(@Param("roleid")Integer roleid);
+
+    /**
+     *功能描述  批量角色模块信息
+     * @author WN
+     * @date 2020/6/15
+     * @param  * @param list
+     * @return void
+     */
+    void saveBathRoleModule(@Param("list")List<TRoleModule> list);
+
+    /**
+     *功能描述 根据角色id删除角色模块关联信息
+     * @author WN
+     * @date 2020/6/15
+     * @param  * @param roleid
+     * @return void
+     */
+    void deleteByRoleid(@Param("roleid")Integer roleid);
+
+    /**
+     *功能描述 根据用户id获取用户拥有角色所关联的所有模块
+     * @author WN
+     * @date 2020/6/15
+     * @param  * @param userid
+     * @return java.util.List<com.xhkjedu.suser.vo.system.RoleModuleVo>
+     */
+    List<RoleModuleVo> listModulesByUserid(@Param("userid")Integer userid);
+}

suser/src/main/java/com/xhkjedu/suser/mapper/system/UserMapper.java

@@ -0,0 +1,211 @@
+package com.xhkjedu.suser.mapper.system;
+
+import com.xhkjedu.suser.base.TkMapper;
+import com.xhkjedu.suser.model.gradeclass.TClassStudent;
+import com.xhkjedu.suser.model.system.TUser;
+import com.xhkjedu.suser.model.system.TUserLog;
+import com.xhkjedu.suser.vo.assess.AssessParams;
+import com.xhkjedu.suser.vo.system.TeacherVo;
+import com.xhkjedu.suser.vo.system.UserVo;
+import org.apache.ibatis.annotations.Param;
+import org.springframework.stereotype.Repository;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * @ClassName UserMapper
+ * Description
+ * Author WN
+ * Date 2020/5/29 17:00
+ **/
+@Repository
+public interface UserMapper extends TkMapper<TUser> {
+
+    /**
+     *功能描述  根据帐号密码获取用户
+     * @author WN
+     * @date 2020/5/29
+     * @param  * @param loginname
+     * @return com.xhkjedu.model.system.TUser
+     */
+    UserVo getUserByLoginname(String loginname);
+
+    /**
+     * 删除用户
+     * @Param [user]
+     * @Author ywx
+     * @Date 2020/6/2 9:59
+     * @return java.lang.Integer
+     **/
+    Integer deleteById(@Param("user") TUser user);
+
+    /**
+     * 获取用户列表
+     * @Param [user]
+     * @Author ywx
+     * @Date 2020/6/2 10:07
+     * @return java.util.List<com.xhkjedu.suser.vo.system.UserVo>
+     **/
+    List<UserVo> findAll(@Param("user") TUser user);
+
+    /**
+     * 获取用户详情
+     * @Param [userid]
+     * @Author ywx
+     * @Date 2020/6/2 10:23
+     * @return com.xhkjedu.suser.vo.system.UserVo
+     **/
+    UserVo findById(@Param("userid") Integer userid);
+
+    /**
+     * 修改用户密码
+     * @Param [user]
+     * @Author ywx
+     * @Date 2020/6/2 10:30
+     * @return java.lang.Integer
+     **/
+    Integer updatePwd(@Param("user") TUser user);
+
+    /**
+     * 修改用户头像
+     * @Param [user]
+     * @Author ywx
+     * @Date 2020/6/2 10:36
+     * @return java.lang.Integer
+     **/
+    Integer updateHeadPic(@Param("user") TUser user);
+
+    /**
+     * 检查登录账号是否存在
+     * @Param [loginname]
+     * @Author ywx
+     * @Date 2020/6/2 10:44
+     * @return java.lang.Integer
+     **/
+    Integer checkLoginName(@Param("loginname") String loginname);
+
+    /**
+     * 根据登录账号获取用户详情
+     * @Param [loginname]
+     * @Author ywx
+     * @Date 2020/6/3 9:33
+     * @return com.xhkjedu.model.system.TUser
+     **/
+    TUser getObjByLoginName(@Param("loginname") String loginname);
+
+    /**
+     * 修改用户状态
+     * @Param [userid, userstate]
+     * @Author ywx
+     * @Date 2020/6/4 9:08
+     * @return void
+     **/
+    void updateState(@Param("userid") Integer userid,@Param("userstate") int userstate);
+
+    /**
+     *功能描述 设置操作密码
+     * @author WN
+     * @date 2020/6/17
+     * @param  * @param userid
+     * @param opepassword
+     * @return void
+     */
+    void updateOpepasswordByUserId(@Param("userid") Integer userid,@Param("opepassword") String opepassword);
+
+    /**
+     *功能描述 验证用户操作密码是否正确
+     * @author WN
+     * @date 2020/6/17
+     * @param  * @param userid
+     * @param opepassword
+     * @return java.lang.Integer
+     */
+    Integer getUserIdByOpepassword(@Param("userid") Integer userid,@Param("opepassword") String opepassword);
+
+    /**
+     * 教师基本信息
+     * @Param [userid]
+     * @Author ywx
+     * @Date 2020/6/29 16:24
+     * @return com.xhkjedu.suser.vo.system.TeacherVo
+     **/
+    TeacherVo getTeacherInfo(Integer userid, Integer classtype);
+
+    /**
+     * 更新学生硬件绑定信息
+     * @Param [user]
+     * @Author ywx
+     * @Date 2020/9/18 11:38
+     * @return void
+     **/
+    void updateBindMac(@Param("user") UserVo user);
+
+    /**
+     * 根据登录账号和硬件地址获取用户信息
+     * @Param [loginname, mac]
+     * @Author ywx
+     * @Date 2020/9/21 16:17
+     * @return com.xhkjedu.suser.vo.system.UserVo
+     **/
+    UserVo getUserByLoginnameMac(String loginname, String mac);
+
+    /**
+     * 删除学生绑定信息
+     * @Param [schoolid]
+     * @Author ywx
+     * @Date 2020/9/24 11:42
+     * @return void
+     **/
+    void delBindmac(Integer schoolid);
+
+    /**
+     * 通过短信修改密码
+     * @Param [user]
+     * @Author ywx
+     * @Date 2020/10/13 15:17
+     * @return void
+     **/
+    void updatePwdByCode(@Param("user") TUser user);
+
+    /**
+     * 批量修改用户密码
+     * @Param [user]
+     * @Author ywx
+     * @Date 2020/10/30 16:04
+     * @return void
+     **/
+    void batchUpdatePwd(@Param("user") TUser user);
+
+    String getUserNameById(@Param("userid")Integer userid);
+
+    //批量修改学生状态
+    void batchUpdateState(@Param("users")List<TClassStudent> users,@Param("userstate")Integer userstate);
+
+    //获取学校管理员
+    UserVo getSchoolAdminBySchoolid(@Param("schoolid")Integer schoolid);
+
+    //校验手机号
+    boolean checkUserPhone(Integer userid);
+
+    //根据登录名获取学生id和行政和提高班班级id
+    TUser getObjByLoginName2(@Param("loginname") String loginname);
+
+    //获取学校账号数量
+    Integer getUserNumBySchoolId(Integer schoolid);
+
+    //用户选择列表
+    List<Map> listForSel(@Param("user") AssessParams user, @Param("year") Integer year);
+
+    //根据班级id用户名获取学生id和数量
+    Map getUserIdByName(Integer schoolid, Integer classid, String username);
+
+    //根据班级科目id用户名获取教师id和数量
+    Map getUserIdByName2(Integer schoolid, Integer classid, String username, String subjectid);
+
+    //根据用户id获取用户类型
+    Integer getUsertypeById(Integer userid);
+
+    //添加登录日志
+    void saveUserLog(@Param("log") TUserLog userLog);
+}

suser/src/main/java/com/xhkjedu/suser/mapper/system/UserRoleMapper.java

@@ -0,0 +1,42 @@
+package com.xhkjedu.suser.mapper.system;
+
+import com.xhkjedu.suser.base.TkMapper;
+import com.xhkjedu.suser.model.system.TUserRole;
+import com.xhkjedu.suser.vo.system.UserRoleVo;
+import org.apache.ibatis.annotations.Param;
+import org.springframework.stereotype.Repository;
+
+import java.util.List;
+
+/**
+ * @ClassName UserRoleMapper
+ * Description 用户角色
+ * Author WN
+ * Date 2020/6/15 11:04
+ **/
+@Repository
+public interface UserRoleMapper extends TkMapper<TUserRole> {
+
+    //根据用户id删除用户角色信息
+    void deleteByUserid(Integer userid);
+
+    //用户角色id集合
+    List<UserRoleVo> listRolesByUserid(@Param("userid") Integer userid);
+
+    //角色下用户
+    List<TUserRole> listUsersByRoleid(Integer roleid);
+
+    /**
+     * @author ywx
+     * @description 获取有常用模块的用户id集合
+     * @date 2020/7/9 20:55
+     **/
+    List<Integer> listUserId(@Param("roleid") Integer roleid);
+
+    /**
+     * @author ywx
+     * @description 根据用户id删除没有权限的常用模块
+     * @date 2020/7/9 20:55
+     **/
+    Integer deleteNoRoleByUserId(@Param("userid") Integer userid);
+}

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

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

suser/src/main/java/com/xhkjedu/suser/model/assess/TAssessFile.java

@@ -0,0 +1,51 @@
+package com.xhkjedu.suser.model.assess;
+
+import com.xhkjedu.suser.model.BaseBean;
+import lombok.Data;
+
+import javax.persistence.Id;
+import javax.persistence.Table;
+
+@Table(name = "t_assess_file")
+@Data
+public class TAssessFile extends BaseBean {
+    @Id
+    //评价用户附件id
+    private Integer afid;
+
+    //评价用户id
+    private Integer auid;
+
+    //附件名称
+    private String filename;
+
+    //附件分类1word,2ppt,3pdf,4图片,5视频,6音频,7压缩包,10其他
+    private Integer fileclass;
+
+    //附件地址
+    private String fileurl;
+
+    //封面图地址
+    private String filecover;
+
+    //是否转换0未转换1已转换2转换失败3加密
+    private Integer converted;
+
+    //转换后的pdf文件地址
+    private String pdfurl;
+
+    //文件后缀
+    private String suffix;
+
+    //文件大小
+    private Integer filesize;
+
+    //视频时长（秒）
+    private Integer duration;
+
+    //创建时间
+    private Integer createtime;
+
+    //转换失败原因
+    private String convertmsg;
+}

suser/src/main/java/com/xhkjedu/suser/model/assess/TAssessUser.java

@@ -0,0 +1,80 @@
+package com.xhkjedu.suser.model.assess;
+
+import com.xhkjedu.suser.model.BaseBean;
+import lombok.Data;
+
+import javax.persistence.Id;
+import javax.persistence.Table;
+import javax.persistence.Transient;
+import java.util.List;
+
+@Table(name = "t_assess_user")
+@Data
+public class TAssessUser extends BaseBean {
+    @Id
+    //评价用户id
+    private Integer auid;
+
+    //用户id
+    private Integer userid;
+
+    //评价id
+    private Integer assessid;
+
+    //评价模板id
+    private Integer templateid;
+
+    //评价指标id
+    private Integer quotaid;
+
+    //用户类型1老师2学生
+    private Integer usertype;
+
+    //评价类型1表扬2批评
+    private Integer autype;
+
+    //学生类型：Y优秀生、L良好生、K学困生、T特殊生
+    private String stutype;
+
+    //年级id
+    private Integer gradeid;
+
+    //班级id
+    private Integer classid;
+
+    //科目id
+    private String subjectid;
+
+    //节次
+    private Integer snum;
+
+    //表现次数
+    private Integer aunum;
+
+    //表现日期
+    private Integer autime;
+
+    //表现备注
+    private String comm;
+
+    //创建人id
+    private Integer createid;
+
+    //创建时间
+    private Integer createtime;
+
+    //学校id
+    private Integer schoolid;
+
+    @Transient
+    //评价用户附件
+    private List<TAssessFile> files;
+
+    @Transient
+    //开始时间
+    private Integer starttime;
+
+    @Transient
+    //截至时间
+    private Integer stoptime;
+}

suser/src/main/java/com/xhkjedu/suser/model/gradeclass/TClass.java

@@ -0,0 +1,48 @@
+package com.xhkjedu.suser.model.gradeclass;
+
+import com.xhkjedu.suser.model.BaseBean;
+import lombok.Data;
+
+import javax.persistence.Id;
+import javax.persistence.Table;
+
+@Table(name = "t_class")
+@Data
+public class TClass extends BaseBean {
+    //班级表
+    @Id
+    private Integer classid;
+
+    //班级名称
+    private String classname;
+
+    //所属年级
+    private Integer gradeid;
+
+    //学生数量
+    private Integer classnum;
+
+    //班级状态1正常3毕业
+    private Integer classstate;
+
+    //班级排序
+    private Integer classorder;
+
+    //入学年（届）
+    private Integer schoolyear;
+
+    //当前年份
+    private Integer year;
+
+    //创建人id
+    private Integer createid;
+
+    //创建时间
+    private Integer createtime;
+
+    //学校id
+    private Integer schoolid;
+
+    //班级类型1行政班2提高班3直播班99已直播班级
+    private Integer classtype;
+}

suser/src/main/java/com/xhkjedu/suser/model/gradeclass/TClassStudent.java

@@ -0,0 +1,78 @@
+package com.xhkjedu.suser.model.gradeclass;
+
+import com.xhkjedu.suser.model.BaseBean;
+import lombok.Data;
+
+import javax.persistence.Id;
+import javax.persistence.Table;
+import javax.persistence.Transient;
+
+@Table(name = "t_class_student")
+@Data
+public class TClassStudent extends BaseBean {
+    //班级关联学生id
+    @Id
+    private Integer csid;
+
+    //班级id
+    private Integer classid;
+
+    //学生id
+    private Integer studentid;
+
+    //创建人
+    private Integer createid;
+
+    //创建时间
+    private Integer createtime;
+
+    //学校id
+    private Integer schoolid;
+
+    //学号
+    @Transient
+    private String studentno;
+
+    //学生姓名
+    @Transient
+    private String studentname;
+
+    //性别1男2女
+    @Transient
+    private Integer usersex;
+
+    //全体分组id
+    @Transient
+    private Integer groupid;
+
+    //原班级id
+    @Transient
+    private Integer oldclassid;
+
+    //排序字段：学生姓名studentname 学号studentno 创建时间createtime
+    @Transient
+    private String fieldname;
+
+    //排序规则：正序asc 倒序desc
+    @Transient
+    private String fieldorder;
+
+    @Transient
+    //用户状态1正常2删除
+    private Integer userstate;
+
+    @Transient
+    //用户手机号
+    private String userphone;
+
+    @Transient
+    private Integer classtype;//班级类型1行政班2提高班3直播班99已直播班
+
+    @Transient
+    //当前年份
+    private Integer year;
+
+    @Transient
+    //有效期
+    private String usertime;
+}

suser/src/main/java/com/xhkjedu/suser/model/gradeclass/TClassTeacher.java

@@ -0,0 +1,59 @@
+package com.xhkjedu.suser.model.gradeclass;
+
+import com.xhkjedu.suser.model.BaseBean;
+import lombok.Data;
+
+import javax.persistence.Id;
+import javax.persistence.Table;
+import javax.persistence.Transient;
+
+@Table(name = "t_class_teacher")
+@Data
+public class TClassTeacher extends BaseBean {
+    //班级教师表
+    @Id
+    private Integer ctid;
+
+    //班级id
+    private Integer classid;
+
+    //教师id
+    private Integer teacherid;
+
+    //创建人id
+    private Integer createid;
+
+    //创建时间
+    private Integer createtime;
+
+    //学校id
+    private Integer schoolid;
+
+    //教师姓名
+    @Transient
+    private String teachername;
+
+    //手机号
+    @Transient
+    private String userphone;
+
+    //排序字段：姓名teachername 登录账号loginname 创建时间createtime
+    @Transient
+    private String fieldname;
+
+    //排序规则：正序asc 倒序desc
+    @Transient
+    private String fieldorder;
+
+    @Transient
+    //所属年级
+    private Integer gradeid;
+
+    @Transient
+    //科目id
+    private String subjectid;
+
+    @Transient
+    //当前年份
+    private Integer year;
+}

suser/src/main/java/com/xhkjedu/suser/model/gradeclass/TGrade.java

@@ -0,0 +1,43 @@
+package com.xhkjedu.suser.model.gradeclass;
+
+import com.xhkjedu.suser.model.BaseBean;
+import lombok.Data;
+
+import javax.persistence.Id;
+import javax.persistence.Table;
+import javax.persistence.Transient;
+
+@Table(name = "t_grade")
+@Data
+public class TGrade extends BaseBean {
+    //年级表
+    @Id
+    private Integer gradeid;
+
+    //年级名称
+    private String gradename;
+
+    //年级处理顺序
+    private Integer gradeorder;
+
+    //所属学段1小学2初中3高中4大学
+    private Integer level;
+
+    //入学年（届）
+    private Integer schoolyear;
+
+    //当前年份
+    private Integer year;
+
+    //创建人id
+    private Integer createid;
+
+    //创建时间
+    private Integer createtime;
+
+    //学校id
+    private Integer schoolid;
+
+    @Transient
+    private Integer classtype;//班级类型1行政班2提高班3直播班99已直播班
+}

suser/src/main/java/com/xhkjedu/suser/model/gradeclass/TGroup.java

@@ -0,0 +1,52 @@
+package com.xhkjedu.suser.model.gradeclass;
+
+import com.xhkjedu.suser.model.BaseBean;
+import com.xhkjedu.suser.vo.gradeclass.GroupStudentVo;
+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_group")
+@Data
+public class TGroup extends BaseBean {
+    //班级分组id
+    @Id
+    private Integer groupid;
+
+    //分组名称
+    private String groupname;
+
+    //班级id
+    private Integer classid;
+
+    //班级分组类型1全体2一般分组
+    private Integer grouptype;
+
+    //分组人数
+    private Integer groupnum;
+
+    //创建人id
+    private Integer createid;
+
+    //创建时间
+    private Integer createtime;
+
+    //学校id
+    private Integer schoolid;
+
+    //当前年份
+    @Transient
+    private Integer year;
+
+    //资源id
+    @Transient
+    private String resourceid;
+
+    //分组下学生
+    @Transient
+    private List<GroupStudentVo> students = new ArrayList<>();
+}

suser/src/main/java/com/xhkjedu/suser/model/gradeclass/TGroupStudent.java

@@ -0,0 +1,33 @@
+package com.xhkjedu.suser.model.gradeclass;
+
+import com.xhkjedu.suser.model.BaseBean;
+import lombok.Data;
+
+import javax.persistence.Id;
+import javax.persistence.Table;
+
+@Table(name = "t_group_student")
+@Data
+public class TGroupStudent extends BaseBean {
+    //分组学生表
+    @Id
+    private Integer gsid;
+
+    //班级id
+    private Integer classid;
+
+    //分组id
+    private Integer groupid;
+
+    //学生id
+    private Integer studentid;
+
+    //创建人id
+    private Integer createid;
+
+    //创建时间
+    private Integer createtime;
+
+    //学校id
+    private Integer schoolid;
+}

suser/src/main/java/com/xhkjedu/suser/model/gradeclass/TSchool.java

@@ -0,0 +1,67 @@
+package com.xhkjedu.suser.model.gradeclass;
+
+import com.xhkjedu.suser.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;//区域码
+}

suser/src/main/java/com/xhkjedu/suser/model/subjectbook/TTeacherPowersb.java

@@ -0,0 +1,35 @@
+package com.xhkjedu.suser.model.subjectbook;
+
+import com.xhkjedu.suser.model.BaseBean;
+import lombok.Data;
+
+import javax.persistence.Id;
+import javax.persistence.Table;
+
+/**
+ * @ClassName TTeacherPowersb
+ * Description 教师教材权限表
+ * Author WN
+ * Date 2020/7/1 19:02
+ **/
+@Table(name = "t_teacher_powersb")
+@Data
+public class TTeacherPowersb extends BaseBean {
+    @Id
+    private Integer tbid;
+
+    //教师id
+    private Integer teacherid;
+
+    //教材关联关系表id
+    private String lsbid;
+
+    //创建人id
+    private Integer createid;
+
+    //创建时间
+    private Integer createtime;
+
+    //学校id
+    private Integer schoolid;
+}

suser/src/main/java/com/xhkjedu/suser/model/system/TMsg.java

@@ -0,0 +1,36 @@
+package com.xhkjedu.suser.model.system;
+
+import com.xhkjedu.suser.model.BaseBean;
+import lombok.Data;
+
+import javax.persistence.Id;
+import javax.persistence.Table;
+import javax.persistence.Transient;
+
+@Table(name = "t_msg")
+@Data
+public class TMsg extends BaseBean {
+    @Id
+    //短信id
+    private Integer msgid;
+
+    //短信内容
+    private String msgtxt;
+
+    //验证码
+    private Integer msgcode;
+
+    //手机号
+    private String userphone;
+
+    //创建时间
+    private Integer createtime;
+
+    @Transient
+    //开始时间
+    private Integer starttime;
+
+    @Transient
+    //结束时间
+    private Integer stoptime;
+}

suser/src/main/java/com/xhkjedu/suser/model/system/TRole.java

@@ -0,0 +1,42 @@
+package com.xhkjedu.suser.model.system;
+
+import com.xhkjedu.suser.model.BaseBean;
+import com.xhkjedu.suser.vo.system.RoleModuleVo;
+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_role")
+@Data
+public class TRole extends BaseBean {
+    //角色表
+    @Id
+    private Integer roleid;
+
+    //角色名称
+    private String rolename;
+
+    //角色备注
+    private String comm;
+
+    //创建人id
+    private Integer createid;
+
+    //创建时间
+    private Integer createtime;
+
+    //学校id
+    private Integer schoolid;
+
+    //用户数量
+    @Transient
+    private Integer usernum;
+
+    //选择模块
+    @Transient
+    private List<RoleModuleVo> modules = new ArrayList<>();
+}

suser/src/main/java/com/xhkjedu/suser/model/system/TRoleModule.java

@@ -0,0 +1,30 @@
+package com.xhkjedu.suser.model.system;
+
+import com.xhkjedu.suser.model.BaseBean;
+import lombok.Data;
+
+import javax.persistence.Id;
+import javax.persistence.Table;
+
+@Table(name = "t_role_module")
+@Data
+public class TRoleModule extends BaseBean {
+    //角色模块表
+    @Id
+    private Integer rmid;
+
+    //角色id
+    private Integer roleid;
+
+    //模块表id
+    private String moduleid;
+
+    //创建人id
+    private Integer createid;
+
+    //创建时间
+    private Integer createtime;
+
+    //学校id
+    private Integer schoolid;
+}

suser/src/main/java/com/xhkjedu/suser/model/system/TUser.java

@@ -0,0 +1,115 @@
+package com.xhkjedu.suser.model.system;
+
+import com.xhkjedu.suser.model.BaseBean;
+import lombok.Data;
+
+import javax.persistence.Id;
+import javax.persistence.Table;
+import javax.persistence.Transient;
+import java.util.List;
+
+/**
+ *功能描述  用户表
+ * @author WN
+ * @date 2020/5/29
+ * @return
+ */
+@Table(name = "t_user")
+@Data
+public class TUser extends BaseBean {
+    //用户表
+    @Id
+    private Integer userid;
+
+    //姓名
+    private String username;
+
+    //登录账号
+    private String loginname;
+
+    //学生学号
+    private String studentno;
+
+    //登录密码
+    private String loginpwd;
+
+    //用户手机号
+    private String userphone;
+
+    //出生日期
+    private Integer userbirthday;
+
+    //身份证号
+    private String cardid;
+
+    //头像地址
+    private String headpic;
+
+    //用户类型999超级管理员0学校管理员1老师2学生
+    private Integer usertype;
+
+    //用户状态1正常2删除3已毕业
+    private Integer userstate;
+
+    //是否绑定硬件地址0不绑定1绑定
+    private Integer bindmac;
+
+    //硬件地址
+    private String mac;
+
+    //操作密码（教师操作密码）
+    private String opepassword;
+
+    //有效期
+    private String usertime;
+
+    //创建人id
+    private Integer createid;
+
+    //创建时间
+    private Integer createtime;
+
+    //删除人id
+    private Integer deleteid;
+
+    //删除时间
+    private Integer deletetime;
+
+    //学校id
+    private Integer schoolid;
+
+    //性别1男2女
+    private Integer usersex;
+
+    @Transient
+    //原登录密码
+    private String oldpwd;
+
+    @Transient
+    //验证码
+    private Integer msgcode;
+
+    @Transient
+    //登录ip
+    private String logip;
+
+    @Transient
+    //登录地址
+    private String logaddress;
+
+    @Transient
+    //登录终端设备
+    private String ultype;
+
+    @Transient
+    //版本号
+    private String versionnum;
+
+    @Transient
+    //班级类型1行政班2提高班3直播班99已直播班级
+    private Integer classtype;
+
+    @Transient
+    //用户类型集合
+    private List<Integer> usertypes;
+}

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

@@ -0,0 +1,53 @@
+package com.xhkjedu.suser.model.system;
+
+import com.xhkjedu.suser.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;
+}

suser/src/main/java/com/xhkjedu/suser/model/system/TUserModule.java

@@ -0,0 +1,36 @@
+package com.xhkjedu.suser.model.system;
+
+import com.xhkjedu.suser.model.BaseBean;
+import com.xhkjedu.suser.model.BaseBean;
+import lombok.Data;
+
+import javax.persistence.Id;
+import javax.persistence.Table;
+import java.util.ArrayList;
+import java.util.List;
+
+@Table(name = "t_user_module")
+@Data
+public class TUserModule extends BaseBean {
+    //用户常用模块表
+    @Id
+    private Integer umid;
+
+    //用户id
+    private Integer userid;
+
+    //模块id
+    private String moduleid;
+
+    //排序
+    private Integer umorder;
+
+    //创建时间
+    private Integer createtime;
+
+    //学校id
+    private Integer schoolid;
+
+    //批量保存用户常用模块
+    private List<String> moduleids = new ArrayList<>();
+}

suser/src/main/java/com/xhkjedu/suser/model/system/TUserRole.java

@@ -0,0 +1,32 @@
+package com.xhkjedu.suser.model.system;
+
+import com.xhkjedu.suser.model.BaseBean;
+import lombok.Data;
+
+import javax.persistence.Id;
+import javax.persistence.Table;
+import javax.persistence.Transient;
+
+@Table(name = "t_user_role")
+@Data
+public class TUserRole extends BaseBean {
+    //用户角色表
+    @Id
+    private Integer urid;
+
+    //用户id
+    private Integer userid;
+
+    //角色id
+    private Integer roleid;
+
+    //创建人id
+    private Integer createid;
+
+    //创建时间
+    private Integer createtime;
+
+    //用户姓名
+    @Transient
+    private String username;
+}

suser/src/main/java/com/xhkjedu/suser/service/gradeclass/ClassService.java

@@ -0,0 +1,201 @@
+package com.xhkjedu.suser.service.gradeclass;
+
+import com.xhkjedu.suser.mapper.gradeclass.ClassMapper;
+import com.xhkjedu.suser.mapper.gradeclass.ClassStudentMapper;
+import com.xhkjedu.suser.mapper.gradeclass.GroupStudentMapper;
+//import com.xhkjedu.suser.mapper.gradeclass.SchoolMapper;
+import com.xhkjedu.suser.model.gradeclass.TClass;
+import com.xhkjedu.suser.model.gradeclass.TClassStudent;
+import com.xhkjedu.suser.model.gradeclass.TGroup;
+import com.xhkjedu.suser.model.gradeclass.TGroupStudent;
+import com.xhkjedu.suser.model.gradeclass.TSchool;
+import com.xhkjedu.utils.N_Utils;
+import com.xhkjedu.vo.ResultVo;
+import com.xhkjedu.suser.vo.gradeclass.ClassVo;
+import org.springframework.beans.BeanUtils;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * @author ywx
+ * @classname TClassService
+ * @description 
+ * @date 2020/6/2 14:57
+ **/
+@Service
+public class ClassService {
+    @Resource
+    private ClassMapper classMapper;
+    @Resource
+    private GroupService groupService;
+    @Resource
+    private ClassStudentMapper classStudentMapper;
+    @Resource
+    private GroupStudentMapper groupStudentMapper;
+    //@Resource
+    //private SchoolMapper schoolMapper;
+
+    //添加
+    public Integer save(TClass model) {
+        model.setCreatetime(N_Utils.getSecondTimestamp());
+        model.setClassnum(0);
+        model.setClassstate(1);
+        //TSchool school = schoolMapper.selectByPrimaryKey(model.getSchoolid());
+        //model.setYear(school.getYear());//当前年份必须和学校年份一致
+        classMapper.insertUseGeneratedKeys(model);
+        //创建全体分组
+        TGroup group = new TGroup();
+        group.setGroupname("全班学生");
+        group.setClassid(model.getId());
+        group.setGrouptype(1);
+        group.setCreateid(model.getCreateid());
+        group.setSchoolid(model.getSchoolid());
+        groupService.save(group);
+        return model.getId();
+    }
+
+    //删除
+    public ResultVo deleteById(Integer classid) {
+        //2021-06-07删除时执行逻辑删除，不再判断是否有学生
+        /*ImportStudentVo student = classStudentMapper.getNumById(classid,0);
+        if (student.getClassnum() !=0){
+            return new ResultVo(1,"班级已关联学生，暂无法删除");
+        }*/
+        classMapper.updateClassstateByClassid(classid,10);//删除班级逻辑删除
+        return new ResultVo(0,"删除成功");
+    }
+
+    //删除
+    public ResultVo deleteById2(Integer classid) {
+        classMapper.deleteByPrimaryKey(classid);
+        return new ResultVo(0,"删除成功");
+    }
+
+    //修改
+    public Integer update(TClass model) {
+        model.setYear(null);//当前年份不能修改
+        return classMapper.updateByPrimaryKeySelective(model);
+    }
+
+    //获取列表
+    public List <ClassVo> findAll(TClass tClass) {
+        return classMapper.findAll(tClass);
+    }
+
+    //更新学生数量
+    public void updateNum(Integer classid) {
+        classMapper.updateNum(classid);
+    }
+
+    //更新班级、分组学生数量
+    public void updateNum2(Integer classid) {
+        classMapper.updateNum2(classid);
+    }
+
+    //基本信息
+    public ClassVo getById(Integer classid) {
+        return classMapper.getById(classid);
+    }
+
+    //学生选课
+    public void saveSelection(Integer classid, Integer studentid, Integer teacherid, Integer schoolid) {
+        TClassStudent student = classStudentMapper.getByClassIdStudentId(classid, studentid);
+        if (student == null) {
+            //班级学生
+            TClassStudent cs = new TClassStudent();
+            cs.setClassid(classid);
+            cs.setStudentid(studentid);
+            cs.setCreateid(teacherid);
+            cs.setSchoolid(schoolid);
+            cs.setCreatetime(N_Utils.getSecondTimestamp());
+            classStudentMapper.save(cs);
+
+            //分组学生
+            ClassVo classVo = getById(classid);
+            Integer groupid = classVo.getGroupid();
+            TGroupStudent gs = new TGroupStudent();
+            gs.setClassid(classid);
+            gs.setGroupid(groupid);
+            gs.setStudentid(studentid);
+            gs.setCreateid(teacherid);
+            gs.setSchoolid(schoolid);
+            gs.setCreatetime(N_Utils.getSecondTimestamp());
+            groupStudentMapper.save(gs);
+        }
+
+        //更新班级、分组学生数量
+        updateNum2(classid);
+    }
+
+    //学生取消选课
+    public void cancelSelection(Integer classid, Integer studentid) {
+        classStudentMapper.deleteById(classid, studentid);
+        //更新班级、分组学生数量
+        updateNum2(classid);
+    }
+
+    //批量添加报名学生
+    public void batchSaveStu(Integer createid, Integer schoolid, Integer classid, List<Integer> studentids) {
+        List<TClassStudent> classStudents = new ArrayList<>();
+        List<TGroupStudent> groupStudents = new ArrayList<>();
+        //班级学生
+        TClassStudent cs = new TClassStudent();
+        cs.setClassid(classid);
+        cs.setCreateid(createid);
+        cs.setSchoolid(schoolid);
+        cs.setCreatetime(N_Utils.getSecondTimestamp());
+        //分组学生
+        ClassVo classVo = getById(classid);
+        Integer groupid = classVo.getGroupid();
+        TGroupStudent gs = new TGroupStudent();
+        gs.setClassid(classid);
+        gs.setGroupid(groupid);
+        gs.setCreateid(createid);
+        gs.setSchoolid(schoolid);
+        gs.setCreatetime(N_Utils.getSecondTimestamp());
+        for (Integer studentid : studentids) {
+            TClassStudent classStudent = new TClassStudent();
+            BeanUtils.copyProperties(cs, classStudent);
+            classStudent.setStudentid(studentid);
+            classStudents.add(classStudent);
+
+            TGroupStudent groupStudent = new TGroupStudent();
+            BeanUtils.copyProperties(gs, groupStudent);
+            groupStudent.setStudentid(studentid);
+            groupStudents.add(groupStudent);
+        }
+        classStudentMapper.insertList(classStudents);
+        groupStudentMapper.insertList(groupStudents);
+        updateNum2(classid);
+    }
+
+    public TClassStudent getByClassIdStudentId(Integer classid,Integer studentid){
+        return classStudentMapper.getByClassIdStudentId(classid,studentid);
+    }
+
+    public List<Integer> listClassidsByGradeid(Integer gradeid,Integer schoolid){
+        return classMapper.listClassidsByGradeid(gradeid,schoolid);
+    }
+
+    //根据班级名称获取班级信息
+    public TClass getByName(TClass tClass) {
+        return classMapper.getByName(tClass);
+    }
+
+    //获取任教老师列表
+    public List<String> listTeacher(Integer classid) {
+        return classMapper.listTeacher(classid);
+    }
+
+    //修改班级类型
+    public Integer updateClasstype(Integer classid, Integer classtype){
+        return classMapper.updateClasstype(classid, classtype);
+    }
+
+    public Integer updateClassstateByClassid(Integer classid,Integer classstate){
+        return classMapper.updateClassstateByClassid(classid, classstate);
+    }
+}

suser/src/main/java/com/xhkjedu/suser/service/gradeclass/ClassStudentService.java

@@ -0,0 +1,528 @@
+package com.xhkjedu.suser.service.gradeclass;
+
+import com.xhkjedu.config.MissingParametersException;
+import com.xhkjedu.suser.mapper.gradeclass.ClassMapper;
+import com.xhkjedu.suser.mapper.gradeclass.ClassStudentMapper;
+//import com.xhkjedu.suser.mapper.gradeclass.SchoolMapper;
+//import com.xhkjedu.suser.mapper.liveplay.CourseMapper;
+//import com.xhkjedu.suser.model.liveplay.LCourse;
+import com.xhkjedu.suser.model.gradeclass.TClassStudent;
+import com.xhkjedu.suser.model.gradeclass.TGroupStudent;
+import com.xhkjedu.suser.model.system.TUser;
+import com.xhkjedu.suser.service.system.UserService;
+import com.xhkjedu.utils.N_Utils;
+import com.xhkjedu.suser.utils.PoiUtils;
+import com.xhkjedu.vo.ResultVo;
+import com.xhkjedu.suser.vo.gradeclass.ClassStudentVo;
+import com.xhkjedu.suser.vo.gradeclass.ClassVo;
+import com.xhkjedu.suser.vo.gradeclass.ImportStudentVo;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+import org.springframework.util.CollectionUtils;
+import org.springframework.web.multipart.MultipartFile;
+
+import javax.annotation.Resource;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * @author ywx
+ * @classname TClassStudentService
+ * @description 
+ * @date 2020/6/2 15:53
+ **/
+@Service
+@Slf4j
+public class ClassStudentService {
+    @Resource
+    private ClassStudentMapper classStudentMapper;
+    @Resource
+    private UserService userService;
+    @Resource
+    private GroupStudentService groupStudentService;
+    @Resource
+    private ClassMapper classMapper;
+    //@Resource
+    //private SchoolMapper schoolMapper;
+    //@Resource
+    //private CourseMapper courseMapper;
+
+    //批量添加
+    public void batchAdd(List<TClassStudent> students) throws Exception {
+        for (TClassStudent student : students) {
+            save(student);
+        }
+    }
+
+    //班级学生批量添加-取消的删除
+    public void batchAdd2(Integer classid, List<Integer> newStuIds) throws Exception {
+        List<Integer> studentIds = classStudentMapper.listStudentIdByClassId(classid);//班级原有学生
+        for (Integer studentid : newStuIds) {
+            if (!N_Utils.numInList(studentid,studentIds)) {//新添加的学生
+                save2(classid, studentid);
+            }
+        }
+        for (Integer studentId : studentIds) {
+            if (!N_Utils.numInList(studentId,newStuIds)) {//删除的学生
+                deleteById(classid, studentId);
+            }
+        }
+    }
+
+    //添加
+    @Transactional(rollbackFor = Exception.class)
+    public Integer save(TClassStudent model) throws Exception {
+        model.setCreatetime(N_Utils.getSecondTimestamp());
+        if (!N_Utils.isEmpty(model.getStudentno())) {
+            TUser user = userService.getObjByLoginName(model.getStudentno());
+            if (user == null) {//学生信息在用户表不存在，添加学生信息
+                user = new TUser();
+                user.setUsertype(2);
+                user.setUsername(model.getStudentname());
+                user.setLoginname(model.getStudentno());
+                user.setLoginpwd("123456");
+                user.setUsersex(model.getUsersex());
+                user.setStudentno(model.getStudentno());
+                user.setCreateid(model.getCreateid());
+                user.setSchoolid(model.getSchoolid());
+                user.setUsertime(model.getUsertime());
+                ResultVo vo = userService.save(user);
+                if (vo.getCode() != 0) throw new MissingParametersException(vo.getMsg());
+                user.setUserid((Integer) vo.getObj());
+            } else if (user.getUsertype()!=2) {
+                throw new Exception("禁止添加非学生账号");
+            } else if (!model.getSchoolid().equals(user.getSchoolid())) {
+                throw new Exception("禁止添加非本校学生账号");
+            }
+
+            model.setStudentid(user.getUserid());
+        }
+
+        //全体分组
+        ClassVo classVo = classMapper.getById(model.getClassid());
+        ImportStudentVo student = getNumById(model.getClassid(), model.getStudentid(), classVo.getYear());
+        if (classVo.getClasstype() == 1 && student.getXznum() != 0){
+            throw new MissingParametersException("该学生已在行政班");
+        }
+        Integer num = student.getClassnum();//班级学生数量
+        if (num == 0) {//学生不在该班级
+            model.setCreateid(classVo.getCreateid());
+            model.setSchoolid(classVo.getSchoolid());
+            classStudentMapper.insertUseGeneratedKeys(model);//添加班级学生
+            classMapper.updateNum(model.getClassid());//更新学生数量
+
+            //分组学生
+            Integer groupid = classVo.getGroupid();
+            TGroupStudent g = new TGroupStudent();
+            g.setClassid(model.getClassid());
+            g.setGroupid(groupid);
+            g.setStudentid(model.getStudentid());
+            g.setCreateid(model.getCreateid());
+            g.setSchoolid(model.getSchoolid());
+            groupStudentService.save(g);
+
+            //一般分组
+            if (!N_Utils.isEmptyInteger(model.getGroupid())) {
+                TGroupStudent groupStudent = new TGroupStudent();
+                groupStudent.setClassid(model.getClassid());
+                groupStudent.setGroupid(model.getGroupid());
+                groupStudent.setStudentid(model.getStudentid());
+                groupStudent.setCreateid(model.getCreateid());
+                groupStudent.setSchoolid(model.getSchoolid());
+                groupStudentService.save(groupStudent);
+            }
+        }
+
+        //2021年4月28日，张道剑建议，南华凯、张剑、王宁 共同确认不再复制预习导学信息
+//        guideGroupStudentMapper.copyGuideResource(model.getStudentid(), model.getClassid());//复制学生预习导学信息
+
+        //把这个学生加到此行政班、提高班相关的所有直播班中
+        if (classVo.getClasstype() == 1 || classVo.getClasstype() == 2) {
+            saveCourseStu(model.getClassid(), model.getStudentid());
+        }
+        return model.getId();
+    }
+
+    //把这个学生加到此行政班相关的所有直播班中
+    public void saveCourseStu(Integer classid, Integer studentid) {
+        //List<LCourse> courses = courseMapper.listXzCourse(classid);
+        //for (LCourse course : courses) {
+        //    Integer courseid = course.getCourseid();
+        //    saveSelection(course.getClassid(), studentid, course.getCreateid(), course.getSchoolid());
+        //    courseMapper.updateStuNum(courseid);
+        //}
+    }
+
+    //学生选课
+    public void saveSelection(Integer classid, Integer studentid, Integer teacherid, Integer schoolid) {
+        TClassStudent student = classStudentMapper.getByClassIdStudentId(classid, studentid);
+        if (student == null) {
+            //班级学生
+            TClassStudent cs = new TClassStudent();
+            cs.setClassid(classid);
+            cs.setStudentid(studentid);
+            cs.setCreateid(teacherid);
+            cs.setSchoolid(schoolid);
+            cs.setCreatetime(N_Utils.getSecondTimestamp());
+            classStudentMapper.save(cs);
+
+            //分组学生
+            ClassVo classVo = classMapper.getById(classid);
+            Integer groupid = classVo.getGroupid();
+            TGroupStudent gs = new TGroupStudent();
+            gs.setClassid(classid);
+            gs.setGroupid(groupid);
+            gs.setStudentid(studentid);
+            gs.setCreateid(teacherid);
+            gs.setSchoolid(schoolid);
+            gs.setCreatetime(N_Utils.getSecondTimestamp());
+            groupStudentService.save(gs);
+        }
+
+        //更新班级学生数量
+        classMapper.updateNum(classid);
+    }
+
+    //学生取消选课
+    public void cancelSelection(Integer classid, Integer studentid) {
+        classStudentMapper.deleteById(classid, studentid);
+        //更新班级、分组学生数量
+        classMapper.updateNum2(classid);
+    }
+
+    //删除
+    @Transactional(rollbackFor = Exception.class)
+    public void deleteById(Integer classid, Integer studentid) {
+        classStudentMapper.deleteById(classid, studentid);//删除班级、分组对应学生
+        classMapper.updateNum2(classid);//更新班级、分组学生数量
+        //把这个学生从此行政班、提高班关联的所有直播班移除
+        ClassVo classVo = classMapper.getById(classid);
+        if (classVo.getClasstype() == 1 || classVo.getClasstype() == 2) {
+            //List<LCourse> courses = courseMapper.listXzCourse(classid);
+            //for (LCourse course : courses) {
+            //    cancelSelection(course.getClassid(), studentid);
+            //}
+        }
+    }
+
+    //修改
+    public ResultVo update(TClassStudent model) {
+        TUser u = userService.getObjByLoginName(model.getStudentno());
+        if (u != null && !model.getStudentid().equals(u.getUserid())){
+            return new ResultVo(1,"该账号已被【"+u.getUsername()+"】占用");
+        }
+        //修改学生信息
+        TUser user = new TUser();
+        user.setUserid(model.getStudentid());
+        user.setUsersex(model.getUsersex());
+        user.setUsername(model.getStudentname());
+        user.setStudentno(model.getStudentno());
+        user.setLoginname(model.getStudentno());
+        user.setUserphone(model.getUserphone());
+        user.setUsertime(model.getUsertime());
+        userService.update(user);
+        return new ResultVo(0,"修改成功");
+    }
+
+    //获取列表
+    public List <ClassStudentVo> findAll(TClassStudent student) {
+        setOrderField(student);
+        return classStudentMapper.findAll(student);
+    }
+
+    //班级学生导入
+    @Transactional(rollbackFor = Exception.class)
+    public ResultVo importUser(MultipartFile file, TClassStudent tClassStudent) {
+        Integer classid = tClassStudent.getClassid();
+        Integer schoolid = tClassStudent.getSchoolid();
+        Integer createid = tClassStudent.getCreateid();
+        //全体分组
+        ClassVo classVo = classMapper.getById(classid);
+        Integer groupid = classVo.getGroupid();
+        N_Utils.validation(new Object[]{classid,"班级id",1,schoolid,"学校id",1,createid,"创建人id",1,groupid,"分组id",1});
+        try {
+            Map<String,Object> map = PoiUtils.readExcelUser(file, 2);
+            List<TUser> students = (List<TUser>)map.get("users");
+            map.remove("users");//导入成功的学生信息不返回给前端
+            /*if (!CollectionUtils.isEmpty((List<TUser>)map.get("excelExisted"))) {
+                map.put("code",1);
+                return new ResultVo(0, "导入失败", map);
+            }*/
+
+            List<TUser> users = new ArrayList<>();
+            List<TClassStudent> classStudents = new ArrayList<>();
+            List<TGroupStudent> groupStudents = new ArrayList<>();
+            // 以下学生信息已存在
+            List<TUser> usersExisted = new ArrayList<>();
+            for (TUser user : students) {
+                TUser u = userService.getObjByLoginName(user.getLoginname());
+                if (null == u){
+                    user.setSchoolid(schoolid);
+                    user.setCreateid(createid);
+                    user.setCreatetime(N_Utils.getSecondTimestamp());
+                    user.setUserstate(1);
+                    users.add(user);
+                } else {
+                    Integer studentid = u.getUserid();
+                    Integer oldclassid = classStudentMapper.getClassIdByStuId(studentid);//获取学生行政班id
+                    if (2 != u.getUsertype() || schoolid != u.getSchoolid()){//非本校学生信息
+                        usersExisted.add(u);
+                    } else if (!classid.equals(oldclassid) && 2 == u.getUsertype() && schoolid == u.getSchoolid()){
+                        if (1 != u.getUserstate()){
+                            userService.updateState(u.getUserid(), 1);
+                        }
+                        if (oldclassid == null) {//学生不在行政班
+                            setStudents(classid, schoolid, createid, groupid, classStudents, groupStudents, studentid);
+                        } else {
+                            moveClass(oldclassid, classid, studentid);//学生在其他行政班转班
+                        }
+                    } else {//本班学生信息
+                        usersExisted.add(u);
+                    }
+                }
+            }
+
+            //保存用户信息
+            if (!CollectionUtils.isEmpty(users)) {
+                userService.batchSave(users);
+                for (TUser user : users) {
+                    Integer studentid = user.getId();
+                    setStudents(classid, schoolid, createid, groupid, classStudents, groupStudents, studentid);
+                }
+            }
+
+            //保存学生关联信息
+            if (!CollectionUtils.isEmpty(classStudents)) {
+                batchSave(classStudents);
+                groupStudentService.batchSave(groupStudents);
+                classMapper.updateNum2(classid);//更新班级、分组学生数量
+                for (TClassStudent classStudent : classStudents) {
+                    saveCourseStu(classid, classStudent.getStudentid());
+                }
+            }
+            map.put("usersExisted",usersExisted);
+            if (N_Utils.isListNotEmpty(usersExisted)){
+                map.put("code",1);
+            } else {
+                map.put("code",0);
+            }
+            return new ResultVo(0, "导入成功", map);
+        } catch (Exception e) {
+            log.error("导入失败 : " + e.getMessage());
+            return new ResultVo(1, "导入失败 : " + e.getMessage());
+        }
+    }
+
+    //提高班学生导入
+    public ResultVo importUser2(MultipartFile file, TClassStudent tClassStudent) {
+        Integer classid = tClassStudent.getClassid();
+        Integer schoolid = tClassStudent.getSchoolid();
+        Integer createid = tClassStudent.getCreateid();
+        //全体分组
+        ClassVo classVo = classMapper.getById(classid);
+        Integer groupid = classVo.getGroupid();
+        N_Utils.validation(new Object[]{classid,"班级id",1,schoolid,"学校id",1,createid,"创建人id",1,groupid,"分组id",1});
+        try {
+            Map<String,Object> map = PoiUtils.readExcelUser(file, 2);
+            List<TUser> students = (List<TUser>)map.get("users");
+            map.remove("users");//导入成功的学生信息不返回给前端
+
+            List<TClassStudent> classStudents = new ArrayList<>();
+            List<TGroupStudent> groupStudents = new ArrayList<>();
+            // 以下学生信息不存在
+            List<TUser> usersNotExisted = new ArrayList<>();
+            for (TUser user : students) {
+                TUser u = userService.getObjByLoginName(user.getLoginname());
+                if (null == u){
+                    user.setSchoolid(schoolid);
+                    user.setCreateid(createid);
+                    user.setCreatetime(N_Utils.getSecondTimestamp());
+                    user.setUserstate(1);
+                    usersNotExisted.add(user);
+                } else {
+                    Integer studentid = u.getUserid();
+                    ImportStudentVo student = getNumById(classid, studentid, classVo.getYear());
+                    Integer classnum = student.getClassnum();//本班级学生数量
+                    if (2 != u.getUsertype() || schoolid != u.getSchoolid() || 0==student.getXznum()){
+                        usersNotExisted.add(u);
+                    } else if (0 == classnum && 2 == u.getUsertype() && schoolid == u.getSchoolid()){
+                        if (1 != u.getUserstate()){
+                            userService.updateState(u.getUserid(), 1);
+                        }
+                        setStudents(classid, schoolid, createid, groupid, classStudents, groupStudents, studentid);
+                    }
+                }
+            }
+
+            //保存学生关联信息
+            if (!CollectionUtils.isEmpty(classStudents)) {
+                batchSave(classStudents);
+                groupStudentService.batchSave(groupStudents);
+                classMapper.updateNum2(classid);//更新班级、分组学生数量
+            }
+            map.put("usersNotExisted",usersNotExisted);
+            if (N_Utils.isListNotEmpty(usersNotExisted)){
+                map.put("code",1);
+            } else {
+                map.put("code",0);
+            }
+            return new ResultVo(0, "导入成功", map);
+        } catch (Exception e) {
+            log.error("导入失败 : " + e.getMessage());
+            return new ResultVo(1, "导入失败 : " + e.getMessage());
+        }
+    }
+
+    private void setStudents(Integer classid, Integer schoolid, Integer createid, Integer groupid, List<TClassStudent> classStudents, List<TGroupStudent> groupStudents, Integer studentid) {
+        TClassStudent cs = new TClassStudent();
+        cs.setClassid(classid);
+        cs.setStudentid(studentid);
+        cs.setCreateid(createid);
+        cs.setCreatetime(N_Utils.getSecondTimestamp());
+        cs.setSchoolid(schoolid);
+        classStudents.add(cs);
+
+        TGroupStudent gs = new TGroupStudent();
+        gs.setGroupid(groupid);
+        gs.setClassid(classid);
+        gs.setStudentid(studentid);
+        gs.setCreateid(createid);
+        gs.setCreatetime(N_Utils.getSecondTimestamp());
+        gs.setSchoolid(schoolid);
+        groupStudents.add(gs);
+    }
+
+    private void batchSave(List<TClassStudent> classStudents) {
+        classStudentMapper.insertList(classStudents);
+        //2021年4月28日，张道剑建议，南华凯、张剑、王宁 共同确认不再复制预习导学信息
+        /*for (TClassStudent s : classStudents) {
+            guideGroupStudentMapper.copyGuideResource(s.getStudentid(), s.getClassid());//复制学生预习导学信息
+        }*/
+    }
+
+    //班级学生数量
+    private ImportStudentVo getNumById(Integer classid, Integer studentid, Integer year) {
+        return classStudentMapper.getNumById(classid, studentid, year);
+    }
+
+    /**
+     * 转班
+     * @Param [oldclassid, classid, groupid, studentid]
+     * @Author ywx
+     * @Date 2020/6/19 10:11
+     * @return void
+     **/
+    @Transactional(rollbackFor = Exception.class)
+    public void moveClass(Integer oldclassid, Integer classid, Integer studentid) throws Exception {
+        deleteById(oldclassid, studentid);//删除原班级、分组对应学生;更新原班级、分组学生数量
+        save2(classid, studentid);//添加班级学生
+        saveCourseStu(classid, studentid);
+    }
+
+    //添加班级学生
+    private void save2(Integer classid, Integer studentid) {
+        //全体分组
+        ClassVo classVo = classMapper.getById(classid);
+        //班级学生
+        TClassStudent cs = new TClassStudent();
+        cs.setClassid(classid);
+        cs.setStudentid(studentid);
+        Integer createid = classVo.getCreateid();
+        cs.setCreateid(createid);
+        cs.setCreatetime(N_Utils.getSecondTimestamp());
+        Integer schoolid = classVo.getSchoolid();
+        cs.setSchoolid(schoolid);
+        classStudentMapper.insertUseGeneratedKeys(cs);//添加班级学生
+        classMapper.updateNum(classid);//更新学生数量
+
+        //分组学生
+        Integer groupid = classVo.getGroupid();
+        TGroupStudent g = new TGroupStudent();
+        g.setClassid(classid);
+        g.setGroupid(groupid);
+        g.setStudentid(studentid);
+        g.setCreateid(createid);
+        g.setSchoolid(schoolid);
+        groupStudentService.save(g);
+    }
+
+    /**
+     * 解除mac绑定
+     * @Param [studentid]
+     * @Author ywx
+     * @Date 2020/9/18 11:56
+     * @return void
+     **/
+    public void removeBind(Integer studentid) {
+        userService.removeBind(studentid);
+    }
+
+    /**
+     *功能描述 获取学生所在班级
+     * @author WN
+     * @date 2020/10/20
+     * @param  * @param year
+     * @param studentid
+     * @return java.util.List<com.xhkjedu.suser.vo.gradeclass.ClassVo>
+     */
+    public List<ClassVo> listClassByStudentId(Integer studentid){
+        //Integer year = schoolMapper.getYearByUserId(studentid);
+        Integer year=2021;
+        return classStudentMapper.listClassByStudentId(year,studentid);
+    }
+
+    public List<ClassStudentVo> listNoClassStu(TClassStudent student) {
+        setOrderField(student);
+        setYear(student);
+        return classStudentMapper.listNoClassStu(student);
+    }
+
+    private void setOrderField(TClassStudent student) {
+        String fieldname = student.getFieldname();
+        if (N_Utils.isEmpty(fieldname) || fieldname.equals("createtime")) {
+            fieldname = "cs.createtime";//按创建时间排序导入的学生分页显示会有重复
+            if (N_Utils.isEmpty(student.getFieldorder())) {
+                student.setFieldorder("desc");
+            }
+        } else if (fieldname.equals("studentname")) {
+            fieldname = "convert(u.username using gbk)";
+        } else if (fieldname.equals("studentno")) {
+            fieldname = "u.studentno";
+        }
+        student.setFieldname(fieldname);
+    }
+
+    //获取学生所在年级列表
+    public List<Integer> listGrade(Integer studentid) {
+        //Integer year = schoolMapper.getYearByUserId(studentid);
+        Integer year=2021;
+        return classStudentMapper.listGrade(studentid, year);
+    }
+
+    //获取全校学生列表
+    public List<ClassStudentVo> listAllStudents(TClassStudent student) {
+        return classStudentMapper.listAllStudents(student);
+    }
+
+    //设置年份
+    public void setYear(TClassStudent student) {
+        //Integer year = schoolMapper.getYearById(student.getSchoolid());
+        Integer year=2021;
+        student.setYear(year);
+    }
+
+    //删除学生所有提高班和所在提高班直播课
+    public ResultVo delTgStu(String loginname) {
+        String[] userIds = loginname.split(",");
+        for (String userid : userIds) {
+            Integer studentid = N_Utils.str2Int(userid);
+            List<Integer> classids = classStudentMapper.listTgClassid(studentid);//获取学生所有提高班
+            for (Integer classid : classids) {
+                deleteById(classid, studentid);
+            }
+        }
+        return new ResultVo(0, "取消选课成功");
+    }
+}

suser/src/main/java/com/xhkjedu/suser/service/gradeclass/ClassTeacherService.java

@@ -0,0 +1,152 @@
+package com.xhkjedu.suser.service.gradeclass;
+
+import com.xhkjedu.config.MissingParametersException;
+import com.xhkjedu.suser.mapper.gradeclass.ClassTeacherMapper;
+//import com.xhkjedu.suser.mapper.gradeclass.SchoolMapper;
+import com.xhkjedu.suser.model.gradeclass.TClassTeacher;
+import com.xhkjedu.suser.model.system.TUser;
+import com.xhkjedu.suser.service.system.UserService;
+import com.xhkjedu.utils.N_Utils;
+import com.xhkjedu.vo.ResultVo;
+import com.xhkjedu.suser.vo.gradeclass.ClassTeacherParams;
+import com.xhkjedu.suser.vo.gradeclass.ClassTeacherVo;
+import com.xhkjedu.suser.vo.gradeclass.ClassVo;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * @author ywx
+ * @classname TClassTeacherService
+ * @description 
+ * @date 2020/6/2 16:45
+ **/
+@Service
+public class ClassTeacherService {
+    @Resource
+    private ClassTeacherMapper classTeacherMapper;
+    @Resource
+    private UserService userService;
+    //@Resource
+    //private SchoolMapper schoolMapper;
+
+    //添加
+    public Integer save(TClassTeacher model) {
+        String userphone = model.getUserphone();
+        TUser user = userService.getObjByLoginName(userphone);
+        if (user == null) {//教师信息在用户表不存在，添加教师信息
+            user = new TUser();
+            user.setUsertype(1);
+            user.setUsername(model.getTeachername());
+            user.setLoginname(userphone);
+            user.setLoginpwd("123456");
+            user.setUserphone(userphone);
+            user.setCreateid(model.getCreateid());
+            user.setSchoolid(model.getSchoolid());
+            ResultVo vo = userService.save(user);
+            if (vo.getCode() != 0) throw new MissingParametersException(vo.getMsg());
+            user.setUserid((Integer) vo.getObj());
+        }
+        model.setTeacherid(user.getUserid());
+        model.setCreatetime(N_Utils.getSecondTimestamp());
+        classTeacherMapper.insertUseGeneratedKeys(model);//添加班级教师
+        return model.getId();
+    }
+
+    //修改
+    public void update(TClassTeacher model) {
+        //修改教师信息
+        TUser user = new TUser();
+        user.setUserid(model.getTeacherid());
+        user.setUsername(model.getTeachername());
+        String userphone = model.getUserphone();
+        user.setUserphone(userphone);
+        userService.update(user);
+    }
+
+    //获取详情
+    public TClassTeacher findById(Integer teacherid) {
+        return classTeacherMapper.selectByPrimaryKey(teacherid);
+    }
+
+    //获取列表
+    public List <ClassTeacherVo> findAll(TClassTeacher teacher, Integer year) {
+        teacher.setYear(year);
+        String fieldname = teacher.getFieldname();
+        if (N_Utils.isEmpty(fieldname) || fieldname.equals("createtime")){
+            fieldname = "u.createtime";
+            if (N_Utils.isEmpty(teacher.getFieldorder())) {
+                teacher.setFieldorder("desc");
+            }
+        } else if (fieldname.equals("teachername")){
+            fieldname = "convert(u.username using gbk)";
+        } else if (fieldname.equals("loginname")){
+            fieldname = "u.loginname";
+        }
+        teacher.setFieldname(fieldname);
+        return classTeacherMapper.findAll(teacher);
+    }
+
+    public Integer getYear(Integer schoolid) {
+        //return schoolMapper.getYearById(schoolid);
+        return 2021;
+    }
+
+    //当前年份教师任教班级
+    public List<ClassVo> listTeacherClass(Integer teacher,Integer classtype){
+        //Integer year = schoolMapper.getYearByUserId(teacher);
+        Integer year=2021;
+        return classTeacherMapper.listTeacherClass(teacher,year,classtype);
+    }
+    //当前年份教师任教班级
+    public List<ClassVo> listTeacherClass2(Integer teacher){
+        //Integer year = schoolMapper.getYearByUserId(teacher);
+        Integer year=2021;
+        return classTeacherMapper.listTeacherClass2(teacher,year);
+    }
+
+    /**
+     * 获取作业学生列表
+     * @Param [paperid]
+     * @Author ywx
+     * @Date 2020/7/10 15:51
+     * @return java.util.List<com.xhkjedu.suser.vo.gradeclass.ClassVo>
+     **/
+    public List<ClassVo> listPaperStudent(Integer paperid) {
+        return classTeacherMapper.listPaperStudent(paperid);
+    }
+
+    //获取作业教师列表
+    public List<Map> listPaperTeacher(Integer paperid, String subjectid) {
+        return classTeacherMapper.listPaperTeacher(paperid, subjectid);
+    }
+
+    /**
+     *功能描述 年级下所有教师
+     * @author WN
+     * @date 2021/1/23
+     * @param  * @param schoolid
+     * @param gradeid
+     * @return java.util.List<com.xhkjedu.model.gradeclass.TClassTeacher>
+     */
+    public List<ClassTeacherVo> listTeachersByGradeid(Integer schoolid,Integer gradeid){
+        //Integer year = schoolMapper.getYearById(schoolid);
+        Integer year=2021;
+        return classTeacherMapper.listTeachersByGradeid(schoolid,gradeid,year);
+    }
+
+    /**
+     *功能描述  获取年级科目下教师集合
+     * @author WN
+     * @date 2021/1/29
+     * @param  * @param ctp
+     * @return java.util.List<com.xhkjedu.suser.vo.gradeclass.ClassTeacherVo>
+     */
+    public List<ClassTeacherVo> listTeahcersBySubjectGrade(ClassTeacherParams ctp) {
+        //Integer year = schoolMapper.getYearById(ctp.getSchoolid());
+        //ctp.setYear(year);
+        return classTeacherMapper.listTeahcersBySubjectGrade(ctp);
+    }
+}

suser/src/main/java/com/xhkjedu/suser/service/gradeclass/GradeService.java

@@ -0,0 +1,87 @@
+package com.xhkjedu.suser.service.gradeclass;
+
+import com.xhkjedu.suser.mapper.gradeclass.GradeMapper;
+//import com.xhkjedu.suser.mapper.gradeclass.SchoolMapper;
+import com.xhkjedu.suser.model.gradeclass.TGrade;
+import com.xhkjedu.utils.N_Utils;
+import com.xhkjedu.suser.vo.gradeclass.GradeVo;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+import java.util.List;
+
+/**
+ * @author ywx
+ * @classname TGradeService
+ * @description 
+ * @date 2020/6/2 14:53
+ **/
+@Service
+public class GradeService {
+    @Resource
+    private GradeMapper gradeMapper;
+    //@Resource
+    //private SchoolMapper schoolMapper;
+
+    //添加
+    public Integer save(TGrade model) {
+        model.setCreatetime(N_Utils.getSecondTimestamp());
+        gradeMapper.insertUseGeneratedKeys(model);
+        return model.getId();
+    }
+
+    //删除
+    public Integer deleteById(Integer gradeid) {
+        return gradeMapper.deleteByPrimaryKey(gradeid);
+    }
+
+    //修改
+    public Integer update(TGrade model) {
+        return gradeMapper.updateByPrimaryKeySelective(model);
+    }
+
+    //获取详情
+    public TGrade findById(Integer gradeid) {
+        return gradeMapper.findById(gradeid);
+    }
+
+    //获取列表
+    public List <TGrade> findAll(Integer schoolid) {
+        //Integer year = schoolMapper.getYearById(schoolid);
+        Integer year = 2021;
+        return gradeMapper.findAll(schoolid, year);
+    }
+
+    /**
+     * 获取通知班级列表
+     * @Param [schoolid, year]
+     * @Author ywx
+     * @Date 2020/6/13 15:41
+     * @return java.util.List<com.xhkjedu.suser.vo.gradeclass.GradeVo>
+     **/
+    public List<GradeVo> listClass(Integer schoolid,Integer classtype) {
+        //Integer year = schoolMapper.getYearById(schoolid);
+        Integer year = 2021;
+        return gradeMapper.listClass(schoolid, year,classtype);
+    }
+
+    /**
+     * 获取通知教师列表
+     * @Param [schoolid, year]
+     * @Author ywx
+     * @Date 2020/6/13 15:42
+     * @return java.util.List<com.xhkjedu.suser.vo.gradeclass.GradeVo>
+     **/
+    public List<GradeVo> listTeacher(Integer schoolid) {
+        //Integer year = schoolMapper.getYearById(schoolid);
+        Integer year = 2021;
+        return gradeMapper.listTeacher(schoolid, year);
+    }
+
+    //获取行政班和提高班
+    public List<GradeVo> listClassForTeacher(Integer schoolid) {
+        //Integer year = schoolMapper.getYearById(schoolid);
+        Integer year = 2021;
+        return gradeMapper.listClassForTeacher(schoolid,year);
+    }
+}

suser/src/main/java/com/xhkjedu/suser/service/gradeclass/GroupService.java

@@ -0,0 +1,75 @@
+package com.xhkjedu.suser.service.gradeclass;
+
+import com.xhkjedu.suser.mapper.gradeclass.GroupMapper;
+//import com.xhkjedu.suser.mapper.gradeclass.SchoolMapper;
+import com.xhkjedu.suser.model.gradeclass.TGroup;
+import com.xhkjedu.utils.N_Utils;
+import com.xhkjedu.suser.vo.gradeclass.ClassGroupVo;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+import java.util.List;
+
+/**
+ * @author ywx
+ * @classname GroupService
+ * @description 
+ * @date 2020/6/2 17:26
+ **/
+@Service
+public class GroupService {
+    @Resource
+    private GroupMapper groupMapper;
+    @Resource
+    private GroupStudentService groupStudentService;
+    //@Resource
+    //private SchoolMapper schoolMapper;
+
+    //添加
+    public Integer save(TGroup model) {
+        model.setGroupnum(0);
+        model.setCreatetime(N_Utils.getSecondTimestamp());
+        groupMapper.insertUseGeneratedKeys(model);
+        if (N_Utils.isListNotEmpty(model.getStudents())){
+            model.setGroupid(model.getId());
+            groupStudentService.batchSave(model);//批量添加分组学生
+        }
+        return model.getId();
+    }
+
+    //删除
+    public Integer deleteById(Integer groupid) {
+        return groupMapper.deleteByPrimaryKey(groupid);
+    }
+
+    //修改
+    public Integer update(TGroup model) {
+        if (N_Utils.isListEmpty(model.getStudents())){//如果分组学生为空直接删除分组
+            return deleteById(model.getGroupid());
+        }
+        groupStudentService.deleteByGroupId(model.getGroupid());//先删除分组学生
+        if (N_Utils.isListNotEmpty(model.getStudents())){
+            groupStudentService.batchSave(model);//在批量添加分组学生
+        }
+        updateNum(model.getGroupid());//更新分组人数
+        model.setGroupnum(null);
+        return groupMapper.updateByPrimaryKeySelective(model);
+    }
+
+    //获取列表
+    public List <TGroup> findAll(Integer classid, Integer createid) {
+        return groupMapper.findAll(classid, createid);
+    }
+
+    //更新分组人数
+    public void updateNum(Integer groupid) {
+        groupMapper.updateNum(groupid);
+    }
+
+    //教师分组列表
+    public List<ClassGroupVo> teacherList(Integer teacherid) {
+        //Integer year = schoolMapper.getYearByUserId(teacherid);
+        Integer year=2022;
+        return groupMapper.teacherList(teacherid, year);
+    }
+}

suser/src/main/java/com/xhkjedu/suser/service/gradeclass/GroupStudentService.java

@@ -0,0 +1,77 @@
+package com.xhkjedu.suser.service.gradeclass;
+
+import com.xhkjedu.suser.mapper.gradeclass.GroupMapper;
+import com.xhkjedu.suser.mapper.gradeclass.GroupStudentMapper;
+import com.xhkjedu.suser.model.gradeclass.TGroup;
+import com.xhkjedu.suser.model.gradeclass.TGroupStudent;
+import com.xhkjedu.utils.N_Utils;
+import com.xhkjedu.suser.vo.gradeclass.GroupStudentVo;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * @author ywx
+ * @classname TGroupStudentService
+ * @description 
+ * @date 2020/6/2 16:57
+ **/
+@Service
+public class GroupStudentService {
+    @Resource
+    private GroupStudentMapper groupStudentMapper;
+    @Resource
+    private GroupMapper groupMapper;
+
+    //添加
+    public Integer save(TGroupStudent model) {
+        model.setCreatetime(N_Utils.getSecondTimestamp());
+        groupStudentMapper.insertUseGeneratedKeys(model);
+        groupMapper.updateNum(model.getGroupid());//更新分组人数
+        return model.getId();
+    }
+
+    //批量添加
+    public void batchSave(TGroup group) {
+        Integer classid = group.getClassid();
+        Integer groupid = group.getGroupid();
+        Integer createid = group.getCreateid();
+        Integer schoolid = group.getSchoolid();
+        List<GroupStudentVo> students = group.getStudents();
+        List<TGroupStudent> groupStudents = new ArrayList<>();
+        for (GroupStudentVo student : students) {
+            TGroupStudent gs = new TGroupStudent();
+            gs.setClassid(classid);
+            gs.setGroupid(groupid);
+            gs.setStudentid(student.getStudentid());
+            gs.setCreateid(createid);
+            gs.setSchoolid(schoolid);
+            gs.setCreatetime(N_Utils.getSecondTimestamp());
+            groupStudents.add(gs);
+        }
+        groupStudentMapper.insertList(groupStudents);
+        groupMapper.updateNum(groupid);//更新分组人数
+    }
+
+    //删除
+    public void deleteById(TGroupStudent group) {
+        groupStudentMapper.deleteByPrimaryKey(group.getGsid());
+        groupMapper.updateNum(group.getGroupid());//更新分组人数
+    }
+
+    //获取列表
+    public List <GroupStudentVo> findAll(Integer groupid) {
+        return groupStudentMapper.findAll(groupid);
+    }
+
+    //批量添加
+    public void batchSave(List<TGroupStudent> groupStudents) {
+        groupStudentMapper.insertList(groupStudents);
+    }
+
+    public void deleteByGroupId(Integer groupid) {
+        groupStudentMapper.deleteByGroupId(groupid);
+    }
+}

suser/src/main/java/com/xhkjedu/suser/service/system/RoleService.java

@@ -0,0 +1,197 @@
+package com.xhkjedu.suser.service.system;
+
+import com.xhkjedu.suser.mapper.system.RoleMapper;
+import com.xhkjedu.suser.mapper.system.RoleModuleMapper;
+import com.xhkjedu.suser.mapper.system.UserRoleMapper;
+import com.xhkjedu.suser.model.system.TRole;
+import com.xhkjedu.suser.model.system.TRoleModule;
+import com.xhkjedu.suser.model.system.TUserRole;
+import com.xhkjedu.utils.N_Utils;
+import com.xhkjedu.suser.vo.system.RoleModuleVo;
+import com.xhkjedu.suser.vo.system.RoleVo;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+import org.springframework.transaction.interceptor.TransactionAspectSupport;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * @ClassName RoleService
+ * Description TODO
+ * Author WN
+ * Date 2020/6/13 17:41
+ **/
+@Service
+@Slf4j
+public class RoleService {
+    @Autowired
+    private RoleMapper roleMapper;
+    @Autowired
+    private RoleModuleMapper roleModuleMapper;
+    @Autowired
+    private UserRoleMapper userRoleMapper;
+
+    //保存
+    @Transactional(rollbackFor = Exception.class)
+    public Integer save(TRole role) throws Exception {
+        try {
+            role.setCreatetime(N_Utils.getSecondTimestamp());
+            //保存角色信息
+            roleMapper.insertUseGeneratedKeys(role);
+            role.setRoleid(role.getId());
+
+            //处理角色模块信息
+            List<RoleModuleVo> rms = role.getModules();
+            if(rms!=null && rms.size()>0){
+                saveRoleModules(rms,role);
+            }
+
+            return role.getId();
+        } catch (Exception e) {
+            log.error("角色保存失败："+e.getMessage());
+            TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
+            throw new Exception("角色保存失败");
+        }
+    }
+
+    private void saveRoleModules(List<RoleModuleVo> rms,TRole role){
+        List<TRoleModule> lst = new ArrayList<>();
+        for(RoleModuleVo rm:rms){
+            TRoleModule trm = new TRoleModule();
+            trm.setRoleid(role.getRoleid());
+            trm.setModuleid(rm.getModuleid());
+            trm.setCreateid(role.getCreateid());
+            trm.setCreatetime(N_Utils.getSecondTimestamp());
+            trm.setSchoolid(role.getSchoolid());
+
+            lst.add(trm);
+
+            for(RoleModuleVo child : rm.getModulechilds()){
+                TRoleModule trm2 = new TRoleModule();
+                trm2.setRoleid(role.getRoleid());
+                trm2.setModuleid(child.getModuleid());
+                trm2.setCreateid(role.getCreateid());
+                trm2.setCreatetime(N_Utils.getSecondTimestamp());
+                trm2.setSchoolid(role.getSchoolid());
+
+                lst.add(trm2);
+            }
+        }
+
+        //批量保存角色模块信系
+        roleModuleMapper.saveBathRoleModule(lst);
+    }
+
+    //修改
+    @Transactional(rollbackFor = Exception.class)
+    public Integer update(TRole role) throws Exception {
+        try {
+            //先删除角色模块关联信息
+            roleModuleMapper.deleteByRoleid(role.getRoleid());
+            if(role.getModules()!=null && role.getModules().size()>0){
+                //重新保存模块关联信息
+                saveRoleModules(role.getModules(),role);
+            }
+            deleteNoRoleUserModule(role.getRoleid());//删除没有权限的用户常用模块
+            return roleMapper.updateByPrimaryKeySelective(role);
+        } catch (Exception e) {
+            log.error("教师修改失败："+e.getMessage());
+            TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
+            throw new Exception("角色修改失败");
+        }
+    }
+
+    /**
+     * @author ywx
+     * @description 删除没有权限的用户常用模块
+     * @date 2020/7/9 21:00
+     **/
+    private void deleteNoRoleUserModule(Integer roleid) {
+        List<Integer> userids = userRoleMapper.listUserId(roleid);//获取有常用模块的用户id集合
+        for (Integer userid : userids) {
+            userRoleMapper.deleteNoRoleByUserId(userid);//根据用户id删除没有权限的常用模块
+        }
+    }
+
+    //删除
+    public Integer del(Integer roleid){
+        Integer result = roleMapper.deleteByPrimaryKey(roleid);
+        deleteNoRoleUserModule(roleid);//删除没有权限的用户常用模块
+        return result;
+    }
+
+    //所有角色
+    public List<TRole> listAllRoles(Integer schoolid){
+        return roleMapper.listAllRoles(schoolid);
+    }
+
+    /**
+     *功能描述 角色详情包含角色下用户
+     * @author WN
+     * @date 2020/6/15
+     * @param  * @param roleid
+     */
+    public RoleVo getRoleDetail(Integer roleid){
+        RoleVo roleVo = roleMapper.getRoleDetail(roleid);
+        //获取角色下用户
+        List<TUserRole> users = userRoleMapper.listUsersByRoleid(roleid);
+        roleVo.setUsers(users);
+
+        //获取角色下模块信息
+        List<RoleModuleVo> modules = roleModuleMapper.listRoleModules(roleid);
+        if(modules!=null && modules.size()>0){
+            roleVo.setModules(listRoleModuleForTree(modules));
+        }
+
+        return roleVo;
+    }
+
+    //处理返回值为层级结果
+    private List<RoleModuleVo> listRoleModuleForTree(List<RoleModuleVo> modules){
+        List<RoleModuleVo> lst = new ArrayList<>();
+        for(RoleModuleVo m : modules){
+            if(m.getLevel()==1){
+                lst.add(m);
+            }
+        }
+
+        for(RoleModuleVo m : lst){
+            List<RoleModuleVo> childs = m.getModulechilds();
+            for(RoleModuleVo mc: modules){
+                if(m.getModuleid().equals(mc.getModulepid())){
+                    if(!isExistModule(childs,m.getModuleid())){
+                        childs.add(mc);
+                    }
+                }
+            }
+        }
+        return lst;
+    }
+
+    //判断集合中是否存在模块
+    private boolean isExistModule(List<RoleModuleVo> lst, String moduleid){
+        for(RoleModuleVo m: lst){
+            if(m.getModuleid().equals(moduleid)){
+                return true;
+            }
+        }
+        return false;
+    }
+
+    /**
+     *功能描述 用户有权限的所有模块
+     * @author WN
+     * @date 2020/6/15
+     * @param  * @param userid
+     * @return java.util.List<com.xhkjedu.suser.vo.system.RoleModuleVo>
+     */
+    public List<RoleModuleVo> listModulesByUserid(Integer userid){
+
+        List<RoleModuleVo> modules = roleModuleMapper.listModulesByUserid(userid);
+
+        return listRoleModuleForTree(modules);
+    }
+}

suser/src/main/java/com/xhkjedu/suser/service/system/TeacherRoleService.java

@@ -0,0 +1,223 @@
+package com.xhkjedu.suser.service.system;
+
+import com.xhkjedu.suser.mapper.gradeclass.ClassTeacherMapper;
+//import com.xhkjedu.suser.mapper.subjectbook.TeacherPowersbMapper;
+//import com.xhkjedu.suser.mapper.subjectbook.TeacherSubjectbookMapper;
+import com.xhkjedu.suser.mapper.system.UserRoleMapper;
+import com.xhkjedu.suser.model.gradeclass.TClassTeacher;
+import com.xhkjedu.suser.model.subjectbook.TTeacherPowersb;
+import com.xhkjedu.suser.model.system.TUserRole;
+import com.xhkjedu.suser.vo.system.TeacherRoleVo;
+import com.xhkjedu.utils.N_Utils;
+import com.xhkjedu.suser.vo.gradeclass.ClassVo;
+import com.xhkjedu.suser.vo.gradeclass.GradeVo;
+import com.xhkjedu.suser.vo.subjectbook.LsbBookVo;
+import com.xhkjedu.suser.vo.subjectbook.SubjectVo;
+import com.xhkjedu.suser.vo.subjectbook.TeacherSubjectbookVo;
+import com.xhkjedu.suser.vo.system.TeacherRoleParam;
+import com.xhkjedu.suser.vo.system.UserRoleVo;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+import org.springframework.transaction.interceptor.TransactionAspectSupport;
+import org.springframework.util.CollectionUtils;
+
+import javax.annotation.Resource;
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * @ClassName TeacherRoleService
+ * Description TODO
+ * Author WN
+ * Date 2020/6/18 9:44
+ **/
+@Service
+@Slf4j
+public class TeacherRoleService {
+    @Autowired
+    private ClassTeacherMapper classTeacherMapper;
+
+    @Autowired
+    private UserRoleMapper userRoleMapper;
+
+    /*@Autowired
+    private TeacherPowersbMapper teacherPowersbMapper;
+
+    @Resource
+    private TeacherSubjectbookMapper teacherSubjectbookMapper;
+
+    @Autowired
+    private UserModuleMapper userModuleMapper;
+    @Resource
+    private SchoolMapper schoolMapper;*/
+
+    /**
+     *功能描述  保存教师设置权限
+     * @author WN
+     * @date 2020/6/18
+     * @param  * @param trole
+     * @return void
+     */
+    @Transactional(rollbackFor = Exception.class)
+    public void save(TeacherRoleParam trole) throws Exception {
+        try {
+            //Integer year = schoolMapper.getYearByUserId(trole.getTeacherid());
+            //trole.setYear(year);
+            int timestamp = N_Utils.getSecondTimestamp();
+            //处理用户角色
+            // 先删除
+            userRoleMapper.deleteByUserid(trole.getTeacherid());
+            if(!CollectionUtils.isEmpty(trole.getRolelist())){
+                List<TUserRole> rolelst = new ArrayList<>();
+                for(Integer roleid : trole.getRolelist()){
+                    TUserRole ur = new TUserRole();
+                    ur.setUserid(trole.getTeacherid());
+                    ur.setRoleid(roleid);
+                    ur.setCreatetime(timestamp);
+                    ur.setCreateid(trole.getCreateid());
+
+                    rolelst.add(ur);
+                }
+
+                //批量保存用户角色信息
+                userRoleMapper.insertList(rolelst);
+            }
+
+            //根据用户id删除没有权限的常用模块
+            //userModuleMapper.deleteNoRoleByUserId(trole.getTeacherid());
+            //
+            ////处理用户教材
+            //List<String> lsbids = teacherSubjectbookMapper.listLsbsByUserid(trole.getTeacherid());
+            //List<String> lsbId = N_Utils.listNotInList3(lsbids, trole.getLsblist());
+            //if (N_Utils.isListNotEmpty(lsbId)){//删除教师收藏教材
+            //    teacherSubjectbookMapper.deleteByLsbIdTeacherId(lsbId, trole.getTeacherid());
+            //}
+            ////先删除
+            //teacherPowersbMapper.deleteByUserid(trole.getTeacherid());
+            if(!CollectionUtils.isEmpty(trole.getLsblist())){
+                List<TTeacherPowersb> tpowerlist = new ArrayList<>();
+                for(String lsbid : trole.getLsblist()){
+                    TTeacherPowersb tp = new TTeacherPowersb();
+                    tp.setTeacherid(trole.getTeacherid());
+                    tp.setLsbid(lsbid);
+                    tp.setCreateid(trole.getCreateid());
+                    tp.setCreatetime(timestamp);
+                    tp.setSchoolid(trole.getSchoolid());
+
+                    tpowerlist.add(tp);
+                }
+
+                //teacherPowersbMapper.insertList(tpowerlist);
+            }
+
+            //处理用户班级
+            //先删除任教班级
+            classTeacherMapper.deleteByUserid(trole.getTeacherid(),trole.getYear());
+            if(!CollectionUtils.isEmpty(trole.getClasslist())){
+                List<TClassTeacher> ctlst = new ArrayList<>();
+                for(Integer classid : trole.getClasslist()){
+                    TClassTeacher ct = new TClassTeacher();
+                    ct.setTeacherid(trole.getTeacherid());
+                    ct.setClassid(classid);
+                    ct.setCreateid(trole.getCreateid());
+                    ct.setSchoolid(trole.getSchoolid());
+                    ct.setCreatetime(timestamp);
+
+                    ctlst.add(ct);
+                }
+
+                classTeacherMapper.insertList(ctlst);
+            }
+        } catch (Exception e) {
+            log.error("教师设置权限失败："+e.getMessage());
+            TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
+            throw new Exception("教师设置权限失败");
+        }
+
+    }
+
+    //获取用户权限--角色、班级、教材 集合
+    public TeacherRoleVo getTeacherRoles(TeacherRoleParam trparam){
+        //Integer year = schoolMapper.getYearByUserId(trparam.getTeacherid());
+        //trparam.setYear(year);
+        TeacherRoleVo trvo = new TeacherRoleVo();
+        //获取已设置角色集合
+        List<UserRoleVo> roleids = userRoleMapper.listRolesByUserid(trparam.getTeacherid());
+        List<ClassVo> classids = classTeacherMapper.listClassesByUserid(trparam.getTeacherid(),trparam.getYear(),trparam.getClasstype());
+        //List<TeacherSubjectbookVo> lsbids = teacherPowersbMapper.listLsbsByUserid(trparam.getTeacherid());
+
+        trvo.setRolelist(roleids);
+        trvo.setClasslist(classids);
+        //trvo.setLsblist(lsbids);
+
+        return trvo;
+    }
+
+    /**
+     * 教师权限教材列表
+     * @Param [teacherid]
+     * @Author ywx
+     * @Date 2020/7/1 10:42
+     * @return com.xhkjedu.suser.vo.system.TeacherRoleVo
+     **/
+    public TeacherRoleVo listBook(Integer teacherid) {
+        TeacherRoleVo trvo = new TeacherRoleVo();
+        //获取已设置角色集合
+        //List<TeacherSubjectbookVo> lsbids = teacherPowersbMapper.listLsbsByUserid(teacherid);
+        //trvo.setLsblist(lsbids);
+        return trvo;
+    }
+
+    /**
+     * 教师权限科目
+     * @Param [teacherid]
+     * @Author ywx
+     * @Date 2020/7/24 9:26
+     * @return java.util.List<com.xhkjedu.suser.vo.subjectbook.SubjectVo>
+     **/
+    public List<SubjectVo> listSubject(Integer teacherid) {
+        //return teacherPowersbMapper.listSubject(teacherid);
+        return null;
+    }
+
+    /**
+     *功能描述 教师权限科目下，权限教材
+     * @author WN
+     * @date 2020/8/11
+     * @param  * @param teacherid
+     * @param subjectid
+     * @return java.util.List<com.xhkjedu.suser.vo.subjectbook.LsbBookVo>
+     */
+    public List<LsbBookVo> listBookBySubjectid(Integer teacherid,String subjectid){
+        //return teacherPowersbMapper.listBookBySubjectid(teacherid,subjectid);
+        return null;
+    }
+
+    /**
+     * 教师权限班级
+     * @Param [teacherid, year]
+     * @Author ywx
+     * @Date 2020/7/29 9:56
+     * @return java.util.List<com.xhkjedu.suser.vo.gradeclass.ClassVo>
+     **/
+    public List<GradeVo> listGradeClassesByUserid(TeacherRoleParam role) {
+        //Integer year = schoolMapper.getYearByUserId(role.getTeacherid());
+        //role.setYear(year);
+        return classTeacherMapper.listGradeClassesByUserid(role);
+    }
+
+    /**
+     * 教师权限班级
+     * @Param [role]
+     * @Author ywx
+     * @Date 2021/6/15 17:41
+     * @return java.util.List<com.xhkjedu.suser.vo.gradeclass.GradeVo>
+     **/
+    public List<GradeVo> listGradeClassesByUserid2(TeacherRoleParam role) {
+        //Integer year = schoolMapper.getYearByUserId(role.getTeacherid());
+        //role.setYear(year);
+        return classTeacherMapper.listGradeClassesByUserid2(role);
+    }
+}

suser/src/main/java/com/xhkjedu/suser/service/system/UserService.java

@@ -0,0 +1,780 @@
+package com.xhkjedu.suser.service.system;
+
+import com.github.pagehelper.PageHelper;
+import com.github.pagehelper.PageInfo;
+import com.xhkjedu.suser.config.ConfigKey;
+//import com.xhkjedu.suser.mapper.gradeclass.SchoolMapper;
+import com.xhkjedu.suser.mapper.system.UserMapper;
+import com.xhkjedu.vo.PageResult;
+import com.xhkjedu.suser.model.system.TMsg;
+import com.xhkjedu.suser.model.system.TUser;
+import com.xhkjedu.suser.model.system.TUserLog;
+import com.xhkjedu.utils.DESUtils;
+import com.xhkjedu.utils.DatesUtil;
+import com.xhkjedu.suser.utils.JedisUtil;
+import com.xhkjedu.utils.MD5;
+import com.xhkjedu.utils.N_Utils;
+import com.xhkjedu.utils.PageUtil;
+import com.xhkjedu.suser.utils.PoiUtils;
+import com.xhkjedu.suser.utils.SMSSender;
+import com.xhkjedu.vo.ResultVo;
+import com.xhkjedu.suser.vo.assess.AssessParams;
+import com.xhkjedu.suser.vo.system.TeacherVo;
+import com.xhkjedu.suser.vo.system.UserVo;
+import com.xhkjedu.suser.vo.system.ZtMsgVo;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.util.CollectionUtils;
+import org.springframework.web.multipart.MultipartFile;
+
+import javax.annotation.Resource;
+import javax.servlet.http.HttpServletRequest;
+import java.net.UnknownHostException;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.UUID;
+
+/**
+ * @ClassName UserService
+ * Description
+ * Author WN
+ * Date 2020/5/29 16:31
+ **/
+@Service
+@Slf4j
+public class UserService extends JedisUtil {
+
+    @Autowired
+    private UserMapper userMapper;
+    /*@Autowired
+    private UserLogService userLogService;
+    @Resource
+    private MsgService msgService;
+    @Resource
+    private SchoolMapper schoolMapper;*/
+
+    /**
+     *功能描述  根据登录名和密码获取用户信息
+     * @author WN
+     * @date 2020/6/1
+     * @param  * @param user
+     * @return com.xhkjedu.vo.ResultVo
+     */
+    public ResultVo getUserByLoginnameAndPwd(TUser user,HttpServletRequest request){
+        ResultVo resultVo = null;
+        String loginpwd = user.getLoginpwd();
+        setLoginPwd(user);
+        UserVo userVo = userMapper.getUserByLoginname(user.getLoginname());
+
+        if(userVo!=null && userVo.getUserid()>0){
+            //String schooldomain = userVo.getSchooldomain();
+            //if (checkDomain(request, schooldomain, userVo.getSchoolid())) return new ResultVo(1, "该账号不存在");
+            user.setUserid(userVo.getUserid());
+            user.setUsername(userVo.getUsername());
+            user.setSchoolid(userVo.getSchoolid());
+            if (!userVo.getLoginpwd().equals(user.getLoginpwd())) {
+                resultVo = new ResultVo(1, "密码错误");
+            } else {
+                if (userVo.getUsertype() == 999) {
+                    resultVo = new ResultVo(0, "登录成功", userVo);
+                } else if (userVo.getUsertype() == 2) {
+                    resultVo = new ResultVo(1, "禁止学生登录");
+                } else if(userVo.getSchoolstate()!=1){
+                    resultVo = new ResultVo(1,"用户所在学校暂无权限");
+                }else{
+                    if(userVo.getUserstate()!=1){
+                        resultVo = new ResultVo(1,"该账户无权访问，请联系老师");
+                    }else{
+                        resultVo = new ResultVo(0,"登录成功",userVo);
+                    }
+                }
+            }
+        }else{
+            resultVo = new ResultVo(1,"该账号不存在");
+        }
+
+        return getLogResultVo(user, resultVo, loginpwd, request);
+    }
+
+    //校验域名
+    private boolean checkDomain(HttpServletRequest request, String schooldomain, Integer schoolid) {
+        String clientlogin = request.getHeader("clientlogin");//有值不校验
+        if (N_Utils.isNotEmpty(clientlogin)) return false;
+        //origin:pc端获取到的是file://、android和手机端获取的为空、开发环境获取的是localhost
+        String url = request.getHeader("origin");
+        if (N_Utils.isEmpty(schooldomain) || N_Utils.isEmpty(url)
+                || url.equals("file://") || url.contains("localhost")) {
+            return false;
+        }
+        String domain = url.replace("https://", "").replace("http://", "");
+        //Integer sid = schoolMapper.getSchoolIdByDomain(domain, schoolid);
+        //if (!schoolid.equals(sid)) {
+        //    return true;
+        //}
+        return false;
+    }
+
+    //教师登录
+    public ResultVo loginTeacher(TUser user,HttpServletRequest request){
+        ResultVo resultVo = null;
+        String loginpwd = user.getLoginpwd();
+        setLoginPwd(user);
+        UserVo userVo = userMapper.getUserByLoginname(user.getLoginname());
+
+        if(userVo!=null && userVo.getUserid()>0) {
+            //String schooldomain = userVo.getSchooldomain();
+            //if (checkDomain(request, schooldomain, userVo.getSchoolid())) return new ResultVo(1, "该账号不存在");
+            user.setUserid(userVo.getUserid());
+            user.setUsername(userVo.getUsername());
+            user.setSchoolid(userVo.getSchoolid());
+            if (!userVo.getLoginpwd().equals(user.getLoginpwd())) {
+                resultVo = new ResultVo(1, "密码错误");
+            } else {
+                if (userVo.getUsertype() != 1) {
+                    resultVo = new ResultVo(1, "禁止非教师账号登录");
+                } else if (userVo.getSchoolstate() != 1) {
+                    resultVo = new ResultVo(1, "用户所在学校暂无权限");
+                }else{
+                    if(userVo.getUserstate()!=1){
+                        resultVo = new ResultVo(1,"该账户无权访问，请联系老师");
+                    }else{
+                        resultVo = new ResultVo(0,"登录成功",userVo);
+                    }
+                }
+            }
+        }else{
+            resultVo = new ResultVo(1,"该账号不存在");
+        }
+
+        return getLogResultVo(user, resultVo, loginpwd, request);
+    }
+
+    /**
+     * 学生登录
+     * @Param [user]
+     * @Author ywx
+     * @Date 2020/6/2 11:14
+     * @return com.xhkjedu.vo.ResultVo
+     **/
+    public ResultVo loginStudent(TUser user, HttpServletRequest request){
+        ResultVo resultVo = null;
+        String loginpwd = user.getLoginpwd();
+        setLoginPwd(user);
+        String mac = user.getMac();
+        UserVo userVo = userMapper.getUserByLoginnameMac(user.getLoginname(),mac);
+
+        if(userVo!=null && userVo.getUserid()>0) {
+            //String schooldomain = userVo.getSchooldomain();
+            //if (checkDomain(request, schooldomain, userVo.getSchoolid())) return new ResultVo(1, "该账号不存在");
+            Integer sbindmac = userVo.getSbindmac();
+            user.setUserid(userVo.getUserid());
+            user.setUsername(userVo.getUsername());
+            user.setSchoolid(userVo.getSchoolid());
+            if (!userVo.getLoginpwd().equals(user.getLoginpwd())) {
+                resultVo = new ResultVo(1, "密码错误");
+            } else {
+                if (userVo.getUsertype() != 2) {
+                    resultVo = new ResultVo(1, "登录失败，仅允许学生登录");
+                } else if (userVo.getXznum() == 0) {
+                    resultVo = new ResultVo(1,"该账号未分配班级");
+                } else if (sbindmac == 1 && N_Utils.isNotEmpty(mac)) {
+                    if (N_Utils.isNotEmpty(userVo.getMac()) && !mac.equals(userVo.getMac())) {
+                        resultVo = new ResultVo(1, "登录失败，该账号已与其他设备关联");
+                    } else {
+                        //20211221添加注释，sql语句修改了，不绑定的情况下会出现一个mac可以绑定多个帐号，绑定情况下没问题
+                        if (N_Utils.isNotEmpty(userVo.getMacname()) && !userVo.getMacname().equals(user.getLoginname())) {
+                            resultVo = new ResultVo(1, "登录失败，该设备已与其他账号关联");
+                        } else {
+                            resultVo = new ResultVo(0, "登录成功", userVo);
+                        }
+                    }
+                } else {
+                    resultVo = new ResultVo(0, "登录成功", userVo);
+                }
+                //更新学生硬件绑定信息
+                userVo.setMac(mac);
+                userVo.setBindmac(sbindmac);
+                userMapper.updateBindMac(userVo);
+            }
+        }else{
+            resultVo = new ResultVo(1,"该账号不存在");
+        }
+
+        return getLogResultVo(user, resultVo, loginpwd, request);
+    }
+
+    /**
+     * 登录日志
+     * @Param [loginname, device, user, result]
+     * @Author ywx
+     * @Date 2020/6/2 11:08
+     * @return com.xhkjedu.vo.ResultVo
+     **/
+    private ResultVo getLogResultVo(TUser user, ResultVo result, String loginpwd, HttpServletRequest request) {
+        String loginname = user.getLoginname();
+        TUserLog userLog = new TUserLog();
+        userLog.setLoginname(loginname);
+        if (result.getCode() == 0) {
+            UserVo userVo = (UserVo) result.getObj();
+            String usertime = userVo.getUsertime();
+            if (N_Utils.isNotEmpty(usertime)) {
+                String dayBegin = DatesUtil.getDayBegin();
+                if (usertime.compareTo(dayBegin) < 0) {
+                    result.setCode(1);
+                    result.setMsg("账号已过有效期，请联系管理员");
+                    return result;
+                }
+            }
+
+            //redis
+            String ticketKey = UUID.randomUUID().toString().replace("-", "");
+            String token = DESUtils.encrypt(ticketKey, ConfigKey.secretKey);//加密
+            String key = userVo.getCloudcode()+"_"+userVo.getUserid()+"_"+user.getUltype();
+            Boolean redis_rtn = set(key, token, ConfigKey.redisdatatime);
+            if(!redis_rtn){
+                result.setCode(1);
+                result.setMsg("加入缓存出错!");
+                return result;
+            } else {
+                userLog.setLoginstate(1);
+                userLog.setLogtxt("登录成功");
+                userVo.setToken_key(key);
+                userVo.setToken_value(token);
+                result.setObj(userVo);
+            }
+        } else {
+            userLog.setLoginstate(2);
+            userLog.setLogtxt(result.getMsg()+"，密码："+loginpwd);
+        }
+        try {
+            userLog.setUserid(user.getUserid());
+            userLog.setUsername(user.getUsername());
+            userLog.setSchoolid(user.getSchoolid());
+            userLog.setLogip(user.getLogip());
+            userLog.setLogaddress(user.getLogaddress());
+            userLog.setUltype(user.getUltype());
+            userLog.setVersionnum(user.getVersionnum());
+            userLog.setLogtime(N_Utils.getSecondTimestamp());
+            userMapper.saveUserLog(userLog);
+        } catch (Exception e) {
+            log.error("添加登录日志失败:" + e.getMessage());
+            result = new ResultVo(1, "保存失败");
+        }
+        return result;
+    }
+
+    /**
+     * 添加用户信息
+     * @Param [user]
+     * @Author ywx
+     * @Date 2020/6/2 9:45
+     * @return com.xhkjedu.vo.ResultVo
+     **/
+    public ResultVo save(TUser user) {
+        Integer schoolid = user.getSchoolid();
+        /*Integer usernum = schoolMapper.getUserNumById(schoolid);
+        if (usernum != null) {
+            Integer usernum2 = userMapper.getUserNumBySchoolId(schoolid);
+            usernum2 = usernum2 + 1;//学校账号数量+本次添加的人
+            if (usernum.compareTo(usernum2) == -1) {
+                return new ResultVo(1,"账号数量已超限，请联系管理员");
+            }
+        }*/
+        user.setUserstate(1);
+        user.setCreatetime(N_Utils.getSecondTimestamp());
+        setLoginPwd(user);
+//        userMapper.insertSelective(user);
+        userMapper.insertUseGeneratedKeys(user);
+        return new ResultVo(0, "保存成功",user.getId());
+    }
+
+    /**
+     * 修改用户信息
+     * @Param [user]
+     * @Author ywx
+     * @Date 2020/6/2 9:51
+     * @return com.xhkjedu.vo.ResultVo
+     **/
+    public ResultVo update(TUser user) {
+        if (N_Utils.isNotEmpty(user.getLoginpwd())) {
+            setLoginPwd(user);
+        }
+        String loginname = user.getLoginname();
+        if (N_Utils.isNotEmpty(loginname)) {
+            TUser user1 = getObjByLoginName(loginname);
+            //登录账号改变并且和别的账号冲突
+            if (user1!=null && !user1.getUserid().equals(user.getUserid())) {
+                return new ResultVo(1,"此用户已存在，请更换！");
+            }
+        }
+        user.setCreatetime(N_Utils.getSecondTimestamp());
+        userMapper.updateByPrimaryKeySelective(user);
+        return new ResultVo(0,"修改成功");
+    }
+
+    private void setLoginPwd(TUser user) {
+        MD5 m = new MD5();
+        String loginpwd = m.getMD5ofStr(m.getMD5ofStr(m.getMD5ofStr(user.getLoginpwd())));
+        user.setLoginpwd(loginpwd);
+    }
+
+    /**
+     * 删除用户
+     * @Param [user]
+     * @Author ywx
+     * @Date 2020/6/2 9:59
+     * @return com.xhkjedu.vo.ResultVo
+     **/
+    public ResultVo deleteById(TUser user) {
+        user.setDeletetime(N_Utils.getSecondTimestamp());
+        userMapper.deleteById(user);
+        return new ResultVo(0,"删除成功");
+    }
+
+    /**
+     * 获取用户列表
+     * @Param [user]
+     * @Author ywx
+     * @Date 2020/6/2 10:06
+     * @return com.xhkjedu.vo.ResultVo
+     **/
+    public ResultVo findAll(TUser user) {
+        PageHelper.startPage(user.getPage(), user.getPageSize());
+        List<UserVo> list = userMapper.findAll(user);
+        PageResult pageResult = PageUtil.getPageResult(new PageInfo<>(list));
+        return new ResultVo(0,"获取列表成功", pageResult);
+    }
+
+    /**
+     * 获取用户详情
+     * @Param [userid]
+     * @Author ywx
+     * @Date 2020/6/2 10:23
+     * @return com.xhkjedu.vo.ResultVo
+     **/
+    public ResultVo findById(Integer userid) {
+        UserVo userVo = userMapper.findById(userid);
+        return new ResultVo(0,"获取详情成功", userVo);
+    }
+
+    /**
+     * 修改用户密码
+     * @Param [user]
+     * @Author ywx
+     * @Date 2020/6/2 10:30
+     * @return com.xhkjedu.vo.ResultVo
+     **/
+    public ResultVo updatePwd(TUser user) {
+        UserVo userVo = userMapper.findById(user.getUserid());
+
+        String oldpwd = this.md5pwd(user.getOldpwd());
+        if(userVo.getLoginpwd().equals(oldpwd)){
+            setLoginPwd(user);
+            userMapper.updatePwd(user);
+            return new ResultVo(0,"修改成功");
+        }else{
+            return new ResultVo(1,"原密码错误");
+        }
+
+    }
+
+    /**
+     * 修改用户头像
+     * @Param [user]
+     * @Author ywx
+     * @Date 2020/6/2 10:37
+     * @return com.xhkjedu.vo.ResultVo
+     **/
+    public ResultVo updateHeadPic(TUser user) {
+        userMapper.updateHeadPic(user);
+        return new ResultVo(0,"修改成功");
+    }
+
+    /**
+     * 检查登录账号是否存在
+     * @Param [loginname]
+     * @Author ywx
+     * @Date 2020/6/2 10:44
+     * @return com.xhkjedu.vo.ResultVo
+     **/
+    public ResultVo checkLoginName(String loginname) {
+        Integer num = userMapper.checkLoginName(loginname);
+        if (num != 0){
+            return new ResultVo(1,"此用户已存在，请更换！");
+        } else {
+            return new ResultVo(0, "检查登录账号是否存在成功");
+        }
+    }
+
+    public Integer getNumByLoginName(String loginname) {
+        Integer num = userMapper.checkLoginName(loginname);
+        return num;
+    }
+
+    /**
+     * 根据登录账号获取用户详情
+     * @Param [loginname]
+     * @Author ywx
+     * @Date 2020/6/3 9:33
+     * @return com.xhkjedu.model.system.TUser
+     **/
+    public TUser getObjByLoginName(String loginname) {
+        return userMapper.getObjByLoginName(loginname);
+    }
+
+    /**
+     * 批量添加
+     * @Param [users]
+     * @Author ywx
+     * @Date 2020/6/3 18:27
+     * @return void
+     **/
+    public void batchSave(List<TUser> users) throws Exception {
+        Integer schoolid = users.get(0).getSchoolid();
+        //Integer usernum = schoolMapper.getUserNumById(schoolid);
+        //if (usernum != null) {
+        //    Integer usernum2 = userMapper.getUserNumBySchoolId(schoolid);
+        //    usernum2 = usernum2 + users.size();//学校账号数量+本次添加的人
+        //    if (usernum.compareTo(usernum2) == -1) {
+        //        throw new Exception("账号数量已超限，请联系管理员");
+        //    }
+        //}
+        userMapper.insertList(users);
+    }
+
+    /**
+     * 修改用户状态
+     * @Param [userid, userstate]
+     * @Author ywx
+     * @Date 2020/6/4 9:08
+     * @return void
+     **/
+    public void updateState(Integer userid, int userstate) {
+        userMapper.updateState(userid, userstate);
+    }
+
+    /**
+     * 导入教师
+     * @Param [file, tUser]
+     * @Author ywx
+     * @Date 2020/6/5 8:47
+     * @return com.xhkjedu.vo.ResultVo
+     **/
+    public ResultVo importTeacher(MultipartFile file, TUser tUser) {
+        Integer schoolid = tUser.getSchoolid();
+        Integer createid = tUser.getCreateid();
+        N_Utils.validation(new Object[]{schoolid,"学校id",1,createid,"创建人id",1});
+        try {
+            Map<String,Object> map = PoiUtils.readExcelUser(file, 1);
+            List<TUser> teachers = (List<TUser>)map.get("users");
+            map.remove("users");//导入成功的教师信息不返回给前端
+            /*if (!CollectionUtils.isEmpty((List<TUser>)map.get("excelExisted"))) {
+                map.put("code",1);
+                return new ResultVo(0, "导入失败", map);
+            }*/
+
+            List<TUser> users = new ArrayList<>();
+            // 以下教师信息已存在
+            List<TUser> usersExisted = new ArrayList<>();
+            for (TUser user : teachers) {
+                TUser u = getObjByLoginName(user.getLoginname());
+                if (null == u){
+                    user.setSchoolid(schoolid);
+                    user.setCreateid(createid);
+                    user.setCreatetime(N_Utils.getSecondTimestamp());
+                    user.setUserstate(1);
+                    users.add(user);
+                } else {
+                    if (1 != u.getUsertype() || schoolid != u.getSchoolid()){
+                        usersExisted.add(u);
+                    } else {
+                        usersExisted.add(u);
+                    }
+                }
+            }
+
+            //保存用户信息
+            if (!CollectionUtils.isEmpty(users)) {
+                batchSave(users);
+            }
+            map.put("usersExisted",usersExisted);
+            if (N_Utils.isListNotEmpty(usersExisted)){
+                map.put("code",1);
+            } else {
+                map.put("code",0);
+            }
+            return new ResultVo(0, "导入成功", map);
+        } catch (Exception e) {
+            log.error("导入失败 : " + e.getMessage());
+            return new ResultVo(1, "导入失败 : " + e.getMessage());
+        }
+    }
+
+    private String md5pwd(String pwd){
+        MD5 m = new MD5();
+        String loginpwd = m.getMD5ofStr(m.getMD5ofStr(m.getMD5ofStr(pwd)));
+        return loginpwd;
+    }
+
+    /**
+     *功能描述 修改操作密码
+     * @author WN
+     * @date 2020/6/17
+     * @param  * @param user
+     * @return void
+     */
+    public void updateOpepasswordByUserId(TUser user){
+        String pwd = md5pwd(user.getOpepassword());
+        userMapper.updateOpepasswordByUserId(user.getUserid(),pwd);
+    }
+
+    /**
+     *功能描述 验证用户操作密码
+     * @author WN
+     * @date 2020/6/17
+     * @param  * @param user
+     * @return java.lang.Integer
+     */
+    public Integer getUserIdByOpepassword(TUser user){
+        String pwd = md5pwd(user.getOpepassword());
+        return userMapper.getUserIdByOpepassword(user.getUserid(),pwd);
+    }
+
+    /**
+     * 教师基本信息
+     * @Param [userid]
+     * @Author ywx
+     * @Date 2020/6/29 16:23
+     * @return com.xhkjedu.suser.vo.system.TeacherVo
+     **/
+    public TeacherVo getTeacherInfo(Integer userid, Integer classtype) {
+        return userMapper.getTeacherInfo(userid, classtype);
+    }
+
+    /**
+     * 重置密码
+     * @Param [user]
+     * @Author ywx
+     * @Date 2020/7/30 14:25
+     * @return com.xhkjedu.vo.ResultVo
+     **/
+    public ResultVo resetPwd(TUser user) {
+        setLoginPwd(user);
+        userMapper.updatePwd(user);
+        return new ResultVo(0,"重置密码成功");
+    }
+
+    /**
+     * 解除mac绑定
+     * @Param [studentid]
+     * @Author ywx
+     * @Date 2020/9/18 11:56
+     * @return void
+     **/
+    public void removeBind(Integer studentid) {
+        UserVo user = new UserVo();
+        user.setUserid(studentid);
+        user.setBindmac(0);
+        user.setMac(null);
+        userMapper.updateBindMac(user);
+    }
+
+    /**
+     * 生成修改码
+     * @Param [userphone]
+     * @Author ywx
+     * @Date 2020/10/13 15:08
+     * @return com.xhkjedu.vo.ResultVo
+     **/
+    public ResultVo updateCode(String userphone) {
+        String templateCode = "xgmm";
+        if (generateCode(userphone, templateCode)) return new ResultVo(1, "请输入验证码或者在5分钟之后重新点击");
+        return new ResultVo(0,"生成修改码成功");
+    }
+
+    /**
+     * 生成验证码
+     * @Param [userphone, templateCode]
+     * @Author ywx
+     * @Date 2020/5/8 10:04
+     * @return boolean
+     **/
+    private boolean generateCode(String userphone, String templateCode) {
+        //Integer msgNum = msgService.getMsgNumByUserPhone(userphone);//5分钟内发送短信次数
+        //if (msgNum != 0) return true;
+
+        Integer messageCode = N_Utils.messageCode();
+        String msgtxt = "";
+        if ("yhzc".equals(templateCode)){//用户注册验证码
+            msgtxt += "验证码"+messageCode+"，您正在注册成为新用户，感谢您的支持！";
+        } else if ("xgmm".equals(templateCode)){//修改密码验证码
+            msgtxt += "验证码"+messageCode+"，您正在尝试修改登录密码，请妥善保管账户信息。";
+        } else if ("dlqr".equals(templateCode)){//登录确认验证码
+            msgtxt += "验证码"+messageCode+"，您正在登录，若非本人操作，请勿泄露。";
+        }
+        ZtMsgVo m = new ZtMsgVo();
+        m.setMobile(userphone);
+        m.setContent(msgtxt);
+        SMSSender.sendSms(m);
+//        SendSmsUtil.sendMsg(userphone, templateCode, messageCode);
+
+        //添加短信信息
+        //TMsg msg = new TMsg();
+        //msg.setUserphone(userphone);
+        //msg.setMsgcode(messageCode);
+        //msg.setMsgtxt(msgtxt);
+        //msgService.save(msg);
+        return false;
+    }
+
+    /**
+     * 通过短信修改密码
+     * @Param [user]
+     * @Author ywx
+     * @Date 2020/10/13 15:17
+     * @return com.xhkjedu.vo.ResultVo
+     **/
+    public ResultVo updatePwdByCode(TUser user) {
+        setLoginPwd(user);
+        ResultVo x = getCodeResultVo(user.getUserphone(), user.getMsgcode());
+        if (x != null) return x;
+        userMapper.updatePwdByCode(user);
+        return new ResultVo(0,"修改成功");
+    }
+
+    /**
+     * 判断验证码是否有效
+     * @Param [userphone, messageCode]
+     * @Author ywx
+     * @Date 2020/5/8 10:21
+     * @return com.xhkjedu.model.baseinfo.ResultVo
+     **/
+    private ResultVo getCodeResultVo(String userphone, Integer messageCode) {
+        //TMsg msg = msgService.findByUserPhoneAndCode(userphone,messageCode);//根据手机号和验证码获取短信信息
+        //if (msg == null) return new ResultVo(1,"验证码有误");
+        //int secondTimestamp = N_Utils.getSecondTimestamp() - 300;//验证码有效时间为5分钟
+        //if (msg.getCreatetime()<secondTimestamp) return new ResultVo(1,"验证码失效");
+        return null;
+    }
+
+    /**
+     * 生成登录确认码
+     * @Param [userphone]
+     * @Author ywx
+     * @Date 2020/10/13 15:19
+     * @return com.xhkjedu.vo.ResultVo
+     **/
+    public ResultVo loginCode(String userphone) {
+        N_Utils.validation(new Object[]{userphone,"手机号",2});
+        String templateCode = "dlqr";
+        if (generateCode(userphone, templateCode)) return new ResultVo(1, "请输入验证码或者在5分钟之后重新点击");
+        return new ResultVo(0,"生成登录确认码成功");
+    }
+
+    /**
+     * 验证码登录
+     * @Param [user]
+     * @Author ywx
+     * @Date 2020/10/13 15:36
+     * @return com.xhkjedu.vo.ResultVo
+     **/
+    public ResultVo loginByCode(TUser user,HttpServletRequest request) {
+        ResultVo resultVo = getCodeResultVo(user.getUserphone(), user.getMsgcode());
+        if (resultVo != null) return resultVo;
+        UserVo userVo = userMapper.getUserByLoginname(user.getUserphone());
+
+        if(userVo!=null && userVo.getUserid()>0){
+            user.setUserid(userVo.getUserid());
+            user.setUsername(userVo.getUsername());
+            user.setSchoolid(userVo.getSchoolid());
+            if(userVo.getUsertype()==999){
+                resultVo = new ResultVo(0,"登录成功",userVo);
+            } else if(userVo.getUsertype()==2){
+                resultVo = new ResultVo(1,"禁止学生登录");
+            } else if(userVo.getSchoolstate()!=1){
+                resultVo = new ResultVo(1,"用户所在学校暂无权限");
+            }else{
+                if(userVo.getUserstate()!=1){
+                    resultVo = new ResultVo(1,"该账户无权访问，请联系老师");
+                }else{
+                    resultVo = new ResultVo(0,"登录成功",userVo);
+                }
+            }
+        }else{
+            resultVo = new ResultVo(1,"该账号不存在");
+        }
+
+        return getLogResultVo(user, resultVo, user.getMsgcode()+"", request);
+    }
+
+    public ResultVo batchUpdatePwd(TUser user) {
+        setLoginPwd(user);
+        userMapper.batchUpdatePwd(user);
+        return new ResultVo(0,"修改成功");
+    }
+
+    public ResultVo checkLogin(Integer userid, String loginpwd) {
+        Map map = new HashMap();
+        boolean needLogin = false;
+        boolean needPhone = false;
+        TUser user = userMapper.selectByPrimaryKey(userid);
+        String usertime = user.getUsertime();
+        String dayBegin = DatesUtil.getDayBegin();
+        String msg = "用户信息正常";
+        if (!loginpwd.equals(user.getLoginpwd())) {
+            needLogin = true;
+            msg = "密码已修改，请重新登录";
+        }
+        if (!needLogin && N_Utils.isNotEmpty(usertime) && usertime.compareTo(dayBegin) < 0) {
+            needLogin = true;
+            msg = "账号已过有效期，请联系管理员";
+        }
+        if (user.getUsertype() == 2) {
+            needPhone = userMapper.checkUserPhone(userid);
+            if (!needLogin && needPhone) msg = "未绑定手机号";
+        }
+        map.put("needLogin", needLogin);
+        map.put("needPhone", needPhone);
+        return new ResultVo(0, msg, map);
+    }
+
+    //用户选择列表
+    public List<Map> listForSel(AssessParams user) {
+        //Integer year = schoolMapper.getYearById(user.getSchoolid());
+        Integer year=2021;
+        return userMapper.listForSel(user, year);
+    }
+
+    //用户名登录
+    public ResultVo loginByName(TUser user, HttpServletRequest request) {
+        ResultVo resultVo = null;
+        UserVo userVo = userMapper.getUserByLoginname(user.getLoginname());
+
+        if(userVo!=null && userVo.getUserid()>0){
+            user.setUserid(userVo.getUserid());
+            user.setUsername(userVo.getUsername());
+            user.setSchoolid(userVo.getSchoolid());
+            user.setUltype("p_web_t");
+            if(userVo.getUsertype()==999){
+                resultVo = new ResultVo(0,"登录成功",userVo);
+            } else if(userVo.getUsertype()==2){
+                resultVo = new ResultVo(1,"禁止学生登录");
+            } else if(userVo.getSchoolstate()!=1){
+                resultVo = new ResultVo(1,"用户所在学校暂无权限");
+            }else{
+                if(userVo.getUserstate()!=1){
+                    resultVo = new ResultVo(1,"该账户无权访问，请联系老师");
+                }else{
+                    resultVo = new ResultVo(0,"登录成功",userVo);
+                }
+            }
+        }else{
+            resultVo = new ResultVo(1,"该账号不存在");
+        }
+
+        return getLogResultVo(user, resultVo, "", request);
+    }
+}

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

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

suser/src/main/java/com/xhkjedu/suser/utils/PoiUtils.java

@@ -0,0 +1,284 @@
+package com.xhkjedu.suser.utils;
+
+import com.xhkjedu.suser.model.system.TUser;
+import com.xhkjedu.utils.MD5;
+import com.xhkjedu.utils.N_Utils;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.poi.hssf.usermodel.HSSFCell;
+import org.apache.poi.hssf.usermodel.HSSFWorkbook;
+import org.apache.poi.ss.usermodel.Cell;
+import org.apache.poi.ss.usermodel.Row;
+import org.apache.poi.ss.usermodel.Sheet;
+import org.apache.poi.ss.usermodel.Workbook;
+import org.apache.poi.xssf.usermodel.XSSFWorkbook;
+import org.springframework.stereotype.Component;
+import org.springframework.web.multipart.MultipartFile;
+
+import java.io.InputStream;
+import java.text.DecimalFormat;
+import java.text.SimpleDateFormat;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * @author ywx
+ * @classname PoiUtils
+ * @description
+ * @date 2020/6/3 16:33
+ **/
+@Component
+@Slf4j
+public class PoiUtils {
+    //2003- 版本的excel
+    private final static String excel2003L = ".xls";
+    //2007+ 版本的excel
+    private final static String excel2007U = ".xlsx";
+
+    /**
+     * 导入班级学生
+     *
+     * @return java.lang.String
+     * @Param [file]
+     * @Author ywx
+     * @Date 2020/6/3 16:43
+     **/
+    public static Map<String, Object> readExcelUser(MultipartFile file, Integer usertype) throws Exception {
+        Map<String, Object> resultMap = new HashMap<>();
+        try {
+            // 数据校验
+            isExcelEmpty(file);
+            InputStream in = file.getInputStream();
+            String fileName = file.getOriginalFilename();
+            Workbook work = getWorkbook(in, fileName);
+            Sheet sheet;// 分表数据
+            Row row;// 行数据
+            sheet = work.getSheetAt(0);//只取第一个sheet
+            if (sheet == null) {
+                throw new Exception("Excel第一个分表内容为空！");
+            }
+
+            int rows = sheet.getLastRowNum(); // 获取最后一个实际行的下标，比行数小1
+            int firstRowNum = sheet.getFirstRowNum(); // 获取第一个实际行的下标，（firstRowNum=0）
+
+            // 导入用户信息
+            List<TUser> users = new ArrayList<>();
+            // excel已存在学生信息
+//            List<TUser> excelExisted = new ArrayList<>();
+            Map<String,String> nameMap = new HashMap<>();
+
+            /*
+             * 遍历当前sheet中的所有行
+             * 排除第一行  第一行为标题头 不纳入遍历
+             */
+            for (int x = firstRowNum+1; x <= rows; x++) {
+                // 获取行
+                row = sheet.getRow(x);
+                if (row == null ){//若此行为空，则跳出循环继续下一行
+                    continue;
+                } else if (isEmptyCell(row.getCell(0)) && isEmptyCell(row.getCell(1))){
+                    continue;
+                }
+                TUser user = new TUser();// 每一行一个学生信息
+                user.setUsertype(usertype);
+                int firstCellNum = row.getFirstCellNum();// 每一行的第一列，（firstCellNum=0）
+                if (firstCellNum == 1) throw new Exception("第" + (x + 1) + "行姓名不能为空");
+                int lastCellNum = row.getLastCellNum();// 每一行的最后一列，获取列数，比最后一列列标大1
+                //遍历所有的列
+                for (int y = firstCellNum; y < lastCellNum; y++) {
+                    Cell cell = row.getCell(y);
+                    if (y == 0){   // 姓名
+                        setUserName(cell, x, user);
+                    } else if(y == 1){// 登录名
+                        if (isEmptyCell(cell) ){
+                            throw new Exception("第"+(x+1)+"行登录账号不能为空");
+                        } else{
+                            String loginname = getCellValue(cell);
+                            user.setLoginname(loginname);//登录名默认为学号
+                            if (2 == usertype) {//导入学生登录账号默认为学号
+                                user.setStudentno(loginname);
+                            }
+                            MD5 md5 = new MD5();
+                            user.setLoginpwd(md5.getMD5ofStr(md5.getMD5ofStr(md5.getMD5ofStr("123456"))));
+                        }
+                    } else if(y == 2){//性别
+                        if (isEmptyCell(cell) ){
+                            user.setUsersex(0);
+                        } else {
+                            String usersex = getCellValue(cell);
+                            if (usersex.equals("女")){
+                                user.setUsersex(2);
+                            } else {
+                                user.setUsersex(1);
+                            }
+                        }
+                    } else if(y == 3){//手机号
+                        setUserPhone(cell, x, user);
+                    } else if(y == 4){//出生日期
+                        if (!isEmptyCell(cell) ){
+                            String birthDay = getCellValue(cell);
+                            user.setUserbirthday(N_Utils.getDataToTimestamp(birthDay,"yyyy-MM-dd"));
+                        }
+                    } else if(y == 5){//身份证号
+                        if (isEmptyCell(cell) ){
+                            user.setCardid("");
+                        } else {
+                            user.setCardid(getCellValue(cell));
+                        }
+                    }
+                }
+
+                String loginname = user.getLoginname();
+                if (N_Utils.isNotEmpty(nameMap.get(loginname))) {
+//                    excelExisted.add(user);
+                } else {
+                    nameMap.put(loginname,loginname);
+                    users.add(user);
+                }
+            }
+
+            resultMap.put("code" , 0);
+            resultMap.put("users" , users);
+//            resultMap.put("excelExisted" , excelExisted);
+        }catch (Exception e){
+            resultMap.put("code" , 1);
+            resultMap.put("msg" , e.getMessage());
+            throw new Exception(e.getMessage());
+        }
+        return resultMap;
+    }
+
+    private static void setUserName(Cell cell, int x, TUser user) throws Exception {
+        if (isEmptyCell(cell)) {
+            throw new Exception("第" + (x + 1) + "行姓名不能为空");
+        } else {
+            user.setUsername(getCellValue(cell));
+        }
+    }
+
+    private static void setUserPhone(Cell cell, int x, TUser user) throws Exception {
+        if (isEmptyCell(cell)) {
+            user.setUserphone("");
+        } else {
+            String phone = getCellValue(cell);
+            if (!N_Utils.isPhone(phone)) {
+                throw new Exception("第" + (x + 1) + "行手机号不合法");
+            }
+            user.setUserphone(phone);
+        }
+    }
+
+    /**
+     * 根据文件后缀，自适应上传文件的版本
+     * @Param [inStr, fileName]
+     * @Author ywx
+     * @Date 2020/6/3 16:42
+     * @return org.apache.poi.ss.usermodel.Workbook
+     **/
+    public static Workbook getWorkbook(InputStream inStr, String fileName) throws Exception{
+        Workbook wb;
+        String fileType = fileName.substring(fileName.lastIndexOf("."));
+        if(excel2003L.equals(fileType)){
+            wb = new HSSFWorkbook(inStr);  //2003-
+        }else if(excel2007U.equals(fileType)){
+            wb = new XSSFWorkbook(inStr);  //2007+
+        }else{
+            throw new Exception("Excel格式解析有误！");
+        }
+        return wb;
+    }
+
+    /**
+     * 判断单元格是否是空值
+     * @Param [cell]
+     * @Author ywx
+     * @Date 2020/6/3 16:37
+     * @return java.lang.Boolean
+     **/
+    public static Boolean isEmptyCell(Cell cell){
+        if(cell != null){
+            Boolean rtn = true;
+            if(N_Utils.isNotEmpty(PoiUtils.getCellValue(cell))){
+                rtn = false;
+            }
+            return rtn;
+        } else {
+            return true;
+        }
+    }
+
+    /**
+     * 对表格中数值进行格式化
+     * @Param [cell]
+     * @Author ywx
+     * @Date 2020/6/3 16:41
+     * @return java.lang.Object
+     **/
+    public static String getCellValue(Cell cell){
+        String value = null;
+        DecimalFormat df = new DecimalFormat("0");  //格式化number String字符
+        SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");  //日期格式化
+        DecimalFormat df2 = new DecimalFormat("0");  //格式化数字
+
+        switch (cell.getCellType()) {
+            case Cell.CELL_TYPE_STRING:
+                value = cell.getRichStringCellValue().getString();
+                break;
+            case Cell.CELL_TYPE_NUMERIC:
+                String cellStyle = cell.getCellStyle().getDataFormatString();
+                if("General".equals(cellStyle)){
+                    value = df.format(cell.getNumericCellValue());
+                }else if("m/d/yy".equals(cellStyle)){
+                    value = sdf.format(cell.getDateCellValue());
+                }else{
+                    value = df2.format(cell.getNumericCellValue());
+                }
+                break;
+            case Cell.CELL_TYPE_BOOLEAN:
+                boolean rtn = cell.getBooleanCellValue();
+                if (rtn){
+                    value = "1";//真
+                } else {
+                    value = "0";//假
+                }
+                break;
+            case Cell.CELL_TYPE_BLANK:
+                value = "";
+                break;
+            case HSSFCell.CELL_TYPE_FORMULA://读取excel公式的值
+                try {
+                    value = String.valueOf(cell.getNumericCellValue());
+                } catch (IllegalStateException e) {
+                    value = String.valueOf(cell.getRichStringCellValue());
+                }
+                break;
+            default:
+                break;
+        }
+        return N_Utils.strTrim(value);
+    }
+
+    /**
+     * 检验Excel内容是否为空
+     * @Param [file]
+     * @Author ywx
+     * @Date 2020/6/3 16:36
+     * @return void
+     **/
+    public static void isExcelEmpty(MultipartFile file) throws Exception {
+        if (null == file || file.isEmpty()) {
+            throw new Exception("文件不存在！");
+        }
+        InputStream in = file.getInputStream();
+        String fileName = file.getOriginalFilename();
+        Workbook work = getWorkbook(in, fileName);
+        if (null == work) {
+            throw new Exception("Excel内容为空！");
+        }
+        Integer sheet_size = work.getNumberOfSheets();
+        if (sheet_size == 0) {
+            throw new Exception("Excel内容为空！");
+        }
+    }
+}

suser/src/main/java/com/xhkjedu/suser/utils/SMSSender.java

@@ -0,0 +1,92 @@
+package com.xhkjedu.suser.utils;
+
+import com.alibaba.fastjson.JSON;
+import com.xhkjedu.suser.config.ConfigKey;
+import com.xhkjedu.utils.MD5;
+import com.xhkjedu.utils.N_Utils;
+import com.xhkjedu.suser.vo.system.ZtMsgVo;
+import lombok.extern.slf4j.Slf4j;
+
+import java.io.BufferedReader;
+import java.io.IOException;
+import java.io.InputStreamReader;
+import java.io.OutputStreamWriter;
+import java.net.URL;
+import java.net.URLConnection;
+
+@Slf4j
+public class SMSSender {
+    /**
+     * 发送短信
+     * @return java.lang.String
+     * @Param [msg]
+     * @Author ywx
+     * @Date 2020/12/11 16:15
+     **/
+    public static String sendSms(ZtMsgVo msg) {
+        msg.setUsername(ConfigKey.username);
+        Integer timestamp = N_Utils.getSecondTimestamp();
+        String tKey = timestamp.toString();
+        msg.setTKey(tKey);
+        MD5 m = new MD5();
+        String password = m.getMD5ofStr2(m.getMD5ofStr2(ConfigKey.password) + tKey);
+        msg.setPassword(password);
+        msg.setContent(ConfigKey.signName + msg.getContent());
+        String param = JSON.toJSONString(msg);
+        return sendPost(ConfigKey.url + "v2/sendSms", param);
+    }
+
+    /**
+     * 向指定 URL 发送POST方法的请求
+     * @param url   发送请求的 URL
+     * @param param 请求参数，请求参数应该是 name1=value1&name2=value2 的形式。
+     * @return 所代表远程资源的响应结果
+     */
+    public static String sendPost(String url, String param) {
+        OutputStreamWriter out = null;
+        BufferedReader in = null;
+        String result = "";
+        try {
+            URL realUrl = new URL(url);
+            // 打开和URL之间的连接
+            URLConnection conn = realUrl.openConnection();
+            // 设置通用的请求属性
+            conn.setRequestProperty("accept", "application/json");
+            conn.setRequestProperty("connection", "Keep-Alive");
+            conn.setRequestProperty("user-agent", "Mozilla/4.0 (compatible; MSIE 6.0; Windows NT 5.1;SV1)");
+            // 发送POST请求必须设置如下两行
+            conn.setDoOutput(true);
+            conn.setDoInput(true);
+            //设置请求编码格式
+            conn.setRequestProperty("Accept-Charset", "UTF-8");
+            conn.setRequestProperty("Content-Type", "application/json; charset=UTF-8");
+            // 文件流编码设置
+            out = new OutputStreamWriter(conn.getOutputStream(), "UTF-8");
+            out.write(param);
+            // flush输出流的缓冲
+            out.flush();
+            // 定义BufferedReader输入流来读取URL的响应
+            in = new BufferedReader(new InputStreamReader(conn.getInputStream(), "UTF-8"));
+            String line;
+            while ((line = in.readLine()) != null) {
+                result += line;
+            }
+        } catch (Exception e) {
+            log.error("发送 POST 请求出现异常！" + e.getMessage());
+        }
+        // 使用finally块来关闭输出流、输入流
+        finally {
+            try {
+                if (out != null) {
+                    out.close();
+                }
+                if (in != null) {
+                    in.close();
+                }
+            } catch (IOException ex) {
+                log.error("关闭输入输出流异常", ex.getMessage());
+            }
+        }
+        return result;
+    }
+}

suser/src/main/java/com/xhkjedu/suser/utils/UserUtil.java

@@ -0,0 +1,46 @@
+package com.xhkjedu.suser.utils;
+
+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;
+
+/**
+ * @author ywx
+ * @className suserUtil
+ * @description
+ * @date 2022/2/21 15:27
+ **/
+@Slf4j
+public class UserUtil {
+    /**
+     * 发送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;
+        }
+    }
+}

suser/src/main/java/com/xhkjedu/suser/vo/assess/AssessParams.java

@@ -0,0 +1,19 @@
+package com.xhkjedu.suser.vo.assess;
+
+import lombok.Data;
+
+/**
+ * @author ywx
+ * @classname AssessParams
+ * @description
+ * @date 2021/12/6 13:21
+ **/
+@Data
+public class AssessParams {
+    private Integer schoolid;//学校id
+    private Integer gradeid;//年级id
+    private Integer classid;//班级id
+    private String subjectid;//科目id
+    private String username;//姓名
+    private Integer usertype;//用户类型1老师2学生
+}

suser/src/main/java/com/xhkjedu/suser/vo/gradeclass/CStudentVo.java

@@ -0,0 +1,15 @@
+package com.xhkjedu.suser.vo.gradeclass;
+
+import lombok.Data;
+
+@Data
+public class CStudentVo {
+    //学生id
+    private Integer studentid;
+
+    //学生姓名
+    private String studentname;
+
+    //头像
+    private String headpic;
+}

suser/src/main/java/com/xhkjedu/suser/vo/gradeclass/ClassGroupVo.java

@@ -0,0 +1,21 @@
+package com.xhkjedu.suser.vo.gradeclass;
+
+import lombok.Data;
+
+import java.util.List;
+
+@Data
+public class ClassGroupVo {
+    //班级id
+    private Integer classid;
+
+    //班级名称
+    private String classname;
+
+    private Integer gradeid;//年级id
+
+    private Integer classnum;//班级人数
+
+    //班级分组id
+    private List<GroupVo> groups;
+}

suser/src/main/java/com/xhkjedu/suser/vo/gradeclass/ClassImportVo.java

@@ -0,0 +1,14 @@
+package com.xhkjedu.suser.vo.gradeclass;
+
+import lombok.Data;
+
+import java.util.List;
+
+@Data
+public class ClassImportVo {
+    //班级id
+    private Integer classid;
+
+    //学生id列表
+    private List<Integer> studentIds;
+}

suser/src/main/java/com/xhkjedu/suser/vo/gradeclass/ClassStudentVo.java

@@ -0,0 +1,57 @@
+package com.xhkjedu.suser.vo.gradeclass;
+
+import lombok.Data;
+
+@Data
+public class ClassStudentVo {
+    //班级关联学生id
+    private Integer csid;
+
+    //学号
+    private String studentno;
+
+    //学生姓名
+    private String studentname;
+
+    //性别1男2女
+    private Integer usersex;
+
+    //班级id
+    private Integer classid;
+
+    //学生id
+    private Integer studentid;
+
+    //登录账号
+    private String loginname;
+
+    //创建时间
+    private Integer createtime;
+
+    //是否绑定硬件地址0不绑定1绑定
+    private Integer bindmac;
+
+    //硬件地址
+    private String mac;
+
+    //头像地址
+    private String headpic;
+
+    private Integer year;//当前年份
+
+    //用户状态1正常2删除
+    private Integer userstate;
+
+    //班级名称
+    private String classname;
+
+    //所属年级
+    private Integer gradeid;
+
+    //手机号
+    private String userphone;
+
+    //有效期
+    private String usertime;
+
+}

suser/src/main/java/com/xhkjedu/suser/vo/gradeclass/ClassTeacherParams.java

@@ -0,0 +1,21 @@
+package com.xhkjedu.suser.vo.gradeclass;
+
+import lombok.Data;
+
+/**
+ * @ClassName ClassTeacherParams
+ * Description TODO 参数
+ * Author WN
+ * Date 2021/1/29 17:26
+ **/
+@Data
+public class ClassTeacherParams {
+
+    private Integer schoolid;//学校id
+
+    private String subjectid;//科目id
+
+    private Integer gradeid;//年级id
+
+    private Integer year;//当前年费
+}

suser/src/main/java/com/xhkjedu/suser/vo/gradeclass/ClassTeacherVo.java

@@ -0,0 +1,30 @@
+package com.xhkjedu.suser.vo.gradeclass;
+
+import lombok.Data;
+
+@Data
+public class ClassTeacherVo {
+    //教师id
+    private Integer teacherid;
+
+    //教师姓名
+    private String teachername;
+
+    //教师性别
+    private Integer usersex;
+
+    //手机号
+    private String userphone;
+
+    //登录账号
+    private String loginname;
+
+    //用户类型0学校管理员1老师
+    private Integer usertype;
+
+    //创建时间
+    private Integer createtime;
+
+    //有效期
+    private String usertime;
+}

suser/src/main/java/com/xhkjedu/suser/vo/gradeclass/ClassVo.java

@@ -0,0 +1,47 @@
+package com.xhkjedu.suser.vo.gradeclass;
+
+import lombok.Data;
+
+import java.util.List;
+
+@Data
+public class ClassVo {
+    //班级id
+    private Integer classid;
+
+    //班级名称
+    private String classname;
+
+    //所属年级
+    private Integer gradeid;
+
+    //全体分组id
+    private Integer groupid;
+
+    //学生数量
+    private Integer classnum;
+
+    //班级排序
+    private Integer classorder;
+
+    //入学年（届）
+    private Integer schoolyear;
+
+    //班级类型1行政班2提高班3直播班99已直播班级
+    private Integer classtype;
+
+    //当前年份
+    private Integer year;
+
+    //创建人
+    private Integer createid;
+
+    //学校id
+    private Integer schoolid;
+
+    //作业是否完成批阅0未完成1已完成
+    private Integer checked;
+
+    //学生列表
+    private List<CStudentVo> students;
+}

suser/src/main/java/com/xhkjedu/suser/vo/gradeclass/GradeSubjectVo.java

@@ -0,0 +1,23 @@
+package com.xhkjedu.suser.vo.gradeclass;
+
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * @author ywx
+ * @classname GradeSubjectVo
+ * @description
+ * @date 2020/6/13 15:35
+ **/
+@Data
+public class GradeSubjectVo {
+    //科目id
+    private String subjectid;
+
+    //科目名称
+    private String subjectname;
+
+    //教师集合
+    private List<ClassTeacherVo> teachers;
+}

suser/src/main/java/com/xhkjedu/suser/vo/gradeclass/GradeVo.java

@@ -0,0 +1,20 @@
+package com.xhkjedu.suser.vo.gradeclass;
+
+import lombok.Data;
+
+import java.util.List;
+
+@Data
+public class GradeVo {
+    //年级表
+    private Integer gradeid;
+
+    //年级名称
+    private String gradename;
+
+    //班级集合
+    private List<ClassVo> classes;
+
+    //科目集合
+    private List<GradeSubjectVo> subjects;
+}

suser/src/main/java/com/xhkjedu/suser/vo/gradeclass/GroupStudentVo.java

@@ -0,0 +1,27 @@
+package com.xhkjedu.suser.vo.gradeclass;
+
+import lombok.Data;
+
+@Data
+public class GroupStudentVo {
+    //分组学生id
+    private Integer gsid;
+
+    //分组id
+    private Integer groupid;
+
+    //学生id
+    private Integer studentid;
+
+    //学号
+    private String studentno;
+
+    //学生姓名
+    private String studentname;
+
+    //性别1男2女
+    private Integer usersex;
+
+    //头像地址
+    private String headpic;
+}

suser/src/main/java/com/xhkjedu/suser/vo/gradeclass/GroupVo.java

@@ -0,0 +1,26 @@
+package com.xhkjedu.suser.vo.gradeclass;
+
+import lombok.Data;
+
+import java.util.List;
+
+@Data
+public class GroupVo {
+    //班级分组id
+    private Integer groupid;
+
+    //分组名称
+    private String groupname;
+
+    //班级id
+    private Integer classid;
+
+    //班级分组类型1全体2一般分组
+    private Integer grouptype;
+
+    //是否选中0未选中1已选中
+    private Integer selected;
+
+    //学生列表
+    private List<CStudentVo> students;
+}

suser/src/main/java/com/xhkjedu/suser/vo/gradeclass/ImportStudentVo.java

@@ -0,0 +1,18 @@
+package com.xhkjedu.suser.vo.gradeclass;
+
+import lombok.Data;
+
+@Data
+public class ImportStudentVo {
+    //班级学生总数量
+    private Integer totalnum;
+
+    //本班级学生数量
+    private Integer classnum;
+
+    //行政班数量
+    private Integer xznum;
+
+    //行政班id
+    private Integer classid;
+}

suser/src/main/java/com/xhkjedu/suser/vo/paper/AStudentPaperVo.java

@@ -0,0 +1,46 @@
+package com.xhkjedu.suser.vo.paper;
+
+import lombok.Data;
+
+@Data
+public class AStudentPaperVo {
+    //试题数量
+    private Integer studentid;
+
+    //学生姓名
+    private String studentname;
+
+    //学生账号
+    private String loginname;
+
+    //年级id
+    private Integer gradeid;
+
+    //班级名称
+    private String classname;
+
+    //状态0未提交1已提交2超时提交
+    private Integer psstate;
+
+    //试卷总分
+    private Double paperscore;
+
+    //用户得分
+    private Double userscore;
+
+    //学生姓名
+    private String subjectid;
+
+    //科目名称
+    private String subjectname;
+
+    //收到作业次数
+    private Integer sdnum;
+    //作业提交次数
+    private Integer commitnum;
+    //提交率
+    private double commitrate;
+    //得分率
+    private double scorerate;
+
+}

suser/src/main/java/com/xhkjedu/suser/vo/paper/AnalyzeSearchVo.java

@@ -0,0 +1,42 @@
+package com.xhkjedu.suser.vo.paper;
+
+import lombok.Data;
+
+@Data
+public class AnalyzeSearchVo {
+    //分页显示页码
+    private Integer page;
+
+    //分页显示条数
+    private Integer pageSize;
+
+    //年级id
+    private Integer gradeid;
+
+    //科目id
+    private String subjectid;
+
+    //班级id
+    private Integer classid;
+
+    //开始时间
+    private Integer starttime;
+
+    //结束时间
+    private Integer stoptime;
+
+    //学校id
+    private Integer schoolid;
+
+    //教师id
+    private Integer teacherid;
+
+    //学生id
+    private Integer studentid;
+
+    private Integer year;//当前年份
+
+    private Integer usertype;//用户类型999超级管理员0学校管理员1老师2学生
+
+    private String classids;//班级ids
+}

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

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

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

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

suser/src/main/java/com/xhkjedu/suser/vo/subjectbook/TeacherSubjectbookVo.java

@@ -0,0 +1,40 @@
+package com.xhkjedu.suser.vo.subjectbook;
+
+import lombok.Data;
+
+/**
+ * @author ywx
+ * @classname TeacherSubjectbookVo
+ * @description 
+ * @date 2020/6/5 15:52
+ **/
+@Data
+public class TeacherSubjectbookVo {
+
+    //教师教材关系id
+    private Integer tbid;
+
+    //教材关联关系表id
+    private String lsbid;
+
+    //是否选中：0未选中1已选中
+    private Integer selected;
+
+    //科目id
+    private String subjectid;
+
+    //科目名称
+    private String subjectname;
+
+    //教材名称
+    private String lsbname;
+
+    private String coverpath;//封面图地址
+
+    //版本id
+    private String versionid;
+
+    //版本名称
+    private String versionname;
+
+}

suser/src/main/java/com/xhkjedu/suser/vo/system/RoleModuleVo.java

@@ -0,0 +1,48 @@
+package com.xhkjedu.suser.vo.system;
+
+import lombok.Data;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * @ClassName RoleModuleVo
+ * Description 角色模块表
+ * Author WN
+ * Date 2020/6/15 14:18
+ **/
+@Data
+public class RoleModuleVo {
+
+    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学生平板
+
+    //内外部应用1内容应用2外部应用
+    private Integer minout;
+
+    //模块分组或应用1分组2应用
+    private Integer mclass;
+
+    //级别1一级2二级
+    private Integer level;
+
+    //子模块
+    List<RoleModuleVo> modulechilds = new ArrayList<>();
+
+}

suser/src/main/java/com/xhkjedu/suser/vo/system/RoleVo.java

@@ -0,0 +1,31 @@
+package com.xhkjedu.suser.vo.system;
+
+import com.xhkjedu.suser.model.system.TUserRole;
+import lombok.Data;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * @ClassName RoleVo
+ * Description TODO
+ * Author WN
+ * Date 2020/6/15 11:19
+ **/
+@Data
+public class RoleVo {
+    //角色id
+    private Integer roleid;
+
+    //角色名称
+    private String rolename;
+
+    //角色备注
+    private String comm;
+
+    //角色关联用户
+    private List<TUserRole> users = new ArrayList<>();
+
+    //角色下模块信息
+    private List<RoleModuleVo> modules = new ArrayList<>();
+}

suser/src/main/java/com/xhkjedu/suser/vo/system/TeacherRoleParam.java

@@ -0,0 +1,42 @@
+package com.xhkjedu.suser.vo.system;
+
+import lombok.Data;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * @ClassName TeacherRoleParam
+ * Description 教师设置权限时传输参数
+ * Author WN
+ * Date 2020/6/18 9:50
+ **/
+@Data
+public class TeacherRoleParam {
+
+    private Integer teacherid;//老师id
+
+    //角色
+    private List<Integer> rolelist = new ArrayList<>();
+
+    //教材
+    private List<String> lsblist = new ArrayList<>();
+
+    //班级
+    private List<Integer> classlist = new ArrayList<>();
+
+    private Integer createid;//创建人id
+
+    private Integer schoolid;//学校id
+
+    private Integer year;//当前年份
+
+    private String subjectid;//科目id
+
+    //班级类型1行政班2提高班3直播班
+    private Integer classtype;
+
+    //年级id
+    private Integer gradeid;
+}
+

suser/src/main/java/com/xhkjedu/suser/vo/system/TeacherRoleVo.java

@@ -0,0 +1,26 @@
+package com.xhkjedu.suser.vo.system;
+
+import com.xhkjedu.suser.vo.gradeclass.ClassVo;
+import com.xhkjedu.suser.vo.subjectbook.TeacherSubjectbookVo;
+import lombok.Data;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * @ClassName TeacherRoleVo
+ * Description 教师权限查看
+ * Author WN
+ * Date 2020/6/18 9:53
+ **/
+@Data
+public class TeacherRoleVo {
+    //角色
+    private List<UserRoleVo> rolelist = new ArrayList<>();
+
+    //教材
+    private List<TeacherSubjectbookVo> lsblist = new ArrayList<>();
+
+    //班级
+    private List<ClassVo> classlist = new ArrayList<>();
+}

suser/src/main/java/com/xhkjedu/suser/vo/system/TeacherVo.java

@@ -0,0 +1,36 @@
+package com.xhkjedu.suser.vo.system;
+
+import com.xhkjedu.suser.vo.gradeclass.ClassVo;
+import lombok.Data;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * @author ywx
+ * @classname TeacherVo
+ * @description 教师基本信息
+ * @date 2020/6/29 16:16
+ **/
+@Data
+public class TeacherVo {
+    private Integer userid;
+    //姓名
+    private String username;
+
+    //头像地址
+    private String headpic;
+
+    //班级名称
+    private String classname;
+
+    //科目名称
+    private String subjectname;
+
+    //有效期
+    private String usertime;
+
+    //教师任教班级
+    private List<ClassVo> classlist = new ArrayList<>();
+
+}

suser/src/main/java/com/xhkjedu/suser/vo/system/UserModuleVo.java

@@ -0,0 +1,33 @@
+package com.xhkjedu.suser.vo.system;
+
+import lombok.Data;
+
+/**
+ * @ClassName RoleModuleVo
+ * Description 角色模块表
+ * Author WN
+ * Date 2020/6/15 14:18
+ **/
+@Data
+public class UserModuleVo {
+    //用户常用应用
+    private Integer umid;
+
+    private String moduleid;
+
+    //模块名称
+    private String modulename;
+
+    //模块简称
+    private String mabbrevname;
+
+    //模块地址
+    private String moduleurl;
+
+    //图标地址
+    private String moduleico;
+
+    //内外部应用1内容应用2外部应用
+    private Integer minout;
+
+}

suser/src/main/java/com/xhkjedu/suser/vo/system/UserRoleVo.java

@@ -0,0 +1,18 @@
+package com.xhkjedu.suser.vo.system;
+
+import lombok.Data;
+
+/**
+ * @ClassName UserRoleVo
+ * Description 用户角色
+ * Author WN
+ * Date 2020/6/18 16:34
+ **/
+@Data
+public class UserRoleVo {
+    //角色id
+    private Integer roleid;
+
+    //角色名称
+    private String rolename;
+}

suser/src/main/java/com/xhkjedu/suser/vo/system/UserVo.java

@@ -0,0 +1,116 @@
+package com.xhkjedu.suser.vo.system;
+
+import lombok.Data;
+
+/**
+ * @ClassName UserVo
+ * Description
+ * Author WN
+ * Date 2020/5/29 17:16
+ **/
+@Data
+public class UserVo {
+    //用户表
+    private Integer userid;
+
+    //姓名
+    private String username;
+
+    //登录账号
+    private String loginname;
+
+    //登录密码
+    private String loginpwd;
+
+    //学生学号
+    private String studentno;
+
+    //用户手机号
+    private String userphone;
+
+    //出生日期
+    private Integer userbirthday;
+
+    //身份证号
+    private String cardid;
+
+    //头像地址
+    private String headpic;
+
+    //用户类型999超级管理员0学校管理员1老师2学生
+    private Integer usertype;
+
+    //用户状态1正常2删除
+    private Integer userstate;
+
+    //是否绑定硬件地址0不绑定1绑定
+    private Integer bindmac;
+
+    //硬件地址
+    private String mac;
+
+    //硬件地址绑定的账号
+    private String macname;
+
+    //学校是否绑定硬件地址0不绑定1绑定
+    private Integer sbindmac;
+
+    //操作密码（教师操作密码）
+    private String opepassword;
+
+    //创建人id
+    private Integer createid;
+
+    //创建人姓名
+    private String createname;
+
+    //创建时间
+    private Integer createtime;
+
+    //删除人id
+    private Integer deleteid;
+
+    //删除时间
+    private Integer deletetime;
+
+    //学校id
+    private Integer schoolid;
+
+    private String schoolname;
+
+    //学校阶段1小学2初中3高中4大学
+    private Integer schoollevel;
+
+    //学校状态1正常10删除
+    private Integer schoolstate;
+
+    //错误率%
+    private Integer errorrate;
+
+    //当前年份
+    private Integer year;
+
+    //性别1男2女
+    private Integer usersex;
+
+    //云平台码
+    private String cloudcode;
+
+    //行政班数量
+    private Integer xznum;
+
+    //是否绑定手机号0不绑定1绑定
+    private Integer bindphone;
+
+    //是否有手机号0没有1有
+    private Integer hasphone;
+
+    //学校域名地址
+    private String schooldomain;
+
+    //有效期
+    private String usertime;
+    private String token_key;
+    private String token_value;
+
+}

suser/src/main/java/com/xhkjedu/suser/vo/system/ZtMsgVo.java

@@ -0,0 +1,34 @@
+package com.xhkjedu.suser.vo.system;
+
+import lombok.Data;
+
+/**
+ * @author ywx
+ * @classname ZtMsgVo
+ * @description 
+ * @date 2020/12/11 15:57
+ **/
+@Data
+public class ZtMsgVo {
+    //用户表
+    private Integer userid;
+
+    //用户名
+    private String username;
+
+    //密码
+    private String password;
+
+    //时间戳
+    private String tKey;
+
+    //手机号
+    private String mobile;
+
+    //短信内容
+    private String content;
+
+    private String time="";
+
+    private String ext="9999";
+}

suser/src/main/resources/application.properties

@@ -26,12 +26,12 @@ spring.datasource.hikari.connection-timeout=20000
 spring.datasource.hikari.connection-test-query=SELECT 1
 
 # 所有Entity别名类所在包
-mybatis.type-aliases-package=com.xhkjedu.model,com.xhkjedu.vo
+mybatis.type-aliases-package=com.xhkjedu.suser.model,com.xhkjedu.suser.vo
 mybatis.mapper-Locations=classpath*:mapper/**/*.xml
-mapper.mappers=com.xhkjedu.base.TkMapper
+mapper.mappers=com.xhkjedu.suser.base.TkMapper
 mapper.identity=MYSQL
 #打印日志的两种方式第一种可以指定包名，第二种都可以打印
-logging.level.com.xhkjedu.mapper=debug
+logging.level.com.xhkjedu.suser.mapper=debug
 #mybatis.configuration.log-impl=org.apache.ibatis.logging.stdout.StdOutImpl
 #分页
 spring.pagehelper.helper-dialect=mysql
@@ -51,3 +51,10 @@ spring.redis.jedis.pool.max-active=60000
 redisdatatime=604800
 #secretKey必须为24位
 secretKey=nanhuakaizhangjianwangni
+#助通科技短信配置
+zt.username=xinghuo666
+zt.password=jUTEBk6e
+zt.url=http://api.mix2.zthysms.com/
+signName=【河南星火燎原】
+#郑州管城大数据SSO认证鉴权接口
+ssourl=http://gcdsj.zzgcjy.cn/portal/sso/api/agent

suser/src/main/resources/mapper/gradeclass/ClassMapper.xml

@@ -0,0 +1,98 @@
+<?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.suser.mapper.gradeclass.ClassMapper">
+    <!--班级学生列表-->
+    <select id="findAll" resultType="com.xhkjedu.suser.vo.gradeclass.ClassVo">
+        select c.classid,c.classname,c.gradeid,c.classnum,tg.groupid,c.classorder,c.schoolyear,c.classtype
+        from t_class c left join t_group tg on c.classid = tg.classid
+        where tg.grouptype=1
+        and c.schoolid=#{tClass.schoolid} and c.year=#{tClass.year}
+        <if test="tClass.classname!=null and tClass.classname!=''">
+            and c.classname like '%${tClass.classname}%'
+        </if>
+        <if test="tClass.classstate!=null and tClass.classstate!=0">
+            and c.classstate=#{tClass.classstate}
+        </if>
+        <if test="tClass.classtype!=null and tClass.classtype!=0">
+            <if test="tClass.classtype!=11">and c.classtype=#{tClass.classtype}</if>
+            <if test="tClass.classtype==11">and c.classtype in(1,2)</if>
+        </if>
+        <if test="tClass.gradeid!=null and tClass.gradeid!=0">
+            and c.gradeid=#{tClass.gradeid}
+        </if>
+        order by c.gradeid,c.classtype,c.classorder
+    </select>
+    <!--更新学生数量-->
+    <update id="updateNum">
+        update t_class c set c.classnum=
+        (select count(*) from t_class_student cs where cs.classid=#{classid})
+        where c.classid=#{classid}
+    </update>
+    <!--更新班级、分组学生数量-->
+    <update id="updateNum2">
+        update t_class c left join t_group g on g.classid=c.classid
+        ,(SELECT COUNT(*)num FROM t_class_student cs where cs.classid=#{classid})a
+        set c.classnum=a.num,g.groupnum=(SELECT COUNT(*) FROM t_group_student gs WHERE gs.groupid=g.groupid)
+        where c.classid=#{classid}
+    </update>
+    <!--要升级的班级列表-->
+    <select id="listClassBySchoolId" resultType="com.xhkjedu.suser.model.gradeclass.TClass">
+        select * from t_class where schoolid=#{schoolid} and year=#{year} and classtype in(1,2) and classstate=1 and gradeid in(1,2,3,4,5,7,8,10,11)
+    </select>
+    <!--升级时要毕业的班级列表-->
+    <select id="listClassBiyeBySchoolId" resultType="com.xhkjedu.suser.model.gradeclass.TClass">
+        select * from t_class where schoolid=#{schoolid} and year=#{year} and classtype in(1,2) and classstate=#{classstate} and gradeid in(6,9,12)
+    </select>
+    <!--要升级的班级id字符串-->
+    <select id="listClassIdBySchoolId" resultType="java.lang.String">
+        select group_concat(classid) from t_class where schoolid=#{schoolid} and year=#{year} and classtype in(1,2) and classstate=1 and gradeid in(1,2,3,4,5,7,8,10,11)
+    </select>
+    <!--基本信息-->
+    <select id="getById" resultType="com.xhkjedu.suser.vo.gradeclass.ClassVo">
+        select c.classid,c.classname,c.gradeid,c.classnum,tg.groupid,c.classtype,c.createid,c.schoolid,c.year
+        from t_class c left join t_group tg on c.classid = tg.classid
+        where c.classid=#{classid} and tg.grouptype=1 limit 1
+    </select>
+
+    <!--获取年级下行政班班级id集合-->
+    <select id="listClassidsByGradeid" resultType="java.lang.Integer">
+        select c.classid from t_class c
+        LEFT JOIN t_school s on c.schoolid=s.schoolid and c.year=s.year
+        where c.gradeid=#{gradeid} and c.schoolid=#{schoolid} and c.classtype=1 and c.classstate=1
+    </select>
+    <!--根据班级名称获取班级信息-->
+    <select id="getByName" resultType="com.xhkjedu.suser.model.gradeclass.TClass">
+        select c.classid, c.classname, c.gradeid, c.classnum, c.classstate, c.classorder, c.schoolyear, c.year, c.classtype
+        , c.createid, c.createtime, c.schoolid
+        from t_class c where c.schoolid=#{tClass.schoolid} and c.classname=#{tClass.classname}
+        and c.year=#{tClass.year} and c.gradeid=#{tClass.gradeid} and c.classstate=1 and c.classtype=#{tClass.classtype} limit 1
+    </select>
+    <!--获取任教老师列表-->
+    <select id="listTeacher" resultType="java.lang.String">
+        select u.username from t_class_teacher ct left join t_user u on ct.teacherid=u.userid
+        where ct.classid=#{classid} and u.userstate=1
+    </select>
+
+    <!--修改班级状态-->
+    <update id="updateClassState">
+       update t_class set classstate=#{classstate} where classid in (${classids})
+    </update>
+    <!--修改单个班级状态-->
+    <update id="updateClassstateByClassid">
+       update t_class set classstate=#{classstate} where classid=#{classid}
+    </update>
+
+    <!--修改班级类型-->
+    <update id="updateClasstype">
+        update t_class set classtype=#{classtype} where classid=#{classid}
+    </update>
+    <!--获取班级当前年份-->
+    <select id="getYearById" resultType="java.lang.Integer">
+        select year from t_class where classid=#{classid}
+    </select>
+    <!--根据班级名称获取班级id-->
+    <select id="getClassIdByName" resultType="java.lang.Integer">
+        select c.classid from t_class c where c.schoolid=#{schoolid} and c.gradeid=#{gradeid} and c.classtype=1 and
+        c.classstate=1 and c.classname=#{classname} and c.year=#{year}
+    </select>
+</mapper>

suser/src/main/resources/mapper/gradeclass/ClassStudentMapper.xml

@@ -0,0 +1,147 @@
+<?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.suser.mapper.gradeclass.ClassStudentMapper">
+    <!--班级学生列表-->
+    <select id="findAll" resultType="com.xhkjedu.suser.vo.gradeclass.ClassStudentVo">
+        select cs.csid,cs.classid,u.username studentname,u.studentno,u.usersex,u.userid studentid,u.loginname,cs.createtime
+        ,u.bindmac,u.mac,u.headpic,u.userphone,u.usertime
+        from t_class_student cs left join t_user u on cs.studentid = u.userid
+        left join t_class c on cs.classid=c.classid
+        where cs.classid=#{student.classid}
+        <if test="student.studentname!=null and student.studentname!=''">
+            and (u.username like '%${student.studentname}%' or u.studentno like '%${student.studentname}%'
+            or u.loginname like '%${student.studentname}%' or u.userphone like '%${student.studentname}%')
+        </if>
+        <if test="student.fieldname!=null and student.fieldname!=''">
+          order by ${student.fieldname} ${student.fieldorder},cs.csid desc
+        </if>
+    </select>
+    <!--删除班级、分组对应学生-->
+    <delete id="deleteById">
+        delete cs.*,gs.*
+        from t_class_student cs left join t_group g on g.classid=cs.classid
+        left join t_group_student gs on g.groupid = gs.groupid AND gs.studentid=cs.studentid
+        where cs.classid=#{classid} and cs.studentid=#{studentid}
+    </delete>
+    <!--班级学生数量-->
+    <select id="getNumById" resultType="com.xhkjedu.suser.vo.gradeclass.ImportStudentVo">
+        <choose>
+            <when test="studentid!=0">
+                select count(distinct cs.classid)totalnum
+                ,count(distinct case when c.classid=#{classid} then c.classid else null end)classnum
+                ,count(distinct case when c.classid!=#{classid} and c.classtype=1 and c.classstate=1 then c.classid else
+                null end)xznum
+                from t_class_student cs left join t_class c on cs.classid=c.classid
+                where cs.studentid=#{studentid} and c.year=#{year}
+            </when>
+            <otherwise>
+                select count(*)classnum from t_class_student cs where cs.classid=#{classid}
+            </otherwise>
+        </choose>
+    </select>
+    <!--获取学生行政班id-->
+    <select id="getClassIdByStuId" resultType="java.lang.Integer">
+        select c.classid
+        from t_class_student cs left join t_class c on cs.classid=c.classid
+        where cs.studentid=#{studentid} and c.classtype=1 and c.classstate=1 limit 1
+    </select>
+    <!--获取要升级的学生列表-->
+    <select id="listStudentByClassIds" resultType="com.xhkjedu.suser.model.gradeclass.TClassStudent">
+        select * from t_class_student where classid in(${classIds}) order by classid;
+    </select>
+    <!--根据班级id和学生id获取班级学生信息-->
+    <select id="getByClassIdStudentId" resultType="com.xhkjedu.suser.model.gradeclass.TClassStudent">
+        select * from t_class_student where classid=#{classid} and studentid=#{studentid} limit 1
+    </select>
+
+    <!-- 获取学生所在班级 -->
+    <select id="listClassByStudentId" resultType="com.xhkjedu.suser.vo.gradeclass.ClassVo">
+        SELECT c.classid,c.classname,c.gradeid,c.classnum,c.classtype FROM t_class c
+        LEFT JOIN t_class_student cs ON c.classid=cs.classid
+        WHERE c.year=#{year} and c.classstate=1 AND cs.studentid=#{studentid} and (c.classtype=1 or c.classtype=2)
+        GROUP BY c.classid ORDER BY c.classtype,c.classorder
+
+    </select>
+
+    <select id="listNoClassStu" resultType="com.xhkjedu.suser.vo.gradeclass.ClassStudentVo">
+        select u.username studentname,u.studentno,u.usersex,u.userid studentid,u.loginname,u.createtime,
+        u.bindmac,u.mac,u.userstate,u.userphone,u.usertime
+        from t_user u left join
+        (select cs1.studentid,cs1.createtime,c.classtype from t_class_student cs1
+        left join t_class c on cs1.classid=c.classid where c.schoolid=#{student.schoolid} and c.year=#{student.year}
+        and c.classtype=1 and c.classstate=1) cs on u.userid=cs.studentid
+        where u.schoolid=#{student.schoolid} and u.usertype=2 and cs.studentid is null
+        <if test="student.userstate!=null and student.userstate!=0">
+            and u.userstate=#{student.userstate}
+        </if>
+        <if test="student.studentname!=null and student.studentname!=''">
+            and (u.username like '%${student.studentname}%' or u.studentno like '%${student.studentname}%')
+        </if>
+        <if test="student.fieldname!=null and student.fieldname!=''">
+            order by ${student.fieldname} ${student.fieldorder},u.userid desc
+        </if>
+    </select>
+    <!-- <if test="student.fieldname!=null and student.fieldname!=''">
+           order by ${student.fieldname} ${student.fieldorder}
+       </if>-->
+    <!--获取学生所在年级列表-->
+    <select id="listGrade" resultType="java.lang.Integer">
+        SELECT DISTINCT c.gradeid FROM t_class_student cs LEFT JOIN t_class c ON cs.classid=c.classid
+        WHERE cs.studentid=#{studentid} AND c.year=#{year} and c.classtype=1 and c.classstate=1
+    </select>
+
+    <!--获取全校学生-->
+    <select id="listAllStudents" resultType="com.xhkjedu.suser.vo.gradeclass.ClassStudentVo">
+        select u.username studentname,u.studentno,u.userphone,
+        u.usersex,u.userid studentid,u.loginname,cs.createtime,
+        u.bindmac,u.mac,u.headpic,u.usertime,c.gradeid,c.classname,c.classid
+        from t_user u left join t_class_student cs on u.userid=cs.studentid
+        left join t_class c on cs.classid=c.classid
+        where u.schoolid=#{student.schoolid} and u.usertype=2 and u.userstate=1
+        and c.classstate=1 and c.year=#{student.year} and c.classtype=#{student.classtype}
+        <if test="student.studentname!=null and student.studentname!=''">
+            and (u.username like '%${student.studentname}%' or u.studentno like '%${student.studentname}%')
+        </if>
+        group by u.userid
+        <if test="student.classtype==1">
+            ,c.classid
+        </if>
+        order by u.studentno
+    </select>
+    <!--获取班级学生id列表-->
+    <select id="listStudentIdByClassId" resultType="java.lang.Integer">
+        select studentid from t_class_student where classid=#{classid}
+    </select>
+    <!--添加-->
+    <insert id="save">
+        insert ignore into t_class_student (classid,studentid,createid,createtime,schoolid)
+        values (#{student.classid},#{student.studentid},#{student.createid},#{student.createtime},#{student.schoolid})
+    </insert>
+    <!--学生所在行政班-->
+    <select id="getClassByStuId" resultType="com.xhkjedu.suser.vo.gradeclass.ClassVo">
+        select c.gradeid,c.classname from t_class_student cs left join t_class c on cs.classid=c.classid
+        left join t_school s on c.schoolid=s.schoolid
+        where cs.studentid=#{studentid} and c.year=s.year and c.classtype=1 and c.classstate=1 limit 1
+    </select>
+    <!--学生列表-->
+    <select id="listStu" resultType="com.xhkjedu.suser.vo.paper.AStudentPaperVo">
+        select cs.studentid,u.username studentname,u.loginname,c.gradeid,c.classname
+        from t_class_student cs left join t_class c on cs.classid=c.classid
+        left join t_user u on cs.studentid=u.userid
+        where c.schoolid=#{paper.schoolid} and c.gradeid=#{paper.gradeid} and c.year=#{paper.year}
+        and c.classtype=1 and u.userstate=1
+        <if test="paper.classid!=0">
+            and cs.classid=#{paper.classid}
+        </if>
+        <if test="paper.classids!=null and paper.classids!=''">
+            and cs.classid in (${paper.classids})
+        </if>
+        group by cs.studentid
+    </select>
+    <!--获取学生所有提高班-->
+    <select id="listTgClassid" resultType="java.lang.Integer">
+        SELECT c.classid FROM t_class_student cs LEFT JOIN t_class c ON cs.classid=c.classid
+        LEFT JOIN t_school s ON c.schoolid=s.schoolid
+        WHERE cs.studentid=#{studentid} AND c.year=s.year AND c.classtype=2
+    </select>
+</mapper>

suser/src/main/resources/mapper/gradeclass/ClassTeacherMapper.xml

@@ -0,0 +1,196 @@
+<?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.suser.mapper.gradeclass.ClassTeacherMapper">
+    <!--班级教师列表-->
+    <select id="findAll" resultType="com.xhkjedu.suser.vo.gradeclass.ClassTeacherVo">
+        select u.userid teacherid,u.username teachername,u.usersex,u.userphone,u.loginname,u.usertype,u.createtime,u.usertime
+        from t_user u
+        <if test="teacher.gradeid!=null and teacher.gradeid!=0">
+            left join t_class_teacher ct on ct.teacherid=u.userid
+            left join t_class c on c.classid=ct.classid
+        </if>
+        <if test="teacher.subjectid!=null and teacher.subjectid!='0'.toString() and teacher.subjectid!=''">
+            left join t_teacher_powersb tp on tp.teacherid=u.userid
+            left join t_subject_book sb on sb.lsbid=tp.lsbid
+        </if>
+        where u.schoolid=#{teacher.schoolid} and u.usertype in(0,1) and u.userstate=1
+        <if test="teacher.teachername!=null and teacher.teachername!=''">
+            and (u.username like '%${teacher.teachername}%' or u.loginname like '%${teacher.teachername}%')
+        </if>
+        <if test="teacher.gradeid!=null and teacher.gradeid!=0">
+            and c.gradeid=#{teacher.gradeid} and c.year=#{teacher.year}
+        </if>
+        <if test="teacher.subjectid!=null and teacher.subjectid!='0'.toString() and teacher.subjectid!=''">
+            and sb.subjectid=#{teacher.subjectid}
+        </if>
+        group by u.userid
+        order by ${teacher.fieldname} ${teacher.fieldorder},u.userid desc
+    </select>
+
+    <!--获取当前年份下教师任教班级-->
+    <select id="listTeacherClass" resultType="com.xhkjedu.suser.vo.gradeclass.ClassVo">
+        SELECT ct.classid,c.classname,c.gradeid,c.classnum
+        FROM t_class_teacher ct LEFT JOIN t_class c ON ct.classid=c.classid
+        WHERE ct.teacherid=#{teacherid} AND c.year=#{year} and c.classstate=1
+        <if test="classtype!=null and classtype!=0">
+            <if test="classtype!=11">and c.classtype=#{classtype}</if>
+            <if test="classtype==11">and c.classtype in(1,2)</if>
+        </if>
+        <if test="classtype==null or classtype==0">
+            and c.classtype!=99
+        </if>
+        order by c.gradeid,c.classtype,c.classorder
+    </select>
+    <select id="listTeacherClass2" resultType="com.xhkjedu.suser.vo.gradeclass.ClassVo">
+        SELECT ct.classid,c.classname,c.gradeid,c.classnum,c.classtype
+        FROM t_class_teacher ct LEFT JOIN t_class c ON ct.classid=c.classid
+        WHERE ct.teacherid=#{teacherid} AND c.year=#{year} and c.classstate=1
+        and c.classtype in(1,2)
+        order by c.gradeid,c.classtype,c.classorder
+    </select>
+    <!--要升级的教师列表-->
+    <select id="listTeacherByClassIds" resultType="com.xhkjedu.suser.model.gradeclass.TClassTeacher">
+        select * from t_class_teacher where classid in(${classIds}) order by classid;
+    </select>
+    <!--前年份教师任教分组学生-->
+    <resultMap id="teacherClass" type="java.util.Map">
+        <result property="classid" column="classid"></result>
+        <result property="classname" column="classname"></result>
+        <result property="gradeid" column="gradeid"></result>
+        <result property="classnum" column="classnum"></result>
+        <collection property="students" ofType="java.util.Map" javaType="java.util.List">
+            <result property="studentid" column="studentid"></result>
+            <result property="studentname" column="studentname"></result>
+            <result property="headpic" column="headpic"></result>
+        </collection>
+    </resultMap>
+    <!--获取作业学生列表-->
+    <select id="listPaperStudent" resultMap="teacherClass">
+        select pg.classid,c.classname,c.gradeid,c.classnum,cs.studentid,u.username studentname,u.headpic
+        from t_paper_group pg left join t_class c on pg.classid=c.classid
+        left join t_class_student cs on c.classid = cs.classid
+        left join t_user u on cs.studentid=u.userid
+        where pg.paperid=#{paperid} order by c.gradeid,c.classtype,c.classorder,convert(u.username using gbk)
+    </select>
+    <!--获取作业教师列表-->
+    <resultMap id="paperTeacher" type="java.util.Map">
+        <result property="classid" column="classid"></result>
+        <result property="classname" column="classname"></result>
+        <result property="gradeid" column="gradeid"></result>
+        <collection property="teachers" ofType="java.util.Map" javaType="java.util.List">
+            <result property="teacherid" column="teacherid"></result>
+            <result property="teachername" column="teachername"></result>
+        </collection>
+    </resultMap>
+    <select id="listPaperTeacher" resultMap="paperTeacher">
+        select pg.classid,c.classname,c.gradeid,ct.teacherid,u.username teachername
+        from t_paper_group pg left join t_class c on pg.classid=c.classid
+        left join t_class_teacher ct on c.classid=ct.classid
+        right join t_teacher_powersb tp on tp.teacherid=ct.teacherid
+        right join t_subject_book sb on sb.lsbid=tp.lsbid and sb.subjectid=#{subjectid}
+        right join t_user u on ct.teacherid=u.userid and u.userstate=1
+        where pg.paperid=#{paperid} order by c.gradeid,c.classtype,c.classorder,convert(u.username using gbk)
+    </select>
+    <!-- 删除教师任教的行政和提高班 -->
+    <delete id="deleteByUserid">
+        DELETE ct FROM t_class_teacher ct
+        LEFT JOIN t_class c ON ct.classid=c.classid
+        WHERE ct.teacherid=#{userid} AND c.year=#{year} and c.classtype in(1,2)
+    </delete>
+
+    <!-- 获取用户当年任教班级id -->
+    <select id="listClassesByUserid" resultType="com.xhkjedu.suser.vo.gradeclass.ClassVo">
+        SELECT ct.classid,c.classname,c.gradeid,c.classtype FROM t_class_teacher ct LEFT JOIN t_class c ON ct.classid=c.classid
+         WHERE ct.teacherid=#{userid} AND c.year=#{year} and c.classstate=1
+        <if test="classtype!=null and classtype!=0">
+            <if test="classtype!=11">and c.classtype=#{classtype}</if>
+            <if test="classtype==11">and c.classtype in(1,2)</if>
+        </if>
+        <if test="classtype==null or classtype==0">
+            and c.classtype!=99
+        </if>
+         order by c.gradeid,c.classtype,c.classorder
+    </select>
+
+    <resultMap id="gradeClass" type="com.xhkjedu.suser.vo.gradeclass.GradeVo">
+        <result property="gradeid" column="gradeid"></result>
+        <result property="gradename" column="gradename"></result>
+        <collection property="classes" ofType="com.xhkjedu.suser.vo.gradeclass.ClassVo">
+            <result property="gradeid" column="gradeid"></result>
+            <result property="classid" column="classid"></result>
+            <result property="classname" column="classname"></result>
+            <result property="classnum" column="classnum"></result>
+            <result property="classtype" column="classtype"></result>
+        </collection>
+    </resultMap>
+
+    <!--1月30日修改获取班级-->
+    <!--<if test="role.classtype!=null and role.classtype!=0">
+            and c.classtype=#{role.classtype}
+        </if>-->
+    <select id="listGradeClassesByUserid" resultMap="gradeClass">
+        select c.gradeid,c.classid,c.classname,c.classnum,c.classtype
+        ,(case c.gradeid when 1 then '一年级' when 2 then '二年级' when 3 then '三年级' when 4 then '四年级'
+         when 5 then '五年级' when 6 then '六年级' when 7 then '七年级' when 8 then '八年级' when 9 then '九年级'
+         when 10 then '高一' when 11 then '高二' when 12 then '高三' else '' end)gradename
+        from t_class_teacher ct left join  t_class c on ct.classid=c.classid
+        where ct.teacherid=#{role.teacherid} and c.year=#{role.year} and c.classstate=1
+        <if test="role.classtype!=null and role.classtype!=0">
+            <if test="role.classtype!=11">and c.classtype=#{role.classtype}</if>
+            <if test="role.classtype==11">and c.classtype in(1,2)</if>
+        </if>
+        <if test="role.classtype==null or role.classtype==0">
+            and c.classtype!=99
+        </if>
+        <if test="role.gradeid!=null and role.gradeid!=0">
+            and c.gradeid=#{role.gradeid}
+        </if>
+        order by c.gradeid,c.classtype,c.classorder
+    </select>
+    <select id="listGradeClassesByUserid2" resultMap="gradeClass">
+        select c.gradeid,c.classid,c.classname,c.classnum,c.classtype
+        ,(case c.gradeid when 1 then '一年级' when 2 then '二年级' when 3 then '三年级' when 4 then '四年级'
+         when 5 then '五年级' when 6 then '六年级' when 7 then '七年级' when 8 then '八年级' when 9 then '九年级'
+         when 10 then '高一' when 11 then '高二' when 12 then '高三' else '' end)gradename
+        from t_class_teacher ct left join  t_class c on ct.classid=c.classid
+        where ct.teacherid=#{role.teacherid} and c.year=#{role.year} and c.classstate=1
+        and c.classtype in(1,2)
+        order by c.gradeid,c.classtype,c.classorder
+    </select>
+    <!--获取教师任教行政和提高班id-->
+    <select id="getClassIds" resultType="java.lang.String">
+        select group_concat(distinct c.classid)
+        from t_class_teacher ct left join  t_class c on ct.classid=c.classid
+        left join t_school s on ct.schoolid=s.schoolid
+        where ct.teacherid=#{teacherid} and c.year=s.year and c.classstate=1
+        and c.classtype in(1,2)
+    </select>
+
+    <!--获取学校年级下教师-->
+    <select id="listTeachersByGradeid" resultType="com.xhkjedu.suser.vo.gradeclass.ClassTeacherVo">
+        select ct.teacherid,u.username as teachername from t_class_teacher ct
+        left join t_class c on ct.classid=c.classid
+        left join t_user u on ct.teacherid=u.userid
+        where c.schoolid=#{schoolid} and c.gradeid=#{gradeid} and c.year=#{year} and c.classstate=1 and u.usertype=1 and u.userstate=1
+        group by ct.teacherid
+    </select>
+
+    <!--获取科目年级下教师-->
+    <select id="listTeahcersBySubjectGrade" resultType="com.xhkjedu.suser.vo.gradeclass.ClassTeacherVo">
+     select ct.teacherid,u.username as teachername from t_class_teacher ct
+     left join t_class c on ct.classid=c.classid
+     left join t_user u on ct.teacherid=u.userid
+    LEFT JOIN t_teacher_powersb tp on tp.teacherid=ct.teacherid
+    LEFT JOIN t_subject_book sb on tp.lsbid=sb.lsbid
+    where c.schoolid=#{ctp.schoolid} and c.gradeid=#{ctp.gradeid} and c.year=#{ctp.year} and c.classstate=1
+    and sb.subjectid=#{ctp.subjectid} and u.usertype=1 and u.userstate=1
+    group by ct.teacherid
+    </select>
+    <!--删除班级下所有教师-->
+    <delete id="deleteByClassId">
+        delete from t_class_teacher where classid=#{classid}
+    </delete>
+
+
+
+</mapper>

suser/src/main/resources/mapper/gradeclass/GradeMapper.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.suser.mapper.gradeclass.GradeMapper">
+    <!--学校年级列表-->
+    <select id="findAll" resultType="com.xhkjedu.suser.model.gradeclass.TGrade">
+        select g.* from t_grade g
+        where g.schoolid=#{schoolid} and g.year=#{year}
+        order by g.gradeorder
+    </select>
+    <!--详情-->
+    <select id="findById" resultType="com.xhkjedu.suser.model.gradeclass.TGrade">
+        select g.*,u.username createname
+        from t_grade g left join t_user u on g.createid=u.userid
+        where g.gradeid=#{gradeid} limit 1
+    </select>
+
+    <resultMap id="gradeResult" type="com.xhkjedu.suser.vo.gradeclass.GradeVo">
+        <result property="gradeid" column="gradeid"></result>
+        <result property="gradename" column="gradename"></result>
+        <collection property="classes" ofType="com.xhkjedu.suser.vo.gradeclass.ClassVo">
+            <result property="gradeid" column="gradeid2"></result>
+            <result property="classid" column="classid"></result>
+            <result property="classname" column="classname"></result>
+            <result property="classnum" column="classnum"></result>
+            <result property="classtype" column="classtype"></result>
+            <result property="classorder" column="classorder"></result>
+            <result property="year" column="year"></result>
+            <result property="schoolyear" column="schoolyear"></result>
+        </collection>
+        <collection property="subjects" ofType="com.xhkjedu.suser.vo.gradeclass.GradeSubjectVo">
+            <result property="subjectid" column="subjectid"></result>
+            <result property="subjectname" column="subjectname"></result>
+            <collection property="teachers" ofType="com.xhkjedu.suser.vo.gradeclass.ClassTeacherVo">
+                <result property="teacherid" column="teacherid"></result>
+                <result property="teachername" column="teachername"></result>
+            </collection>
+        </collection>
+    </resultMap>
+    <!--获取通知班级列表-->
+    <select id="listClass" resultMap="gradeResult">
+        select c.gradeid,c.gradeid gradeid2,c.classid,c.classname,c.classnum,c.classtype,c.classorder,c.year,c.schoolyear
+        ,(case c.gradeid when 1 then '一年级' when 2 then '二年级' when 3 then '三年级' when 4 then '四年级'
+         when 5 then '五年级' when 6 then '六年级' when 7 then '七年级' when 8 then '八年级' when 9 then '九年级'
+         when 10 then '高一' when 11 then '高二' when 12 then '高三' else '' end)gradename
+        from t_class c where c.schoolid=#{schoolid} and c.year=#{year} and c.classstate=1
+        <if test="classtype!=null and classtype!=0">
+            and c.classtype=#{classtype}
+        </if>
+        <if test="classtype==null or classtype==0">
+            and c.classtype<![CDATA[ < ]]>5
+        </if>
+         order by c.gradeid,c.classtype,c.classorder,c.classid desc
+    </select>
+
+    <!--教师设置权限班级-->
+    <select id="listClassForTeacher" resultMap="gradeResult">
+        select c.gradeid,c.gradeid gradeid2,c.classid,c.classname,c.classnum,c.classtype,c.classorder,c.year,c.schoolyear
+        ,(case c.gradeid when 1 then '一年级' when 2 then '二年级' when 3 then '三年级' when 4 then '四年级'
+        when 5 then '五年级' when 6 then '六年级' when 7 then '七年级' when 8 then '八年级' when 9 then '九年级'
+        when 10 then '高一' when 11 then '高二' when 12 then '高三' else '' end)gradename
+        from t_class c where c.schoolid=#{schoolid} and c.year=#{year} and c.classstate=1 and c.classtype between 1 and 2
+        order by c.gradeid,c.classtype,c.classorder,c.classid desc
+    </select>
+
+    <!--获取通知教师列表-->
+    <select id="listTeacher" resultMap="gradeResult">
+        select c.gradeid,s.subjectid,s.subjectname,u.userid teacherid,u.username teachername
+        ,(case c.gradeid when 1 then '一年级' when 2 then '二年级' when 3 then '三年级' when 4 then '四年级'
+         when 5 then '五年级' when 6 then '六年级' when 7 then '七年级' when 8 then '八年级' when 9 then '九年级'
+         when 10 then '高一' when 11 then '高二' when 12 then '高三' else '' end)gradename
+        from t_class c left join t_teacher_powersb ts on c.schoolid=ts.schoolid
+        left join t_subject_book sb on ts.lsbid=sb.lsbid
+        left join t_subject s on sb.subjectid=s.subjectid
+        left join t_class_teacher ct on c.classid=ct.classid and ts.teacherid=ct.teacherid
+        left join t_user u on ct.teacherid=u.userid
+        where c.schoolid=#{schoolid} and c.year=#{year} and c.classstate=1 and u.usertype=1 and u.userstate=1
+        order by c.gradeid,c.classtype,c.classorder,s.subjectorder,convert(u.username using gbk)
+    </select>
+</mapper>

suser/src/main/resources/mapper/gradeclass/GroupMapper.xml

@@ -0,0 +1,66 @@
+<?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.suser.mapper.gradeclass.GroupMapper">
+    <!--班级分组列表-->
+    <select id="findAll" resultType="com.xhkjedu.suser.model.gradeclass.TGroup">
+        select g.*,u.username createname from t_group g left join t_user u on g.createid=u.userid
+        where g.classid=#{classid}
+        <if test="createid!=null">
+            and (g.createid=#{createid} or g.grouptype=1)
+        </if>
+        order by g.grouptype,g.groupid desc
+    </select>
+    <!--更新分组人数-->
+    <update id="updateNum">
+        update t_group g set g.groupnum=
+        (select count(*) from t_group_student gs where gs.groupid=#{groupid})
+        where g.groupid=#{groupid}
+    </update>
+    <resultMap id="teacherGroup" type="com.xhkjedu.suser.vo.gradeclass.ClassGroupVo">
+        <result property="classid" column="classid"></result>
+        <result property="classname" column="classname"></result>
+        <result property="gradeid" column="gradeid"></result>
+        <result property="classnum" column="classnum"></result>
+        <collection property="groups" ofType="com.xhkjedu.suser.vo.gradeclass.GroupVo">
+            <result property="classid" column="classid"></result>
+            <result property="groupid" column="groupid"></result>
+            <result property="groupname" column="groupname"></result>
+            <result property="grouptype" column="grouptype"></result>
+            <result property="selected" column="selected"></result>
+            <collection property="students" ofType="com.xhkjedu.suser.vo.gradeclass.CStudentVo"
+                        javaType="java.util.List" select="listStudent" column="{groupid=groupid}">
+            </collection>
+        </collection>
+    </resultMap>
+    <resultMap id="studentResult" type="com.xhkjedu.suser.vo.gradeclass.CStudentVo">
+        <result property="studentid" column="studentid"></result>
+        <result property="studentname" column="studentname"></result>
+    </resultMap>
+    <select id="listStudent" resultMap="studentResult">
+        select gs.studentid,u.username studentname,u.headpic
+        from t_group_student gs left join t_user u on gs.studentid=u.userid
+        where gs.groupid=#{groupid} order by convert(u.username using gbk)
+    </select>
+    <!--教师分组列表-->
+    <select id="teacherList" resultMap="teacherGroup">
+        select c.classid,c.classname,c.classnum,c.gradeid,g.groupid,g.groupname,g.grouptype from t_group g
+        left join t_class_teacher ct on ct.classid=g.classid
+        left join t_class c on ct.classid = c.classid
+        where ct.teacherid=#{teacherid} and c.year=#{year} and c.classstate=1
+        and c.classtype<![CDATA[ < ]]>5 and (g.createid=#{teacherid} or g.grouptype=1)
+        order by c.gradeid,c.classtype,c.classorder,g.grouptype asc, g.groupid desc
+    </select>
+
+    <!--分组以及分组下所有学生id-->
+    <select id="listStudentidsByGroupids" resultType="java.lang.Integer">
+        SELECT DISTINCT studentid FROM t_group_student  WHERE groupid IN (${groupids})
+    </select>
+    <!--获取班级的全体分组-->
+    <select id="findByClassId" resultType="com.xhkjedu.suser.model.gradeclass.TGroup">
+        select g.* from t_group g where g.classid=#{classid} and g.grouptype=1
+    </select>
+    <!--要升级的全体分组列表-->
+    <select id="listStudentByClassIds" resultType="com.xhkjedu.suser.model.gradeclass.TGroup">
+        select g.* from t_group g where g.classid in(${classIds}) and g.grouptype=1 order by classid
+    </select>
+</mapper>

suser/src/main/resources/mapper/gradeclass/GroupStudentMapper.xml

@@ -0,0 +1,24 @@
+<?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.suser.mapper.gradeclass.GroupStudentMapper">
+    <!--分组学生列表-->
+    <select id="findAll" resultType="com.xhkjedu.suser.vo.gradeclass.GroupStudentVo">
+        select gs.gsid,gs.groupid,tu.studentno,tu.username studentname,tu.usersex,gs.studentid,tu.headpic
+        from t_group_student gs left join t_user tu on gs.studentid = tu.userid
+        where gs.groupid=#{groupid}
+        order by convert(tu.username using gbk)
+    </select>
+    <!--获取要升级的学生列表-->
+    <select id="listStudentByGroupIds" resultType="com.xhkjedu.suser.model.gradeclass.TGroupStudent">
+        select * from t_group_student where groupid in(${groupIds}) order by groupid;
+    </select>
+    <!--删除分组学生-->
+    <delete id="deleteByGroupId">
+        delete from t_group_student where groupid=#{groupid}
+    </delete>
+    <!--添加-->
+    <insert id="save">
+        insert ignore into t_group_student (classid,groupid,studentid,createid,createtime,schoolid)
+        values (#{student.classid},#{student.groupid},#{student.studentid},#{student.createid},#{student.createtime},#{student.schoolid})
+    </insert>
+</mapper>

suser/src/main/resources/mapper/system/RoleMapper.xml

@@ -0,0 +1,17 @@
+<?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.suser.mapper.system.RoleMapper">
+    <!-- 获取所有角色 -->
+    <select id="listAllRoles" resultType="com.xhkjedu.suser.model.system.TRole">
+        SELECT r.roleid,r.rolename,r.comm,r.createid,r.createtime,u.username AS createname,
+        (SELECT COUNT(*) FROM t_user_role ur WHERE ur.roleid=r.roleid) AS usernum
+        FROM t_role r LEFT JOIN t_user u ON r.createid = u.userid
+        WHERE r.schoolid=#{schoolid} ORDER BY createtime desc
+    </select>
+
+    <!-- 获取角色下用户 -->
+    <select id="getRoleDetail" resultType="com.xhkjedu.suser.vo.system.RoleVo">
+        SELECT r.roleid,r.rolename,r.comm from t_role r
+        WHERE r.roleid=#{roleid} limit 1
+    </select>
+</mapper>

suser/src/main/resources/mapper/system/RoleModuleMapper.xml

@@ -0,0 +1,33 @@
+<?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.suser.mapper.system.RoleModuleMapper">
+
+    <!-- 角色下所有模块 -->
+    <select id="listRoleModules" resultType="com.xhkjedu.suser.vo.system.RoleModuleVo">
+        SELECT rm.moduleid,m.modulename,m.moduleurl,m.moduleico,m.modulepid,m.minout,m.mclass,m.level
+        FROM t_role_module rm LEFT JOIN t_module m ON rm.moduleid=m.moduleid
+        WHERE rm.roleid=#{roleid} and m.display=1 ORDER BY m.morder
+    </select>
+
+    <!-- 批量保存角色模块信息 -->
+    <insert id="saveBathRoleModule">
+        INSERT INTO t_role_module (roleid,moduleid,createid,createtime,schoolid) VALUES
+        <foreach collection ="list" item="rm" index= "index" separator =",">
+            (#{rm.roleid},#{rm.moduleid},#{rm.createid},#{rm.createtime},#{rm.schoolid})
+        </foreach>
+    </insert>
+
+    <!-- 根据角色删除模块信息 -->
+    <delete id="deleteByRoleid" parameterType="java.lang.Integer">
+        delete from t_role_module where roleid=#{roleid}
+    </delete>
+
+    <!--获取用户拥有的所有模块-->
+    <select id="listModulesByUserid" resultType="com.xhkjedu.suser.vo.system.RoleModuleVo">
+        SELECT DISTINCT rm.moduleid,m.modulename,m.moduleurl,m.moduleico,m.modulepid,m.morder,m.minout,
+        m.mclass,m.level,m.mabbrevname
+        FROM t_role_module rm LEFT JOIN t_module m ON rm.moduleid=m.moduleid
+        LEFT JOIN t_user_role ur ON rm.roleid=ur.roleid
+        WHERE userid=#{userid} and m.display=1 ORDER BY m.level,m.morder,m.moduleid
+    </select>
+</mapper>

suser/src/main/resources/mapper/system/UserMapper.xml

@@ -0,0 +1,215 @@
+<?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.suser.mapper.system.UserMapper">
+
+    <!-- 登录 -->
+    <select id="getUserByLoginname" resultType="com.xhkjedu.suser.vo.system.UserVo">
+        select u.userid,u.username,u.loginname,u.loginpwd,u.userphone,u.userbirthday,u.cardid,u.headpic,u.usertype,
+        u.userstate,u.opepassword,u.createid,u.createtime,u.deleteid,u.deletetime,u.schoolid,u.bindmac,u.mac,u.usertime
+        ,s.year,s.schoolname,s.schoollevel,s.schoolstate,s.bindmac sbindmac,s.errorrate,s.schooldomain
+        ,(select cloudcode from t_cloud limit 1)cloudcode
+        from t_user u left join t_school s on u.schoolid = s.schoolid
+        where u.loginname=#{loginname} limit 1
+    </select>
+    <!--学生andorid登录，20211221添加GROUP_CONCAT，因为不绑定的情况下一个mac可以多个帐号登录-->
+    <select id="getUserByLoginnameMac" resultType="com.xhkjedu.suser.vo.system.UserVo">
+        select u.userid,u.username,u.loginname,u.loginpwd,u.userbirthday,u.cardid,u.headpic,u.usertype,
+        u.userstate,u.opepassword,u.createid,u.createtime,u.deleteid,u.deletetime,u.schoolid,u.bindmac,u.mac,u.usertime
+        ,s.year,s.schoolname,s.schoollevel,s.schoolstate,s.bindmac sbindmac,s.errorrate,s.schooldomain
+        ,(case when u.userphone is null or u.userphone='' then 0 else 1 end)hasphone
+        ,(select GROUP_CONCAT(u1.loginname) from t_user u1 where u1.mac=#{mac} and u1.schoolid=u.schoolid)macname
+        ,c.cloudcode,c.bindphone
+        ,(select count(cs.csid) from t_class_student cs left join t_class c on cs.classid=c.classid
+        where cs.studentid=u.userid and c.classstate=1 and c.year=s.year and c.classtype=1)xznum
+        from t_user u,t_school s,t_cloud c
+        where u.loginname=#{loginname} and u.schoolid = s.schoolid limit 1
+    </select>
+    <!--校验手机号-->
+    <select id="checkUserPhone" resultType="java.lang.Boolean">
+        select (case when c.bindphone=1 and (u.userphone is null or u.userphone='') then true else false end)
+        from t_user u,t_cloud c where u.userid=#{userid}
+    </select>
+    <!--删除用户-->
+    <update id="deleteById">
+        update t_user set userstate=2,deleteid=#{user.deleteid},deletetime=#{user.deletetime}
+        where userid=#{user.userid}
+    </update>
+    <!--获取用户列表-->
+    <select id="findAll" resultType="com.xhkjedu.suser.vo.system.UserVo">
+        select u.*,u2.username createname from t_user u
+        left join t_user u2 on u2.userid=u.createid
+        where u.schoolid=#{user.schoolid}
+        <if test="user.loginname!=null and user.loginname!=''">
+            and u.loginname like '%${user.loginname}%'
+            or u.username like '%${user.loginname}%'
+        </if>
+        order by u.createtime desc
+    </select>
+    <!--获取用户详情-->
+    <select id="findById" resultType="com.xhkjedu.suser.vo.system.UserVo">
+        select u.*,u2.username createname,s.year,s.schoolname,s.schoollevel,s.schoolstate,s.bindmac sbindmac,s.errorrate
+        ,(select cloudcode from t_cloud limit 1)cloudcode
+        from t_user u
+        left join t_user u2 on u2.userid=u.createid
+        left join t_school s on u.schoolid = s.schoolid
+        where u.userid=#{userid} limit 1
+    </select>
+    <!--修改用户密码-->
+    <update id="updatePwd">
+        update t_user set loginpwd=#{user.loginpwd} where userid=#{user.userid}
+    </update>
+    <!--修改用户头像-->
+    <update id="updateHeadPic">
+        update t_user set headpic=#{user.headpic} where userid=#{user.userid}
+    </update>
+    <!--检查登录账号是否存在-->
+    <select id="checkLoginName" resultType="java.lang.Integer">
+        select count(*) from t_user u where u.loginname=#{loginname}
+    </select>
+    <!--根据登录账号获取用户详情-->
+    <select id="getObjByLoginName" resultType="com.xhkjedu.suser.model.system.TUser">
+        select u.* from t_user u where u.loginname=#{loginname} limit 1
+    </select>
+    <!--根据登录名获取学生id和行政和提高班班级id-->
+    <select id="getObjByLoginName2" resultType="com.xhkjedu.suser.model.system.TUser">
+        select u.userid,u.usertype,u.userstate,u.schoolid,group_concat(distinct c.classid) ultype
+        from t_user u left join t_class_student cs on u.userid=cs.studentid
+        left join t_class c on cs.classid=c.classid and c.classtype in(1,2) and c.classstate=1
+        where u.loginname=#{loginname} limit 1
+    </select>
+    <!--修改用户状态-->
+    <update id="updateState">
+        update t_user set userstate=#{userstate} where userid=#{userid}
+    </update>
+
+    <!-- 用户设置操作密码 -->
+    <update id="updateOpepasswordByUserId">
+        update t_user set opepassword=#{opepassword} where userid=#{userid}
+    </update>
+    <!-- 验证用户操作密码 -->
+    <select id="getUserIdByOpepassword" resultType="java.lang.Integer">
+        select count(*) from t_user where userid=#{userid} and opepassword=#{opepassword}
+    </select>
+
+    <resultMap id="teacherInfoMap" type="com.xhkjedu.suser.vo.system.TeacherVo">
+        <result property="userid" column="userid"></result>
+        <result property="username" column="username"></result>
+        <result property="headpic" column="headpic"></result>
+        <result property="subjectname" column="subjectname"></result>
+        <collection property="classlist" ofType="com.xhkjedu.suser.vo.gradeclass.ClassVo"
+                    javaType="java.util.List" select="listTeacherClass" column="{userid=userid,classtype=classtype}">
+        </collection>
+    </resultMap>
+
+    <resultMap id="teacherClass" type="com.xhkjedu.suser.vo.gradeclass.ClassVo">
+        <result property="classid" column="classid"></result>
+        <result property="classname" column="classname"></result>
+        <result property="gradeid" column="gradeid"></result>
+    </resultMap>
+    <!--教师任教班级-->
+    <select id="listTeacherClass" resultMap="teacherClass">
+        select c.classid,c.classname,c.gradeid from t_class c
+        left join t_class_teacher ct on c.classid=ct.classid
+        where ct.teacherid=#{userid} and c.classstate=1
+        <if test="classtype!=null and classtype!=0">
+            <if test="classtype!=11">and c.classtype=#{classtype}</if>
+            <if test="classtype==11">and c.classtype in(1,2)</if>
+        </if>
+        <if test="classtype==null or classtype==0">
+            and c.classtype!=99
+        </if>
+        order by c.gradeid,c.classtype,c.classorder
+    </select>
+
+    <!--教师基本信息-->
+    <select id="getTeacherInfo" resultMap="teacherInfoMap">
+        select u.userid,u.username,u.headpic,group_concat(distinct s.subjectname order by s.subjectorder)subjectname
+        ,#{classtype} classtype,u.usertime
+        from t_user u
+        left join t_teacher_powersb ts on u.userid = ts.teacherid
+        left join t_subject_book sb on ts.lsbid=sb.lsbid
+        left join t_subject s on sb.subjectid=s.subjectid
+        where u.userid=#{userid}
+    </select>
+    <!--更新学生硬件绑定信息-->
+    <update id="updateBindMac">
+        update t_user set bindmac=#{user.bindmac},mac=#{user.mac} where userid=#{user.userid}
+    </update>
+    <!--删除学生绑定信息-->
+    <update id="delBindmac">
+        update t_user set bindmac=0,mac=null where schoolid=#{schoolid}
+    </update>
+    <!--通过短信修改密码-->
+    <update id="updatePwdByCode">
+        update t_user set loginpwd=#{user.loginpwd} where userphone=#{user.userphone}
+    </update>
+    <!--批量修改用户密码-->
+    <update id="batchUpdatePwd">
+        update t_user set loginpwd=#{user.loginpwd} where schoolid=#{user.schoolid}
+        and usertype in (
+        <foreach collection="user.usertypes" item="usertype" index="index" separator=",">
+            ${usertype}
+        </foreach>
+        )
+    </update>
+
+    <!--根据用户id获取用户姓名-->
+    <select id="getUserNameById" resultType="java.lang.String">
+        select username from t_user where userid=#{userid}
+    </select>
+
+    <!--批量修改用户状态-->
+    <update id="batchUpdateState">
+        update t_user set userstate=#{userstate} where
+        <foreach collection="users" item="user" index="index" separator="or">
+            userid=${user.studentid}
+        </foreach>
+    </update>
+
+    <!--获取学校管理员-->
+    <select id="getSchoolAdminBySchoolid" resultType="com.xhkjedu.suser.vo.system.UserVo">
+        select userid,username,loginname,loginpwd from t_user where schoolid=#{schoolid}
+        and usertype=0 and userstate=1 order by userid limit 1
+    </select>
+
+    <!--获取学校账号数量-->
+    <select id="getUserNumBySchoolId" resultType="java.lang.Integer">
+        select count(*) from t_user where schoolid=#{schoolid} and userstate=1
+    </select>
+    <!--用户选择列表-->
+    <select id="listForSel" resultType="java.util.Map">
+        select u.userid,u.username,u.loginname
+        from t_user u left join t_class_teacher ct on ct.teacherid=u.userid
+        left join t_class c on c.classid=ct.classid
+        left join t_teacher_powersb tp on tp.teacherid=u.userid
+        left join t_subject_book sb on sb.lsbid=tp.lsbid
+        where u.schoolid=#{user.schoolid} and u.userstate=1 and u.usertype=1
+        and c.gradeid=#{user.gradeid} and c.year=#{year} and c.classid=#{user.classid}
+        and sb.subjectid=#{user.subjectid}
+        <if test="user.username!=null and user.username!=''">
+            and u.username like '%${user.username}%'
+        </if>
+        group by u.userid
+        order by convert(u.username using gbk)
+    </select>
+    <!--根据班级id用户名获取学生id和数量-->
+    <select id="getUserIdByName" resultType="java.util.Map">
+        select u.userid,count(distinct u.userid)num
+        from t_user u left join t_class_student cs on u.userid=cs.studentid
+        where u.schoolid=#{schoolid} and u.userstate=1 and u.username=#{username} and cs.classid=#{classid}
+    </select>
+    <!--根据班级科目id用户名获取教师id和数量-->
+    <select id="getUserIdByName2" resultType="java.util.Map">
+        select u.userid,count(distinct u.userid)num
+        from t_user u left join t_class_teacher ct on u.userid=ct.teacherid
+        left join t_teacher_powersb tp on tp.teacherid=u.userid
+        left join t_subject_book sb on sb.lsbid=tp.lsbid
+        where u.schoolid=#{schoolid} and u.userstate=1 and u.username=#{username}
+        and ct.classid=#{classid} and sb.subjectid=#{subjectid}
+    </select>
+
+    <!--根据用户id获取用户类型-->
+    <select id="getUsertypeById" resultType="java.lang.Integer">
+        select usertype from t_user where userid=#{userid}
+    </select>
+</mapper>

suser/src/main/resources/mapper/system/UserRoleMapper..xml

@@ -0,0 +1,33 @@
+<?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.suser.mapper.system.UserRoleMapper">
+    <delete id="deleteByUserid">
+        delete from t_user_role where userid=#{userid}
+    </delete>
+
+    <!-- 根据用户id获取关联角色 -->
+    <select id="listRolesByUserid" resultType="com.xhkjedu.suser.vo.system.UserRoleVo">
+        SELECT ur.roleid,r.rolename
+        FROM t_user_role ur LEFT JOIN t_role r ON ur.roleid=r.roleid
+        WHERE ur.userid=#{userid}
+    </select>
+
+    <!-- 获取角色下用户 -->
+    <select id="listUsersByRoleid" resultType="com.xhkjedu.suser.model.system.TUserRole">
+        SELECT ur.userid,u.username FROM t_user_role ur
+        LEFT JOIN t_user u ON ur.userid=u.userid WHERE ur.roleid=#{roleid}
+    </select>
+
+    <!--获取有常用模块的用户id集合-->
+    <select id="listUserId" resultType="java.lang.Integer">
+        SELECT um.userid FROM t_user_module um LEFT JOIN t_role_module rm ON um.moduleid=rm.moduleid
+        WHERE rm.roleid=#{roleid} GROUP BY um.userid
+    </select>
+    <!--根据用户id删除没有权限的常用模块-->
+    <delete id="deleteNoRoleByUserId">
+        DELETE FROM t_user_module WHERE userid=#{userid} AND moduleid
+        NOT IN(SELECT rm.moduleid FROM t_user u LEFT JOIN t_user_role ur ON u.userid=ur.userid
+        LEFT JOIN t_role_module rm ON ur.roleid=rm.roleid
+        WHERE u.userid=#{userid} GROUP BY rm.moduleid)
+    </delete>
+</mapper>