导入排课方法更新

src/main/java/org/rcisoft/business/barrange/dao/BArrangeRepository.java

@@ -84,7 +84,7 @@ public interface BArrangeRepository extends BaseMapper<BArrange> {
             "LEFT JOIN b_teacher on b_teacher.`code` = b_schedule_dto.teacher_code " +
             "LEFT JOIN s_user on s_user.login_name = b_teacher.`code` " +
             "where sub_agency_id = #{subAgencyId} " +
-            "ORDER BY lesson_code,class_code,teacher_code,week " +
+            "ORDER BY seq,lesson_code,class_code,teacher_code,week " +
             //"GROUP BY lesson_code,teacher_code,class_code " +
             "</script>")
     @ResultMap(value = "scheduleDtoResultMap")

src/main/java/org/rcisoft/business/barrange/service/impl/BArrangeServiceImpl.java

@@ -268,7 +268,7 @@ public class BArrangeServiceImpl implements BArrangeService {
                     "周二", "周三", "周四", "周五", "周六","周日", "上课地点", "教室编号", "备注"};
         }
         //ArrayList<String[]> values = ExcelUtil.importExcel(hwb, headers,true,2);  //获取excel数据
-        ArrayList<String[]> values = ExcelUtil.importExcel(hwb, headers,true,2);  //获取excel数据
+        ArrayList<String[]> values = ExcelUtil.importExcelv2(hwb, headers,2);  //获取excel数据
         if(values.get(0)[3]==null || values.get(0)[14]==null ||values.get(0)[16]==null  ||values.get(0)[26]==null ||
                 values.get(0)[3].equals("") || values.get(0)[14].equals("") ||values.get(0)[16].equals("") ||values.get(0)[26].equals("")){
             throw new ServiceException(ResultServiceEnums.EXCEL_IMPORT_DATA_HAS_NULL);
@@ -281,81 +281,41 @@ public class BArrangeServiceImpl implements BArrangeService {
         List<String> teacherCodes = new ArrayList<>();
         List<String> classCodes = new ArrayList<>();
         List<String> roomCodes = new ArrayList<>();
-
-        String[] wholeValue = new String[28];
         int index = 0;
         for (String[] value : values) {
             ScheduleDto scheduleDto = new ScheduleDto();
-
             //判断1:根据课程编号查询是否有此门课程；
-            if(value[3].equals("")){
-                value[3] = wholeValue[3];
-            }else{
-                if(bLessonRepository.selectOne(new BLesson(value[3].trim()))==null){
-                    lessonCodes.add(value[3]);
-                    continue;
-                }else{
-                    wholeValue[3] = value[3];
-                }
+            if(bLessonRepository.selectOne(new BLesson(value[3].trim()))==null){
+                lessonCodes.add(value[3]);
+                continue;
             }
-
             //判断2:根据教师编号查询是否有此教师；
             SysUser user1 =new SysUser();
-            if(value[14].equals("")){
-                value[14] = wholeValue[14];
-            }else{
-                user1.setLoginName(value[14]);
-                user1.setDelFlag("0");
-                user1.setFlag("1");
-
-                if (sysUserMapper.selectOne(user1) == null) {
-                    teacherCodes.add(value[14]);
-                    continue;
-                }else{
-                    wholeValue[14] = value[14];
-                }
+            user1.setLoginName(value[14]);
+            user1.setDelFlag("0");
+            user1.setFlag("1");
+            if (sysUserMapper.selectOne(user1) == null) {
+                teacherCodes.add(value[14]);
+                continue;
             }
-
             //判断3:根据班级编号查询是否有此班级；
-            if(value[16].equals("")){
-                value[16] = wholeValue[16];
-            }else{
-                if (bEduClassRepository.selectOne(new BEduClass(value[16].trim())) == null) {
-                    classCodes.add(value[16]);
-                    continue;
-                }else{
-                    wholeValue[16] = value[16];
-                }
+            if (bEduClassRepository.selectOne(new BEduClass(value[16].trim())) == null) {
+                classCodes.add(value[16]);
+                continue;
             }
-
-
             //判断4:根据教室编号查询是否有此教室；
             //如果存在星期日，向后推一格
             if(contanSunday){
-                if(value[27].equals("")){
-                    value[27] = wholeValue[27];
-                }else{
-                    if(bRoomsRepository.selectOne(new BRooms(value[27].trim()))==null){
-                        roomCodes.add(value[27]);
-                        continue;
-                    }else{
-                        wholeValue[27] = value[27];
-                    }
+                if(bRoomsRepository.selectOne(new BRooms(value[27].trim()))==null){
+                    roomCodes.add(value[27]);
+                    continue;
                 }
             }else {
-                if(value[26].equals("")){
-                    value[26] = wholeValue[26];
-                }else{
-                    if(bRoomsRepository.selectOne(new BRooms(value[26].trim()))==null){
-                        roomCodes.add(value[26]);
-                        continue;
-                    }else{
-                        wholeValue[26] = value[26];
-                    }
+                if(bRoomsRepository.selectOne(new BRooms(value[26].trim()))==null){
+                    roomCodes.add(value[26]);
+                    continue;
                 }
             }
-
-
             //合法:通过了四次判断，证明可建立该排课
             scheduleDto.setLessonCode(value[3]);
             scheduleDto.setTeacherCode(value[14]);
@@ -394,8 +354,6 @@ public class BArrangeServiceImpl implements BArrangeService {
             bSlScheduleRepository.updateStatusBySubAgencyId(subAgencyId,"1");
 
         }
-
-
         String result = "";
         if (scheduleDtos.size()>0){
             bArrangeRepository.avoidRepeatDto(subAgencyId);
@@ -443,8 +401,7 @@ public class BArrangeServiceImpl implements BArrangeService {
                     "授课学时", "上机学时", "实验学时", "考试类型", "任课教师", "教师编号", "教学班组名", "教学班组编号", "周次", "周学时", "周一",
                     "周二", "周三", "周四", "周五", "周六","周日", "上课地点", "教室编号", "备注"};
         }
-        //ArrayList<String[]> values = ExcelUtil.importExcel(hwb, headers,true,2);  //获取excel数据
-        ArrayList<String[]> values = ExcelUtil.importExcel(hwb, headers,true,2);  //获取excel数据
+        ArrayList<String[]> values = ExcelUtil.importExcelv2(hwb, headers,2);  //获取excel数据
         if(values.get(0)[3]==null || values.get(0)[14]==null ||values.get(0)[16]==null  ||values.get(0)[26]==null ||
             values.get(0)[3].equals("") || values.get(0)[14].equals("") ||values.get(0)[16].equals("") ||values.get(0)[26].equals("")){
             throw new ServiceException(ResultServiceEnums.EXCEL_IMPORT_DATA_HAS_NULL);
@@ -459,80 +416,40 @@ public class BArrangeServiceImpl implements BArrangeService {
         List<String> roomCodes = new ArrayList<>();
         List<String> weekErrors = new ArrayList<>();
 
-        String[] wholeValue = new String[28];
         for (String[] value : values) {
 
-
-
             //判断1:根据课程编号查询是否有此门课程；
-            if(value[3].equals("")){
-                value[3] = wholeValue[3];
-            }else{
-                if(bLessonRepository.selectOne(new BLesson(value[3].trim()))==null){
-                    lessonCodes.add(value[3]);
-                    continue;
-                }else{
-                    wholeValue[3] = value[3];
-                }
+            if(bLessonRepository.selectOne(new BLesson(value[3].trim()))==null){
+                lessonCodes.add(value[3]);
+                continue;
             }
-
             //判断2:根据教师编号查询是否有此教师；
             SysUser user1 =new SysUser();
-            if(value[14].equals("")){
-                value[14] = wholeValue[14];
-            }else{
-                user1.setLoginName(value[14]);
-                user1.setDelFlag("0");
-                user1.setFlag("1");
-
-                if (sysUserMapper.selectOne(user1) == null) {
-                    teacherCodes.add(value[14]);
-                    continue;
-                }else{
-                    wholeValue[14] = value[14];
-                }
+            user1.setLoginName(value[14]);
+            user1.setDelFlag("0");
+            user1.setFlag("1");
+            if (sysUserMapper.selectOne(user1) == null) {
+                teacherCodes.add(value[14]);
+                continue;
             }
-
             //判断3:根据班级编号查询是否有此班级；
-            if(value[16].equals("")){
-                value[16] = wholeValue[16];
-            }else{
-                if (bEduClassRepository.selectOne(new BEduClass(value[16].trim())) == null) {
-                    classCodes.add(value[16]);
-                    continue;
-                }else{
-                    wholeValue[16] = value[16];
-                }
+            if (bEduClassRepository.selectOne(new BEduClass(value[16].trim())) == null) {
+                classCodes.add(value[16]);
+                continue;
             }
-
-
             //判断4:根据教室编号查询是否有此教室；
             //如果存在星期日，向后推一格
             if(contanSunday){
-                if(value[27].equals("")){
-                    value[27] = wholeValue[27];
-                }else{
-                    if(bRoomsRepository.selectOne(new BRooms(value[27].trim()))==null){
-                        roomCodes.add(value[27]);
-                        continue;
-                    }else{
-                        wholeValue[27] = value[27];
-                    }
+                if(bRoomsRepository.selectOne(new BRooms(value[27].trim()))==null){
+                    roomCodes.add(value[27]);
+                    continue;
                 }
             }else {
-                if(value[26].equals("")){
-                    value[26] = wholeValue[26];
-                }else{
-                    if(bRoomsRepository.selectOne(new BRooms(value[26].trim()))==null){
-                        roomCodes.add(value[26]);
-                        continue;
-                    }else{
-                        wholeValue[26] = value[26];
-                    }
+                if(bRoomsRepository.selectOne(new BRooms(value[26].trim()))==null){
+                    roomCodes.add(value[26]);
+                    continue;
                 }
             }
-
-
             String week = value[17];
             if(week.contains("-")){
                 int location = week.indexOf("-");

src/main/java/org/rcisoft/core/result/ResultServiceEnums.java

@@ -189,6 +189,8 @@ public enum ResultServiceEnums {
     DATA_HAS_USED(100,"当前数据被使用，不可删除"),
 
     CAN_NOT_OVERLAP(101,"时间区间不可重叠"),
+
+    ROLE_HAS_USED(102,"当前角色被使用，不可删除")
     ;
 
     private Integer code;

src/main/java/org/rcisoft/core/security/JwtAuthenTokenFilter.java

@@ -52,14 +52,14 @@ public class JwtAuthenTokenFilter extends OncePerRequestFilter {
         /**/
         String lk = rcRedisServiceImpl.get("lk");
 
-        if(StringUtils.isBlank(lk) || !"1".equals(lk)){
-            if(permitRes==-1) {
-                Result result = new Result();
-                result.setCode(202);
-                ResponseUtil.responseResult(response, result);
-                return;
-            }
-        }
+//        if(StringUtils.isBlank(lk) || !"1".equals(lk)){
+//            if(permitRes==-1) {
+//                Result result = new Result();
+//                result.setCode(202);
+//                ResponseUtil.responseResult(response, result);
+//                return;
+//            }
+//        }
         // 取得header
         String authHeader = request.getHeader(this.tokenHeader);
         //判断header头

src/main/java/org/rcisoft/sys/role/service/impl/SysRoleServiceImpl.java

@@ -68,7 +68,7 @@ public class SysRoleServiceImpl implements SysRoleService {
         int userCount = sysUserMapper.countUserByRole(id);
         //如果仍然有用户（如果用户被逻辑删除，则忽略此角色，但如果用于被停用，则依然被计算）是此角色，则该角色不可删除
         if(userCount > 0){
-            throw new ServiceException(ResultServiceEnums.DATA_HAS_USED);
+            throw new ServiceException(ResultServiceEnums.ROLE_HAS_USED);
         }else{
             //删除该角色所有的关联信息
             sysRoleRepository.deleteRoleMenuByRoleId(id);