Merge remote-tracking branch 'origin/master'

cooleshow-auth/auth-server/src/main/resources/config/mybatis/SysMenuMapper.xml

@@ -43,14 +43,23 @@
     <insert id="insert" parameterType="com.yonge.cooleshow.auth.api.entity.SysMenu" useGeneratedKeys="true" keyColumn="id"
             keyProperty="id">
         INSERT INTO sys_menu
-        (id_,name_,permission_,path_,parent_id_,icon_,component_,sort_,type_,create_time_,update_time_,hidden_,parent_permission_,memo_,keep_alive_)
-        VALUES(#{id},#{name},#{permission},#{path},#{parentId},#{icon},#{component},#{sort},#{type},now(),now(),#{hid},#{parentPermission},#{memo},#{keepAlive})
+        (id_,name_,permission_,path_,parent_id_,icon_,component_,sort_,type_,create_time_,update_time_,hidden_,parent_permission_,memo_,keep_alive_,is_affix_,is_iframe_,link_path_)
+        VALUES(#{id},#{name},#{permission},#{path},#{parentId},#{icon},#{component},#{sort},#{type},now(),now(),#{hid},#{parentPermission},#{memo},#{keepAlive},#{isAffix},#{isIframe},#{linkPath})
     </insert>
 
     <!-- 根据主键查询一条记录 -->
     <update id="update" parameterType="com.yonge.cooleshow.auth.api.entity.SysMenu">
         UPDATE sys_menu
         <set>
+            <if test="isAffix != null">
+                is_affix_ = #{isAffix},
+            </if>
+            <if test="isIframe != null">
+                is_iframe_ = #{isIframe},
+            </if>
+            <if test="linkPath != null">
+                link_path_ = #{linkPath},
+            </if>
             <if test="parentId != null">
                 parent_id_ = #{parentId},
             </if>

cooleshow-user/user-admin/src/main/java/com/yonge/cooleshow/admin/controller/MusicSheetController.java

@@ -133,12 +133,17 @@ public class MusicSheetController extends BaseController {
             } else {
                 pageSize = musicSheetDto.getPageSize();
             }
-
+            String search;
+            if(musicSheetDto.getSearch()==null){
+                search = "";
+            } else {
+                search = musicSheetDto.getSearch();
+            }
             LambdaQueryWrapper<MusicSheet> lambdaQueryWrapper = Wrappers.lambdaQuery();
-            lambdaQueryWrapper.or().like(MusicSheet::getMusicSheetName , musicSheetDto.getSearch());
-            lambdaQueryWrapper.or().like(MusicSheet::getComposer , musicSheetDto.getSearch());
-            lambdaQueryWrapper.or().like(MusicSheet::getMusicTag , musicSheetDto.getSearch());
-            lambdaQueryWrapper.or().like(MusicSheet::getMusicSubject , musicSheetDto.getSearch());
+            lambdaQueryWrapper.or().like(MusicSheet::getMusicSheetName , search);
+            lambdaQueryWrapper.or().like(MusicSheet::getComposer , search);
+            lambdaQueryWrapper.or().like(MusicSheet::getMusicTag , search);
+            lambdaQueryWrapper.or().like(MusicSheet::getMusicSubject , search);
 
             Page<MusicSheet> page = new Page<>(pageNo,pageSize);
             return succeed(musicSheetService.page(page, lambdaQueryWrapper));

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/constant/LiveRoomConstant.java

@@ -0,0 +1,26 @@
+package com.yonge.cooleshow.biz.dal.constant;
+
+public interface LiveRoomConstant {
+
+    //替换的字符串
+    String USER_ID = "${userId}";
+
+    //替换的字符串
+    String ROOM_UID = "${roomUid}";
+
+    //缓存排头
+    String COOLESHOW = "COOLESHOW";
+
+    //直播间累计用户信息-指只要进入到该房间的用户都要记录
+    String LIVE_ROOM_TOTAL_USER_LIST = String.join(":", COOLESHOW, "LIVE_ROOM_TOTAL_USER_LIST", ROOM_UID);
+
+    //用户当前对应的直播间Uid
+    String LIVE_USER_ROOM = String.join(":", COOLESHOW, "LIVE_ROOM_USER", USER_ID);
+
+    //房间点赞数
+    String LIVE_ROOM_LIKE = String.join(":", COOLESHOW, "LIVE_ROOM_LIKE", ROOM_UID);
+
+    //房间的信息
+    String LIVE_ROOM_INFO = String.join(":", COOLESHOW, "LIVE_ROOM_INFO", ROOM_UID);
+
+}

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

@@ -28,5 +28,14 @@ public interface TeacherFreeTimeDao extends BaseMapper<TeacherFreeTime> {
     TeacherFreeTime findOne(@Param("teacherId") Long teacherId,
                             @Param("courseMinutes") Integer courseMinutes,
                             @Param("freeMinutes") Integer freeMinutes);
+
+    /**
+    * @description: 修改默认配置
+     * @param defaultFlag
+    * @return void
+    * @author zx
+    * @date 2022/3/29 10:02
+    */
+    void updateDefaultFlag(@Param("defaultFlag") boolean defaultFlag, @Param("teacherId") Long teacherId);
 }
 

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

@@ -75,7 +75,7 @@ public class MusicSheet extends BaseEntity {
     private Integer chargeType;  //收费类型(0:免费;1:会员;2:单曲收费)
 
     @TableField("audit_status_")
-    @ApiModelProperty(value = "审核状态")
+    @ApiModelProperty(value = "审核状态(0:待审核;1:通过;2:未通过)")
     private Integer auditStatus;  //审核状态(0:待审核;1:通过;2:未通过)
 
     @TableField("sort_number_")

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

@@ -75,6 +75,10 @@ public class TeacherFreeTime implements Serializable {
     @ApiModelProperty(value = "周日;")
     private String sunday;
 
+    @TableField("default_flag_")
+    @ApiModelProperty(value = "是否默认配置")
+    private Boolean defaultFlag = true;
+
     @TableField("create_time_")
     @ApiModelProperty(value = "创建时间;")
     private Date createTime;
@@ -83,6 +87,13 @@ public class TeacherFreeTime implements Serializable {
     @ApiModelProperty(value = "修改时间;")
     private Date updateTime;
 
+    public Boolean getDefaultFlag() {
+        return defaultFlag;
+    }
+
+    public void setDefaultFlag(Boolean defaultFlag) {
+        this.defaultFlag = defaultFlag;
+    }
 
     public Long getId() {
         return id;

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

@@ -38,6 +38,8 @@ public class TeacherFreeTimeServiceImpl extends ServiceImpl<TeacherFreeTimeDao,
         if(Objects.nonNull(oldTeacherFreeTime)){
             baseMapper.deleteById(oldTeacherFreeTime.getId());
         }
+        //将其他配置改为非默认
+        baseMapper.updateDefaultFlag(false,teacherFreeTime.getTeacherId());
         Date date = new Date();
         teacherFreeTime.setCreateTime(date);
         teacherFreeTime.setUpdateTime(date);

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/support/WrapperUtil.java

@@ -105,6 +105,13 @@ public class WrapperUtil {
     }
 
     /**
+     * 检查对象是否有值
+     */
+    public static <T> void checkObj(T obj, String errMsg) {
+        Optional.ofNullable(obj).orElseThrow(() -> new BizException(errMsg));
+    }
+
+    /**
      * 全部有值则为true
      *
      * @param obj 多个对象
@@ -187,4 +194,45 @@ public class WrapperUtil {
                 .orElse(new HashMap<String, Object>());
     }
 
+    /**
+     * 判断2个时间段是否有交集-默认允许结束时间和开始时间相等
+     *
+     * @param startDateOne 第一个时间段的开始时间
+     * @param endDateOne   第一个时间段的结束时间
+     * @param startDateTwo 第二个时间段的开始时间
+     * @param endDateTwo   第二个时间段的结束时间
+     * @return 有交集 true 无交集 false
+     */
+    public static Boolean inInterSection(Date startDateOne, Date endDateOne, Date startDateTwo, Date endDateTwo) {
+        return inInterSection(startDateOne, endDateOne, startDateTwo, endDateTwo, true);
+    }
+
+    /**
+     * 判断2个时间段是否有交集
+     *
+     * @param startDateOne 第一个时间段的开始时间
+     * @param endDateOne   第一个时间段的结束时间
+     * @param startDateTwo 第二个时间段的开始时间
+     * @param endDateTwo   第二个时间段的结束时间
+     * @param eq           是否允许结束时间和开始时间相等 true 允许
+     * @return 有交集 true 无交集 false
+     */
+    public static Boolean inInterSection(Date startDateOne, Date endDateOne, Date startDateTwo, Date endDateTwo, boolean eq) {
+        Date maxStartDate = startDateOne;
+        if (maxStartDate.before(startDateTwo)) {
+            maxStartDate = startDateTwo;
+        }
+
+        Date minEndDate = endDateOne;
+        if (endDateTwo.before(minEndDate)) {
+            minEndDate = endDateTwo;
+        }
+        //是否允许结束时间和开始时间相等 true 允许
+        if (eq) {
+            return maxStartDate.before(minEndDate);
+        } else {
+            return maxStartDate.before(minEndDate) || (maxStartDate.getTime() == minEndDate.getTime());
+        }
+    }
+
 }

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

@@ -15,26 +15,31 @@
         <result column="friday_" jdbcType="VARCHAR" property="friday"/>
         <result column="saturday_" jdbcType="VARCHAR" property="saturday"/>
         <result column="sunday_" jdbcType="VARCHAR" property="sunday"/>
+        <result column="default_flag_" property="defaultFlag"/>
         <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_
+        , teacher_id_, free_minutes_, course_minutes_, skip_holiday_flag_, subject_price_,
+    monday_, tuesday_, wednesday_, thursday_, friday_, saturday_, sunday_,default_flag_,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_)
+        monday_, tuesday_, wednesday_, thursday_, friday_, saturday_, sunday_,default_flag_, 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})
+            #{entity.friday}, #{entity.saturday}, #{entity.sunday}, #{entity.defaultFlag},NOW(),NOW())
         </foreach>
     </insert>
+    <update id="updateDefaultFlag">
+        UPDATE teacher_free_time SET default_flag_ = #{defaultFlag} WHERE teacher_id_ = #{teacherId}
+    </update>
     <select id="findOne" resultMap="BaseResultMap">
         SELECT <include refid="Base_Column_List"/>
         FROM teacher_free_time WHERE teacher_id_ = #{teacherId}