群聊

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/dao/ImGroupMemberAuditDao.java

@@ -22,7 +22,7 @@ public interface ImGroupMemberAuditDao extends BaseMapper<ImGroupMemberAudit> {
 
     ImGroupMemberAudit findOne(Map<String, Object> params);
 
-    <T> IPage<T> queryPage(Page<T> pageInfo, @Param("params") ImGroupMemberAuditQueryInfo queryInfo);
+    List<ImGroupMemberAudit> queryAll(@Param("params") ImGroupMemberAuditQueryInfo queryInfo);
 
     void batchUpdateAuditStatus(@Param("auditIds") String auditIds, @Param("auditStatus") String auditStatus);
 

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/dao/TeacherDao.java

@@ -8,6 +8,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.yonge.cooleshow.biz.dal.dto.BasicUserInfo;
 import com.yonge.cooleshow.biz.dal.dto.req.UserSetReq;
 import com.yonge.cooleshow.biz.dal.dto.search.TeacherSearch;
+import com.yonge.cooleshow.biz.dal.entity.Subject;
 import com.yonge.cooleshow.biz.dal.entity.Teacher;
 import com.yonge.cooleshow.biz.dal.vo.TeacherVo;
 import com.yonge.cooleshow.biz.dal.vo.UserSetVo;
@@ -47,4 +48,12 @@ public interface TeacherDao extends BaseMapper<Teacher> {
      */
     TeacherVo detail(@Param("userId") Long userId);
 
+    /**
+     * @description: 获取老师可授课声部列表
+     * @param
+     * @return java.util.List<com.yonge.cooleshow.biz.dal.entity.Subject>
+     * @author zx
+     * @date 2022/3/25 09:38
+     */
+    List<Subject> querySubject(@Param("userId") Long userId);
 }

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/dao/TeacherFreeTimeDao.java

@@ -0,0 +1,32 @@
+package com.yonge.cooleshow.biz.dal.dao;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.yonge.cooleshow.biz.dal.entity.TeacherFreeTime;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+/**
+ * 老师可排课时间表(TeacherFreeTime)表数据库访问层
+ *
+ * @author zx
+ * @since 2022-03-25 10:04:26
+ */
+public interface TeacherFreeTimeDao extends BaseMapper<TeacherFreeTime> {
+
+    int insertBatch(@Param("entities") List<TeacherFreeTime> entities);
+
+    /**
+     * @description: 获取老师陪练课设置
+     * @param teacherId
+     * @param courseMinutes
+     * @param freeMinutes
+     * @return com.yonge.cooleshow.biz.dal.entity.TeacherFreeTime
+     * @author zx
+     * @date 2022/3/25 10:25
+     */
+    TeacherFreeTime findOne(@Param("teacherId") Long teacherId,
+                            @Param("courseMinutes") Integer courseMinutes,
+                            @Param("freeMinutes") Integer freeMinutes);
+}
+

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/dto/PracticeTimesSetting.java

@@ -0,0 +1,29 @@
+package com.yonge.cooleshow.biz.dal.dto;
+
+import io.swagger.annotations.ApiModelProperty;
+
+//陪练课可选单课时时长配置
+public class PracticeTimesSetting {
+
+    @ApiModelProperty(value = "课间休息分钟数")
+    private Integer freeMinutes;
+
+    @ApiModelProperty(value = "单课时分钟数")
+    private Integer courseMinutes;
+
+    public Integer getFreeMinutes() {
+        return freeMinutes;
+    }
+
+    public void setFreeMinutes(Integer freeMinutes) {
+        this.freeMinutes = freeMinutes;
+    }
+
+    public Integer getCourseMinutes() {
+        return courseMinutes;
+    }
+
+    public void setCourseMinutes(Integer courseMinutes) {
+        this.courseMinutes = courseMinutes;
+    }
+}

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

@@ -38,7 +38,6 @@ public class ImGroupMemberAudit implements Serializable {
     private Long groupId;
 
     @TableField("desc_")
-    @NotNull(message = "申请原因不可为空")
     @ApiModelProperty(value = "申请原因")
     private String desc;
 

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

@@ -0,0 +1,208 @@
+package com.yonge.cooleshow.biz.dal.entity;
+
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * 老师可排课时间表(TeacherFreeTime)表实体类
+ *
+ * @author zx
+ * @since 2022-03-25 10:04:27
+ */
+@ApiModel(value = "teacher_free_time-老师可排课时间表")
+public class TeacherFreeTime implements Serializable {
+    @TableId(value = "id_", type = IdType.AUTO)
+    @ApiModelProperty(value = "主键;")
+    private Long id;
+
+    @TableField("teacher_id_")
+    @ApiModelProperty(value = "老师编号;")
+    private Long teacherId;
+
+    @NotNull(message = "课间休息分钟数不可为空")
+    @TableField("free_minutes_")
+    @ApiModelProperty(value = "课间休息分钟数")
+    private Integer freeMinutes;
+
+    @NotNull(message = "单课时分钟数不可为空")
+    @TableField("course_minutes_")
+    @ApiModelProperty(value = "单课时分钟数")
+    private Integer courseMinutes;
+
+    @TableField("skip_holiday_flag_")
+    @ApiModelProperty(value = "是否跳过节假日1是0否")
+    private Boolean skipHolidayFlag = false;
+
+    @NotBlank(message = "声部单课时金额不可为空")
+    @TableField("subject_price_")
+    @ApiModelProperty(value = "声部单课时金额:[{'id':1,'price':100.1}]")
+    private String subjectPrice;
+
+    @TableField("monday_")
+    @ApiModelProperty(value = "周一;数据结构[{'startTime':'08:00:00'','endTime':'08:30:00'}];")
+    private String monday;
+
+    @TableField("tuesday_")
+    @ApiModelProperty(value = "周二;")
+    private String tuesday;
+
+    @TableField("wednesday_")
+    @ApiModelProperty(value = "周三;")
+    private String wednesday;
+
+    @TableField("thursday_")
+    @ApiModelProperty(value = "周四;")
+    private String thursday;
+
+    @TableField("friday_")
+    @ApiModelProperty(value = "周五;")
+    private String friday;
+
+    @TableField("saturday_")
+    @ApiModelProperty(value = "周六;")
+    private String saturday;
+
+    @TableField("sunday_")
+    @ApiModelProperty(value = "周日;")
+    private String sunday;
+
+    @TableField("create_time_")
+    @ApiModelProperty(value = "创建时间;")
+    private Date createTime;
+
+    @TableField("update_time_")
+    @ApiModelProperty(value = "修改时间;")
+    private Date updateTime;
+
+
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    public Long getTeacherId() {
+        return teacherId;
+    }
+
+    public void setTeacherId(Long teacherId) {
+        this.teacherId = teacherId;
+    }
+
+    public Integer getFreeMinutes() {
+        return freeMinutes;
+    }
+
+    public void setFreeMinutes(Integer freeMinutes) {
+        this.freeMinutes = freeMinutes;
+    }
+
+    public Integer getCourseMinutes() {
+        return courseMinutes;
+    }
+
+    public void setCourseMinutes(Integer courseMinutes) {
+        this.courseMinutes = courseMinutes;
+    }
+
+    public Boolean getSkipHolidayFlag() {
+        return skipHolidayFlag;
+    }
+
+    public void setSkipHolidayFlag(Boolean skipHolidayFlag) {
+        this.skipHolidayFlag = skipHolidayFlag;
+    }
+
+    public String getSubjectPrice() {
+        return subjectPrice;
+    }
+
+    public void setSubjectPrice(String subjectPrice) {
+        this.subjectPrice = subjectPrice;
+    }
+
+    public String getMonday() {
+        return monday;
+    }
+
+    public void setMonday(String monday) {
+        this.monday = monday;
+    }
+
+    public String getTuesday() {
+        return tuesday;
+    }
+
+    public void setTuesday(String tuesday) {
+        this.tuesday = tuesday;
+    }
+
+    public String getWednesday() {
+        return wednesday;
+    }
+
+    public void setWednesday(String wednesday) {
+        this.wednesday = wednesday;
+    }
+
+    public String getThursday() {
+        return thursday;
+    }
+
+    public void setThursday(String thursday) {
+        this.thursday = thursday;
+    }
+
+    public String getFriday() {
+        return friday;
+    }
+
+    public void setFriday(String friday) {
+        this.friday = friday;
+    }
+
+    public String getSaturday() {
+        return saturday;
+    }
+
+    public void setSaturday(String saturday) {
+        this.saturday = saturday;
+    }
+
+    public String getSunday() {
+        return sunday;
+    }
+
+    public void setSunday(String sunday) {
+        this.sunday = sunday;
+    }
+
+    public Date getCreateTime() {
+        return createTime;
+    }
+
+    public void setCreateTime(Date createTime) {
+        this.createTime = createTime;
+    }
+
+    public Date getUpdateTime() {
+        return updateTime;
+    }
+
+    public void setUpdateTime(Date updateTime) {
+        this.updateTime = updateTime;
+    }
+
+}
+

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

@@ -8,6 +8,8 @@ import com.yonge.cooleshow.biz.dal.enums.AuditStatusEnum;
 import com.yonge.cooleshow.biz.dal.queryInfo.ImGroupMemberAuditQueryInfo;
 import com.yonge.cooleshow.common.page.PageInfo;
 
+import java.util.List;
+
 /**
  * (ImGroupMemberAudit)表服务接口
  *
@@ -37,6 +39,6 @@ public interface ImGroupMemberAuditService extends IService<ImGroupMemberAudit>
     */
     void applyAudit(String auditId, AuditStatusEnum auditStatus,Long groupId) throws Exception;
 
-    PageInfo<ImGroupMemberAudit> queryPage(ImGroupMemberAuditQueryInfo queryInfo);
+    List<ImGroupMemberAudit> queryAll(ImGroupMemberAuditQueryInfo queryInfo);
 }
 

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

@@ -3,8 +3,6 @@ package com.yonge.cooleshow.biz.dal.service;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.yonge.cooleshow.biz.dal.dao.ImGroupDao;
 import com.yonge.cooleshow.biz.dal.entity.ImGroup;
-import com.yonge.cooleshow.common.page.PageInfo;
-
 import java.util.List;
 import java.util.Map;
 

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

@@ -0,0 +1,26 @@
+package com.yonge.cooleshow.biz.dal.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.yonge.cooleshow.biz.dal.dao.TeacherFreeTimeDao;
+import com.yonge.cooleshow.biz.dal.entity.TeacherFreeTime;
+
+/**
+ * 老师可排课时间表(TeacherFreeTime)表服务接口
+ *
+ * @author zx
+ * @since 2022-03-25 10:04:27
+ */
+public interface TeacherFreeTimeService extends IService<TeacherFreeTime> {
+
+    TeacherFreeTimeDao getDao();
+
+    /**
+    * @description: 更新陪练课排课设置
+     * @param teacherFreeTime
+    * @return void
+    * @author zx
+    * @date 2022/3/25 10:18
+    */
+    void upSet(TeacherFreeTime teacherFreeTime);
+}
+

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

@@ -5,11 +5,14 @@ import com.baomidou.mybatisplus.extension.service.IService;
 import com.yonge.cooleshow.biz.dal.dto.req.UserSetReq;
 import com.yonge.cooleshow.biz.dal.dto.req.TeacherSubmitReq;
 import com.yonge.cooleshow.biz.dal.dto.search.TeacherSearch;
+import com.yonge.cooleshow.biz.dal.entity.Subject;
 import com.yonge.cooleshow.biz.dal.entity.Teacher;
 import com.yonge.cooleshow.biz.dal.vo.TeacherVo;
 import com.yonge.cooleshow.biz.dal.vo.UserSetVo;
 import com.yonge.cooleshow.common.entity.HttpResponseResult;
 
+import java.util.List;
+
 /**
  * 教师表 服务类
  * @author liweifan
@@ -50,4 +53,12 @@ public interface TeacherService extends IService<Teacher>  {
      */
     TeacherVo detail(Long userId);
 
+    /**
+    * @description: 获取老师可授课声部列表
+     * @param userId
+    * @return com.yonge.cooleshow.common.entity.HttpResponseResult<java.util.List<com.yonge.cooleshow.biz.dal.entity.Subject>>
+    * @author zx
+    * @date 2022/3/25 09:37
+    */
+    List<Subject> querySubject(Long userId);
 }

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

