1、swagger接口文档

admin-core/src/main/java/com/ibeetl/admin/core/service/CorePlatformService.java

@@ -300,10 +300,27 @@ public class CorePlatformService {
         }
 
         if (coreUserList != null && coreUserList.size() > 0) {
-            throw new PlatformException("注册的账号已存在：" + code);
+//            throw new PlatformException("注册的账号已存在：" + code);
+            return;
         }
     }
 
+    public Boolean CheckUserCodeThrowMessage(String code){
+        code = code.trim();
+        CoreUser coreUser = new CoreUser();
+        coreUser.setCode(code);
+        List<CoreUser> coreUserList = coreUserDao.template(coreUser);
+        if (code.startsWith(ACCESS_SUPPER_ADMIN)) {
+            throw new PlatformException("注册账号不允许admin开头：" + code);
+        }
+
+        if (coreUserList != null && coreUserList.size() > 0) {
+//            throw new PlatformException("注册的账号已存在：" + code);
+            return true;
+        }
+        return false;
+    }
+
     public boolean isAllowUserCode(Long id,String code){
         CoreUser coreUser = new CoreUser();
         coreUser.setCode(code);

admin-core/src/main/java/com/ibeetl/admin/core/service/CoreUserService.java

@@ -89,8 +89,8 @@ public class CoreUserService extends CoreBaseService<CoreUser> {
 		Assert.notNull(jobType0, "岗位不能为空！");
 		Assert.notNull(jobType1, "岗位子类型不能为空！");
 
-		Boolean length = userCode.length() <= 16;
+//		Boolean length = userCode.length() <= 16;
-		Assert.isTrue(length, "输入内容："+userCode+ " 超过16个字符！");
+//		Assert.isTrue(length, "输入内容："+userCode+ " 超过16个字符！");
 
 		// 判断用户Code唯一
 		Boolean isNotExist = coreUserDao.createLambdaQuery().andEq(CoreUser::getCode,userCode).count() == 0;
@@ -106,8 +106,12 @@ public class CoreUserService extends CoreBaseService<CoreUser> {
 		user.setJobType0(jobType0.name());
 		user.setJobType1(jobType1.name());
 		user.setOrgId(orgId);
-		user.setOldId(50000+user.getId());
+
 		coreUserDao.insert(user);
+		CoreUser c = new CoreUser();
+		c.setId(user.getId());
+		c.setOldId(50000+user.getId());
+		coreUserDao.updateTemplateById(c);
 		return user.getId();
 	}
 	

web/src/main/java/com/ibeetl/jlw/dao/StudentDao.java

@@ -123,4 +123,6 @@ public interface StudentDao extends BaseMapper<Student>{
 
     List<Map<String,Object>> findAllBySchoolId(Long schoolId);
 
+    List<Student> getStudentByStudentNoAndOrgId(String studentNo,Long orgId);
+
 }

web/src/main/java/com/ibeetl/jlw/dao/TeacherDao.java

@@ -56,4 +56,6 @@ public interface TeacherDao extends BaseMapper<Teacher>{
 
 
     List<Map<String,Object>> findAllTeacherBySchoolId(Long schoolId);
+
+    List<Teacher> getByTeacherJobNameAndOrgId(String teacherJobName, Long orgId);
 }

web/src/main/java/com/ibeetl/jlw/entity/UniversityFaculty.java

@@ -58,133 +58,193 @@ public class UniversityFaculty extends BaseEntity{
 
     private Long orgId;
 
+    private Long oldId;
+
+    public Long getOldId() {
+        return oldId;
+    }
+
+    public void setOldId(Long oldId) {
+        this.oldId = oldId;
+    }
+
     public UniversityFaculty() {
     }
 
-    /**院系ID（学院ID）
+    /**
+     * 院系ID（学院ID）
+     *
      * @return
      */
     public Long getUniversityFacultyId() {
         return universityFacultyId;
     }
-    /**院系ID（学院ID）
+
+    /**
+     * 院系ID（学院ID）
+     *
      * @param universityFacultyId
      */
     public void setUniversityFacultyId(Long universityFacultyId) {
         this.universityFacultyId = universityFacultyId;
     }
 
-    /**院系名称
+    /**
+     * 院系名称
+     *
      * @return
      */
     public String getUniversityFacultyName() {
         return universityFacultyName;
     }
-    /**院系名称
+
+    /**
+     * 院系名称
+     *
      * @param universityFacultyName
      */
     public void setUniversityFacultyName(String universityFacultyName) {
         this.universityFacultyName = universityFacultyName;
     }
 
-    /**院系联系人
+    /**
+     * 院系联系人
+     *
      * @return
      */
     public String getUniversityFacultyContact() {
         return universityFacultyContact;
     }
-    /**院系联系人
+
+    /**
+     * 院系联系人
+     *
      * @param universityFacultyContact
      */
     public void setUniversityFacultyContact(String universityFacultyContact) {
         this.universityFacultyContact = universityFacultyContact;
     }
 
-    /**院系联系人电话
+    /**
+     * 院系联系人电话
+     *
      * @return
      */
     public String getUniversityFacultyContactTel() {
         return universityFacultyContactTel;
     }
-    /**院系联系人电话
+
+    /**
+     * 院系联系人电话
+     *
      * @param universityFacultyContactTel
      */
     public void setUniversityFacultyContactTel(String universityFacultyContactTel) {
         this.universityFacultyContactTel = universityFacultyContactTel;
     }
 
-    /**院系联系人地址
+    /**
+     * 院系联系人地址
+     *
      * @return
      */
     public String getUniversityFacultyContactAddress() {
         return universityFacultyContactAddress;
     }
-    /**院系联系人地址
+
+    /**
+     * 院系联系人地址
+     *
      * @param universityFacultyContactAddress
      */
     public void setUniversityFacultyContactAddress(String universityFacultyContactAddress) {
         this.universityFacultyContactAddress = universityFacultyContactAddress;
     }
 
-    /**院校ID （院系的上一级）
+    /**
+     * 院校ID （院系的上一级）
+     *
      * @return
      */
     public Long getUniversitiesCollegesId() {
         return universitiesCollegesId;
     }
-    /**院校ID （院系的上一级）
+
+    /**
+     * 院校ID （院系的上一级）
+     *
      * @param universitiesCollegesId
      */
     public void setUniversitiesCollegesId(Long universitiesCollegesId) {
         this.universitiesCollegesId = universitiesCollegesId;
     }
 
-    /**状态（ 1 正常 2删除）
+    /**
+     * 状态（ 1 正常 2删除）
+     *
      * @return
      */
     public Integer getUniversityFacultyStatus() {
         return universityFacultyStatus;
     }
-    /**状态（ 1 正常 2删除）
+
+    /**
+     * 状态（ 1 正常 2删除）
+     *
      * @param universityFacultyStatus
      */
     public void setUniversityFacultyStatus(Integer universityFacultyStatus) {
         this.universityFacultyStatus = universityFacultyStatus;
     }
 
-    /**创建时间
+    /**
+     * 创建时间
+     *
      * @return
      */
     public Date getUniversityFacultyAddTime() {
         return universityFacultyAddTime;
     }
-    /**创建时间
+
+    /**
+     * 创建时间
+     *
      * @param universityFacultyAddTime
      */
     public void setUniversityFacultyAddTime(Date universityFacultyAddTime) {
         this.universityFacultyAddTime = universityFacultyAddTime;
     }
 
-    /**用户ID
+    /**
+     * 用户ID
+     *
      * @return
      */
     public Long getUserId() {
         return userId;
     }
-    /**用户ID
+
+    /**
+     * 用户ID
+     *
      * @param userId
      */
     public void setUserId(Long userId) {
         this.userId = userId;
     }
 
-    /**组织ID
+    /**
+     * 组织ID
+     *
      * @return
      */
     public Long getOrgId() {
         return orgId;
     }
-    /**组织ID
+
+    /**
+     * 组织ID
+     *
      * @param orgId
      */
     public void setOrgId(Long orgId) {

web/src/main/java/com/ibeetl/jlw/entity/UniversitySystem.java

@@ -54,6 +54,17 @@ public class UniversitySystem extends BaseEntity{
 
     private Long orgId ;
 
+    private Long oldId;
+
+
+    public Long getOldId() {
+        return oldId;
+    }
+
+    public void setOldId(Long oldId) {
+        this.oldId = oldId;
+    }
+
     public UniversitySystem(){
     }
 

web/src/main/java/com/ibeetl/jlw/service/SchoolClassService.java

@@ -145,7 +145,7 @@ public class SchoolClassService extends CoreBaseService<SchoolClass> {
 
     public SchoolClass getByName(String name, Long orgId) {
         SchoolClassQuery query = new SchoolClassQuery();
-        query.setClassStatus(1);
+//        query.setClassStatus(1);
         query.setClassName(name.trim());
 
         if (orgId != null && orgId != 1) {
@@ -154,6 +154,25 @@ public class SchoolClassService extends CoreBaseService<SchoolClass> {
         return getFirst(getValuesByQueryNotWithPermission(query));
     }
 
+
+    public SchoolClass getByNameAndCollegeIdAndMajorId(String name,Long majorId,Long collegeId, Long orgId) {
+        SchoolClassQuery query = new SchoolClassQuery();
+//        query.setClassStatus(1);
+        query.setClassName(name.trim());
+        query.setUniversitySystemId(majorId);
+        query.setUniversityFacultyId(collegeId);
+        if (orgId != null && orgId != 1) {
+            query.setOrgId(orgId);
+        }
+        return getFirst(getValuesByQueryNotWithPermission(query));
+    }
+
+    public SchoolClass getByOldId(Long oldClassId){
+        SchoolClassQuery query = new SchoolClassQuery();
+        query.setOldId(oldClassId);
+        return getFirst(getValuesByQueryNotWithPermission(query));
+    }
+
     public SchoolClass getByName(String name) {
         return getByName(name, null);
     }
@@ -268,7 +287,7 @@ public class SchoolClassService extends CoreBaseService<SchoolClass> {
         SchoolClassQuery query = new SchoolClassQuery();
         query.setClassName(name);
         query.setUniversitySystemId(majorId);
-        query.setClassStatus(1);
+//        query.setClassStatus(1);
         query.setUniversitiesCollegesId(collegeId);
         query.setUniversityFacultyId(facultyId);
         return getFirst(getValuesByQueryNotWithPermission(query));

web/src/main/java/com/ibeetl/jlw/service/StudentService.java

@@ -486,6 +486,13 @@ public class StudentService extends CoreBaseService<Student> {
         }
     }
 
+    public Student getStudentByStudentNoAndOrgId(String studentNo, Long orgId) {
+        List<Student> students = studentDao.getStudentByStudentNoAndOrgId(studentNo, orgId);
+        if(students!=null&&students.size()>0){
+            return students.get(0);
+        }
+        return null;
+    }
     public JsonResult add(@NotNull Student student) {
 
         Date date = new Date();

web/src/main/java/com/ibeetl/jlw/service/TeacherService.java

@@ -72,36 +72,57 @@ import static com.ibeetl.jlw.web.IpAddressController.ipAddressMap;
 @Transactional
 public class TeacherService extends CoreBaseService<Teacher> {
 
-    @Autowired private TeacherDao teacherDao;
+    @Autowired
+    private TeacherDao teacherDao;
 
-    @Autowired private CorePlatformService platformService;
+    @Autowired
+    private CorePlatformService platformService;
 
-    @Autowired private UserConsoleService userConsoleService;
+    @Autowired
+    private UserConsoleService userConsoleService;
 
-    @Autowired private CoreUserRoleDao coreUserRoleDao;
+    @Autowired
+    private CoreUserRoleDao coreUserRoleDao;
 
-    @Autowired private UniversitiesCollegesService universitiesCollegesService;
+    @Autowired
-    @Autowired private UniversitiesCollegesDao universitiesCollegesDao;
+    private UniversitiesCollegesService universitiesCollegesService;
+    @Autowired
+    private UniversitiesCollegesDao universitiesCollegesDao;
 
-    @Autowired private StudentService studentService;
+    @Autowired
+    private StudentService studentService;
     @Lazy
-    @Autowired private TeacherService teacherService;
+    @Autowired
-
+    private TeacherService teacherService;
-    @Autowired private CompetitionTeacherEvaluationService competitionTeacherEvaluationService;
+
-
+    @Autowired
-    @Autowired private CompetitionService competitionService;
+    private CompetitionTeacherEvaluationService competitionTeacherEvaluationService;
-    @Autowired private CompetitionStudentsService competitionStudentsService;
+
-    @Autowired private CompetitionTaskOneQuestionService competitionTaskOneQuestionService;
+    @Autowired
-    @Autowired private CompetitionTaskSecondQuestionService competitionTaskSecondQuestionService;
+    private CompetitionService competitionService;
-    @Autowired private CompetitionTaskSecondQuestionStepService competitionTaskSecondQuestionStepService;
+    @Autowired
-
+    private CompetitionStudentsService competitionStudentsService;
-    @Autowired private ExamService examService;
+    @Autowired
-    @Autowired private ExamStudentsService examStudentsService;
+    private CompetitionTaskOneQuestionService competitionTaskOneQuestionService;
-    @Autowired private ExamTaskOneQuestionService examTaskOneQuestionService;
+    @Autowired
-    @Autowired private ExamTaskSecondQuestionService examTaskSecondQuestionService;
+    private CompetitionTaskSecondQuestionService competitionTaskSecondQuestionService;
-    @Autowired private ExamTaskSecondQuestionStepService examTaskSecondQuestionStepService;
+    @Autowired
-    @Autowired private ExamTaskThreeQuestionService examTaskThreeQuestionService;
+    private CompetitionTaskSecondQuestionStepService competitionTaskSecondQuestionStepService;
-    @Autowired private ExamTaskThreeQuestionStepService examTaskThreeQuestionStepService;
+
+    @Autowired
+    private ExamService examService;
+    @Autowired
+    private ExamStudentsService examStudentsService;
+    @Autowired
+    private ExamTaskOneQuestionService examTaskOneQuestionService;
+    @Autowired
+    private ExamTaskSecondQuestionService examTaskSecondQuestionService;
+    @Autowired
+    private ExamTaskSecondQuestionStepService examTaskSecondQuestionStepService;
+    @Autowired
+    private ExamTaskThreeQuestionService examTaskThreeQuestionService;
+    @Autowired
+    private ExamTaskThreeQuestionStepService examTaskThreeQuestionStepService;
     @Autowired
     private WebPlatformService webPlatformService;
 
@@ -130,7 +151,8 @@ public class TeacherService extends CoreBaseService<Teacher> {
             List<Teacher> teacherLogList = getTeacherLog(teacherQuery);
             try {
                 groupByTeacherId = teacherLogList.stream().collect(Collectors.groupingBy(e -> (null != e.get("platform") && StringUtils.isNotBlank(e.get("platform").toString()) ? e.get("platform").toString() : "null") + e.getTeacherId()));
-            }catch (Exception e){}
+            } catch (Exception e) {
+            }
         }
 
         if (null != groupByTeacherId) {
@@ -221,6 +243,14 @@ public class TeacherService extends CoreBaseService<Teacher> {
         return teacherDao.getIdsByQuery(teacherQuery);
     }
 
+    public Teacher getByTeacherJobNameAndOrgId(String teacherJobName, Long orgId) {
+        List<Teacher> teachers = teacherDao.getByTeacherJobNameAndOrgId(teacherJobName, orgId);
+        if(teachers!=null&&teachers.size()>0){
+            return teachers.get(0);
+        }
+        return null;
+    }
+
     public JsonResult add(Teacher teacher) {
 
         Date date = new Date();

web/src/main/java/com/ibeetl/jlw/service/UniversitiesCollegesService.java

@@ -100,9 +100,8 @@ public class UniversitiesCollegesService extends CoreBaseService<UniversitiesCol
     }
 
     public boolean add(UniversitiesColleges universitiesColleges){
-        universitiesColleges.setOldSchoolId(universitiesColleges.getUniversitiesCollegesId()+500);
-        universitiesCollegesDao.insert(universitiesColleges);
 
+        universitiesCollegesDao.insert(universitiesColleges);
         CoreOrg coreOrg = new CoreOrg();
         coreOrg.setName(universitiesColleges.getUniversitiesCollegesName());
         coreOrg.setCode("u_"+universitiesColleges.getUniversitiesCollegesId());
@@ -120,6 +119,7 @@ public class UniversitiesCollegesService extends CoreBaseService<UniversitiesCol
         u.setOrgId(coreOrg.getId());
         // 三位数字+三个小写字母. 组成的授权动态码
         u.setUniversitiesCollegesAuthCode(RandomUtil.randomString(6));
+        u.setOldSchoolId(universitiesColleges.getUniversitiesCollegesId()+500);
         universitiesCollegesDao.updateTemplateById(u);
 
         universitiesColleges.setUniversitiesCollegesAuthCode(u.getUniversitiesCollegesAuthCode());

web/src/main/java/com/ibeetl/jlw/service/UniversityFacultyService.java

@@ -240,4 +240,16 @@ public class UniversityFacultyService extends CoreBaseService<UniversityFaculty>
         query.setUniversitiesCollegesId(schoolId);
         return getFirst(getValuesByQueryNotWithPermission(query));
     }
+
+    public UniversityFaculty getByOldId(Long oldId){
+        UniversityFacultyQuery query = new UniversityFacultyQuery();
+        query.setOldId(oldId);
+        return getFirst(getValuesByQueryNotWithPermission(query));
+    }
+
+    public UniversityFaculty getById(Long id){
+        UniversityFacultyQuery query = new UniversityFacultyQuery();
+        query.setUniversityFacultyId(id);
+        return getFirst(getValuesByQueryNotWithPermission(query));
+    }
 }

web/src/main/java/com/ibeetl/jlw/service/UniversitySystemService.java

@@ -154,12 +154,23 @@ public class UniversitySystemService extends CoreBaseService<UniversitySystem>{
         UniversitySystemQuery query = new UniversitySystemQuery();
         query.setUniversitySystemStatus(1);
         query.setUniversitySystemName(name.trim());
+        if (query != null) {
+            query.setOrgId(orgId);
+        }
+        return getFirst(universitySystemDao.getValuesByQueryNotWithPermission(query));
+    }
 
+    public UniversitySystem getByNameAndUniversityFacultyId (String name, Long universityFacultyId, Long orgId){
+        UniversitySystemQuery query = new UniversitySystemQuery();
+        query.setUniversitySystemStatus(1);
+        query.setUniversitySystemName(name.trim());
+        query.setUniversityFacultyId(universityFacultyId);
         if (query != null) {
             query.setOrgId(orgId);
         }
         return getFirst(universitySystemDao.getValuesByQueryNotWithPermission(query));
     }
+
     public UniversitySystem getByName (String name){
         return getByName(name, null);
     }
@@ -231,11 +242,31 @@ public class UniversitySystemService extends CoreBaseService<UniversitySystem>{
         return universitySystemDao.getUniversitySystemListByOrgId(orgId);
     }
 
-    public UniversitySystem getByNameAndSchoolIdAndCollegeId(String name,Long facultyId){
+    public UniversitySystem getByNameAndSchoolIdAndCollegeId(String name,Long facultyId,Long orgId){
         UniversitySystemQuery universitySystemQuery = new UniversitySystemQuery();
         universitySystemQuery.setUniversitySystemName(name);
         universitySystemQuery.setUniversityFacultyId(facultyId);
         universitySystemQuery.setUniversitySystemStatus(1);
+        universitySystemQuery.setOrgId(orgId);
         return getFirst(universitySystemDao.getValuesByQueryNotWithPermission(universitySystemQuery));
     }
+
+    public UniversitySystem getByOldId(Long oldId,Long universityFacultyId){
+        UniversitySystemQuery universitySystemQuery = new UniversitySystemQuery();
+        universitySystemQuery.setOldId(oldId);
+        universitySystemQuery.setUniversityFacultyId(universityFacultyId);
+        return getFirst(universitySystemDao.getValuesByQueryNotWithPermission(universitySystemQuery));
+    }
+
+    public UniversitySystem getByOldId(Long oldId){
+        UniversitySystemQuery universitySystemQuery = new UniversitySystemQuery();
+        universitySystemQuery.setOldId(oldId);
+        return getFirst(universitySystemDao.getValuesByQueryNotWithPermission(universitySystemQuery));
+    }
+
+    public UniversitySystem getById(Long id){
+        UniversitySystemQuery query = new UniversitySystemQuery();
+        query.setUniversitySystemId(id);
+        return getFirst(universitySystemDao.getValuesByQueryNotWithPermission(query));
+    }
 }

web/src/main/java/com/ibeetl/jlw/web/TestController.java

@@ -7,6 +7,7 @@ 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.CorePlatformService;
 import com.ibeetl.admin.core.service.CoreUserService;
 import com.ibeetl.jlw.entity.*;
 import com.ibeetl.jlw.entity.dto.CreateUserDTO;
@@ -101,6 +102,11 @@ public class TestController {
             ps = conn.prepareStatement(sql);
             ResultSet resultSet = ps.executeQuery();
             while (resultSet.next()) {
+
+                String schoolName = resultSet.getString(1);
+                UniversitiesColleges collegesServiceByName = universitiesCollegesService.getByName(schoolName);
+                if (collegesServiceByName != null) continue;
+
                 UniversitiesColleges universitiesColleges = new UniversitiesColleges();
                 CreateUserDTO createUserDTO = new CreateUserDTO();
                 universitiesColleges.setUniversitiesCollegesName(resultSet.getString(1));
@@ -136,6 +142,7 @@ public class TestController {
 
             String sql = "SELECT" +
                     " col.Name AS collegeName," +
+                    " col.Id as collegeId," +
                     " sch.Name AS schoolName," +
                     " col.Contacts," +
                     " col.PhoneNo," +
@@ -149,27 +156,43 @@ public class TestController {
                     " col.SchoolId = sch.id";
             ps = conn.prepareStatement(sql);
             ResultSet resultSet = ps.executeQuery();
+            int i = 0;
             while (resultSet.next()) {
+                System.out.println("-----------------------------------已处理" + i++ + "-------------------------------------------");
                 UniversityFacultyQuery universityFacultyQuery = new UniversityFacultyQuery();
                 CoreUser coreUser = new CoreUser();
                 universityFacultyQuery.setUniversityFacultyName(resultSet.getString(1));
-                universityFacultyQuery.setUniversityFacultyContact(resultSet.getString(3));
+                String collegeName = resultSet.getString(1);
-                universityFacultyQuery.setUniversityFacultyContactTel(resultSet.getString(4));
+                Long oldId = resultSet.getLong(2);
-                universityFacultyQuery.setUniversityFacultyContactAddress(resultSet.getString(5));
+                if (collegeName.equals("演示学院")) {
+                    int a = 0;
+                }
+                universityFacultyQuery.setUniversityFacultyContact(resultSet.getString(4));
+                universityFacultyQuery.setUniversityFacultyContactTel(resultSet.getString(5));
+                universityFacultyQuery.setUniversityFacultyContactAddress(resultSet.getString(6));
 
-                UniversitiesColleges universitiesColleges = universitiesCollegesService.getByName(resultSet.getString(2));
+                UniversitiesColleges universitiesColleges = universitiesCollegesService.getByName(resultSet.getString(3));
                 if (universitiesColleges == null) {
                     continue;
                 }
                 universityFacultyQuery.setUniversitiesCollegesId(universitiesColleges.getUniversitiesCollegesId());
-                universityFacultyQuery.setUniversityFacultyStatus(resultSet.getInt(6) + 1);
+                universityFacultyQuery.setUniversityFacultyStatus(resultSet.getInt(7) + 1);
                 universityFacultyQuery.setUniversityFacultyAddTime(new Date());
+
+                UniversityFaculty universityFaculty = universityFacultyService.getByOldId(oldId);
+                if (universityFaculty != null) {
+                    universityFaculty.setOldId(oldId);
+                    universityFacultyService.updateTemplate(universityFaculty);
+                    continue ;
+                }
+
                 CoreUser userByCode = coreUserService.getUserByCode(universitiesColleges.getUniversitiesCollegesContacts());
                 if (userByCode != null) {
                     universityFacultyQuery.setUserId(userByCode.getId());
                 } else {
                     universityFacultyQuery.setUserId(Long.valueOf(100));
                 }
+                universityFacultyQuery.setOldId(oldId);
                 universityFacultyQuery.setOrgId(universitiesColleges.getOrgId());
                 universityFacultyService.add(universityFacultyQuery);
             }
@@ -199,28 +222,50 @@ public class TestController {
                     "  ma.PhoneNo, " +
                     "  ma.IsDeleted, " +
                     "  col.Name AS colName, " +
-                    "  sch.Name AS schName  " +
+                    "  sch.Name AS schName," +
+                    "  col.Id as colId," +
+                    "  ma.Id as majorId  " +
                     "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();
+            int i = 0;
             while (resultSet.next()) {
+                System.out.println("-----------------------------------已处理" + i++ + "-------------------------------------------");
+                Long oldCollegeId = resultSet.getLong(7);
+                Long oldId = resultSet.getLong(8);
                 UniversitySystemQuery universitySystemQuery = new UniversitySystemQuery();
+                universitySystemQuery.setOldId(oldId);
                 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);
+                if (resultSet.getString(6).equals("安阳学院")) {
+                    int a = 0;
+                }
                 UniversitiesColleges universitiesColleges = universitiesCollegesService.getByName(resultSet.getString(6));
+                if (resultSet.getString(6).equals("安徽建筑大学2")) {
+                    continue;
+                }
                 if (universitiesColleges == null) {
                     continue;
                 }
-                UniversityFaculty universityFaculty = universityFacultyService.getByNameAndSchoolId(resultSet.getString(5), universitiesColleges.getUniversitiesCollegesId());
+                UniversityFaculty universityFaculty = universityFacultyService.getByOldId(oldCollegeId);
                 if (universityFaculty == null) {
                     continue;
                 }
+                if (universitiesColleges.getUniversitiesCollegesName().equals("安阳学院") && universityFaculty.getUniversityFacultyName().equals("经管学院")) {
+                    int a = 0;
+                }
+                UniversitySystem systemServiceByName = universitySystemService.getByOldId(resultSet.getLong(8),universityFaculty.getUniversityFacultyId());
+                if (systemServiceByName != null) {
+                    systemServiceByName.setOldId(oldId);
+                    universitySystemService.updateTemplate(systemServiceByName);
+                    continue;
+                }
                 universitySystemQuery.setUniversityFacultyId(universityFaculty.getUniversityFacultyId());
 
                 universitySystemQuery.setOrgId(universitiesColleges.getOrgId());
@@ -246,31 +291,50 @@ public class TestController {
             conn = openConn();
 //            UniversitySystemQuery universitySystemQuery;
 
-            String sql = "SELECT   " +
+            String sql = "SELECT    \n" +
-                    "  sch.Name as schName,  " +
+                    "                      cla.Name as schName,   \n" +
-                    "  col.Name as colName,  " +
+                    "                      cla.Name as colName,   \n" +
-                    "  maj.Name as majName,  " +
+                    "                      cla.Name as majName,   \n" +
-                    "  cla.Name as claName,  " +
+                    "                      cla.Name as claName,   \n" +
-                    "  cla.IsDeleted  " +
+                    "                      cla.IsDeleted, \n" +
-                    "FROM  " +
+                    "                      cla.CollegeId, \n" +
-                    "  EduClasses cla  " +
+                    "                      cla.MajorId, \n" +
-                    "  JOIN EduMajors maj ON cla.MajorId = maj.Id  " +
+                    "                      cla.id," +
-                    "  JOIN EduColleges col ON maj.CollegeId = col.Id  " +
+                    "                      cla.schoolId   \n" +
-                    "  JOIN EduSchools sch ON col.schoolId = sch.id";
+                    "                    FROM   \n" +
+                    "                      EduClasses cla";
             ps = conn.prepareStatement(sql);
             ResultSet resultSet = ps.executeQuery();
+            int i = 0;
             while (resultSet.next()) {
+                System.out.println("-----------------------------------已处理" + i++ + "-------------------------------------------");
+                String claName = resultSet.getString(4);
+                if (claName.equals("内部体验1班")) {
+                    int a = 0;
+                }
+                if (resultSet.getString(9).equals("16")) {
+                    continue;
+                }
+                SchoolClass serviceByName = schoolClassService.getByOldId(resultSet.getLong(8));
+                if (serviceByName != null) {
+                    serviceByName.setOldClassId(resultSet.getLong(8));
+                    schoolClassService.updateTemplate(serviceByName);
+                    continue;
+                }
 
+                UniversitySystem universitySystem = universitySystemService.getByOldId(resultSet.getLong(7));
+                if (universitySystem == null) {
+                    continue;
+                }
 
-                String claName = resultSet.getString(4);
 
-                SchoolClass serviceByName = schoolClassService.getByName(claName);
+                UniversitiesColleges universitiesColleges = universitiesCollegesService.getByOrgId(universitySystem.getOrgId());
-                if (serviceByName != null) {
+                if (universitiesColleges == null) {
                     continue;
                 }
+
                 SchoolClass schoolClass = new SchoolClass();
                 schoolClass.setClassName(resultSet.getString(4));
-                UniversitiesColleges universitiesColleges = universitiesCollegesService.getByName(resultSet.getString(1));
                 if (universitiesColleges == null) {
                     continue;
                 }
@@ -278,19 +342,16 @@ public class TestController {
                 String uniqueClassSn = schoolClassService.buildClassSnEnsureUnique(universitiesColleges, schoolClass.getClassName());
                 schoolClass.setClassSn(uniqueClassSn);
                 schoolClass.setOrgId(universitiesColleges.getOrgId());
-                UniversityFaculty universityFaculty = universityFacultyService.getByNameAndSchoolId(resultSet.getString(2), universitiesColleges.getUniversitiesCollegesId());
+                UniversityFaculty universityFaculty = universityFacultyService.getById(universitySystem.getUniversityFacultyId());
                 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);
+                schoolClass.setClassStatus(1);
+                schoolClass.setOldClassId(resultSet.getLong(8));
                 schoolClassService.save(schoolClass);
             }
 
@@ -323,10 +384,12 @@ public class TestController {
                     "  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";
+                    "  JOIN EduSchools sch ON tea.SchoolId = sch.Id ";
             ps = conn.prepareStatement(sql);
             ResultSet resultSet = ps.executeQuery();
+            int i = 0;
             while (resultSet.next()) {
+                System.out.println("--------------------------------已处理：" + i++ + "------------------------");
                 Teacher teacher = new Teacher();
                 UniversitiesColleges universitiesColleges = universitiesCollegesService.getByName(resultSet.getString(1));
                 if (universitiesColleges == null) {
@@ -336,16 +399,21 @@ public class TestController {
                 if (universityFaculty == null) {
                     continue;
                 }
-                UniversitySystem universitySystem = universitySystemService.getByNameAndSchoolIdAndCollegeId(resultSet.getString(3), universityFaculty.getUniversityFacultyId());
+                UniversitySystem universitySystem = universitySystemService.getByNameAndSchoolIdAndCollegeId(resultSet.getString(3), universityFaculty.getUniversityFacultyId(), universitiesColleges.getOrgId());
                 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 byTeacherJobNameAndOrgId = teacherService.getByTeacherJobNameAndOrgId(teacher.getTeacherJobNumber(), universitiesColleges.getOrgId());
+                if (byTeacherJobNameAndOrgId != null) continue;
                 teacher.setTeacherStatus(resultSet.getInt(8) + 1);
                 int anInt = resultSet.getInt(7);
                 GenderEnum genderEnum;
@@ -367,7 +435,8 @@ public class TestController {
         }
     }
 
-
+    @Autowired
+    CorePlatformService platformService;
     @ApiOperation("迁移学生数据")
     @PostMapping("updateStudent")
     public void updateStudent() throws SQLException {
@@ -384,7 +453,9 @@ public class TestController {
                     "  stu.PhoneNo,  " +
                     "  stu.Sex,  " +
                     "  stu.IsDeleted,  " +
-                    "  cla.Name   " +
+                    "  cla.Name   ," +
+                    "  col.Id," +
+                    "  maj.Id,cla.id " +
                     "FROM  " +
                     "  EduStudents stu  " +
                     "  JOIN EduColleges col ON stu.CollegeId = col.Id  " +
@@ -393,14 +464,24 @@ public class TestController {
                     "  JOIN EduClasses cla ON stu.ClassId = cla.Id";
             ps = conn.prepareStatement(sql);
             ResultSet resultSet = ps.executeQuery();
+            int i=0;
             while (resultSet.next()) {
+                System.out.println("-----------------------------------已处理" + i++ + "-------------------------------------------");
+                if (resultSet.getString(9).contains("内部体验")) {
+                    int a = 0;
+                }
                 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);
+//                Map<String, Object> studentByNo = coreUserService.getStudentByNo(username);
-                if (studentByNo != null) {
+
+                if(username.length()==36){
+                    continue;
+                }
+                Boolean aBoolean = platformService.CheckUserCodeThrowMessage(username);
+                if (aBoolean) {
                     continue;
                 }
                 int anInt = resultSet.getInt(7);
@@ -412,24 +493,15 @@ public class TestController {
                 }
                 student.setStudentGender(genderEnum);
                 student.setAddTime(new Date());
-                UniversitiesColleges universitiesColleges = universitiesCollegesService.getByName(resultSet.getString(1));
+
-                if (universitiesColleges == null) {
+                SchoolClass schoolClass = schoolClassService.getByOldId(resultSet.getLong(12)
-                    continue;
+                );
-                }
+                if (schoolClass == null) {
-                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(),
+                Student studentNoAndOrgId = studentService.getStudentByStudentNoAndOrgId(student.getStudentSn(), schoolClass.getOrgId());
-                        universitiesColleges.getUniversitiesCollegesId(),
+                if (studentNoAndOrgId != null) {
-                        universityFaculty.getUniversityFacultyId()
-                );
-                if (universitiesColleges == null || universityFaculty == null || universitySystem == null || schoolClass == null) {
                     continue;
                 }
                 student.setClassId(schoolClass.getClassId());
@@ -559,9 +631,9 @@ public class TestController {
         Connection connection = openConn();
         PreparedStatement ps = null;
         for (SchoolClass schoolClass : classes) {
-            Long universitiesCollegesId = schoolClass.getUniversitiesCollegesId();
+            Long majorId = schoolClass.getUniversitySystemId();
-            UniversitiesColleges universitiesColleges = universitiesCollegesService.queryById(universitiesCollegesId);
+            UniversitySystem system = universitySystemService.getById(majorId);
-            String sql = "select EduClasses.* from EduClasses join EduSchools on EduClasses.schoolId = EduSchools.Id where EduSchools.Id = " + universitiesColleges.getOldSchoolId() + " and EduClasses.Name = '" + schoolClass.getClassName() + "'";
+            String sql = "select * from EduClasses where MajorId ="+system.getOldId()+" and Name = '"+schoolClass.getClassName()+"'";
 
             ps = connection.prepareStatement(sql);
             ResultSet resultSet = ps.executeQuery();

web/src/main/java/com/ibeetl/jlw/web/query/SchoolClassQuery.java

@@ -47,6 +47,17 @@ public class SchoolClassQuery extends PageParam {
      */
     @Query(name = "教师ID", display = false)
     private Long teacherId;
+
+    private Long oldId;
+
+    public Long getOldId() {
+        return oldId;
+    }
+
+    public void setOldId(Long oldId) {
+        this.oldId = oldId;
+    }
+
     public Long getClassId(){
         return  classId;
     }
@@ -132,7 +143,7 @@ public class SchoolClassQuery extends PageParam {
         pojo.setAddTime(this.getAddTime());
         pojo.setOrgId(this.getOrgId());
         pojo.setUserId(this.getUserId());
-
+        pojo.setOldClassId(this.getOldId());
         return pojo;
      }
 

web/src/main/java/com/ibeetl/jlw/web/query/UniversityFacultyQuery.java

@@ -5,6 +5,7 @@ import com.ibeetl.admin.core.annotation.Query;
 import com.ibeetl.admin.core.web.query.PageParam;
 import com.ibeetl.jlw.entity.UniversityFaculty;
 import io.swagger.annotations.ApiModelProperty;
+import org.apache.tomcat.websocket.pojo.PojoPathParam;
 
 import javax.validation.constraints.NotNull;
 import java.util.Date;
@@ -51,6 +52,17 @@ public class UniversityFacultyQuery extends PageParam {
     @ApiModelProperty("组织ID")
     private Long orgId;
 
+    @ApiModelProperty("2.0院系id")
+    private Long oldId;
+
+    public Long getOldId() {
+        return oldId;
+    }
+
+    public void setOldId(Long oldId) {
+        this.oldId = oldId;
+    }
+
     private String universityFacultyIdPlural;
     private String universitiesCollegesIdPlural;
     private String userIdPlural;
@@ -133,6 +145,7 @@ public class UniversityFacultyQuery extends PageParam {
         pojo.setUniversityFacultyAddTime(this.getUniversityFacultyAddTime());
         pojo.setUserId(this.getUserId());
         pojo.setOrgId(this.getOrgId());
+        pojo.setOldId(this.getOldId());
         return pojo;
     }
 

web/src/main/java/com/ibeetl/jlw/web/query/UniversitySystemQuery.java

@@ -56,6 +56,16 @@ public class UniversitySystemQuery extends PageParam {
 
     private String _given;//指定更新的特定字段，多个逗号隔开
 
+    private Long oldId;
+
+    public Long getOldId() {
+        return oldId;
+    }
+
+    public void setOldId(Long oldId) {
+        this.oldId = oldId;
+    }
+
     public Long getUniversitySystemId(){
         return  universitySystemId;
     }
@@ -122,6 +132,7 @@ public class UniversitySystemQuery extends PageParam {
         pojo.setUniversityFacultyId(this.getUniversityFacultyId());
         pojo.setUserId(this.getUserId());
         pojo.setOrgId(this.getOrgId());
+        pojo.setOldId(this.getOldId());
         return pojo;
     }
 

web/src/main/resources/sql/jlw/schoolClass.md

@@ -172,6 +172,9 @@ getValuesByQueryNotWithPermission
       @if(!isEmpty(userId)){
         and t.user_id =#userId#
       @}
+      @if(!isEmpty(oldId)){
+        and t.old_class_id =#oldId#
+      @}
 
 getAllSchoolClass
 ===

web/src/main/resources/sql/jlw/student.md

@@ -2215,3 +2215,7 @@ pagedListStudentInfoByClassId
 findAllBySchoolId
 ===
 select student.student_sn as studentNo,student.student_name as name,school_class.old_class_id as classId from student join universities_colleges uc on student.org_id = uc.org_id join school_class on student.class_id =school_class.class_id  where old_school_id = #schoolId#
+
+getStudentByStudentNoAndOrgId
+===
+select * from student where student_sn = #studentNo# and org_id = #orgId#

web/src/main/resources/sql/jlw/teacher.md

@@ -563,3 +563,8 @@ findAllTeacherBySchoolId
 ===
 select teacher_job_number as teacherNo,teacher_name as name from teacher join universities_colleges on teacher.universities_colleges_id=
 universities_colleges.universities_colleges_id where old_school_id =#schoolId#
+
+
+getByTeacherJobNameAndOrgId
+===
+select * from teacher where teacher_job_number = #teacherJobName# and org_id = #orgId#

web/src/main/resources/sql/jlw/universityFaculty.md

@@ -351,6 +351,9 @@ getValuesByQueryNotWithPermission
       @if(!isEmpty(orgId)){
         and t.org_id =#orgId#
       @}
+      @if(!isEmpty(oldId)){
+       and t.old_id=#oldId#
+      @}
       @if(!isEmpty(orgIdPlural)){
         and find_in_set(t.org_id,#orgIdPlural#)
       @}

web/src/main/resources/sql/jlw/universitySystem.md

@@ -343,6 +343,9 @@ getValuesByQueryNotWithPermission
       @if(!isEmpty(orgId)){
         and t.org_id =#orgId#
       @}
+      @if(!isEmpty(oldId)){
+        and t.old_id = #oldId#
+      @}
       @if(!isEmpty(orgIdPlural)){
         and find_in_set(t.org_id,#orgIdPlural#)
       @}