update

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

@@ -429,25 +429,27 @@ public class StudentAttendanceServiceImpl extends BaseServiceImpl<Long, StudentA
                 null, DateUtil.dateToString(courseSchedule.getStartClassTime(), "yyyy年MM月dd日 HH点mm分"),
                 courseSchedule.getType().getMsg(), sysUser.getUsername(), remark);
 
-        // 发送消息到学校端
-        MusicGroup musicGroup = musicGroupDao.get(courseSchedule.getMusicGroupId());
-
-        IPage<SchoolStaffWrapper.SchoolStaff> page = schoolStaffService.selectPage(new Page<>(1, -1),
-                SchoolStaffWrapper.SchoolStaffQuery.builder().schoolId(musicGroup.getCooperationOrganId().longValue()).build());
-        List<SchoolStaffWrapper.SchoolStaff> records = page.getRecords();
-        if (org.apache.commons.collections.CollectionUtils.isNotEmpty(records)) {
-
-            Map<Integer, String> userMap = new HashMap<>();
-            records.forEach(o -> userMap.put(o.getUserId().intValue(), o.getUserId().toString()));
-
-            String classDate = DateUtil.format(courseSchedule.getClassDate(), DateUtil.DEFAULT_PATTERN);
-            String startClassTime = DateUtil.format(courseSchedule.getStartClassTime(), DateUtil.EXPANDED_TIME_FORMAT);
-            String endClassTime = DateUtil.format(courseSchedule.getEndClassTime(), DateUtil.EXPANDED_TIME_FORMAT);
-            String leaveTime = classDate + " " + startClassTime + "-" + endClassTime;
-
-            sysMessageService.batchSendMessage(MessageSenderPluginContext.MessageSender.JIGUANG, MessageTypeEnum.JIGUANG_STUDENT_LEAVE,
-                    userMap, null, 0, null,
-                    "SCHOOL",musicGroup.getName(),sysUser.getUsername(),leaveTime,courseSchedule.getName());
+        if(courseSchedule.getGroupType() == GroupType.MUSIC){
+            // 发送消息到学校端
+            MusicGroup musicGroup = musicGroupDao.get(courseSchedule.getMusicGroupId());
+
+            IPage<SchoolStaffWrapper.SchoolStaff> page = schoolStaffService.selectPage(new Page<>(1, -1),
+                    SchoolStaffWrapper.SchoolStaffQuery.builder().schoolId(musicGroup.getCooperationOrganId().longValue()).build());
+            List<SchoolStaffWrapper.SchoolStaff> records = page.getRecords();
+            if (org.apache.commons.collections.CollectionUtils.isNotEmpty(records)) {
+
+                Map<Integer, String> userMap = new HashMap<>();
+                records.forEach(o -> userMap.put(o.getUserId().intValue(), o.getUserId().toString()));
+
+                String classDate = DateUtil.format(courseSchedule.getClassDate(), DateUtil.DEFAULT_PATTERN);
+                String startClassTime = DateUtil.format(courseSchedule.getStartClassTime(), DateUtil.EXPANDED_TIME_FORMAT);
+                String endClassTime = DateUtil.format(courseSchedule.getEndClassTime(), DateUtil.EXPANDED_TIME_FORMAT);
+                String leaveTime = classDate + " " + startClassTime + "-" + endClassTime;
+
+                sysMessageService.batchSendMessage(MessageSenderPluginContext.MessageSender.JIGUANG, MessageTypeEnum.JIGUANG_STUDENT_LEAVE,
+                        userMap, null, 0, null,
+                        "SCHOOL",musicGroup.getName(),sysUser.getUsername(),leaveTime,courseSchedule.getName());
+            }
         }
         return true;
     }

mec-student/src/main/java/com/ym/mec/student/controller/StudentCourseScheduleController.java

@@ -7,6 +7,7 @@ import com.ym.mec.biz.dal.enums.GroupType;
 import com.ym.mec.biz.dal.page.StudentCourseScheduleRecordQueryInfo;
 import com.ym.mec.biz.service.CourseScheduleService;
 import com.ym.mec.biz.service.StudentAttendanceService;
+import com.ym.mec.biz.service.SysUserService;
 import com.ym.mec.common.controller.BaseController;
 import com.ym.mec.util.date.DateUtil;
 import com.yonge.log.model.AuditLogAnnotation;
