update

mec-biz/src/main/java/com/ym/mec/biz/service/impl/CourseScheduleServiceImpl.java

@@ -1515,14 +1515,8 @@ public class CourseScheduleServiceImpl extends BaseServiceImpl<Long, CourseSched
 		List<Long> courseIds = courseSchedules.stream().map(CourseSchedule::getId).collect(Collectors.toList());
 		List<CourseSchedule> existCourses = courseScheduleDao.findByCourseScheduleIds(courseIds);
 		Date now = new Date();
-
-		SysUser sysUser = sysUserFeignService.queryUserInfo();
-		if (null == sysUser) {
-			throw new BizException("获取用户信息失败");
-		}
-
 		//获取操作日志
-		List<CourseScheduleModifyLog> modifyLogs = getModifyLogs(courseIds,existCourses,sysUser.getId(),now);
+		List<CourseScheduleModifyLog> modifyLogs = getModifyLogs(courseIds,existCourses,operatorId,now);
 
 		for (CourseSchedule existCours : existCourses) {
 			if(now.compareTo(existCours.getStartClassTime())>0){

mec-teacher/src/main/java/com/ym/mec/teacher/controller/TeacherCourseScheduleController.java

@@ -1,6 +1,5 @@
 package com.ym.mec.teacher.controller;
 
-import com.ym.mec.auth.api.client.SysUserFeignService;
 import com.ym.mec.auth.api.entity.SysUser;
 import com.ym.mec.biz.dal.dao.ClassGroupStudentMapperDao;
 import com.ym.mec.biz.dal.dao.StudentAttendanceDao;
@@ -47,14 +46,13 @@ public class TeacherCourseScheduleController extends BaseController {
     @Autowired
     private StudentAttendanceService studentAttendanceService;
     @Autowired
-    private SysUserFeignService sysUserFeignService;
+    private SysUserService sysUserService;
     @Autowired
     private StudentAttendanceDao studentAttendanceDao;
     @Autowired
     private SysTenantConfigService sysTenantConfigService;
     @Autowired
     private ClassGroupStudentMapperDao classGroupStudentMapperDao;
-
     @Autowired
     private SubjectService subjectService;
 
@@ -75,10 +73,7 @@ public class TeacherCourseScheduleController extends BaseController {
         if(Objects.isNull(date)){
             return failed("请指定日期!");
         }
-        SysUser user = sysUserFeignService.queryUserInfo();
-        if(null == user){
-            return failed(HttpStatus.FORBIDDEN, "请登录");
-        }
+        SysUser user = sysUserService.getUser();
         if(null == user.getTenantId()){
             return failed("用户机构信息异常，请联系管理员");
         }
@@ -103,27 +98,16 @@ public class TeacherCourseScheduleController extends BaseController {
     @ApiOperation(value = "根据月份获取该月历史有课的日期")
     @GetMapping("/getHistoryCourseScheduleDateByMonth")
     public Object getHistoryCourseScheduleDateByTeacher(@ApiParam(value = "月份", required = true) @RequestParam Date month) {
-        SysUser user = sysUserFeignService.queryUserInfo();
-        if(null==user){
-            return failed(HttpStatus.FORBIDDEN, "请登录");
-        }
         if(Objects.isNull(month)){
             return failed(HttpStatus.FORBIDDEN, "请指定日期!");
         }
-        return succeed(scheduleService.getHistoryCourseScheduleDateByTeacher(user.getId(),month));
+        return succeed(scheduleService.getHistoryCourseScheduleDateByTeacher(sysUserService.getUserId(),month));
     }
 
     @ApiOperation(value = "根据日期获取当日历史课程")
     @GetMapping("/getHistoryCourseSchedulesWithDate")
     public Object getHistoryCourseSchedulesWithDate(@ApiParam(value = "日期", required = true) Date date){
-        if(Objects.isNull(date)){
-            return failed("请指定日期!");
-        }
-        SysUser user = sysUserFeignService.queryUserInfo();
-        if(null==user){
-            return failed(HttpStatus.FORBIDDEN, "请登录");
-        }
-        List<CourseScheduleDto> teacherCourseSchedulesWithDate = scheduleService.getTeacherHistoryCourseSchedulesWithDate(user.getId(),date);
+        List<CourseScheduleDto> teacherCourseSchedulesWithDate = scheduleService.getTeacherHistoryCourseSchedulesWithDate(sysUserService.getUserId(),date);
         Map<String,Object> result = new HashMap<>();
         result.put("rows",teacherCourseSchedulesWithDate);
         result.put("appealDaysRange",1);
@@ -143,11 +127,7 @@ public class TeacherCourseScheduleController extends BaseController {
     @ApiOperation(value = "获取老师指定班级的排课")
     @GetMapping("/queryTeacherClassCourseSchedule")
     public Object queryTeacherClassCourseSchedule(CourseScheduleQueryInfo queryInfo){
-        SysUser user = sysUserFeignService.queryUserInfo();
-        if(null==user){
-            return failed(HttpStatus.FORBIDDEN, "请登录");
-        }
-        queryInfo.setUserId(user.getId().longValue());
+        queryInfo.setUserId(sysUserService.getUserId().longValue());
         return succeed(scheduleService.queryTeacherClassCourseSchedule(queryInfo));
     }
 
@@ -155,11 +135,7 @@ public class TeacherCourseScheduleController extends BaseController {
     @GetMapping("/queryTeacherVipClassCourseSchedule")
     public Object queryTeacherVipClassCourseSchedule(CourseScheduleQueryInfo queryInfo){
         Map<String,Object> result = new HashMap<>();
-        SysUser user = sysUserFeignService.queryUserInfo();
-        if(null==user){
-            return failed(HttpStatus.FORBIDDEN, "请登录");
-        }
-        queryInfo.setUserId(user.getId().longValue());
+        queryInfo.setUserId(sysUserService.getUserId().longValue());
         result.put("rows",scheduleService.queryTeacherVipClassCourseSchedule(queryInfo));
         result.put("appealHoursRange",4);
         return succeed(result);
@@ -181,13 +157,6 @@ public class TeacherCourseScheduleController extends BaseController {
         return succeed(studentAttendanceService.getCurrentCourseStudents(queryInfo));
     }
 
-//    @ApiOperation(value = "课程批量调整")
-//    @PostMapping("/batchUpdateCourseSchedule")
-//    public Object batchUpdateCourseSchedule(@RequestBody BatchInsertCoursesDto batchInsertCoursesDto){
-//        scheduleService.batchUpdateCourseSchedule(batchInsertCoursesDto);
-//        return succeed();
-//    }
-
     @ApiOperation(value = "课时调整")
     @PostMapping(value = "/classStartDateAdjust",consumes = MediaType.APPLICATION_FORM_URLENCODED_VALUE, produces = MediaType.APPLICATION_JSON_UTF8_VALUE)
     @AuditLogAnnotation(operateName = "课时调整")
@@ -205,9 +174,6 @@ public class TeacherCourseScheduleController extends BaseController {
         if(Objects.isNull(oldCourseSchedule.getTenantId())){
             return failed("课程机构信息异常");
         }
-        /*if(oldCourseSchedule.getGroupType() != GroupType.VIP){
-        	return failed("客户端只能调整VIP课");
-        }*/
         Date now = new Date();
         if(now.compareTo(oldCourseSchedule.getStartClassTime())>0){
             throw new BizException("进行中或已结束课程不可调整");
@@ -356,11 +322,7 @@ public class TeacherCourseScheduleController extends BaseController {
     @PostMapping("/courseAdjustOnlyWithClassDate")
     @AuditLogAnnotation(operateName = "课程批量调整")
     public HttpResponseResult courseAdjustOnlyWithClassDate(@RequestBody List<CourseSchedule> courseSchedules){
-        SysUser user = sysUserFeignService.queryUserInfo();
-        if(null==user){
-            return failed(HttpStatus.FORBIDDEN, "请登录");
-        }
-        scheduleService.courseAdjustOnlyWithClassDate(courseSchedules,user.getId());
+        scheduleService.courseAdjustOnlyWithClassDate(courseSchedules,sysUserService.getUserId());
         return succeed();
     }
 
@@ -368,10 +330,7 @@ public class TeacherCourseScheduleController extends BaseController {
     @PostMapping("/courseEvaluateList")
     @AuditLogAnnotation(operateName = "课程评价列表")
     public HttpResponseResult courseEvaluateList(@RequestBody EvaluateCourseQueryInfo queryInfo){
-        SysUser user = sysUserFeignService.queryUserInfo();
-        if(null==user){
-            return failed(HttpStatus.FORBIDDEN, "请登录");
-        }
+        SysUser user = sysUserService.getUser();
         queryInfo.setTeacherId(user.getId());
         String offlineSignInEarlyForwardTime = sysTenantConfigService.getTenantConfigValue(SysConfigService.OFFLINE_SIGN_IN_EARLY_FORWARD_TIME, user.getTenantId());
         String configValue1 = sysTenantConfigService.getTenantConfigValue(SysConfigService.ENABLE_STUDENT_ATTENDANCE_TIME_RANGE_VIP, user.getTenantId());
@@ -411,11 +370,7 @@ public class TeacherCourseScheduleController extends BaseController {
     @PostMapping("/queryStudyStandardWaitVisit")
     @AuditLogAnnotation(operateName = "学习标准待回访列表")
     public HttpResponseResult queryStudyStandardWaitVisit(EvaluateCourseQueryInfo queryInfo){
-        SysUser user = sysUserFeignService.queryUserInfo();
-        if(null==user){
-            return failed(HttpStatus.FORBIDDEN, "请登录");
-        }
-        queryInfo.setTeacherId(user.getId());
+        queryInfo.setTeacherId(sysUserService.getUserId());
         return succeed(scheduleService.queryStudyStandardWaitVisit(queryInfo));
     }