diff --git a/admin-core/src/main/java/com/ibeetl/admin/core/entity/CoreUser.java b/admin-core/src/main/java/com/ibeetl/admin/core/entity/CoreUser.java
index 2a1d52a7..87302b30 100644
--- a/admin-core/src/main/java/com/ibeetl/admin/core/entity/CoreUser.java
+++ b/admin-core/src/main/java/com/ibeetl/admin/core/entity/CoreUser.java
@@ -257,10 +257,10 @@ public class CoreUser extends BaseEntity implements AbstractToken {
 	}
 
 	public void setOldId(Long oldId) {
-		if(oldId==null){
-			this.oldId=id;
-		}else{
-			this.oldId = oldId;
-		}
+		this.oldId = oldId;
+	}
+
+	public CoreUser() {
+		this.oldId=id;
 	}
 }
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 363a1062..01986721 100644
--- a/web/src/main/java/com/ibeetl/jlw/service/LoginTodoService.java
+++ b/web/src/main/java/com/ibeetl/jlw/service/LoginTodoService.java
@@ -73,7 +73,7 @@ public class LoginTodoService {
                 .schoolClass(first.getClassName())
                 .studentNo(student.getStudentSn())
                 .classId(student.getClassId().toString())
-                .userId(coreUser.getId().toString())
+                .userId(coreUser.getOldId().toString())
                 .build();
         consumer.accept(loginTodo);
         return loginTodo;
diff --git a/web/src/main/java/com/ibeetl/jlw/service/SchoolClassService.java b/web/src/main/java/com/ibeetl/jlw/service/SchoolClassService.java
index bc7fa8fd..6a9b071f 100644
--- a/web/src/main/java/com/ibeetl/jlw/service/SchoolClassService.java
+++ b/web/src/main/java/com/ibeetl/jlw/service/SchoolClassService.java
@@ -259,4 +259,14 @@ public class SchoolClassService extends CoreBaseService<SchoolClass> {
     public List<Map<String, Object>> getClassListByMajorId(String majorId) {
         return schoolClassDao.getClassListByMajorId(majorId);
     }
+
+    public SchoolClass getByNameAndMajorId(String name, Long majorId,Long collegeId,Long facultyId) {
+        SchoolClassQuery query = new SchoolClassQuery();
+        query.setClassName(name);
+        query.setUniversitySystemId(majorId);
+        query.setClassStatus(1);
+        query.setUniversitiesCollegesId(collegeId);
+        query.setUniversityFacultyId(facultyId);
+        return getFirst(getValuesByQueryNotWithPermission(query));
+    }
 }
\ No newline at end of file
diff --git a/web/src/main/java/com/ibeetl/jlw/service/UniversityFacultyService.java b/web/src/main/java/com/ibeetl/jlw/service/UniversityFacultyService.java
index 95060f80..5309ee2a 100644
--- a/web/src/main/java/com/ibeetl/jlw/service/UniversityFacultyService.java
+++ b/web/src/main/java/com/ibeetl/jlw/service/UniversityFacultyService.java
@@ -233,4 +233,11 @@ public class UniversityFacultyService extends CoreBaseService<UniversityFaculty>
         return getByName(name, null);
     }
 
+    public UniversityFaculty getByNameAndSchoolId(String name, Long schoolId) {
+        UniversityFacultyQuery query = new UniversityFacultyQuery();
+        query.setUniversityFacultyStatus(1);
+        query.setUniversityFacultyName(name.trim());
+        query.setUniversitiesCollegesId(schoolId);
+        return getFirst(getValuesByQueryNotWithPermission(query));
+    }
 }
diff --git a/web/src/main/java/com/ibeetl/jlw/service/UniversitySystemService.java b/web/src/main/java/com/ibeetl/jlw/service/UniversitySystemService.java
index df0a8cf4..c3415d18 100644
--- a/web/src/main/java/com/ibeetl/jlw/service/UniversitySystemService.java
+++ b/web/src/main/java/com/ibeetl/jlw/service/UniversitySystemService.java
@@ -230,4 +230,12 @@ public class UniversitySystemService extends CoreBaseService<UniversitySystem>{
     public List<Map<String,Object>> getUniversitySystemListByOrgId(Long orgId){
         return universitySystemDao.getUniversitySystemListByOrgId(orgId);
     }
+
+    public UniversitySystem getByNameAndSchoolIdAndCollegeId(String name,Long facultyId){
+        UniversitySystemQuery universitySystemQuery = new UniversitySystemQuery();
+        universitySystemQuery.setUniversitySystemName(name);
+        universitySystemQuery.setUniversityFacultyId(facultyId);
+        universitySystemQuery.setUniversitySystemStatus(1);
+        return getFirst(universitySystemDao.getValuesByQueryNotWithPermission(universitySystemQuery));
+    }
 }
