Merge branch 'tag_album_20221011'

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

@@ -69,12 +69,7 @@ public class MusicTagController extends BaseController {
 	@ApiOperation(value = "新增", httpMethod="POST", consumes="application/json", produces="application/json")
 	@PreAuthorize("@pcs.hasPermissions('MusicTag/save')")
 	public HttpResponseResult<Boolean> save(@Validated(MusicTagSaveDto.Create.class) @RequestBody MusicTagSaveDto musicTagSaveDto) {
-		if (musicTagSaveDto.getParentTagId() != null && musicTagSaveDto.getParentTagId() != 0) {
-			MusicTag musicTag = musicTagService.getById(musicTagSaveDto.getParentTagId());
-			if (musicTag.getParentTagId() != 0) {
-				return failed("标签只能有两级");
-			}
-		}
+
 		return succeed(musicTagService.createMusicTag(musicTagSaveDto));
 	}
 
@@ -85,12 +80,6 @@ public class MusicTagController extends BaseController {
 	@ApiOperation(value = "修改", httpMethod="POST", consumes="application/json", produces="application/json")
 	@PreAuthorize("@pcs.hasPermissions('MusicTag/update')")
 	public HttpResponseResult<Boolean> update(@Validated(MusicTagSaveDto.Update.class) @RequestBody MusicTagSaveDto musicTagSaveDto) {
-		if (musicTagSaveDto.getParentTagId() != null && musicTagSaveDto.getParentTagId() != 0) {
-			MusicTag musicTag = musicTagService.getById(musicTagSaveDto.getParentTagId());
-			if (musicTag.getParentTagId() != 0) {
-				return failed("标签只能有两级");
-			}
-		}
 		return succeed(musicTagService.updateMusicTag(musicTagSaveDto));
 	}
 

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

@@ -45,46 +45,7 @@ public class MusicTagServiceImpl extends ServiceImpl<MusicTagDao, MusicTag> impl
      @Override
     public IPage<MusicTagVo> selectPage(IPage<MusicTagVo> page, MusicTagSearch query){
          IPage<MusicTagVo> musicTagVoIPage = page.setRecords(baseMapper.selectPage(page, query));
-         // 将父类的id 拿出来，集体查出子集
-         List<Long> longList = musicTagVoIPage
-                 .getRecords()
-                 .stream()
-                 .map(MusicTag::getId)
-                 .collect(Collectors.toList());
-
-         List<MusicTagVo> musicTagVoList = musicTagDao.getChildrenByParentIdList(longList,query.getState());
-
-         // 根据父级id， 将子集分类
-         Map<String, List<MusicTagVo>> musicTagMap = musicTagVoList.stream()
-                                                                .collect(Collectors.groupingBy( vo -> vo.getParentTagId().toString()));
-         musicTagVoIPage.getRecords()
-                 .forEach(musicTagVo -> {
-                     List<MusicTagVo> childrenList = musicTagMap.get(musicTagVo.getId().toString());
-                     if (CollectionUtils.isEmpty(childrenList)) {
-                         return;
-                     }
-                     childrenList.forEach(children -> {
-                         musicTagVo.setEnablePlatformMusicSheetNum(musicTagVo.getEnablePlatformMusicSheetNum() + children.getEnablePlatformMusicSheetNum());
-                         musicTagVo.setEnableTeacherMusicSheetNum(musicTagVo.getEnableTeacherMusicSheetNum() + children.getEnableTeacherMusicSheetNum());
-                         musicTagVo.setMusicPlatformSheetNum(musicTagVo.getMusicPlatformSheetNum() + children.getMusicPlatformSheetNum());
-                         musicTagVo.setMusicTeacherSheetNum(musicTagVo.getMusicTeacherSheetNum() + children.getMusicTeacherSheetNum());
-                     });
-                     // 如果没有按名称/编号查询 或 父级标签包含了名称/编号 ， 展示所有子集 标签列表子集收起
-                     if (StringUtil.isBlank(query.getIdAndName())
-                             || musicTagVo.getName().contains(query.getIdAndName())
-                             || musicTagVo.getId().toString().contains(query.getIdAndName())) {
-                         musicTagVo.setChildren(childrenList);
-                     } else {
-                         // 如果名称查询中，父级不包含名称/编号，子集包含，只展示包含的子集，并且默认展开子集列表
-                         musicTagVo.setOpen(YesOrNoEnum.YES);
-                         List<MusicTagVo> childrenNameList = childrenList.stream()
-                                                                .filter(vo -> vo.getName().contains(query.getIdAndName())
-                                                                        ||vo.getId().toString().contains(query.getIdAndName()))
-                                                                .collect(Collectors.toList());
-                         musicTagVo.setChildren(childrenNameList);
-                     }
-                 });
-         return musicTagVoIPage;
+        return musicTagVoIPage;
      }
 
     @Override
@@ -113,14 +74,7 @@ public class MusicTagServiceImpl extends ServiceImpl<MusicTagDao, MusicTag> impl
      */
     private boolean checkTagBeUsed(Long musicTagId) {
 
-        List<MusicTag> list = this.lambdaQuery()
-                                  .eq(MusicTag::getParentTagId, musicTagId)
-                                  .eq(MusicTag::getDelFlag, false)
-                                  .list();
-        List<Long> longs = list.stream().map(MusicTag::getId).collect(Collectors.toList());
-        if (CollectionUtils.isEmpty(longs)) {
-            longs = new ArrayList<>();
-        }
+        List<Long> longs = new ArrayList<>();
         longs.add(musicTagId);
         if (baseMapper.checkTagBeUsedMusicAblum(longs) >0) return true;
         if (baseMapper.checkTagBeUsedMusicSheet(longs) >0) return true;
@@ -138,22 +92,9 @@ public class MusicTagServiceImpl extends ServiceImpl<MusicTagDao, MusicTag> impl
         }
         MusicTag musicTag = new MusicTag();
         musicTag.setId(musicTagId);
-        if (tag.getState().getCode().equals(YesOrNoEnum.NO.getCode())) {
-            musicTag.setState(YesOrNoEnum.YES);
-            return this.updateById(musicTag);
-        } else {
-            // 一级停用，二级也停用
-            if (musicTag.getParentTagId() == null || musicTag.getParentTagId() ==0) {
-                return this.lambdaUpdate()
-                    .eq(MusicTag::getParentTagId,musicTagId)
-                    .or(wrapper -> wrapper.eq(MusicTag::getId,musicTagId))
-                    .set(MusicTag::getState,YesOrNoEnum.NO)
-                    .update();
-            } else {
-                musicTag.setState(YesOrNoEnum.NO);
-                return this.updateById(musicTag);
-            }
-        }
+        musicTag.setState(YesOrNoEnum.YES);
+        return this.updateById(musicTag);
+
     }
 
     @Override
@@ -248,22 +189,7 @@ public class MusicTagServiceImpl extends ServiceImpl<MusicTagDao, MusicTag> impl
             return musicTagVo;
         }).collect(Collectors.toList());
 
-        List<MusicTagVo> tree = new ArrayList<>();
-        for (MusicTagVo musicTagVo : musicTagVoList) {
-            if (musicTagVo.getParentTagId() == null || musicTagVo.getParentTagId() == 0) {
-                tree.add(musicTagVo);
-            }
-            for (MusicTagVo tagVo : musicTagVoList) {
-                if (tagVo.getParentTagId() != null && tagVo.getParentTagId() != 0
-                        && tagVo.getParentTagId().equals(musicTagVo.getId())) {
-                    if (musicTagVo.getChildren() == null) {
-                        musicTagVo.setChildren(new ArrayList<>());
-                    }
-                    musicTagVo.getChildren().add(tagVo);
-                }
-            }
-        }
-        return tree;
+        return musicTagVoList;
     }
 
     @Override

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

@@ -42,7 +42,7 @@
 		FROM music_tag t
         left join sys_user su on t.update_by_ = su.id_
         <where>
-            t.parent_tag_id_ = 0 and t.del_flag_ = 0
+            t.del_flag_ = 0
             <if test="param.state != null">
                 and t.state_ = #{param.state}
             </if>