@@ -32,12 +33,10 @@ public class StudentCourseScheduleController extends BaseController {
 
 	@Autowired
 	private CourseScheduleService scheduleService;
-
 	@Autowired
 	private StudentAttendanceService studentAttendanceService;
-
 	@Autowired
-	private SysUserFeignService sysUserFeignService;
+	private SysUserService sysUserService;
 
 	@ApiOperation(value = "根据月份获取乐团在该月有课的日期")
 	@GetMapping("/getCourseScheduleDateByMonth")
@@ -69,10 +68,7 @@ public class StudentCourseScheduleController extends BaseController {
 	@PostMapping("/leave")
 	@AuditLogAnnotation(operateName = "请假")
 	public Object leave(Long courseScheduleId, String reason) {
-		SysUser user = sysUserFeignService.queryUserInfo();
-		if (user == null) {
-			return failed(HttpStatus.FORBIDDEN, "请登录");
-		}
+		SysUser user = sysUserService.getUser();
 		if (user.getTenantId() == null) {
 			return failed("机构信息异常，请联系老师确认机构信息");
 		}
@@ -95,11 +91,6 @@ public class StudentCourseScheduleController extends BaseController {
 	@ApiOperation(value = "获取本周课程规划")
 	@GetMapping("/queryCoursePlan")
 	public Object queryCoursePlan(){
-		SysUser sysUser = sysUserFeignService.queryUserInfo();
-		if(sysUser == null || sysUser.getId() == null){
-			return failed(HttpStatus.FORBIDDEN, "请登录");
-		}
-		
 		Date now = new Date();
 		
 		Date startDate = DateUtil.getWeekMondayWithDate(now);
@@ -108,7 +99,7 @@ public class StudentCourseScheduleController extends BaseController {
 		Date endDate = DateUtil.addDays(startDate, 7);
 		endDate = DateUtil.getLastSecondWithDay(endDate);
 		
-		return succeed(scheduleService.queryMusicCoursePlan(sysUser.getId(), startDate, endDate));
+		return succeed(scheduleService.queryMusicCoursePlan(sysUserService.getUserId(), startDate, endDate));
 	}
 
 }

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

@@ -1,24 +1,19 @@
 package com.ym.mec.teacher.controller;
 
+import com.ym.mec.biz.dal.dao.CourseScheduleDao;
+import com.ym.mec.biz.dal.entity.TeacherLeaveRecord;
+import com.ym.mec.biz.service.SysUserService;
+import com.ym.mec.biz.service.TeacherLeaveRecordService;
+import com.ym.mec.common.controller.BaseController;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
-
-import java.util.Date;
-import java.util.Objects;
-
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.http.HttpStatus;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
-import com.ym.mec.auth.api.client.SysUserFeignService;
-import com.ym.mec.auth.api.entity.SysUser;
-import com.ym.mec.biz.dal.dao.CourseScheduleDao;
-import com.ym.mec.biz.dal.entity.TeacherLeaveRecord;
-import com.ym.mec.biz.service.TeacherLeaveRecordService;
-import com.ym.mec.common.controller.BaseController;
+import java.util.Date;
 
 @Api(tags = "老师请假服务")
 @RequestMapping("teacherLeaveRecord")
@@ -26,22 +21,16 @@ import com.ym.mec.common.controller.BaseController;
 public class TeacherLeaveRecordController extends BaseController {
 
 	@Autowired
-	private SysUserFeignService sysUserFeignService;
-
+	private SysUserService sysUserService;
 	@Autowired
 	private CourseScheduleDao courseScheduleDao;
-
 	@Autowired
 	private TeacherLeaveRecordService teacherLeaveRecordService;
 
 	@ApiOperation(value = "查询vip课列表")
 	@GetMapping("/queryVipCourseScheduleList")
 	public Object queryVipCourseScheduleList(Date startTime, Date endTime) {
-		SysUser sysUser = sysUserFeignService.queryUserInfo();
-		if (Objects.isNull(sysUser)) {
-			return failed(HttpStatus.FORBIDDEN, "请登录");
-		}
-		return succeed(courseScheduleDao.queryTeacherCourseScheduleListByTimeRangeAndType(sysUser.getId(), null, startTime, endTime));
+		return succeed(courseScheduleDao.queryTeacherCourseScheduleListByTimeRangeAndType(sysUserService.getUserId(), null, startTime, endTime));
 	}
 
 	@ApiOperation(value = "请假")