Commit a6ac0fdafa6a562928e91c993b5492d79655d1f8
1 parent
897d9009
Exists in
master
排课 优化 调整课程
Showing
4 changed files
with
79 additions
and
77 deletions
Show diff stats
src/main/java/com/jevon/controller/ScheduleController.java
| @@ -765,73 +765,75 @@ public class ScheduleController { | @@ -765,73 +765,75 @@ public class ScheduleController { | ||
| 765 | return true ; | 765 | return true ; |
| 766 | }else { | 766 | }else { |
| 767 | //增加判断 不排课的课程不能替换 合班的课程不能替换 联课的可能不能替换 | 767 | //增加判断 不排课的课程不能替换 合班的课程不能替换 联课的可能不能替换 |
| 768 | - JoinClass joinClass = new JoinClass(); | ||
| 769 | - joinClass.setSchoolId(nextClass.getSchoolId()); | ||
| 770 | - joinClass.setTeam(nextClass.getTeam()); | ||
| 771 | - joinClass.setCourseId(nextClass.getCourseId()); | ||
| 772 | - joinClass.setClassId(nextClass.getClassId()); | ||
| 773 | - List<JoinClass> joinClasses = joinClassService.selectByCourse(joinClass); | ||
| 774 | - boolean joinClassFlag = joinClasses != null && joinClasses.size() > 0 ; | ||
| 775 | - TeacherClass searchTeacherClass = new TeacherClass(); | ||
| 776 | - searchTeacherClass.setSchoolId(nextClass.getSchoolId()); | ||
| 777 | - searchTeacherClass.setTeam(nextClass.getTeam()); | ||
| 778 | - searchTeacherClass.setCourseName(nextClass.getCourseName()); | ||
| 779 | - List<TeacherClass> teacherClasses = teacherClassService.selectByCourseName(searchTeacherClass); | ||
| 780 | - boolean joinTimesFlag = teacherClasses.get(0).getJoinTimes()>0?true:false; | ||
| 781 | - if(nextClass.getCourseName().equals("不排课") || joinClassFlag || joinTimesFlag){ | ||
| 782 | - //这些课 不能替换 | ||
| 783 | - }else { | ||
| 784 | - TeacherClass replaceClassTeacher = new TeacherClass(); | ||
| 785 | - replaceClassTeacher.setSchoolId(classCourse.getSchoolId()); | ||
| 786 | - replaceClassTeacher.setGrade(classCourse.getGrade()); | ||
| 787 | - replaceClassTeacher.setClassId(classCourse.getClassId()); | ||
| 788 | - replaceClassTeacher.setCourseName(nextClass.getCourseName()); | ||
| 789 | - replaceClassTeacher.setTeam(team); | ||
| 790 | - String nextTeacher = teacherClassService.selectByCourseAndClass(replaceClassTeacher).getTeacherName(); | ||
| 791 | - | ||
| 792 | - //原课的老师 下一节课是否有课 ；下一节课的老师 上一节是否有课 | ||
| 793 | - TeacherCourse searchTeacher = new TeacherCourse(); | ||
| 794 | - searchTeacher.setSchoolId(classCourse.getSchoolId()); | ||
| 795 | - searchTeacher.setSingleOrDouble(classCourse.getSingleOrDouble()); | ||
| 796 | - searchTeacher.setTeacherName(teacherClass.getTeacherName()); | ||
| 797 | - searchTeacher.setWeek(weekChange); | ||
| 798 | - searchTeacher.setCourseNumber(courseNumberChange); | ||
| 799 | - searchTeacher.setTeam(team); | ||
| 800 | - TeacherCourse teacherCourse = teacherCourseService.selectTeacherCourse(searchTeacher); | ||
| 801 | - | ||
| 802 | - TeacherCourse nextTeacherCourseSearch = new TeacherCourse(); | ||
| 803 | - nextTeacherCourseSearch.setSchoolId(classCourse.getSchoolId()); | ||
| 804 | - nextTeacherCourseSearch.setSingleOrDouble(classCourse.getSingleOrDouble()); | ||
| 805 | - nextTeacherCourseSearch.setTeacherName(nextTeacher); | ||
| 806 | - nextTeacherCourseSearch.setWeek(week); | ||
| 807 | - nextTeacherCourseSearch.setCourseNumber(courseNumber); | ||
| 808 | - nextTeacherCourseSearch.setTeam(team); | ||
| 809 | - TeacherCourse nextTeacherCourse = teacherCourseService.selectTeacherCourse(nextTeacherCourseSearch); | ||
| 810 | - if(StringUtils.isBlank(nextTeacherCourse.getCourseName()) && StringUtils.isBlank(teacherCourse.getCourseName())){ | ||
| 811 | - //则上下替换课程 班级课程上下替换，老师课程交换 | ||
| 812 | - String className =teacherClass.getCourseName(); | ||
| 813 | - String nextClassName = nextClass.getCourseName(); | ||
| 814 | - classCourse.setCourseName(nextClassName); | ||
| 815 | - nextClass.setCourseName(className); | ||
| 816 | - classCourseService.updateByPrimaryKey(classCourse); | ||
| 817 | - classCourseService.updateByPrimaryKey(nextClass); | ||
| 818 | - | ||
| 819 | - teacherCourse.setGrade(teacherClass.getGrade()); | ||
| 820 | - teacherCourse.setCourseName(className); | ||
| 821 | - teacherCourse.setClassId(teacherClass.getClassId()+""); | ||
| 822 | - teacherCourseService.updateTeacherCourse(teacherCourse); | ||
| 823 | - | ||
| 824 | - nextTeacherCourse.setGrade(nextClass.getGrade()); | ||
| 825 | - nextTeacherCourse.setCourseName(nextClassName); | ||
| 826 | - nextTeacherCourse.setClassId(nextClass.getClassId()+""); | ||
| 827 | - teacherCourseService.updateTeacherCourse(nextTeacherCourse); | ||
| 828 | - | ||
| 829 | - nextTeacherCourse.setWeek(weekChange); | ||
| 830 | - nextTeacherCourse.setCourseNumber(courseNumberChange); | ||
| 831 | - nextTeacherCourse.setCourseName(null); | ||
| 832 | - nextTeacherCourse.setClassId(null); | ||
| 833 | - teacherCourseService.updateTeacherCourse(nextTeacherCourse); | ||
| 834 | - return true ; | 768 | + if(!nextClass.getCourseName().equals("不排课")){ |
| 769 | + JoinClass joinClass = new JoinClass(); | ||
| 770 | + joinClass.setSchoolId(nextClass.getSchoolId()); | ||
| 771 | + joinClass.setTeam(nextClass.getTeam()); | ||
| 772 | + joinClass.setCourseId(nextClass.getCourseId()); | ||
| 773 | + joinClass.setClassId(nextClass.getClassId()); | ||
| 774 | + List<JoinClass> joinClasses = joinClassService.selectByCourse(joinClass); | ||
| 775 | + boolean joinClassFlag = joinClasses != null && joinClasses.size() > 0 ; | ||
| 776 | + TeacherClass searchTeacherClass = new TeacherClass(); | ||
| 777 | + searchTeacherClass.setSchoolId(nextClass.getSchoolId()); | ||
| 778 | + searchTeacherClass.setTeam(nextClass.getTeam()); | ||
| 779 | + searchTeacherClass.setCourseName(nextClass.getCourseName()); | ||
| 780 | + List<TeacherClass> teacherClasses = teacherClassService.selectByCourseName(searchTeacherClass); | ||
| 781 | + boolean joinTimesFlag = teacherClasses.get(0).getJoinTimes()>0?true:false; | ||
| 782 | + if(nextClass.getCourseName().equals("不排课") || joinClassFlag || joinTimesFlag){ | ||
| 783 | + //这些课 不能替换 | ||
| 784 | + }else { | ||
| 785 | + TeacherClass replaceClassTeacher = new TeacherClass(); | ||
| 786 | + replaceClassTeacher.setSchoolId(classCourse.getSchoolId()); | ||
| 787 | + replaceClassTeacher.setGrade(classCourse.getGrade()); | ||
| 788 | + replaceClassTeacher.setClassId(classCourse.getClassId()); | ||
| 789 | + replaceClassTeacher.setCourseName(nextClass.getCourseName()); | ||
| 790 | + replaceClassTeacher.setTeam(team); | ||
| 791 | + String nextTeacher = teacherClassService.selectByCourseAndClass(replaceClassTeacher).getTeacherName(); | ||
| 792 | + | ||
| 793 | + //原课的老师 下一节课是否有课 ；下一节课的老师 上一节是否有课 | ||
| 794 | + TeacherCourse searchTeacher = new TeacherCourse(); | ||
| 795 | + searchTeacher.setSchoolId(classCourse.getSchoolId()); | ||
| 796 | + searchTeacher.setSingleOrDouble(classCourse.getSingleOrDouble()); | ||
| 797 | + searchTeacher.setTeacherName(teacherClass.getTeacherName()); | ||
| 798 | + searchTeacher.setWeek(weekChange); | ||
| 799 | + searchTeacher.setCourseNumber(courseNumberChange); | ||
| 800 | + searchTeacher.setTeam(team); | ||
| 801 | + TeacherCourse teacherCourse = teacherCourseService.selectTeacherCourse(searchTeacher); | ||
| 802 | + | ||
| 803 | + TeacherCourse nextTeacherCourseSearch = new TeacherCourse(); | ||
| 804 | + nextTeacherCourseSearch.setSchoolId(classCourse.getSchoolId()); | ||
| 805 | + nextTeacherCourseSearch.setSingleOrDouble(classCourse.getSingleOrDouble()); | ||
| 806 | + nextTeacherCourseSearch.setTeacherName(nextTeacher); | ||
| 807 | + nextTeacherCourseSearch.setWeek(week); | ||
| 808 | + nextTeacherCourseSearch.setCourseNumber(courseNumber); | ||
| 809 | + nextTeacherCourseSearch.setTeam(team); | ||
| 810 | + TeacherCourse nextTeacherCourse = teacherCourseService.selectTeacherCourse(nextTeacherCourseSearch); | ||
| 811 | + if(StringUtils.isBlank(nextTeacherCourse.getCourseName()) && StringUtils.isBlank(teacherCourse.getCourseName())){ | ||
| 812 | + //则上下替换课程 班级课程上下替换，老师课程交换 | ||
| 813 | + String className =teacherClass.getCourseName(); | ||
| 814 | + String nextClassName = nextClass.getCourseName(); | ||
| 815 | + classCourse.setCourseName(nextClassName); | ||
| 816 | + nextClass.setCourseName(className); | ||
| 817 | + classCourseService.updateByPrimaryKey(classCourse); | ||
| 818 | + classCourseService.updateByPrimaryKey(nextClass); | ||
| 819 | + | ||
| 820 | + teacherCourse.setGrade(teacherClass.getGrade()); | ||
| 821 | + teacherCourse.setCourseName(className); | ||
| 822 | + teacherCourse.setClassId(teacherClass.getClassId()+""); | ||
| 823 | + teacherCourseService.updateTeacherCourse(teacherCourse); | ||
| 824 | + | ||
| 825 | + nextTeacherCourse.setGrade(nextClass.getGrade()); | ||
| 826 | + nextTeacherCourse.setCourseName(nextClassName); | ||
| 827 | + nextTeacherCourse.setClassId(nextClass.getClassId()+""); | ||
| 828 | + teacherCourseService.updateTeacherCourse(nextTeacherCourse); | ||
| 829 | + | ||
| 830 | + nextTeacherCourse.setWeek(weekChange); | ||
| 831 | + nextTeacherCourse.setCourseNumber(courseNumberChange); | ||
| 832 | + nextTeacherCourse.setCourseName(null); | ||
| 833 | + nextTeacherCourse.setClassId(null); | ||
| 834 | + teacherCourseService.updateTeacherCourse(nextTeacherCourse); | ||
| 835 | + return true ; | ||
| 836 | + } | ||
| 835 | } | 837 | } |
| 836 | } | 838 | } |
| 837 | } | 839 | } |
src/main/java/com/jevon/controller/ScheduleInitController.java
| @@ -210,8 +210,8 @@ public class ScheduleInitController { | @@ -210,8 +210,8 @@ public class ScheduleInitController { | ||
| 210 | // 获得工作簿 | 210 | // 获得工作簿 |
| 211 | Workbook workbook = null; | 211 | Workbook workbook = null; |
| 212 | String file = excelFile.getName(); | 212 | String file = excelFile.getName(); |
| 213 | - InputStream inputStream = new FileInputStream(excelFile) ; | ||
| 214 | - //InputStream inputStream = HttpClientUtils.GetFileInputStream(initTeacherCourseReqVo.getUrl()); | 213 | + //InputStream inputStream = new FileInputStream(excelFile) ; |
| 214 | + InputStream inputStream = HttpClientUtils.GetFileInputStream(initTeacherCourseReqVo.getUrl()); | ||
| 215 | if(inputStream == null){ | 215 | if(inputStream == null){ |
| 216 | baseVo.setMessage("路径不存在"); | 216 | baseVo.setMessage("路径不存在"); |
| 217 | baseVo.setSuccess(false); | 217 | baseVo.setSuccess(false); |
src/main/resources/application.yml
| @@ -3,12 +3,12 @@ server: | @@ -3,12 +3,12 @@ server: | ||
| 3 | 3 | ||
| 4 | spring: | 4 | spring: |
| 5 | datasource: | 5 | datasource: |
| 6 | - username: SZJXTUSER | ||
| 7 | - password: xst200919 | ||
| 8 | - url: jdbc:sqlserver://60.190.202.57:14333;database=SmartPaike | ||
| 9 | -# username: szjxtuser | ||
| 10 | -# password: RQminVCJota3H1u8bBYH | ||
| 11 | -# url: jdbc:sqlserver://116.62.241.27:33419;database=SmartCampus_java | 6 | +# username: SZJXTUSER |
| 7 | +# password: xst200919 | ||
| 8 | +# url: jdbc:sqlserver://60.190.202.57:14333;database=SmartPaike | ||
| 9 | + username: szjxtuser | ||
| 10 | + password: RQminVCJota3H1u8bBYH | ||
| 11 | + url: jdbc:sqlserver://116.62.241.27:33419;database=SmartCampus_java | ||
| 12 | driver-class-name: com.microsoft.sqlserver.jdbc.SQLServerDriver | 12 | driver-class-name: com.microsoft.sqlserver.jdbc.SQLServerDriver |
| 13 | filters: stat | 13 | filters: stat |
| 14 | maxActive: 20 | 14 | maxActive: 20 |
src/main/resources/logback.xml
| 1 | <?xml version="1.0" encoding="UTF-8"?> | 1 | <?xml version="1.0" encoding="UTF-8"?> |
| 2 | <configuration debug="true"> | 2 | <configuration debug="true"> |
| 3 | <!-- 项目名称 --> | 3 | <!-- 项目名称 --> |
| 4 | - <property name="PROJECT_NAME" value="schedule" /> | 4 | + <property name="PROJECT_NAME" value="smartCampus_java" /> |
| 5 | 5 | ||
| 6 | <!--定义日志文件的存储地址 勿在 LogBack 的配置中使用相对路径--> | 6 | <!--定义日志文件的存储地址 勿在 LogBack 的配置中使用相对路径--> |
| 7 | <!-- <property name="LOG_HOME" value="/opt/web/log/" />--> | 7 | <!-- <property name="LOG_HOME" value="/opt/web/log/" />--> |
| 8 | - <property name="LOG_HOME" value="D://smartCampus_java//log"/> | 8 | + <property name="LOG_HOME" value="E://smartCampus_java//log"/> |
| 9 | 9 | ||
| 10 | <!-- 控制台输出 --> | 10 | <!-- 控制台输出 --> |
| 11 | <appender name="CONSOLE" class="ch.qos.logback.core.ConsoleAppender"> | 11 | <appender name="CONSOLE" class="ch.qos.logback.core.ConsoleAppender"> |