修改班级表结构，部分查询代码

src/main/java/com/sztzjy/financial_bigdata/config/Constant.java

@@ -38,6 +38,6 @@ public class Constant {
     public static final String THEORY = "理论考试模块";
     public static final String RESOURCE = "资源中心模块";
     public static final String API_URL = "http://120.79.54.255:8889";
-//    public static final String API_URL = "http://192.168.2.29:8889";
+//    public static final String API_URL = "http://192.168.2.44:8889";
 
 }

src/main/java/com/sztzjy/financial_bigdata/controller/tea/TeaGradeManageController.java

@@ -147,8 +147,9 @@ public class TeaGradeManageController {
                                                                         @RequestParam String schoolId,
                                                                         @ApiParam("学号或姓名搜索框") @RequestParam(required = false) String keyWord,
                                                                         @RequestParam(required = false) String classId,
-                                                                        @RequestParam(required = false) String examManageId) {
-        List<TeaExamAndUserDto> list = getTeaExamAndUserDtos(schoolId, keyWord, classId, examManageId);
+                                                                        @RequestParam(required = false) String examManageId,
+                                                                        @RequestParam String systemOwner) {
+        List<TeaExamAndUserDto> list = getTeaExamAndUserDtos(schoolId, keyWord, classId, examManageId, systemOwner);
         if (list == null || list.isEmpty()) {
             return new ResultEntity<PageInfo<TeaExamAndUserDto>>(new PageInfo<>());
         }
@@ -311,8 +312,9 @@ public class TeaGradeManageController {
                            @RequestParam String schoolId,
                            @ApiParam("学号或姓名搜索框") @RequestParam(required = false) String keyWord,
                            @RequestParam(required = false) String classId,
-                           @RequestParam(required = false) String examManageId) {
-        List<TeaExamAndUserDto> list = getTeaExamAndUserDtos(schoolId, keyWord, classId, examManageId);
+                           @RequestParam(required = false) String examManageId,
+                           @RequestParam String systemOwner) {
+        List<TeaExamAndUserDto> list = getTeaExamAndUserDtos(schoolId, keyWord, classId, examManageId, systemOwner);
 
         list.sort(new TeaGradeManageServiceImpl.StuUserDtoComparator()); //比较器按得分排序
         int i = 0;
@@ -335,11 +337,11 @@ public class TeaGradeManageController {
     }
 
 
-    private List<TeaExamAndUserDto> getTeaExamAndUserDtos(String schoolId, String keyWord, String classId, String examManageId) {
+    private List<TeaExamAndUserDto> getTeaExamAndUserDtos(String schoolId, String keyWord, String classId, String examManageId, String systemOwner) {
         List<TeaExamAndUserDto> list = new ArrayList<>();
 
         // 批量查询用户信息
-        List<StuUser> stuUsers = userMapper.selectTeaExamAndUserDtos(schoolId, keyWord, classId);
+        List<StuUser> stuUsers = userMapper.selectTeaExamAndUserDtos(schoolId, keyWord, classId, systemOwner);
 
         // 构建用户id列表
         List<String> userIds = stuUsers.stream()
@@ -371,7 +373,9 @@ public class TeaGradeManageController {
         Map<String, StuStudentExamWithBLOBs> userExamMap = stuStudentExams.stream()
                 .collect(Collectors.toMap(StuStudentExamWithBLOBs::getUserid, Function.identity()));
 
-        List<StuClass> stuClass = stuClassMapper.getByPrimaryKeys(classIds);
+        StuClassExample example = new StuClassExample();
+        example.createCriteria().andClassIdIn(classIds);
+        List<StuClass> stuClass = stuClassMapper.selectByExample(example);
 
         // 构建班级ID与班级对象的映射关系
         Map<String, StuClass> classMap = stuClass.stream()

src/main/java/com/sztzjy/financial_bigdata/controller/tea/UserController.java

@@ -227,38 +227,39 @@ public class UserController {
         for (int i = 0; i < zyUserInfoList.size(); i++) {
             StuClass stuClass = new StuClass();
             ZYUserInfo zyUserInfo = zyUserInfoList.get(i);
-            Integer zyUserId = zyUserInfo.getUserId();
-            String username = zyUserInfo.getUsername();   // studentid
-            String name = zyUserInfo.getName();
-            String password = zyUserInfo.getPassword();
             Integer roleId = zyUserInfo.getRoleId();   //3教师  4学生
 
-            StuUserExample example = new StuUserExample();
-            example.createCriteria().andZyUseridEqualTo(zyUserId).andSystemOnwerEqualTo(systemOwner);
-            List<StuUser> list = stuUserMapper.selectByExample(example);
-            if (!list.isEmpty()) {
-                continue;
-            }
-            StuUser stuUser = new StuUser();
-            stuUser.setUserid(IdUtil.randomUUID());
-            stuUser.setStudentId(zyUserInfo.getUsername());
-            stuUser.setName(name);
-            stuUser.setUsername(username);
-            stuUser.setClassId(zyUserInfo.getClassId().toString());
-            stuUser.setPassword(password);
-            stuUser.setPhone(zyUserInfo.getPhone());
-            stuUser.setMajor(zyUserInfo.getMajorName());
-            stuUser.setRoleId(roleId);
-            stuUser.setSchoolId(zyUserInfo.getSchoolId().toString());
-            stuUser.setSchoolName(zyUserInfo.getSchoolName());
-
-            //新增两个参数
-            stuUser.setSystemOnwer(systemOwner);
-            stuUser.setZyUserid(zyUserInfo.getUserId());
-
-            stuUser.setStatus(0);
-            stuUser.setCreateTime(new Date());
-            users.add(stuUser);
+//            Integer zyUserId = zyUserInfo.getUserId();
+//            String username = zyUserInfo.getUsername();   // studentid
+//            String name = zyUserInfo.getName();
+//            String password = zyUserInfo.getPassword();
+
+//            StuUserExample example = new StuUserExample();
+//            example.createCriteria().andZyUseridEqualTo(zyUserId).andSystemOnwerEqualTo(systemOwner);
+//            List<StuUser> list = stuUserMapper.selectByExample(example);
+//            if (!list.isEmpty()) {
+//                continue;
+//            }
+//            StuUser stuUser = new StuUser();
+//            stuUser.setUserid(IdUtil.randomUUID());
+//            stuUser.setStudentId(zyUserInfo.getUsername());
+//            stuUser.setName(name);
+//            stuUser.setUsername(username);
+//            stuUser.setClassId(zyUserInfo.getClassId().toString());
+//            stuUser.setPassword(password);
+//            stuUser.setPhone(zyUserInfo.getPhone());
+//            stuUser.setMajor(zyUserInfo.getMajorName());
+//            stuUser.setRoleId(roleId);
+//            stuUser.setSchoolId(zyUserInfo.getSchoolId().toString());
+//            stuUser.setSchoolName(zyUserInfo.getSchoolName());
+//
+//            //新增两个参数
+//            stuUser.setSystemOnwer(systemOwner);
+//            stuUser.setZyUserid(zyUserInfo.getUserId());
+//
+//            stuUser.setStatus(0);
+//            stuUser.setCreateTime(new Date());
+//            users.add(stuUser);
 
             if (roleId == 4) {
                 stuClass.setClassId(zyUserInfo.getClassId().toString());
@@ -278,10 +279,10 @@ public class UserController {
                 }
             }
         }
-        if (users.isEmpty()) {
-            return "账号已全部存在";
-        }
-        stuUserMapper.batchInsertStudents(users);
+//        if (users.isEmpty()) {
+//            return "账号已全部存在";
+//        }
+//        stuUserMapper.batchInsertStudents(users);
         return "ok";
     }
 

src/main/java/com/sztzjy/financial_bigdata/entity/StuClass.java

@@ -10,6 +10,8 @@ import io.swagger.annotations.ApiModelProperty;
  * stu_class
  */
 public class StuClass {
+    private String id;
+
     private String classId;
 
     @ApiModelProperty("班级名称")
@@ -24,6 +26,14 @@ public class StuClass {
     @ApiModelProperty("归属系统")
     private String systemOwner;
 
+    public String getId() {
+        return id;
+    }
+
+    public void setId(String id) {
+        this.id = id == null ? null : id.trim();
+    }
+
     public String getClassId() {
         return classId;
     }

src/main/java/com/sztzjy/financial_bigdata/entity/StuClassExample.java

@@ -105,6 +105,76 @@ public class StuClassExample {
             criteria.add(new Criterion(condition, value1, value2));
         }
 
+        public Criteria andIdIsNull() {
+            addCriterion("id is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdIsNotNull() {
+            addCriterion("id is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdEqualTo(String value) {
+            addCriterion("id =", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdNotEqualTo(String value) {
+            addCriterion("id <>", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdGreaterThan(String value) {
+            addCriterion("id >", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdGreaterThanOrEqualTo(String value) {
+            addCriterion("id >=", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdLessThan(String value) {
+            addCriterion("id <", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdLessThanOrEqualTo(String value) {
+            addCriterion("id <=", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdLike(String value) {
+            addCriterion("id like", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdNotLike(String value) {
+            addCriterion("id not like", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdIn(List<String> values) {
+            addCriterion("id in", values, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdNotIn(List<String> values) {
+            addCriterion("id not in", values, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdBetween(String value1, String value2) {
+            addCriterion("id between", value1, value2, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdNotBetween(String value1, String value2) {
+            addCriterion("id not between", value1, value2, "id");
+            return (Criteria) this;
+        }
+
         public Criteria andClassIdIsNull() {
             addCriterion("class_id is null");
             return (Criteria) this;
@@ -374,6 +444,76 @@ public class StuClassExample {
             addCriterion("school_name not between", value1, value2, "schoolName");
             return (Criteria) this;
         }
+
+        public Criteria andSystemOwnerIsNull() {
+            addCriterion("system_owner is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andSystemOwnerIsNotNull() {
+            addCriterion("system_owner is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andSystemOwnerEqualTo(String value) {
+            addCriterion("system_owner =", value, "systemOwner");
+            return (Criteria) this;
+        }
+
+        public Criteria andSystemOwnerNotEqualTo(String value) {
+            addCriterion("system_owner <>", value, "systemOwner");
+            return (Criteria) this;
+        }
+
+        public Criteria andSystemOwnerGreaterThan(String value) {
+            addCriterion("system_owner >", value, "systemOwner");
+            return (Criteria) this;
+        }
+
+        public Criteria andSystemOwnerGreaterThanOrEqualTo(String value) {
+            addCriterion("system_owner >=", value, "systemOwner");
+            return (Criteria) this;
+        }
+
+        public Criteria andSystemOwnerLessThan(String value) {
+            addCriterion("system_owner <", value, "systemOwner");
+            return (Criteria) this;
+        }
+
+        public Criteria andSystemOwnerLessThanOrEqualTo(String value) {
+            addCriterion("system_owner <=", value, "systemOwner");
+            return (Criteria) this;
+        }
+
+        public Criteria andSystemOwnerLike(String value) {
+            addCriterion("system_owner like", value, "systemOwner");
+            return (Criteria) this;
+        }
+
+        public Criteria andSystemOwnerNotLike(String value) {
+            addCriterion("system_owner not like", value, "systemOwner");
+            return (Criteria) this;
+        }
+
+        public Criteria andSystemOwnerIn(List<String> values) {
+            addCriterion("system_owner in", values, "systemOwner");
+            return (Criteria) this;
+        }
+
+        public Criteria andSystemOwnerNotIn(List<String> values) {
+            addCriterion("system_owner not in", values, "systemOwner");
+            return (Criteria) this;
+        }
+
+        public Criteria andSystemOwnerBetween(String value1, String value2) {
+            addCriterion("system_owner between", value1, value2, "systemOwner");
+            return (Criteria) this;
+        }
+
+        public Criteria andSystemOwnerNotBetween(String value1, String value2) {
+            addCriterion("system_owner not between", value1, value2, "systemOwner");
+            return (Criteria) this;
+        }
     }
 
     public static class Criteria extends GeneratedCriteria {

src/main/java/com/sztzjy/financial_bigdata/mapper/StuClassMapper.java

@@ -15,7 +15,7 @@ public interface StuClassMapper {
 
     int deleteByExample(StuClassExample example);
 
-    int deleteByPrimaryKey(String classId);
+    int deleteByPrimaryKey(String id);
 
     int insert(StuClass record);
 
@@ -23,7 +23,7 @@ public interface StuClassMapper {
 
     List<StuClass> selectByExample(StuClassExample example);
 
-    StuClass selectByPrimaryKey(String classId);
+    StuClass selectByPrimaryKey(String id);
 
     int updateByExampleSelective(@Param("record") StuClass record, @Param("example") StuClassExample example);
 
@@ -40,7 +40,7 @@ public interface StuClassMapper {
     @Select("SELECT  s.class_name FROM stu_class s, stu_userinfo u WHERE s.class_id = u.class_id and s.class_id = #{classId};")
     String selectClassNameByClassId(@Param("classId")String classId);
 
-    List<StuClass> selectByPrimaryKeys(@Param("classIds") Set<String> classIds);
-
-    List<StuClass> getByPrimaryKeys(@Param("classIds") List<String> classIds);
+//    List<StuClass> selectByPrimaryKeys(@Param("classIds") Set<String> classIds);
+//
+//    List<StuClass> getByPrimaryKeys(@Param("classIds") List<String> classIds);
 }

src/main/java/com/sztzjy/financial_bigdata/mapper/StuUserMapper.java

@@ -66,7 +66,10 @@ public interface StuUserMapper {
             "</script>")
     List<StuUser> selectByPrimaryKeys(@Param("userIds") List<String> userIds);
 
-    List<StuUser> selectTeaExamAndUserDtos(@Param("schoolId")String schoolId,@Param("keyWord") String keyWord, @Param("classId")String classId);
+    List<StuUser> selectTeaExamAndUserDtos(@Param("schoolId")String schoolId,
+                                           @Param("keyWord") String keyWord,
+                                           @Param("classId")String classId,
+                                           @Param("systemOwner")String systemOwner);
 
     List<StuUser> getByNameAndStudentID(@Param("schoolId")String schoolId,
                                         @Param("keyWord") String keyWord,

src/main/java/com/sztzjy/financial_bigdata/service/tea/impl/TeaGradeManageServiceImpl.java

@@ -298,7 +298,12 @@ public class TeaGradeManageServiceImpl implements ITeaGradeManageService {
 
         // 批量获取班级信息
         Set<String> classIds = stuUsers.stream().map(StuUser::getClassId).collect(Collectors.toSet());
-        List<StuClass> stuClasses = classMapper.selectByPrimaryKeys(classIds);
+
+        StuClassExample example =new StuClassExample();
+        List<String> IDlist = new ArrayList<>(classIds);
+        example.createCriteria().andClassIdIn(IDlist).andSystemOwnerEqualTo(systemOwner);
+
+        List<StuClass> stuClasses = classMapper.selectByExample(example);
         Map<String, String> classIdToNameMap = stuClasses.stream().collect(Collectors.toMap(StuClass::getClassId, StuClass::getClassName));
 
         // 批量获取实训记录

src/main/resources/generatorConfig.xml

@@ -42,7 +42,7 @@
             <property name="enableSubPackages" value="true"/>
         </javaClientGenerator>
         <!-- 需要生成的表 -->
-<!--        <table tableName="stu_class" domainObjectName="StuClass" />-->
+        <table tableName="stu_class" domainObjectName="StuClass" />
 <!--        <table tableName="stu_error" domainObjectName="StuError" />-->
 <!--        <table tableName="stu_exam_case" domainObjectName="StuExamCase" />-->
 <!--        <table tableName="stu_student_exam" domainObjectName="StuStudentExam" />-->
@@ -55,7 +55,7 @@
 <!--        <table tableName="sys_course_chapter" domainObjectName="SysCourseChapter" />-->
 <!--        <table tableName="sys_log" domainObjectName="SysLog" />-->
 <!--        <table tableName="sys_objective_question" domainObjectName="SysObjectiveQuestion" />-->
-        <table tableName="tea_exam_manage" domainObjectName="TeaExamManage" />
+<!--        <table tableName="tea_exam_manage" domainObjectName="TeaExamManage" />-->
 <!--        <table tableName="tea_learning_statistics" domainObjectName="TeaLearningStatistics" />-->
 <!--        <table tableName="tea_resource_center" domainObjectName="TeaResourceCenter" />-->
 <!--        <table tableName="training_report" domainObjectName="TrainingReport" />-->

src/main/resources/mapper/StuUserMapper.xml

@@ -452,7 +452,8 @@
     <select id="selectTeaExamAndUserDtos" resultMap="BaseResultMap">
         select * from stu_userinfo u
         where
-        u.role_id = 4
+        system_onwer =#{systemOwner}
+        AND u.role_id = 4
         AND u.school_id = #{schoolId}
         <if test="keyWord != null and keyWord!=''">
             AND student_id like CONCAT ('%',#{keyWord},'%') or name like CONCAT ('%',#{keyWord},'%')