update: 修改枚举统一

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

@@ -1,28 +1,25 @@
 package com.yonge.cooleshow.admin.controller;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
-
-import javax.validation.Valid;
-
+import com.yonge.cooleshow.auth.api.client.SysUserFeignService;
+import com.yonge.cooleshow.auth.api.entity.SysUser;
 import com.yonge.cooleshow.biz.dal.dto.search.MusicAlbumDetailSearch;
 import com.yonge.cooleshow.biz.dal.dto.search.MusicAlbumSearch;
-import com.yonge.cooleshow.biz.dal.enums.StateEnum;
+import com.yonge.cooleshow.biz.dal.entity.MusicAlbum;
+import com.yonge.cooleshow.biz.dal.enums.YesOrNoEnum;
+import com.yonge.cooleshow.biz.dal.service.MusicAlbumService;
 import com.yonge.cooleshow.biz.dal.support.PageUtil;
 import com.yonge.cooleshow.biz.dal.vo.AlbumDetailVo;
 import com.yonge.cooleshow.biz.dal.vo.MusicAlbumVo;
+import com.yonge.cooleshow.common.controller.BaseController;
+import com.yonge.cooleshow.common.entity.HttpResponseResult;
 import com.yonge.cooleshow.common.page.PageInfo;
 import com.yonge.toolset.utils.string.StringUtil;
 import io.swagger.annotations.*;
-import org.springframework.web.bind.annotation.*;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.RequestMapping;
-import com.yonge.cooleshow.common.controller.BaseController;
-import com.yonge.cooleshow.common.entity.HttpResponseResult;
-import com.yonge.cooleshow.biz.dal.entity.MusicAlbum;
-import com.yonge.cooleshow.biz.dal.service.MusicAlbumService;
-import com.yonge.cooleshow.auth.api.entity.SysUser;
-import com.yonge.cooleshow.auth.api.client.SysUserFeignService;
+import org.springframework.web.bind.annotation.*;
 
+import javax.validation.Valid;
 import java.util.Date;
 
 /**
@@ -51,7 +48,7 @@ public class MusicAlbumController extends BaseController {
 
         musicAlbum.setCreateBy(sysUser.getId());
         musicAlbum.setCreateTime(new Date());
-        musicAlbum.setAlbumStatus(StateEnum.STOP);
+        musicAlbum.setAlbumStatus(YesOrNoEnum.NO);
         return succeed(musicAlbumService.createMusicAlbum(musicAlbum));
     }
 
@@ -127,7 +124,7 @@ public class MusicAlbumController extends BaseController {
     public HttpResponseResult<AlbumDetailVo> detailAddMusicSheet(@Valid @RequestBody MusicAlbumDetailSearch query) {
 
         query.setType(1);
-        query.setState(StateEnum.ENABLE);
+        query.setState(YesOrNoEnum.YES);
         AlbumDetailVo albumDetailVo = musicAlbumService.detail(PageUtil.getPage(query),query);
         return succeed(albumDetailVo);
     }

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

@@ -96,7 +96,7 @@ public class MusicSheetController extends BaseController {
             BeanUtils.copyProperties(musicSheetDto, musicSheet);
             musicSheet.setCreateBy(sysUser.getId());
             musicSheet.setCreateTime(new Date());
-            musicSheet.setState(StateEnum.STOP);
+            musicSheet.setState(YesOrNoEnum.NO);
             musicSheetService.save(musicSheet);
         }
 

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

@@ -1,14 +1,14 @@
 package com.yonge.cooleshow.biz.dal.dao;
 
-import java.util.List;
-
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.yonge.cooleshow.biz.dal.enums.StateEnum;
-import org.apache.ibatis.annotations.Param;
+import com.yonge.cooleshow.biz.dal.dto.search.MusicTagSearch;
 import com.yonge.cooleshow.biz.dal.entity.MusicTag;
+import com.yonge.cooleshow.biz.dal.enums.YesOrNoEnum;
 import com.yonge.cooleshow.biz.dal.vo.MusicTagVo;
-import com.yonge.cooleshow.biz.dal.dto.search.MusicTagSearch;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
 
 
 public interface MusicTagDao extends BaseMapper<MusicTag> {
@@ -38,7 +38,7 @@ public interface MusicTagDao extends BaseMapper<MusicTag> {
 	 * @param idAndName 标签编号/名称
 	 * @return List
 	 */
