From c8634e695f0fa3848c7fe56acc4ae9c656aa9397 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E6=B2=85?= <907037276@qq.com> Date: Mon, 15 Jan 2024 16:38:33 +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 --- .../src/main/resources/sql/core/coreUser.md | 2 +- .../java/com/ibeetl/jlw/entity/Teacher.java | 12 ++++++- .../ibeetl/jlw/service/TeacherService.java | 13 ++++--- .../com/ibeetl/jlw/web/TestController.java | 36 ++++++++++++++++--- 4 files changed, 52 insertions(+), 11 deletions(-) diff --git a/admin-core/src/main/resources/sql/core/coreUser.md b/admin-core/src/main/resources/sql/core/coreUser.md index 58fd9fb6..d53789f0 100644 --- a/admin-core/src/main/resources/sql/core/coreUser.md +++ b/admin-core/src/main/resources/sql/core/coreUser.md @@ -128,7 +128,7 @@ getTeacherByNoOfNet universities_colleges.universities_colleges_name AS schoolName, university_faculty.university_faculty_id AS collegeId, university_faculty.university_faculty_name AS collegeName, - teacher.teacher_id AS teacherId + teacher.old_id AS teacherId FROM core_user JOIN teacher ON core_user.CODE = teacher.teacher_job_number diff --git a/web/src/main/java/com/ibeetl/jlw/entity/Teacher.java b/web/src/main/java/com/ibeetl/jlw/entity/Teacher.java index 2f0877a3..bd5d1372 100644 --- a/web/src/main/java/com/ibeetl/jlw/entity/Teacher.java +++ b/web/src/main/java/com/ibeetl/jlw/entity/Teacher.java @@ -91,7 +91,17 @@ public class Teacher extends BaseEntity implements AbstractToken { //后台用户ID private Long userId ; - + + private Long oldId; + + public Long getOldId() { + return oldId; + } + + public void setOldId(Long oldId) { + this.oldId = oldId; + } + public Teacher(){ } diff --git a/web/src/main/java/com/ibeetl/jlw/service/TeacherService.java b/web/src/main/java/com/ibeetl/jlw/service/TeacherService.java index 5dadcf40..b215b627 100644 --- a/web/src/main/java/com/ibeetl/jlw/service/TeacherService.java +++ b/web/src/main/java/com/ibeetl/jlw/service/TeacherService.java @@ -134,6 +134,10 @@ public class TeacherService extends CoreBaseService { return ret; } + public List findAll() { + return teacherDao.all(); + } + public PageQuery queryLogByCondition(PageQuery query) { PageQuery ret = teacherDao.queryByCondition(query); queryListAfter(ret.getList()); @@ -247,7 +251,7 @@ public class TeacherService extends CoreBaseService { public Teacher getByTeacherJobNameAndOrgId(String teacherJobName, Long orgId) { List teachers = teacherDao.getByTeacherJobNameAndOrgId(teacherJobName, orgId); - if(teachers!=null&&teachers.size()>0){ + if (teachers != null && teachers.size() > 0) { return teachers.get(0); } return null; @@ -296,10 +300,10 @@ public class TeacherService extends CoreBaseService { t.setTeacherId(teacher.getTeacherId()); t.setUserId(createdUserId); t.setOrgId(orgId); - + t.setOldId(5000L + teacher.getTeacherId()); Integer icibtSchoolId = universitiesColleges.getIcibtSchoolId(); - if(icibtSchoolId!=null){ + if (icibtSchoolId != null) { createBxStudent(icibtSchoolId, teacher.getTeacherSn(), teacher.getTeacherName(), 1); } this.updateTemplate(t); @@ -316,13 +320,14 @@ public class TeacherService extends CoreBaseService { } - public void createBxStudent(Integer icibtSchoolId,String studentNo, String name, Integer sex) { + public void createBxStudent(Integer icibtSchoolId, String studentNo, String name, Integer sex) { String PostData = "{'LoginName':'" + studentNo + "','Password':'" + encryptToMD5("123qwe") + "','Name':'" + name + "','Sex':'" + sex + "','SchoolNumber':'" + studentNo + "','RoleId':'" + 3 + "','SchoolId':'" + icibtSchoolId + "'}"; String request = HttpJsonRequest.sendPostRequest("http://120.79.161.177:8183/SignIn/AddUser", null, PostData, "application/json"); } + public Boolean edit(Teacher teacher) { this.updateTemplate(teacher); diff --git a/web/src/main/java/com/ibeetl/jlw/web/TestController.java b/web/src/main/java/com/ibeetl/jlw/web/TestController.java index 98bca505..036fc399 100644 --- a/web/src/main/java/com/ibeetl/jlw/web/TestController.java +++ b/web/src/main/java/com/ibeetl/jlw/web/TestController.java @@ -13,6 +13,7 @@ import com.ibeetl.jlw.entity.*; import com.ibeetl.jlw.entity.dto.CreateUserDTO; import com.ibeetl.jlw.enums.GenderEnum; import com.ibeetl.jlw.service.*; +import com.ibeetl.jlw.util.ZhiYunJDBCUtil; import com.ibeetl.jlw.web.query.UniversitiesCollegesJurisdictionExperimentalSystemQuery; import com.ibeetl.jlw.web.query.UniversityFacultyQuery; import com.ibeetl.jlw.web.query.UniversitySystemQuery; @@ -183,7 +184,7 @@ public class TestController { if (universityFaculty != null) { universityFaculty.setOldId(oldId); universityFacultyService.updateTemplate(universityFaculty); - continue ; + continue; } CoreUser userByCode = coreUserService.getUserByCode(universitiesColleges.getUniversitiesCollegesContacts()); @@ -260,7 +261,7 @@ public class TestController { if (universitiesColleges.getUniversitiesCollegesName().equals("安阳学院") && universityFaculty.getUniversityFacultyName().equals("经管学院")) { int a = 0; } - UniversitySystem systemServiceByName = universitySystemService.getByOldId(resultSet.getLong(8),universityFaculty.getUniversityFacultyId()); + UniversitySystem systemServiceByName = universitySystemService.getByOldId(resultSet.getLong(8), universityFaculty.getUniversityFacultyId()); if (systemServiceByName != null) { systemServiceByName.setOldId(oldId); universitySystemService.updateTemplate(systemServiceByName); @@ -437,6 +438,7 @@ public class TestController { @Autowired CorePlatformService platformService; + @ApiOperation("迁移学生数据") @PostMapping("updateStudent") public void updateStudent() throws SQLException { @@ -464,7 +466,7 @@ public class TestController { " JOIN EduClasses cla ON stu.ClassId = cla.Id where sch.Name='张家口学院'"; ps = conn.prepareStatement(sql); ResultSet resultSet = ps.executeQuery(); - int i=0; + int i = 0; while (resultSet.next()) { System.out.println("-----------------------------------已处理" + i++ + "-------------------------------------------"); if (resultSet.getString(9).contains("内部体验")) { @@ -477,7 +479,7 @@ public class TestController { String username = resultSet.getString(5); // Map studentByNo = coreUserService.getStudentByNo(username); - if(username.length()==36){ + if (username.length() == 36) { continue; } Boolean aBoolean = platformService.CheckUserCodeThrowMessage(username); @@ -633,7 +635,7 @@ public class TestController { for (SchoolClass schoolClass : classes) { Long majorId = schoolClass.getUniversitySystemId(); UniversitySystem system = universitySystemService.getById(majorId); - String sql = "select * from EduClasses where MajorId ="+system.getOldId()+" and Name = '"+schoolClass.getClassName()+"'"; + String sql = "select * from EduClasses where MajorId =" + system.getOldId() + " and Name = '" + schoolClass.getClassName() + "'"; ps = connection.prepareStatement(sql); ResultSet resultSet = ps.executeQuery(); @@ -675,4 +677,28 @@ public class TestController { } } + + @ApiOperation("修改教师旧的id") + @PostMapping("updateTeacherId.json") + public void updateTeacherId() { + List teachers = teacherService.findAll(); + for (Teacher teacher : teachers) { + String sql = "select * from EduTeachers where TeacherNo =" + teacher.getTeacherSn(); + try { + Connection connection = ZhiYunJDBCUtil.openConn(); + PreparedStatement ps = connection.prepareStatement(sql); + ResultSet rs = ps.executeQuery(); + while (rs.next()){ + teacher.setOldId(rs.getLong("id")); + teacherService.updateTemplate(teacher); + } + connection.close(); + ps.close(); + }catch (Exception ex){ + ex.printStackTrace(); + } + } + + } + }