@@ -118,10 +118,8 @@ public class ImGroupMemberAuditServiceImpl extends ServiceImpl<ImGroupMemberAudi
     }
 
     @Override
-    public PageInfo<ImGroupMemberAudit> queryPage(ImGroupMemberAuditQueryInfo queryInfo) {
-        Page<ImGroupMemberAudit> pageInfo = PageUtil.getPage(queryInfo.getPage(), queryInfo.getRows());
-        pageInfo.setDesc("id_");
-        return PageUtil.pageInfo(baseMapper.queryPage(pageInfo,queryInfo));
+    public List<ImGroupMemberAudit> queryAll(ImGroupMemberAuditQueryInfo queryInfo) {
+        return baseMapper.queryAll(queryInfo);
     }
 }
 

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

@@ -0,0 +1,43 @@
+package com.yonge.cooleshow.biz.dal.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.yonge.cooleshow.biz.dal.dao.TeacherFreeTimeDao;
+import com.yonge.cooleshow.biz.dal.entity.TeacherFreeTime;
+import com.yonge.cooleshow.biz.dal.service.TeacherFreeTimeService;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.util.Objects;
+
+/**
+ * 老师可排课时间表(TeacherFreeTime)表服务实现类
+ *
+ * @author zx
+ * @since 2022-03-25 10:04:27
+ */
+@Service("teacherFreeTimeService")
+public class TeacherFreeTimeServiceImpl extends ServiceImpl<TeacherFreeTimeDao, TeacherFreeTime> implements TeacherFreeTimeService {
+
+    private final static Logger log = LoggerFactory.getLogger(TeacherFreeTimeServiceImpl.class);
+
+    @Override
+    public TeacherFreeTimeDao getDao() {
+        return this.baseMapper;
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void upSet(TeacherFreeTime teacherFreeTime) {
+        TeacherFreeTime oldTeacherFreeTime = baseMapper.findOne(teacherFreeTime.getTeacherId(),
+                teacherFreeTime.getCourseMinutes(),
+                teacherFreeTime.getFreeMinutes());
+        //删除原有设置
+        if(Objects.nonNull(oldTeacherFreeTime)){
+            baseMapper.deleteById(oldTeacherFreeTime.getId());
+        }
+        baseMapper.insert(teacherFreeTime);
+    }
+}
+

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

@@ -9,6 +9,7 @@ import com.yonge.cooleshow.auth.api.enums.SysUserType;
 import com.yonge.cooleshow.biz.dal.dto.req.UserSetReq;
 import com.yonge.cooleshow.biz.dal.dto.req.TeacherSubmitReq;
 import com.yonge.cooleshow.biz.dal.dto.search.TeacherSearch;
+import com.yonge.cooleshow.biz.dal.entity.Subject;
 import com.yonge.cooleshow.biz.dal.entity.TeacherStyleVideo;
 import com.yonge.cooleshow.biz.dal.enums.AuthStatusEnum;
 import com.yonge.cooleshow.biz.dal.enums.TeacherTypeEnum;
@@ -80,6 +81,11 @@ public class TeacherServiceImpl extends ServiceImpl<TeacherDao, Teacher> impleme
         return detail;
     }
 
