tianzeOrg
/
tianze-pro
8
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

1、swagger接口文档

Browse Source
beetlsql3-dev
陈沅 1 year ago
parent 38d2eb685b
commit 4a9d2863f4
21 changed files with 663 additions and 343 deletions
Show Stats Download Patch File Download Diff File

19
admin-core/src/main/java/com/ibeetl/admin/core/service/CorePlatformService.java
Unescape Escape View File

@ -300,10 +300,27 @@ public class CorePlatformService {
} }
if (coreUserList != null && coreUserList.size() > 0) { 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){ public boolean isAllowUserCode(Long id,String code){
CoreUser coreUser = new CoreUser(); CoreUser coreUser = new CoreUser();
coreUser.setCode(code); coreUser.setCode(code);

10
admin-core/src/main/java/com/ibeetl/admin/core/service/CoreUserService.java
Unescape Escape View File

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

2
web/src/main/java/com/ibeetl/jlw/dao/StudentDao.java
Unescape Escape View File

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

2
web/src/main/java/com/ibeetl/jlw/dao/TeacherDao.java
Unescape Escape View File

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

298
web/src/main/java/com/ibeetl/jlw/entity/UniversityFaculty.java
Unescape Escape View File

@ -8,186 +8,246 @@ import org.beetl.sql.annotation.entity.AssignID;
import javax.validation.constraints.NotNull; import javax.validation.constraints.NotNull;
import java.util.Date; import java.util.Date;
/* /*
* 院系管理 * 院系管理
* gen by Spring Boot2 Admin 2022-09-08 * gen by Spring Boot2 Admin 2022-09-08
*/ */
public class UniversityFaculty extends BaseEntity{ public class UniversityFaculty extends BaseEntity {
//院系ID（学院ID） //院系ID（学院ID）
@NotNull(message = "ID不能为空", groups =ValidateConfig.UPDATE.class) @NotNull(message = "ID不能为空", groups = ValidateConfig.UPDATE.class)
// @SeqID(name = ORACLE_CORE_SEQ_NAME) // @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 （院系的上一级） //院校ID （院系的上一级）
@Dict(type = "universities_colleges.universities_colleges_name.universities_colleges_status=1") @Dict(type = "universities_colleges.universities_colleges_name.universities_colleges_status=1")
private Long universitiesCollegesId ; private Long universitiesCollegesId;
//状态（ 1 正常 2删除） //状态（ 1 正常 2删除）
@Dict(type="global_status") @Dict(type = "global_status")
private Integer universityFacultyStatus;
private Integer universityFacultyStatus ;
//创建时间 //创建时间
private Date universityFacultyAddTime ; private Date universityFacultyAddTime;
//用户ID //用户ID
private Long userId ; private Long userId;
//组织ID //组织ID
private Long orgId ; private Long orgId;
public UniversityFaculty(){ private Long oldId;
public Long getOldId() {
return oldId;
}
public void setOldId(Long oldId) {
this.oldId = oldId;
} }
/**院系ID（学院ID） public UniversityFaculty() {
*@return
*/
public Long getUniversityFacultyId(){
return universityFacultyId;
} }
/**院系ID（学院ID）
*@param universityFacultyId /**
*/ * 院系ID（学院ID）
public void setUniversityFacultyId(Long universityFacultyId){ *
* @return
*/
public Long getUniversityFacultyId() {
return universityFacultyId;
}
/**
* 院系ID（学院ID）
*
* @param universityFacultyId
*/
public void setUniversityFacultyId(Long universityFacultyId) {
this.universityFacultyId = universityFacultyId; this.universityFacultyId = universityFacultyId;
} }
/**院系名称 /**
*@return * 院系名称
*/ *
public String getUniversityFacultyName(){ * @return
return universityFacultyName; */
public String getUniversityFacultyName() {
return universityFacultyName;
} }
/**院系名称
*@param universityFacultyName /**
*/ * 院系名称
public void setUniversityFacultyName(String universityFacultyName){ *
* @param universityFacultyName
*/
public void setUniversityFacultyName(String universityFacultyName) {
this.universityFacultyName = universityFacultyName; this.universityFacultyName = universityFacultyName;
} }
/**院系联系人 /**
*@return * 院系联系人
*/ *
public String getUniversityFacultyContact(){ * @return
return universityFacultyContact; */
public String getUniversityFacultyContact() {
return universityFacultyContact;
} }
/**院系联系人
*@param universityFacultyContact /**
*/ * 院系联系人
public void setUniversityFacultyContact(String universityFacultyContact){ *
* @param universityFacultyContact
*/
public void setUniversityFacultyContact(String universityFacultyContact) {
this.universityFacultyContact = universityFacultyContact; this.universityFacultyContact = universityFacultyContact;
} }
/**院系联系人电话 /**
*@return * 院系联系人电话
*/ *
public String getUniversityFacultyContactTel(){ * @return
return universityFacultyContactTel; */
public String getUniversityFacultyContactTel() {
return universityFacultyContactTel;
} }
/**院系联系人电话
*@param universityFacultyContactTel /**
*/ * 院系联系人电话
public void setUniversityFacultyContactTel(String universityFacultyContactTel){ *
* @param universityFacultyContactTel
*/
public void setUniversityFacultyContactTel(String universityFacultyContactTel) {
this.universityFacultyContactTel = universityFacultyContactTel; this.universityFacultyContactTel = universityFacultyContactTel;
} }
/**院系联系人地址 /**
*@return * 院系联系人地址
*/ *
public String getUniversityFacultyContactAddress(){ * @return
return universityFacultyContactAddress; */
public String getUniversityFacultyContactAddress() {
return universityFacultyContactAddress;
} }
/**院系联系人地址
*@param universityFacultyContactAddress /**
*/ * 院系联系人地址
public void setUniversityFacultyContactAddress(String universityFacultyContactAddress){ *
* @param universityFacultyContactAddress
*/
public void setUniversityFacultyContactAddress(String universityFacultyContactAddress) {
this.universityFacultyContactAddress = universityFacultyContactAddress; this.universityFacultyContactAddress = universityFacultyContactAddress;
} }
/**院校ID （院系的上一级） /**
*@return * 院校ID （院系的上一级）
*/ *
public Long getUniversitiesCollegesId(){ * @return
return universitiesCollegesId; */
public Long getUniversitiesCollegesId() {
return universitiesCollegesId;
} }
/**院校ID （院系的上一级）
*@param universitiesCollegesId /**
*/ * 院校ID （院系的上一级）
public void setUniversitiesCollegesId(Long universitiesCollegesId){ *
* @param universitiesCollegesId
*/
public void setUniversitiesCollegesId(Long universitiesCollegesId) {
this.universitiesCollegesId = universitiesCollegesId; this.universitiesCollegesId = universitiesCollegesId;
} }
/**状态（ 1 正常 2删除） /**
*@return * 状态（ 1 正常 2删除）
*/ *
public Integer getUniversityFacultyStatus(){ * @return
return universityFacultyStatus; */
public Integer getUniversityFacultyStatus() {
return universityFacultyStatus;
} }
/**状态（ 1 正常 2删除）
*@param universityFacultyStatus /**
*/ * 状态（ 1 正常 2删除）
public void setUniversityFacultyStatus(Integer universityFacultyStatus){ *
* @param universityFacultyStatus
*/
public void setUniversityFacultyStatus(Integer universityFacultyStatus) {
this.universityFacultyStatus = universityFacultyStatus; this.universityFacultyStatus = universityFacultyStatus;
} }
/**创建时间 /**
*@return * 创建时间
*/ *
public Date getUniversityFacultyAddTime(){ * @return
return universityFacultyAddTime; */
public Date getUniversityFacultyAddTime() {
return universityFacultyAddTime;
} }
/**创建时间
*@param universityFacultyAddTime /**
*/ * 创建时间
public void setUniversityFacultyAddTime(Date universityFacultyAddTime){ *
* @param universityFacultyAddTime
*/
public void setUniversityFacultyAddTime(Date universityFacultyAddTime) {
this.universityFacultyAddTime = universityFacultyAddTime; this.universityFacultyAddTime = universityFacultyAddTime;
} }
/**用户ID /**
*@return * 用户ID
*/ *
public Long getUserId(){ * @return
return userId; */
public Long getUserId() {
return userId;
} }
/**用户ID
*@param userId /**
*/ * 用户ID
public void setUserId(Long userId){ *
* @param userId
*/
public void setUserId(Long userId) {
this.userId = userId; this.userId = userId;
} }
/**组织ID /**
*@return * 组织ID
*/ *
public Long getOrgId(){ * @return
return orgId; */
public Long getOrgId() {
return orgId;
} }
/**组织ID
*@param orgId /**
*/ * 组织ID
public void setOrgId(Long orgId){ *
* @param orgId
*/
public void setOrgId(Long orgId) {
this.orgId = orgId; this.orgId = orgId;
} }

13
web/src/main/java/com/ibeetl/jlw/entity/UniversitySystem.java
Unescape Escape View File

@ -53,7 +53,18 @@ public class UniversitySystem extends BaseEntity{
//组织ID //组织ID
private Long orgId ; private Long orgId ;
private Long oldId;
public Long getOldId() {
return oldId;
}
public void setOldId(Long oldId) {
this.oldId = oldId;
}
public UniversitySystem(){ public UniversitySystem(){
} }

23
web/src/main/java/com/ibeetl/jlw/service/SchoolClassService.java
Unescape Escape View File

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

7
web/src/main/java/com/ibeetl/jlw/service/StudentService.java
Unescape Escape View File

@ -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) { public JsonResult add(@NotNull Student student) {
Date date = new Date(); Date date = new Date();

332
web/src/main/java/com/ibeetl/jlw/service/TeacherService.java
Unescape Escape View File

@ -72,78 +72,100 @@ import static com.ibeetl.jlw.web.IpAddressController.ipAddressMap;
@Transactional @Transactional
public class TeacherService extends CoreBaseService<Teacher> { 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 @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 @Autowired
private WebPlatformService webPlatformService; private WebPlatformService webPlatformService;
public PageQuery<Teacher>queryByCondition(PageQuery query){ public PageQuery<Teacher> queryByCondition(PageQuery query) {
PageQuery ret = teacherDao.queryByCondition(query); PageQuery ret = teacherDao.queryByCondition(query);
queryListAfter(ret.getList()); queryListAfter(ret.getList());
return ret; return ret;
} }
public PageQuery<Teacher>queryLogByCondition(PageQuery query){ public PageQuery<Teacher> queryLogByCondition(PageQuery query) {
PageQuery ret = teacherDao.queryByCondition(query); PageQuery ret = teacherDao.queryByCondition(query);
queryListAfter(ret.getList()); queryListAfter(ret.getList());
String teacherIds = ""; String teacherIds = "";
List<Teacher> teacherList = ret.getList(); List<Teacher> teacherList = ret.getList();
for(int i=0;i<teacherList.size();i++){ for (int i = 0; i < teacherList.size(); i++) {
teacherIds += teacherList.get(i).getTeacherId()+","; teacherIds += teacherList.get(i).getTeacherId() + ",";
} }
Map<String, List<Teacher>> groupByTeacherId = CacheLogJob.teacherLogMap; Map<String, List<Teacher>> 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 teacherQuery = new TeacherQuery();
teacherQuery.setTeacherIds(teacherIds); teacherQuery.setTeacherIds(teacherIds);
List<Teacher> teacherLogList = getTeacherLog(teacherQuery); List<Teacher> teacherLogList = getTeacherLog(teacherQuery);
try{ 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())); 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){ if (null != groupByTeacherId) {
for(int i=0;i<teacherList.size();i++){ for (int i = 0; i < teacherList.size(); i++) {
List<Teacher> 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()); List<Teacher> 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 != teacherLogList && teacherLogList.size() > 0) {
Teacher teacherLog = teacherLogList.get(0); Teacher teacherLog = teacherLogList.get(0);
teacherList.get(i).set("lastLoginTime",teacherLog.get("lastLoginTime")); 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("onlineDuration", TimeTool.diffTime(teacherLog.get("lastLoginTime"), teacherLog.get("lastOperateTime")));
teacherList.get(i).set("ip",teacherLog.get("ip")); 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; 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地址 teacherList.get(i).set("ipAddress", null != ipAddress ? (ipAddress.getProvince() + ipAddress.getCity() + ipAddress.getDistrict()) : null);//IP地址
}else { } else {
teacherList.get(i).set("lastLoginTime", RandomUtil.randomDay(-20, -1)); teacherList.get(i).set("lastLoginTime", RandomUtil.randomDay(-20, -1));
teacherList.get(i).set("onlineDuration", RandomUtil.randomNumber()); teacherList.get(i).set("onlineDuration", RandomUtil.randomNumber());
teacherList.get(i).set("ip", "127.0.0.1"); teacherList.get(i).set("ip", "127.0.0.1");
@ -151,7 +173,7 @@ public class TeacherService extends CoreBaseService<Teacher> {
} }
} }
if (CollectionUtils.isNotEmpty(teacherList)) { 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); Collections.reverse(teacherList);
ret.setList(teacherList); ret.setList(teacherList);
} }
@ -160,11 +182,11 @@ public class TeacherService extends CoreBaseService<Teacher> {
return ret; return ret;
} }
public void deleteTeacher(String ids){ public void deleteTeacher(String ids) {
String userIds = ""; String userIds = "";
List<Teacher> teacherList = teacherDao.getByIds(ids); List<Teacher> teacherList = teacherDao.getByIds(ids);
for(int i=0;i<teacherList.size();i++){ for (int i = 0; i < teacherList.size(); i++) {
userIds += teacherList.get(i).getUserId() + ","; userIds += teacherList.get(i).getUserId() + ",";
} }
@ -175,24 +197,24 @@ public class TeacherService extends CoreBaseService<Teacher> {
} }
public void deleteByList(List list){ public void deleteByList(List list) {
String ids = ""; String ids = "";
for(int i=0;null != list &&i<list.size();i++){ for (int i = 0; null != list && i < list.size(); i++) {
ids += list.get(i).toString()+","; ids += list.get(i).toString() + ",";
} }
if(StringUtils.isNotBlank(ids)){ if (StringUtils.isNotBlank(ids)) {
teacherDao.deleteByIds(ids); teacherDao.deleteByIds(ids);
} }
} }
public List<Teacher> getTeacherLog (TeacherQuery teacherQuery){ public List<Teacher> getTeacherLog(TeacherQuery teacherQuery) {
return teacherDao.getTeacherLog(teacherQuery); return teacherDao.getTeacherLog(teacherQuery);
} }
public List<Map<String,Object>>getStatisticsLog(){ public List<Map<String, Object>> getStatisticsLog() {
List<Map<String,Object>> statisticsLogList = CacheLogJob.statisticsLogList; List<Map<String, Object>> statisticsLogList = CacheLogJob.statisticsLogList;
if(null == statisticsLogList || statisticsLogList.size() == 0){ if (null == statisticsLogList || statisticsLogList.size() == 0) {
statisticsLogList = teacherDao.getStatisticsLog(); statisticsLogList = teacherDao.getStatisticsLog();
} }
for (Map<String, Object> stringObjectMap : statisticsLogList) { for (Map<String, Object> stringObjectMap : statisticsLogList) {
@ -213,19 +235,27 @@ public class TeacherService extends CoreBaseService<Teacher> {
return statisticsLogList; return statisticsLogList;
} }
public Teacher getByUserId(Long userId){ public Teacher getByUserId(Long userId) {
return teacherDao.getByUserId(userId); return teacherDao.getByUserId(userId);
} }
public String getIdsByQuery(TeacherQuery teacherQuery){ public String getIdsByQuery(TeacherQuery teacherQuery) {
return teacherDao.getIdsByQuery(teacherQuery); return teacherDao.getIdsByQuery(teacherQuery);
} }
public JsonResult add(Teacher teacher){ 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(); 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.setAddTime(date);
teacher.setTeacherStatus(1); teacher.setTeacherStatus(1);
this.save(teacher); this.save(teacher);
@ -258,13 +288,13 @@ public class TeacherService extends CoreBaseService<Teacher> {
} }
public Boolean edit(Teacher teacher){ public Boolean edit(Teacher teacher) {
this.updateTemplate(teacher); this.updateTemplate(teacher);
teacher = this.queryById(teacher.getTeacherId()); teacher = this.queryById(teacher.getTeacherId());
String code = teacher.createCode();//TODO 可改规则 String code = teacher.createCode();//TODO 可改规则
if (!platformService.isAllowUserCode(teacher.getUserId(),code)) { if (!platformService.isAllowUserCode(teacher.getUserId(), code)) {
throw new PlatformException("不允许的注册账号 " + code); throw new PlatformException("不允许的注册账号 " + code);
} }
CoreUser coreUser = new CoreUser(); CoreUser coreUser = new CoreUser();
@ -280,7 +310,7 @@ public class TeacherService extends CoreBaseService<Teacher> {
} }
public Boolean initPassword(Teacher teacher){ public Boolean initPassword(Teacher teacher) {
Teacher t = this.queryById(teacher.getTeacherId()); Teacher t = this.queryById(teacher.getTeacherId());
CoreUser coreUser = new CoreUser(); CoreUser coreUser = new CoreUser();
@ -292,18 +322,18 @@ public class TeacherService extends CoreBaseService<Teacher> {
return true; return true;
} }
public JsonResult importTemplate(FileEntity fileEntity,List<Long>list){ public JsonResult importTemplate(FileEntity fileEntity, List<Long> list) {
if(null != fileEntity){ if (null != fileEntity) {
File file = new File(fileEntity.getAbsoluteUrl()); 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; Workbook wb = null;
InputStream is = null; InputStream is = null;
try { try {
is = new FileInputStream(fileEntity.getAbsoluteUrl()); is = new FileInputStream(fileEntity.getAbsoluteUrl());
if("xls".equals(fileEntity.getFormat())){ if ("xls".equals(fileEntity.getFormat())) {
wb = new HSSFWorkbook(is); wb = new HSSFWorkbook(is);
}else if("xlsx".equals(fileEntity.getFormat())){ } else if ("xlsx".equals(fileEntity.getFormat())) {
wb = new XSSFWorkbook(is); wb = new XSSFWorkbook(is);
} }
} catch (FileNotFoundException e) { } catch (FileNotFoundException e) {
@ -312,16 +342,16 @@ public class TeacherService extends CoreBaseService<Teacher> {
e.printStackTrace(); e.printStackTrace();
} }
try { try {
if(null != is){ if (null != is) {
is.close(); is.close();
} }
}catch (Exception e){ } catch (Exception e) {
e.printStackTrace(); e.printStackTrace();
} }
if(wb != null){ if (wb != null) {
List<String[]>errMsg = new ArrayList<>(); List<String[]> errMsg = new ArrayList<>();
String msg =""; String msg = "";
//获取Sheet1 //获取Sheet1
Sheet sheet = wb.getSheet("Sheet1"); Sheet sheet = wb.getSheet("Sheet1");
@ -332,28 +362,28 @@ public class TeacherService extends CoreBaseService<Teacher> {
//获取最大列数 //获取最大列数
int colNum = firstRow.getPhysicalNumberOfCells(); int colNum = firstRow.getPhysicalNumberOfCells();
String[] columns = {"院校名称","教师姓名","工号","电话","邮箱"}; String[] columns = {"院校名称", "教师姓名", "工号", "电话", "邮箱"};
Map<String,Integer> map = new HashMap<>();//获取需要的表头的列 Map<String, Integer> map = new HashMap<>();//获取需要的表头的列
//从第一列找到需要的表头 //从第一列找到需要的表头
for (int i=0; i<colNum; i++){ for (int i = 0; i < colNum; i++) {
String cellData = getCellFormatValue(firstRow.getCell(i)); String cellData = getCellFormatValue(firstRow.getCell(i));
for(int j=0;j<columns.length;j++){ for (int j = 0; j < columns.length; j++) {
if(columns[j].equals(cellData)){ if (columns[j].equals(cellData)) {
map.put(columns[j],i); map.put(columns[j], i);
} }
} }
} }
//验证所需要的表头是否全 //验证所需要的表头是否全
Integer flag = 0; Integer flag = 0;
for(int i=0;i<columns.length;i++){ for (int i = 0; i < columns.length; i++) {
if(null != map.get(columns[i])){ if (null != map.get(columns[i])) {
flag ++; flag++;
} }
} }
if(flag != columns.length){ if (flag != columns.length) {
return JsonResult.failMessage("导入失败，表格表头应包含 \"院校名称\",\"教师姓名\",\"工号\",\"电话\",\"邮箱\""); return JsonResult.failMessage("导入失败，表格表头应包含 \"院校名称\",\"教师姓名\",\"工号\",\"电话\",\"邮箱\"");
} }
@ -361,11 +391,11 @@ public class TeacherService extends CoreBaseService<Teacher> {
Date date = new Date(); Date date = new Date();
for (int i = 1; i<rowNum; i++) { for (int i = 1; i < rowNum; i++) {
Row row = sheet.getRow(i); Row row = sheet.getRow(i);
if(null == row){ if (null == row) {
// msg += "第"+(i+1)+"数据为空<br>"; // msg += "第"+(i+1)+"数据为空<br>";
errMsg.add(new String[]{"第"+(i+1)+"数据为空"}); errMsg.add(new String[]{"第" + (i + 1) + "数据为空"});
continue; continue;
} }
@ -375,19 +405,19 @@ public class TeacherService extends CoreBaseService<Teacher> {
String teacherMobile = getCellFormatValue(row.getCell(map.get(columns[3]))); String teacherMobile = getCellFormatValue(row.getCell(map.get(columns[3])));
String teacherEmail = getCellFormatValue(row.getCell(map.get(columns[4]))); String teacherEmail = getCellFormatValue(row.getCell(map.get(columns[4])));
if(StringUtils.isBlank(universitiesCollegesName)){ if (StringUtils.isBlank(universitiesCollegesName)) {
errMsg.add(new String[]{"第"+ToolUtils.numberToLetter(map.get(columns[0])+1)+"列，第"+(i+1)+"行院校名称为空"}); errMsg.add(new String[]{"第" + ToolUtils.numberToLetter(map.get(columns[0]) + 1) + "列，第" + (i + 1) + "行院校名称为空"});
continue; continue;
}else if(StringUtils.isBlank(teacherName)){ } else if (StringUtils.isBlank(teacherName)) {
errMsg.add(new String[]{"第"+ToolUtils.numberToLetter(map.get(columns[1])+1)+"列，第"+(i+1)+"行教师姓名为空"}); errMsg.add(new String[]{"第" + ToolUtils.numberToLetter(map.get(columns[1]) + 1) + "列，第" + (i + 1) + "行教师姓名为空"});
continue; continue;
}else if(StringUtils.isBlank(teacherJobNumber)){ } else if (StringUtils.isBlank(teacherJobNumber)) {
errMsg.add(new String[]{"第"+ToolUtils.numberToLetter(map.get(columns[2])+1)+"列，第"+(i+1)+"行工号为空"}); errMsg.add(new String[]{"第" + ToolUtils.numberToLetter(map.get(columns[2]) + 1) + "列，第" + (i + 1) + "行工号为空"});
continue; continue;
// }else if(universitiesCollegesName.split("_").length != 2){ // }else if(universitiesCollegesName.split("_").length != 2){
// errMsg.add(new String[]{"第"+ToolUtils.numberToLetter(map.get(columns[0])+1)+"列，第"+(i+1)+"行院校ID为空"}); // errMsg.add(new String[]{"第"+ToolUtils.numberToLetter(map.get(columns[0])+1)+"列，第"+(i+1)+"行院校ID为空"});
// continue; // continue;
}else { } else {
String universitiesCollegesId = ""; String universitiesCollegesId = "";
// 通过名字查询院校信息，如果查询不到就告诉前台需要先去添加院校 // 通过名字查询院校信息，如果查询不到就告诉前台需要先去添加院校
@ -400,7 +430,7 @@ public class TeacherService extends CoreBaseService<Teacher> {
Assert.notEmpty(universitiesColleges, "未查询到院校:{}，请先添加院校信息！", universitiesCollegesName); Assert.notEmpty(universitiesColleges, "未查询到院校:{}，请先添加院校信息！", universitiesCollegesName);
// 通过名字没查询到院校的时候 // 通过名字没查询到院校的时候
if(ObjectUtil.isEmpty(universitiesColleges)) { if (ObjectUtil.isEmpty(universitiesColleges)) {
// 正则取院校ID // 正则取院校ID
universitiesCollegesId = ReUtil.get("\\d+", universitiesCollegesName, 0); universitiesCollegesId = ReUtil.get("\\d+", universitiesCollegesName, 0);
Assert.notBlank(universitiesCollegesId, "请先添加院校信息:{}！", universitiesCollegesName); Assert.notBlank(universitiesCollegesId, "请先添加院校信息:{}！", universitiesCollegesName);
@ -426,14 +456,14 @@ public class TeacherService extends CoreBaseService<Teacher> {
if (!platformService.isAllowUserCode(code)) { if (!platformService.isAllowUserCode(code)) {
list.add(pojo.getTeacherId()); list.add(pojo.getTeacherId());
// msg += "第"+(i+1)+"行不允许的注册账号 "+code+"<br>"; // msg += "第"+(i+1)+"行不允许的注册账号 "+code+"<br>";
errMsg.add(new String[]{"第"+(i+1)+"行不允许的注册账号 "+code}); errMsg.add(new String[]{"第" + (i + 1) + "行不允许的注册账号 " + code});
}else { } else {
{ {
Teacher t = new Teacher(); Teacher t = new Teacher();
t.setUniversitiesCollegesId(Long.parseLong(universitiesCollegesId)); t.setUniversitiesCollegesId(Long.parseLong(universitiesCollegesId));
t.setTeacherName(teacherName); t.setTeacherName(teacherName);
if(teacherDao.template(t).size()>1){ if (teacherDao.template(t).size() > 1) {
errMsg.add(new String[]{"第"+(i+1)+"行存在同名同姓的教师，姓名 "+teacherName+" 是否删除",pojo.getTeacherId().toString()}); errMsg.add(new String[]{"第" + (i + 1) + "行存在同名同姓的教师，姓名 " + teacherName + " 是否删除", pojo.getTeacherId().toString()});
} }
} }
CoreUser coreUser = new CoreUser(); CoreUser coreUser = new CoreUser();
@ -468,28 +498,28 @@ public class TeacherService extends CoreBaseService<Teacher> {
} }
} }
if(count>0){ if (count > 0) {
JsonResult jsonResult = new JsonResult(); JsonResult jsonResult = new JsonResult();
jsonResult.setCode(JsonReturnCode.SUCCESS.getCode()); jsonResult.setCode(JsonReturnCode.SUCCESS.getCode());
jsonResult.setData(errMsg); jsonResult.setData(errMsg);
jsonResult.setMsg("导入成功,共导入"+count+"条"+(StringUtils.isNotBlank(msg)?"<br>"+msg:"")); jsonResult.setMsg("导入成功,共导入" + count + "条" + (StringUtils.isNotBlank(msg) ? "<br>" + msg : ""));
return jsonResult; return jsonResult;
}else { } else {
return JsonResult.failMessage("导入失败").setData(errMsg); return JsonResult.failMessage("导入失败").setData(errMsg);
} }
} }
return JsonResult.failMessage("导入失败"); return JsonResult.failMessage("导入失败");
}else { } else {
return JsonResult.failMessage("上传失败"); return JsonResult.failMessage("上传失败");
} }
}else { } else {
return JsonResult.failMessage("上传失败"); return JsonResult.failMessage("上传失败");
} }
} }
public String getCellFormatValue(Cell cell) { public String getCellFormatValue(Cell cell) {
String value = null; String value = null;
if (cell != null){ if (cell != null) {
switch (cell.getCellTypeEnum()) { switch (cell.getCellTypeEnum()) {
case STRING: case STRING:
value = cell.getRichStringCellValue().getString(); value = cell.getRichStringCellValue().getString();
@ -517,20 +547,20 @@ public class TeacherService extends CoreBaseService<Teacher> {
return value; return value;
} }
public List<Map<String,Object>> getExcelValues (TeacherQuery teacherQuery){ public List<Map<String, Object>> getExcelValues(TeacherQuery teacherQuery) {
return teacherDao.getExcelValues(teacherQuery); return teacherDao.getExcelValues(teacherQuery);
} }
public List<Map<String,Object>> getExcelValues2Competition (TeacherQuery teacherQuery){ public List<Map<String, Object>> getExcelValues2Competition(TeacherQuery teacherQuery) {
return teacherDao.getExcelValues2Competition(teacherQuery); return teacherDao.getExcelValues2Competition(teacherQuery);
} }
public List<Teacher> getValues (Object paras){ public List<Teacher> getValues(Object paras) {
return sqlManager.select(SqlId.of("jlw.teacher.getTeacherValues"),Teacher.class, 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()); CompetitionTaskSecondQuestionStep competitionTaskSecondQuestionStep = competitionTaskSecondQuestionStepService.queryById(competitionTaskSecondQuestionStepQuery.getCompetitionTaskSecondQuestionStepId());
CompetitionTaskSecondQuestion competitionTaskSecondQuestion = competitionTaskSecondQuestionService.queryById(competitionTaskSecondQuestionStep.getCompetitionTaskSecondQuestionId()); CompetitionTaskSecondQuestion competitionTaskSecondQuestion = competitionTaskSecondQuestionService.queryById(competitionTaskSecondQuestionStep.getCompetitionTaskSecondQuestionId());
@ -557,21 +587,21 @@ public class TeacherService extends CoreBaseService<Teacher> {
} }
public Boolean setCT3QuestionScore(CompetitionTeacherEvaluationQuery competitionTeacherEvaluationQuery,CoreUser coreUser){ public Boolean setCT3QuestionScore(CompetitionTeacherEvaluationQuery competitionTeacherEvaluationQuery, CoreUser coreUser) {
Teacher teacher = teacherService.getByUserId(coreUser.getId()); Teacher teacher = teacherService.getByUserId(coreUser.getId());
Competition competition = competitionService.getById(competitionTeacherEvaluationQuery.getCompetitionId()); Competition competition = competitionService.getById(competitionTeacherEvaluationQuery.getCompetitionId());
//判断是否为评委 1是 2否 //判断是否为评委 1是 2否
if(!ToolUtils.findInSet(competition.getCompetitionJudgeIds(),teacher.getTeacherId())){ if (!ToolUtils.findInSet(competition.getCompetitionJudgeIds(), teacher.getTeacherId())) {
return false; return false;
} }
CompetitionTeacherEvaluation competitionTeacherEvaluation = new CompetitionTeacherEvaluation(); CompetitionTeacherEvaluation competitionTeacherEvaluation = new CompetitionTeacherEvaluation();
if(null != teacher){ if (null != teacher) {
competitionTeacherEvaluation.setCompetitionStudentsId(competitionTeacherEvaluationQuery.getCompetitionStudentsId()); competitionTeacherEvaluation.setCompetitionStudentsId(competitionTeacherEvaluationQuery.getCompetitionStudentsId());
competitionTeacherEvaluation.setTeacherId(teacher.getTeacherId()); competitionTeacherEvaluation.setTeacherId(teacher.getTeacherId());
List<CompetitionTeacherEvaluation> competitionTeacherEvaluationList = competitionTeacherEvaluationService.getValues(competitionTeacherEvaluation); List<CompetitionTeacherEvaluation> competitionTeacherEvaluationList = competitionTeacherEvaluationService.getValues(competitionTeacherEvaluation);
if(null != competitionTeacherEvaluationList && competitionTeacherEvaluationList.size()>0) { if (null != competitionTeacherEvaluationList && competitionTeacherEvaluationList.size() > 0) {
competitionTeacherEvaluation = competitionTeacherEvaluationList.get(0); competitionTeacherEvaluation = competitionTeacherEvaluationList.get(0);
CompetitionTeacherEvaluation cte = new CompetitionTeacherEvaluation(); CompetitionTeacherEvaluation cte = new CompetitionTeacherEvaluation();
@ -580,7 +610,7 @@ public class TeacherService extends CoreBaseService<Teacher> {
cte.setCompetitionTaskThreeComment(competitionTeacherEvaluationQuery.getCompetitionTaskThreeComment()); cte.setCompetitionTaskThreeComment(competitionTeacherEvaluationQuery.getCompetitionTaskThreeComment());
competitionTeacherEvaluationService.updateTemplate(cte); competitionTeacherEvaluationService.updateTemplate(cte);
}else { } else {
CompetitionTeacherEvaluation cte = new CompetitionTeacherEvaluation(); CompetitionTeacherEvaluation cte = new CompetitionTeacherEvaluation();
cte.setCompetitionStudentsId(competitionTeacherEvaluationQuery.getCompetitionStudentsId()); cte.setCompetitionStudentsId(competitionTeacherEvaluationQuery.getCompetitionStudentsId());
@ -598,20 +628,20 @@ public class TeacherService extends CoreBaseService<Teacher> {
Document doc = Jsoup.parse(competitionTeacherEvaluationQuery.getCompetitionTaskThreeResultsInfo()); Document doc = Jsoup.parse(competitionTeacherEvaluationQuery.getCompetitionTaskThreeResultsInfo());
Elements trs = doc.select("table").select("tr"); Elements trs = doc.select("table").select("tr");
for(int i = 0;i<trs.size();i++){ for (int i = 0; i < trs.size(); i++) {
Elements tds = trs.get(i).select("td"); Elements tds = trs.get(i).select("td");
if(tds.size()>0){ if (tds.size() > 0) {
Elements inputs = tds.get(tds.size()-1).select("input"); Elements inputs = tds.get(tds.size() - 1).select("input");
if(inputs.size()>0){ if (inputs.size() > 0) {
Attributes attributes = inputs.get(inputs.size()-1).attributes(); Attributes attributes = inputs.get(inputs.size() - 1).attributes();
if(attributes.size()>0){ if (attributes.size() > 0) {
b = b.add(new BigDecimal(StringUtils.isNotBlank(attributes.get("value"))?attributes.get("value"):"0")); b = b.add(new BigDecimal(StringUtils.isNotBlank(attributes.get("value")) ? attributes.get("value") : "0"));
} }
} }
} }
} }
score = b.setScale(1, RoundingMode.HALF_UP).toString(); score = b.setScale(1, RoundingMode.HALF_UP).toString();
}catch (Exception e){ } catch (Exception e) {
e.printStackTrace(); e.printStackTrace();
} }
@ -622,26 +652,26 @@ public class TeacherService extends CoreBaseService<Teacher> {
String competitionTaskThreeFractions = ""; String competitionTaskThreeFractions = "";
String[] competitionJudgeId = competition.getCompetitionJudgeIds().split(","); String[] competitionJudgeId = competition.getCompetitionJudgeIds().split(",");
String[] competitionTaskThreeFraction = new String[competitionJudgeId.length]; String[] competitionTaskThreeFraction = new String[competitionJudgeId.length];
for(int i=0;i<competitionTaskThreeFraction.length;i++){ for (int i = 0; i < competitionTaskThreeFraction.length; i++) {
if(null != competitionStudents.getCompetitionTaskThreeFractions() if (null != competitionStudents.getCompetitionTaskThreeFractions()
&& StringUtils.isNotBlank(competitionStudents.getCompetitionTaskThreeFractions()) && StringUtils.isNotBlank(competitionStudents.getCompetitionTaskThreeFractions())
&& competitionStudents.getCompetitionTaskThreeFractions().split(",").length > i){ && competitionStudents.getCompetitionTaskThreeFractions().split(",").length > i) {
competitionTaskThreeFraction[i] = competitionStudents.getCompetitionTaskThreeFractions().split(",")[i]; competitionTaskThreeFraction[i] = competitionStudents.getCompetitionTaskThreeFractions().split(",")[i];
}else { } else {
competitionTaskThreeFraction[i] = " "; competitionTaskThreeFraction[i] = " ";
} }
} }
for(int i=0;i<competitionJudgeId.length;i++){ for (int i = 0; i < competitionJudgeId.length; i++) {
if(competitionJudgeId[i].equals(teacher.getTeacherId().toString())){ if (competitionJudgeId[i].equals(teacher.getTeacherId().toString())) {
competitionTaskThreeFraction[i] = score; competitionTaskThreeFraction[i] = score;
} }
} }
for(int i=0;i<competitionTaskThreeFraction.length;i++){ for (int i = 0; i < competitionTaskThreeFraction.length; i++) {
competitionTaskThreeFractions += competitionTaskThreeFraction[i] + (i == competitionTaskThreeFraction.length - 1?"":","); competitionTaskThreeFractions += competitionTaskThreeFraction[i] + (i == competitionTaskThreeFraction.length - 1 ? "" : ",");
} }
CompetitionStudents cs = new CompetitionStudents(); CompetitionStudents cs = new CompetitionStudents();
@ -656,7 +686,7 @@ public class TeacherService extends CoreBaseService<Teacher> {
return false; return false;
} }
public Boolean setET2QuestionScore(ExamTaskSecondQuestionStepQuery examTaskSecondQuestionStepQuery){ public Boolean setET2QuestionScore(ExamTaskSecondQuestionStepQuery examTaskSecondQuestionStepQuery) {
ExamTaskSecondQuestionStep examTaskSecondQuestionStep = examTaskSecondQuestionStepService.queryById(examTaskSecondQuestionStepQuery.getExamTaskSecondQuestionStepId()); ExamTaskSecondQuestionStep examTaskSecondQuestionStep = examTaskSecondQuestionStepService.queryById(examTaskSecondQuestionStepQuery.getExamTaskSecondQuestionStepId());
ExamTaskSecondQuestion examTaskSecondQuestion = examTaskSecondQuestionService.queryById(examTaskSecondQuestionStep.getExamTaskSecondQuestionId()); ExamTaskSecondQuestion examTaskSecondQuestion = examTaskSecondQuestionService.queryById(examTaskSecondQuestionStep.getExamTaskSecondQuestionId());
@ -682,39 +712,39 @@ public class TeacherService extends CoreBaseService<Teacher> {
return true; return true;
} }
public Boolean setET3QuestionScore(ExamStudentsQuery examStudentsQuery){ public Boolean setET3QuestionScore(ExamStudentsQuery examStudentsQuery) {
//计算出分数 //计算出分数
BigDecimal score = null; BigDecimal score = null;
if(StringUtils.isNotBlank(examStudentsQuery.getExamTaskThreeResultsInfo())){ if (StringUtils.isNotBlank(examStudentsQuery.getExamTaskThreeResultsInfo())) {
try { try {
BigDecimal b = BigDecimal.ZERO; BigDecimal b = BigDecimal.ZERO;
Document doc = Jsoup.parse(examStudentsQuery.getExamTaskThreeResultsInfo()); Document doc = Jsoup.parse(examStudentsQuery.getExamTaskThreeResultsInfo());
Elements trs = doc.select("table").select("tr"); Elements trs = doc.select("table").select("tr");
for(int i = 0;i<trs.size();i++){ for (int i = 0; i < trs.size(); i++) {
Elements tds = trs.get(i).select("td"); Elements tds = trs.get(i).select("td");
if(tds.size()>0){ if (tds.size() > 0) {
Elements inputs = tds.get(tds.size()-1).select("input"); Elements inputs = tds.get(tds.size() - 1).select("input");
if(inputs.size()>0){ if (inputs.size() > 0) {
Attributes attributes = inputs.get(inputs.size()-1).attributes(); Attributes attributes = inputs.get(inputs.size() - 1).attributes();
if(attributes.size()>0){ if (attributes.size() > 0) {
b = b.add(new BigDecimal(StringUtils.isNotBlank(attributes.get("value"))?attributes.get("value"):"0")); b = b.add(new BigDecimal(StringUtils.isNotBlank(attributes.get("value")) ? attributes.get("value") : "0"));
} }
} }
} }
} }
score = b.setScale(1, RoundingMode.HALF_UP); score = b.setScale(1, RoundingMode.HALF_UP);
}catch (Exception e){ } catch (Exception e) {
e.printStackTrace(); e.printStackTrace();
} }
}else { } else {
score = examStudentsQuery.getExamTaskThreeFraction(); score = examStudentsQuery.getExamTaskThreeFraction();
} }
//更新分数 //更新分数
if(null != score){ if (null != score) {
ExamStudents cs = new ExamStudents(); ExamStudents cs = new ExamStudents();
cs.setExamStudentsId(examStudentsQuery.getExamStudentsId()); cs.setExamStudentsId(examStudentsQuery.getExamStudentsId());
cs.setExamTaskThreeFraction(score); cs.setExamTaskThreeFraction(score);
@ -771,7 +801,7 @@ public class TeacherService extends CoreBaseService<Teacher> {
* 通过用户ID获取教师的关系信息 * 通过用户ID获取教师的关系信息
* 班级-专业-院系-院校 * 班级-专业-院系-院校
* *
* @param userIds 用户ID集合 * @param userIds 用户ID集合
* @return * @return
*/ */
public List<TeacherExtendSchoolInfo> getTeacherExtendSchoolInfoListByUserIds(@NotBlank(message = "用户ID集合不能为空！") String userIds) { public List<TeacherExtendSchoolInfo> getTeacherExtendSchoolInfoListByUserIds(@NotBlank(message = "用户ID集合不能为空！") String userIds) {
@ -782,7 +812,7 @@ public class TeacherService extends CoreBaseService<Teacher> {
* 通过用户ID获取教师的关系信息 * 通过用户ID获取教师的关系信息
* 班级-专业-院系-院校 * 班级-专业-院系-院校
* *
* @param userIds 用户ID集合 * @param userIds 用户ID集合
* @return * @return
*/ */
public TeacherExtendSchoolInfo getTeacherExtendSchoolInfoByUserIds(@NotBlank(message = "用户ID集合不能为空！") String userIds) { public TeacherExtendSchoolInfo getTeacherExtendSchoolInfoByUserIds(@NotBlank(message = "用户ID集合不能为空！") String userIds) {
@ -818,7 +848,7 @@ public class TeacherService extends CoreBaseService<Teacher> {
// 查询库里已经存在的编号 // 查询库里已经存在的编号
List<String> existsList = teacherDao.createLambdaQuery() List<String> existsList = teacherDao.createLambdaQuery()
.andIsNotNull(Teacher::getTeacherSn) .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) { for (String duplicateElement : existsList) {
int errorRowIndex = jobNumberList.indexOf(duplicateElement); int errorRowIndex = jobNumberList.indexOf(duplicateElement);
@ -830,13 +860,13 @@ public class TeacherService extends CoreBaseService<Teacher> {
} }
public List<Map<String,Object>> findAllTeacherBySchoolId(Long schoolId){ public List<Map<String, Object>> findAllTeacherBySchoolId(Long schoolId) {
List<Map<String, Object>> mapList = teacherDao.findAllTeacherBySchoolId(schoolId); List<Map<String, Object>> mapList = teacherDao.findAllTeacherBySchoolId(schoolId);
List<Map<String,Object>> dataList = new ArrayList<>(); List<Map<String, Object>> dataList = new ArrayList<>();
for (Map<String, Object> map : mapList) { for (Map<String, Object> map : mapList) {
Map<String,Object> dataMap = new HashMap<>(); Map<String, Object> dataMap = new HashMap<>();
dataMap.put("teacherNo",map.get("teacherno")); dataMap.put("teacherNo", map.get("teacherno"));
dataMap.put("name",map.get("name")); dataMap.put("name", map.get("name"));
dataList.add(dataMap); dataList.add(dataMap);
} }
return dataList; return dataList;

4
web/src/main/java/com/ibeetl/jlw/service/UniversitiesCollegesService.java
Unescape Escape View File

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

12
web/src/main/java/com/ibeetl/jlw/service/UniversityFacultyService.java
Unescape Escape View File

@ -240,4 +240,16 @@ public class UniversityFacultyService extends CoreBaseService<UniversityFaculty>
query.setUniversitiesCollegesId(schoolId); query.setUniversitiesCollegesId(schoolId);
return getFirst(getValuesByQueryNotWithPermission(query)); 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));
}
} }

33
web/src/main/java/com/ibeetl/jlw/service/UniversitySystemService.java
Unescape Escape View File

@ -154,12 +154,23 @@ public class UniversitySystemService extends CoreBaseService<UniversitySystem>{
UniversitySystemQuery query = new UniversitySystemQuery(); UniversitySystemQuery query = new UniversitySystemQuery();
query.setUniversitySystemStatus(1); query.setUniversitySystemStatus(1);
query.setUniversitySystemName(name.trim()); 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) { if (query != null) {
query.setOrgId(orgId); query.setOrgId(orgId);
} }
return getFirst(universitySystemDao.getValuesByQueryNotWithPermission(query)); return getFirst(universitySystemDao.getValuesByQueryNotWithPermission(query));
} }
public UniversitySystem getByName (String name){ public UniversitySystem getByName (String name){
return getByName(name, null); return getByName(name, null);
} }
@ -231,11 +242,31 @@ public class UniversitySystemService extends CoreBaseService<UniversitySystem>{
return universitySystemDao.getUniversitySystemListByOrgId(orgId); 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 universitySystemQuery = new UniversitySystemQuery();
universitySystemQuery.setUniversitySystemName(name); universitySystemQuery.setUniversitySystemName(name);
universitySystemQuery.setUniversityFacultyId(facultyId); universitySystemQuery.setUniversityFacultyId(facultyId);
universitySystemQuery.setUniversitySystemStatus(1); universitySystemQuery.setUniversitySystemStatus(1);
universitySystemQuery.setOrgId(orgId);
return getFirst(universitySystemDao.getValuesByQueryNotWithPermission(universitySystemQuery)); 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));
}
} }

192
web/src/main/java/com/ibeetl/jlw/web/TestController.java
Unescape Escape View File

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

13
web/src/main/java/com/ibeetl/jlw/web/query/SchoolClassQuery.java
Unescape Escape View File

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

13
web/src/main/java/com/ibeetl/jlw/web/query/UniversityFacultyQuery.java
Unescape Escape View File

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

11
web/src/main/java/com/ibeetl/jlw/web/query/UniversitySystemQuery.java
Unescape Escape View File

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

3
web/src/main/resources/sql/jlw/schoolClass.md
Unescape Escape View File

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

6
web/src/main/resources/sql/jlw/student.md
Unescape Escape View File

@ -2214,4 +2214,8 @@ pagedListStudentInfoByClassId
findAllBySchoolId 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# 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#

7
web/src/main/resources/sql/jlw/teacher.md
Unescape Escape View File

@ -562,4 +562,9 @@ getTeacherUserInfoRuleInfo
findAllTeacherBySchoolId findAllTeacherBySchoolId
=== ===
select teacher_job_number as teacherNo,teacher_name as name from teacher join universities_colleges on teacher.universities_colleges_id= 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# universities_colleges.universities_colleges_id where old_school_id =#schoolId#
getByTeacherJobNameAndOrgId
===
select * from teacher where teacher_job_number = #teacherJobName# and org_id = #orgId#

3
web/src/main/resources/sql/jlw/universityFaculty.md
Unescape Escape View File

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

3
web/src/main/resources/sql/jlw/universitySystem.md
Unescape Escape View File

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

Write Preview
Loading…
Cancel
Save