From 4a9d2863f4ffc59131bd11d3292085915d4f0d77 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E6=B2=85?= <907037276@qq.com> Date: Tue, 21 Nov 2023 09:30:00 +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 --- .../core/service/CorePlatformService.java | 19 +- .../admin/core/service/CoreUserService.java | 10 +- .../java/com/ibeetl/jlw/dao/StudentDao.java | 2 + .../java/com/ibeetl/jlw/dao/TeacherDao.java | 2 + .../ibeetl/jlw/entity/UniversityFaculty.java | 298 +++++++++------- .../ibeetl/jlw/entity/UniversitySystem.java | 13 +- .../jlw/service/SchoolClassService.java | 23 +- .../ibeetl/jlw/service/StudentService.java | 7 + .../ibeetl/jlw/service/TeacherService.java | 332 ++++++++++-------- .../service/UniversitiesCollegesService.java | 4 +- .../jlw/service/UniversityFacultyService.java | 12 + .../jlw/service/UniversitySystemService.java | 33 +- .../com/ibeetl/jlw/web/TestController.java | 192 ++++++---- .../jlw/web/query/SchoolClassQuery.java | 13 +- .../jlw/web/query/UniversityFacultyQuery.java | 13 + .../jlw/web/query/UniversitySystemQuery.java | 11 + web/src/main/resources/sql/jlw/schoolClass.md | 3 + web/src/main/resources/sql/jlw/student.md | 6 +- web/src/main/resources/sql/jlw/teacher.md | 7 +- .../resources/sql/jlw/universityFaculty.md | 3 + .../resources/sql/jlw/universitySystem.md | 3 + 21 files changed, 663 insertions(+), 343 deletions(-) diff --git a/admin-core/src/main/java/com/ibeetl/admin/core/service/CorePlatformService.java b/admin-core/src/main/java/com/ibeetl/admin/core/service/CorePlatformService.java index 9ffbd6e0..6758bdda 100644 --- a/admin-core/src/main/java/com/ibeetl/admin/core/service/CorePlatformService.java +++ b/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 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); diff --git a/admin-core/src/main/java/com/ibeetl/admin/core/service/CoreUserService.java b/admin-core/src/main/java/com/ibeetl/admin/core/service/CoreUserService.java index 6c988bf5..d6c6f7c3 100644 --- a/admin-core/src/main/java/com/ibeetl/admin/core/service/CoreUserService.java +++ b/admin-core/src/main/java/com/ibeetl/admin/core/service/CoreUserService.java @@ -89,8 +89,8 @@ public class CoreUserService extends CoreBaseService { Assert.notNull(jobType0, "岗位不能为空！"); Assert.notNull(jobType1, "岗位子类型不能为空！"); - Boolean length = userCode.length() <= 16; - Assert.isTrue(length, "输入内容："+userCode+ " 超过16个字符！"); +// Boolean length = userCode.length() <= 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 { 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(); } diff --git a/web/src/main/java/com/ibeetl/jlw/dao/StudentDao.java b/web/src/main/java/com/ibeetl/jlw/dao/StudentDao.java index 9aa6c130..af1a8247 100644 --- a/web/src/main/java/com/ibeetl/jlw/dao/StudentDao.java +++ b/web/src/main/java/com/ibeetl/jlw/dao/StudentDao.java @@ -123,4 +123,6 @@ public interface StudentDao extends BaseMapper{ List> findAllBySchoolId(Long schoolId); + List getStudentByStudentNoAndOrgId(String studentNo,Long orgId); + } \ No newline at end of file diff --git a/web/src/main/java/com/ibeetl/jlw/dao/TeacherDao.java b/web/src/main/java/com/ibeetl/jlw/dao/TeacherDao.java index da762028..47f8fe0b 100644 --- a/web/src/main/java/com/ibeetl/jlw/dao/TeacherDao.java +++ b/web/src/main/java/com/ibeetl/jlw/dao/TeacherDao.java @@ -56,4 +56,6 @@ public interface TeacherDao extends BaseMapper{ List> findAllTeacherBySchoolId(Long schoolId); + + List getByTeacherJobNameAndOrgId(String teacherJobName, Long orgId); } \ No newline at end of file diff --git a/web/src/main/java/com/ibeetl/jlw/entity/UniversityFaculty.java b/web/src/main/java/com/ibeetl/jlw/entity/UniversityFaculty.java index cec38505..4469de2d 100644 --- a/web/src/main/java/com/ibeetl/jlw/entity/UniversityFaculty.java +++ b/web/src/main/java/com/ibeetl/jlw/entity/UniversityFaculty.java @@ -8,186 +8,246 @@ import org.beetl.sql.annotation.entity.AssignID; import javax.validation.constraints.NotNull; import java.util.Date; -/* -* 院系管理 -* gen by Spring Boot2 Admin 2022-09-08 -*/ -public class UniversityFaculty extends BaseEntity{ +/* + * 院系管理 + * gen by Spring Boot2 Admin 2022-09-08 + */ +public class UniversityFaculty extends BaseEntity { //院系ID（学院ID） - @NotNull(message = "ID不能为空", groups =ValidateConfig.UPDATE.class) + @NotNull(message = "ID不能为空", groups = ValidateConfig.UPDATE.class) // @SeqID(name = ORACLE_CORE_SEQ_NAME) - @AssignID(value = "maskAutoID",param = "com.ibeetl.jlw.entity.UniversityFaculty") + @AssignID(value = "maskAutoID", param = "com.ibeetl.jlw.entity.UniversityFaculty") + + private Long universityFacultyId; - private Long universityFacultyId ; - //院系名称 - private String universityFacultyName ; - + private String universityFacultyName; + //院系联系人 - private String universityFacultyContact ; - + private String universityFacultyContact; + //院系联系人电话 - private String universityFacultyContactTel ; - + private String universityFacultyContactTel; + //院系联系人地址 - private String universityFacultyContactAddress ; - + private String universityFacultyContactAddress; + //院校ID （院系的上一级） @Dict(type = "universities_colleges.universities_colleges_name.universities_colleges_status=1") - private Long universitiesCollegesId ; - + private Long universitiesCollegesId; + //状态（ 1 正常 2删除） - @Dict(type="global_status") + @Dict(type = "global_status") + + private Integer universityFacultyStatus; - private Integer universityFacultyStatus ; - //创建时间 - private Date universityFacultyAddTime ; - + private Date universityFacultyAddTime; + //用户ID - private Long userId ; - + private Long userId; + //组织ID - private Long orgId ; - - public UniversityFaculty(){ + private Long orgId; + + private Long oldId; + + public Long getOldId() { + return oldId; + } + + public void setOldId(Long oldId) { + this.oldId = oldId; } - /**院系ID（学院ID） - *@return - */ - public Long getUniversityFacultyId(){ - return universityFacultyId; + public UniversityFaculty() { } - /**院系ID（学院ID） - *@param universityFacultyId - */ - public void setUniversityFacultyId(Long universityFacultyId){ + + /** + * 院系ID（学院ID） + * + * @return + */ + public Long getUniversityFacultyId() { + return universityFacultyId; + } + + /** + * 院系ID（学院ID） + * + * @param universityFacultyId + */ + public void setUniversityFacultyId(Long universityFacultyId) { this.universityFacultyId = universityFacultyId; } - /**院系名称 - *@return - */ - public String getUniversityFacultyName(){ - return universityFacultyName; + /** + * 院系名称 + * + * @return + */ + public String getUniversityFacultyName() { + return universityFacultyName; } - /**院系名称 - *@param universityFacultyName - */ - public void setUniversityFacultyName(String universityFacultyName){ + + /** + * 院系名称 + * + * @param universityFacultyName + */ + public void setUniversityFacultyName(String universityFacultyName) { this.universityFacultyName = universityFacultyName; } - /**院系联系人 - *@return - */ - public String getUniversityFacultyContact(){ - return universityFacultyContact; + /** + * 院系联系人 + * + * @return + */ + public String getUniversityFacultyContact() { + return universityFacultyContact; } - /**院系联系人 - *@param universityFacultyContact - */ - public void setUniversityFacultyContact(String universityFacultyContact){ + + /** + * 院系联系人 + * + * @param universityFacultyContact + */ + public void setUniversityFacultyContact(String universityFacultyContact) { this.universityFacultyContact = universityFacultyContact; } - /**院系联系人电话 - *@return - */ - public String getUniversityFacultyContactTel(){ - return universityFacultyContactTel; + /** + * 院系联系人电话 + * + * @return + */ + public String getUniversityFacultyContactTel() { + return universityFacultyContactTel; } - /**院系联系人电话 - *@param universityFacultyContactTel - */ - public void setUniversityFacultyContactTel(String universityFacultyContactTel){ + + /** + * 院系联系人电话 + * + * @param universityFacultyContactTel + */ + public void setUniversityFacultyContactTel(String universityFacultyContactTel) { this.universityFacultyContactTel = universityFacultyContactTel; } - /**院系联系人地址 - *@return - */ - public String getUniversityFacultyContactAddress(){ - return universityFacultyContactAddress; + /** + * 院系联系人地址 + * + * @return + */ + public String getUniversityFacultyContactAddress() { + return universityFacultyContactAddress; } - /**院系联系人地址 - *@param universityFacultyContactAddress - */ - public void setUniversityFacultyContactAddress(String universityFacultyContactAddress){ + + /** + * 院系联系人地址 + * + * @param universityFacultyContactAddress + */ + public void setUniversityFacultyContactAddress(String universityFacultyContactAddress) { this.universityFacultyContactAddress = universityFacultyContactAddress; } - /**院校ID （院系的上一级） - *@return - */ - public Long getUniversitiesCollegesId(){ - return universitiesCollegesId; + /** + * 院校ID （院系的上一级） + * + * @return + */ + public Long getUniversitiesCollegesId() { + return universitiesCollegesId; } - /**院校ID （院系的上一级） - *@param universitiesCollegesId - */ - public void setUniversitiesCollegesId(Long universitiesCollegesId){ + + /** + * 院校ID （院系的上一级） + * + * @param universitiesCollegesId + */ + public void setUniversitiesCollegesId(Long universitiesCollegesId) { this.universitiesCollegesId = universitiesCollegesId; } - /**状态（ 1 正常 2删除） - *@return - */ - public Integer getUniversityFacultyStatus(){ - return universityFacultyStatus; + /** + * 状态（ 1 正常 2删除） + * + * @return + */ + public Integer getUniversityFacultyStatus() { + return universityFacultyStatus; } - /**状态（ 1 正常 2删除） - *@param universityFacultyStatus - */ - public void setUniversityFacultyStatus(Integer universityFacultyStatus){ + + /** + * 状态（ 1 正常 2删除） + * + * @param universityFacultyStatus + */ + public void setUniversityFacultyStatus(Integer universityFacultyStatus) { this.universityFacultyStatus = universityFacultyStatus; } - /**创建时间 - *@return - */ - public Date getUniversityFacultyAddTime(){ - return universityFacultyAddTime; + /** + * 创建时间 + * + * @return + */ + public Date getUniversityFacultyAddTime() { + return universityFacultyAddTime; } - /**创建时间 - *@param universityFacultyAddTime - */ - public void setUniversityFacultyAddTime(Date universityFacultyAddTime){ + + /** + * 创建时间 + * + * @param universityFacultyAddTime + */ + public void setUniversityFacultyAddTime(Date universityFacultyAddTime) { this.universityFacultyAddTime = universityFacultyAddTime; } - /**用户ID - *@return - */ - public Long getUserId(){ - return userId; + /** + * 用户ID + * + * @return + */ + public Long getUserId() { + return userId; } - /**用户ID - *@param userId - */ - public void setUserId(Long userId){ + + /** + * 用户ID + * + * @param userId + */ + public void setUserId(Long userId) { this.userId = userId; } - /**组织ID - *@return - */ - public Long getOrgId(){ - return orgId; + /** + * 组织ID + * + * @return + */ + public Long getOrgId() { + return orgId; } - /**组织ID - *@param orgId - */ - public void setOrgId(Long orgId){ + + /** + * 组织ID + * + * @param orgId + */ + public void setOrgId(Long orgId) { this.orgId = orgId; } diff --git a/web/src/main/java/com/ibeetl/jlw/entity/UniversitySystem.java b/web/src/main/java/com/ibeetl/jlw/entity/UniversitySystem.java index b4a518c4..4caafaba 100644 --- a/web/src/main/java/com/ibeetl/jlw/entity/UniversitySystem.java +++ b/web/src/main/java/com/ibeetl/jlw/entity/UniversitySystem.java @@ -53,7 +53,18 @@ public class UniversitySystem extends BaseEntity{ //组织ID private Long orgId ; - + + private Long oldId; + + + public Long getOldId() { + return oldId; + } + + public void setOldId(Long oldId) { + this.oldId = oldId; + } + public UniversitySystem(){ } 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 b9bdeff9..12be4051 100644 --- a/web/src/main/java/com/ibeetl/jlw/service/SchoolClassService.java +++ b/web/src/main/java/com/ibeetl/jlw/service/SchoolClassService.java @@ -145,7 +145,7 @@ public class SchoolClassService extends CoreBaseService { 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 { 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 { 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)); diff --git a/web/src/main/java/com/ibeetl/jlw/service/StudentService.java b/web/src/main/java/com/ibeetl/jlw/service/StudentService.java index 92e03228..6ac43ac8 100644 --- a/web/src/main/java/com/ibeetl/jlw/service/StudentService.java +++ b/web/src/main/java/com/ibeetl/jlw/service/StudentService.java @@ -486,6 +486,13 @@ public class StudentService extends CoreBaseService { } } + public Student getStudentByStudentNoAndOrgId(String studentNo, Long orgId) { + List 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(); 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 1fb18ebc..0a6ec28e 100644 --- a/web/src/main/java/com/ibeetl/jlw/service/TeacherService.java +++ b/web/src/main/java/com/ibeetl/jlw/service/TeacherService.java @@ -72,78 +72,100 @@ import static com.ibeetl.jlw.web.IpAddressController.ipAddressMap; @Transactional public class TeacherService extends CoreBaseService { - @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 private UniversitiesCollegesDao universitiesCollegesDao; + @Autowired + private UniversitiesCollegesService universitiesCollegesService; + @Autowired + private UniversitiesCollegesDao universitiesCollegesDao; - @Autowired private StudentService studentService; + @Autowired + private StudentService studentService; @Lazy - @Autowired private TeacherService teacherService; - - @Autowired private CompetitionTeacherEvaluationService competitionTeacherEvaluationService; - - @Autowired private CompetitionService competitionService; - @Autowired private CompetitionStudentsService competitionStudentsService; - @Autowired private CompetitionTaskOneQuestionService competitionTaskOneQuestionService; - @Autowired private CompetitionTaskSecondQuestionService competitionTaskSecondQuestionService; - @Autowired private CompetitionTaskSecondQuestionStepService competitionTaskSecondQuestionStepService; - - @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 TeacherService teacherService; + + @Autowired + private CompetitionTeacherEvaluationService competitionTeacherEvaluationService; + + @Autowired + private CompetitionService competitionService; + @Autowired + private CompetitionStudentsService competitionStudentsService; + @Autowired + private CompetitionTaskOneQuestionService competitionTaskOneQuestionService; + @Autowired + private CompetitionTaskSecondQuestionService competitionTaskSecondQuestionService; + @Autowired + private CompetitionTaskSecondQuestionStepService competitionTaskSecondQuestionStepService; + + @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; - public PageQueryqueryByCondition(PageQuery query){ - PageQuery ret = teacherDao.queryByCondition(query); + public PageQuery queryByCondition(PageQuery query) { + PageQuery ret = teacherDao.queryByCondition(query); queryListAfter(ret.getList()); return ret; } - public PageQueryqueryLogByCondition(PageQuery query){ - PageQuery ret = teacherDao.queryByCondition(query); + public PageQuery queryLogByCondition(PageQuery query) { + PageQuery ret = teacherDao.queryByCondition(query); queryListAfter(ret.getList()); String teacherIds = ""; List teacherList = ret.getList(); - for(int i=0;i> groupByTeacherId = CacheLogJob.teacherLogMap; - if((null == groupByTeacherId || groupByTeacherId.size() == 0 )&& StringUtils.isNotBlank(teacherIds)){ + if ((null == groupByTeacherId || groupByTeacherId.size() == 0) && StringUtils.isNotBlank(teacherIds)) { TeacherQuery teacherQuery = new TeacherQuery(); teacherQuery.setTeacherIds(teacherIds); List 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){} + 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) { + } } - if(null != groupByTeacherId){ - for(int i=0;i teacherLogList = groupByTeacherId.get((null != teacherList.get(i).get("platform")&&StringUtils.isNotBlank(teacherList.get(i).get("platform").toString())?teacherList.get(i).get("platform").toString():"null")+teacherList.get(i).getTeacherId()); - if(null != teacherLogList && teacherLogList.size()>0){ + if (null != groupByTeacherId) { + for (int i = 0; i < teacherList.size(); i++) { + List teacherLogList = groupByTeacherId.get((null != teacherList.get(i).get("platform") && StringUtils.isNotBlank(teacherList.get(i).get("platform").toString()) ? teacherList.get(i).get("platform").toString() : "null") + teacherList.get(i).getTeacherId()); + if (null != teacherLogList && teacherLogList.size() > 0) { Teacher teacherLog = teacherLogList.get(0); - teacherList.get(i).set("lastLoginTime",teacherLog.get("lastLoginTime")); - teacherList.get(i).set("onlineDuration",TimeTool.diffTime(teacherLog.get("lastLoginTime"),teacherLog.get("lastOperateTime"))); - teacherList.get(i).set("ip",teacherLog.get("ip")); - IpAddress ipAddress = null != teacherLog.get("ip") && StringUtils.isNotBlank(teacherLog.get("ip").toString())?ipAddressMap.get(teacherLog.get("ip").toString()):null; - teacherList.get(i).set("ipAddress",null != ipAddress?(ipAddress.getProvince()+ipAddress.getCity()+ipAddress.getDistrict()):null);//IP地址 - }else { + teacherList.get(i).set("lastLoginTime", teacherLog.get("lastLoginTime")); + teacherList.get(i).set("onlineDuration", TimeTool.diffTime(teacherLog.get("lastLoginTime"), teacherLog.get("lastOperateTime"))); + teacherList.get(i).set("ip", teacherLog.get("ip")); + IpAddress ipAddress = null != teacherLog.get("ip") && StringUtils.isNotBlank(teacherLog.get("ip").toString()) ? ipAddressMap.get(teacherLog.get("ip").toString()) : null; + teacherList.get(i).set("ipAddress", null != ipAddress ? (ipAddress.getProvince() + ipAddress.getCity() + ipAddress.getDistrict()) : null);//IP地址 + } else { teacherList.get(i).set("lastLoginTime", RandomUtil.randomDay(-20, -1)); teacherList.get(i).set("onlineDuration", RandomUtil.randomNumber()); teacherList.get(i).set("ip", "127.0.0.1"); @@ -151,7 +173,7 @@ public class TeacherService extends CoreBaseService { } } if (CollectionUtils.isNotEmpty(teacherList)) { - teacherList = teacherList.stream().sorted(Comparator.comparing(v -> (Date)v.get("lastLoginTime"))).collect(Collectors.toList()); + teacherList = teacherList.stream().sorted(Comparator.comparing(v -> (Date) v.get("lastLoginTime"))).collect(Collectors.toList()); Collections.reverse(teacherList); ret.setList(teacherList); } @@ -160,11 +182,11 @@ public class TeacherService extends CoreBaseService { return ret; } - public void deleteTeacher(String ids){ + public void deleteTeacher(String ids) { String userIds = ""; List teacherList = teacherDao.getByIds(ids); - for(int i=0;i { } - public void deleteByList(List list){ + public void deleteByList(List list) { String ids = ""; - for(int i=0;null != list &&i getTeacherLog (TeacherQuery teacherQuery){ + public List getTeacherLog(TeacherQuery teacherQuery) { return teacherDao.getTeacherLog(teacherQuery); } - public List>getStatisticsLog(){ + public List> getStatisticsLog() { - List> statisticsLogList = CacheLogJob.statisticsLogList; - if(null == statisticsLogList || statisticsLogList.size() == 0){ + List> statisticsLogList = CacheLogJob.statisticsLogList; + if (null == statisticsLogList || statisticsLogList.size() == 0) { statisticsLogList = teacherDao.getStatisticsLog(); } for (Map stringObjectMap : statisticsLogList) { @@ -213,19 +235,27 @@ public class TeacherService extends CoreBaseService { return statisticsLogList; } - public Teacher getByUserId(Long userId){ + public Teacher getByUserId(Long userId) { return teacherDao.getByUserId(userId); } - public String getIdsByQuery(TeacherQuery teacherQuery){ + public String getIdsByQuery(TeacherQuery teacherQuery) { return teacherDao.getIdsByQuery(teacherQuery); } - public JsonResult add(Teacher teacher){ + public Teacher getByTeacherJobNameAndOrgId(String teacherJobName, Long orgId) { + List 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(); - teacher.setTeacherPassword(StringUtils.isNotBlank(teacher.getTeacherPassword())?teacher.getTeacherPassword():"123qwe"); + teacher.setTeacherPassword(StringUtils.isNotBlank(teacher.getTeacherPassword()) ? teacher.getTeacherPassword() : "123qwe"); teacher.setAddTime(date); teacher.setTeacherStatus(1); this.save(teacher); @@ -258,13 +288,13 @@ public class TeacherService extends CoreBaseService { } - public Boolean edit(Teacher teacher){ + public Boolean edit(Teacher teacher) { this.updateTemplate(teacher); teacher = this.queryById(teacher.getTeacherId()); String code = teacher.createCode();//TODO 可改规则 - if (!platformService.isAllowUserCode(teacher.getUserId(),code)) { + if (!platformService.isAllowUserCode(teacher.getUserId(), code)) { throw new PlatformException("不允许的注册账号 " + code); } CoreUser coreUser = new CoreUser(); @@ -280,7 +310,7 @@ public class TeacherService extends CoreBaseService { } - public Boolean initPassword(Teacher teacher){ + public Boolean initPassword(Teacher teacher) { Teacher t = this.queryById(teacher.getTeacherId()); CoreUser coreUser = new CoreUser(); @@ -292,18 +322,18 @@ public class TeacherService extends CoreBaseService { return true; } - public JsonResult importTemplate(FileEntity fileEntity,Listlist){ - if(null != fileEntity){ + public JsonResult importTemplate(FileEntity fileEntity, List list) { + if (null != fileEntity) { File file = new File(fileEntity.getAbsoluteUrl()); - if(file.exists() && file.isFile() && file.canRead() && ToolUtils.findInSet("xls,xlsx",fileEntity.getFormat())){ + if (file.exists() && file.isFile() && file.canRead() && ToolUtils.findInSet("xls,xlsx", fileEntity.getFormat())) { Workbook wb = null; InputStream is = null; try { is = new FileInputStream(fileEntity.getAbsoluteUrl()); - if("xls".equals(fileEntity.getFormat())){ + if ("xls".equals(fileEntity.getFormat())) { wb = new HSSFWorkbook(is); - }else if("xlsx".equals(fileEntity.getFormat())){ + } else if ("xlsx".equals(fileEntity.getFormat())) { wb = new XSSFWorkbook(is); } } catch (FileNotFoundException e) { @@ -312,16 +342,16 @@ public class TeacherService extends CoreBaseService { e.printStackTrace(); } try { - if(null != is){ + if (null != is) { is.close(); } - }catch (Exception e){ + } catch (Exception e) { e.printStackTrace(); } - if(wb != null){ - ListerrMsg = new ArrayList<>(); - String msg =""; + if (wb != null) { + List errMsg = new ArrayList<>(); + String msg = ""; //获取Sheet1 Sheet sheet = wb.getSheet("Sheet1"); @@ -332,28 +362,28 @@ public class TeacherService extends CoreBaseService { //获取最大列数 int colNum = firstRow.getPhysicalNumberOfCells(); - String[] columns = {"院校名称","教师姓名","工号","电话","邮箱"}; + String[] columns = {"院校名称", "教师姓名", "工号", "电话", "邮箱"}; - Map map = new HashMap<>();//获取需要的表头的列 + Map map = new HashMap<>();//获取需要的表头的列 //从第一列找到需要的表头 - for (int i=0; i { Date date = new Date(); - for (int i = 1; i"; - errMsg.add(new String[]{"第"+(i+1)+"数据为空"}); + errMsg.add(new String[]{"第" + (i + 1) + "数据为空"}); continue; } @@ -375,19 +405,19 @@ public class TeacherService extends CoreBaseService { String teacherMobile = getCellFormatValue(row.getCell(map.get(columns[3]))); String teacherEmail = getCellFormatValue(row.getCell(map.get(columns[4]))); - if(StringUtils.isBlank(universitiesCollegesName)){ - errMsg.add(new String[]{"第"+ToolUtils.numberToLetter(map.get(columns[0])+1)+"列，第"+(i+1)+"行院校名称为空"}); + if (StringUtils.isBlank(universitiesCollegesName)) { + errMsg.add(new String[]{"第" + ToolUtils.numberToLetter(map.get(columns[0]) + 1) + "列，第" + (i + 1) + "行院校名称为空"}); continue; - }else if(StringUtils.isBlank(teacherName)){ - errMsg.add(new String[]{"第"+ToolUtils.numberToLetter(map.get(columns[1])+1)+"列，第"+(i+1)+"行教师姓名为空"}); + } else if (StringUtils.isBlank(teacherName)) { + errMsg.add(new String[]{"第" + ToolUtils.numberToLetter(map.get(columns[1]) + 1) + "列，第" + (i + 1) + "行教师姓名为空"}); continue; - }else if(StringUtils.isBlank(teacherJobNumber)){ - errMsg.add(new String[]{"第"+ToolUtils.numberToLetter(map.get(columns[2])+1)+"列，第"+(i+1)+"行工号为空"}); + } else if (StringUtils.isBlank(teacherJobNumber)) { + errMsg.add(new String[]{"第" + ToolUtils.numberToLetter(map.get(columns[2]) + 1) + "列，第" + (i + 1) + "行工号为空"}); continue; // }else if(universitiesCollegesName.split("_").length != 2){ // errMsg.add(new String[]{"第"+ToolUtils.numberToLetter(map.get(columns[0])+1)+"列，第"+(i+1)+"行院校ID为空"}); // continue; - }else { + } else { String universitiesCollegesId = ""; // 通过名字查询院校信息，如果查询不到就告诉前台需要先去添加院校 @@ -400,7 +430,7 @@ public class TeacherService extends CoreBaseService { Assert.notEmpty(universitiesColleges, "未查询到院校:{}，请先添加院校信息！", universitiesCollegesName); // 通过名字没查询到院校的时候 - if(ObjectUtil.isEmpty(universitiesColleges)) { + if (ObjectUtil.isEmpty(universitiesColleges)) { // 正则取院校ID universitiesCollegesId = ReUtil.get("\\d+", universitiesCollegesName, 0); Assert.notBlank(universitiesCollegesId, "请先添加院校信息:{}！", universitiesCollegesName); @@ -426,14 +456,14 @@ public class TeacherService extends CoreBaseService { if (!platformService.isAllowUserCode(code)) { list.add(pojo.getTeacherId()); // msg += "第"+(i+1)+"行不允许的注册账号 "+code+"
"; - errMsg.add(new String[]{"第"+(i+1)+"行不允许的注册账号 "+code}); - }else { + errMsg.add(new String[]{"第" + (i + 1) + "行不允许的注册账号 " + code}); + } else { { Teacher t = new Teacher(); t.setUniversitiesCollegesId(Long.parseLong(universitiesCollegesId)); t.setTeacherName(teacherName); - if(teacherDao.template(t).size()>1){ - errMsg.add(new String[]{"第"+(i+1)+"行存在同名同姓的教师，姓名 "+teacherName+" 是否删除",pojo.getTeacherId().toString()}); + if (teacherDao.template(t).size() > 1) { + errMsg.add(new String[]{"第" + (i + 1) + "行存在同名同姓的教师，姓名 " + teacherName + " 是否删除", pojo.getTeacherId().toString()}); } } CoreUser coreUser = new CoreUser(); @@ -468,28 +498,28 @@ public class TeacherService extends CoreBaseService { } } - if(count>0){ + if (count > 0) { JsonResult jsonResult = new JsonResult(); jsonResult.setCode(JsonReturnCode.SUCCESS.getCode()); jsonResult.setData(errMsg); - jsonResult.setMsg("导入成功,共导入"+count+"条"+(StringUtils.isNotBlank(msg)?"
"+msg:"")); + jsonResult.setMsg("导入成功,共导入" + count + "条" + (StringUtils.isNotBlank(msg) ? "
" + msg : "")); return jsonResult; - }else { + } else { return JsonResult.failMessage("导入失败").setData(errMsg); } } return JsonResult.failMessage("导入失败"); - }else { + } else { return JsonResult.failMessage("上传失败"); } - }else { + } else { return JsonResult.failMessage("上传失败"); } } public String getCellFormatValue(Cell cell) { String value = null; - if (cell != null){ + if (cell != null) { switch (cell.getCellTypeEnum()) { case STRING: value = cell.getRichStringCellValue().getString(); @@ -517,20 +547,20 @@ public class TeacherService extends CoreBaseService { return value; } - public List> getExcelValues (TeacherQuery teacherQuery){ + public List> getExcelValues(TeacherQuery teacherQuery) { return teacherDao.getExcelValues(teacherQuery); } - public List> getExcelValues2Competition (TeacherQuery teacherQuery){ + public List> getExcelValues2Competition(TeacherQuery teacherQuery) { return teacherDao.getExcelValues2Competition(teacherQuery); } - public List getValues (Object paras){ - return sqlManager.select(SqlId.of("jlw.teacher.getTeacherValues"),Teacher.class, paras); + public List getValues(Object paras) { + return sqlManager.select(SqlId.of("jlw.teacher.getTeacherValues"), Teacher.class, paras); } - public Boolean setCT2QuestionScore(CompetitionTaskSecondQuestionStepQuery competitionTaskSecondQuestionStepQuery){ + public Boolean setCT2QuestionScore(CompetitionTaskSecondQuestionStepQuery competitionTaskSecondQuestionStepQuery) { CompetitionTaskSecondQuestionStep competitionTaskSecondQuestionStep = competitionTaskSecondQuestionStepService.queryById(competitionTaskSecondQuestionStepQuery.getCompetitionTaskSecondQuestionStepId()); CompetitionTaskSecondQuestion competitionTaskSecondQuestion = competitionTaskSecondQuestionService.queryById(competitionTaskSecondQuestionStep.getCompetitionTaskSecondQuestionId()); @@ -557,21 +587,21 @@ public class TeacherService extends CoreBaseService { } - public Boolean setCT3QuestionScore(CompetitionTeacherEvaluationQuery competitionTeacherEvaluationQuery,CoreUser coreUser){ + public Boolean setCT3QuestionScore(CompetitionTeacherEvaluationQuery competitionTeacherEvaluationQuery, CoreUser coreUser) { Teacher teacher = teacherService.getByUserId(coreUser.getId()); Competition competition = competitionService.getById(competitionTeacherEvaluationQuery.getCompetitionId()); //判断是否为评委 1是 2否 - if(!ToolUtils.findInSet(competition.getCompetitionJudgeIds(),teacher.getTeacherId())){ + if (!ToolUtils.findInSet(competition.getCompetitionJudgeIds(), teacher.getTeacherId())) { return false; } CompetitionTeacherEvaluation competitionTeacherEvaluation = new CompetitionTeacherEvaluation(); - if(null != teacher){ + if (null != teacher) { competitionTeacherEvaluation.setCompetitionStudentsId(competitionTeacherEvaluationQuery.getCompetitionStudentsId()); competitionTeacherEvaluation.setTeacherId(teacher.getTeacherId()); List competitionTeacherEvaluationList = competitionTeacherEvaluationService.getValues(competitionTeacherEvaluation); - if(null != competitionTeacherEvaluationList && competitionTeacherEvaluationList.size()>0) { + if (null != competitionTeacherEvaluationList && competitionTeacherEvaluationList.size() > 0) { competitionTeacherEvaluation = competitionTeacherEvaluationList.get(0); CompetitionTeacherEvaluation cte = new CompetitionTeacherEvaluation(); @@ -580,7 +610,7 @@ public class TeacherService extends CoreBaseService { cte.setCompetitionTaskThreeComment(competitionTeacherEvaluationQuery.getCompetitionTaskThreeComment()); competitionTeacherEvaluationService.updateTemplate(cte); - }else { + } else { CompetitionTeacherEvaluation cte = new CompetitionTeacherEvaluation(); cte.setCompetitionStudentsId(competitionTeacherEvaluationQuery.getCompetitionStudentsId()); @@ -598,20 +628,20 @@ public class TeacherService extends CoreBaseService { Document doc = Jsoup.parse(competitionTeacherEvaluationQuery.getCompetitionTaskThreeResultsInfo()); Elements trs = doc.select("table").select("tr"); - for(int i = 0;i0){ - Elements inputs = tds.get(tds.size()-1).select("input"); - if(inputs.size()>0){ - Attributes attributes = inputs.get(inputs.size()-1).attributes(); - if(attributes.size()>0){ - b = b.add(new BigDecimal(StringUtils.isNotBlank(attributes.get("value"))?attributes.get("value"):"0")); + if (tds.size() > 0) { + Elements inputs = tds.get(tds.size() - 1).select("input"); + if (inputs.size() > 0) { + Attributes attributes = inputs.get(inputs.size() - 1).attributes(); + if (attributes.size() > 0) { + b = b.add(new BigDecimal(StringUtils.isNotBlank(attributes.get("value")) ? attributes.get("value") : "0")); } } } } score = b.setScale(1, RoundingMode.HALF_UP).toString(); - }catch (Exception e){ + } catch (Exception e) { e.printStackTrace(); } @@ -622,26 +652,26 @@ public class TeacherService extends CoreBaseService { String competitionTaskThreeFractions = ""; String[] competitionJudgeId = competition.getCompetitionJudgeIds().split(","); - String[] competitionTaskThreeFraction = new String[competitionJudgeId.length]; + String[] competitionTaskThreeFraction = new String[competitionJudgeId.length]; - for(int i=0;i i){ + && competitionStudents.getCompetitionTaskThreeFractions().split(",").length > i) { competitionTaskThreeFraction[i] = competitionStudents.getCompetitionTaskThreeFractions().split(",")[i]; - }else { + } else { competitionTaskThreeFraction[i] = " "; } } - for(int i=0;i { return false; } - public Boolean setET2QuestionScore(ExamTaskSecondQuestionStepQuery examTaskSecondQuestionStepQuery){ + public Boolean setET2QuestionScore(ExamTaskSecondQuestionStepQuery examTaskSecondQuestionStepQuery) { ExamTaskSecondQuestionStep examTaskSecondQuestionStep = examTaskSecondQuestionStepService.queryById(examTaskSecondQuestionStepQuery.getExamTaskSecondQuestionStepId()); ExamTaskSecondQuestion examTaskSecondQuestion = examTaskSecondQuestionService.queryById(examTaskSecondQuestionStep.getExamTaskSecondQuestionId()); @@ -682,39 +712,39 @@ public class TeacherService extends CoreBaseService { return true; } - public Boolean setET3QuestionScore(ExamStudentsQuery examStudentsQuery){ + public Boolean setET3QuestionScore(ExamStudentsQuery examStudentsQuery) { //计算出分数 BigDecimal score = null; - if(StringUtils.isNotBlank(examStudentsQuery.getExamTaskThreeResultsInfo())){ + if (StringUtils.isNotBlank(examStudentsQuery.getExamTaskThreeResultsInfo())) { try { BigDecimal b = BigDecimal.ZERO; Document doc = Jsoup.parse(examStudentsQuery.getExamTaskThreeResultsInfo()); Elements trs = doc.select("table").select("tr"); - for(int i = 0;i0){ - Elements inputs = tds.get(tds.size()-1).select("input"); - if(inputs.size()>0){ - Attributes attributes = inputs.get(inputs.size()-1).attributes(); - if(attributes.size()>0){ - b = b.add(new BigDecimal(StringUtils.isNotBlank(attributes.get("value"))?attributes.get("value"):"0")); + if (tds.size() > 0) { + Elements inputs = tds.get(tds.size() - 1).select("input"); + if (inputs.size() > 0) { + Attributes attributes = inputs.get(inputs.size() - 1).attributes(); + if (attributes.size() > 0) { + b = b.add(new BigDecimal(StringUtils.isNotBlank(attributes.get("value")) ? attributes.get("value") : "0")); } } } } score = b.setScale(1, RoundingMode.HALF_UP); - }catch (Exception e){ + } catch (Exception e) { e.printStackTrace(); } - }else { + } else { score = examStudentsQuery.getExamTaskThreeFraction(); } //更新分数 - if(null != score){ + if (null != score) { ExamStudents cs = new ExamStudents(); cs.setExamStudentsId(examStudentsQuery.getExamStudentsId()); cs.setExamTaskThreeFraction(score); @@ -771,7 +801,7 @@ public class TeacherService extends CoreBaseService { * 通过用户ID获取教师的关系信息 * 班级-专业-院系-院校 * - * @param userIds 用户ID集合 + * @param userIds 用户ID集合 * @return */ public List getTeacherExtendSchoolInfoListByUserIds(@NotBlank(message = "用户ID集合不能为空！") String userIds) { @@ -782,7 +812,7 @@ public class TeacherService extends CoreBaseService { * 通过用户ID获取教师的关系信息 * 班级-专业-院系-院校 * - * @param userIds 用户ID集合 + * @param userIds 用户ID集合 * @return */ public TeacherExtendSchoolInfo getTeacherExtendSchoolInfoByUserIds(@NotBlank(message = "用户ID集合不能为空！") String userIds) { @@ -818,7 +848,7 @@ public class TeacherService extends CoreBaseService { // 查询库里已经存在的编号 List existsList = teacherDao.createLambdaQuery() .andIsNotNull(Teacher::getTeacherSn) - .andIn(Teacher::getTeacherSn, jobNumberList).select(String.class,"teacher_job_number"); + .andIn(Teacher::getTeacherSn, jobNumberList).select(String.class, "teacher_job_number"); for (String duplicateElement : existsList) { int errorRowIndex = jobNumberList.indexOf(duplicateElement); @@ -830,13 +860,13 @@ public class TeacherService extends CoreBaseService { } - public List> findAllTeacherBySchoolId(Long schoolId){ + public List> findAllTeacherBySchoolId(Long schoolId) { List> mapList = teacherDao.findAllTeacherBySchoolId(schoolId); - List> dataList = new ArrayList<>(); + List> dataList = new ArrayList<>(); for (Map map : mapList) { - Map dataMap = new HashMap<>(); - dataMap.put("teacherNo",map.get("teacherno")); - dataMap.put("name",map.get("name")); + Map dataMap = new HashMap<>(); + dataMap.put("teacherNo", map.get("teacherno")); + dataMap.put("name", map.get("name")); dataList.add(dataMap); } return dataList; diff --git a/web/src/main/java/com/ibeetl/jlw/service/UniversitiesCollegesService.java b/web/src/main/java/com/ibeetl/jlw/service/UniversitiesCollegesService.java index 81a0b5bb..bb52769f 100644 --- a/web/src/main/java/com/ibeetl/jlw/service/UniversitiesCollegesService.java +++ b/web/src/main/java/com/ibeetl/jlw/service/UniversitiesCollegesService.java @@ -100,9 +100,8 @@ public class UniversitiesCollegesService extends CoreBaseService 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)); + } } 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 c3415d18..455e6c9b 100644 --- a/web/src/main/java/com/ibeetl/jlw/service/UniversitySystemService.java +++ b/web/src/main/java/com/ibeetl/jlw/service/UniversitySystemService.java @@ -154,12 +154,23 @@ public class UniversitySystemService extends CoreBaseService{ 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{ 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)); + } } 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 958b5f47..ea6e2e41 100644 --- a/web/src/main/java/com/ibeetl/jlw/web/TestController.java +++ b/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)); - universityFacultyQuery.setUniversityFacultyContactTel(resultSet.getString(4)); - universityFacultyQuery.setUniversityFacultyContactAddress(resultSet.getString(5)); + String collegeName = resultSet.getString(1); + Long oldId = resultSet.getLong(2); + 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 " + - " 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"; + String sql = "SELECT \n" + + " cla.Name as schName, \n" + + " cla.Name as colName, \n" + + " cla.Name as majName, \n" + + " cla.Name as claName, \n" + + " cla.IsDeleted, \n" + + " cla.CollegeId, \n" + + " cla.MajorId, \n" + + " cla.id," + + " cla.schoolId \n" + + " 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); - if (serviceByName != null) { + UniversitiesColleges universitiesColleges = universitiesCollegesService.getByOrgId(universitySystem.getOrgId()); + 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 studentByNo = coreUserService.getStudentByNo(username); - if (studentByNo != null) { +// Map studentByNo = coreUserService.getStudentByNo(username); + + 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) { - 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) { + + SchoolClass schoolClass = schoolClassService.getByOldId(resultSet.getLong(12) + ); + if (schoolClass == null) { continue; } - SchoolClass schoolClass = schoolClassService.getByNameAndMajorId(resultSet.getString(9), - universitySystem.getUniversitySystemId(), - universitiesColleges.getUniversitiesCollegesId(), - universityFaculty.getUniversityFacultyId() - ); - if (universitiesColleges == null || universityFaculty == null || universitySystem == null || schoolClass == null) { + + Student studentNoAndOrgId = studentService.getStudentByStudentNoAndOrgId(student.getStudentSn(), schoolClass.getOrgId()); + if (studentNoAndOrgId != 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(); - UniversitiesColleges universitiesColleges = universitiesCollegesService.queryById(universitiesCollegesId); - String sql = "select EduClasses.* from EduClasses join EduSchools on EduClasses.schoolId = EduSchools.Id where EduSchools.Id = " + universitiesColleges.getOldSchoolId() + " and EduClasses.Name = '" + schoolClass.getClassName() + "'"; + Long majorId = schoolClass.getUniversitySystemId(); + UniversitySystem system = universitySystemService.getById(majorId); + String sql = "select * from EduClasses where MajorId ="+system.getOldId()+" and Name = '"+schoolClass.getClassName()+"'"; ps = connection.prepareStatement(sql); ResultSet resultSet = ps.executeQuery(); @@ -584,22 +656,22 @@ public class TestController { Connection connection = openConn(); PreparedStatement ps = null; - int i =0; - for(Student student:students){ - String name=null; + int i = 0; + for (Student student : students) { + String name = null; String sql = "select * from EduStudents where StudentNo = '" + student.getStudentSn() + "' and IsDeleted = 0"; ps = connection.prepareStatement(sql); ResultSet resultSet = ps.executeQuery(); - while (resultSet.next()){ - name=resultSet.getString("Name"); + while (resultSet.next()) { + name = resultSet.getString("Name"); } - if(!StringUtils.hasText(name)){ + if (!StringUtils.hasText(name)) { continue; } student.setStudentName(name); studentService.updateTemplate(student); - System.out.println("已处理："+i+++"/"+students.size()); + System.out.println("已处理：" + i++ + "/" + students.size()); } } diff --git a/web/src/main/java/com/ibeetl/jlw/web/query/SchoolClassQuery.java b/web/src/main/java/com/ibeetl/jlw/web/query/SchoolClassQuery.java index 91048f1f..02c7d064 100644 --- a/web/src/main/java/com/ibeetl/jlw/web/query/SchoolClassQuery.java +++ b/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; } diff --git a/web/src/main/java/com/ibeetl/jlw/web/query/UniversityFacultyQuery.java b/web/src/main/java/com/ibeetl/jlw/web/query/UniversityFacultyQuery.java index 3026ae8b..025c60d1 100644 --- a/web/src/main/java/com/ibeetl/jlw/web/query/UniversityFacultyQuery.java +++ b/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; } diff --git a/web/src/main/java/com/ibeetl/jlw/web/query/UniversitySystemQuery.java b/web/src/main/java/com/ibeetl/jlw/web/query/UniversitySystemQuery.java index 82815f5b..4d729ef0 100644 --- a/web/src/main/java/com/ibeetl/jlw/web/query/UniversitySystemQuery.java +++ b/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; } diff --git a/web/src/main/resources/sql/jlw/schoolClass.md b/web/src/main/resources/sql/jlw/schoolClass.md index 3056324f..547c5653 100644 --- a/web/src/main/resources/sql/jlw/schoolClass.md +++ b/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 === diff --git a/web/src/main/resources/sql/jlw/student.md b/web/src/main/resources/sql/jlw/student.md index 9ec05911..b3c988c9 100644 --- a/web/src/main/resources/sql/jlw/student.md +++ b/web/src/main/resources/sql/jlw/student.md @@ -2214,4 +2214,8 @@ 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# \ No newline at end of file +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# \ No newline at end of file diff --git a/web/src/main/resources/sql/jlw/teacher.md b/web/src/main/resources/sql/jlw/teacher.md index 24a2a71c..2147d599 100644 --- a/web/src/main/resources/sql/jlw/teacher.md +++ b/web/src/main/resources/sql/jlw/teacher.md @@ -562,4 +562,9 @@ getTeacherUserInfoRuleInfo 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# \ No newline at end of file +universities_colleges.universities_colleges_id where old_school_id =#schoolId# + + +getByTeacherJobNameAndOrgId +=== +select * from teacher where teacher_job_number = #teacherJobName# and org_id = #orgId# \ No newline at end of file diff --git a/web/src/main/resources/sql/jlw/universityFaculty.md b/web/src/main/resources/sql/jlw/universityFaculty.md index 0f46e7a5..376f160b 100644 --- a/web/src/main/resources/sql/jlw/universityFaculty.md +++ b/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#) @} diff --git a/web/src/main/resources/sql/jlw/universitySystem.md b/web/src/main/resources/sql/jlw/universitySystem.md index 96b8ca87..d55d54ec 100644 --- a/web/src/main/resources/sql/jlw/universitySystem.md +++ b/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#) @}