Merge remote-tracking branch 'cloud-schoolapi/ywx'

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

@@ -1,13 +1,11 @@
 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 com.xhkjedu.utils.N_Utils;
+import com.xhkjedu.vo.ResultVo;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
@@ -15,6 +13,7 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
 import java.util.List;
+import java.util.Map;
 
 /**
  * @ClassName TeacherRoleController
@@ -91,7 +90,7 @@ public class TeacherRoleController {
     public ResultVo listSubject(@RequestBody TeacherRoleParam trole){
         Integer teacherid = trole.getTeacherid();
         N_Utils.validation(new Object[]{teacherid,"教师id",1});
-        List<SubjectVo> subject = teacherRoleService.listSubject(teacherid);
+        List<Map> subject = teacherRoleService.listSubject(teacherid);
         return new ResultVo(0,"获取教师权限科目列表成功",subject);
     }
 
@@ -107,7 +106,7 @@ public class TeacherRoleController {
         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);
+        List<Map> subject = teacherRoleService.listBookBySubjectid(teacherid, subjectid);
         return new ResultVo(0,"获取科目下权限教材列表成功",subject);
     }
 

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

@@ -17,38 +17,15 @@ public interface ClassMapper extends TkMapper<TClass> {
     //更新班级、分组学生数量
     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

@@ -5,8 +5,6 @@ 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;
@@ -24,9 +22,6 @@ public interface ClassStudentMapper extends TkMapper<TClassStudent> {
     //获取学生行政班id
     Integer getClassIdByStuId(@Param("studentid") Integer studentid);
 
-    //获取要升级的学生列表
-    List<TClassStudent> listStudentByClassIds(@Param("classIds") String classIds);
-
     /**
      * 根据班级id和学生id获取班级学生信息
      * @Param [classid, studentid]
@@ -52,12 +47,6 @@ public interface ClassStudentMapper extends TkMapper<TClassStudent> {
     //添加
     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

@@ -31,15 +31,6 @@ public interface ClassTeacherMapper extends TkMapper<TClassTeacher> {
     //当前年份教师任教班级
     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);
 
@@ -81,10 +72,4 @@ public interface ClassTeacherMapper extends TkMapper<TClassTeacher> {
     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/GroupMapper.java

@@ -18,9 +18,4 @@ public interface GroupMapper extends TkMapper<TGroup> {
 
     //教师分组列表
     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

@@ -11,9 +11,6 @@ public interface GroupStudentMapper extends TkMapper<TGroupStudent> {
     //列表
     List<GroupStudentVo> findAll(Integer groupid);
 
-    //获取要升级的学生列表
-    List<TGroupStudent> listStudentByGroupIds(@Param("groupIds") String groupIds);
-
     //删除分组学生
     Integer deleteByGroupId(Integer groupid);
 

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

@@ -6,4 +6,7 @@ public interface SchoolMapper {
 
     //获取用户当前年份
     Integer getYearByUserId(Integer userid);
+
+    //获取学校账号数量
+    Integer getUserNumById(Integer schoolid);
 }

suser/src/main/java/com/xhkjedu/suser/mapper/liveplay/CourseMapper.java

@@ -0,0 +1,14 @@
+package com.xhkjedu.suser.mapper.liveplay;
+
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+import java.util.Map;
+
+public interface CourseMapper {
+    //更新已报学生数量
+    void updateStuNum(@Param("courseid") Integer courseid);
+
+    //行政班的所有直播课
+    List<Map> listXzCourse(Integer classid);
+}

suser/src/main/java/com/xhkjedu/suser/mapper/subjectbook/TeacherPowersbMapper.java

@@ -0,0 +1,56 @@
+package com.xhkjedu.suser.mapper.subjectbook;
+
+import com.xhkjedu.suser.base.TkMapper;
+import com.xhkjedu.suser.model.subjectbook.TTeacherPowersb;
+import org.apache.ibatis.annotations.Param;
+import org.springframework.stereotype.Repository;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * @ClassName TeacherPowersbMapper
+ * Description 教师教材权限
+ * Author WN
+ * Date 2020/7/1 19:05
+ **/
+@Repository
+public interface TeacherPowersbMapper extends TkMapper<TTeacherPowersb> {
+
+    /**
+     *功能描述  根据用户id删除教师权限教材
+     * @author WN
+     * @date 2020/7/1
+     * @param  * @param userid
+     * @return void
+     */
+    void deleteByUserid(@Param("userid")Integer userid);
+
+    /**
+     *功能描述  获取教师权限教材
+     * @author WN
+     * @date 2020/7/1
+     * @param  * @param userid
+     * @return java.util.List<com.xhkjedu.vo.subjectbook.TeacherSubjectbookVo>
+     */
+    List<Map> listLsbsByUserid(@Param("userid")Integer userid);
+
+    /**
+     * 教师权限科目
+     * @Param [teacherid]
+     * @Author ywx
+     * @Date 2020/7/24 9:26
+     * @return java.util.List<com.xhkjedu.vo.subjectbook.SubjectVo>
+     **/
+    List<Map> listSubject(@Param("teacherid") Integer teacherid);
+
+    /**
+     *功能描述 教师权限科目下，权限教材
+     * @author WN
+     * @date 2020/8/11
+     * @param  * @param teacherid
+     * @param subjectid
+     * @return java.util.List<com.xhkjedu.vo.subjectbook.LsbBookVo>
+     */
+    List<Map> listBookBySubjectid(@Param("teacherid") Integer teacherid, @Param("subjectid") String subjectid);
+}