+    @Override
+    public List<Subject> querySubject(Long userId) {
+        return baseMapper.querySubject(userId);
+    }
+
     private HttpResponseResult<Boolean> doCreate(TeacherSubmitReq teacherSubmitReq) throws BizException {
         //判断手机号
         SysUser sysUser = userFeignService.queryUserByMobile(teacherSubmitReq.getPhone());

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

@@ -53,7 +53,7 @@
         </where>
         LIMIT 1
     </select>
-    <select id="queryPage" resultMap="ImGroupMemberAuditDto">
+    <select id="queryAll" resultMap="ImGroupMemberAuditDto">
         SELECT gma.*,su.avatar_,CASE WHEN gma.role_type_ = 'STUDENT' THEN su.username_ ELSE su.real_name_ END username_
         FROM im_group_member_audit gma
         LEFT JOIN sys_user su ON su.id_ = gma.user_id_
@@ -68,6 +68,7 @@
                 AND gma.user_id_ = #{params.userId}
             </if>
         </where>
+        ORDER BY gma.id_ DESC
     </select>
     <select id="findByIds" resultMap="BaseResultMap">
         SELECT <include refid="Base_Column_List"/> FROM im_group_member_audit WHERE FIND_IN_SET(id_,#{auditIds})

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

@@ -0,0 +1,45 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.yonge.cooleshow.biz.dal.dao.TeacherFreeTimeDao">
+    <resultMap id="BaseResultMap" type="com.yonge.cooleshow.biz.dal.entity.TeacherFreeTime">
+        <id column="id_" jdbcType="INTEGER" property="id"/>
+        <result column="teacher_id_" jdbcType="INTEGER" property="teacherId"/>
+        <result column="free_minutes_" jdbcType="INTEGER" property="freeMinutes"/>
+        <result column="course_minutes_" jdbcType="INTEGER" property="courseMinutes"/>
+        <result column="skip_holiday_flag_" property="skipHolidayFlag"/>
+        <result column="subject_price_" jdbcType="VARCHAR" property="subjectPrice"/>
+        <result column="monday_" jdbcType="VARCHAR" property="monday"/>
+        <result column="tuesday_" jdbcType="VARCHAR" property="tuesday"/>
+        <result column="wednesday_" jdbcType="VARCHAR" property="wednesday"/>
+        <result column="thursday_" jdbcType="VARCHAR" property="thursday"/>
+        <result column="friday_" jdbcType="VARCHAR" property="friday"/>
+        <result column="saturday_" jdbcType="VARCHAR" property="saturday"/>
+        <result column="sunday_" jdbcType="VARCHAR" property="sunday"/>
+        <result column="create_time_" jdbcType="TIMESTAMP" property="createTime"/>
+        <result column="update_time_" jdbcType="TIMESTAMP" property="updateTime"/>
+    </resultMap>
+
+    <sql id="Base_Column_List">
+        id_
+        , teacher_id_, free_minutes_, course_minutes_, skip_holiday_flag_, subject_price_, monday_, tuesday_, wednesday_, thursday_, friday_, saturday_, sunday_, create_time_, update_time_
+    </sql>
+
+    <insert id="insertBatch" keyColumn="id_" keyProperty="id" useGeneratedKeys="true"
+            parameterType="com.yonge.cooleshow.biz.dal.entity.TeacherFreeTime">
+        insert into teacher_free_time(teacher_id_, free_minutes_, course_minutes_, skip_holiday_flag_, subject_price_,
+        monday_, tuesday_, wednesday_, thursday_, friday_, saturday_, sunday_, create_time_, update_time_)
+        values
+        <foreach collection="entities" item="entity" separator=",">
+            (#{entity.teacherId}, #{entity.freeMinutes}, #{entity.courseMinutes}, #{entity.skipHolidayFlag},
+            #{entity.subjectPrice}, #{entity.monday}, #{entity.tuesday}, #{entity.wednesday}, #{entity.thursday},
+            #{entity.friday}, #{entity.saturday}, #{entity.sunday}, #{entity.createTime}, #{entity.updateTime})
+        </foreach>
+    </insert>
+    <select id="findOne" resultMap="BaseResultMap">
+        SELECT <include refid="Base_Column_List"/>
+        FROM teacher_free_time WHERE teacher_id_ = #{teacherId}
+        AND free_minutes_ = #{freeMinutes}
+        AND course_minutes_ = #{courseMinutes} LIMIT 1
+    </select>
+
+</mapper>

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

@@ -112,4 +112,9 @@
         ) b on t.user_id_ = b.user_id_
         where t.user_id_ = #{userId}
     </select>
+    <select id="querySubject" resultMap="com.yonge.cooleshow.biz.dal.dao.SubjectDao.Subject">
+        SELECT s.* FROM teacher t
+        LEFT JOIN `subject` s ON FIND_IN_SET(s.id_,t.subject_id_)
+        WHERE t.user_id_ = #{userId}
+    </select>
 </mapper>

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

@@ -23,6 +23,7 @@ import org.springframework.web.bind.annotation.RestController;
 
 import javax.annotation.Resource;
 import javax.validation.Valid;
+import java.util.List;
 import java.util.Map;
 import java.util.Objects;
 
@@ -72,9 +73,9 @@ public class ImGroupMemberAuditController extends BaseController {
     }
 
     @ApiOperation("申请入群列表")
-    @PostMapping(value = "/queryPage")
-    public HttpResponseResult<PageInfo<ImGroupMemberAudit>> queryPage(@Valid @RequestBody ImGroupMemberAuditQueryInfo queryInfo){
-        return succeed(imGroupMemberAuditService.queryPage(queryInfo));
+    @PostMapping(value = "/queryAll")
+    public HttpResponseResult<List<ImGroupMemberAudit>> queryAll(@Valid @RequestBody ImGroupMemberAuditQueryInfo queryInfo){
+        return succeed(imGroupMemberAuditService.queryAll(queryInfo));
     }
 
 }

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

@@ -1,22 +1,23 @@
 package com.yonge.cooleshow.teacher.controller;
 
-import com.yonge.cooleshow.biz.dal.dto.req.UserSetReq;
-import com.yonge.cooleshow.biz.dal.vo.TeacherHomeVo;
-import com.yonge.cooleshow.biz.dal.vo.TeacherVo;
-import com.yonge.cooleshow.biz.dal.vo.UserSetVo;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.http.HttpStatus;
-import org.springframework.web.bind.annotation.*;
-
 import com.yonge.cooleshow.auth.api.client.SysUserFeignService;
 import com.yonge.cooleshow.auth.api.entity.SysUser;
+import com.yonge.cooleshow.biz.dal.entity.Subject;
 import com.yonge.cooleshow.biz.dal.entity.Teacher;
 import com.yonge.cooleshow.biz.dal.service.TeacherService;
+import com.yonge.cooleshow.biz.dal.vo.TeacherHomeVo;
 import com.yonge.cooleshow.common.controller.BaseController;
 import com.yonge.cooleshow.common.entity.HttpResponseResult;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+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 java.util.List;
 
 @RestController
 @RequestMapping("/Teacher")
@@ -64,4 +65,14 @@ public class TeacherController extends BaseController {
         }
         return  teacherService.openLive(user.getId());
     }
+
+    @ApiOperation(value = "获取老师可授课声部列表")
+    @PostMapping("/querySubject")
+    public HttpResponseResult<List<Subject>> querySubject(){
+        SysUser user = sysUserFeignService.queryUserInfo();
+        if (user == null) {
+            return failed(HttpStatus.FORBIDDEN, "请登录");
+        }
+        return succeed(teacherService.querySubject(user.getId()));
+    }
 }

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

