From 934a0afa34cdef964fec61cd3ea5735215eeddc3 Mon Sep 17 00:00:00 2001 From: xiaoCJ <406612557@qq.com> Date: Mon, 28 Oct 2024 10:29:37 +0800 Subject: [PATCH 1/6] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=80=81=E5=B8=88?= =?UTF-8?q?=E7=AB=AF=E7=8F=AD=E7=BA=A7=E4=B8=8B=E6=8B=89=E6=A1=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../sztzjy/financial_bigdata/controller/tea/UserController.java | 1 + 1 file changed, 1 insertion(+) diff --git a/src/main/java/com/sztzjy/financial_bigdata/controller/tea/UserController.java b/src/main/java/com/sztzjy/financial_bigdata/controller/tea/UserController.java index 3a198c0..11b9341 100644 --- a/src/main/java/com/sztzjy/financial_bigdata/controller/tea/UserController.java +++ b/src/main/java/com/sztzjy/financial_bigdata/controller/tea/UserController.java @@ -265,6 +265,7 @@ public class UserController { stuClass.setClassName(zyUserInfo.getClassName()); stuClass.setSchoolName(zyUserInfo.getSchoolName()); stuClass.setCreateTime(new Date()); + stuClass.setSystemOwner(systemOwner); map.put(zyUserInfo.getClassId().toString(), stuClass); } } From 8a15424ac0dea65bb347e1d6b85737e7e14b2b5b Mon Sep 17 00:00:00 2001 From: xiaoCJ <406612557@qq.com> Date: Mon, 28 Oct 2024 12:29:17 +0800 Subject: [PATCH 2/6] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=8F=AD=E7=BA=A7?= =?UTF-8?q?=E8=A1=A8=E7=BB=93=E6=9E=84=EF=BC=8C=E9=83=A8=E5=88=86=E6=9F=A5?= =?UTF-8?q?=E8=AF=A2=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../financial_bigdata/config/Constant.java | 2 +- .../tea/TeaGradeManageController.java | 18 ++- .../controller/tea/UserController.java | 69 ++++----- .../financial_bigdata/entity/StuClass.java | 10 ++ .../entity/StuClassExample.java | 140 ++++++++++++++++++ .../mapper/StuClassMapper.java | 10 +- .../mapper/StuUserMapper.java | 5 +- .../tea/impl/TeaGradeManageServiceImpl.java | 7 +- src/main/resources/generatorConfig.xml | 4 +- src/main/resources/mapper/StuUserMapper.xml | 3 +- 10 files changed, 216 insertions(+), 52 deletions(-) diff --git a/src/main/java/com/sztzjy/financial_bigdata/config/Constant.java b/src/main/java/com/sztzjy/financial_bigdata/config/Constant.java index 55615ed..476f56c 100644 --- a/src/main/java/com/sztzjy/financial_bigdata/config/Constant.java +++ b/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"; } diff --git a/src/main/java/com/sztzjy/financial_bigdata/controller/tea/TeaGradeManageController.java b/src/main/java/com/sztzjy/financial_bigdata/controller/tea/TeaGradeManageController.java index e4d8575..9d1c885 100644 --- a/src/main/java/com/sztzjy/financial_bigdata/controller/tea/TeaGradeManageController.java +++ b/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 list = getTeaExamAndUserDtos(schoolId, keyWord, classId, examManageId); + @RequestParam(required = false) String examManageId, + @RequestParam String systemOwner) { + List list = getTeaExamAndUserDtos(schoolId, keyWord, classId, examManageId, systemOwner); if (list == null || list.isEmpty()) { return new ResultEntity>(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 list = getTeaExamAndUserDtos(schoolId, keyWord, classId, examManageId); + @RequestParam(required = false) String examManageId, + @RequestParam String systemOwner) { + List list = getTeaExamAndUserDtos(schoolId, keyWord, classId, examManageId, systemOwner); list.sort(new TeaGradeManageServiceImpl.StuUserDtoComparator()); //比较器按得分排序 int i = 0; @@ -335,11 +337,11 @@ public class TeaGradeManageController { } - private List getTeaExamAndUserDtos(String schoolId, String keyWord, String classId, String examManageId) { + private List getTeaExamAndUserDtos(String schoolId, String keyWord, String classId, String examManageId, String systemOwner) { List list = new ArrayList<>(); // 批量查询用户信息 - List stuUsers = userMapper.selectTeaExamAndUserDtos(schoolId, keyWord, classId); + List stuUsers = userMapper.selectTeaExamAndUserDtos(schoolId, keyWord, classId, systemOwner); // 构建用户id列表 List userIds = stuUsers.stream() @@ -371,7 +373,9 @@ public class TeaGradeManageController { Map userExamMap = stuStudentExams.stream() .collect(Collectors.toMap(StuStudentExamWithBLOBs::getUserid, Function.identity())); - List stuClass = stuClassMapper.getByPrimaryKeys(classIds); + StuClassExample example = new StuClassExample(); + example.createCriteria().andClassIdIn(classIds); + List stuClass = stuClassMapper.selectByExample(example); // 构建班级ID与班级对象的映射关系 Map classMap = stuClass.stream() diff --git a/src/main/java/com/sztzjy/financial_bigdata/controller/tea/UserController.java b/src/main/java/com/sztzjy/financial_bigdata/controller/tea/UserController.java index 11b9341..0b07ab5 100644 --- a/src/main/java/com/sztzjy/financial_bigdata/controller/tea/UserController.java +++ b/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 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 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"; } diff --git a/src/main/java/com/sztzjy/financial_bigdata/entity/StuClass.java b/src/main/java/com/sztzjy/financial_bigdata/entity/StuClass.java index aaaf3a5..06893c0 100644 --- a/src/main/java/com/sztzjy/financial_bigdata/entity/StuClass.java +++ b/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; } diff --git a/src/main/java/com/sztzjy/financial_bigdata/entity/StuClassExample.java b/src/main/java/com/sztzjy/financial_bigdata/entity/StuClassExample.java index 38b95f3..a5297d1 100644 --- a/src/main/java/com/sztzjy/financial_bigdata/entity/StuClassExample.java +++ b/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 values) { + addCriterion("id in", values, "id"); + return (Criteria) this; + } + + public Criteria andIdNotIn(List 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 values) { + addCriterion("system_owner in", values, "systemOwner"); + return (Criteria) this; + } + + public Criteria andSystemOwnerNotIn(List 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 { diff --git a/src/main/java/com/sztzjy/financial_bigdata/mapper/StuClassMapper.java b/src/main/java/com/sztzjy/financial_bigdata/mapper/StuClassMapper.java index dd7853c..c45117d 100644 --- a/src/main/java/com/sztzjy/financial_bigdata/mapper/StuClassMapper.java +++ b/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 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 selectByPrimaryKeys(@Param("classIds") Set classIds); - - List getByPrimaryKeys(@Param("classIds") List classIds); +// List selectByPrimaryKeys(@Param("classIds") Set classIds); +// +// List getByPrimaryKeys(@Param("classIds") List classIds); } \ No newline at end of file diff --git a/src/main/java/com/sztzjy/financial_bigdata/mapper/StuUserMapper.java b/src/main/java/com/sztzjy/financial_bigdata/mapper/StuUserMapper.java index 17611bf..03d985a 100644 --- a/src/main/java/com/sztzjy/financial_bigdata/mapper/StuUserMapper.java +++ b/src/main/java/com/sztzjy/financial_bigdata/mapper/StuUserMapper.java @@ -66,7 +66,10 @@ public interface StuUserMapper { "") List selectByPrimaryKeys(@Param("userIds") List userIds); - List selectTeaExamAndUserDtos(@Param("schoolId")String schoolId,@Param("keyWord") String keyWord, @Param("classId")String classId); + List selectTeaExamAndUserDtos(@Param("schoolId")String schoolId, + @Param("keyWord") String keyWord, + @Param("classId")String classId, + @Param("systemOwner")String systemOwner); List getByNameAndStudentID(@Param("schoolId")String schoolId, @Param("keyWord") String keyWord, diff --git a/src/main/java/com/sztzjy/financial_bigdata/service/tea/impl/TeaGradeManageServiceImpl.java b/src/main/java/com/sztzjy/financial_bigdata/service/tea/impl/TeaGradeManageServiceImpl.java index 0483b1d..9f6abcb 100644 --- a/src/main/java/com/sztzjy/financial_bigdata/service/tea/impl/TeaGradeManageServiceImpl.java +++ b/src/main/java/com/sztzjy/financial_bigdata/service/tea/impl/TeaGradeManageServiceImpl.java @@ -298,7 +298,12 @@ public class TeaGradeManageServiceImpl implements ITeaGradeManageService { // 批量获取班级信息 Set classIds = stuUsers.stream().map(StuUser::getClassId).collect(Collectors.toSet()); - List stuClasses = classMapper.selectByPrimaryKeys(classIds); + + StuClassExample example =new StuClassExample(); + List IDlist = new ArrayList<>(classIds); + example.createCriteria().andClassIdIn(IDlist).andSystemOwnerEqualTo(systemOwner); + + List stuClasses = classMapper.selectByExample(example); Map classIdToNameMap = stuClasses.stream().collect(Collectors.toMap(StuClass::getClassId, StuClass::getClassName)); // 批量获取实训记录 diff --git a/src/main/resources/generatorConfig.xml b/src/main/resources/generatorConfig.xml index e10bec8..8d32ca3 100644 --- a/src/main/resources/generatorConfig.xml +++ b/src/main/resources/generatorConfig.xml @@ -42,7 +42,7 @@ - + @@ -55,7 +55,7 @@ -
+ diff --git a/src/main/resources/mapper/StuUserMapper.xml b/src/main/resources/mapper/StuUserMapper.xml index 85d8d20..bad8766 100644 --- a/src/main/resources/mapper/StuUserMapper.xml +++ b/src/main/resources/mapper/StuUserMapper.xml @@ -452,7 +452,8 @@ select @@ -87,11 +88,11 @@ select from stu_class - where class_id = #{classId,jdbcType=VARCHAR} + where id = #{id,jdbcType=VARCHAR} delete from stu_class - where class_id = #{classId,jdbcType=VARCHAR} + where id = #{id,jdbcType=VARCHAR} delete from stu_class @@ -100,14 +101,19 @@ - insert into stu_class (class_id, class_name, create_time, - school_name, system_owner) - values (#{classId,jdbcType=VARCHAR}, #{className,jdbcType=VARCHAR}, #{createTime,jdbcType=TIMESTAMP}, - #{schoolName,jdbcType=VARCHAR}, #{systemOwner,jdbcType=VARCHAR}) + insert into stu_class (id, class_id, class_name, + create_time, school_name, system_owner + ) + values (#{id,jdbcType=VARCHAR}, #{classId,jdbcType=VARCHAR}, #{className,jdbcType=VARCHAR}, + #{createTime,jdbcType=TIMESTAMP}, #{schoolName,jdbcType=VARCHAR}, #{systemOwner,jdbcType=VARCHAR} + ) insert into stu_class + + id, + class_id, @@ -125,6 +131,9 @@ + + #{id,jdbcType=VARCHAR}, + #{classId,jdbcType=VARCHAR}, @@ -151,6 +160,9 @@ update stu_class + + id = #{record.id,jdbcType=VARCHAR}, + class_id = #{record.classId,jdbcType=VARCHAR}, @@ -173,7 +185,8 @@ update stu_class - set class_id = #{record.classId,jdbcType=VARCHAR}, + set id = #{record.id,jdbcType=VARCHAR}, + class_id = #{record.classId,jdbcType=VARCHAR}, class_name = #{record.className,jdbcType=VARCHAR}, create_time = #{record.createTime,jdbcType=TIMESTAMP}, school_name = #{record.schoolName,jdbcType=VARCHAR}, @@ -185,6 +198,9 @@ update stu_class + + class_id = #{classId,jdbcType=VARCHAR}, + class_name = #{className,jdbcType=VARCHAR}, @@ -198,32 +214,33 @@ system_owner = #{systemOwner,jdbcType=VARCHAR}, - where class_id = #{classId,jdbcType=VARCHAR} + where id = #{id,jdbcType=VARCHAR} update stu_class - set class_name = #{className,jdbcType=VARCHAR}, + set class_id = #{classId,jdbcType=VARCHAR}, + class_name = #{className,jdbcType=VARCHAR}, create_time = #{createTime,jdbcType=TIMESTAMP}, school_name = #{schoolName,jdbcType=VARCHAR}, system_owner = #{systemOwner,jdbcType=VARCHAR} - where class_id = #{classId,jdbcType=VARCHAR} + where id = #{id,jdbcType=VARCHAR} - + + + + + + + + - + + + + + + + + \ No newline at end of file From f22edb40846681b293e2efb9d9eab15c70886d3b Mon Sep 17 00:00:00 2001 From: xiaoCJ <406612557@qq.com> Date: Mon, 28 Oct 2024 14:38:34 +0800 Subject: [PATCH 4/6] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=8F=AD=E7=BA=A7?= =?UTF-8?q?=E8=A1=A8=E7=BB=93=E6=9E=84=EF=BC=8C=E9=83=A8=E5=88=86=E6=9F=A5?= =?UTF-8?q?=E8=AF=A2=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/tea/UserController.java | 71 ++++++++++--------- 1 file changed, 36 insertions(+), 35 deletions(-) diff --git a/src/main/java/com/sztzjy/financial_bigdata/controller/tea/UserController.java b/src/main/java/com/sztzjy/financial_bigdata/controller/tea/UserController.java index 0b07ab5..ba10401 100644 --- a/src/main/java/com/sztzjy/financial_bigdata/controller/tea/UserController.java +++ b/src/main/java/com/sztzjy/financial_bigdata/controller/tea/UserController.java @@ -229,39 +229,40 @@ public class UserController { ZYUserInfo zyUserInfo = zyUserInfoList.get(i); Integer roleId = zyUserInfo.getRoleId(); //3教师 4学生 -// 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 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 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.setId(IdUtil.randomUUID()); stuClass.setClassId(zyUserInfo.getClassId().toString()); stuClass.setClassName(zyUserInfo.getClassName()); stuClass.setSchoolName(zyUserInfo.getSchoolName()); @@ -279,10 +280,10 @@ public class UserController { } } } -// if (users.isEmpty()) { -// return "账号已全部存在"; -// } -// stuUserMapper.batchInsertStudents(users); + if (users.isEmpty()) { + return "账号已全部存在"; + } + stuUserMapper.batchInsertStudents(users); return "ok"; } From 3686624e5bffab3cb43dcbda79588167831bdbb1 Mon Sep 17 00:00:00 2001 From: xiaoCJ <406612557@qq.com> Date: Mon, 28 Oct 2024 17:24:21 +0800 Subject: [PATCH 5/6] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=8F=AD=E7=BA=A7?= =?UTF-8?q?=E8=A1=A8=E7=BB=93=E6=9E=84=EF=BC=8C=E9=83=A8=E5=88=86=E6=9F=A5?= =?UTF-8?q?=E8=AF=A2=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/stu/StuIndexController.java | 4 +++- .../controller/tea/TeaExamManageController.java | 7 +++++-- .../tea/TeaGradeManageController.java | 17 +++++++++++++---- 3 files changed, 21 insertions(+), 7 deletions(-) diff --git a/src/main/java/com/sztzjy/financial_bigdata/controller/stu/StuIndexController.java b/src/main/java/com/sztzjy/financial_bigdata/controller/stu/StuIndexController.java index ac0f0f1..937e723 100644 --- a/src/main/java/com/sztzjy/financial_bigdata/controller/stu/StuIndexController.java +++ b/src/main/java/com/sztzjy/financial_bigdata/controller/stu/StuIndexController.java @@ -127,7 +127,9 @@ public class StuIndexController { StuUserDto stuUserDto = new StuUserDto(); BeanUtils.copyProperties(stuUser, stuUserDto); - StuClass stuClass = stuClassMapper.selectByPrimaryKey(stuUser.getClassId()); + StuClassExample example =new StuClassExample(); + List stuClassList = stuClassMapper.selectByExample(example); + StuClass stuClass = stuClassList.get(0); stuUserDto.setClassName(stuClass.getClassName()); stuUserDto.setIpPlace(sysLoginLogs.get(0).getIpAddress()); stuUserDto.setLastIP(sysLoginLogs.get(0).getLoginIp()); diff --git a/src/main/java/com/sztzjy/financial_bigdata/controller/tea/TeaExamManageController.java b/src/main/java/com/sztzjy/financial_bigdata/controller/tea/TeaExamManageController.java index b4455d0..680dd3a 100644 --- a/src/main/java/com/sztzjy/financial_bigdata/controller/tea/TeaExamManageController.java +++ b/src/main/java/com/sztzjy/financial_bigdata/controller/tea/TeaExamManageController.java @@ -154,9 +154,12 @@ public class TeaExamManageController { list.add(s); } } + + StuClassExample example =new StuClassExample(); + example.createCriteria().andClassIdIn(list); + List stuClasslist = stuClassMapper.selectByExample(example); String s = ""; - for (String id : list) { - StuClass stuClass = stuClassMapper.selectByPrimaryKey(id); + for (StuClass stuClass : stuClasslist) { s += stuClass.getClassName() + ","; } // 去掉最后一个逗号 diff --git a/src/main/java/com/sztzjy/financial_bigdata/controller/tea/TeaGradeManageController.java b/src/main/java/com/sztzjy/financial_bigdata/controller/tea/TeaGradeManageController.java index 9d1c885..ffc1384 100644 --- a/src/main/java/com/sztzjy/financial_bigdata/controller/tea/TeaGradeManageController.java +++ b/src/main/java/com/sztzjy/financial_bigdata/controller/tea/TeaGradeManageController.java @@ -221,11 +221,18 @@ public class TeaGradeManageController { if (!teaAndStudentExams.isEmpty()) { TeaAndStudentExam teaAndStudentExam = teaAndStudentExams.get(0); String classId = teaAndStudentExam.getClassId(); + + String[] split = classId.split(","); - for (String singleId : split) { - StuClass stuClass = stuClassMapper.selectByPrimaryKey(singleId); + List idlist = Arrays.asList(split); + + StuClassExample example =new StuClassExample(); + example.createCriteria().andClassIdIn(idlist); + List stuClassList = stuClassMapper.selectByExample(example); + + for (StuClass stuClass : stuClassList) { String className = stuClass.getClassName(); - map.put(singleId, className); + map.put(stuClass.getId(), className); } list.add(map); } @@ -475,7 +482,9 @@ public class TeaGradeManageController { StuUser user = userMapper.selectByPrimaryKey(trainingReport.getUserId()); trainingReportDto.setName(user.getName()); trainingReportDto.setStudentId(user.getStudentId()); - StuClass stuClass = stuClassMapper.selectByPrimaryKey(user.getClassId()); + StuClassExample example =new StuClassExample(); + List stuClassList = stuClassMapper.selectByExample(example); + StuClass stuClass = stuClassList.get(0); trainingReportDto.setClassName(stuClass.getClassName()); list.add(trainingReportDto); } From 32c559cd516e4a7c5309e426886dcff27007f33c Mon Sep 17 00:00:00 2001 From: xiaoCJ <406612557@qq.com> Date: Mon, 28 Oct 2024 17:47:40 +0800 Subject: [PATCH 6/6] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=8F=AD=E7=BA=A7?= =?UTF-8?q?=E7=9B=B8=E5=85=B3=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/stu/StuIndexController.java | 1 + .../controller/tea/TeaExamManageController.java | 2 +- .../tea/TeaGradeManageController.java | 17 +++++++++++------ 3 files changed, 13 insertions(+), 7 deletions(-) diff --git a/src/main/java/com/sztzjy/financial_bigdata/controller/stu/StuIndexController.java b/src/main/java/com/sztzjy/financial_bigdata/controller/stu/StuIndexController.java index 937e723..e2cfbc3 100644 --- a/src/main/java/com/sztzjy/financial_bigdata/controller/stu/StuIndexController.java +++ b/src/main/java/com/sztzjy/financial_bigdata/controller/stu/StuIndexController.java @@ -128,6 +128,7 @@ public class StuIndexController { StuUserDto stuUserDto = new StuUserDto(); BeanUtils.copyProperties(stuUser, stuUserDto); StuClassExample example =new StuClassExample(); + example.createCriteria().andClassIdEqualTo(stuUser.getClassId()); List stuClassList = stuClassMapper.selectByExample(example); StuClass stuClass = stuClassList.get(0); stuUserDto.setClassName(stuClass.getClassName()); diff --git a/src/main/java/com/sztzjy/financial_bigdata/controller/tea/TeaExamManageController.java b/src/main/java/com/sztzjy/financial_bigdata/controller/tea/TeaExamManageController.java index 680dd3a..4c2dce6 100644 --- a/src/main/java/com/sztzjy/financial_bigdata/controller/tea/TeaExamManageController.java +++ b/src/main/java/com/sztzjy/financial_bigdata/controller/tea/TeaExamManageController.java @@ -156,7 +156,7 @@ public class TeaExamManageController { } StuClassExample example =new StuClassExample(); - example.createCriteria().andClassIdIn(list); + example.createCriteria().andClassIdIn(list).andSystemOwnerEqualTo(systemOwner); List stuClasslist = stuClassMapper.selectByExample(example); String s = ""; for (StuClass stuClass : stuClasslist) { diff --git a/src/main/java/com/sztzjy/financial_bigdata/controller/tea/TeaGradeManageController.java b/src/main/java/com/sztzjy/financial_bigdata/controller/tea/TeaGradeManageController.java index ffc1384..24c51c3 100644 --- a/src/main/java/com/sztzjy/financial_bigdata/controller/tea/TeaGradeManageController.java +++ b/src/main/java/com/sztzjy/financial_bigdata/controller/tea/TeaGradeManageController.java @@ -212,7 +212,8 @@ public class TeaGradeManageController { @AnonymousAccess @PostMapping("/getClassByExamManageId") @ApiOperation("考试模式--图表统计接口班级下拉框返回classID和班级名") //只显示新建实训时添加的班级 - public ResultEntity>> getClassByExamManageId(@RequestParam String examManageId) { + public ResultEntity>> getClassByExamManageId(@RequestParam String examManageId, + @RequestParam String systemOwner) { TeaAndStudentExamExample teaAndStudentExamExample = new TeaAndStudentExamExample(); teaAndStudentExamExample.createCriteria().andExamManageIdEqualTo(examManageId); List teaAndStudentExams = teaAndStudentExamMapper.selectByExample(teaAndStudentExamExample); @@ -226,8 +227,8 @@ public class TeaGradeManageController { String[] split = classId.split(","); List idlist = Arrays.asList(split); - StuClassExample example =new StuClassExample(); - example.createCriteria().andClassIdIn(idlist); + StuClassExample example = new StuClassExample(); + example.createCriteria().andClassIdIn(idlist).andSystemOwnerEqualTo(systemOwner); List stuClassList = stuClassMapper.selectByExample(example); for (StuClass stuClass : stuClassList) { @@ -381,7 +382,7 @@ public class TeaGradeManageController { .collect(Collectors.toMap(StuStudentExamWithBLOBs::getUserid, Function.identity())); StuClassExample example = new StuClassExample(); - example.createCriteria().andClassIdIn(classIds); + example.createCriteria().andClassIdIn(classIds).andSystemOwnerEqualTo(systemOwner); List stuClass = stuClassMapper.selectByExample(example); // 构建班级ID与班级对象的映射关系 @@ -393,9 +394,12 @@ public class TeaGradeManageController { TeaExamAndUserDto teaExamAndUserDto = new TeaExamAndUserDto(); teaExamAndUserDto.setName(stuUser.getName()); teaExamAndUserDto.setStudentId(stuUser.getStudentId()); - // 从映射关系中获取班级对象 + if (classMap.get(stuUser.getClassId())==null){ + continue; + } StuClass classdata = classMap.get(stuUser.getClassId()); + teaExamAndUserDto.setClassName(classdata.getClassName()); StuStudentExamWithBLOBs stuStudentExam = userExamMap.get(stuUser.getUserid()); @@ -482,7 +486,8 @@ public class TeaGradeManageController { StuUser user = userMapper.selectByPrimaryKey(trainingReport.getUserId()); trainingReportDto.setName(user.getName()); trainingReportDto.setStudentId(user.getStudentId()); - StuClassExample example =new StuClassExample(); + StuClassExample example = new StuClassExample(); + example.createCriteria().andClassIdEqualTo(user.getClassId()); List stuClassList = stuClassMapper.selectByExample(example); StuClass stuClass = stuClassList.get(0); trainingReportDto.setClassName(stuClass.getClassName());