update:更新swagger文档，判断用户登录，曲目假删

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

@@ -45,34 +45,32 @@ public class MusicAlbumController extends BaseController {
     @PostMapping(value="/create", consumes="application/json", produces="application/json")
     public HttpResponseResult<Object> create(@Valid @RequestBody MusicAlbum musicAlbum) {
         SysUser sysUser = sysUserFeignService.queryUserInfo();
-        if (sysUser == null) {
+        if (sysUser == null  || sysUser.getId() == null) {
             return failed("用户信息获取失败");
         }
 
         musicAlbum.setCreateBy(sysUser.getId());
         musicAlbum.setCreateTime(new Date());
         musicAlbum.setAlbumStatus(StateEnum.STOP);
-        musicAlbumService.createMusicAlbum(musicAlbum);
-        return succeed();
+        return succeed(musicAlbumService.createMusicAlbum(musicAlbum));
     }
 
     @ApiOperation(value = "删除", httpMethod="POST", consumes="application/json", produces="application/json")
     @PostMapping("/delete/{id}")
     public Object delete(@PathVariable Long id) {
         SysUser sysUser = sysUserFeignService.queryUserInfo();
-        if (sysUser == null) {
+        if (sysUser == null  || sysUser.getId() == null) {
             return failed("用户信息获取失败");
         }
 
-        musicAlbumService.removeById(id);
-        return succeed();
+        return succeed(musicAlbumService.removeById(id));
     }
 
     @ApiOperation(value = "修改", httpMethod="POST", consumes="application/json", produces="application/json")
     @PostMapping(value="/update", consumes="application/json", produces="application/json")
     public HttpResponseResult<Object> update(@Valid @RequestBody MusicAlbum musicAlbum) {
         SysUser sysUser = sysUserFeignService.queryUserInfo();
-        if (sysUser == null) {
+        if (sysUser == null  || sysUser.getId() == null) {
             return failed("用户信息获取失败");
         }
         if (musicAlbum.getId()==null){
@@ -81,15 +79,14 @@ public class MusicAlbumController extends BaseController {
 
         musicAlbum.setUpdateBy(sysUser.getId());
         musicAlbum.setUpdateTime(new Date());
-        musicAlbumService.updateMusicAlbum(musicAlbum);
-        return succeed();
+        return succeed(musicAlbumService.updateMusicAlbum(musicAlbum));
     }
 
     @ApiOperation(value = "分页查询", httpMethod="POST", consumes="application/json", produces="application/json")
     @PostMapping(value="/list", consumes="application/json", produces="application/json")
     public HttpResponseResult<PageInfo<MusicAlbumVo>> list(@RequestBody MusicAlbumSearch query) {
         SysUser sysUser = sysUserFeignService.queryUserInfo();
-        if (sysUser == null) {
+        if (sysUser == null  || sysUser.getId() == null) {
             return failed("用户信息获取失败");
         }
         IPage<MusicAlbumVo> iPage = musicAlbumService.selectPage(PageUtil.getPage(query),query);
@@ -112,8 +109,8 @@ public class MusicAlbumController extends BaseController {
     /**
      * 专辑详情
      */
-    @PostMapping("/detail")
-    @ApiOperation(value = "专辑详情", consumes="application/json", produces="application/json")
+    @PostMapping(value = "/detail", consumes="application/json", produces="application/json")
+    @ApiOperation(value = "专辑详情",  httpMethod="POST", consumes="application/json", produces="application/json")
     public HttpResponseResult<AlbumDetailVo> detail(@Valid @RequestBody MusicAlbumDetailSearch query) {
 
         query.setType(2);
@@ -125,8 +122,8 @@ public class MusicAlbumController extends BaseController {
     /**
      * 专辑详情能新增的曲目列表
      */
-    @PostMapping("/detail/canAddMusicSheet")
-    @ApiOperation(value = "专辑详情能新增的曲目列表")
+    @PostMapping(value = "/detail/canAddMusicSheet", consumes="application/json", produces="application/json")
+    @ApiOperation(value = "专辑详情能新增的曲目列表",  httpMethod="POST", consumes="application/json", produces="application/json")
     public HttpResponseResult<AlbumDetailVo> detailAddMusicSheet(@Valid @RequestBody MusicAlbumDetailSearch query) {
 
         query.setType(1);
@@ -168,7 +165,7 @@ public class MusicAlbumController extends BaseController {
     })
     public HttpResponseResult<Boolean> detailAddMusicSheet(Long albumId, String musicSheetIds) {
         SysUser sysUser = sysUserFeignService.queryUserInfo();
-        if (sysUser == null) {
+        if (sysUser == null  || sysUser.getId() == null) {
             return failed("用户信息获取失败");
         }
         if (StringUtil.isEmpty(albumId)) {

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

@@ -59,10 +59,10 @@ public class MusicSheetController extends BaseController {
      * 查询单条
      */
     @GetMapping("/detail/{id}")
-    @ApiOperation(value = "详情", notes = "传入musicTag")
+    @ApiOperation(value = "详情", notes = "传入id")
     public HttpResponseResult<MusicSheetDetailVo> detail(@ApiParam(value = "曲谱编号", required = true) @PathVariable("id") Long id) {
         SysUser sysUser = sysUserFeignService.queryUserInfo();
-        if (sysUser == null) {
+        if (sysUser == null  || sysUser.getId() == null) {
             return failed("用户信息获取失败");
         }
         return succeed(musicSheetService.detail(id, sysUser, SysUserType.SYSTEM));
@@ -72,7 +72,7 @@ public class MusicSheetController extends BaseController {
     @PostMapping(value="/create", consumes="application/json", produces="application/json")
     public HttpResponseResult<Object> create(@Valid @RequestBody MusicSheetDto musicSheetDto) {
         SysUser sysUser = sysUserFeignService.queryUserInfo();
-        if (sysUser == null) {
+        if (sysUser == null  || sysUser.getId() == null) {
             return failed("用户信息获取失败");
         }
 
@@ -86,6 +86,7 @@ public class MusicSheetController extends BaseController {
 
         musicSheetDto.setUserId(0L);
         musicSheetDto.setAuditStatus(AuditEnum.OPEN);
+        musicSheetDto.setDelFlag(false);
         List<MusicSheetAccompaniment> list;
         if (!AudioTypeEnum.MIDI.getCode().equals(musicSheetDto.getAudioType().getCode())){
             list = musicSheetDto.getBackground();
@@ -110,11 +111,11 @@ public class MusicSheetController extends BaseController {
     @PostMapping("/delete/{id}")
     public Object delete(@PathVariable Long id) {
         SysUser sysUser = sysUserFeignService.queryUserInfo();
-        if (sysUser == null) {
+        if (sysUser == null  || sysUser.getId() == null) {
             return failed("用户信息获取失败");
         }
 
-        boolean result = musicSheetService.removeById(id);
+        boolean result = musicSheetService.del(id);
         if (result){
             return succeed("删除成功");
         } else {
@@ -126,7 +127,7 @@ public class MusicSheetController extends BaseController {
     @PostMapping(value="/update", consumes="application/json", produces="application/json")
     public HttpResponseResult<Object> update(@Valid @RequestBody MusicSheet musicSheet) {
         SysUser sysUser = sysUserFeignService.queryUserInfo();
-        if (sysUser == null) {
+        if (sysUser == null  || sysUser.getId() == null) {
             return failed("用户信息获取失败");
         }
         if (musicSheet.getId()==null){
@@ -147,7 +148,7 @@ public class MusicSheetController extends BaseController {
     @PostMapping(value="/list", consumes="application/json", produces="application/json")
     public HttpResponseResult<PageInfo<MusicSheetVo>> list(@RequestBody MusicSheetSearch query) {
         SysUser sysUser = sysUserFeignService.queryUserInfo();
-        if (sysUser == null) {
+        if (sysUser == null  || sysUser.getId() == null) {
             return failed("用户信息获取失败");
         }
 
@@ -171,8 +172,8 @@ public class MusicSheetController extends BaseController {
     /**
      * 学生详情-乐谱
      */
-    @PostMapping("/student")
-    @ApiOperation(value = "学生详情-乐谱")
+    @PostMapping(value = "/student", consumes="application/json", produces="application/json")
+    @ApiOperation(value = "学生详情-乐谱", httpMethod="POST", consumes="application/json", produces="application/json")
     public HttpResponseResult<PageInfo<StudentMusicSheetOrderVo>> student(@Valid @RequestBody StudentMusicSheetOrderSearch query) {
         return succeed(PageUtil.pageInfo(musicSheetService.selectStudentOrderPage(PageUtil.getPage(query),query)));
     }
@@ -181,17 +182,17 @@ public class MusicSheetController extends BaseController {
     /**
      * 老师详情-乐谱
      */
-    @PostMapping("/teacher")
-    @ApiOperation(value = "老师详情-乐谱")
+    @PostMapping(value = "/teacher", consumes="application/json", produces="application/json")
+    @ApiOperation(value = "老师详情-乐谱", httpMethod="POST", consumes="application/json", produces="application/json")
     public HttpResponseResult<PageInfo<TeacherMusicSheetVo>> teacher(@Valid @RequestBody TeacherMusicSheetSearch query) {
         return succeed(PageUtil.pageInfo(musicSheetService.selectTeacherPage(PageUtil.getPage(query),query)));
     }
 
     /**
-     * 审核中心-乐谱审核
+     * 审核中心-乐谱审核列表
      */
-    @PostMapping("/audit/list")
-    @ApiOperation(value = "审核中心-乐谱审核列表")
+    @PostMapping(value = "/audit/list", consumes="application/json", produces="application/json")
+    @ApiOperation(value = "审核中心-乐谱审核列表", httpMethod="POST", consumes="application/json", produces="application/json")
     public HttpResponseResult<PageInfo<TeacherMusicSheetVo>> audit(@RequestBody TeacherMusicSheetAuditSearch query) {
         return succeed(PageUtil.pageInfo(musicSheetService.selectAuditPage(PageUtil.getPage(query),query)));
     }
@@ -199,11 +200,11 @@ public class MusicSheetController extends BaseController {
     /**
      * 审核中心-乐谱审核
      */
-    @PostMapping("/audit")
-    @ApiOperation(value = "审核中心-乐谱审核")
+    @PostMapping(value = "/audit", consumes="application/json", produces="application/json")
+    @ApiOperation(value = "审核中心-乐谱审核", httpMethod="POST", consumes="application/json", produces="application/json")
     public HttpResponseResult<Boolean> audit(@Valid @RequestBody TeacherMusicSheetAuditReq param) {
         SysUser sysUser = sysUserFeignService.queryUserInfo();
-        if (sysUser == null) {
+        if (sysUser == null  || sysUser.getId() == null) {
             return failed("用户信息获取失败");
         }
         return status(musicSheetService.audit(param,sysUser.getId()));

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

@@ -17,6 +17,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 
+import javax.validation.Valid;
 import java.util.List;
 
 @RestController
@@ -31,7 +32,7 @@ public class MusicTagController extends BaseController {
      * 查询单条
      */
     @GetMapping("/detail/{id}")
-    @ApiOperation(value = "详情", notes = "传入musicTag")
+	@ApiOperation(value = "详情", notes = "传入id")
     public HttpResponseResult<MusicTagVo> detail(@ApiParam(value = "标签编号", required = true) @PathVariable("id") Long id) {
     	return succeed(musicTagService.detail(id));
 	}
@@ -39,9 +40,9 @@ public class MusicTagController extends BaseController {
     /**
      * 查询分页tree
      */
-    @GetMapping("/page")
-    @ApiOperation(value = "查询分页", notes = "传入musicTag")
-    public HttpResponseResult<PageInfo<MusicTagVo>> page(MusicTagSearch query) {
+    @PostMapping(value = "/page", consumes="application/json", produces="application/json")
+    @ApiOperation(value = "查询分页", httpMethod="POST", consumes="application/json", produces="application/json")
+    public HttpResponseResult<PageInfo<MusicTagVo>> page(@Valid @RequestBody MusicTagSearch query) {
 		IPage<MusicTagVo> pages = musicTagService.selectPage(PageUtil.getPage(query), query);
 		return succeed(PageUtil.pageInfo(pages));
 	}
@@ -51,7 +52,7 @@ public class MusicTagController extends BaseController {
 	 * 查询分页tree
 	 */
 	@GetMapping("/tree")
-	@ApiOperation(value = "查询标签树列表", notes = "传入musicTag")
+	@ApiOperation(value = "查询标签树列表")
 	public HttpResponseResult<List<MusicTagVo>> tree() {
 		List<MusicTagVo> treeList = musicTagService.selectMusicTagTree();
 		return succeed(treeList);
@@ -60,21 +61,19 @@ public class MusicTagController extends BaseController {
     /**
 	 * 新增
 	 */
-	@PostMapping("/save")
-	@ApiOperation(value = "新增", notes = "传入musicTag")
+	@PostMapping(value = "/save",  consumes="application/json", produces="application/json")
+	@ApiOperation(value = "新增", httpMethod="POST", consumes="application/json", produces="application/json")
 	public HttpResponseResult<Boolean> save(@Validated(MusicTagSaveDto.Create.class) @RequestBody MusicTagSaveDto musicTagSaveDto) {
-		musicTagService.createMusicTag(musicTagSaveDto);
-		return succeed();
+		return succeed(musicTagService.createMusicTag(musicTagSaveDto));
 	}
 
     /**
 	 * 修改
 	 */
-	@PostMapping("/update")
-	@ApiOperation(value = "修改", notes = "传入musicTag")
+	@PostMapping(value =  "/update",  consumes="application/json", produces="application/json")
+	@ApiOperation(value = "修改", httpMethod="POST", consumes="application/json", produces="application/json")
 	public HttpResponseResult<Boolean> update(@Validated(MusicTagSaveDto.Update.class) @RequestBody MusicTagSaveDto musicTagSaveDto) {
-		musicTagService.updateMusicTag(musicTagSaveDto);
-		return succeed();
+		return succeed(musicTagService.updateMusicTag(musicTagSaveDto));
 	}
 
  	/**

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

@@ -15,7 +15,7 @@ import javax.validation.constraints.NotNull;
 public class MusicAlbumDetailSearch extends MusicSheetSearch {
 
     @NotNull(message = "专辑编号ID不能为空")
-    @ApiModelProperty("专辑编号ID")
+    @ApiModelProperty(value = "专辑编号ID",required = true)
     private Long id;
 
     /**
@@ -24,6 +24,8 @@ public class MusicAlbumDetailSearch extends MusicSheetSearch {
     @ApiModelProperty(hidden = true,value = "1：新增曲目，2：已有曲目")
     private Integer type;
 
+    @ApiModelProperty(value = "假删除 0 : 未删除 1：已删除",hidden = true)
+    private Boolean delFlag = false;
 
     public Long getId() {
         return id;
@@ -40,4 +42,14 @@ public class MusicAlbumDetailSearch extends MusicSheetSearch {
     public void setType(Integer type) {
         this.type = type;
     }
+
+    @Override
+    public Boolean getDelFlag() {
+        return delFlag;
+    }
+
+    @Override
+    public void setDelFlag(Boolean delFlag) {
+        this.delFlag = delFlag;
+    }
 }

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

@@ -43,6 +43,9 @@ public class MusicSheetSearch  extends Query {
     @ApiModelProperty(value = "创建人id （老师id）")
     private Long createBy;
 
+    @ApiModelProperty(value = "假删除 0 : 未删除 1：已删除",hidden = true)
+    private Boolean delFlag = false;
+
     public String getIdAndName() {
         return idAndName;
     }
@@ -112,4 +115,12 @@ public class MusicSheetSearch  extends Query {
     public void setCreateBy(Long createBy) {
         this.createBy = createBy;
     }
+
+    public Boolean getDelFlag() {
+        return delFlag;
+    }
+
+    public void setDelFlag(Boolean delFlag) {
+        this.delFlag = delFlag;
+    }
 }

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

@@ -1,6 +1,8 @@
 package com.yonge.cooleshow.biz.dal.dto.search;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
+import com.yonge.cooleshow.biz.dal.enums.OrderStatusEnum;
+import com.yonge.cooleshow.biz.dal.enums.YesOrNoEnum;
 import com.yonge.cooleshow.biz.dal.support.Query;
 import com.yonge.toolset.utils.string.StringUtil;
 import io.swagger.annotations.ApiModelProperty;
@@ -45,6 +47,12 @@ public class StudentMusicSheetOrderSearch extends Query {
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     private Date endTime;
 
+    @ApiModelProperty(value = "订单状态 WAIT_PAY 待支付 PAYING 支付中  PAID 已付款 CLOSE 已关闭",hidden = true)
+    private YesOrNoEnum orderStatus = YesOrNoEnum.YES;
+
+    @ApiModelProperty(value = "假删除 0 : 未删除 1：已删除",hidden = true)
+    private Boolean delFlag = false;
+
     public Long getStudentId() {
         return studentId;
     }
@@ -103,4 +111,20 @@ public class StudentMusicSheetOrderSearch extends Query {
     public void setMusicTagList(List<Long> musicTagList) {
         this.musicTagList = musicTagList;
     }
+
+    public Boolean getDelFlag() {
+        return delFlag;
+    }
+
+    public void setDelFlag(Boolean delFlag) {
+        this.delFlag = delFlag;
+    }
+
+    public YesOrNoEnum getOrderStatus() {
+        return orderStatus;
+    }
+
+    public void setOrderStatus(YesOrNoEnum orderStatus) {
+        this.orderStatus = orderStatus;
+    }
 }

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

@@ -39,6 +39,9 @@ public class TeacherMusicSheetAuditSearch extends Query {
     @ApiModelProperty("审核状态（0：审核中，1：已通过，2：已拒绝）")
     private AuditEnum state;
 
+    @ApiModelProperty(value = "假删除 0 : 未删除 1：已删除",hidden = true)
+    private Boolean delFlag = false;
+
     public String getIdAndName() {
         return idAndName;
     }
@@ -78,4 +81,12 @@ public class TeacherMusicSheetAuditSearch extends Query {
     public void setState(AuditEnum state) {
         this.state = state;
     }
+
+    public Boolean getDelFlag() {
+        return delFlag;
+    }
+
+    public void setDelFlag(Boolean delFlag) {
+        this.delFlag = delFlag;
+    }
 }

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

@@ -35,6 +35,9 @@ public class TeacherMusicSheetSearch extends Query {
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     private Date endTime;
 
+    @ApiModelProperty(value = "假删除 0 : 未删除 1：已删除",hidden = true)
+    private Boolean delFlag = false;
+
     public Long getTeacherId() {
         return teacherId;
     }
@@ -66,4 +69,12 @@ public class TeacherMusicSheetSearch extends Query {
     public void setEndTime(Date endTime) {
         this.endTime = endTime;
     }
+
+    public Boolean getDelFlag() {
+        return delFlag;
+    }
+
+    public void setDelFlag(Boolean delFlag) {
+        this.delFlag = delFlag;
+    }
 }

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

@@ -133,6 +133,11 @@ public class MusicSheet implements Serializable {
     @ApiModelProperty(value = "备注")
     private String remark;  //备注，填写未通过审核的原因
 
+
+	@TableField("del_flag_")
+	@ApiModelProperty(value = "假删除标识 0：未删除 1：已删除")
+	private Boolean delFlag;
+
 	public Long getId() {
 		return id;
 	}
@@ -333,4 +338,11 @@ public class MusicSheet implements Serializable {
 		this.remark = remark;
 	}
 
+	public Boolean getDelFlag() {
+		return delFlag;
+	}
+
+	public void setDelFlag(Boolean delFlag) {
+		this.delFlag = delFlag;
+	}
 }

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

@@ -1,5 +1,6 @@
 package com.yonge.cooleshow.biz.dal.entity;
 
+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;
@@ -48,7 +49,7 @@ public class MusicSheetPurchaseRecord extends BaseEntity {
 
     @TableField("order_status_")
     @ApiModelProperty(value = "订单状态(1:已完成;0:取消)")
-    private Integer orderStatus;  //订单状态(1:已完成;0:取消)
+    private YesOrNoEnum orderStatus;  //订单状态(1:已完成;0:取消)
 
 
 	public MusicSheetPurchaseRecord setId(Long id) {
@@ -114,12 +115,12 @@ public class MusicSheetPurchaseRecord extends BaseEntity {
 	    return this.purchasePrice;
 	}
 
-	public MusicSheetPurchaseRecord setOrderStatus(Integer orderStatus) {
+	public MusicSheetPurchaseRecord setOrderStatus(YesOrNoEnum orderStatus) {
 	    this.orderStatus = orderStatus;
 	    return this;
 	}
 
-	public Integer getOrderStatus() {
+	public YesOrNoEnum getOrderStatus() {
 	    return this.orderStatus;
 	}
 

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

@@ -69,14 +69,14 @@ public interface MusicAlbumService extends IService<MusicAlbum> {
      *
      * @param musicAlbum 专辑对象
      */
-    void createMusicAlbum(MusicAlbum musicAlbum);
+    boolean createMusicAlbum(MusicAlbum musicAlbum);
 
     /**
      * 修改专辑
      *
      * @param musicAlbum 专辑对象
      */
-    void updateMusicAlbum(MusicAlbum musicAlbum);
+    boolean updateMusicAlbum(MusicAlbum musicAlbum);
 
     /**
      * 判断是否已收藏

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

@@ -149,4 +149,12 @@ public interface MusicSheetService extends IService<MusicSheet> {
      * @return boolean
      */
     boolean audit(TeacherMusicSheetAuditReq param, Long userId);
+
+    /**
+     * 假删除曲目
+     *
+     * @param id 曲目id
+     * @return boolean
+     */
+    boolean del(Long id);
 }

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

@@ -51,14 +51,14 @@ public interface MusicTagService extends IService<MusicTag>  {
 	 *
 	 * @param musicTagSaveDto 音乐标签信息
 	 */
-    void createMusicTag(MusicTagSaveDto musicTagSaveDto);
+    boolean createMusicTag(MusicTagSaveDto musicTagSaveDto);
 
 	/**
 	 * 修改音乐标签
 	 *
 	 * @param musicTagSaveDto 音乐标签信息
 	 */
-	void updateMusicTag(MusicTagSaveDto musicTagSaveDto);
+	boolean updateMusicTag(MusicTagSaveDto musicTagSaveDto);
 
 	/**
 	 * 获取标签树

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

@@ -120,20 +120,20 @@ public class MusicAlbumServiceImpl extends ServiceImpl<MusicAlbumDao,MusicAlbum>
 
     @Override
     @Transactional(rollbackFor = Exception.class)
-    public void createMusicAlbum(MusicAlbum musicAlbum) {
+    public boolean createMusicAlbum(MusicAlbum musicAlbum) {
         if (checkNameRepeat(musicAlbum.getAlbumName(),musicAlbum.getId())) {
             throw new BizException("专辑名称重复");
         }
-        this.save(musicAlbum);
+        return this.save(musicAlbum);
     }
 
     @Override
     @Transactional(rollbackFor = Exception.class)
-    public void updateMusicAlbum(MusicAlbum musicAlbum) {
+    public boolean updateMusicAlbum(MusicAlbum musicAlbum) {
         if (checkNameRepeat(musicAlbum.getAlbumName(),musicAlbum.getId())) {
             throw new BizException("专辑名称重复");
         }
-        this.updateById(musicAlbum);
+        return this.updateById(musicAlbum);
     }
 
     @Override

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

@@ -134,6 +134,9 @@ public class MusicSheetServiceImpl extends ServiceImpl<MusicSheetDao,MusicSheet>
     @Override
     public MusicSheetDetailVo detail(Long id, SysUser sysUser,SysUserType userType) {
         MusicSheetDetailVo detail = baseMapper.detail(id);
+        if (detail == null) {
+            throw new BizException("未找到曲目信息");
+        }
         if (ChargeTypeEnum.FREE.getCode().equals(detail.getChargeType().getCode())) {
             detail.setPlay(YesOrNoEnum.YES);
         }  else if (SysUserType.STUDENT.getCode().equals(userType.getCode())) {
@@ -241,4 +244,13 @@ public class MusicSheetServiceImpl extends ServiceImpl<MusicSheetDao,MusicSheet>
             return false;
         }
     }
+
+    @Override
+    public boolean del(Long id) {
+        return this.lambdaUpdate()
+                .eq(MusicSheet::getId,id)
+                .set(MusicSheet::getDelFlag,true)
+                .update();
+
+    }
 }

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

@@ -1,5 +1,6 @@
 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;
@@ -82,7 +83,16 @@ public class MusicTagServiceImpl extends ServiceImpl<MusicTagDao, MusicTag> impl
         MusicTag musicTag = new MusicTag();
         musicTag.setId(musicTagId);
         musicTag.setDelFlag(true);
-        return this.updateById(musicTag);
+        if (this.updateById(musicTag)) {
+            // 删除下面的子集标签
+            return this.lambdaUpdate()
+                       .eq(MusicTag::getParentTagId,musicTagId)
+                       .set(MusicTag::getDelFlag,true)
+                       .update();
+        }
+
+        return false;
+
     }
 
     @Override
@@ -104,7 +114,7 @@ public class MusicTagServiceImpl extends ServiceImpl<MusicTagDao, MusicTag> impl
 
     @Override
     @Transactional(rollbackFor = Exception.class)
-    public void createMusicTag(MusicTagSaveDto musicTagSaveDto) {
+    public boolean createMusicTag(MusicTagSaveDto musicTagSaveDto) {
 
         if (checkNameRepeat(musicTagSaveDto.getName(), musicTagSaveDto.getId())) {
             throw new BizException("标签名称重复");
@@ -122,7 +132,7 @@ public class MusicTagServiceImpl extends ServiceImpl<MusicTagDao, MusicTag> impl
         musicTag.setName(musicTagSaveDto.getName());
         musicTag.setCreateTime(new Date());
         musicTag.setCreateBy(sysUser.getId());
-        this.save(musicTag);
+        return this.save(musicTag);
     }
 
     /**
@@ -144,7 +154,7 @@ public class MusicTagServiceImpl extends ServiceImpl<MusicTagDao, MusicTag> impl
 
     @Override
     @Transactional(rollbackFor = Exception.class)
-    public void updateMusicTag(MusicTagSaveDto musicTagSaveDto) {
+    public boolean updateMusicTag(MusicTagSaveDto musicTagSaveDto) {
 
         if (checkNameRepeat(musicTagSaveDto.getName(), musicTagSaveDto.getId())) {
             throw new BizException("标签名称重复");
@@ -162,7 +172,7 @@ public class MusicTagServiceImpl extends ServiceImpl<MusicTagDao, MusicTag> impl
         musicTag.setName(musicTagSaveDto.getName());
         musicTag.setUpdateTime(new Date());
         musicTag.setUpdateBy(sysUser.getId());
-        this.updateById(musicTag);
+        return this.updateById(musicTag);
     }
 
     @Override

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

@@ -54,6 +54,7 @@
         t.create_by_ as createBy,
         t.update_time_ as updateTime,
         t.update_by_ as updateBy,
+        t.del_flag_ as delFlag,
         t.remark_ as remark
     </sql>
 
@@ -97,6 +98,9 @@
         <if test="param.createBy != null">
             and t.create_by_ = #{param.createBy}
         </if>
+        <if test="param.delFlag != null">
+            and t.del_flag_ = #{param.delFlag}
+        </if>
     </sql>
 
     <select id="selectAlbumDetailPage" resultType="com.yonge.cooleshow.biz.dal.entity.MusicSheet">
@@ -132,6 +136,9 @@
                     and (amr.album_id_ &lt;&gt;  #{param.id} or amr.album_id_ is null)
                 </if>
             </if>
+            <if test="param.delFlag != null">
+                and t.del_flag_ = #{param.delFlag}
+            </if>
         </where>
     </select>
 
@@ -176,6 +183,7 @@
         <result column="createBy" jdbcType="BIGINT" property="createBy"/>
         <result column="updateTime" jdbcType="TIMESTAMP" property="updateTime"/>
         <result column="updateBy" jdbcType="BIGINT" property="updateBy"/>
+        <result column="delFlag" jdbcType="BOOLEAN" property="delFlag"/>
         <result column="remark" jdbcType="VARCHAR" property="remark"/>
         <collection property="background" ofType="com.yonge.cooleshow.biz.dal.entity.MusicSheetAccompaniment">
             <id column="accompanimentId" jdbcType="BIGINT" property="id"/>
@@ -285,7 +293,9 @@
         from music_sheet_purchase_record mspr
         left join music_sheet ms on mspr.music_sheet_id_ = ms.id_
         <where>
-            mspr.order_status_ = '${@ com.yonge.cooleshow.biz.dal.enums.YesOrNoEnum@YES}'
+            <if test="param.orderStatus != null">
+                and mspr.order_status_ = #{param.orderStatus}
+            </if>
             <if test="param.idAndName != null and param.idAndName != ''">
                 and (ms.id_ like concat('%',#{param.idAndName} ,'%')
                     or ms.music_sheet_name_ like concat('%',#{param.idAndName},'%'))
@@ -308,6 +318,9 @@
             <if test="param.endTime != null">
                 and mspr.purchase_time_ &lt; #{param.endTime}
             </if>
+            <if test="param.delFlag != null">
+                and ms.del_flag_ = #{param.delFlag}
+            </if>
         </where>
     </select>
 
@@ -341,6 +354,9 @@
             <if test="param.endTime != null">
                 and ms.create_time_ &lt; #{param.endTime}
             </if>
+            <if test="param.delFlag != null">
+                and ms.del_flag_ = #{param.delFlag}
+            </if>
         </where>
     </select>
 
@@ -383,6 +399,9 @@
             <if test="param.endTime != null">
                 and ms.create_time_ &lt; #{param.endTime}
             </if>
+            <if test="param.delFlag != null">
+                and ms.del_flag_ = #{param.delFlag}
+            </if>
         </where>
     </select>
 </mapper>

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

@@ -45,7 +45,7 @@ public class MusicAlbumController extends BaseController {
     @PostMapping(value="/list", consumes="application/json", produces="application/json")
     public HttpResponseResult<PageInfo<MusicAlbumVo>> list(@RequestBody MusicAlbumSearch query) {
         SysUser sysUser = sysUserFeignService.queryUserInfo();
-        if (sysUser == null) {
+        if (sysUser == null  || sysUser.getId() == null) {
             return failed("用户信息获取失败");
         }
         query.setAlbumStatus(StateEnum.ENABLE);
@@ -57,11 +57,11 @@ public class MusicAlbumController extends BaseController {
     /**
      * 专辑详情
      */
-    @PostMapping("/detail")
-    @ApiOperation(value = "专辑详情", consumes="application/json", produces="application/json")
+    @PostMapping(value = "/detail",  consumes="application/json", produces="application/json")
+    @ApiOperation(value = "专辑详情",httpMethod="POST", consumes="application/json", produces="application/json")
     public HttpResponseResult<AlbumDetailVo> detail(@Valid @RequestBody MusicAlbumDetailSearch query) {
         SysUser sysUser = sysUserFeignService.queryUserInfo();
-        if (sysUser == null) {
+        if (sysUser == null  || sysUser.getId() == null) {
             return failed("用户信息获取失败");
         }
         query.setType(2);
@@ -79,7 +79,7 @@ public class MusicAlbumController extends BaseController {
     @ApiOperation(value = "专辑收藏/取消收藏")
     public HttpResponseResult<Boolean> favorite(@ApiParam(value = "专辑编号", required = true) @PathVariable("id") Long id) {
         SysUser sysUser = sysUserFeignService.queryUserInfo();
-        if (sysUser == null) {
+        if (sysUser == null  || sysUser.getId() == null) {
             return failed("用户信息获取失败");
         }
 
@@ -94,7 +94,7 @@ public class MusicAlbumController extends BaseController {
     @ApiOperation(value = "收藏专辑列表")
     public HttpResponseResult<PageInfo<MusicAlbumVo>> favoriteAlbum(Query query) {
         SysUser sysUser = sysUserFeignService.queryUserInfo();
-        if (sysUser == null) {
+        if (sysUser == null  || sysUser.getId() == null) {
             return failed("用户信息获取失败");
         }
         StudentMusicAlbumSearch search = new StudentMusicAlbumSearch();

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

@@ -45,7 +45,7 @@ public class MusicSheetController extends BaseController {
     @ApiOperation(value = "详情", notes = "传入musicTag")
     public HttpResponseResult<MusicSheetDetailVo> detail(@ApiParam(value = "曲谱编号", required = true) @PathVariable("id") Long id) {
         SysUser sysUser = sysUserFeignService.queryUserInfo();
-        if (sysUser == null) {
+        if (sysUser == null  || sysUser.getId() == null) {
             return failed("用户信息获取失败");
         }
         return succeed(musicSheetService.detail(id, sysUser, SysUserType.STUDENT));
@@ -55,7 +55,7 @@ public class MusicSheetController extends BaseController {
     @PostMapping(value="/list", consumes="application/json", produces="application/json")
     public HttpResponseResult<PageInfo<MusicSheetVo>> list(@RequestBody StudentMusicSheetSearch query) {
         SysUser sysUser = sysUserFeignService.queryUserInfo();
-        if (sysUser == null) {
+        if (sysUser == null  || sysUser.getId() == null) {
             return failed("用户信息获取失败");
         }
 
@@ -74,7 +74,7 @@ public class MusicSheetController extends BaseController {
     @ApiOperation(value = "曲目收藏/取消收藏")
     public HttpResponseResult<Boolean> favorite(@ApiParam(value = "曲目编号", required = true) @PathVariable("id") Long id) {
         SysUser sysUser = sysUserFeignService.queryUserInfo();
-        if (sysUser == null) {
+        if (sysUser == null  || sysUser.getId() == null) {
             return failed("用户信息获取失败");
         }
         return succeed(musicSheetService.setFavorite(sysUser.getId(),id));
@@ -89,7 +89,7 @@ public class MusicSheetController extends BaseController {
     @ApiOperation(value = "我的单曲")
     public HttpResponseResult<PageInfo<MusicSheetVo>> myMusic(Query query) {
         SysUser sysUser = sysUserFeignService.queryUserInfo();
-        if (sysUser == null) {
+        if (sysUser == null  || sysUser.getId() == null) {
             return failed("用户信息获取失败");
         }
         StudentMusicSheetSearch search = new StudentMusicSheetSearch();
@@ -108,7 +108,7 @@ public class MusicSheetController extends BaseController {
     @ApiOperation(value = "收藏单曲")
     public HttpResponseResult<PageInfo<MusicSheetVo>> favoriteMusic(Query query) {
         SysUser sysUser = sysUserFeignService.queryUserInfo();
-        if (sysUser == null) {
+        if (sysUser == null  || sysUser.getId() == null) {
             return failed("用户信息获取失败");
         }
         StudentMusicSheetSearch search = new StudentMusicSheetSearch();
@@ -127,7 +127,7 @@ public class MusicSheetController extends BaseController {
     @ApiOperation(value = "最近练习")
     public HttpResponseResult<PageInfo<MusicSheetVo>> practiceMusic(Query query) {
         SysUser sysUser = sysUserFeignService.queryUserInfo();
-        if (sysUser == null) {
+        if (sysUser == null  || sysUser.getId() == null) {
             return failed("用户信息获取失败");
         }
         StudentMusicSheetSearch search = new StudentMusicSheetSearch();

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

@@ -0,0 +1,34 @@
+package com.yonge.cooleshow.student.controller;
+
+import com.yonge.cooleshow.biz.dal.service.MusicTagService;
+import com.yonge.cooleshow.biz.dal.vo.MusicTagVo;
+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.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.List;
+
+@RestController
+@RequestMapping("/MusicTag")
+@Api(value = "音乐标签表", tags = "音乐标签表")
+public class MusicTagController extends BaseController {
+
+    @Autowired
+    private MusicTagService musicTagService;
+
+	/**
+	 * 查询分页tree
+	 */
+	@GetMapping("/tree")
+	@ApiOperation(value = "查询标签树列表")
+	public HttpResponseResult<List<MusicTagVo>> tree() {
+		List<MusicTagVo> treeList = musicTagService.selectMusicTagTree();
+		return succeed(treeList);
+	}
+
+}

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

@@ -56,7 +56,7 @@ public class MusicSheetController extends BaseController {
     @ApiOperation(value = "详情", notes = "传入musicTag")
     public HttpResponseResult<MusicSheetDetailVo> detail(@ApiParam(value = "曲谱编号", required = true) @PathVariable("id") Long id) {
         SysUser sysUser = sysUserFeignService.queryUserInfo();
-        if (sysUser == null) {
+        if (sysUser == null  || sysUser.getId() == null) {
             return failed("用户信息获取失败");
         }
         return succeed(musicSheetService.detail(id, sysUser, SysUserType.TEACHER));
@@ -66,7 +66,7 @@ public class MusicSheetController extends BaseController {
     @PostMapping(value="/create", consumes="application/json", produces="application/json")
     public HttpResponseResult<Object> create(@Valid @RequestBody MusicSheetDto musicSheetDto) {
         SysUser sysUser = sysUserFeignService.queryUserInfo();
-        if (sysUser == null) {
+        if (sysUser == null  || sysUser.getId() == null) {
             return failed("用户信息获取失败");
         }
 
@@ -99,7 +99,7 @@ public class MusicSheetController extends BaseController {
     @PostMapping(value="/list", consumes="application/json", produces="application/json")
     public HttpResponseResult<PageInfo<MusicSheetVo>> list(@RequestBody MusicSheetSearch query) {
         SysUser sysUser = sysUserFeignService.queryUserInfo();
-        if (sysUser == null) {
+        if (sysUser == null  || sysUser.getId() == null) {
             return failed("用户信息获取失败");
         }
         // 设置只查老师用户 状态为启用
@@ -113,7 +113,7 @@ public class MusicSheetController extends BaseController {
     @GetMapping(value="/share")
     public HttpResponseResult<MusicSheetShareVo> shareMusicSheet() {
         SysUser sysUser = sysUserFeignService.queryUserInfo();
-        if (sysUser == null) {
+        if (sysUser == null  || sysUser.getId() == null) {
             return failed("用户信息获取失败");
         }
         return succeed(musicSheetService.shareMusicSheet(sysUser));

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

@@ -25,7 +25,7 @@ public class MusicTagController extends BaseController {
 	 * 查询分页tree
 	 */
 	@GetMapping("/tree")
-	@ApiOperation(value = "查询标签树列表", notes = "传入musicTag")
+	@ApiOperation(value = "查询标签树列表")
 	public HttpResponseResult<List<MusicTagVo>> tree() {
 		List<MusicTagVo> treeList = musicTagService.selectMusicTagTree();
 		return succeed(treeList);