From 54fa00b9abdaaa30745c071a710e604d15033602 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E6=B2=85?= <907037276@qq.com> Date: Mon, 8 Jan 2024 10:04:16 +0800 Subject: [PATCH] =?UTF-8?q?1=E3=80=81swagger=E6=8E=A5=E5=8F=A3=E6=96=87?= =?UTF-8?q?=E6=A1=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/ibeetl/jlw/entity/LoginTodo.java | 9 ++ .../jlw/entity/StudentExtendSchoolInfo.java | 9 +- .../ibeetl/jlw/service/LoginTodoService.java | 3 +- .../StudentAccountAssetAllocationService.java | 17 +++- .../com/ibeetl/jlw/web/AccountController.java | 84 ++++++++++++++++--- web/src/main/resources/sql/jlw/student.md | 4 +- 6 files changed, 108 insertions(+), 18 deletions(-) diff --git a/web/src/main/java/com/ibeetl/jlw/entity/LoginTodo.java b/web/src/main/java/com/ibeetl/jlw/entity/LoginTodo.java index c852aebc..b7f4cbbc 100644 --- a/web/src/main/java/com/ibeetl/jlw/entity/LoginTodo.java +++ b/web/src/main/java/com/ibeetl/jlw/entity/LoginTodo.java @@ -108,6 +108,15 @@ public class LoginTodo implements Serializable { final private String code; } + /** + * 保险系统学校id + */ + private Integer icibtSchoolId; + + /** + * 保险系统班级id + */ + private Integer icibtClassId; /** * 转换成JSON格式 * @return diff --git a/web/src/main/java/com/ibeetl/jlw/entity/StudentExtendSchoolInfo.java b/web/src/main/java/com/ibeetl/jlw/entity/StudentExtendSchoolInfo.java index f2f9d93c..c93e189c 100644 --- a/web/src/main/java/com/ibeetl/jlw/entity/StudentExtendSchoolInfo.java +++ b/web/src/main/java/com/ibeetl/jlw/entity/StudentExtendSchoolInfo.java @@ -59,6 +59,13 @@ public class StudentExtendSchoolInfo extends Student implements ExtendSchoolInfo * 院校所在市区 */ private String universitiesCollegesCity; - + /** + * 保险系统学校id + */ + private Integer icibtSchoolId; + /** + * 保险系统班级id + */ + private Integer icibtClassId; } diff --git a/web/src/main/java/com/ibeetl/jlw/service/LoginTodoService.java b/web/src/main/java/com/ibeetl/jlw/service/LoginTodoService.java index 01986721..60a9e443 100644 --- a/web/src/main/java/com/ibeetl/jlw/service/LoginTodoService.java +++ b/web/src/main/java/com/ibeetl/jlw/service/LoginTodoService.java @@ -60,7 +60,6 @@ public class LoginTodoService { Assert.notNull(first, "未获取到院校信息！"); // 类型为未知 时候，传递null String gender = UN_KNOW.equals(student.getStudentGender()) || student.getStudentGender() == null ? null : student.getStudentGender().getText(); - LoginTodo loginTodo = LoginTodo.builder().username(coreUser.getCode()) .password(coreUser.getPassword()) .roleid(LoginTodo.ThirdRole.STUDENT_ROLE.getCode()) @@ -74,6 +73,8 @@ public class LoginTodoService { .studentNo(student.getStudentSn()) .classId(student.getClassId().toString()) .userId(coreUser.getOldId().toString()) + .icibtClassId(first.getIcibtClassId()) + .icibtSchoolId(first.getIcibtSchoolId()) .build(); consumer.accept(loginTodo); return loginTodo; diff --git a/web/src/main/java/com/ibeetl/jlw/service/StudentAccountAssetAllocationService.java b/web/src/main/java/com/ibeetl/jlw/service/StudentAccountAssetAllocationService.java index 9e99e500..aef6ea40 100644 --- a/web/src/main/java/com/ibeetl/jlw/service/StudentAccountAssetAllocationService.java +++ b/web/src/main/java/com/ibeetl/jlw/service/StudentAccountAssetAllocationService.java @@ -383,10 +383,19 @@ public class StudentAccountAssetAllocationService extends CoreBaseService studentNos = studentService.findStudentNoByClassId(schoolClass.getClassId()); - return JsonResult.success(studentNos); + List studentNos = studentService.findStudentNoByClassId(schoolClass.getClassId()); + return JsonResult.success(studentNos); } } return JsonResult.success(); @@ -1094,9 +1093,9 @@ public class AccountController { //根据逗号分隔studentNo List userIds = new ArrayList<>(); String[] studentNos = studentNo.split(","); - for(String s : studentNos){ + for (String s : studentNos) { CoreUser coreUser = coreUserService.findByUsername(s); - if(coreUser!=null){ + if (coreUser != null) { userIds.add(coreUser.getOldId().intValue()); } } @@ -1125,8 +1124,8 @@ public class AccountController { @ApiOperation("理财接口：获取教师授课班级列表") @GetMapping("getClassIdsByZhiyun.json") public JsonResult getClassIdsByZhiyun(Long userId) { - if(userId==null){ - return JsonResult.success(schoolClassService.getClassIdsByZhiyunAndUserIdIsNull()); + if (userId == null) { + return JsonResult.success(schoolClassService.getClassIdsByZhiyunAndUserIdIsNull()); } return JsonResult.success(schoolClassService.getClassIdsByZhiyun(userId)); } @@ -1134,24 +1133,87 @@ public class AccountController { @ApiOperation("理财接口：获取所有班级") @GetMapping("findAllClass.json") public JsonResult findAllClass() { - return JsonResult.success(schoolClassService.findAllClass()); + return JsonResult.success(schoolClassService.findAllClass()); } @ApiOperation("理财接口：获取所有用户") @GetMapping("findAllUser.json") public JsonResult findAllUser() { - return JsonResult.success(coreUserService.findAllUser()); + return JsonResult.success(coreUserService.findAllUser()); } @ApiOperation("理财接口：获取所有学生信息") @GetMapping("findAllStudent.json") public JsonResult findAllStudent() { - return JsonResult.success(studentService.findAllStudent()); + return JsonResult.success(studentService.findAllStudent()); } @ApiOperation("理财接口：根据班级id获取班级名称") @GetMapping("getClassNameByNewClassId.json") public JsonResult getClassNameByNewClassId(Long newClassId) { - return JsonResult.success(schoolClassService.findClassNameByClassId(newClassId)); + return JsonResult.success(schoolClassService.findClassNameByClassId(newClassId)); + } + + @ApiOperation("修改保险系统学校id") + @PostMapping("updateInsuranceSchoolId.json") + public JsonResult updateInsuranceSchoolId() { + List universitiesColleges = universitiesCollegesService.getAll(); + for (UniversitiesColleges colleges : universitiesColleges) { + Integer schoolId = colleges.getOldSchoolId().intValue(); + if (schoolId != null && schoolId > 0) { + try { + Connection connection = openConn(); + PreparedStatement ps = connection.prepareStatement("select ICIBTSchoolId from EduSchools where id = ?"); + ps.setInt(1, schoolId); + ResultSet rs = ps.executeQuery(); + while (rs.next()) { + Integer icibtschoolId = rs.getInt("ICIBTSchoolId"); + if (icibtschoolId != null && icibtschoolId > 0) { + colleges.setIcibtSchoolId(icibtschoolId); + universitiesCollegesService.updateTemplate(colleges); + } + } + connection.close(); + ps.close(); + rs.close(); + } catch (Exception e) { + e.printStackTrace(); + } + } + } + return JsonResult.success(); + } + + + @ApiOperation("修改保险系统班级id") + @PostMapping("updateInsuranceClassId.json") + public JsonResult updateInsuranceClassId() { + List schoolClasses = schoolClassService.getAll(); + int i = 0; + for (SchoolClass schoolClass : schoolClasses) { + System.out.println("已处理：-----------------------------------------------------------" + i++); + Integer classId = schoolClass.getOldClassId().intValue(); + if (classId != null && classId > 0) { + try { + Connection connection = openConn(); + PreparedStatement ps = connection.prepareStatement("select ICIBTClassId from EduClasses where id = ?"); + ps.setInt(1, classId); + ResultSet rs = ps.executeQuery(); + while (rs.next()) { + Integer icibtClassId = rs.getInt("ICIBTClassId"); + if (icibtClassId != null && icibtClassId > 0) { + schoolClass.setIcibtClassId(icibtClassId); + schoolClassService.updateTemplate(schoolClass); + } + } + connection.close(); + ps.close(); + rs.close(); + } catch (Exception e) { + e.printStackTrace(); + } + } + } + return JsonResult.success(); } } diff --git a/web/src/main/resources/sql/jlw/student.md b/web/src/main/resources/sql/jlw/student.md index 545f9771..4069129e 100644 --- a/web/src/main/resources/sql/jlw/student.md +++ b/web/src/main/resources/sql/jlw/student.md @@ -1415,7 +1415,9 @@ getStudentExtendSchoolInfo td.universities_colleges_id, td.universities_colleges_name, td.universities_colleges_city, - td.universities_colleges_province + td.universities_colleges_province, + ta.icibt_class_id, + td.icibt_school_id FROM student t LEFT JOIN school_class ta ON ta.class_id = t.class_id