查询节假日

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));
+    }
 }