-	List<MusicTagVo> getChildren(@Param("id") Long id, @Param("state") StateEnum state, @Param("idAndName") String idAndName);
+	List<MusicTagVo> getChildren(@Param("id") Long id, @Param("state") YesOrNoEnum state, @Param("idAndName") String idAndName);
 
 
 	/**
@@ -48,5 +48,5 @@ public interface MusicTagDao extends BaseMapper<MusicTag> {
 	 * @param state    状态
 	 * @return 子集集合
 	 */
-	List<MusicTagVo> getChildrenByParentIdList(@Param("longList") List<Long> longList, @Param("state") StateEnum state);
+	List<MusicTagVo> getChildrenByParentIdList(@Param("longList") List<Long> longList, @Param("state") YesOrNoEnum state);
 }

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

@@ -1,6 +1,5 @@
 package com.yonge.cooleshow.biz.dal.dto.search;
 
-import com.yonge.cooleshow.biz.dal.enums.StateEnum;
 import com.yonge.cooleshow.biz.dal.enums.YesOrNoEnum;
 import com.yonge.cooleshow.common.page.QueryInfo;
 import com.yonge.toolset.utils.string.StringUtil;
@@ -29,7 +28,7 @@ public class MusicAlbumSearch extends QueryInfo{
     private List<Long> albumTagIdList;
 
     @ApiModelProperty("专辑状态0：停用，1：启用")
-    private StateEnum albumStatus;
+    private YesOrNoEnum albumStatus;
 
     public String getIdAndName() {
         return idAndName;
@@ -58,11 +57,11 @@ public class MusicAlbumSearch extends QueryInfo{
         this.albumTagIdList = albumTagIdList;
     }
 
-    public StateEnum getAlbumStatus() {
+    public YesOrNoEnum getAlbumStatus() {
         return albumStatus;
     }
 
-    public void setAlbumStatus(StateEnum albumStatus) {
+    public void setAlbumStatus(YesOrNoEnum albumStatus) {
         this.albumStatus = albumStatus;
     }
 }

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

@@ -1,7 +1,7 @@
 package com.yonge.cooleshow.biz.dal.dto.search;
 
 import com.yonge.cooleshow.biz.dal.enums.AuthStatusEnum;
-import com.yonge.cooleshow.biz.dal.enums.StateEnum;
+import com.yonge.cooleshow.biz.dal.enums.YesOrNoEnum;
 import com.yonge.cooleshow.common.page.QueryInfo;
 import com.yonge.toolset.utils.string.StringUtil;
 import io.swagger.annotations.ApiModel;
@@ -35,7 +35,7 @@ public class MusicSheetSearch  extends QueryInfo{
     private List<Long> subjectIdList;
 
     @ApiModelProperty("曲目状态（0：停用，1：启用））")
-    private StateEnum state;
+    private YesOrNoEnum state;
 
     @ApiModelProperty("曲目审核状态(0:待审核;1:通过;2:未通过)")
     private AuthStatusEnum auditStatus;
@@ -43,7 +43,7 @@ public class MusicSheetSearch  extends QueryInfo{
     @ApiModelProperty(value = "创建人id （老师id）")
     private Long createBy;
 
-    @ApiModelProperty(value = "假删除 0 : 未删除 1：已删除",hidden = true)
+    @ApiModelProperty(value = "假删除 false : 未删除 true：已删除",hidden = true)
     private Boolean delFlag = false;
 
     public String getIdAndName() {
@@ -92,11 +92,11 @@ public class MusicSheetSearch  extends QueryInfo{
         }
     }
 
-    public StateEnum getState() {
+    public YesOrNoEnum getState() {
         return state;
     }
 
-    public void setState(StateEnum state) {
+    public void setState(YesOrNoEnum state) {
         this.state = state;
     }
 

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

@@ -1,6 +1,6 @@
 package com.yonge.cooleshow.biz.dal.dto.search;
 
-import com.yonge.cooleshow.biz.dal.enums.StateEnum;
+import com.yonge.cooleshow.biz.dal.enums.YesOrNoEnum;
 import com.yonge.cooleshow.common.page.QueryInfo;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
@@ -17,7 +17,7 @@ public class MusicTagSearch extends QueryInfo{
 	private String idAndName;
 
 	@ApiModelProperty("标签状态（0：禁用，1：启用）")
-	private StateEnum state;
+	private YesOrNoEnum state;
 
 	public String getIdAndName() {
 		return idAndName;
@@ -27,11 +27,11 @@ public class MusicTagSearch extends QueryInfo{
 		this.idAndName = idAndName;
 	}
 
-	public StateEnum getState() {
+	public YesOrNoEnum getState() {
 		return state;
 	}
 
-	public void setState(StateEnum state) {
+	public void setState(YesOrNoEnum state) {
 		this.state = state;
 	}
 }

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

@@ -1,11 +1,10 @@
 package com.yonge.cooleshow.biz.dal.entity;
 
-import com.yonge.cooleshow.biz.dal.enums.StateEnum;
-import com.yonge.cooleshow.biz.dal.enums.YesOrNoEnum;
-import com.yonge.cooleshow.common.entity.BaseEntity;
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
+import com.yonge.cooleshow.biz.dal.enums.YesOrNoEnum;
+import com.yonge.cooleshow.common.entity.BaseEntity;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import org.apache.commons.lang3.builder.ToStringBuilder;
@@ -47,7 +46,7 @@ public class MusicAlbum extends BaseEntity {
 
     @TableField("album_status_")
     @ApiModelProperty(value = "专辑状态(1:启用;0:停用)")
-    private StateEnum albumStatus;  //专辑状态(1:启用;0:停用)
+    private YesOrNoEnum albumStatus;  //专辑状态(1:启用;0:停用)
 
     @TableField("sort_number_")
     @ApiModelProperty(value = "排序号")
@@ -123,12 +122,12 @@ public class MusicAlbum extends BaseEntity {
 	    return this.albumCoverUrl;
 	}
 
-	public MusicAlbum setAlbumStatus(StateEnum albumStatus) {
+	public MusicAlbum setAlbumStatus(YesOrNoEnum albumStatus) {
 	    this.albumStatus = albumStatus;
 	    return this;
 	}
 
-	public StateEnum getAlbumStatus() {
+	public YesOrNoEnum getAlbumStatus() {
 	    return this.albumStatus;
 	}
 

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

@@ -47,10 +47,10 @@ public class MusicSheet implements Serializable {
     @ApiModelProperty(value = "曲谱声部(适用的乐器,可能是多个,用逗号分隔)")
     private String musicSubject;  //曲谱声部(适用的乐器,可能是多个,用逗号分隔)
 
-    @NotBlank(message = "曲谱音频文件类型不能为空!")
+    @NotNull(message = "曲谱音频文件类型不能为空!")
     @TableField("audio_type_")
-    @ApiModelProperty(value = "曲目音频类型 1：mp3, 2:midi, 3:mp3_metronome")
-    private AudioTypeEnum audioType;  //曲谱音频文件类型(midi;mp3)
+    @ApiModelProperty(value = "曲目音频类型 MP3：mp3, MIDI:midi, MP3_METRONOME:mp3_metronome")
+    private AudioTypeEnum audioType;
 
     @NotBlank(message = "曲谱标签不能为空!")
     @TableField("music_tag_")
@@ -71,16 +71,16 @@ public class MusicSheet implements Serializable {
 
     @NotNull(message = "收费类型不能为空!")
     @TableField("charge_type_")
-    @ApiModelProperty(value = "收费类型(0:免费;1:会员;2:单曲收费)")
+    @ApiModelProperty(value = "收费类型(FREE:免费;VIP:会员;CHARGE:单曲收费)")
     private ChargeTypeEnum chargeType;  //收费类型(0:免费;1:会员;2:单曲收费)
 
 
 	@TableField("state_")
 	@ApiModelProperty(value = "曲目状态(0:停用，1：启用)")
-	private StateEnum state;
+	private YesOrNoEnum state;
 
     @TableField("audit_status_")
-    @ApiModelProperty(value = "审核状态(1:待审核;2:通过;3:未通过)")
+    @ApiModelProperty(value = "审核状态(DOING:待审核;PASS:通过;UNPASS:未通过)")
     private AuthStatusEnum auditStatus;
 
     @TableField("sort_number_")
@@ -226,11 +226,11 @@ public class MusicSheet implements Serializable {
 		this.chargeType = chargeType;
 	}
 
-	public StateEnum getState() {
+	public YesOrNoEnum getState() {
 		return state;
 	}
 
-	public void setState(StateEnum state) {
+	public void setState(YesOrNoEnum state) {
 		this.state = state;
 	}
 

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

@@ -26,7 +26,7 @@ public class MusicSheetAuthRecord implements Serializable {
     @ApiModelProperty("曲目id ")
 	@TableField(value = "music_sheet_id_")
     private Long musicSheetId;
-    @ApiModelProperty("审核状态 0:审核中;1:通过;2:未通过 ")
+    @ApiModelProperty("审核状态 DOING:审核中;PASS:通过;UNPASS:未通过 ")
 	@TableField(value = "audit_state_")
     private AuthStatusEnum auditState;
     @ApiModelProperty("审核人 ")

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

@@ -4,15 +4,14 @@ import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
-import com.yonge.cooleshow.biz.dal.enums.StateEnum;
+import com.fasterxml.jackson.annotation.JsonFormat;
 import com.yonge.cooleshow.biz.dal.enums.YesOrNoEnum;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
+import org.springframework.format.annotation.DateTimeFormat;
 
 import java.io.Serializable;
 import java.util.Date;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import org.springframework.format.annotation.DateTimeFormat;
 
 /**
  * 音乐标签表
@@ -34,7 +33,7 @@ public class MusicTag implements Serializable {
 
     @TableField(value = "state_")
     @ApiModelProperty(value = "标签状态（0：禁用，1：启用）")
-    private StateEnum state;
+    private YesOrNoEnum state;
 
 	@TableField(value = "del_flag_")
     @ApiModelProperty(value = "假删标识（0：正常，1：删除）")
@@ -108,11 +107,11 @@ public class MusicTag implements Serializable {
         this.updateTime = updateTime;
     }
 
-    public StateEnum getState() {
+    public YesOrNoEnum getState() {
         return state;
     }
 
-    public void setState(StateEnum state) {
+    public void setState(YesOrNoEnum state) {
         this.state = state;
     }
 

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/enums/AudioTypeEnum.java

@@ -9,23 +9,24 @@ import com.yonge.cooleshow.common.enums.BaseEnum;
  * @author liujunchi
  * @date 2022-04-01
  */
-public enum AudioTypeEnum implements BaseEnum<Integer,AudioTypeEnum> {
+public enum AudioTypeEnum implements BaseEnum<String,AudioTypeEnum> {
 
 
-    MP3(1,"mp3"),
-    MIDI(2,"midi"),
-    MP3_METRONOME(3,"mp3_metronome");
+    MP3("MP3","mp3"),
+    MIDI("MIDI","midi"),
+    MP3_METRONOME("MP3_METRONOME","mp3_metronome");
     @EnumValue
-    private Integer code;
+    private String code;
     private String msg;
 
-    AudioTypeEnum(Integer code, String msg) {
+    AudioTypeEnum(String code,String msg) {
         this.code = code;
         this.msg = msg;
     }
 
-    public void setCode(Integer code) {
-        this.code = code;
+    @Override
+    public String getCode() {
+        return this.code;
     }
 
     public String getMsg() {
@@ -35,9 +36,4 @@ public enum AudioTypeEnum implements BaseEnum<Integer,AudioTypeEnum> {
     public void setMsg(String msg) {
         this.msg = msg;
     }
-
-    @Override
-    public Integer getCode() {
-        return this.code;
-    }
 }

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/enums/ChargeTypeEnum.java

@@ -4,26 +4,26 @@ import com.baomidou.mybatisplus.annotation.EnumValue;
 import com.yonge.cooleshow.common.enums.BaseEnum;
 
 /**
- * Description 收费类型(0:免费;1:会员;2:单曲收费)
+ * Description 收费类型(FREE:免费;VIP:会员;CHARGE:单曲收费)
  *
  * @author: liujunchi
  * @date: 2022-03-30
  */
-public enum ChargeTypeEnum implements BaseEnum<Integer,ChargeTypeEnum> {
+public enum ChargeTypeEnum implements BaseEnum<String,ChargeTypeEnum> {
 
-    FREE(0,"免费"),
-    VIP(1,"会员"),
-    CHARGE(2,"单曲收费");
+    FREE("FREE","免费"),
+    VIP("VIP","会员"),
+    CHARGE("CHARGE","单曲收费");
     @EnumValue
-    private Integer code;
+    private String code;
     private String msg;
 
-    ChargeTypeEnum(Integer code, String msg) {
+    ChargeTypeEnum(String code, String msg) {
         this.code = code;
         this.msg = msg;
     }
 
-    public void setCode(Integer code) {
+    public void setCode(String code) {
         this.code = code;
     }
 
@@ -36,7 +36,7 @@ public enum ChargeTypeEnum implements BaseEnum<Integer,ChargeTypeEnum> {
     }
 
     @Override
-    public Integer getCode() {
+    public String getCode() {
         return this.code;
     }
 }

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/enums/OpenEnum.java

@@ -1,33 +0,0 @@
-package com.yonge.cooleshow.biz.dal.enums;
-
-import com.baomidou.mybatisplus.annotation.EnumValue;
-import com.yonge.cooleshow.common.enums.BaseEnum;
-
-/**
- * Description 标签列表是否展开列表
- *
- * @author: liujunchi
- * @date: 2022-03-30
- */
-public enum OpenEnum implements BaseEnum<Integer, OpenEnum> {
-    OPEN(0,"展开"),
-    CLOSE(1, "不展开");
-    @EnumValue
-    private Integer code;
-
-    private String msg;
-
-    OpenEnum(Integer code, String msg) {
-        this.code = code;
-        this.msg = msg;
-    }
-
-    public String getMsg() {
-        return msg;
-    }
-
-    @Override
-    public Integer getCode() {
-        return this.code;
-    }
-}

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/enums/StateEnum.java

@@ -1,33 +0,0 @@
-package com.yonge.cooleshow.biz.dal.enums;
-
-import com.baomidou.mybatisplus.annotation.EnumValue;
-import com.yonge.cooleshow.common.enums.BaseEnum;
-
-/**
- * Description
- *
- * @author: liujunchi
- * @date: 2022-03-30
- */
-public enum StateEnum implements BaseEnum<Integer, StateEnum> {
-    STOP(0,"停用"),
-    ENABLE(1, "启用");
-    @EnumValue
-    private Integer code;
-
-    private String msg;
-
-    StateEnum(Integer code, String msg) {
-        this.code = code;
-        this.msg = msg;
-    }
-
-    public String getMsg() {
-        return msg;
-    }
-
-    @Override
-    public Integer getCode() {
-        return this.code;
-    }
-}

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

@@ -2,15 +2,14 @@ package com.yonge.cooleshow.biz.dal.service.impl;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.service.additional.query.impl.LambdaQueryChainWrapper;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.yonge.cooleshow.biz.dal.dao.MusicAlbumDao;
 import com.yonge.cooleshow.biz.dal.dto.search.MusicAlbumDetailSearch;
 import com.yonge.cooleshow.biz.dal.dto.search.MusicAlbumSearch;
 import com.yonge.cooleshow.biz.dal.dto.search.StudentMusicAlbumSearch;
 import com.yonge.cooleshow.biz.dal.entity.AlbumFavorite;
 import com.yonge.cooleshow.biz.dal.entity.MusicAlbum;
-import com.yonge.cooleshow.biz.dal.dao.MusicAlbumDao;
 import com.yonge.cooleshow.biz.dal.entity.MusicSheet;
-import com.yonge.cooleshow.biz.dal.enums.StateEnum;
-
 import com.yonge.cooleshow.biz.dal.enums.YesOrNoEnum;
 import com.yonge.cooleshow.biz.dal.service.AlbumFavoriteService;
 import com.yonge.cooleshow.biz.dal.service.AlbumMusicRelateService;
@@ -23,9 +22,8 @@ import com.yonge.cooleshow.common.exception.BizException;
 import com.yonge.toolset.utils.string.StringUtil;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import org.springframework.stereotype.Service;
 import org.springframework.beans.factory.annotation.Autowired;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.CollectionUtils;
 
@@ -72,10 +70,10 @@ public class MusicAlbumServiceImpl extends ServiceImpl<MusicAlbumDao,MusicAlbum>
         if (musicAlbum == null) {
             throw  new BizException("未找到专辑信息");
         }
-        if (StateEnum.STOP.getCode().equals(musicAlbum.getAlbumStatus().getCode())) {
-            musicAlbum.setAlbumStatus(StateEnum.ENABLE);
+        if (YesOrNoEnum.NO.getCode().equals(musicAlbum.getAlbumStatus().getCode())) {
+            musicAlbum.setAlbumStatus(YesOrNoEnum.YES);
         } else {
-            musicAlbum.setAlbumStatus(StateEnum.STOP);
+            musicAlbum.setAlbumStatus(YesOrNoEnum.NO);
         }
         return this.updateById(musicAlbum);
     }

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

@@ -70,7 +70,7 @@ public class MusicSheetServiceImpl extends ServiceImpl<MusicSheetDao,MusicSheet>
         BeanUtils.copyProperties(musicSheetDto, musicSheet);
         //保存主表
         musicSheet.setCreateBy(sysUser.getId());
-        musicSheet.setState(StateEnum.STOP);
+        musicSheet.setState(YesOrNoEnum.NO);
         musicSheet.setCreateTime(new Date());
         int count = musicSheetDao.insert(musicSheet);
 
@@ -96,10 +96,10 @@ public class MusicSheetServiceImpl extends ServiceImpl<MusicSheetDao,MusicSheet>
         if (musicSheet == null) {
             throw  new BizException("未找到曲目信息");
         }
-        if (StateEnum.STOP.getCode().equals(musicSheet.getState().getCode())) {
-            musicSheet.setState(StateEnum.ENABLE);
+        if (YesOrNoEnum.NO.getCode().equals(musicSheet.getState().getCode())) {
+            musicSheet.setState(YesOrNoEnum.YES);
         } else {
-            musicSheet.setState(StateEnum.STOP);
+            musicSheet.setState(YesOrNoEnum.NO);
         }
         return this.updateById(musicSheet);
 
@@ -116,7 +116,7 @@ public class MusicSheetServiceImpl extends ServiceImpl<MusicSheetDao,MusicSheet>
         // 设置只查老师用户
         query.setCreateBy(sysUser.getId());
         query.setAuditStatus(AuthStatusEnum.PASS);
-        query.setState(StateEnum.ENABLE);
+        query.setState(YesOrNoEnum.YES);
         // 只查3条
         query.setRows(3);
         IPage<MusicSheetVo> musicSheetVoIPage = selectPage(PageUtil.getPage(query), query);

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

@@ -1,6 +1,5 @@
 package com.yonge.cooleshow.biz.dal.service.impl;
 
-import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.service.additional.query.impl.LambdaQueryChainWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@@ -10,8 +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.enums.OpenEnum;
-import com.yonge.cooleshow.biz.dal.enums.StateEnum;
 import com.yonge.cooleshow.biz.dal.enums.YesOrNoEnum;
 import com.yonge.cooleshow.biz.dal.service.MusicTagService;
 import com.yonge.cooleshow.biz.dal.vo.MusicTagVo;
@@ -66,7 +63,7 @@ public class MusicTagServiceImpl extends ServiceImpl<MusicTagDao, MusicTag> impl
                          musicTagVo.setChildren(childrenList);
                      } else {
                          // 如果名称查询中，父级不包含名称/编号，子集包含，只展示包含的子集，并且默认展开子集列表
-                         musicTagVo.setOpen(OpenEnum.OPEN);
+                         musicTagVo.setOpen(YesOrNoEnum.YES);
                          List<MusicTagVo> childrenNameList = childrenList.stream()
                                                                 .filter(vo -> vo.getName().contains(query.getIdAndName())
                                                                         ||vo.getId().toString().contains(query.getIdAndName()))
@@ -98,10 +95,10 @@ public class MusicTagServiceImpl extends ServiceImpl<MusicTagDao, MusicTag> impl
         }
         MusicTag musicTag = new MusicTag();
         musicTag.setId(musicTagId);
-        if (tag.getState().getCode().equals(StateEnum.STOP.getCode())) {
-            musicTag.setState(StateEnum.ENABLE);
+        if (tag.getState().getCode().equals(YesOrNoEnum.NO.getCode())) {
+            musicTag.setState(YesOrNoEnum.YES);
         } else {
-            musicTag.setState(StateEnum.STOP);
+            musicTag.setState(YesOrNoEnum.NO);
         }
         return this.updateById(musicTag);
     }
@@ -117,7 +114,7 @@ public class MusicTagServiceImpl extends ServiceImpl<MusicTagDao, MusicTag> impl
         SysUser sysUser = sysUserFeignService.queryUserInfo();
         MusicTag musicTag = new MusicTag();
         musicTag.setDelFlag(false);
-        musicTag.setState(StateEnum.STOP);
+        musicTag.setState(YesOrNoEnum.NO);
         if (musicTagSaveDto.getParentTagId() == null) {
             musicTag.setParentTagId(0L);
         } else {
@@ -173,7 +170,7 @@ public class MusicTagServiceImpl extends ServiceImpl<MusicTagDao, MusicTag> impl
     public List<MusicTagVo> selectMusicTagTree() {
         List<MusicTag> list = this.lambdaQuery()
                 .eq(MusicTag::getDelFlag,YesOrNoEnum.NO.getCode())
-                .eq(MusicTag::getState,StateEnum.ENABLE.getCode())
+                .eq(MusicTag::getState,YesOrNoEnum.YES.getCode())
                 .list();
         if (list == null) {
             return new ArrayList<>();

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

@@ -1,7 +1,7 @@
 package com.yonge.cooleshow.biz.dal.vo;
 
 import com.yonge.cooleshow.biz.dal.entity.MusicTag;
-import com.yonge.cooleshow.biz.dal.enums.OpenEnum;
+import com.yonge.cooleshow.biz.dal.enums.YesOrNoEnum;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 
@@ -19,17 +19,17 @@ public class MusicTagVo extends MusicTag{
 	@ApiModelProperty("更新人")
 	private String updateName;
 
-	@ApiModelProperty("是否展开标签（0:展开，1：不展开）")
-	private OpenEnum open = OpenEnum.CLOSE;
+	@ApiModelProperty("是否展开标签（1:展开，0：不展开）")
+	private YesOrNoEnum open =YesOrNoEnum.YES;
 
 	@ApiModelProperty("二级标签")
 	private List<MusicTagVo> children = new ArrayList<>();
 
-	public OpenEnum getOpen() {
+	public YesOrNoEnum getOpen() {
 		return open;
 	}
 
-	public void setOpen(OpenEnum open) {
+	public void setOpen(YesOrNoEnum open) {
 		this.open = open;
 	}
 

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

@@ -1,6 +1,6 @@
 package com.yonge.cooleshow.biz.dal.vo;
 
-import com.yonge.cooleshow.biz.dal.enums.AuditEnum;
+import com.yonge.cooleshow.biz.dal.enums.AuthStatusEnum;
 import io.swagger.annotations.ApiModelProperty;
 
 import java.math.BigDecimal;
@@ -48,8 +48,8 @@ public class TeacherMusicSheetVo {
     @ApiModelProperty(value = "创建时间")
     private java.util.Date createTime;  //创建时间
 
-    @ApiModelProperty(value = "审核状态(0:待审核;1:通过;2:未通过)")
-    private AuditEnum auditStatus;  //审核状态(0:待审核;1:通过;2:未通过)
+    @ApiModelProperty(value = "审核状态(DOING:待审核;PASS:通过;UNPASS:未通过)")
+    private AuthStatusEnum auditStatus;
 
     @ApiModelProperty("审批人姓名")
     private String auditName;
@@ -143,11 +143,11 @@ public class TeacherMusicSheetVo {
         this.createTime = createTime;
     }
 
-    public AuditEnum getAuditStatus() {
+    public AuthStatusEnum getAuditStatus() {
         return auditStatus;
     }
 
-    public void setAuditStatus(AuditEnum auditStatus) {
+    public void setAuditStatus(AuthStatusEnum auditStatus) {
         this.auditStatus = auditStatus;
     }
 

cooleshow-user/user-student/src/main/java/com/yonge/cooleshow/student/controller/MusicAlbumController.java

@@ -6,16 +6,15 @@ import com.yonge.cooleshow.auth.api.entity.SysUser;
 import com.yonge.cooleshow.biz.dal.dto.search.MusicAlbumDetailSearch;
 import com.yonge.cooleshow.biz.dal.dto.search.MusicAlbumSearch;
 import com.yonge.cooleshow.biz.dal.dto.search.StudentMusicAlbumSearch;
-import com.yonge.cooleshow.biz.dal.enums.StateEnum;
 import com.yonge.cooleshow.biz.dal.enums.YesOrNoEnum;
 import com.yonge.cooleshow.biz.dal.service.MusicAlbumService;
 import com.yonge.cooleshow.biz.dal.support.PageUtil;
-import com.yonge.cooleshow.common.page.QueryInfo;
 import com.yonge.cooleshow.biz.dal.vo.AlbumDetailVo;
 import com.yonge.cooleshow.biz.dal.vo.MusicAlbumVo;
 import com.yonge.cooleshow.common.controller.BaseController;
 import com.yonge.cooleshow.common.entity.HttpResponseResult;
 import com.yonge.cooleshow.common.page.PageInfo;
+import com.yonge.cooleshow.common.page.QueryInfo;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
@@ -48,7 +47,7 @@ public class MusicAlbumController extends BaseController {
         if (sysUser == null  || sysUser.getId() == null) {
             return failed("用户信息获取失败");
         }
-        query.setAlbumStatus(StateEnum.ENABLE);
+        query.setAlbumStatus(YesOrNoEnum.YES);
         IPage<MusicAlbumVo> iPage = musicAlbumService.selectPage(PageUtil.getPage(query),query);
         return succeed(PageUtil.pageInfo(iPage));
     }
@@ -65,7 +64,7 @@ public class MusicAlbumController extends BaseController {
             return failed("用户信息获取失败");
         }
         query.setType(2);
-        query.setState(StateEnum.ENABLE);
+        query.setState(YesOrNoEnum.YES);
         YesOrNoEnum yesOrNoEnum = musicAlbumService.checkFavorite(sysUser.getId(),query.getId() );
         AlbumDetailVo albumDetailVo = musicAlbumService.detail(PageUtil.getPage(query), query);
         albumDetailVo.setFavorite(yesOrNoEnum);
@@ -99,7 +98,7 @@ public class MusicAlbumController extends BaseController {
         }
         StudentMusicAlbumSearch search = new StudentMusicAlbumSearch();
         search.setStudentId(sysUser.getId());
-        search.setAlbumStatus(StateEnum.ENABLE);
+        search.setAlbumStatus(YesOrNoEnum.YES);
         IPage<MusicAlbumVo> albumVoIPage = musicAlbumService.favoriteAlbum(PageUtil.getPage(query), search);
         return succeed(PageUtil.pageInfo(albumVoIPage));
     }

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

@@ -5,17 +5,16 @@ import com.yonge.cooleshow.auth.api.client.SysUserFeignService;
 import com.yonge.cooleshow.auth.api.entity.SysUser;
 import com.yonge.cooleshow.auth.api.enums.SysUserType;
 import com.yonge.cooleshow.biz.dal.dto.search.StudentMusicSheetSearch;
-import com.yonge.cooleshow.biz.dal.enums.AuditEnum;
 import com.yonge.cooleshow.biz.dal.enums.AuthStatusEnum;
-import com.yonge.cooleshow.biz.dal.enums.StateEnum;
+import com.yonge.cooleshow.biz.dal.enums.YesOrNoEnum;
 import com.yonge.cooleshow.biz.dal.service.MusicSheetService;
 import com.yonge.cooleshow.biz.dal.support.PageUtil;
-import com.yonge.cooleshow.common.page.QueryInfo;
 import com.yonge.cooleshow.biz.dal.vo.MusicSheetDetailVo;
 import com.yonge.cooleshow.biz.dal.vo.MusicSheetVo;
 import com.yonge.cooleshow.common.controller.BaseController;
 import com.yonge.cooleshow.common.entity.HttpResponseResult;
 import com.yonge.cooleshow.common.page.PageInfo;
+import com.yonge.cooleshow.common.page.QueryInfo;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
@@ -61,7 +60,7 @@ public class MusicSheetController extends BaseController {
         }
 
         // 学生 只能看通过审核 并且 启用的 曲目
-        query.setState(StateEnum.ENABLE);
+        query.setState(YesOrNoEnum.YES);
         query.setAuditStatus(AuthStatusEnum.PASS);
         query.setStudentId(sysUser.getId());
         IPage<MusicSheetVo> musicSheetVoIPage = musicSheetService.selectStudentPage(PageUtil.getPage(query), query);
@@ -95,7 +94,7 @@ public class MusicSheetController extends BaseController {
         }
         StudentMusicSheetSearch search = new StudentMusicSheetSearch();
         search.setStudentId(sysUser.getId());
-        search.setState(StateEnum.ENABLE);
+        search.setState(YesOrNoEnum.YES);
         search.setAuditStatus(AuthStatusEnum.PASS);
         IPage<MusicSheetVo> sheetVoIPage = musicSheetService.myMusic(PageUtil.getPage(query),search);
         return succeed(PageUtil.pageInfo(sheetVoIPage));
@@ -114,7 +113,7 @@ public class MusicSheetController extends BaseController {
         }
         StudentMusicSheetSearch search = new StudentMusicSheetSearch();
         search.setStudentId(sysUser.getId());
-        search.setState(StateEnum.ENABLE);
+        search.setState(YesOrNoEnum.YES);
         search.setAuditStatus(AuthStatusEnum.PASS);
         IPage<MusicSheetVo> sheetVoIPage = musicSheetService.favoriteMusic(PageUtil.getPage(query),search);
         return succeed(PageUtil.pageInfo(sheetVoIPage));
@@ -133,7 +132,7 @@ public class MusicSheetController extends BaseController {
         }
         StudentMusicSheetSearch search = new StudentMusicSheetSearch();
         search.setStudentId(sysUser.getId());
-        search.setState(StateEnum.ENABLE);
+        search.setState(YesOrNoEnum.YES);
         search.setAuditStatus(AuthStatusEnum.PASS);
         IPage<MusicSheetVo> sheetVoIPage = musicSheetService.practiceMusic(PageUtil.getPage(query),search);
         return succeed(PageUtil.pageInfo(sheetVoIPage));

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

@@ -86,7 +86,7 @@ public class MusicSheetController extends BaseController {
             BeanUtils.copyProperties(musicSheetDto, musicSheet);
             musicSheet.setCreateBy(sysUser.getId());
             musicSheet.setCreateTime(new Date());
-            musicSheet.setState(StateEnum.STOP);
+            musicSheet.setState(YesOrNoEnum.NO);
             musicSheetService.save(musicSheet);
         }
         return succeed("新增曲谱成功");