suser/src/main/java/com/xhkjedu/suser/mapper/subjectbook/TeacherSubjectbookMapper.java

@@ -0,0 +1,15 @@
+package com.xhkjedu.suser.mapper.subjectbook;
+
+import org.apache.ibatis.annotations.Param;
+import org.springframework.stereotype.Repository;
+
+import java.util.List;
+
+@Repository
+public interface TeacherSubjectbookMapper {
+    //获取用户教材集合
+    List<String> listLsbsByUserid(Integer userid);
+
+    //删除教师收藏教材
+    Integer deleteByLsbIdTeacherId(@Param("lsbids") List<String> lsbids,@Param("teacherid") Integer teacherid);
+}

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

@@ -0,0 +1,24 @@
+package com.xhkjedu.suser.mapper.system;
+
+import com.xhkjedu.suser.base.TkMapper;
+import com.xhkjedu.suser.model.system.TMsg;
+
+public interface MsgMapper extends TkMapper<TMsg> {
+    /**
+     * 5分钟内发送短信次数
+     * @Param [userphone]
+     * @Author ywx
+     * @Date 2020/10/15 16:55
+     * @return java.lang.Integer
+     **/
+    Integer getMsgNumByUserPhone(String userphone);
+
+    /**
+     * 根据手机号和验证码获取短信信息
+     * @Param [userphone, msgcode]
+     * @Author ywx
+     * @Date 2020/10/15 17:04
+     * @return com.xhkjedu.model.system.TMsg
+     **/
+    TMsg findByUserPhoneAndCode(String userphone, Integer msgcode);
+}

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

@@ -0,0 +1,9 @@
+package com.xhkjedu.suser.mapper.system;
+
+import com.xhkjedu.suser.base.TkMapper;
+import com.xhkjedu.suser.model.system.TUserLog;
+import org.springframework.stereotype.Repository;
+
+@Repository
+public interface UserLogMapper extends TkMapper<TUserLog> {
+}

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

@@ -1,9 +1,7 @@
 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;
