Merge branch 'dev_v1.3.6_20221021'

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

@@ -31,17 +31,6 @@ public interface MusicTagDao extends BaseMapper<MusicTag> {
 	List<MusicTagVo> selectPage(@Param("page") IPage page, @Param("param") MusicTagSearch musicTag);
 
 	/**
-	 * 根据父级id查询子级列表
-	 *
-	 * @param id        父级id
-	 * @param state     状态
-	 * @param idAndName 标签编号/名称
-	 * @return List
-	 */
-	List<MusicTagVo> getChildren(@Param("id") Long id, @Param("state") YesOrNoEnum state, @Param("idAndName") String idAndName);
-
-
-	/**
 	 * 根据父级id集合查询子集标签
 	 *
 	 * @param longList 父级id集合
@@ -65,5 +54,5 @@ public interface MusicTagDao extends BaseMapper<MusicTag> {
 	 * @param longs
 	 * @return
 	 */
-    Integer checkTagBeUsedMusicAblum(@Param("longs") List<Long> longs);
+    Integer checkTagBeUsedMusicAlbum(@Param("longs") List<Long> longs);
 }

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

@@ -3,6 +3,7 @@ package com.yonge.cooleshow.biz.dal.service;
 import com.yonge.cooleshow.biz.dal.entity.MusicFavorite;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.yonge.cooleshow.biz.dal.enums.ClientEnum;
+import com.yonge.cooleshow.common.enums.YesOrNoEnum;
 
 import java.util.List;
 
@@ -31,4 +32,13 @@ public interface MusicFavoriteService extends IService<MusicFavorite> {
      * @return
      */
     long getMusicSheetFavoriteNum(Long musicSheetId);
+
+    /**
+     * 检查是否收藏曲目
+     *
+     * @param musicSheetId 曲目id
+     * @param userId 用户id
+     * @param userType 用户类型 老师 学生
+     */
+    YesOrNoEnum checkFavorite(Long musicSheetId, Long userId, ClientEnum userType);
 }

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

@@ -5,6 +5,7 @@ import com.yonge.cooleshow.biz.dal.entity.MusicFavorite;
 import com.yonge.cooleshow.biz.dal.dao.MusicFavoriteDao;
 import com.yonge.cooleshow.biz.dal.enums.ClientEnum;
 import com.yonge.cooleshow.biz.dal.service.MusicFavoriteService;
+import com.yonge.cooleshow.common.enums.YesOrNoEnum;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.stereotype.Service;
@@ -46,4 +47,14 @@ public class MusicFavoriteServiceImpl extends ServiceImpl<MusicFavoriteDao,Music
         return  baseMapper.selectMusicSheetFavoriteNum(musicSheetId);
 
     }
+
+    @Override
+    public YesOrNoEnum checkFavorite(Long musicSheetId, Long userId, ClientEnum userType) {
+        return this.lambdaQuery()
+                .eq(MusicFavorite::getUserId,userId)
+                .eq(MusicFavorite::getMusicSheetId,musicSheetId)
+                .eq(MusicFavorite::getClientType,userType)
+                .count() >0?YesOrNoEnum.YES:YesOrNoEnum.NO;
+
+    }
 }

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

@@ -267,6 +267,16 @@ public class MusicSheetServiceImpl extends ServiceImpl<MusicSheetDao, MusicSheet
         if (sysUser == null) {
             return detail;
         }
