diff --git a/web/src/main/java/com/ibeetl/jlw/web/StudentController.java b/web/src/main/java/com/ibeetl/jlw/web/StudentController.java index 44d51bbf..d56c1d00 100644 --- a/web/src/main/java/com/ibeetl/jlw/web/StudentController.java +++ b/web/src/main/java/com/ibeetl/jlw/web/StudentController.java @@ -2205,6 +2205,11 @@ public class StudentController extends BaseController{ student.setAddTime(null); student.setUserId(null); student.setOrgId(null); + + + if (student.getStudentSn().length() >= 16) { + return JsonResult.failMessage("输入内容：" + student.getStudentSn() + " 超过16个字符！"); + } boolean success = studentService.edit(student); if (success) { return JsonResult.success(); diff --git a/web/src/main/java/com/ibeetl/jlw/web/TeacherController.java b/web/src/main/java/com/ibeetl/jlw/web/TeacherController.java index 94bd6a13..7d237561 100644 --- a/web/src/main/java/com/ibeetl/jlw/web/TeacherController.java +++ b/web/src/main/java/com/ibeetl/jlw/web/TeacherController.java @@ -2,6 +2,7 @@ package com.ibeetl.jlw.web; import cn.hutool.core.collection.CollectionUtil; import cn.hutool.core.lang.Assert; +import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.StrUtil; import cn.hutool.json.JSONUtil; import cn.jlw.Interceptor.GetFile; @@ -74,44 +75,73 @@ public class TeacherController extends BaseController { private static final String MODEL = "/jlw/teacher"; private static final String API = "/api/teacher"; - @Autowired private CorePlatformService platformService; + @Autowired + private CorePlatformService platformService; - @Autowired private StudentService studentService; + @Autowired + private StudentService studentService; - @Autowired private TeacherService teacherService; + @Autowired + private TeacherService teacherService; - @Autowired private UniversitiesCollegesService universitiesCollegesService; + @Autowired + private UniversitiesCollegesService universitiesCollegesService; - @Autowired private CompetitionTeacherEvaluationService competitionTeacherEvaluationService; + @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 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 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 CourseInfoService courseInfoService; - @Autowired private ResourcesQuestionService resourcesQuestionService; - @Autowired private ResourcesCompetitionService resourcesCompetitionService; - @Autowired private ResourcesCompetitionStepService resourcesCompetitionStepService; - @Autowired private ResourcesTrainingService resourcesTrainingService; - @Autowired private ResourcesTrainingStepService resourcesTrainingStepService; + @Autowired + private CourseInfoService courseInfoService; + @Autowired + private ResourcesQuestionService resourcesQuestionService; + @Autowired + private ResourcesCompetitionService resourcesCompetitionService; + @Autowired + private ResourcesCompetitionStepService resourcesCompetitionStepService; + @Autowired + private ResourcesTrainingService resourcesTrainingService; + @Autowired + private ResourcesTrainingStepService resourcesTrainingStepService; - @Autowired private ResourcesApplicationService resourcesApplicationService; + @Autowired + private ResourcesApplicationService resourcesApplicationService; - @Autowired private StudentDefenceLogService studentDefenceLogService; - @Autowired private StudentDefenceLogInfoService studentDefenceLogInfoService; - @Autowired private UniversitiesCollegesDao universitiesCollegesDao; - @Autowired private UniversityFacultyService universityFacultyService; - @Autowired private UniversitySystemService universitySystemService; + @Autowired + private StudentDefenceLogService studentDefenceLogService; + @Autowired + private StudentDefenceLogInfoService studentDefenceLogInfoService; + @Autowired + private UniversitiesCollegesDao universitiesCollegesDao; + @Autowired + private UniversityFacultyService universityFacultyService; + @Autowired + private UniversitySystemService universitySystemService; @Autowired FileService fileService; @@ -134,10 +164,10 @@ public class TeacherController extends BaseController { competitionQuery.setOrgId(coreUser.getOrgId()); List competitionList = competitionService.getValuesByQuery(competitionQuery); - ModelAndView view = new ModelAndView("/jlw/teacher/index.html") ; + ModelAndView view = new ModelAndView("/jlw/teacher/index.html"); view.addObject("search", TeacherQuery.class.getName()); - view.addObject("beAdministrator",null != coreUser && "JT_S_01".equals(coreUser.getJobType1())?1:2);//是否是管理员 1是 2否 - view.addObject("competitionList",competitionList); + view.addObject("beAdministrator", null != coreUser && "JT_S_01".equals(coreUser.getJobType1()) ? 1 : 2);//是否是管理员 1是 2否 + view.addObject("competitionList", competitionList); return view; } @@ -156,10 +186,10 @@ public class TeacherController extends BaseController { @ResponseBody public ModelAndView add(Long teacherId, @SCoreUser CoreUser coreUser) { ModelAndView view = new ModelAndView("/jlw/teacher/add.html"); - if(teacherId != null){ + if (teacherId != null) { Teacher teacher = teacherService.queryById(teacherId); view.addObject("teacher", teacher); - }else { + } else { view.addObject("teacher", new Teacher()); } // 如果是学校管理员则查询所在院校的信息 @@ -188,26 +218,26 @@ public class TeacherController extends BaseController { view.addObject("universitiesCollegesName", null); ResourcesApplication resourcesApplication = new ResourcesApplication(); - if(!coreUser.isAdmin()){//非超管 + if (!coreUser.isAdmin()) {//非超管 UniversitiesColleges universitiesColleges = new UniversitiesColleges(); universitiesColleges.setOrgId(coreUser.getOrgId()); List universitiesCollegesList = universitiesCollegesService.getValues(universitiesColleges); - if(universitiesCollegesList.size() > 0){ + if (universitiesCollegesList.size() > 0) { universitiesColleges = universitiesCollegesList.get(0); view.addObject("universitiesCollegesName", universitiesColleges.getUniversitiesCollegesName()); view.addObject("universitiesCollegesId", universitiesColleges.getUniversitiesCollegesId()); } - UniversitiesCollegesJurisdictionExperimentalSystem uSystem = (UniversitiesCollegesJurisdictionExperimentalSystem)platformService.getOther(); - if(null != uSystem && ((Integer)1).equals(uSystem.getType())){ + UniversitiesCollegesJurisdictionExperimentalSystem uSystem = (UniversitiesCollegesJurisdictionExperimentalSystem) platformService.getOther(); + if (null != uSystem && ((Integer) 1).equals(uSystem.getType())) { resourcesApplication.setResourcesApplicationId(uSystem.getTypeId()); } } - view.addObject("resourcesApplicationList",resourcesApplicationService.getValues(resourcesApplication)); + view.addObject("resourcesApplicationList", resourcesApplicationService.getValues(resourcesApplication)); view.addObject("orgId", coreUser.getOrgId()); - view.addObject("beTeacher",null != coreUser && "JT_S_02".equals(coreUser.getJobType1())?1:2);//是否是教师 1是 2否 + view.addObject("beTeacher", null != coreUser && "JT_S_02".equals(coreUser.getJobType1()) ? 1 : 2);//是否是教师 1是 2否 return view; } @@ -220,24 +250,24 @@ public class TeacherController extends BaseController { view.addObject("universitiesCollegesName", null); ResourcesApplication resourcesApplication = new ResourcesApplication(); - if(!coreUser.isAdmin()){//非超管 + if (!coreUser.isAdmin()) {//非超管 UniversitiesColleges universitiesColleges = new UniversitiesColleges(); universitiesColleges.setOrgId(coreUser.getOrgId()); List universitiesCollegesList = universitiesCollegesService.getValues(universitiesColleges); - if(universitiesCollegesList.size() > 0){ + if (universitiesCollegesList.size() > 0) { universitiesColleges = universitiesCollegesList.get(0); view.addObject("universitiesCollegesName", universitiesColleges.getUniversitiesCollegesName()); view.addObject("universitiesCollegesId", universitiesColleges.getUniversitiesCollegesId()); } - UniversitiesCollegesJurisdictionExperimentalSystem uSystem = (UniversitiesCollegesJurisdictionExperimentalSystem)platformService.getOther(); - if(null != uSystem && ((Integer)1).equals(uSystem.getType())){ + UniversitiesCollegesJurisdictionExperimentalSystem uSystem = (UniversitiesCollegesJurisdictionExperimentalSystem) platformService.getOther(); + if (null != uSystem && ((Integer) 1).equals(uSystem.getType())) { resourcesApplication.setResourcesApplicationId(uSystem.getTypeId()); } } - view.addObject("resourcesApplicationList",resourcesApplicationService.getValues(resourcesApplication)); - view.addObject("beTeacher",null != coreUser && "JT_S_02".equals(coreUser.getJobType1())?1:2);//是否是教师 1是 2否 + view.addObject("resourcesApplicationList", resourcesApplicationService.getValues(resourcesApplication)); + view.addObject("beTeacher", null != coreUser && "JT_S_02".equals(coreUser.getJobType1()) ? 1 : 2);//是否是教师 1是 2否 return view; } @@ -250,14 +280,14 @@ public class TeacherController extends BaseController { UniversitiesColleges universitiesColleges = new UniversitiesColleges(); universitiesColleges.setOrgId(coreUser.getOrgId()); List universitiesCollegesList = universitiesCollegesService.getValues(universitiesColleges); - if(universitiesCollegesList.size() > 0){ + if (universitiesCollegesList.size() > 0) { universitiesColleges = universitiesCollegesList.get(0); view.addObject("universitiesCollegesName", universitiesColleges.getUniversitiesCollegesName()); - }else { + } else { view.addObject("universitiesCollegesName", null); } - view.addObject("beTeacher",null != coreUser && "JT_S_02".equals(coreUser.getJobType1())?1:2);//是否是教师 1是 2否 + view.addObject("beTeacher", null != coreUser && "JT_S_02".equals(coreUser.getJobType1()) ? 1 : 2);//是否是教师 1是 2否 return view; } @@ -270,26 +300,26 @@ public class TeacherController extends BaseController { @ResponseBody public JsonResult indexInfo(Long competitionId) { - Map map = new HashMap<>(); + Map map = new HashMap<>(); Competition competition = competitionService.getById(competitionId); - Integer competitionType = null != competition && null != competition.getCompetitionType()?competition.getCompetitionType():null; + Integer competitionType = null != competition && null != competition.getCompetitionType() ? competition.getCompetitionType() : null; - map.put("competition",competition); + map.put("competition", competition); map.put("competitionCount", null); map.put("competitionStudentsList", null); map.put("competitionTeamCount", null); //竞赛人数 - if(((Integer)1).equals(competitionType)){ + if (((Integer) 1).equals(competitionType)) { CompetitionStudentsQuery competitionStudentsQuery = new CompetitionStudentsQuery(); competitionStudentsQuery.setCompetitionId(competitionId); competitionStudentsQuery.setCompetitionStatus(1); competitionStudentsQuery.setOrderByCompetitionRanking(1); List competitionStudentsList = competitionStudentsService.getCompetitionPersonalInfo(competitionStudentsQuery); map.put("competitionCount", competitionStudentsList.size()); - map.put("competitionStudentsList",competitionStudentsList); - }else if(((Integer)2).equals(competitionType)) { + map.put("competitionStudentsList", competitionStudentsList); + } else if (((Integer) 2).equals(competitionType)) { CompetitionStudentsQuery competitionStudentsQuery = new CompetitionStudentsQuery(); competitionStudentsQuery.setCompetitionId(competitionId); competitionStudentsQuery.setCompetitionStatus(1); @@ -298,14 +328,14 @@ public class TeacherController extends BaseController { } //竞赛团队 - if(((Integer)2).equals(competitionType)){ + if (((Integer) 2).equals(competitionType)) { CompetitionStudentsQuery competitionStudentsQuery = new CompetitionStudentsQuery(); competitionStudentsQuery.setCompetitionId(competitionId); competitionStudentsQuery.setCompetitionStatus(1); competitionStudentsQuery.setOrderByCompetitionRanking(1); List competitionStudentsList = competitionStudentsService.getCompetitionTeamInfo(competitionStudentsQuery); - map.put("competitionStudentsList",competitionStudentsList); - map.put("competitionTeamCount",competitionStudentsList.size()); + map.put("competitionStudentsList", competitionStudentsList); + map.put("competitionTeamCount", competitionStudentsList.size()); } return JsonResult.successMap(map); @@ -315,42 +345,43 @@ public class TeacherController extends BaseController { //题库中客观题 预览 @GetMapping(MODEL + "/getResourcesQuestionMap.json") @ResponseBody - public JsonResult getResourcesQuestionMap(Long courseInfoId){ - if(null == courseInfoId){ + public JsonResult getResourcesQuestionMap(Long courseInfoId) { + if (null == courseInfoId) { return JsonResult.failMessage("参数丢失"); } - Mapmap = new HashMap<>(); + Map map = new HashMap<>(); CourseInfo[] courseInfos = courseInfoService.getSurroundChapterInfo(courseInfoId); CourseInfo courseInfo = courseInfos[1]; - map.put("courseInfo",courseInfo);//当前章节信息 + map.put("courseInfo", courseInfo);//当前章节信息 //上一个章节ID - map.put("backCourseInfoId",courseInfos[0].getCourseInfoId()); + map.put("backCourseInfoId", courseInfos[0].getCourseInfoId()); //下一个章节ID - map.put("nextCourseInfoId",courseInfos[2].getCourseInfoId()); + map.put("nextCourseInfoId", courseInfos[2].getCourseInfoId()); - map.put("headImg",null); - map.put("studentName",null); - map.put("studentSn",null);//学生账号 - map.put("className",null);//班级名称 + map.put("headImg", null); + map.put("studentName", null); + map.put("studentSn", null);//学生账号 + map.put("className", null);//班级名称 List resourcesQuestionList = null; - if(ToolUtils.isNotSplitBlank(courseInfo.getResourcesQuestionIds(),",",0)){ + if (ToolUtils.isNotSplitBlank(courseInfo.getResourcesQuestionIds(), ",", 0)) { ResourcesQuestionQuery resourcesQuestionQuery = new ResourcesQuestionQuery(); resourcesQuestionQuery.setResourcesQuestionIds(courseInfo.getResourcesQuestionIds()); resourcesQuestionList = resourcesQuestionService.getValuesByQuery(resourcesQuestionQuery); } Map> groupByQuestionType = null; - try{ + try { groupByQuestionType = resourcesQuestionList.stream().collect(Collectors.groupingBy(e -> e.getQuestionType())); - }catch (Exception e){} + } catch (Exception e) { + } - map.put("data",groupByQuestionType); - map.put("nowTime",System.currentTimeMillis()); + map.put("data", groupByQuestionType); + map.put("nowTime", System.currentTimeMillis()); return JsonResult.successMap(map); } @@ -358,54 +389,54 @@ public class TeacherController extends BaseController { //题库中竞赛案例 预览 @GetMapping(MODEL + "/getResourcesCompetitionList.json") @ResponseBody - public JsonResult getResourcesCompetitionList(Long courseInfoId,ResourcesCompetitionQuery resourcesCompetitionQuery){ - if(null == courseInfoId){ + public JsonResult getResourcesCompetitionList(Long courseInfoId, ResourcesCompetitionQuery resourcesCompetitionQuery) { + if (null == courseInfoId) { return JsonResult.failMessage("参数丢失"); } - Mapmap = new HashMap<>(); + Map map = new HashMap<>(); CourseInfo[] courseInfos = courseInfoService.getSurroundChapterInfo(courseInfoId); CourseInfo courseInfo = courseInfos[1]; - map.put("courseInfo",courseInfo);//当前章节信息 + map.put("courseInfo", courseInfo);//当前章节信息 //上一个章节ID - map.put("backCourseInfoId",courseInfos[0].getCourseInfoId()); + map.put("backCourseInfoId", courseInfos[0].getCourseInfoId()); //下一个章节ID - map.put("nextCourseInfoId",courseInfos[2].getCourseInfoId()); + map.put("nextCourseInfoId", courseInfos[2].getCourseInfoId()); //目录 - map.put("chapterList",courseInfoService.getChapterList(courseInfoId)); + map.put("chapterList", courseInfoService.getChapterList(courseInfoId)); - map.put("headImg",null); - map.put("studentName",null); + map.put("headImg", null); + map.put("studentName", null); - if(null == courseInfo.getResourcesCompetitionIds()){ + if (null == courseInfo.getResourcesCompetitionIds()) { courseInfo.setResourcesCompetitionIds(""); } ResourcesCompetitionQuery r = new ResourcesCompetitionQuery(); r.setLimit(1L); r.setPage(resourcesCompetitionQuery.getPage()); - if(ToolUtils.findInSet(courseInfo.getResourcesCompetitionIds(),resourcesCompetitionQuery.getResourcesCompetitionId()) || null == resourcesCompetitionQuery.getResourcesCompetitionId()){ - r.setResourcesCompetitionIds(resourcesCompetitionQuery.getResourcesCompetitionId()+","+courseInfo.getResourcesCompetitionIds().replace(resourcesCompetitionQuery.getResourcesCompetitionId().toString(),"")); - }else { + if (ToolUtils.findInSet(courseInfo.getResourcesCompetitionIds(), resourcesCompetitionQuery.getResourcesCompetitionId()) || null == resourcesCompetitionQuery.getResourcesCompetitionId()) { + r.setResourcesCompetitionIds(resourcesCompetitionQuery.getResourcesCompetitionId() + "," + courseInfo.getResourcesCompetitionIds().replace(resourcesCompetitionQuery.getResourcesCompetitionId().toString(), "")); + } else { r.setResourcesCompetitionId(resourcesCompetitionQuery.getResourcesCompetitionId()); } PageQuery page = r.getPageQuery(); resourcesCompetitionService.queryByCondition(page); List resourcesCompetitionList = page.getList(); - for(int i=0;null != resourcesCompetitionList && imap = new HashMap<>(); + Map map = new HashMap<>(); CourseInfo[] courseInfos = courseInfoService.getSurroundChapterInfo(courseInfoId); CourseInfo courseInfo = courseInfos[1]; - map.put("courseInfo",courseInfo);//当前章节信息 + map.put("courseInfo", courseInfo);//当前章节信息 //上一个章节ID - map.put("backCourseInfoId",courseInfos[0].getCourseInfoId()); + map.put("backCourseInfoId", courseInfos[0].getCourseInfoId()); //下一个章节ID - map.put("nextCourseInfoId",courseInfos[2].getCourseInfoId()); + map.put("nextCourseInfoId", courseInfos[2].getCourseInfoId()); //目录 - map.put("chapterList",courseInfoService.getChapterList(courseInfoId)); + map.put("chapterList", courseInfoService.getChapterList(courseInfoId)); - map.put("headImg",null); - map.put("studentName",null); + map.put("headImg", null); + map.put("studentName", null); - if(null == courseInfo.getResourcesTrainingIds()){ + if (null == courseInfo.getResourcesTrainingIds()) { courseInfo.setResourcesTrainingIds(""); } ResourcesTrainingQuery r = new ResourcesTrainingQuery(); r.setLimit(1L); r.setPage(resourcesTrainingQuery.getPage()); - if(ToolUtils.findInSet(courseInfo.getResourcesTrainingIds(),resourcesTrainingQuery.getResourcesTrainingId()) || null == resourcesTrainingQuery.getResourcesTrainingId()){ + if (ToolUtils.findInSet(courseInfo.getResourcesTrainingIds(), resourcesTrainingQuery.getResourcesTrainingId()) || null == resourcesTrainingQuery.getResourcesTrainingId()) { - r.setResourcesTrainingIds(resourcesTrainingQuery.getResourcesTrainingId()+","+courseInfo.getResourcesTrainingIds().replace(resourcesTrainingQuery.getResourcesTrainingId().toString(),"")); - }else { + r.setResourcesTrainingIds(resourcesTrainingQuery.getResourcesTrainingId() + "," + courseInfo.getResourcesTrainingIds().replace(resourcesTrainingQuery.getResourcesTrainingId().toString(), "")); + } else { r.setResourcesTrainingId(resourcesTrainingQuery.getResourcesTrainingId()); } PageQuery page = r.getPageQuery(); resourcesTrainingService.queryByCondition(page); List resourcesTrainingList = page.getList(); - for(int i=0;null != resourcesTrainingList && i allCompetitionList(CompetitionQuery condition,@SCoreUser CoreUser coreUser) { + public JsonResult allCompetitionList(CompetitionQuery condition, @SCoreUser CoreUser coreUser) { condition.setOrgId(coreUser.getOrgId()); - UniversitiesCollegesJurisdictionExperimentalSystem uSystem = (UniversitiesCollegesJurisdictionExperimentalSystem)platformService.getOther(); - if(null != uSystem && ((Integer)1).equals(uSystem.getType())){ + UniversitiesCollegesJurisdictionExperimentalSystem uSystem = (UniversitiesCollegesJurisdictionExperimentalSystem) platformService.getOther(); + if (null != uSystem && ((Integer) 1).equals(uSystem.getType())) { condition.setResourcesApplicationId(uSystem.getTypeId()); } @@ -485,9 +516,9 @@ public class TeacherController extends BaseController { //大赛详情 （除了大赛任务、排行榜、参赛学员（或团队）、大赛答辩） @GetMapping(MODEL + "/getCompetitionInfo.json") @ResponseBody - public JsonResult getCompetitionInfo(Long competitionId,Integer part) { + public JsonResult getCompetitionInfo(Long competitionId, Integer part) { //part 代表部分值 1大赛概况 2大赛任务 3排行榜 4大赛答辩 5参赛学员（参赛团队） 6获奖名单 7大赛动态 8常见问题 - Competition competition = competitionService.queryInfo2Teacher(competitionId,part); + Competition competition = competitionService.queryInfo2Teacher(competitionId, part); return JsonResult.success(competition); } @@ -497,12 +528,12 @@ public class TeacherController extends BaseController { @ResponseBody public JsonResult competitionStudentsTaskList(CompetitionStudentsQuery condition) { Competition competition = competitionService.getById(condition.getCompetitionId()); - if(null != competition){ - if(((Integer)1).equals(competition.getCompetitionType())){ + if (null != competition) { + if (((Integer) 1).equals(competition.getCompetitionType())) { PageQuery page = condition.getPageQuery(); competitionStudentsService.queryPersonalByCondition(page); return JsonResult.success(page); - }else if(((Integer)2).equals(competition.getCompetitionType())){ + } else if (((Integer) 2).equals(competition.getCompetitionType())) { PageQuery page = condition.getPageQuery(); competitionStudentsService.queryTeamPersonalByCondition(page); return JsonResult.success(page); @@ -516,12 +547,12 @@ public class TeacherController extends BaseController { @ResponseBody public JsonResult competitionStudentsDefenseList(CompetitionStudentsQuery condition) { Competition competition = competitionService.getById(condition.getCompetitionId()); - if(null != competition){ - if(((Integer)1).equals(competition.getCompetitionType())){ + if (null != competition) { + if (((Integer) 1).equals(competition.getCompetitionType())) { PageQuery page = condition.getPageQuery(); competitionStudentsService.queryPersonalByCondition(page); return JsonResult.success(page); - }else if(((Integer)2).equals(competition.getCompetitionType())){ + } else if (((Integer) 2).equals(competition.getCompetitionType())) { PageQuery page = condition.getPageQuery(); competitionStudentsService.queryTeamDefenceByCondition(page); return JsonResult.success(page); @@ -535,22 +566,22 @@ public class TeacherController extends BaseController { @ResponseBody public JsonResult competitionRankingList(CompetitionStudentsQuery condition) { Competition competition = competitionService.getById(condition.getCompetitionId()); - if(null != competition){ - if(((Integer)1).equals(competition.getCompetitionType())){ + if (null != competition) { + if (((Integer) 1).equals(competition.getCompetitionType())) { PageQuery page = condition.getPageQuery(); competitionStudentsService.queryPersonalByCondition(page); return JsonResult.success(page); - }else if(((Integer)2).equals(competition.getCompetitionType())){ + } else if (((Integer) 2).equals(competition.getCompetitionType())) { //团队赛排行榜类型（1团队赛排行 2团队赛个人排行 3团队赛答辩排行） - if(((Integer)1).equals(condition.getCompetitionRankingType())){ + if (((Integer) 1).equals(condition.getCompetitionRankingType())) { PageQuery page = condition.getPageQuery(); competitionStudentsService.queryTeamByCondition(page); return JsonResult.success(page); - }else if(((Integer)2).equals(condition.getCompetitionRankingType())){ + } else if (((Integer) 2).equals(condition.getCompetitionRankingType())) { PageQuery page = condition.getPageQuery(); competitionStudentsService.queryTeamPersonalByCondition(page); return JsonResult.success(page); - }else if(((Integer)3).equals(condition.getCompetitionRankingType())){ + } else if (((Integer) 3).equals(condition.getCompetitionRankingType())) { PageQuery page = condition.getPageQuery(); competitionStudentsService.queryTeamDefenceByCondition(page); return JsonResult.success(page); @@ -565,12 +596,12 @@ public class TeacherController extends BaseController { @ResponseBody public JsonResult competitionStudentsList(CompetitionStudentsQuery condition) { Competition competition = competitionService.getById(condition.getCompetitionId()); - if(null != competition){ - if(((Integer)1).equals(competition.getCompetitionType())){ + if (null != competition) { + if (((Integer) 1).equals(competition.getCompetitionType())) { PageQuery page = condition.getPageQuery(); competitionStudentsService.queryPersonalByCondition(page); return JsonResult.success(page); - }else if(((Integer)2).equals(competition.getCompetitionType())){ + } else if (((Integer) 2).equals(competition.getCompetitionType())) { PageQuery page = condition.getPageQuery(); competitionStudentsService.queryTeamByCondition(page); return JsonResult.success(page); @@ -582,44 +613,45 @@ public class TeacherController extends BaseController { //大赛任务一 阅卷 @GetMapping(MODEL + "/getCT1QuestionMap.json") @ResponseBody - public JsonResult getCT1QuestionMap(CompetitionTaskOneQuestionQuery competitionTaskOneQuestionQuery,Long studentsId){ - if(null == competitionTaskOneQuestionQuery.getCompetitionId()){ + public JsonResult getCT1QuestionMap(CompetitionTaskOneQuestionQuery competitionTaskOneQuestionQuery, Long studentsId) { + if (null == competitionTaskOneQuestionQuery.getCompetitionId()) { return JsonResult.failMessage("参数丢失"); } - if(null == studentsId){ + if (null == studentsId) { return JsonResult.failMessage("请选择相应的学生"); } Student student = studentService.queryById(studentsId); Competition competition = competitionService.getById(competitionTaskOneQuestionQuery.getCompetitionId()); - Mapmap = new HashMap<>(); + Map map = new HashMap<>(); - map.put("competitionName",competition.getCompetitionName());//大赛名称 - map.put("cT1StartTime",competition.getCompetitionTaskOneStartTime());//开始时间 - map.put("cT1EndTime",competition.getCompetitionTaskOneEndTime());//结束时间 - map.put("competitionType",competition.getCompetitionType());//大赛类型:1:个人 2：团队 - map.put("headImg",student.getHeadImg());//头像 - map.put("studentName",student.getStudentName());//学生姓名 - map.put("studentSn",student.getStudentSn());//学生账号 + map.put("competitionName", competition.getCompetitionName());//大赛名称 + map.put("cT1StartTime", competition.getCompetitionTaskOneStartTime());//开始时间 + map.put("cT1EndTime", competition.getCompetitionTaskOneEndTime());//结束时间 + map.put("competitionType", competition.getCompetitionType());//大赛类型:1:个人 2：团队 + map.put("headImg", student.getHeadImg());//头像 + map.put("studentName", student.getStudentName());//学生姓名 + map.put("studentSn", student.getStudentSn());//学生账号 CompetitionStudentsQuery competitionStudentsQuery = new CompetitionStudentsQuery(); competitionStudentsQuery.setCompetitionId(competitionTaskOneQuestionQuery.getCompetitionId()); competitionStudentsQuery.setStudentsId(student.getStudentId()); List competitionStudentsList = competitionStudentsService.getCompetitionTeamInfo(competitionStudentsQuery); - map.put("teamName",null != competitionStudentsList && competitionStudentsList.size()>0?competitionStudentsList.get(0).getTeamName():null);//队伍名称 + map.put("teamName", null != competitionStudentsList && competitionStudentsList.size() > 0 ? competitionStudentsList.get(0).getTeamName() : null);//队伍名称 competitionTaskOneQuestionQuery.setStudentsId(student.getStudentId()); List cT1QuestionList = competitionTaskOneQuestionService.getValuesByQuery(competitionTaskOneQuestionQuery); Map> groupByQuestionType = null; - try{ + try { groupByQuestionType = cT1QuestionList.stream().collect(Collectors.groupingBy(e -> e.getQuestionType())); - }catch (Exception e){} + } catch (Exception e) { + } - map.put("data",groupByQuestionType);//所有数据 - map.put("nowTime",System.currentTimeMillis()); + map.put("data", groupByQuestionType);//所有数据 + map.put("nowTime", System.currentTimeMillis()); return JsonResult.successMap(map); } @@ -627,46 +659,46 @@ public class TeacherController extends BaseController { //大赛任务二 阅卷 @GetMapping(MODEL + "/getCT2QuestionList.json") @ResponseBody - public JsonResult getCT2QuestionList(CompetitionTaskSecondQuestionQuery competitionTaskSecondQuestionQuery,Long studentsId){ - if(null == competitionTaskSecondQuestionQuery.getCompetitionId()){ + public JsonResult getCT2QuestionList(CompetitionTaskSecondQuestionQuery competitionTaskSecondQuestionQuery, Long studentsId) { + if (null == competitionTaskSecondQuestionQuery.getCompetitionId()) { return JsonResult.failMessage("参数丢失"); } - if(null == studentsId){ + if (null == studentsId) { return JsonResult.failMessage("请选择相应的学生"); } Student student = studentService.queryById(studentsId); Competition competition = competitionService.getById(competitionTaskSecondQuestionQuery.getCompetitionId()); - Mapmap = new HashMap<>(); + Map map = new HashMap<>(); - map.put("competitionName",competition.getCompetitionName()); - map.put("cT2StartTime",competition.getCompetitionTaskSecondStartTime()); - map.put("cT2EndTime",competition.getCompetitionTaskSecondEndTime()); - map.put("competitionType",competition.getCompetitionType()); - map.put("headImg",student.getHeadImg()); - map.put("studentName",student.getStudentName()); + map.put("competitionName", competition.getCompetitionName()); + map.put("cT2StartTime", competition.getCompetitionTaskSecondStartTime()); + map.put("cT2EndTime", competition.getCompetitionTaskSecondEndTime()); + map.put("competitionType", competition.getCompetitionType()); + map.put("headImg", student.getHeadImg()); + map.put("studentName", student.getStudentName()); CompetitionStudentsQuery competitionStudentsQuery = new CompetitionStudentsQuery(); competitionStudentsQuery.setCompetitionId(competitionTaskSecondQuestionQuery.getCompetitionId()); competitionStudentsQuery.setStudentsId(student.getStudentId()); List competitionStudentsList = competitionStudentsService.getCompetitionTeamInfo(competitionStudentsQuery); - map.put("teamName",null != competitionStudentsList && competitionStudentsList.size()>0?competitionStudentsList.get(0).getTeamName():null); + map.put("teamName", null != competitionStudentsList && competitionStudentsList.size() > 0 ? competitionStudentsList.get(0).getTeamName() : null); competitionTaskSecondQuestionQuery.setStudentsId(student.getStudentId()); PageQuery page = competitionTaskSecondQuestionQuery.getPageQuery(); competitionTaskSecondQuestionService.queryByConditionWithOutAnswer(page); List cT2QuestionList = page.getList(); - for(int i=0;i competitionList = competitionService.getValuesByQuery(competitionQuery); - if(null != competitionList && competitionList.size()>0){ + if (null != competitionList && competitionList.size() > 0) { Competition competition = competitionList.get(0); - if(null != competition){ + if (null != competition) { Teacher teacher = teacherService.getByUserId(coreUser.getId()); //判断是否为评委 1是 2否 - competition.set("beCompetitionJudge",ToolUtils.findInSet(competition.getCompetitionJudgeIds(),teacher.getTeacherId())?1:2); + competition.set("beCompetitionJudge", ToolUtils.findInSet(competition.getCompetitionJudgeIds(), teacher.getTeacherId()) ? 1 : 2); 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); } //处理空的分数 - String competitionTaskThreeFractions =""; - if(null != competitionTeacherEvaluation.get("competitionTaskThreeFractions") && StringUtils.isNotBlank(competitionTeacherEvaluation.get("competitionTaskThreeFractions").toString())){ + String competitionTaskThreeFractions = ""; + if (null != competitionTeacherEvaluation.get("competitionTaskThreeFractions") && StringUtils.isNotBlank(competitionTeacherEvaluation.get("competitionTaskThreeFractions").toString())) { String[] cT3Fraction = competitionTeacherEvaluation.get("competitionTaskThreeFractions").toString().split(","); //平均分 BigDecimal avg = BigDecimal.ZERO; - for(int i=0;imap = new HashMap<>(); - map.put("competition",competition); - map.put("data",competitionTeacherEvaluation); + Map map = new HashMap<>(); + map.put("competition", competition); + map.put("data", competitionTeacherEvaluation); return JsonResult.successMap(map); } @@ -765,25 +797,25 @@ public class TeacherController extends BaseController { //大赛任务三 评分 @PostMapping(MODEL + "/setCT3QuestionScore.json") @ResponseBody - public JsonResult setCT3QuestionScore(CompetitionTeacherEvaluationQuery competitionTeacherEvaluationQuery,@SCoreUser CoreUser coreUser){ - if(null == competitionTeacherEvaluationQuery.getCompetitionId()){ + public JsonResult setCT3QuestionScore(CompetitionTeacherEvaluationQuery competitionTeacherEvaluationQuery, @SCoreUser CoreUser coreUser) { + if (null == competitionTeacherEvaluationQuery.getCompetitionId()) { return JsonResult.failMessage("参数丢失"); } - if(null == competitionTeacherEvaluationQuery.getCompetitionStudentsId()){ + if (null == competitionTeacherEvaluationQuery.getCompetitionStudentsId()) { return JsonResult.failMessage("参数丢失"); } - if(null == competitionTeacherEvaluationQuery.getCompetitionTaskThreeResultsInfo()){ + if (null == competitionTeacherEvaluationQuery.getCompetitionTaskThreeResultsInfo()) { return JsonResult.failMessage("请填写评分详情"); } - if(null == coreUser){ + if (null == coreUser) { return JsonResult.failMessage("请登录后再操作"); } - boolean flag = teacherService.setCT3QuestionScore(competitionTeacherEvaluationQuery,coreUser); - if(flag){ + boolean flag = teacherService.setCT3QuestionScore(competitionTeacherEvaluationQuery, coreUser); + if (flag) { return JsonResult.success(); - }else { + } else { return JsonResult.failMessage("评分失败"); } } @@ -791,7 +823,7 @@ public class TeacherController extends BaseController { //全部考试列表 @PostMapping(MODEL + "/allExamList.json") @ResponseBody - public JsonResult allExamList(ExamQuery condition,@SCoreUser CoreUser coreUser) { + public JsonResult allExamList(ExamQuery condition, @SCoreUser CoreUser coreUser) { condition.setOrgId(coreUser.getOrgId()); PageQuery page = condition.getPageQuery(); @@ -804,7 +836,7 @@ public class TeacherController extends BaseController { @ResponseBody public JsonResult examRankingList(ExamStudentsQuery condition) { Exam exam = examService.queryById(condition.getExamId()); - if(null != exam){ + if (null != exam) { PageQuery page = condition.getPageQuery(); examStudentsService.queryExamByCondition(page); return JsonResult.success(page); @@ -817,7 +849,7 @@ public class TeacherController extends BaseController { @ResponseBody public JsonResult examGradeList(ExamStudentsQuery condition) { Exam exam = examService.queryById(condition.getExamId()); - if(null != exam){ + if (null != exam) { PageQuery page = condition.getPageQuery(); examStudentsService.queryExamByCondition(page); return JsonResult.success(page); @@ -831,7 +863,7 @@ public class TeacherController extends BaseController { @ResponseBody public JsonResult examStudentsList(ExamStudentsQuery condition) { Exam exam = examService.queryById(condition.getExamId()); - if(null != exam){ + if (null != exam) { PageQuery page = condition.getPageQuery(); examStudentsService.queryExamByCondition(page); return JsonResult.success(page); @@ -842,36 +874,37 @@ public class TeacherController extends BaseController { //考试任务一 阅卷 @GetMapping(MODEL + "/getET1QuestionMap.json") @ResponseBody - public JsonResult getET1QuestionMap(ExamTaskOneQuestionQuery examTaskOneQuestionQuery,Long studentsId){ - if(null == examTaskOneQuestionQuery.getExamId()){ + public JsonResult getET1QuestionMap(ExamTaskOneQuestionQuery examTaskOneQuestionQuery, Long studentsId) { + if (null == examTaskOneQuestionQuery.getExamId()) { return JsonResult.failMessage("参数丢失"); } - if(null == studentsId){ + if (null == studentsId) { return JsonResult.failMessage("请选择相应的学生"); } Student student = studentService.queryById(studentsId); Exam exam = examService.queryById(examTaskOneQuestionQuery.getExamId()); - Mapmap = new HashMap<>(); + Map map = new HashMap<>(); - map.put("examName",exam.getExamName());//大赛名称 - map.put("eT1StartTime",exam.getExamTaskOneStartTime());//开始时间 - map.put("eT1EndTime",exam.getExamTaskOneEndTime());//结束时间 - map.put("headImg",student.getHeadImg());//头像 - map.put("studentName",student.getStudentName());//学生姓名 - map.put("studentSn",student.getStudentSn());//学生账号 + map.put("examName", exam.getExamName());//大赛名称 + map.put("eT1StartTime", exam.getExamTaskOneStartTime());//开始时间 + map.put("eT1EndTime", exam.getExamTaskOneEndTime());//结束时间 + map.put("headImg", student.getHeadImg());//头像 + map.put("studentName", student.getStudentName());//学生姓名 + map.put("studentSn", student.getStudentSn());//学生账号 examTaskOneQuestionQuery.setStudentsId(student.getStudentId()); List cT1QuestionList = examTaskOneQuestionService.getValuesByQuery(examTaskOneQuestionQuery); Map> groupByQuestionType = null; - try{ + try { groupByQuestionType = cT1QuestionList.stream().collect(Collectors.groupingBy(e -> e.getQuestionType())); - }catch (Exception e){} + } catch (Exception e) { + } - map.put("data",groupByQuestionType);//所有数据 - map.put("nowTime",System.currentTimeMillis()); + map.put("data", groupByQuestionType);//所有数据 + map.put("nowTime", System.currentTimeMillis()); return JsonResult.successMap(map); } @@ -879,38 +912,38 @@ public class TeacherController extends BaseController { //考试任务二 阅卷 @GetMapping(MODEL + "/getET2QuestionList.json") @ResponseBody - public JsonResult getET2QuestionList(ExamTaskSecondQuestionQuery examTaskSecondQuestionQuery,Long studentsId){ - if(null == examTaskSecondQuestionQuery.getExamId()){ + public JsonResult getET2QuestionList(ExamTaskSecondQuestionQuery examTaskSecondQuestionQuery, Long studentsId) { + if (null == examTaskSecondQuestionQuery.getExamId()) { return JsonResult.failMessage("参数丢失"); } - if(null == studentsId){ + if (null == studentsId) { return JsonResult.failMessage("请选择相应的学生"); } Student student = studentService.queryById(studentsId); Exam exam = examService.queryById(examTaskSecondQuestionQuery.getExamId()); - Mapmap = new HashMap<>(); + Map map = new HashMap<>(); - map.put("examName",exam.getExamName()); - map.put("eT2StartTime",exam.getExamTaskSecondStartTime()); - map.put("eT2EndTime",exam.getExamTaskSecondEndTime()); - map.put("headImg",student.getHeadImg()); - map.put("studentName",student.getStudentName()); + map.put("examName", exam.getExamName()); + map.put("eT2StartTime", exam.getExamTaskSecondStartTime()); + map.put("eT2EndTime", exam.getExamTaskSecondEndTime()); + map.put("headImg", student.getHeadImg()); + map.put("studentName", student.getStudentName()); examTaskSecondQuestionQuery.setStudentsId(student.getStudentId()); PageQuery page = examTaskSecondQuestionQuery.getPageQuery(); examTaskSecondQuestionService.queryByConditionWithOutAnswer(page); List eT2QuestionList = page.getList(); - for(int i=0;imap = new HashMap<>(); + Map map = new HashMap<>(); - map.put("examName",exam.getExamName()); - map.put("eT3StartTime",exam.getExamTaskThreeStartTime()); - map.put("eT3EndTime",exam.getExamTaskThreeEndTime()); - map.put("headImg",student.getHeadImg()); - map.put("studentName",student.getStudentName()); + map.put("examName", exam.getExamName()); + map.put("eT3StartTime", exam.getExamTaskThreeStartTime()); + map.put("eT3EndTime", exam.getExamTaskThreeEndTime()); + map.put("headImg", student.getHeadImg()); + map.put("studentName", student.getStudentName()); - map.put("examStudents",examStudents); + map.put("examStudents", examStudents); examTaskThreeQuestionQuery.setStudentsId(student.getStudentId()); PageQuery page = examTaskThreeQuestionQuery.getPageQuery(); examTaskThreeQuestionService.queryByConditionWithOutAnswer(page); List eT3QuestionList = page.getList(); - for(int i=0;i list(TeacherQuery condition,@SCoreUser CoreUser coreUser){ - if(null == condition.getTeacherStatus() && StringUtils.isBlank(condition.getTeacherStatuses())){ + public JsonResult list(TeacherQuery condition, @SCoreUser CoreUser coreUser) { + if (null == condition.getTeacherStatus() && StringUtils.isBlank(condition.getTeacherStatuses())) { condition.setTeacherStatus(1); } @@ -1020,11 +1052,11 @@ public class TeacherController extends BaseController { PageQuery page = condition.getPageQuery(); teacherService.queryByCondition(page); - Mapmap = new HashMap<>(); - map.put("count",page.getTotalRow()); - map.put("data",page.getList()); - map.put("beAdministrator",null != coreUser && "JT_S_01".equals(coreUser.getJobType1())?1:2);//是否是管理员 1是 2否 - map.put("tempTeacherIds",teacherService.getIdsByQuery(condition)); + Map map = new HashMap<>(); + map.put("count", page.getTotalRow()); + map.put("data", page.getList()); + map.put("beAdministrator", null != coreUser && "JT_S_01".equals(coreUser.getJobType1()) ? 1 : 2);//是否是管理员 1是 2否 + map.put("tempTeacherIds", teacherService.getIdsByQuery(condition)); return JsonResult.successMap(map); } @@ -1032,20 +1064,20 @@ public class TeacherController extends BaseController { @PostMapping(MODEL + "/add.json") @Function("teacher.add") @ResponseBody - public JsonResult add(@Validated(ValidateConfig.ADD.class)Teacher teacher, BindingResult result,@SCoreUser CoreUser coreUser){ - if(result.hasErrors()){ + public JsonResult add(@Validated(ValidateConfig.ADD.class) Teacher teacher, BindingResult result, @SCoreUser CoreUser coreUser) { + if (result.hasErrors()) { return JsonResult.failMessage(result); - }else{ - if(null == teacher.getUniversitiesCollegesId()){ + } else { + if (null == teacher.getUniversitiesCollegesId()) { UniversitiesColleges universitiesColleges = new UniversitiesColleges(); universitiesColleges.setOrgId(coreUser.getOrgId()); List universitiesCollegesList = universitiesCollegesService.getValues(universitiesColleges); - if(universitiesCollegesList.size() > 0){ + if (universitiesCollegesList.size() > 0) { universitiesColleges = universitiesCollegesList.get(0); teacher.setUniversitiesCollegesId(universitiesColleges.getUniversitiesCollegesId()); teacher.setOrgId(universitiesColleges.getOrgId()); } - }else { + } else { UniversitiesColleges universitiesColleges = universitiesCollegesService.queryById(teacher.getUniversitiesCollegesId()); teacher.setOrgId(universitiesColleges.getOrgId()); } @@ -1056,14 +1088,18 @@ public class TeacherController extends BaseController { @PostMapping(MODEL + "/edit.json") @Function("teacher.edit") @ResponseBody - public JsonResult edit(@Validated(ValidateConfig.UPDATE.class) Teacher teacher, BindingResult result) { - if(result.hasErrors()){ + public JsonResult edit(@Validated(ValidateConfig.UPDATE.class) Teacher teacher, BindingResult result) { + if (result.hasErrors()) { return JsonResult.failMessage(result); - }else { + } else { teacher.setUniversitiesCollegesId(null); teacher.setAddTime(null); teacher.setUserId(null); teacher.setOrgId(null); + + if (teacher.getTeacherJobNumber().length() >= 16) { + return JsonResult.failMessage("输入内容：" + teacher.getTeacherJobNumber() + " 超过16个字符！"); + } boolean success = teacherService.edit(teacher); if (success) { @@ -1078,10 +1114,10 @@ public class TeacherController extends BaseController { @PostMapping(MODEL + "/initPassword.json") @Function("teacher.edit") @ResponseBody - public JsonResult initPassword(@Validated(ValidateConfig.UPDATE.class) Teacher teacher, BindingResult result) { - if(result.hasErrors()){ + public JsonResult initPassword(@Validated(ValidateConfig.UPDATE.class) Teacher teacher, BindingResult result) { + if (result.hasErrors()) { return JsonResult.failMessage(result); - }else { + } else { boolean success = teacherService.initPassword(teacher); if (success) { return JsonResult.success(); @@ -1091,20 +1127,20 @@ public class TeacherController extends BaseController { } } - + @GetMapping(MODEL + "/view.json") @Function("teacher.query") @ResponseBody - public JsonResultqueryInfo(Long teacherId) { - Teacher teacher = teacherService.queryById( teacherId); - return JsonResult.success(teacher); + public JsonResult queryInfo(Long teacherId) { + Teacher teacher = teacherService.queryById(teacherId); + return JsonResult.success(teacher); } @GetMapping(MODEL + "/getValues.json") @ResponseBody - public JsonResult>getValues(TeacherQuery param) { + public JsonResult> getValues(TeacherQuery param) { List list = teacherService.getValues(param); - return JsonResult.success(list); + return JsonResult.success(list); } @@ -1120,18 +1156,18 @@ public class TeacherController extends BaseController { @PostMapping(MODEL + "/logList.json") @Function("teacher.query") @ResponseBody - public JsonResult logList(TeacherQuery condition,@SCoreUser CoreUser coreUser){ + public JsonResult logList(TeacherQuery condition, @SCoreUser CoreUser coreUser) { condition.setLog(1); - condition.setOrgId(null != coreUser && "JT_S_02".equals(coreUser.getJobType1())?coreUser.getOrgId():null); + condition.setOrgId(null != coreUser && "JT_S_02".equals(coreUser.getJobType1()) ? coreUser.getOrgId() : null); - if(null == condition.getTeacherStatus()){ + if (null == condition.getTeacherStatus()) { condition.setTeacherStatus(1); } - if(null != coreUser && "JT_S_02".equals(coreUser.getJobType1())){ - UniversitiesCollegesJurisdictionExperimentalSystem uSystem = (UniversitiesCollegesJurisdictionExperimentalSystem)platformService.getOther(); - if(null != uSystem && ((Integer)1).equals(uSystem.getType())){ + if (null != coreUser && "JT_S_02".equals(coreUser.getJobType1())) { + UniversitiesCollegesJurisdictionExperimentalSystem uSystem = (UniversitiesCollegesJurisdictionExperimentalSystem) platformService.getOther(); + if (null != uSystem && ((Integer) 1).equals(uSystem.getType())) { condition.setResourcesApplicationId(uSystem.getTypeId()); } } @@ -1145,9 +1181,9 @@ public class TeacherController extends BaseController { //日志统计 @PostMapping(MODEL + "/statisticsLog.json") @ResponseBody - public JsonResult statisticsLog(@SCoreUser CoreUser coreUser){ + public JsonResult statisticsLog(@SCoreUser CoreUser coreUser) { - if(null == coreUser){ + if (null == coreUser) { return JsonResult.failMessage("请登录后再操作"); } @@ -1158,10 +1194,10 @@ public class TeacherController extends BaseController { @PostMapping(MODEL + "/queryPracticePerformanceStatistic.json") @Function("student.query") @ResponseBody - public JsonResult queryPracticePerformanceStatistic(StudentQuery condition,@SCoreUser CoreUser coreUser){ - condition.setOrgId(null != coreUser && "JT_S_02".equals(coreUser.getJobType1())?coreUser.getOrgId():null); + public JsonResult queryPracticePerformanceStatistic(StudentQuery condition, @SCoreUser CoreUser coreUser) { + condition.setOrgId(null != coreUser && "JT_S_02".equals(coreUser.getJobType1()) ? coreUser.getOrgId() : null); - if(null == condition.getStudentStatus()){ + if (null == condition.getStudentStatus()) { condition.setStudentStatus(1); } @@ -1174,36 +1210,36 @@ public class TeacherController extends BaseController { //查课程名称 @GetMapping(MODEL + "/getCourseResourcesList.json") @ResponseBody - public JsonResult getCourseResourcesList(){ - Listlist = courseInfoService.getListByCourseLabelTypes("应用课程类"); - return JsonResult.success(list); + public JsonResult getCourseResourcesList() { + List list = courseInfoService.getListByCourseLabelTypes("应用课程类"); + return JsonResult.success(list); } //练习成绩详情 @GetMapping(MODEL + "/getPracticePerformanceStatisticInfoList.json") @ResponseBody - public JsonResult>getPracticePerformanceStatisticInfoList(StudentQuery studentQuery,@SCoreUser CoreUser coreUser) { - studentQuery.setOrgId(null != coreUser && "JT_S_02".equals(coreUser.getJobType1())?coreUser.getOrgId():null); + public JsonResult> getPracticePerformanceStatisticInfoList(StudentQuery studentQuery, @SCoreUser CoreUser coreUser) { + studentQuery.setOrgId(null != coreUser && "JT_S_02".equals(coreUser.getJobType1()) ? coreUser.getOrgId() : null); - Listlist = studentService.getPracticePerformanceStatisticInfoList(studentQuery); - return JsonResult.success(list); + List list = studentService.getPracticePerformanceStatisticInfoList(studentQuery); + return JsonResult.success(list); } //练习进度 @GetMapping(MODEL + "/getPracticeProgressList.json") @ResponseBody - public JsonResult>getPracticeProgressList(StudentQuery studentQuery,@SCoreUser CoreUser coreUser) { - studentQuery.setOrgId(null != coreUser && "JT_S_02".equals(coreUser.getJobType1())?coreUser.getOrgId():null); + public JsonResult> getPracticeProgressList(StudentQuery studentQuery, @SCoreUser CoreUser coreUser) { + studentQuery.setOrgId(null != coreUser && "JT_S_02".equals(coreUser.getJobType1()) ? coreUser.getOrgId() : null); - Listlist = studentService.getPracticeProgressList(studentQuery); - return JsonResult.success(list); + List list = studentService.getPracticeProgressList(studentQuery); + return JsonResult.success(list); } //错题统计 @PostMapping(MODEL + "/getErrorStatistics.json") @ResponseBody - public JsonResult getErrorStatistics(StudentQuery condition,@SCoreUser CoreUser coreUser) { - condition.setOrgId(null != coreUser && "JT_S_02".equals(coreUser.getJobType1())?coreUser.getOrgId():null); + public JsonResult getErrorStatistics(StudentQuery condition, @SCoreUser CoreUser coreUser) { + condition.setOrgId(null != coreUser && "JT_S_02".equals(coreUser.getJobType1()) ? coreUser.getOrgId() : null); PageQuery page = condition.getPageQuery(); studentService.getErrorStatistics(page); @@ -1213,8 +1249,8 @@ public class TeacherController extends BaseController { //实训案例列表 @PostMapping(MODEL + "/getStudentTrainingList.json") @ResponseBody - public JsonResult getStudentTrainingList(StudentDefenceLogInfoQuery condition,@SCoreUser CoreUser coreUser){ - condition.setOrgId(null != coreUser && "JT_S_02".equals(coreUser.getJobType1())?coreUser.getOrgId():null); + public JsonResult getStudentTrainingList(StudentDefenceLogInfoQuery condition, @SCoreUser CoreUser coreUser) { + condition.setOrgId(null != coreUser && "JT_S_02".equals(coreUser.getJobType1()) ? coreUser.getOrgId() : null); PageQuery page = condition.getPageQuery(); studentDefenceLogInfoService.queryByCondition(page); @@ -1224,8 +1260,8 @@ public class TeacherController extends BaseController { //实训案例详情 @GetMapping(MODEL + "/getStudentTrainingInfo.json") @ResponseBody - public JsonResult getStudentTrainingInfo(StudentDefenceLogInfoQuery studentDefenceLogInfoQuery){ - if(null == studentDefenceLogInfoQuery.getStudentDefenceLogInfoId()){ + public JsonResult getStudentTrainingInfo(StudentDefenceLogInfoQuery studentDefenceLogInfoQuery) { + if (null == studentDefenceLogInfoQuery.getStudentDefenceLogInfoId()) { return JsonResult.failMessage("请选择相应的记录"); } @@ -1233,24 +1269,24 @@ public class TeacherController extends BaseController { StudentDefenceLog studentDefenceLog = studentDefenceLogService.queryById(studentDefenceLogInfo.getStudentDefenceLogId()); - Long resourcesTrainingId = null != studentDefenceLogInfo.get("resourcesTrainingId") && StringUtils.isNotBlank(studentDefenceLogInfo.get("resourcesTrainingId").toString())?Long.parseLong(studentDefenceLogInfo.get("resourcesTrainingId").toString()):null; - if(null == resourcesTrainingId){ + Long resourcesTrainingId = null != studentDefenceLogInfo.get("resourcesTrainingId") && StringUtils.isNotBlank(studentDefenceLogInfo.get("resourcesTrainingId").toString()) ? Long.parseLong(studentDefenceLogInfo.get("resourcesTrainingId").toString()) : null; + if (null == resourcesTrainingId) { return JsonResult.failMessage("案例信息丢失"); } ResourcesTraining resourcesTraining = resourcesTrainingService.queryById(resourcesTrainingId); - if(null == resourcesTraining){ + if (null == resourcesTraining) { return JsonResult.failMessage("案例信息丢失"); } - resourcesTraining.set("studentFraction",studentDefenceLogInfo.getStudentFraction()); - resourcesTraining.set("studentDefenceData",studentDefenceLogInfo.getStudentDefenceData()); - resourcesTraining.set("defenceComment",studentDefenceLogInfo.getDefenceComment()); + resourcesTraining.set("studentFraction", studentDefenceLogInfo.getStudentFraction()); + resourcesTraining.set("studentDefenceData", studentDefenceLogInfo.getStudentDefenceData()); + resourcesTraining.set("defenceComment", studentDefenceLogInfo.getDefenceComment()); ResourcesTrainingStepQuery resourcesTrainingStepQuery = new ResourcesTrainingStepQuery(); resourcesTrainingStepQuery.setResourcesTrainingId(resourcesTraining.getResourcesTrainingId()); resourcesTrainingStepQuery.setStudentId(studentDefenceLog.getStudentId()); List resourcesTrainingStepList = resourcesTrainingStepService.getValuesByQuery(resourcesTrainingStepQuery); - resourcesTraining.set("resourcesTrainingStepList",resourcesTrainingStepList); + resourcesTraining.set("resourcesTrainingStepList", resourcesTrainingStepList); return JsonResult.success(resourcesTraining); } @@ -1258,14 +1294,14 @@ public class TeacherController extends BaseController { //实训案例评分 @PostMapping(MODEL + "/setDefenceFraction.json") @ResponseBody - public JsonResult setDefenceFraction(StudentDefenceLogInfoQuery studentDefenceLogInfoQuery,@SCoreUser CoreUser coreUser){ - if(null == coreUser){ + public JsonResult setDefenceFraction(StudentDefenceLogInfoQuery studentDefenceLogInfoQuery, @SCoreUser CoreUser coreUser) { + if (null == coreUser) { return JsonResult.failMessage("请登录后再操作"); } - if(null == studentDefenceLogInfoQuery.getStudentDefenceLogInfoId()){ + if (null == studentDefenceLogInfoQuery.getStudentDefenceLogInfoId()) { return JsonResult.failMessage("请选择相应的记录"); } - if(null == studentDefenceLogInfoQuery.getStudentFraction()){ + if (null == studentDefenceLogInfoQuery.getStudentFraction()) { return JsonResult.failMessage("请填写相应的分数"); } @@ -1282,27 +1318,27 @@ public class TeacherController extends BaseController { //打开在线编译器 @PostMapping(MODEL + "/createJupyterNotebook.json") @ResponseBody - public JsonResult createJupyterNotebook(@SCoreUser CoreUser coreUser){ - if(null == coreUser){ + public JsonResult createJupyterNotebook(@SCoreUser CoreUser coreUser) { + if (null == coreUser) { return JsonResult.failMessage("请登录后操作"); } String JupyterNotebookUrl = JupyterNotebookUtils.createJupyterNotebook(coreUser.getCode()); - if(StringUtils.isNotBlank(JupyterNotebookUrl)){ + if (StringUtils.isNotBlank(JupyterNotebookUrl)) { return JsonResult.success(JupyterNotebookUrl); - }else { + } else { return JsonResult.failMessage("开启失败，请重试，如果重试失败，请联系管理员"); } } //下载模板信息 @GetMapping(MODEL + "/downloadTemplate_old.json") - public void download(HttpServletResponse response,@SCoreUser CoreUser coreUser) { + public void download(HttpServletResponse response, @SCoreUser CoreUser coreUser) { XSSFWorkbook workbook = null; InputStream is = null; try { - is = new FileInputStream(GetFile.p + File.separator +"filesystem"+ File.separator +"template"+ File.separator+ "教师导入模板.xlsx"); + is = new FileInputStream(GetFile.p + File.separator + "filesystem" + File.separator + "template" + File.separator + "教师导入模板.xlsx"); workbook = new XSSFWorkbook(is); @@ -1311,26 +1347,26 @@ public class TeacherController extends BaseController { UniversitiesColleges universitiesColleges = new UniversitiesColleges(); universitiesColleges.setUniversitiesCollegesStatus(1); - if("JT_S_02".equals(coreUser.getJobType1())){//老师 + if ("JT_S_02".equals(coreUser.getJobType1())) {//老师 universitiesColleges.setOrgId(coreUser.getOrgId()); } List universitiesCollegesList = universitiesCollegesService.getValues(universitiesColleges); - if(null != universitiesCollegesList && universitiesCollegesList.size()>0){ - for(int i=0;i 0) { + for (int i = 0; i < universitiesCollegesList.size(); i++) { Row row = sheet.createRow(i); Cell cell = row.createCell(0); - cell.setCellValue(universitiesCollegesList.get(i).getUniversitiesCollegesName()+"_"+universitiesCollegesList.get(i).getUniversitiesCollegesId()); + cell.setCellValue(universitiesCollegesList.get(i).getUniversitiesCollegesName() + "_" + universitiesCollegesList.get(i).getUniversitiesCollegesId()); } - }else { + } else { throw new PlatformException("请先添加院校"); } try { - if(null != is){ + if (null != is) { is.close(); } - }catch (Exception e){ + } catch (Exception e) { e.printStackTrace(); } @@ -1346,7 +1382,7 @@ public class TeacherController extends BaseController { //workbook将Excel写入到response的输出流中，供页面下载 workbook.write(response.getOutputStream()); - }catch (Exception e){ + } catch (Exception e) { e.printStackTrace(); } finally { try { @@ -1356,7 +1392,8 @@ public class TeacherController extends BaseController { if (null != response && null != response.getOutputStream()) { response.getOutputStream().close(); } - } catch (Exception e) { } + } catch (Exception e) { + } } } @@ -1364,9 +1401,9 @@ public class TeacherController extends BaseController { @PostMapping(MODEL + "/importTemplate_old.json") @ResponseBody public JsonResult importTemplate(@RFile FileEntity fileEntity) { - Listlist=new ArrayList<>(); - JsonResult jsonResult = teacherService.importTemplate(fileEntity,list); - if(list.size()>0){ + List list = new ArrayList<>(); + JsonResult jsonResult = teacherService.importTemplate(fileEntity, list); + if (list.size() > 0) { teacherService.deleteByList(list); } return jsonResult; @@ -1412,12 +1449,12 @@ public class TeacherController extends BaseController { //导出信息 @GetMapping(MODEL + "/export1.json") @ResponseBody - public void export(HttpServletResponse response,TeacherQuery teacherQuery) { + public void export(HttpServletResponse response, TeacherQuery teacherQuery) { HSSFWorkbook workbook = null; try { //表头数据 String[] header = {"院校名称", "教师姓名", "工号", "电话", "邮箱"}; - String[] headerCode = {"universitiesCollegesName","teacherName","teacherJobNumber", "teacherMobile", "teacherEmail"}; + String[] headerCode = {"universitiesCollegesName", "teacherName", "teacherJobNumber", "teacherMobile", "teacherEmail"}; //数据内容 List> mapList = teacherService.getExcelValues(teacherQuery); @@ -1463,7 +1500,7 @@ public class TeacherController extends BaseController { //设置表格特定的列宽度 if (null != widthMap.get(headerCode[i])) { String width = widthMap.get(headerCode[i]).toString().split("\\.")[0]; - Integer w = Integer.parseInt(width) > header[i].length()*3?Integer.parseInt(width):header[i].length()*3; + Integer w = Integer.parseInt(width) > header[i].length() * 3 ? Integer.parseInt(width) : header[i].length() * 3; sheet.setColumnWidth(i, w * 190); } @@ -1484,7 +1521,7 @@ public class TeacherController extends BaseController { for (int i = 0; i < mapList.size(); i++) { HSSFRow row = sheet.createRow(i + 1); - row.setHeight((short) (50*10)); + row.setHeight((short) (50 * 10)); Map map = mapList.get(i); for (int j = 0; j < headerCode.length; j++) { @@ -1508,7 +1545,7 @@ public class TeacherController extends BaseController { //workbook将Excel写入到response的输出流中，供页面下载 workbook.write(response.getOutputStream()); - }catch (Exception e){ + } catch (Exception e) { e.printStackTrace(); } finally { try { @@ -1518,16 +1555,18 @@ public class TeacherController extends BaseController { if (null != response && null != response.getOutputStream()) { response.getOutputStream().close(); } - } catch (Exception e) { } + } catch (Exception e) { + } } } /** * 导出批量模板 + * * @return */ @SneakyThrows - @GetMapping({ API + "/exportBatchTemplate.do", MODEL + "/downloadTemplate.json" }) + @GetMapping({API + "/exportBatchTemplate.do", MODEL + "/downloadTemplate.json"}) @ResponseBody public void exportBatchTemplate(@SCoreUser CoreUser coreUser) { @@ -1538,8 +1577,7 @@ public class TeacherController extends BaseController { if (coreUser.isAdmin()) { // 输出 Excel com.ibeetl.admin.core.util.excelGroupValidation.ExcelUtil.createExcel(Arrays.asList(new TeacherBatchImportAdminDTO()), response.getOutputStream()); - } - else { + } else { // 输出 Excel com.ibeetl.admin.core.util.excelGroupValidation.ExcelUtil.createExcel(Arrays.asList(new TeacherBatchImportUniAdminDTO()), response.getOutputStream()); } @@ -1547,6 +1585,7 @@ public class TeacherController extends BaseController { /** * 功能描述:
+ * * @param file * @return {@link JsonResult} * @Author: 87966 @@ -1644,8 +1683,7 @@ public class TeacherController extends BaseController { // 导入并添加身份信息 list.forEach(teacherService::add); - } - catch (IllegalArgumentException exception) { + } catch (IllegalArgumentException exception) { return JsonResult.failMessage(exception.getMessage()).setCode(DIY_ERROR.getCode()); } return JsonResult.successMessage("导入成功！");