@@ -150,15 +148,6 @@ public interface UserMapper extends TkMapper<TUser> {
      **/
     UserVo getUserByLoginnameMac(String loginname, String mac);
 
-    /**
-     * 删除学生绑定信息
-     * @Param [schoolid]
-     * @Author ywx
-     * @Date 2020/9/24 11:42
-     * @return void
-     **/
-    void delBindmac(Integer schoolid);
-
     /**
      * 通过短信修改密码
      * @Param [user]
@@ -177,35 +166,12 @@ public interface UserMapper extends TkMapper<TUser> {
      **/
     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/UserModuleMapper.java

@@ -0,0 +1,22 @@
+package com.xhkjedu.suser.mapper.system;
+
+import com.xhkjedu.suser.base.TkMapper;
+import com.xhkjedu.suser.model.system.TUserModule;
+import org.apache.ibatis.annotations.Param;
+import org.springframework.stereotype.Repository;
+
+/**
+ * @ClassName UserModuleMapper
+ * Description 用户常用模块
+ * Author WN
+ * Date 2020/6/15 14:51
+ **/
+@Repository
+public interface UserModuleMapper extends TkMapper<TUserModule> {
+    /**
+     * @author ywx
+     * @description 根据用户id删除没有权限的常用模块
+     * @date 2020/7/9 20:55
+     **/
+    Integer deleteNoRoleByUserId(@Param("userid") Integer userid);
+}

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

@@ -1,22 +1,15 @@
 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.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.suser.vo.gradeclass.ClassVo;
 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;
 
 /**
@@ -32,19 +25,15 @@ public class ClassService {
     @Resource
     private GroupService groupService;
     @Resource
-    private ClassStudentMapper classStudentMapper;
-    @Resource
-    private GroupStudentMapper groupStudentMapper;
-    //@Resource
-    //private SchoolMapper schoolMapper;
+    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());//当前年份必须和学校年份一致
+        Integer year = schoolMapper.getYearById(model.getSchoolid());
+        model.setYear(year);//当前年份必须和学校年份一致
         classMapper.insertUseGeneratedKeys(model);
         //创建全体分组
         TGroup group = new TGroup();
@@ -59,21 +48,10 @@ public class ClassService {
 
     //删除
     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);//当前年份不能修改
@@ -85,101 +63,6 @@ public class ClassService {
         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);
@@ -189,13 +72,4 @@ public class ClassService {
     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

@@ -3,19 +3,18 @@ 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.mapper.gradeclass.SchoolMapper;
+import com.xhkjedu.suser.mapper.liveplay.CourseMapper;
 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 com.xhkjedu.utils.N_Utils;
+import com.xhkjedu.vo.ResultVo;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -44,10 +43,10 @@ public class ClassStudentService {
     private GroupStudentService groupStudentService;
     @Resource
     private ClassMapper classMapper;
-    //@Resource
-    //private SchoolMapper schoolMapper;
-    //@Resource
-    //private CourseMapper courseMapper;
+    @Resource
+    private SchoolMapper schoolMapper;
+    @Resource
+    private CourseMapper courseMapper;
 
     //批量添加
     public void batchAdd(List<TClassStudent> students) throws Exception {
@@ -135,9 +134,6 @@ public class ClassStudentService {
             }
         }
 
-        //2021年4月28日，张道剑建议，南华凯、张剑、王宁 共同确认不再复制预习导学信息
-//        guideGroupStudentMapper.copyGuideResource(model.getStudentid(), model.getClassid());//复制学生预习导学信息
-
         //把这个学生加到此行政班、提高班相关的所有直播班中
         if (classVo.getClasstype() == 1 || classVo.getClasstype() == 2) {
             saveCourseStu(model.getClassid(), model.getStudentid());
@@ -147,12 +143,12 @@ public class ClassStudentService {
 
     //把这个学生加到此行政班相关的所有直播班中
     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);
-        //}
+        List<Map> courses = courseMapper.listXzCourse(classid);
+        for (Map course : courses) {
+            Integer courseid = (Integer) course.get("courseid");
+            saveSelection((Integer) course.get("classid"), studentid, (Integer) course.get("createid"), (Integer) course.get("schoolid"));
+            courseMapper.updateStuNum(courseid);
+        }
     }
 
     //学生选课
@@ -200,10 +196,10 @@ public class ClassStudentService {
         //把这个学生从此行政班、提高班关联的所有直播班移除
         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);
-            //}
+            List<Map> courses = courseMapper.listXzCourse(classid);
+            for (Map course : courses) {
+                cancelSelection((Integer) course.get("classid"), studentid);
+            }
         }
     }
 
@@ -468,8 +464,7 @@ public class ClassStudentService {
      * @return java.util.List<com.xhkjedu.suser.vo.gradeclass.ClassVo>
      */
     public List<ClassVo> listClassByStudentId(Integer studentid){
-        //Integer year = schoolMapper.getYearByUserId(studentid);
-        Integer year=2021;
+        Integer year = schoolMapper.getYearByUserId(studentid);
         return classStudentMapper.listClassByStudentId(year,studentid);
     }
 
@@ -496,8 +491,7 @@ public class ClassStudentService {
 
     //获取学生所在年级列表
     public List<Integer> listGrade(Integer studentid) {
-        //Integer year = schoolMapper.getYearByUserId(studentid);
-        Integer year=2021;
+        Integer year = schoolMapper.getYearByUserId(studentid);
         return classStudentMapper.listGrade(studentid, year);
     }
 
@@ -508,8 +502,7 @@ public class ClassStudentService {
 
     //设置年份
     public void setYear(TClassStudent student) {
-        //Integer year = schoolMapper.getYearById(student.getSchoolid());
-        Integer year=2021;
+        Integer year = schoolMapper.getYearById(student.getSchoolid());
         student.setYear(year);
     }
 

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

@@ -2,15 +2,15 @@ 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.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 com.xhkjedu.utils.N_Utils;
+import com.xhkjedu.vo.ResultVo;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
@@ -20,7 +20,7 @@ import java.util.Map;
 /**
  * @author ywx
  * @classname TClassTeacherService
- * @description 
+ * @description
  * @date 2020/6/2 16:45
  **/
 @Service
@@ -29,8 +29,8 @@ public class ClassTeacherService {
     private ClassTeacherMapper classTeacherMapper;
     @Resource
     private UserService userService;
-    //@Resource
-    //private SchoolMapper schoolMapper;
+    @Resource
+    private SchoolMapper schoolMapper;
 
     //添加
     public Integer save(TClassTeacher model) {
@@ -90,20 +90,17 @@ public class ClassTeacherService {
     }
 
     public Integer getYear(Integer schoolid) {
-        //return schoolMapper.getYearById(schoolid);
-        return 2021;
+        return schoolMapper.getYearById(schoolid);
     }
 
     //当前年份教师任教班级
     public List<ClassVo> listTeacherClass(Integer teacher,Integer classtype){
-        //Integer year = schoolMapper.getYearByUserId(teacher);
-        Integer year=2021;
+        Integer year = schoolMapper.getYearByUserId(teacher);
         return classTeacherMapper.listTeacherClass(teacher,year,classtype);
     }
     //当前年份教师任教班级
     public List<ClassVo> listTeacherClass2(Integer teacher){
-        //Integer year = schoolMapper.getYearByUserId(teacher);
-        Integer year=2021;
+        Integer year = schoolMapper.getYearByUserId(teacher);
         return classTeacherMapper.listTeacherClass2(teacher,year);
     }
 
@@ -132,8 +129,7 @@ public class ClassTeacherService {
      * @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;
+        Integer year = schoolMapper.getYearById(schoolid);
         return classTeacherMapper.listTeachersByGradeid(schoolid,gradeid,year);
     }
 
@@ -145,8 +141,8 @@ public class ClassTeacherService {
      * @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);
+        Integer year = schoolMapper.getYearById(ctp.getSchoolid());
+        ctp.setYear(year);
         return classTeacherMapper.listTeahcersBySubjectGrade(ctp);
     }
 }

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

@@ -1,10 +1,10 @@
 package com.xhkjedu.suser.service.gradeclass;
 
 import com.xhkjedu.suser.mapper.gradeclass.GroupMapper;
-//import com.xhkjedu.suser.mapper.gradeclass.SchoolMapper;
+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 com.xhkjedu.utils.N_Utils;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
@@ -13,7 +13,7 @@ import java.util.List;
 /**
  * @author ywx
  * @classname GroupService
- * @description 
+ * @description
  * @date 2020/6/2 17:26
  **/
 @Service
@@ -22,15 +22,15 @@ public class GroupService {
     private GroupMapper groupMapper;
     @Resource
     private GroupStudentService groupStudentService;
-    //@Resource
-    //private SchoolMapper schoolMapper;
+    @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())){
+        if (N_Utils.isListNotEmpty(model.getStudents())) {
             model.setGroupid(model.getId());
             groupStudentService.batchSave(model);//批量添加分组学生
         }
@@ -68,8 +68,7 @@ public class GroupService {
 
     //教师分组列表
     public List<ClassGroupVo> teacherList(Integer teacherid) {
-        //Integer year = schoolMapper.getYearByUserId(teacherid);
-        Integer year=2022;
+        Integer year = schoolMapper.getYearByUserId(teacherid);
         return groupMapper.teacherList(teacherid, year);
     }
 }

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

@@ -1,21 +1,20 @@
 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.gradeclass.SchoolMapper;
+import com.xhkjedu.suser.mapper.subjectbook.TeacherPowersbMapper;
+import com.xhkjedu.suser.mapper.subjectbook.TeacherSubjectbookMapper;
+import com.xhkjedu.suser.mapper.system.UserModuleMapper;
 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.TeacherRoleVo;
 import com.xhkjedu.suser.vo.system.UserRoleVo;
+import com.xhkjedu.utils.N_Utils;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -26,6 +25,7 @@ import org.springframework.util.CollectionUtils;
 import javax.annotation.Resource;
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Map;
 
 /**
  * @ClassName TeacherRoleService
@@ -42,7 +42,7 @@ public class TeacherRoleService {
     @Autowired
     private UserRoleMapper userRoleMapper;
 
-    /*@Autowired
+    @Autowired
     private TeacherPowersbMapper teacherPowersbMapper;
 
     @Resource
@@ -51,7 +51,7 @@ public class TeacherRoleService {
     @Autowired
     private UserModuleMapper userModuleMapper;
     @Resource
-    private SchoolMapper schoolMapper;*/
+    private SchoolMapper schoolMapper;
 
     /**
      *功能描述  保存教师设置权限
@@ -63,15 +63,15 @@ public class TeacherRoleService {
     @Transactional(rollbackFor = Exception.class)
     public void save(TeacherRoleParam trole) throws Exception {
         try {
-            //Integer year = schoolMapper.getYearByUserId(trole.getTeacherid());
-            //trole.setYear(year);
+            Integer year = schoolMapper.getYearByUserId(trole.getTeacherid());
+            trole.setYear(year);
             int timestamp = N_Utils.getSecondTimestamp();
             //处理用户角色
             // 先删除
             userRoleMapper.deleteByUserid(trole.getTeacherid());
-            if(!CollectionUtils.isEmpty(trole.getRolelist())){
+            if (!CollectionUtils.isEmpty(trole.getRolelist())) {
                 List<TUserRole> rolelst = new ArrayList<>();
-                for(Integer roleid : trole.getRolelist()){
+                for (Integer roleid : trole.getRolelist()) {
                     TUserRole ur = new TUserRole();
                     ur.setUserid(trole.getTeacherid());
                     ur.setRoleid(roleid);
@@ -86,19 +86,19 @@ public class TeacherRoleService {
             }
 
             //根据用户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())){
+            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()){
+                for (String lsbid : trole.getLsblist()) {
                     TTeacherPowersb tp = new TTeacherPowersb();
                     tp.setTeacherid(trole.getTeacherid());
                     tp.setLsbid(lsbid);
@@ -109,7 +109,7 @@ public class TeacherRoleService {
                     tpowerlist.add(tp);
                 }
 
-                //teacherPowersbMapper.insertList(tpowerlist);
+                teacherPowersbMapper.insertList(tpowerlist);
             }
 
             //处理用户班级
@@ -139,18 +139,18 @@ public class TeacherRoleService {
     }
 
     //获取用户权限--角色、班级、教材 集合
-    public TeacherRoleVo getTeacherRoles(TeacherRoleParam trparam){
-        //Integer year = schoolMapper.getYearByUserId(trparam.getTeacherid());
-        //trparam.setYear(year);
+    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());
+        List<ClassVo> classids = classTeacherMapper.listClassesByUserid(trparam.getTeacherid(), trparam.getYear(), trparam.getClasstype());
+        List<Map> lsbids = teacherPowersbMapper.listLsbsByUserid(trparam.getTeacherid());
 
         trvo.setRolelist(roleids);
         trvo.setClasslist(classids);
-        //trvo.setLsblist(lsbids);
+        trvo.setLsblist(lsbids);
 
         return trvo;
     }
@@ -165,34 +165,34 @@ public class TeacherRoleService {
     public TeacherRoleVo listBook(Integer teacherid) {
         TeacherRoleVo trvo = new TeacherRoleVo();
         //获取已设置角色集合
-        //List<TeacherSubjectbookVo> lsbids = teacherPowersbMapper.listLsbsByUserid(teacherid);
-        //trvo.setLsblist(lsbids);
+        List<Map> lsbids = teacherPowersbMapper.listLsbsByUserid(teacherid);
+        trvo.setLsblist(lsbids);
         return trvo;
     }
 
     /**
      * 教师权限科目
+     *
+     * @return java.util.List<com.xhkjedu.suser.vo.subjectbook.SubjectVo>
      * @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;
+    public List<Map> listSubject(Integer teacherid) {
+        return teacherPowersbMapper.listSubject(teacherid);
     }
 
     /**
-     *功能描述 教师权限科目下，权限教材
-     * @author WN
-     * @date 2020/8/11
-     * @param  * @param teacherid
+     * 功能描述 教师权限科目下，权限教材
+     *
+     * @param *         @param teacherid
      * @param subjectid
      * @return java.util.List<com.xhkjedu.suser.vo.subjectbook.LsbBookVo>
+     * @author WN
+     * @date 2020/8/11
      */
-    public List<LsbBookVo> listBookBySubjectid(Integer teacherid,String subjectid){
-        //return teacherPowersbMapper.listBookBySubjectid(teacherid,subjectid);
-        return null;
+    public List<Map> listBookBySubjectid(Integer teacherid, String subjectid) {
+        return teacherPowersbMapper.listBookBySubjectid(teacherid, subjectid);
     }
 
     /**
@@ -203,8 +203,8 @@ public class TeacherRoleService {
      * @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);
+        Integer year = schoolMapper.getYearByUserId(role.getTeacherid());
+        role.setYear(year);
         return classTeacherMapper.listGradeClassesByUserid(role);
     }
 
@@ -216,8 +216,8 @@ public class TeacherRoleService {
      * @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);
+        Integer year = schoolMapper.getYearByUserId(role.getTeacherid());
+        role.setYear(year);
         return classTeacherMapper.listGradeClassesByUserid2(role);
     }
 }

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

@@ -3,25 +3,27 @@ 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.gradeclass.SchoolMapper;
+import com.xhkjedu.suser.mapper.system.MsgMapper;
+import com.xhkjedu.suser.mapper.system.UserLogMapper;
 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 com.xhkjedu.utils.DESUtils;
+import com.xhkjedu.utils.DatesUtil;
+import com.xhkjedu.utils.MD5;
+import com.xhkjedu.utils.N_Utils;
+import com.xhkjedu.utils.PageUtil;
+import com.xhkjedu.vo.PageResult;
+import com.xhkjedu.vo.ResultVo;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -30,7 +32,6 @@ 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;
@@ -49,12 +50,12 @@ public class UserService extends JedisUtil {
 
     @Autowired
     private UserMapper userMapper;
-    /*@Autowired
-    private UserLogService userLogService;
+    @Autowired
+    private UserLogMapper userLogMapper;
     @Resource
-    private MsgService msgService;
+    private MsgMapper msgMapper;
     @Resource
-    private SchoolMapper schoolMapper;*/
+    private SchoolMapper schoolMapper;
 
     /**
      *功能描述  根据登录名和密码获取用户信息
@@ -70,8 +71,6 @@ public class UserService extends JedisUtil {
         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());
@@ -99,24 +98,6 @@ public class UserService extends JedisUtil {
         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;
@@ -125,8 +106,6 @@ public class UserService extends JedisUtil {
         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());
@@ -167,8 +146,6 @@ public class UserService extends JedisUtil {
         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());
@@ -258,7 +235,7 @@ public class UserService extends JedisUtil {
             userLog.setUltype(user.getUltype());
             userLog.setVersionnum(user.getVersionnum());
             userLog.setLogtime(N_Utils.getSecondTimestamp());
-            userMapper.saveUserLog(userLog);
+            userLogMapper.insertSelective(userLog);
         } catch (Exception e) {
             log.error("添加登录日志失败:" + e.getMessage());
             result = new ResultVo(1, "保存失败");
@@ -275,18 +252,17 @@ public class UserService extends JedisUtil {
      **/
     public ResultVo save(TUser user) {
         Integer schoolid = user.getSchoolid();
-        /*Integer usernum = schoolMapper.getUserNumById(schoolid);
+        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());
     }
@@ -409,11 +385,6 @@ public class UserService extends JedisUtil {
         }
     }
 
-    public Integer getNumByLoginName(String loginname) {
-        Integer num = userMapper.checkLoginName(loginname);
-        return num;
-    }
-
     /**
      * 根据登录账号获取用户详情
      * @Param [loginname]
@@ -434,14 +405,14 @@ public class UserService extends JedisUtil {
      **/
     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("账号数量已超限，请联系管理员");
-        //    }
-        //}
+        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);
     }
 
@@ -471,10 +442,6 @@ public class UserService extends JedisUtil {
             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<>();
             // 以下教师信息已存在
@@ -603,30 +570,30 @@ public class UserService extends JedisUtil {
      * @return boolean
      **/
     private boolean generateCode(String userphone, String templateCode) {
-        //Integer msgNum = msgService.getMsgNumByUserPhone(userphone);//5分钟内发送短信次数
-        //if (msgNum != 0) return true;
+        Integer msgNum = msgMapper.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+"，您正在登录，若非本人操作，请勿泄露。";
+        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);
+        TMsg msg = new TMsg();
+        msg.setUserphone(userphone);
+        msg.setMsgcode(messageCode);
+        msg.setMsgtxt(msgtxt);
+        msg.setCreatetime(N_Utils.getSecondTimestamp());
+        msgMapper.insertSelective(msg);
         return false;
     }
 
@@ -653,10 +620,10 @@ public class UserService extends JedisUtil {
      * @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,"验证码失效");
+        TMsg msg = msgMapper.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;
     }
 
@@ -743,8 +710,7 @@ public class UserService extends JedisUtil {
 
     //用户选择列表
     public List<Map> listForSel(AssessParams user) {
-        //Integer year = schoolMapper.getYearById(user.getSchoolid());
-        Integer year=2021;
+        Integer year = schoolMapper.getYearById(user.getSchoolid());
         return userMapper.listForSel(user, year);
     }
 

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

@@ -1,26 +0,0 @@
-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

@@ -1,22 +0,0 @@
-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

@@ -1,40 +0,0 @@
-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/TeacherRoleVo.java

@@ -1,11 +1,11 @@
 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;
+import java.util.Map;
 
 /**
  * @ClassName TeacherRoleVo
@@ -19,7 +19,7 @@ public class TeacherRoleVo {
     private List<UserRoleVo> rolelist = new ArrayList<>();
 
     //教材
-    private List<TeacherSubjectbookVo> lsblist = new ArrayList<>();
+    private List<Map> lsblist = new ArrayList<>();
 
     //班级
     private List<ClassVo> classlist = new ArrayList<>();

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

@@ -35,18 +35,6 @@
         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
@@ -54,12 +42,6 @@
         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
@@ -73,26 +55,8 @@
         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

@@ -45,10 +45,6 @@
         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
@@ -117,27 +113,6 @@
         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

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

@@ -48,10 +48,6 @@
         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>
@@ -157,14 +153,6 @@
         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">
@@ -186,10 +174,6 @@
     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>
 
 
 

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

@@ -51,16 +51,8 @@
         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

@@ -8,10 +8,6 @@
         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}

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

@@ -10,4 +10,8 @@
         select s.year from t_user u left join t_school s on u.schoolid=s.schoolid
         where u.userid=#{userid}
     </select>
+    <!--获取学校账号数量-->
+    <select id="getUserNumById" resultType="java.lang.Integer">
+        select usernum from t_school where schoolid=#{schoolid}
+    </select>
 </mapper>

suser/src/main/resources/mapper/liveplay/CourseMapper.xml

@@ -0,0 +1,16 @@
+<?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.liveplay.CourseMapper">
+    <!--更新已报学生数量-->
+    <update id="updateStuNum">
+        update l_course c set c.stunum=(select tc.classnum from t_class tc where tc.classid=c.classid)
+        where c.courseid=#{courseid}
+    </update>
+    <!--行政班的所有直播课-->
+    <select id="listXzCourse" resultType="java.util.Map">
+        select c.courseid,c.classid,c.createid,c.schoolid
+        from l_course c left join l_course_class cc on cc.courseid=c.courseid
+        where c.coursetype=1 and cc.classid=#{classid}
+        group by c.courseid
+    </select>
+</mapper>

suser/src/main/resources/mapper/subjectbook/TeacherPowersbMapper.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.subjectbook.TeacherPowersbMapper">
+    <!-- 根据用户id删除用户教材 -->
+    <delete id="deleteByUserid">
+        delete from t_teacher_powersb where teacherid=#{userid}
+    </delete>
+    <!-- 用户id获取教材集合 -->
+    <select id="listLsbsByUserid" resultType="java.util.Map">
+        SELECT tsb.lsbid,sb.subjectid,s.subjectname,sb.lsbname,sb.coverpath,sb.versionid,v.versionname
+        FROM t_teacher_powersb tsb LEFT JOIN t_subject_book sb ON tsb.lsbid=sb.lsbid
+        LEFT JOIN t_subject s ON sb.subjectid=s.subjectid
+        LEFT JOIN t_version v ON sb.versionid=v.versionid
+        WHERE tsb.teacherid=#{userid} and (sb.belong=1 or sb.schoolid=tsb.schoolid)
+        ORDER BY s.subjectorder,v.versionorder,sb.lsborder
+    </select>
+    <!--教师权限科目-->
+    <select id="listSubject" resultType="java.util.Map">
+        SELECT sb.subjectid,s.subjectname,s.level
+        FROM t_teacher_powersb tsb LEFT JOIN t_subject_book sb ON tsb.lsbid=sb.lsbid
+        LEFT JOIN t_subject s ON sb.subjectid=s.subjectid
+        WHERE tsb.teacherid=#{teacherid} and (sb.belong=1 or sb.schoolid=tsb.schoolid)
+        GROUP BY s.subjectid ORDER BY s.subjectorder
+    </select>
+
+    <select id="listBookBySubjectid" resultType="java.util.Map">
+        SELECT tsb.lsbid,sb.lsbname,sb.versionid,v.versionname
+         FROM t_teacher_powersb tsb LEFT JOIN t_subject_book sb ON tsb.lsbid=sb.lsbid
+         LEFT JOIN t_version v ON sb.versionid=v.versionid
+         WHERE tsb.teacherid=#{teacherid} AND sb.subjectid=#{subjectid} and (sb.belong=1 or sb.schoolid=tsb.schoolid)
+         GROUP BY sb.lsbid ORDER BY v.versionorder,sb.lsborder
+    </select>
+</mapper>

suser/src/main/resources/mapper/subjectbook/TeacherSubjectBookMapper.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.subjectbook.TeacherSubjectbookMapper">
+    <!-- 用户id获取教材集合 -->
+    <select id="listLsbsByUserid" resultType="java.lang.String">
+        SELECT lsbid FROM t_teacher_subjectbook WHERE teacherid=#{userid}
+    </select>
+    <!--删除教师收藏教材-->
+    <delete id="deleteByLsbIdTeacherId">
+        delete from t_teacher_subjectbook
+        where teacherid=#{teacherid} and (
+        <foreach collection="lsbids" item="lsbid" separator="or">
+            lsbid=#{lsbid}
+        </foreach>
+        )
+    </delete>
+</mapper>

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

@@ -0,0 +1,13 @@
+<?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.MsgMapper">
+    <!-- 5分钟内发送短信次数 -->
+    <select id="getMsgNumByUserPhone" resultType="java.lang.Integer">
+        select count(*) from t_msg where userphone=#{userphone} and createtime>=UNIX_TIMESTAMP(now())-300
+    </select>
+    <!--根据手机号和验证码获取短信信息-->
+    <select id="findByUserPhoneAndCode" resultType="com.xhkjedu.suser.model.system.TMsg">
+        select msgid,msgtxt,msgcode,userphone,createtime
+        from t_msg where userphone=#{userphone} and msgcode=#{msgcode} limit 1
+    </select>
+</mapper>

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

@@ -70,13 +70,6 @@
     <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}
@@ -135,10 +128,6 @@
     <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}
@@ -153,25 +142,6 @@
         )
     </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
@@ -192,12 +162,8 @@
         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
@@ -212,11 +178,4 @@
     <select id="getUsertypeById" resultType="java.lang.Integer">
         select usertype from t_user where userid=#{userid}
     </select>
-    <!--添加登录日志-->
-    <insert id="saveUserLog">
-        INSERT INTO t_user_log (userid, username, loginname, loginstate, logtime
-        , logip, logaddress, ultype, versionnum, logtxt, schoolid) VALUES
-        (#{log.userid},#{log.username},#{log.loginname},#{log.loginstate},#{log.logtime}
-        ,#{log.logip},#{log.logaddress},#{log.ultype},#{log.versionnum},#{log.logtxt},#{log.schoolid});
-    </insert>
 </mapper>

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

@@ -0,0 +1,11 @@
+<?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.UserModuleMapper">
+    <!--根据用户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>