+
+        // 收藏
+        YesOrNoEnum favorite = musicFavoriteService.checkFavorite(id,sysUser.getId(),userType);
+        detail.setFavorite(favorite);
+
+        // 收藏人数
+        long musicSheetFavoriteNum = musicFavoriteService.getMusicSheetFavoriteNum(id);
+        detail.setFavoriteCount(musicSheetFavoriteNum);
+
+        // 播放状态
         if (AuthStatusEnum.UNPASS.getCode().equals(detail.getAuditStatus().getCode())) {
             String reason = musicSheetAuthRecordService.selectAuditReason(id);
             detail.setReason(reason);

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

@@ -9,7 +9,6 @@ import com.yonge.cooleshow.biz.dal.dao.MusicTagDao;
 import com.yonge.cooleshow.biz.dal.dto.MusicTagSaveDto;
 import com.yonge.cooleshow.biz.dal.dto.search.MusicTagSearch;
 import com.yonge.cooleshow.biz.dal.entity.MusicTag;
-import com.yonge.cooleshow.biz.dal.service.MusicSheetService;
 import com.yonge.cooleshow.biz.dal.service.MusicTagService;
 import com.yonge.cooleshow.biz.dal.vo.MusicTagVo;
 import com.yonge.cooleshow.common.enums.YesOrNoEnum;
@@ -35,8 +34,6 @@ public class MusicTagServiceImpl extends ServiceImpl<MusicTagDao, MusicTag> impl
     @Autowired
     private SysUserFeignService sysUserFeignService;
 
-    private MusicSheetService musicSheetService;
-
 	@Override
     public MusicTagVo detail(Long id) {
         return baseMapper.detail(id);
@@ -102,10 +99,8 @@ public class MusicTagServiceImpl extends ServiceImpl<MusicTagDao, MusicTag> impl
 
         List<Long> longs = new ArrayList<>();
         longs.add(musicTagId);
-        if (baseMapper.checkTagBeUsedMusicAblum(longs) >0) return true;
-        if (baseMapper.checkTagBeUsedMusicSheet(longs) >0) return true;
-
-        return false;
+        if (baseMapper.checkTagBeUsedMusicAlbum(longs) >0) return true;
+        return baseMapper.checkTagBeUsedMusicSheet(longs) > 0;
 
     }
 
@@ -212,13 +207,12 @@ public class MusicTagServiceImpl extends ServiceImpl<MusicTagDao, MusicTag> impl
         if (list == null) {
             return new ArrayList<>();
         }
-        List<MusicTagVo> musicTagVoList = list.stream().map(musicTag -> {
+
+        return list.stream().map(musicTag -> {
             MusicTagVo musicTagVo = new MusicTagVo();
             BeanUtils.copyProperties(musicTag, musicTagVo);
             return musicTagVo;
         }).collect(Collectors.toList());
-
-        return musicTagVoList;
     }
 
     @Override

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

@@ -55,23 +55,11 @@ public class SysMusicCompareRecordServiceImpl extends BaseServiceImpl<Long, SysM
 	private final static Logger log = LoggerFactory.getLogger(SysMusicCompareRecordServiceImpl.class);
 	@Autowired
 	private SysMusicCompareRecordDao sysMusicCompareRecordDao;
-	@Autowired
-	private TeacherDao teacherDao;
-	@Autowired
-	private StudentDao studentDao;
-	@Autowired
-	private SysMessageService sysMessageService;
-	
-    @Autowired
-    private SysUserFeignService sysUserFeignService;
 
 	@Autowired
 	private SysConfigService sysConfigService;
 
 	@Autowired
-	private ActivityEvaluationRecordService activityEvaluationRecordService;
-
-	@Autowired
 	private MusicSheetDao musicSheetDao;
 
 	@Override
@@ -82,9 +70,8 @@ public class SysMusicCompareRecordServiceImpl extends BaseServiceImpl<Long, SysM
 	@Override
 	public long insert(SysMusicCompareRecord bean) {
 		// 保存评测记录
-		long insert = super.insert(bean);
 
-		return insert;
+		return super.insert(bean);
 	}
 
 	@Override

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/vo/MusicSheetDetailVo.java

@@ -23,6 +23,13 @@ public class MusicSheetDetailVo extends MusicSheet {
     @ApiModelProperty("是否能播放（0：否，1：是） 学生端进入小酷Ai判断 试用/完整 播放")
     private YesOrNoEnum play;
 
+
+    @ApiModelProperty("收藏0：否，1：是")
+    private YesOrNoEnum favorite;
+
+    @ApiModelProperty("收藏人数")
+    private Long favoriteCount;
+
     @ApiModelProperty("订单状态(WAIT_PAY:待支付;PAYING:支付中,PAID:已付款)")
     private OrderStatusEnum orderStatus;
 
@@ -65,6 +72,22 @@ public class MusicSheetDetailVo extends MusicSheet {
     @ApiModelProperty("审核理由")
     private String auditReason;
 
+    public Long getFavoriteCount() {
+        return favoriteCount;
+    }
+
+    public void setFavoriteCount(Long favoriteCount) {
+        this.favoriteCount = favoriteCount;
+    }
+
+    public YesOrNoEnum getFavorite() {
+        return favorite;
+    }
+
+    public void setFavorite(YesOrNoEnum favorite) {
+        this.favorite = favorite;
+    }
+
     public String getRealName() {
         return realName;
     }

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

@@ -53,37 +53,13 @@
             </if>
             <if test="param.idAndName != null and param.idAndName != ''">
                 and ( t.id_ like concat( '%',#{param.idAndName},'%') or
-                    t.name_ like  concat ('%',#{param.idAndName},'%') or
-                    exists(select mt.parent_tag_id_ from music_tag mt
-                        where (mt.name_ like concat( '%',#{param.idAndName},'%') or mt.id_ like concat('%',#{param.idAndName},'%') )
-                        and mt.parent_tag_id_ = t.id_ and mt.del_flag_ = 0
-                    )
+                    t.name_ like  concat ('%',#{param.idAndName},'%')
                     )
             </if>
         </where>
         order by  t.sort_number_ desc
 	</select>
 
-	<select id="getChildren" resultType="com.yonge.cooleshow.biz.dal.vo.MusicTagVo">
-        SELECT
-        <include refid="baseColumns" />,
-        su.username_ as updateName
-        FROM music_tag t
-        left join sys_user su on t.update_by_ = su.id_
-        <where>
-            t.del_flag_ = 0
-            <if test="id != null">
-                and t.parent_tag_id_ = #{id}
-            </if>
-            <if test="state != null">
-                and t.state_ = #{state}
-            </if>
-            <if test="idAndName != null and idAndName != ''">
-                and ( t.id_ like concat( '%',#{idAndName},'%') or
-                t.name_ like  concat ('%',#{idAndName},'%')
-            </if>
-        </where>
-    </select>
 
 	<select id="getChildrenByParentIdList" resultType="com.yonge.cooleshow.biz.dal.vo.MusicTagVo">
         SELECT
@@ -123,7 +99,7 @@
         </where>
     </select>
 
-    <select id="checkTagBeUsedMusicAblum" resultType="java.lang.Integer">
+    <select id="checkTagBeUsedMusicAlbum" resultType="java.lang.Integer">
 
         select count(1) from music_album ms
         <where>

service.md

@@ -1,8 +1,8 @@
 - [ ] gateway-server
 - [ ] auth-server
-- [x] admin-server
-- [ ] teacher-server
-- [ ] student-server
+- [ ] admin-server
+- [x] teacher-server
+- [x] student-server
 - [ ] website-server
 - [ ] task-server
 - [ ] websocket-server