Merge branch 'master' of http://git.dayaedu.com/yonge/cooleshow

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/service/SysUserService.java

@@ -0,0 +1,12 @@
+package com.yonge.cooleshow.biz.dal.service;
+
+import com.yonge.cooleshow.auth.api.entity.SysUser;
+
+public interface SysUserService{
+
+    Long getUserId();
+
+    SysUser getUser();
+
+    SysUser findUserById(Long userId);
+}

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/service/impl/ImNetworkRoomServiceImpl.java

@@ -2,7 +2,6 @@ package com.yonge.cooleshow.biz.dal.service.impl;
 
 import com.alibaba.fastjson.JSON;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.yonge.cooleshow.auth.api.client.SysUserFeignService;
 import com.yonge.cooleshow.auth.api.entity.SysUser;
 import com.yonge.cooleshow.biz.dal.dao.ImNetworkRoomDao;
 import com.yonge.cooleshow.biz.dal.dao.SysConfigDao;
@@ -26,9 +25,6 @@ import org.springframework.util.CollectionUtils;
 
 import javax.annotation.Resource;
 import java.util.*;
-import java.util.function.BiConsumer;
-import java.util.function.BiFunction;
-import java.util.function.Function;
 import java.util.stream.Collectors;
 
 /**
@@ -43,7 +39,7 @@ public class ImNetworkRoomServiceImpl extends ServiceImpl<ImNetworkRoomDao, ImNe
     private final static Logger log = LoggerFactory.getLogger(ImNetworkRoomServiceImpl.class);
 
     @Resource
-    private SysUserFeignService sysUserFeignService;
+    private SysUserService sysUserService;
     @Resource
     private TeacherDao teacherDao;
     @Resource
@@ -69,9 +65,7 @@ public class ImNetworkRoomServiceImpl extends ServiceImpl<ImNetworkRoomDao, ImNe
     @Override
     @Transactional(rollbackFor = Exception.class)
     public HttpResponseResult<ImNetworkRoomResult> joinRoom(Long courseScheduleId) throws Exception {
-        Long userId = Optional.ofNullable(sysUserFeignService.queryUserInfo()).
-                map(SysUser::getId).
-                orElseThrow(()-> new BizException("请登录"));
+        Long userId = sysUserService.getUserId();
         CourseSchedule courseSchedule = Optional.ofNullable(courseScheduleService.getById(courseScheduleId)).
                 orElseThrow(()->new BizException("房间信息不存在"));
         UserRoleEnum userRole = UserRoleEnum.STUDENT;
@@ -179,9 +173,7 @@ public class ImNetworkRoomServiceImpl extends ServiceImpl<ImNetworkRoomDao, ImNe
     @Override
     @Transactional(rollbackFor = Exception.class)
     public void joinRoomFailure(String roomId) {
-        Long userId = Optional.ofNullable(sysUserFeignService.queryUserInfo()).
-                map(SysUser::getId).
-                orElseThrow(()-> new BizException("请登录"));
+        Long userId = sysUserService.getUserId();
         log.info("joinRoomFailure: roomId={}, userId={}", roomId, userId);
         imNetworkRoomMemberService.getDao().delByRidAndUid(roomId, userId);
     }
@@ -189,9 +181,7 @@ public class ImNetworkRoomServiceImpl extends ServiceImpl<ImNetworkRoomDao, ImNe
     @Override
     @Transactional(rollbackFor = Exception.class)
     public void leaveRoom(String roomId) throws Exception {
-        Long userId = Optional.ofNullable(sysUserFeignService.queryUserInfo()).
-                map(SysUser::getId).
-                orElseThrow(()-> new BizException("请登录"));
+        Long userId = sysUserService.getUserId();
         log.info("leaveRoom: roomId={}, userId={}", roomId, userId);
         long courseScheduleId = Long.parseLong(roomId);
         Long teacherId = Optional.ofNullable(courseScheduleService.getById(courseScheduleId)).
@@ -258,9 +248,7 @@ public class ImNetworkRoomServiceImpl extends ServiceImpl<ImNetworkRoomDao, ImNe
     @Override
     @Transactional(rollbackFor = Exception.class)
     public void sendImPlayMidiMessage(ImNetworkCustomMessage customMessage) throws Exception {
-        Long userId = Optional.ofNullable(sysUserFeignService.queryUserInfo()).
-                map(SysUser::getId).
-                orElseThrow(()-> new BizException("请登录"));
+        Long userId = sysUserService.getUserId();
         Long roomId = customMessage.getRoomId();
         log.info("sendImPlayMidiMessage: roomId={}, userId={}", roomId, userId);
         ImNetworkMetronomeMessage displayMessage = new ImNetworkMetronomeMessage(customMessage);
@@ -274,9 +262,7 @@ public class ImNetworkRoomServiceImpl extends ServiceImpl<ImNetworkRoomDao, ImNe
     public void pushDownloadMusicSheetMsg(ImNetworkMusicSheetDto musicSheetDto) throws Exception {
         Long courseScheduleId = Optional.ofNullable(musicSheetDto).map(ImNetworkBaseDto::getRoomId).orElseThrow(() -> new BizException("房间编号不能为空"));
         Long accompanimentId = Optional.ofNullable(musicSheetDto).map(ImNetworkMusicSheetDto::getAccompanimentId).orElseThrow(() -> new BizException("伴奏编号不能为空"));
-        Long userId = Optional.ofNullable(sysUserFeignService.queryUserInfo()).
-                map(SysUser::getId).
-                orElseThrow(()-> new BizException("请登录"));
+        Long userId = sysUserService.getUserId();
         List<CourseScheduleStudentMusicSheetResult> scheduleStudentMusicSheetResults = courseScheduleStudentMusicSheetService.getDao().
                 queryBySheetIdAndCourseId(accompanimentId, courseScheduleId, null, null, 0);
 
@@ -311,9 +297,7 @@ public class ImNetworkRoomServiceImpl extends ServiceImpl<ImNetworkRoomDao, ImNe
     @Transactional(rollbackFor = Exception.class)
     public void display(ImNetworkDisplayDataDto displayData) throws Exception {
         log.info("display in data = {}", displayData);
-        Long userId = Optional.ofNullable(sysUserFeignService.queryUserInfo()).
-                map(SysUser::getId).
-                orElseThrow(()-> new BizException("请登录"));
+        Long userId = sysUserService.getUserId();
 
         StringBuffer display = new StringBuffer("display://type=").append(displayData.getType().ordinal()).append("?userId=");
         switch (displayData.getType()) {
@@ -374,8 +358,7 @@ public class ImNetworkRoomServiceImpl extends ServiceImpl<ImNetworkRoomDao, ImNe
     @Transactional(rollbackFor = Exception.class)
     public void controlDevice(ImNetworkDeviceControlDto deviceControl) throws Exception {
         log.info("controlDevice in deviceControl = {}", deviceControl);
-        SysUser sysUser = Optional.ofNullable(sysUserFeignService.queryUserInfo()).
-                orElseThrow(()-> new BizException("请登录"));
+        SysUser sysUser = sysUserService.getUser();
         String roomId = deviceControl.getRoomId();
         Long userId = deviceControl.getUserId();
         if(deviceControl.getEnable()){
@@ -469,8 +452,7 @@ public class ImNetworkRoomServiceImpl extends ServiceImpl<ImNetworkRoomDao, ImNe
     @Transactional(rollbackFor = Exception.class)
     public void approveControlDevice(ImNetworkDeviceControlDto deviceControl) throws Exception {
         log.info("approveControlDevice: deviceControl={}", deviceControl);
-        SysUser sysUser = Optional.ofNullable(sysUserFeignService.queryUserInfo()).
-                orElseThrow(()-> new BizException("请登录"));
+        SysUser sysUser = sysUserService.getUser();
         ImNetworkRoomMember roomMember = Optional.ofNullable(imNetworkRoomMemberService.getDao().findByRidAndUid(deviceControl.getRoomId(), sysUser.getId())).
                 orElseThrow(()-> new BizException("用户不在房间内"));
         switch (deviceControl.getDeviceType()) {
@@ -509,9 +491,7 @@ public class ImNetworkRoomServiceImpl extends ServiceImpl<ImNetworkRoomDao, ImNe
     @Transactional(rollbackFor = Exception.class)
     public void deviceStatusSync(ImNetworkDeviceControlDto deviceStatusSync) throws Exception {
         log.info("deviceStatusSync: deviceStatusSync={}", deviceStatusSync);
-        Long userId = Optional.ofNullable(sysUserFeignService.queryUserInfo()).
-                map(SysUser::getId).
-                orElseThrow(()-> new BizException("请登录"));
+        Long userId = sysUserService.getUserId();
         ImNetworkDeviceTypeEnum deviceType = deviceStatusSync.getDeviceType();
         ImNetworkRoomMember roomMember = Optional.ofNullable(imNetworkRoomMemberService.getDao().
                         findByRidAndUid(deviceStatusSync.getRoomId(), userId))
@@ -564,8 +544,7 @@ public class ImNetworkRoomServiceImpl extends ServiceImpl<ImNetworkRoomDao, ImNe
     @Transactional(rollbackFor = Exception.class)
     public void rejectControlDevice(ImNetworkDeviceControlDto deviceControl) throws Exception {
         log.info("rejectControlDevice: deviceControl={}", deviceControl);
-        SysUser sysUser = Optional.ofNullable(sysUserFeignService.queryUserInfo()).
-                orElseThrow(()-> new BizException("请登录"));
+        SysUser sysUser = sysUserService.getUser();
         ImNetworkControlDeviceNotifyMessage msg = new ImNetworkControlDeviceNotifyMessage(ImNetworkActionEnum.REJECT.ordinal());
         msg.setType(deviceControl.getDeviceType().ordinal());
         msg.setOpUserId(sysUser.getId().toString());
@@ -584,9 +563,7 @@ public class ImNetworkRoomServiceImpl extends ServiceImpl<ImNetworkRoomDao, ImNe
         Long accompanimentId = Optional.ofNullable(musicSheetDto).map(ImNetworkMusicSheetDto::getAccompanimentId).orElseThrow(() -> new BizException("伴奏编号不能为空"));
         Integer status = Optional.ofNullable(musicSheetDto).map(ImNetworkMusicSheetDto::getStatus).orElseThrow(() -> new BizException("伴奏下载状态不能为空"));
         log.info("musicSheetDownNotify: musicSheetDto={}", musicSheetDto);
-        Long userId = Optional.ofNullable(sysUserFeignService.queryUserInfo()).
-                map(SysUser::getId).
-                orElseThrow(()-> new BizException("请登录"));
+        Long userId = sysUserService.getUserId();
         List<CourseScheduleStudentMusicSheetResult> studentMusicSheetResults = courseScheduleStudentMusicSheetService.getDao().queryBySheetIdAndCourseId(accompanimentId, roomId,userId, null, null);
         if(CollectionUtils.isEmpty(studentMusicSheetResults)){
             return;

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/service/impl/SysUserServiceImpl.java

@@ -0,0 +1,42 @@
+package com.yonge.cooleshow.biz.dal.service.impl;
+
+import com.yonge.cooleshow.auth.api.client.SysUserFeignService;
+import com.yonge.cooleshow.auth.api.entity.SysUser;
+import com.yonge.cooleshow.biz.dal.service.SysUserService;
+import com.yonge.toolset.base.exception.BizException;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.Optional;
+
+@Service
+public class SysUserServiceImpl implements SysUserService {
+
+    @Autowired
+    private SysUserFeignService sysUserFeignService;
+
+    @Override
+    public Long getUserId() {
+        return Optional.ofNullable(sysUserFeignService.queryUserInfo()).
+                map(SysUser::getId).
+                orElseThrow(()-> new BizException("请登录"));
+    }
+
+    @Override
+    public SysUser getUser() {
+        SysUser sysUser = sysUserFeignService.queryUserInfo();
+        Optional.ofNullable(sysUser).
+                map(SysUser::getId).
+                orElseThrow(()-> new BizException("请登录"));
+        return sysUser;
+    }
+
+    @Override
+    public SysUser findUserById(Long userId) {
+        SysUser sysUser = sysUserFeignService.queryUserById(userId);
+        Optional.ofNullable(sysUser).
+                map(SysUser::getId).
+                orElseThrow(()-> new BizException("请登录"));
+        return sysUser;
+    }
+}

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/service/impl/TeacherFreeTimeServiceImpl.java

@@ -44,29 +44,6 @@ public class TeacherFreeTimeServiceImpl extends ServiceImpl<TeacherFreeTimeDao,
         TeacherFreeTime oldTeacherFreeTime = baseMapper.findOne(teacherFreeTime.getTeacherId(),
                 teacherFreeTime.getCourseMinutes(),
                 teacherFreeTime.getFreeMinutes());
-        System.out.println(teacherFreeTime.getMonday());
-        //结束时间减去休息时间
-/*        if (StringUtil.isNotBlank(teacherFreeTime.getMonday())){
-            teacherFreeTime.setMonday(timeOffSet(teacherFreeTime.getMonday(), teacherFreeTime.getFreeMinutes()));
-        }
-        if (StringUtil.isNotBlank(teacherFreeTime.getTuesday())){
-            teacherFreeTime.setTuesday(timeOffSet(teacherFreeTime.getTuesday(),teacherFreeTime.getFreeMinutes()));
-        }
-        if (StringUtil.isNotBlank(teacherFreeTime.getWednesday())){
-            teacherFreeTime.setWednesday(timeOffSet(teacherFreeTime.getWednesday(),teacherFreeTime.getFreeMinutes()));
-        }
-        if (StringUtil.isNotBlank(teacherFreeTime.getThursday())){
-            teacherFreeTime.setThursday(timeOffSet(teacherFreeTime.getThursday(),teacherFreeTime.getFreeMinutes()));
-        }
-        if (StringUtil.isNotBlank(teacherFreeTime.getFriday())){
-            teacherFreeTime.setFriday(timeOffSet(teacherFreeTime.getFriday(),teacherFreeTime.getFreeMinutes()));
-        }
-        if (StringUtil.isNotBlank(teacherFreeTime.getSaturday())){
-            teacherFreeTime.setSaturday(timeOffSet(teacherFreeTime.getSaturday(),teacherFreeTime.getFreeMinutes()));
-        }
-        if (StringUtil.isNotBlank(teacherFreeTime.getSunday())){
-            teacherFreeTime.setSunday(timeOffSet(teacherFreeTime.getSunday(),teacherFreeTime.getFreeMinutes()));
-        }*/
 
         //删除原有设置
         if(Objects.nonNull(oldTeacherFreeTime)){

cooleshow-user/user-teacher/src/main/java/com/yonge/cooleshow/teacher/controller/TeacherCourseScheduleController.java

@@ -6,6 +6,7 @@ import com.yonge.cooleshow.auth.api.entity.SysUser;
 import com.yonge.cooleshow.biz.dal.dto.search.MyCourseSearch;
 import com.yonge.cooleshow.biz.dal.entity.CourseCalendarEntity;
 import com.yonge.cooleshow.biz.dal.service.CourseScheduleService;
+import com.yonge.cooleshow.biz.dal.service.HolidaysFestivalsService;
 import com.yonge.cooleshow.biz.dal.support.PageUtil;
 import com.yonge.cooleshow.biz.dal.vo.*;
 import com.yonge.cooleshow.common.controller.BaseController;
@@ -41,6 +42,8 @@ public class TeacherCourseScheduleController extends BaseController {
     private CourseScheduleService courseScheduleService;
     @Resource
     private SysUserFeignService sysUserFeignService;
+    @Resource
+    private HolidaysFestivalsService holidaysFestivalsService;
 
     @ApiImplicitParams({
             @ApiImplicitParam(name = "classDate", dataType = "Integer", value = "年月"),
@@ -270,5 +273,15 @@ public class TeacherCourseScheduleController extends BaseController {
         courseScheduleService.updateCourseStudent(param);
         return succeed();
     }
+
+    @ApiOperation("查询节假日")
+    @GetMapping("/selectHoliday")
+    public HttpResponseResult<Object> selectHoliday(Integer year) {
+        SysUser user = sysUserFeignService.queryUserInfo();
+        if (user == null || null == user.getId()) {
+            return failed(HttpStatus.FORBIDDEN, "请登录");
+        }
+        return succeed(holidaysFestivalsService.queryByYear(year));
+    }
 }