@@ -0,0 +1,54 @@
+package com.yonge.cooleshow.teacher.controller;
+
+
+import com.yonge.cooleshow.auth.api.client.SysUserFeignService;
+import com.yonge.cooleshow.auth.api.entity.SysUser;
+import com.yonge.cooleshow.biz.dal.entity.Subject;
+import com.yonge.cooleshow.biz.dal.entity.TeacherFreeTime;
+import com.yonge.cooleshow.biz.dal.service.TeacherFreeTimeService;
+import com.yonge.cooleshow.common.controller.BaseController;
+import com.yonge.cooleshow.common.entity.HttpResponseResult;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.http.HttpStatus;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.annotation.Resource;
+import javax.validation.Valid;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 老师可排课时间表(TeacherFreeTime)表控制层
+ *
+ * @author zx
+ * @since 2022-03-25 10:04:26
+ */
+@Api(tags = "老师可排课时间表")
+@RestController
+@RequestMapping("/teacherFreeTime")
+public class TeacherFreeTimeController extends BaseController {
+    /**
+     * 服务对象
+     */
+    @Resource
+    private TeacherFreeTimeService teacherFreeTimeService;
+    @Resource
+    private SysUserFeignService sysUserFeignService;
+
+    @ApiOperation(value = "新增、修改老师陪练课设置")
+    @PostMapping("/upSet")
+    public HttpResponseResult upSet(@Valid @RequestBody TeacherFreeTime teacherFreeTime){
+        SysUser user = sysUserFeignService.queryUserInfo();
+        if (user == null) {
+            return failed(HttpStatus.FORBIDDEN, "请登录");
+        }
+        teacherFreeTime.setTeacherId(user.getId());
+        teacherFreeTimeService.upSet(teacherFreeTime);
+        return succeed();
+    }
+}
+