diff --git a/web/src/main/java/com/ibeetl/jlw/web/AccountController.java b/web/src/main/java/com/ibeetl/jlw/web/AccountController.java
index dc9d9aee..9801c1bd 100644
--- a/web/src/main/java/com/ibeetl/jlw/web/AccountController.java
+++ b/web/src/main/java/com/ibeetl/jlw/web/AccountController.java
@@ -835,6 +835,7 @@ public class AccountController {
         List<CoreUser> coreUsers = userService.getCoreUserList(coreUser);
         int i = 0;
         for (CoreUser user : coreUsers) {
+            if(user.getOldId()!=null){continue;}
             Connection conn = openConn();
             PreparedStatement ps = conn.prepareStatement("select * from EduUsers where username = '" + user.getCode() + "' and IsDeleted = 0");
 
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 536b771e..6323c6eb 100644
--- a/web/src/main/java/com/ibeetl/jlw/web/TestController.java
+++ b/web/src/main/java/com/ibeetl/jlw/web/TestController.java
@@ -1,445 +1,448 @@
-//package com.ibeetl.jlw.web;
-//
-//import cn.hutool.core.util.StrUtil;
-//import cn.jlw.Interceptor.SCoreUser;
-//import cn.jlw.oldAliPay.pc.util.Stringutils;
-//import com.google.gson.Gson;
-//import com.google.gson.JsonArray;
-//import com.google.gson.JsonObject;
-//import com.ibeetl.admin.core.entity.CoreUser;
-//import com.ibeetl.admin.core.service.CoreUserService;
-//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.web.query.UniversitiesCollegesJurisdictionExperimentalSystemQuery;
-//import com.ibeetl.jlw.web.query.UniversityFacultyQuery;
-//import com.ibeetl.jlw.web.query.UniversitySystemQuery;
-//import io.swagger.annotations.Api;
-//import io.swagger.annotations.ApiOperation;
-//import org.apache.regexp.RE;
-//import org.springframework.beans.factory.annotation.Autowired;
-//import org.springframework.web.bind.annotation.PostMapping;
-//import org.springframework.web.bind.annotation.RequestMapping;
-//import org.springframework.web.bind.annotation.RestController;
-//
-//import java.sql.*;
-//import java.text.SimpleDateFormat;
-//import java.util.ArrayList;
-//import java.util.Collections;
-//import java.util.Date;
-//import java.util.List;
-//
-//@Api(tags = "数据迁移")
-//@RestController
-//@RequestMapping("test")
-//public class TestController {
-//
-//    @Autowired
-//    private UniversitiesCollegesService universitiesCollegesService;
-//    @Autowired
-//    private UniversityFacultyService universityFacultyService;
-//    @Autowired
-//    private CoreUserService coreUserService;
-//    @Autowired
-//    private UniversitySystemService universitySystemService;
-//    @Autowired
-//    private SchoolClassService schoolClassService;
-//    @Autowired
-//    private TeacherService teacherService;
-//    @Autowired
-//    private StudentService studentService;
-//    @Autowired
-//    private ResourcesApplicationService resourcesApplicationService;
-//    @Autowired
-//    private UniversitiesCollegesJurisdictionExperimentalSystemService universitiesCollegesJurisdictionExperimentalSystemService;
-//
-//    private final static String URL = "jdbc:sqlserver://120.79.161.177:1433;databaseName=Test.Zhiyun_v2.0;trustServerCertificate=true;encrypt=true";
-//    private final static String USER = "sa";
-//    private final static String PASSWORD = "sztzjy@2017";
-//
-//    // 打开数据库连接
-//    public static Connection openConn() throws SQLException {
-//        try {
-//            Connection connection = DriverManager.getConnection(URL, USER, PASSWORD);
-//            if (connection != null) {
-//                System.out.println("成功建立数据库连接");
-//                return connection;
-//            } else {
-//                throw new SQLException("无法建立数据库连接");
-//            }
-//        } catch (SQLException e) {
-//            throw new SQLException("无法建立数据库连接: " + e.getMessage(), e);
-//        }
-//    }
-//
-//    // 关闭数据库连接
-//    public static void closeConn(Connection connection) {
-//        if (connection != null) {
-//            try {
-//                connection.close();
-//                System.out.println("数据库连接已关闭");
-//            } catch (SQLException e) {
-//                System.err.println("无法关闭数据库连接: " + e.getMessage());
-//            }
-//        }
-//    }
-//
-//    @ApiOperation("迁移学校及学校管理员数据")
-//    @PostMapping("/school")
-//    public void school() throws SQLException {
-//        Connection conn = null;
-//        PreparedStatement ps = null;
-//        try {
-//            conn = openConn();
-//
-//            String sql = "select EduSchools.Name,EduLevel.LevelName,EduUsers.EmailAddress, " +
-//                    "EduUsers.UserName,EduSchools.IsDeleted from EduSchools " +
-//                    "join EduUsers on EduSchools.Id=EduUsers.SchoolId " +
-//                    "join EduUserRoles on EduUsers.Id = EduUserRoles.UserId " +
-//                    "join EduLevel on EduSchools.LevelId=EduLevel.Id where " +
-//                    "EduUserRoles.RoleId=2";
-//            ps = conn.prepareStatement(sql);
-//            ResultSet resultSet = ps.executeQuery();
-//            while (resultSet.next()) {
-//                UniversitiesColleges universitiesColleges = new UniversitiesColleges();
-//                CreateUserDTO createUserDTO = new CreateUserDTO();
-//                universitiesColleges.setUniversitiesCollegesName(resultSet.getString(1));
-//                universitiesColleges.setUniversitiesCollegesGrade(resultSet.getString(2));
-//                universitiesColleges.setUniversitiesCollegesProvince("广东省");
-//                universitiesColleges.setUniversitiesCollegesCity("深圳市");
-//                universitiesColleges.setUniversitiesCollegesContacts(resultSet.getString(4));
-//                universitiesColleges.setUniversitiesCollegesContactsEmail(resultSet.getString(3));
-//                universitiesColleges.setUniversitiesCollegesStatus(resultSet.getInt(5) + 1);
-//                universitiesColleges.setAddTime(new Date());
-//                universitiesColleges.setUniversitiesCollegesStatus(1);
-//                createUserDTO.setUserCode(resultSet.getString(4));
-//                createUserDTO.setPassword("123qwe");
-//                universitiesCollegesService.addAndCreateCoreUser(universitiesColleges, createUserDTO);
-//            }
-//        } catch (Exception e) {
-//            e.printStackTrace();
-//        } finally {
-//            ps.close();
-//            closeConn(conn);
-//        }
-//    }
-//
-//
-//    @ApiOperation("迁移院系数据")
-//    @PostMapping("updateCollage")
-//    public void updateCollage() throws SQLException {
-//
-//        Connection conn = null;
-//        PreparedStatement ps = null;
-//        try {
-//            conn = openConn();
-//
-//            String sql = "SELECT" +
-//                    " col.Name AS collegeName," +
-//                    " sch.Name AS schoolName," +
-//                    " col.Contacts," +
-//                    " col.PhoneNo," +
-//                    " col.Address," +
-//                    " col.IsDeleted" +
-//                    " " +
-//                    "FROM " +
-//                    " EduColleges col" +
-//                    " JOIN EduSchools sch " +
-//                    "ON" +
-//                    " col.SchoolId = sch.id";
-//            ps = conn.prepareStatement(sql);
-//            ResultSet resultSet = ps.executeQuery();
-//            while (resultSet.next()) {
-//                UniversityFacultyQuery universityFacultyQuery = new UniversityFacultyQuery();
-//                CoreUser coreUser = new CoreUser();
-//                universityFacultyQuery.setUniversityFacultyName(resultSet.getString(1));
-//                universityFacultyQuery.setUniversityFacultyContact(resultSet.getString(3));
-//                universityFacultyQuery.setUniversityFacultyContactTel(resultSet.getString(4));
-//                universityFacultyQuery.setUniversityFacultyContactAddress(resultSet.getString(5));
-//
-//                UniversitiesColleges universitiesColleges = universitiesCollegesService.getByName(resultSet.getString(2));
-//                if (universitiesColleges == null) {
-//                    continue;
-//                }
-//                universityFacultyQuery.setUniversitiesCollegesId(universitiesColleges.getUniversitiesCollegesId());
-//                universityFacultyQuery.setUniversityFacultyStatus(resultSet.getInt(6) + 1);
-//                universityFacultyQuery.setUniversityFacultyAddTime(new Date());
-//                CoreUser userByCode = coreUserService.getUserByCode(universitiesColleges.getUniversitiesCollegesContacts());
-//                if (userByCode != null) {
-//                    universityFacultyQuery.setUserId(userByCode.getId());
-//                } else {
-//                    universityFacultyQuery.setUserId(Long.valueOf(100));
-//                }
-//                universityFacultyQuery.setOrgId(universitiesColleges.getOrgId());
-//                universityFacultyService.add(universityFacultyQuery);
-//            }
-//        } catch (Exception e) {
-//            e.printStackTrace();
-//        } finally {
-//            ps.close();
-//            closeConn(conn);
-//        }
-//
-//
-//    }
-//
-//
-//    @ApiOperation("迁移专业数据")
-//    @PostMapping("updateMajor")
-//    public void updateMajor() throws SQLException {
-//        Connection conn = null;
-//        PreparedStatement ps = null;
-//        try {
-//            conn = openConn();
-////            UniversitySystemQuery universitySystemQuery;
-//
-//            String sql = "SELECT " +
-//                    "  ma.Name AS majorName, " +
-//                    "  ma.Contacts, " +
-//                    "  ma.PhoneNo, " +
-//                    "  ma.IsDeleted, " +
-//                    "  col.Name AS colName, " +
-//                    "  sch.Name AS schName  " +
-//                    "FROM " +
-//                    "  EduMajors ma " +
-//                    "  JOIN EduColleges col ON ma.CollegeId = col.Id " +
-//                    "  JOIN EduSchools sch ON col.schoolId = sch.id";
-//            ps = conn.prepareStatement(sql);
-//            ResultSet resultSet = ps.executeQuery();
-//            while (resultSet.next()) {
-//                UniversitySystemQuery universitySystemQuery = new UniversitySystemQuery();
-//                universitySystemQuery.setUniversitySystemName(resultSet.getString(1));
-//                universitySystemQuery.setUniversitySystemContact(resultSet.getString(2));
-//                universitySystemQuery.setUniversitySystemContactTel(resultSet.getString(3));
-//                universitySystemQuery.setUniversitySystemAddTime(new Date());
-//                universitySystemQuery.setUniversitySystemStatus(resultSet.getInt(4) + 1);
-//                UniversitiesColleges universitiesColleges = universitiesCollegesService.getByName(resultSet.getString(6));
-//                if (universitiesColleges == null) {
-//                    continue;
-//                }
-//                UniversityFaculty universityFaculty = universityFacultyService.getByNameAndSchoolId(resultSet.getString(5), universitiesColleges.getUniversitiesCollegesId());
-//                if (universityFaculty == null) {
-//                    continue;
-//                }
-//                universitySystemQuery.setUniversityFacultyId(universityFaculty.getUniversityFacultyId());
-//
-//                universitySystemQuery.setOrgId(universitiesColleges.getOrgId());
-//                universitySystemQuery.setUserId(universitiesColleges.getUserId());
-//                universitySystemService.add(universitySystemQuery);
-//            }
-//
-//        } catch (Exception e) {
-//            e.printStackTrace();
-//        } finally {
-//            ps.close();
-//            closeConn(conn);
-//        }
-//    }
-//
-//
-//    @ApiOperation("迁移班级数据")
-//    @PostMapping("updateClasses")
-//    public void updateClasses() throws SQLException {
-//        Connection conn = null;
-//        PreparedStatement ps = null;
-//        try {
-//            conn = openConn();
-////            UniversitySystemQuery universitySystemQuery;
-//
-//            String sql = "SELECT   " +
-//                    "  sch.Name as schName,  " +
-//                    "  col.Name as colName,  " +
-//                    "  maj.Name as majName,  " +
-//                    "  cla.Name as claName,  " +
-//                    "  cla.IsDeleted  " +
-//                    "FROM  " +
-//                    "  EduClasses cla  " +
-//                    "  JOIN EduMajors maj ON cla.MajorId = maj.Id  " +
-//                    "  JOIN EduColleges col ON maj.CollegeId = col.Id  " +
-//                    "  JOIN EduSchools sch ON col.schoolId = sch.id";
-//            ps = conn.prepareStatement(sql);
-//            ResultSet resultSet = ps.executeQuery();
-//            while (resultSet.next()) {
-//
-//
-//                String claName = resultSet.getString(4);
-//
-//                SchoolClass serviceByName = schoolClassService.getByName(claName);
-//                if (serviceByName != null) {
-//                    continue;
-//                }
-//                SchoolClass schoolClass = new SchoolClass();
-//                schoolClass.setClassName(resultSet.getString(4));
-//                UniversitiesColleges universitiesColleges = universitiesCollegesService.getByName(resultSet.getString(1));
-//                if (universitiesColleges == null) {
-//                    continue;
-//                }
-//                schoolClass.setUniversitiesCollegesId(universitiesColleges.getUniversitiesCollegesId());
-//                String uniqueClassSn = schoolClassService.buildClassSnEnsureUnique(universitiesColleges, schoolClass.getClassName());
-//                schoolClass.setClassSn(uniqueClassSn);
-//                schoolClass.setOrgId(universitiesColleges.getOrgId());
-//                UniversityFaculty universityFaculty = universityFacultyService.getByNameAndSchoolId(resultSet.getString(2), universitiesColleges.getUniversitiesCollegesId());
-//                if (universityFaculty == null) {
-//                    continue;
-//                }
-//                schoolClass.setUniversityFacultyId(universityFaculty.getUniversityFacultyId());
-//                UniversitySystem universitySystem = universitySystemService.getByNameAndSchoolIdAndCollegeId(resultSet.getString(3), universityFaculty.getUniversityFacultyId());
-//                if (universitySystem == null) {
-//                    continue;
-//                }
-//                schoolClass.setUniversitySystemId(universitySystem.getUniversitySystemId());
-//                schoolClass.setOrgId(universitiesColleges.getOrgId());
-//                schoolClass.setUserId(Long.valueOf(100));
-//                schoolClass.setClassStatus(resultSet.getInt(5) + 1);
-//                schoolClassService.save(schoolClass);
-//            }
-//
-//        } catch (Exception e) {
-//            e.printStackTrace();
-//        } finally {
-//            ps.close();
-//            closeConn(conn);
-//        }
-//    }
-//
-//    @ApiOperation("迁移教师数据")
-//    @PostMapping("updateTeacher")
-//    public void updateTeacher() throws SQLException {
-//        Connection conn = null;
-//        PreparedStatement ps = null;
-//        try {
-//            conn = openConn();
-//
-//            String sql = "SELECT  " +
-//                    "  sch.Name AS schName,  " +
-//                    "  col.Name AS colName,  " +
-//                    "  maj.Name AS majName,  " +
-//                    "  tea.Name AS teacherName,  " +
-//                    "  tea.TeacherNo AS teacherNo,  " +
-//                    "  tea.PhoneNo,  " +
-//                    "  tea.Sex,  " +
-//                    "  tea.IsDeleted   " +
-//                    "FROM  " +
-//                    "  EduTeachers tea  " +
-//                    "  JOIN EduColleges col ON tea.CollegeId = col.Id  " +
-//                    "  JOIN EduMajors maj ON tea.MajorId = maj.Id  " +
-//                    "  JOIN EduSchools sch ON tea.SchoolId = sch.Id";
-//            ps = conn.prepareStatement(sql);
-//            ResultSet resultSet = ps.executeQuery();
-//            while (resultSet.next()) {
-//                Teacher teacher = new Teacher();
-//                UniversitiesColleges universitiesColleges = universitiesCollegesService.getByName(resultSet.getString(1));
-//                if (universitiesColleges == null) {
-//                    continue;
-//                }
-//                UniversityFaculty universityFaculty = universityFacultyService.getByNameAndSchoolId(resultSet.getString(2), universitiesColleges.getUniversitiesCollegesId());
-//                if (universityFaculty == null) {
-//                    continue;
-//                }
-//                UniversitySystem universitySystem = universitySystemService.getByNameAndSchoolIdAndCollegeId(resultSet.getString(3), universityFaculty.getUniversityFacultyId());
-//                if (universitySystem == null) {
-//                    continue;
-//                }
-//                teacher.setTeacherName(resultSet.getString(4));
-//                teacher.setUniversitiesCollegesId(universitiesColleges.getUniversitiesCollegesId());
-//                teacher.setUniversityFacultyId(universityFaculty.getUniversityFacultyId());
-//                teacher.setUniversitySystemId(universitySystem.getUniversitySystemId());
-//                teacher.setTeacherMobile(resultSet.getString(6));
-//                teacher.setTeacherJobNumber(resultSet.getString(5));
-//                teacher.setTeacherStatus(resultSet.getInt(8) + 1);
-//                int anInt = resultSet.getInt(7);
-//                GenderEnum genderEnum;
-//                if (anInt == 1) {
-//                    genderEnum = GenderEnum.MAN;
-//                } else {
-//                    genderEnum = GenderEnum.WOMAN;
-//                }
-//                teacher.setTeacherGender(genderEnum);
-//                teacher.setAddTime(new Date());
-//                teacherService.add(teacher);
-//            }
-//
-//        } catch (Exception e) {
-//            e.printStackTrace();
-//        } finally {
-//            ps.close();
-//            closeConn(conn);
-//        }
-//    }
-//
-//
-//    @ApiOperation("迁移学生数据")
-//    @PostMapping("updateStudent")
-//    public void updateStudent() throws SQLException {
-//        Connection conn = null;
-//        PreparedStatement ps = null;
-//        try {
-//            conn = openConn();
-//            String sql = "SELECT  " +
-//                    "  sch.Name AS schName,  " +
-//                    "  col.Name AS colName,  " +
-//                    "  maj.Name AS majName,  " +
-//                    "  stu.Name AS studentName,  " +
-//                    "  stu.StudentNo AS StudentNo,  " +
-//                    "  stu.PhoneNo,  " +
-//                    "  stu.Sex,  " +
-//                    "  stu.IsDeleted,  " +
-//                    "  cla.Name   " +
-//                    "FROM  " +
-//                    "  EduStudents stu  " +
-//                    "  JOIN EduColleges col ON stu.CollegeId = col.Id  " +
-//                    "  JOIN EduMajors maj ON stu.MajorId = maj.Id  " +
-//                    "  JOIN EduSchools sch ON stu.SchoolId = sch.Id  " +
-//                    "  JOIN EduClasses cla ON stu.ClassId = cla.Id";
-//            ps = conn.prepareStatement(sql);
-//            ResultSet resultSet = ps.executeQuery();
-//            while (resultSet.next()) {
-//                Student student = new Student();
-//                student.setStudentName(resultSet.getString(4));
-//                student.setStudentSn(resultSet.getString(5));
-//                student.setStudentMobile(resultSet.getString(6));
-//                int anInt = resultSet.getInt(7);
-//                GenderEnum genderEnum;
-//                if (anInt == 1) {
-//                    genderEnum = GenderEnum.MAN;
-//                } else {
-//                    genderEnum = GenderEnum.WOMAN;
-//                }
-//                student.setStudentGender(genderEnum);
-//                student.setAddTime(new Date());
-//                UniversitiesColleges universitiesColleges = universitiesCollegesService.getByName(resultSet.getString(1));
-//                if (universitiesColleges == null) {
-//                    continue;
-//                }
-//                UniversityFaculty universityFaculty = universityFacultyService.getByNameAndSchoolId(resultSet.getString(2), universitiesColleges.getUniversitiesCollegesId());
-//                if (universityFaculty == null) {
-//                    continue;
-//                }
-//                UniversitySystem universitySystem = universitySystemService.getByNameAndSchoolIdAndCollegeId(resultSet.getString(3), universityFaculty.getUniversityFacultyId());
-//                if (universitySystem == null) {
-//                    continue;
-//                }
-//                SchoolClass schoolClass = schoolClassService.getByNameAndMajorId(resultSet.getString(9),
-//                        universitySystem.getUniversitySystemId(),
-//                        universitiesColleges.getUniversitiesCollegesId(),
-//                        universityFaculty.getUniversityFacultyId()
-//                );
-//                if (universitiesColleges == null || universityFaculty == null || universitySystem == null || schoolClass == null) {
-//                    continue;
-//                }
-//                student.setClassId(schoolClass.getClassId());
-//                studentService.add(student);
-//            }
-//        } catch (Exception ex) {
-//            ex.printStackTrace();
-//        } finally {
-//            ps.close();
-//            closeConn(conn);
-//        }
-//    }
-//
-//
+package com.ibeetl.jlw.web;
+
+import cn.hutool.core.util.StrUtil;
+import cn.jlw.Interceptor.SCoreUser;
+import cn.jlw.oldAliPay.pc.util.Stringutils;
+import com.google.gson.Gson;
+import com.google.gson.JsonArray;
+import com.google.gson.JsonObject;
+import com.ibeetl.admin.core.entity.CoreUser;
+import com.ibeetl.admin.core.service.CoreUserService;
+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.web.query.UniversitiesCollegesJurisdictionExperimentalSystemQuery;
+import com.ibeetl.jlw.web.query.UniversityFacultyQuery;
+import com.ibeetl.jlw.web.query.UniversitySystemQuery;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.apache.regexp.RE;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.sql.*;
+import java.text.SimpleDateFormat;
+import java.util.*;
+import java.util.Date;
+
+@Api(tags = "数据迁移")
+@RestController
+@RequestMapping("test")
+public class TestController {
+
+    @Autowired
+    private UniversitiesCollegesService universitiesCollegesService;
+    @Autowired
+    private UniversityFacultyService universityFacultyService;
+    @Autowired
+    private CoreUserService coreUserService;
+    @Autowired
+    private UniversitySystemService universitySystemService;
+    @Autowired
+    private SchoolClassService schoolClassService;
+    @Autowired
+    private TeacherService teacherService;
+    @Autowired
+    private StudentService studentService;
+    @Autowired
+    private ResourcesApplicationService resourcesApplicationService;
+    @Autowired
+    private UniversitiesCollegesJurisdictionExperimentalSystemService universitiesCollegesJurisdictionExperimentalSystemService;
+
+    private final static String URL = "jdbc:sqlserver://120.79.161.177:1433;databaseName=Test.Zhiyun_v2.0;trustServerCertificate=true;encrypt=true";
+    private final static String USER = "sa";
+    private final static String PASSWORD = "sztzjy@2017";
+
+    // 打开数据库连接
+    public static Connection openConn() throws SQLException {
+        try {
+            Connection connection = DriverManager.getConnection(URL, USER, PASSWORD);
+            if (connection != null) {
+                System.out.println("成功建立数据库连接");
+                return connection;
+            } else {
+                throw new SQLException("无法建立数据库连接");
+            }
+        } catch (SQLException e) {
+            throw new SQLException("无法建立数据库连接: " + e.getMessage(), e);
+        }
+    }
+
+    // 关闭数据库连接
+    public static void closeConn(Connection connection) {
+        if (connection != null) {
+            try {
+                connection.close();
+                System.out.println("数据库连接已关闭");
+            } catch (SQLException e) {
+                System.err.println("无法关闭数据库连接: " + e.getMessage());
+            }
+        }
+    }
+
+    @ApiOperation("迁移学校及学校管理员数据")
+    @PostMapping("/school")
+    public void school() throws SQLException {
+        Connection conn = null;
+        PreparedStatement ps = null;
+        try {
+            conn = openConn();
+
+            String sql = "select EduSchools.Name,EduLevel.LevelName,EduUsers.EmailAddress, " +
+                    "EduUsers.UserName,EduSchools.IsDeleted from EduSchools " +
+                    "join EduUsers on EduSchools.Id=EduUsers.SchoolId " +
+                    "join EduUserRoles on EduUsers.Id = EduUserRoles.UserId " +
+                    "join EduLevel on EduSchools.LevelId=EduLevel.Id where " +
+                    "EduUserRoles.RoleId=2";
+            ps = conn.prepareStatement(sql);
+            ResultSet resultSet = ps.executeQuery();
+            while (resultSet.next()) {
+                UniversitiesColleges universitiesColleges = new UniversitiesColleges();
+                CreateUserDTO createUserDTO = new CreateUserDTO();
+                universitiesColleges.setUniversitiesCollegesName(resultSet.getString(1));
+                universitiesColleges.setUniversitiesCollegesGrade(resultSet.getString(2));
+                universitiesColleges.setUniversitiesCollegesProvince("广东省");
+                universitiesColleges.setUniversitiesCollegesCity("深圳市");
+                universitiesColleges.setUniversitiesCollegesContacts(resultSet.getString(4));
+                universitiesColleges.setUniversitiesCollegesContactsEmail(resultSet.getString(3));
+                universitiesColleges.setUniversitiesCollegesStatus(resultSet.getInt(5) + 1);
+                universitiesColleges.setAddTime(new Date());
+                universitiesColleges.setUniversitiesCollegesStatus(1);
+                createUserDTO.setUserCode(resultSet.getString(4));
+                createUserDTO.setPassword("123qwe");
+                universitiesCollegesService.addAndCreateCoreUser(universitiesColleges, createUserDTO);
+            }
+        } catch (Exception e) {
+            e.printStackTrace();
+        } finally {
+            ps.close();
+            closeConn(conn);
+        }
+    }
+
+
+    @ApiOperation("迁移院系数据")
+    @PostMapping("updateCollage")
+    public void updateCollage() throws SQLException {
+
+        Connection conn = null;
+        PreparedStatement ps = null;
+        try {
+            conn = openConn();
+
+            String sql = "SELECT" +
+                    " col.Name AS collegeName," +
+                    " sch.Name AS schoolName," +
+                    " col.Contacts," +
+                    " col.PhoneNo," +
+                    " col.Address," +
+                    " col.IsDeleted" +
+                    " " +
+                    "FROM " +
+                    " EduColleges col" +
+                    " JOIN EduSchools sch " +
+                    "ON" +
+                    " col.SchoolId = sch.id";
+            ps = conn.prepareStatement(sql);
+            ResultSet resultSet = ps.executeQuery();
+            while (resultSet.next()) {
+                UniversityFacultyQuery universityFacultyQuery = new UniversityFacultyQuery();
+                CoreUser coreUser = new CoreUser();
+                universityFacultyQuery.setUniversityFacultyName(resultSet.getString(1));
+                universityFacultyQuery.setUniversityFacultyContact(resultSet.getString(3));
+                universityFacultyQuery.setUniversityFacultyContactTel(resultSet.getString(4));
+                universityFacultyQuery.setUniversityFacultyContactAddress(resultSet.getString(5));
+
+                UniversitiesColleges universitiesColleges = universitiesCollegesService.getByName(resultSet.getString(2));
+                if (universitiesColleges == null) {
+                    continue;
+                }
+                universityFacultyQuery.setUniversitiesCollegesId(universitiesColleges.getUniversitiesCollegesId());
+                universityFacultyQuery.setUniversityFacultyStatus(resultSet.getInt(6) + 1);
+                universityFacultyQuery.setUniversityFacultyAddTime(new Date());
+                CoreUser userByCode = coreUserService.getUserByCode(universitiesColleges.getUniversitiesCollegesContacts());
+                if (userByCode != null) {
+                    universityFacultyQuery.setUserId(userByCode.getId());
+                } else {
+                    universityFacultyQuery.setUserId(Long.valueOf(100));
+                }
+                universityFacultyQuery.setOrgId(universitiesColleges.getOrgId());
+                universityFacultyService.add(universityFacultyQuery);
+            }
+        } catch (Exception e) {
+            e.printStackTrace();
+        } finally {
+            ps.close();
+            closeConn(conn);
+        }
+
+
+    }
+
+
+    @ApiOperation("迁移专业数据")
+    @PostMapping("updateMajor")
+    public void updateMajor() throws SQLException {
+        Connection conn = null;
+        PreparedStatement ps = null;
+        try {
+            conn = openConn();
+//            UniversitySystemQuery universitySystemQuery;
+
+            String sql = "SELECT " +
+                    "  ma.Name AS majorName, " +
+                    "  ma.Contacts, " +
+                    "  ma.PhoneNo, " +
+                    "  ma.IsDeleted, " +
+                    "  col.Name AS colName, " +
+                    "  sch.Name AS schName  " +
+                    "FROM " +
+                    "  EduMajors ma " +
+                    "  JOIN EduColleges col ON ma.CollegeId = col.Id " +
+                    "  JOIN EduSchools sch ON col.schoolId = sch.id";
+            ps = conn.prepareStatement(sql);
+            ResultSet resultSet = ps.executeQuery();
+            while (resultSet.next()) {
+                UniversitySystemQuery universitySystemQuery = new UniversitySystemQuery();
+                universitySystemQuery.setUniversitySystemName(resultSet.getString(1));
+                universitySystemQuery.setUniversitySystemContact(resultSet.getString(2));
+                universitySystemQuery.setUniversitySystemContactTel(resultSet.getString(3));
+                universitySystemQuery.setUniversitySystemAddTime(new Date());
+                universitySystemQuery.setUniversitySystemStatus(resultSet.getInt(4) + 1);
+                UniversitiesColleges universitiesColleges = universitiesCollegesService.getByName(resultSet.getString(6));
+                if (universitiesColleges == null) {
+                    continue;
+                }
+                UniversityFaculty universityFaculty = universityFacultyService.getByNameAndSchoolId(resultSet.getString(5), universitiesColleges.getUniversitiesCollegesId());
+                if (universityFaculty == null) {
+                    continue;
+                }
+                universitySystemQuery.setUniversityFacultyId(universityFaculty.getUniversityFacultyId());
+
+                universitySystemQuery.setOrgId(universitiesColleges.getOrgId());
+                universitySystemQuery.setUserId(universitiesColleges.getUserId());
+                universitySystemService.add(universitySystemQuery);
+            }
+
+        } catch (Exception e) {
+            e.printStackTrace();
+        } finally {
+            ps.close();
+            closeConn(conn);
+        }
+    }
+
+
+    @ApiOperation("迁移班级数据")
+    @PostMapping("updateClasses")
+    public void updateClasses() throws SQLException {
+        Connection conn = null;
+        PreparedStatement ps = null;
+        try {
+            conn = openConn();
+//            UniversitySystemQuery universitySystemQuery;
+
+            String sql = "SELECT   " +
+                    "  sch.Name as schName,  " +
+                    "  col.Name as colName,  " +
+                    "  maj.Name as majName,  " +
+                    "  cla.Name as claName,  " +
+                    "  cla.IsDeleted  " +
+                    "FROM  " +
+                    "  EduClasses cla  " +
+                    "  JOIN EduMajors maj ON cla.MajorId = maj.Id  " +
+                    "  JOIN EduColleges col ON maj.CollegeId = col.Id  " +
+                    "  JOIN EduSchools sch ON col.schoolId = sch.id";
+            ps = conn.prepareStatement(sql);
+            ResultSet resultSet = ps.executeQuery();
+            while (resultSet.next()) {
+
+
+                String claName = resultSet.getString(4);
+
+                SchoolClass serviceByName = schoolClassService.getByName(claName);
+                if (serviceByName != null) {
+                    continue;
+                }
+                SchoolClass schoolClass = new SchoolClass();
+                schoolClass.setClassName(resultSet.getString(4));
+                UniversitiesColleges universitiesColleges = universitiesCollegesService.getByName(resultSet.getString(1));
+                if (universitiesColleges == null) {
+                    continue;
+                }
+                schoolClass.setUniversitiesCollegesId(universitiesColleges.getUniversitiesCollegesId());
+                String uniqueClassSn = schoolClassService.buildClassSnEnsureUnique(universitiesColleges, schoolClass.getClassName());
+                schoolClass.setClassSn(uniqueClassSn);
+                schoolClass.setOrgId(universitiesColleges.getOrgId());
+                UniversityFaculty universityFaculty = universityFacultyService.getByNameAndSchoolId(resultSet.getString(2), universitiesColleges.getUniversitiesCollegesId());
+                if (universityFaculty == null) {
+                    continue;
+                }
+                schoolClass.setUniversityFacultyId(universityFaculty.getUniversityFacultyId());
+                UniversitySystem universitySystem = universitySystemService.getByNameAndSchoolIdAndCollegeId(resultSet.getString(3), universityFaculty.getUniversityFacultyId());
+                if (universitySystem == null) {
+                    continue;
+                }
+                schoolClass.setUniversitySystemId(universitySystem.getUniversitySystemId());
+                schoolClass.setOrgId(universitiesColleges.getOrgId());
+                schoolClass.setUserId(Long.valueOf(100));
+                schoolClass.setClassStatus(resultSet.getInt(5) + 1);
+                schoolClassService.save(schoolClass);
+            }
+
+        } catch (Exception e) {
+            e.printStackTrace();
+        } finally {
+            ps.close();
+            closeConn(conn);
+        }
+    }
+
+    @ApiOperation("迁移教师数据")
+    @PostMapping("updateTeacher")
+    public void updateTeacher() throws SQLException {
+        Connection conn = null;
+        PreparedStatement ps = null;
+        try {
+            conn = openConn();
+
+            String sql = "SELECT  " +
+                    "  sch.Name AS schName,  " +
+                    "  col.Name AS colName,  " +
+                    "  maj.Name AS majName,  " +
+                    "  tea.Name AS teacherName,  " +
+                    "  tea.TeacherNo AS teacherNo,  " +
+                    "  tea.PhoneNo,  " +
+                    "  tea.Sex,  " +
+                    "  tea.IsDeleted   " +
+                    "FROM  " +
+                    "  EduTeachers tea  " +
+                    "  JOIN EduColleges col ON tea.CollegeId = col.Id  " +
+                    "  JOIN EduMajors maj ON tea.MajorId = maj.Id  " +
+                    "  JOIN EduSchools sch ON tea.SchoolId = sch.Id where sch.Id = 117";
+            ps = conn.prepareStatement(sql);
+            ResultSet resultSet = ps.executeQuery();
+            while (resultSet.next()) {
+                Teacher teacher = new Teacher();
+                UniversitiesColleges universitiesColleges = universitiesCollegesService.getByName(resultSet.getString(1));
+                if (universitiesColleges == null) {
+                    continue;
+                }
+                UniversityFaculty universityFaculty = universityFacultyService.getByNameAndSchoolId(resultSet.getString(2), universitiesColleges.getUniversitiesCollegesId());
+                if (universityFaculty == null) {
+                    continue;
+                }
+                UniversitySystem universitySystem = universitySystemService.getByNameAndSchoolIdAndCollegeId(resultSet.getString(3), universityFaculty.getUniversityFacultyId());
+                if (universitySystem == null) {
+                    continue;
+                }
+                teacher.setTeacherName(resultSet.getString(4));
+                teacher.setUniversitiesCollegesId(universitiesColleges.getUniversitiesCollegesId());
+                teacher.setUniversityFacultyId(universityFaculty.getUniversityFacultyId());
+                teacher.setUniversitySystemId(universitySystem.getUniversitySystemId());
+                teacher.setTeacherMobile(resultSet.getString(6));
+                teacher.setTeacherJobNumber(resultSet.getString(5));
+                teacher.setTeacherStatus(resultSet.getInt(8) + 1);
+                int anInt = resultSet.getInt(7);
+                GenderEnum genderEnum;
+                if (anInt == 1) {
+                    genderEnum = GenderEnum.MAN;
+                } else {
+                    genderEnum = GenderEnum.WOMAN;
+                }
+                teacher.setTeacherGender(genderEnum);
+                teacher.setAddTime(new Date());
+                teacherService.add(teacher);
+            }
+
+        } catch (Exception e) {
+            e.printStackTrace();
+        } finally {
+            ps.close();
+            closeConn(conn);
+        }
+    }
+
+
+    @ApiOperation("迁移学生数据")
+    @PostMapping("updateStudent")
+    public void updateStudent() throws SQLException {
+        Connection conn = null;
+        PreparedStatement ps = null;
+        try {
+            conn = openConn();
+            String sql = "SELECT  " +
+                    "  sch.Name AS schName,  " +
+                    "  col.Name AS colName,  " +
+                    "  maj.Name AS majName,  " +
+                    "  stu.Name AS studentName,  " +
+                    "  stu.StudentNo AS StudentNo,  " +
+                    "  stu.PhoneNo,  " +
+                    "  stu.Sex,  " +
+                    "  stu.IsDeleted,  " +
+                    "  cla.Name   " +
+                    "FROM  " +
+                    "  EduStudents stu  " +
+                    "  JOIN EduColleges col ON stu.CollegeId = col.Id  " +
+                    "  JOIN EduMajors maj ON stu.MajorId = maj.Id  " +
+                    "  JOIN EduSchools sch ON stu.SchoolId = sch.Id  " +
+                    "  JOIN EduClasses cla ON stu.ClassId = cla.Id where sch.Id = 117";
+            ps = conn.prepareStatement(sql);
+            ResultSet resultSet = ps.executeQuery();
+            while (resultSet.next()) {
+                Student student = new Student();
+                student.setStudentName(resultSet.getString(4));
+                student.setStudentSn(resultSet.getString(5));
+                student.setStudentMobile(resultSet.getString(6));
+                String username = resultSet.getString(5);
+                Map<String, Object> studentByNo = coreUserService.getStudentByNo(username);
+                if(studentByNo!=null){
+                    continue;
+                }
+                int anInt = resultSet.getInt(7);
+                GenderEnum genderEnum;
+                if (anInt == 1) {
+                    genderEnum = GenderEnum.MAN;
+                } else {
+                    genderEnum = GenderEnum.WOMAN;
+                }
+                student.setStudentGender(genderEnum);
+                student.setAddTime(new Date());
+                UniversitiesColleges universitiesColleges = universitiesCollegesService.getByName(resultSet.getString(1));
+                if (universitiesColleges == null) {
+                    continue;
+                }
+                UniversityFaculty universityFaculty = universityFacultyService.getByNameAndSchoolId(resultSet.getString(2), universitiesColleges.getUniversitiesCollegesId());
+                if (universityFaculty == null) {
+                    continue;
+                }
+                UniversitySystem universitySystem = universitySystemService.getByNameAndSchoolIdAndCollegeId(resultSet.getString(3), universityFaculty.getUniversityFacultyId());
+                if (universitySystem == null) {
+                    continue;
+                }
+                SchoolClass schoolClass = schoolClassService.getByNameAndMajorId(resultSet.getString(9),
+                        universitySystem.getUniversitySystemId(),
+                        universitiesColleges.getUniversitiesCollegesId(),
+                        universityFaculty.getUniversityFacultyId()
+                );
+                if (universitiesColleges == null || universityFaculty == null || universitySystem == null || schoolClass == null) {
+                    continue;
+                }
+                student.setClassId(schoolClass.getClassId());
+                studentService.add(student);
+            }
+        } catch (Exception ex) {
+            ex.printStackTrace();
+        } finally {
+            ps.close();
+            closeConn(conn);
+        }
+    }
+
+
 //    @ApiOperation("迁移应用系统")
 //    @PostMapping("copyApplications")
 //    public void copyApplications() {
@@ -523,4 +526,4 @@
 //            e.printStackTrace();
 //        }
 //    }
-//}
+}