Merge remote-tracking branch 'origin/master'

audio-analysis/src/main/java/com/yonge/netty/entity/MusicXmlBasicInfo.java

@@ -27,6 +27,9 @@ public class MusicXmlBasicInfo {
 	
 	private String partIndex;
 
+	// 自定义配置 默认空字符串
+	private String customConfiguration ="";
+
 	private int speed;
 
 	private String heardLevel;
@@ -39,6 +42,14 @@ public class MusicXmlBasicInfo {
 
 	private Map<Integer, MusicXmlSection> musicXmlSectionMap = new HashMap<Integer, MusicXmlSection>();
 
+	public String getCustomConfiguration() {
+		return customConfiguration;
+	}
+
+	public void setCustomConfiguration(String customConfiguration) {
+		this.customConfiguration = customConfiguration;
+	}
+
 	public Integer getId() {
 		return id;
 	}

audio-analysis/src/main/java/com/yonge/netty/server/service/AudioCompareHandler.java

@@ -154,6 +154,7 @@ public class AudioCompareHandler implements MessageHandler {
 				sysMusicCompareRecord.setDeviceType(DeviceTypeEnum.valueOf(musicXmlBasicInfo.getPlatform()));
 				sysMusicCompareRecord.setSpeed(musicXmlBasicInfo.getSpeed());
 				sysMusicCompareRecord.setPartIndex(musicXmlBasicInfo.getPartIndex());
+				sysMusicCompareRecord.setCustomConfiguration(musicXmlBasicInfo.getCustomConfiguration());
 				
 				SysUser sysUser = sysUserFeignService.queryUserById(sysMusicCompareRecord.getUserId());
 				

cooleshow-mall/mall-admin/src/main/java/com/yonge/cooleshow/admin/service/impl/OmsOrderReturnApplyServiceImpl.java

@@ -77,6 +77,9 @@ public class OmsOrderReturnApplyServiceImpl implements OmsOrderReturnApplyServic
     public int updateStatus(Long id, OmsUpdateStatusParam statusParam) {
         Integer status = statusParam.getStatus();
         OmsOrderReturnApply omsOrderReturnApply = returnApplyMapper.selectByPrimaryKey(id);
+        if (omsOrderReturnApply.getProductPrice().compareTo(statusParam.getReturnAmount()) <0) {
+            throw new BizException("退款金额不能大于商品金额");
+        }
         if (omsOrderReturnApply.getStatus().equals(statusParam.getStatus())) {
             return 1;
         }

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/entity/SysMusicCompareRecord.java

@@ -39,6 +39,10 @@ public class SysMusicCompareRecord extends BaseEntity {
 
 	private int notesDataIndex;
 
+
+	// 自定义配置 默认空字符串
+	private String customConfiguration ="";
+
 	/** 总分 */
 	private BigDecimal score;
 
@@ -79,6 +83,14 @@ public class SysMusicCompareRecord extends BaseEntity {
 	@ApiModelProperty("音乐过期 0：否 1：是")
 	private Integer expire;
 
+	public String getCustomConfiguration() {
+		return customConfiguration;
+	}
+
+	public void setCustomConfiguration(String customConfiguration) {
+		this.customConfiguration = customConfiguration;
+	}
+
 	public Integer getExpire() {
 		return expire;
 	}

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

@@ -56,8 +56,8 @@ public class ImUserFriendServiceImpl extends ServiceImpl<ImUserFriendDao, ImUser
             List<BasicUserInfo> basicUserInfos = basicUserInfoMap.get(studentId);
             if(CollectionUtils.isNotEmpty(basicUserInfos)){
                 BasicUserInfo info = basicUserInfos.get(0);
-                teacherFriend.setFriendAvatar(info.getAvatar());
-                teacherFriend.setFriendNickname(info.getUsername());
+                teacherFriend.setFriendAvatar(basicUserInfo.getAvatar());
+                teacherFriend.setFriendNickname(basicUserInfo.getUsername());
                 studentFriend.setFriendAvatar(info.getAvatar());
                 studentFriend.setFriendNickname(info.getUsername());
             }

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

@@ -109,6 +109,7 @@ public class SysMusicCompareRecordServiceImpl extends BaseServiceImpl<Long, SysM
 		jsonObject.put("heardLevel", userLastEvaluationData.getHeardLevel());
 		jsonObject.put("videoFilePath", userLastEvaluationData.getVideoFilePath());
 		jsonObject.put("partIndex", userLastEvaluationData.getPartIndex());
+		jsonObject.put("customConfiguration", userLastEvaluationData.getCustomConfiguration());
 		if(userLastEvaluationData.getCreateTime() == null) {
 			jsonObject.put("expire", 1);
 		} else {

cooleshow-user/user-biz/src/main/resources/config/mybatis/MusicAlbumMapper.xml

@@ -53,7 +53,7 @@
             </if>
             <if test="query.albumTagIdList != null and query.albumTagIdList.size() != 0">
                 and
-                <foreach collection="query.albumTagIdList" separator="and" item="item">
+                <foreach collection="query.albumTagIdList"  open="(" close=")"  separator="or" item="item">
                     find_in_set(#{item},t.album_tag_)
                 </foreach>
             </if>
@@ -93,7 +93,7 @@
             </if>
             <if test="query.albumTagIdList != null and query.albumTagIdList.size() != 0">
                 and
-                <foreach collection="query.albumTagIdList" separator="and" item="item">
+                <foreach collection="query.albumTagIdList"  open="(" close=")"  separator="or" item="item">
                     find_in_set(#{item},t.album_tag_)
                 </foreach>
             </if>
@@ -170,7 +170,7 @@
             </if>
             <if test="query.albumTagIdList != null and query.albumTagIdList.size() != 0">
                 and
-                <foreach collection="query.albumTagIdList" separator="and" item="item">
+                <foreach collection="query.albumTagIdList" open="(" close=")" separator="or" item="item">
                     find_in_set(#{item},t.album_tag_)
                 </foreach>
             </if>

cooleshow-user/user-biz/src/main/resources/config/mybatis/MusicSheetMapper.xml

@@ -88,13 +88,13 @@
         </if>
         <if test="param.musicTagIds != null and param.musicTagIds != ''">
             and
-            <foreach collection="param.musicTagIdList" separator="or" item="item">
+            <foreach collection="param.musicTagIdList" open="(" close=")" separator="or" item="item">
                 find_in_set(#{item},t.music_tag_)
             </foreach>
         </if>
         <if test="param.subjectIds != null and param.subjectIds != ''">
             and
-            <foreach collection="param.subjectIdList" separator="or" item="item">
+            <foreach collection="param.subjectIdList" separator="or" item="item"  open="(" close=")" >
                 find_in_set(#{item},t.music_subject_)
             </foreach>
         </if>
@@ -133,13 +133,13 @@
             </if>
             <if test="param.musicTagIds != null and param.musicTagIds != ''">
                 and
-                <foreach collection="param.musicTagIdList" separator="and" item="item">
+                <foreach collection="param.musicTagIdList" separator="or" item="item"  open="(" close=")" >
                     find_in_set(#{item},t.music_tag_)
                 </foreach>
             </if>
             <if test="param.subjectIds != null and param.subjectIds != ''">
                 and
-                <foreach collection="param.subjectIdList" separator="and" item="item">
+                <foreach collection="param.subjectIdList" separator="or" item="item"  open="(" close=")" >
                     find_in_set(#{item},t.music_subject_)
                 </foreach>
             </if>
@@ -375,7 +375,7 @@
             </if>
             <if test="param.musicTagList != null and param.musicTagList.size() != 0">
                 and
-                <foreach collection="param.musicTagList" separator="and" item="item">
+                <foreach collection="param.musicTagList" separator="or" item="item"  open="(" close=")" >
                     find_in_set(#{item},ms.music_tag_)
                 </foreach>
             </if>

cooleshow-user/user-biz/src/main/resources/config/mybatis/SysMusicCompareRecordMapper.xml

@@ -30,6 +30,7 @@
 		<result column="monday_" property="monday"/>
 		<result column="create_time_" property="createTime" />
 		<result column="part_index_" property="partIndex" />
+		<result column="custom_configuration_" property="customConfiguration" />
 	</resultMap>
 
 	<!-- 根据主键查询一条记录 -->
@@ -46,11 +47,11 @@
 	<insert id="insert" parameterType="com.yonge.cooleshow.biz.dal.entity.SysMusicCompareRecord" useGeneratedKeys="true" keyColumn="id" keyProperty="id">
 		INSERT INTO sys_music_compare_record (id_,user_id_,music_sheet_id_,heard_level_,behavior_id_,score_data_,score_,intonation_,cadence_,integrity_,
 		                                      record_file_path_,video_file_path_,device_type_,client_id_,play_time_,speed_,monday_,
-												source_time_,feature_,create_time_,update_time_,part_index_)
+												source_time_,feature_,create_time_,update_time_,part_index_,custom_configuration_)
 		VALUES(#{id},#{userId},#{musicSheetId},#{heardLevel,typeHandler=com.yonge.toolset.mybatis.dal.CustomEnumTypeHandler},#{behaviorId},#{scoreData},
 		       #{score},#{intonation},#{cadence},#{integrity},
 		       #{recordFilePath},#{videoFilePath},#{deviceType,typeHandler=com.yonge.toolset.mybatis.dal.CustomEnumTypeHandler},#{clientId},#{playTime},#{speed},#{monday},
-		       #{sourceTime},#{feature,typeHandler=com.yonge.toolset.mybatis.dal.CustomEnumTypeHandler}, NOW(), NOW(),#{partIndex})
+		       #{sourceTime},#{feature,typeHandler=com.yonge.toolset.mybatis.dal.CustomEnumTypeHandler}, NOW(), NOW(),#{partIndex},#{customConfiguration})
 	</insert>
 
 	<!-- 根据主键查询一条记录 -->
@@ -107,6 +108,9 @@
 		<if test="partIndex != null">
 			part_index_ = #{partIndex},
 		</if>
+		<if test="customConfiguration != null">
+			custom_configuration_ = #{customConfiguration},
+		</if>
 		<if test="feature!=null">
 			feature_ = #{feature,typeHandler=com.yonge.toolset.mybatis.dal.CustomEnumTypeHandler},
 		</if>
@@ -147,7 +151,8 @@
 		       smcr.score_, smcr.intonation_, smcr.cadence_,
 		       smcr.integrity_, smcr.record_file_path_, smcr.video_file_path_, smcr.client_id_, smcr.device_type_, smcr.play_time_,
 		       smcr.monday_, smcr.create_time_,
-			sms.music_sheet_name_ sys_music_score_name_,if(smcr.create_time_ is not null and date_add(smcr.create_time_,INTERVAL #{expireTime} DAY) &lt; now(),1,0) as expire
+			sms.music_sheet_name_ sys_music_score_name_,if(smcr.create_time_ is not null and date_add(smcr.create_time_,INTERVAL #{expireTime} DAY) &lt; now(),1,0) as expire,
+			smcr.custom_configuration_ as customConfiguration
 		FROM sys_music_compare_record smcr
 		LEFT JOIN music_sheet sms on smcr.music_sheet_id_ = sms.id_
 		<include refid="queryCondition"/>

cooleshow-user/user-website/src/main/java/com/yonge/cooleshow/website/controller/WebCourseScheduleController.java

@@ -0,0 +1,307 @@
+package com.yonge.cooleshow.website.controller;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.yonge.cooleshow.auth.api.client.SysUserFeignService;
+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.vo.*;
+import com.yonge.cooleshow.common.controller.BaseController;
+import com.yonge.cooleshow.common.entity.HttpResponseResult;
+import com.yonge.toolset.base.page.PageInfo;
+import com.yonge.toolset.mybatis.support.PageUtil;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiImplicitParams;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.http.HttpStatus;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
+import javax.annotation.Resource;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+
+/**
+ * 老师课程表(CourseSchedule)表控制层
+ *
+ * @author hgw
+ * @since 2022-03-18 15:29:11
+ */
+@Api(tags = "老师课程表")
+@RestController
+@RequestMapping("/courseSchedule")
+public class WebCourseScheduleController extends BaseController {
+    /**
+     * 服务对象
+     */
+    @Resource
+    private CourseScheduleService courseScheduleService;
+    @Resource
+    private SysUserFeignService sysUserFeignService;
+    @Resource
+    private HolidaysFestivalsService holidaysFestivalsService;
+
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "classDate", dataType = "Integer", value = "年月"),
+            @ApiImplicitParam(name = "status", dataType = "String", value = "课程状态 NOT_START未开始 ING进行中 COMPLETE已完成"),
+            @ApiImplicitParam(name = "subjectId", dataType = "Long", value = "声部id"),
+            @ApiImplicitParam(name = "page", dataType = "Integer", value = "页数"),
+            @ApiImplicitParam(name = "rows", dataType = "Integer", value = "每页数量"),
+    })
+    @ApiOperation("老师端-首页-我的课程-直播课")
+    @PostMapping("/queryTeacherLiveCourse")
+    public HttpResponseResult<PageInfo<TeacherLiveCourseInfoVo>> queryTeacherLiveCourse(@RequestBody Map<String, Object> param) {
+        return succeed(courseScheduleService.queryTeacherLiveCourse(param));
+    }
+
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "year", dataType = "Integer", value = "年"),
+            @ApiImplicitParam(name = "month", dataType = "Integer", value = "月"),
+            @ApiImplicitParam(name = "singleCourseMinutes", dataType = "Integer", value = "单课时时长(不包含休息时间)"),
+            @ApiImplicitParam(name = "freeCourseMinutes", dataType = "Integer", value = "单课时休息时长)"),
+            @ApiImplicitParam(name = "teacherId", dataType = "Long", value = "老师id"),
+    })
+    @ApiOperation("直播课创建时的日历数据")
+    @PostMapping("/createLiveCourseCalendar")
+    public HttpResponseResult<List<CourseCalendarEntity>> createLiveCourseCalendar(@RequestBody Map<String, Object> param) {
+        return succeed(courseScheduleService.createLiveCourseCalendar(param));
+    }
+
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "teacherId", dataType = "Long", value = "老师id"),
+            @ApiImplicitParam(name = "studentId", dataType = "Long", value = "学生id"),
+            @ApiImplicitParam(name = "year", dataType = "Integer", value = "年"),
+            @ApiImplicitParam(name = "month", dataType = "Integer", value = "月"),
+            @ApiImplicitParam(name = "day", dataType = "Integer", value = "日"),
+    })
+    @ApiOperation("陪练课日历-用于学生购买指定老师陪练课")
+    @PostMapping("/createPracticeCourseCalendar")
+    public HttpResponseResult<List<CourseCalendarEntity>> generatePracticeCourseCalender(@RequestBody Map<String, Object> param) {
+        return succeed(courseScheduleService.createPracticeCourseCalender(param));
+    }
+
+    @ApiOperation(value = "陪练课查询",
+            notes = "老师端-首页-我的课程-陪练课\n" +
+                    "search:{\"classMonth\":\"2022-03\",\"status\":\"COMPLETE\",\"subjectId\":1}\n" +
+                    "老师端-首页-课后评价\n" +
+                    "search:{\"classMonth\":\"2022-03\",\"replied\":0,\"studentName\":\"测试王\"}\n" +
+                    "老师端-我的-我的主页\n" +
+                    "search:{\"classMonth\":\"2022-03\"}\n" +
+                    "老师端-课表\n" +
+                    "search:{\"classDate\":\"2022-03-27\"}\n" +
+                    "     search:{\"classMonth\":\"2022-03\"}\n" +
+                    "老师端-课表-陪练课\n" +
+                    "     search:{\"classDate\":\"2022-03-27\"}")
+    @PostMapping("/queryTeacherPracticeCourse")
+    public HttpResponseResult<PageInfo<MyCourseVo>> queryTeacherPracticeCourse(@RequestBody MyCourseSearch search) {
+        SysUser user = sysUserFeignService.queryUserInfo();
+        if (user == null || null == user.getId()) {
+            return failed(HttpStatus.FORBIDDEN, "请登录");
+        }
+        search.setTeacherId(user.getId());
+        IPage<MyCourseVo> pages = courseScheduleService.queryTeacherPracticeCourse(PageUtil.getPage(search), search);
+        return succeed(PageUtil.pageInfo(pages));
+    }
+
+    @ApiOperation("老师端-课表-日历")
+    @PostMapping("/queryCourseSchedule")
+    public HttpResponseResult<Set<String>> queryCourseSchedule(@RequestBody MyCourseSearch search) {
+        SysUser user = sysUserFeignService.queryUserInfo();
+        if (user == null || null == user.getId()) {
+            return failed(HttpStatus.FORBIDDEN, "请登录");
+        }
+        search.setTeacherId(user.getId());
+        return succeed(courseScheduleService.queryCourseSchedule(search));
+    }
+
+    @ApiOperation(value = "老师端-课表-日历-用户", notes = "search:{\"classDate\":\"2022-03-27\"}")
+    @PostMapping("/queryCourseUser")
+    public HttpResponseResult<Map<String, Object>> queryCourseUser(@RequestBody MyCourseSearch search) {
+        SysUser user = sysUserFeignService.queryUserInfo();
+        if (user == null || null == user.getId()) {
+            return failed(HttpStatus.FORBIDDEN, "请登录");
+        }
+        search.setTeacherId(user.getId());
+        return succeed(courseScheduleService.queryCourseUser(search));
+    }
+
+    @ApiOperation(value = "老师端-课表-日历-调课")
+    @PostMapping("/courseAdjust")
+    public HttpResponseResult<Object> courseAdjust(@Validated @RequestBody CourseAdjustVo adjustVo) {
+        SysUser user = sysUserFeignService.queryUserInfo();
+        if (user == null || null == user.getId()) {
+            return failed(HttpStatus.FORBIDDEN, "请登录");
+        }
+        courseScheduleService.courseAdjust(adjustVo, user.getId());
+        return succeed();
+    }
+
+    @ApiOperation("老师-首页-最近课程")
+    @GetMapping("/queryLiveAndVideo")
+    public HttpResponseResult<StudentHomePage> queryLiveAndVideo() {
+        SysUser user = sysUserFeignService.queryUserInfo();
+        if (user == null || null == user.getId()) {
+            return failed(HttpStatus.FORBIDDEN, "请登录");
+        }
+        return succeed(courseScheduleService.queryLiveAndVideo(null, user.getId(), null));
+    }
+
+    @ApiOperation("老师端-查询房间配置")
+    @GetMapping("/selectRoomConfig")
+    public HttpResponseResult<Object> selectRoomConfig() {
+        return succeed(courseScheduleService.selectRoomConfig());
+    }
+
+    //测试未约满课老师
+    @GetMapping("/test")
+    public HttpResponseResult<Object> test(Integer amount) {
+//        courseScheduleService.scheduleTask();
+//        return succeed(courseScheduleService.getTeacherId(amount));
+//        courseScheduleService.scheduleTask();
+//        courseScheduleService.teacherSalaryTask();
+        courseScheduleService.scheduleTask();
+        return succeed();
+    }
+
+    @ApiOperation("查询琴房剩余时长、冻结时长、统计学员人数")
+    @GetMapping("/selectRemainTime")
+    public HttpResponseResult<PianoRoomTimeVo> selectRemainTime() {
+        SysUser user = sysUserFeignService.queryUserInfo();
+        if (user == null || null == user.getId()) {
+            return failed(HttpStatus.FORBIDDEN, "请登录");
+        }
+        return succeed(courseScheduleService.selectRemainTime(user.getId()));
+    }
+
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "subjectId", dataType = "Long", value = "学员声部id"),
+            @ApiImplicitParam(name = "userName", dataType = "String", value = "学员姓名"),
+            @ApiImplicitParam(name = "courseId", dataType = "Long", value = "课程id"),
+    })
+    @ApiOperation("我的学员&课内学员")
+    @PostMapping("/selectStudent")
+    public HttpResponseResult<PageInfo<CourseStudentVo>> selectStudent(@RequestBody Map<String, Object> param) {
+        SysUser user = sysUserFeignService.queryUserInfo();
+        if (user == null || null == user.getId()) {
+            return failed(HttpStatus.FORBIDDEN, "请登录");
+        }
+        param.put("teacherId", user.getId());
+        return succeed(courseScheduleService.selectStudent(param));
+    }
+
+    @ApiOperation("排课")
+    @PostMapping("/arrangeCourse")
+    public HttpResponseResult<Object> arrangeCourse(@RequestBody ArrangeCourseVo arrangeCourseVo) {
+        SysUser user = sysUserFeignService.queryUserInfo();
+        if (user == null || null == user.getId()) {
+            return failed(HttpStatus.FORBIDDEN, "请登录");
+        }
+        courseScheduleService.arrangeCourse(arrangeCourseVo, user.getId());
+        return succeed();
+    }
+
+    @ApiOperation("根据月份查询消耗时长")
+    @GetMapping("/selectConsumeTime")
+    public HttpResponseResult<Object> selectConsumeTime(String month) {
+        SysUser user = sysUserFeignService.queryUserInfo();
+        if (user == null || null == user.getId()) {
+            return failed(HttpStatus.FORBIDDEN, "请登录");
+        }
+        return succeed(courseScheduleService.selectConsumeTime(month, user.getId()));
+    }
+
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "subjectId", dataType = "Long", value = "声部id"),
+            @ApiImplicitParam(name = "month", dataType = "String", value = "月份,yyyy-mm"),
+            @ApiImplicitParam(name = "status", dataType = "String", value = "课程状态"),
+    })
+    @ApiOperation("琴房课程列表")
+    @PostMapping("/selectCourseList")
+    public HttpResponseResult<PageInfo<CourseScheduleRecordVo>> selectCourseList(@RequestBody Map<String, Object> param) {
+        SysUser user = sysUserFeignService.queryUserInfo();
+        if (user == null || null == user.getId()) {
+            return failed(HttpStatus.FORBIDDEN, "请登录");
+        }
+        param.put("teacherId", user.getId());
+        return succeed(courseScheduleService.selectCourseList(param));
+    }
+
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "subjectId", dataType = "Long", value = "声部id"),
+            @ApiImplicitParam(name = "month", dataType = "String", value = "月份,yyyy-mm"),
+            @ApiImplicitParam(name = "status", dataType = "String", value = "课程状态"),
+    })
+    @ApiOperation("消耗时长列表")
+    @PostMapping("/selectConsumeTimeList")
+    public HttpResponseResult<PageInfo<CourseScheduleRecordVo>> selectConsumeTimeList(@RequestBody Map<String, Object> param) {
+        SysUser user = sysUserFeignService.queryUserInfo();
+        if (user == null || null == user.getId()) {
+            return failed(HttpStatus.FORBIDDEN, "请登录");
+        }
+        param.put("teacherId", user.getId());
+        return succeed(courseScheduleService.selectConsumeTimeList(param));
+    }
+
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "courseId", dataType = "Long", value = "课程id"),
+    })
+    @ApiOperation("删除课程")
+    @PostMapping("/deleteCourse")
+    public HttpResponseResult<Object> deleteCourse(@RequestBody Map<String, Object> param) {
+        SysUser user = sysUserFeignService.queryUserInfo();
+        if (user == null || null == user.getId()) {
+            return failed(HttpStatus.FORBIDDEN, "请登录");
+        }
+        param.put("teacherId", user.getId());
+        courseScheduleService.deleteCourse(param);
+        return succeed();
+    }
+
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "courseId", dataType = "Long", value = "课程id"),
+            @ApiImplicitParam(name = "startTime", dataType = "String", value = "上课时间"),
+            @ApiImplicitParam(name = "endTime", dataType = "String", value = "下课时间"),
+    })
+    @ApiOperation("调整上课时间")
+    @PostMapping("/updateCourseTime")
+    public HttpResponseResult<Object> updateCourseTime(@RequestBody Map<String, Object> param) {
+        SysUser user = sysUserFeignService.queryUserInfo();
+        if (user == null || null == user.getId()) {
+            return failed(HttpStatus.FORBIDDEN, "请登录");
+        }
+        param.put("teacherId", user.getId());
+        courseScheduleService.updateCourseTime(param);
+        return succeed();
+    }
+
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "studentIds", dataType = "List", value = "学生id集合"),
+            @ApiImplicitParam(name = "courseId", dataType = "Long", value = "课程id"),
+    })
+    @ApiOperation("调整上课学员")
+    @PostMapping("/updateCourseStudent")
+    public HttpResponseResult<Object> updateCourseStudent(@RequestBody Map<String, Object> param) {
+        SysUser user = sysUserFeignService.queryUserInfo();
+        if (user == null || null == user.getId()) {
+            return failed(HttpStatus.FORBIDDEN, "请登录");
+        }
+        param.put("teacherId", user.getId());
+        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));
+    }
+}
+