Merge branch 'zx_online_cbs' of http://git.dayaedu.com/yonge/cooleshow into develop-new

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

@@ -1,417 +1,105 @@
 package com.yonge.cooleshow.admin.controller;
 
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.yonge.cooleshow.auth.api.client.SysUserFeignService;
-import com.yonge.cooleshow.auth.api.entity.SysUser;
+import com.alibaba.fastjson.JSONObject;
+import com.dayaedu.cbs.openfeign.wrapper.music.CbsMusicSheetApplicationExtendClientWrapper;
+import com.dayaedu.cbs.openfeign.wrapper.music.CbsMusicSheetWrapper;
+import com.microsvc.toolkit.common.response.template.R;
 import com.yonge.cooleshow.biz.dal.dto.AdjustModel;
-import com.yonge.cooleshow.biz.dal.dto.MusicSheetDto;
-import com.yonge.cooleshow.biz.dal.dto.MusicSheetExport;
-import com.yonge.cooleshow.biz.dal.dto.MusicSheetRenderDto;
-import com.yonge.cooleshow.biz.dal.dto.ReasonDto;
-import com.yonge.cooleshow.biz.dal.dto.req.TeacherMusicSheetAuditReq;
-import com.yonge.cooleshow.biz.dal.dto.search.MusicSheetSearch;
 import com.yonge.cooleshow.biz.dal.dto.search.StudentMusicSheetOrderSearch;
-import com.yonge.cooleshow.biz.dal.dto.search.TeacherMusicSheetAuditSearch;
 import com.yonge.cooleshow.biz.dal.dto.search.TeacherMusicSheetSearch;
 import com.yonge.cooleshow.biz.dal.entity.MusicSheet;
-import com.yonge.cooleshow.biz.dal.enums.AuthStatusEnum;
-import com.yonge.cooleshow.biz.dal.enums.ChargeTypeEnum;
 import com.yonge.cooleshow.biz.dal.enums.ClientEnum;
-import com.yonge.cooleshow.biz.dal.enums.MusicSheetTypeEnum;
 import com.yonge.cooleshow.biz.dal.enums.OrderTypeEnum;
-import com.yonge.cooleshow.biz.dal.enums.SourceTypeEnum;
 import com.yonge.cooleshow.biz.dal.service.MusicSheetService;
-import com.yonge.cooleshow.biz.dal.service.MusicTagService;
+import com.yonge.cooleshow.biz.dal.service.SysUserService;
+import com.yonge.cooleshow.biz.dal.service.cbs.CbsMusicScoreService;
 import com.yonge.cooleshow.biz.dal.vo.MusicSheetDetailVo;
 import com.yonge.cooleshow.biz.dal.vo.MusicSheetStudentByMessage;
-import com.yonge.cooleshow.biz.dal.vo.MusicSheetVo;
 import com.yonge.cooleshow.biz.dal.vo.StudentMusicSheetOrderVo;
 import com.yonge.cooleshow.biz.dal.vo.TeacherMusicSheetVo;
 import com.yonge.cooleshow.common.controller.BaseController;
 import com.yonge.cooleshow.common.entity.HttpResponseResult;
-import com.yonge.cooleshow.common.enums.BizHttpStatus;
-import com.yonge.cooleshow.common.enums.YesOrNoEnum;
-import com.yonge.toolset.base.exception.BizException;
 import com.yonge.toolset.base.page.PageInfo;
-import com.yonge.toolset.base.util.StringUtil;
 import com.yonge.toolset.mybatis.support.PageUtil;
-import com.yonge.toolset.utils.easyexcel.ErrMsg;
-import com.yonge.toolset.utils.easyexcel.ExcelDataReader;
-import com.yonge.toolset.utils.easyexcel.ExcelException;
-import com.yonge.toolset.utils.easyexcel.ExcelUtils;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.http.HttpStatus;
 import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.RestController;
-import org.springframework.web.multipart.MultipartFile;
+import org.springframework.web.bind.annotation.*;
 
+import javax.annotation.Resource;
 import javax.validation.Valid;
-import java.util.Date;
-import java.util.List;
 
-/**
- * 曲谱表 web 控制层
- * @author yzp
- * @date 2022-03-26 00:21:46
- * @version v1.0
- **/
 @RestController
-@RequestMapping("${app-config.url.admin:}/music/sheet")
+@RequestMapping("${app-config.url.admin:}/")
 @Api(tags = "曲谱表 API接口")
 public class MusicSheetController extends BaseController {
-    @Autowired
-    private SysUserFeignService sysUserFeignService;
-
-	@Autowired
+    @Resource
+    private SysUserService sysUserService;
+	@Resource
 	private MusicSheetService musicSheetService;
+	@Resource
+	private CbsMusicScoreService cbsMusicScoreService;
 
-    @Autowired
-    private MusicTagService musicTagService;
-
-    /**
-     * 查询单条
-     */
-    @GetMapping("/detail/{id}")
+    @GetMapping("music/sheet/detail/{id}")
     @ApiOperation(value = "详情", notes = "传入id")
     @PreAuthorize("@pcs.hasPermissions('music/sheet/detail')")
     public HttpResponseResult<MusicSheetDetailVo> detail(@ApiParam(value = "曲谱编号", required = true) @PathVariable("id") Long id) {
-        SysUser sysUser = sysUserFeignService.queryUserInfo();
-        if (sysUser == null  || sysUser.getId() == null) {
-            return failed("用户信息获取失败");
-        }
-        return succeed(musicSheetService.detail(id, sysUser, ClientEnum.SYSTEM));
-    }
-
-	@ApiOperation(value = "新增", httpMethod="POST", consumes="application/json", produces="application/json")
-    @PostMapping(value="/create", consumes="application/json", produces="application/json")
-    @PreAuthorize("@pcs.hasPermissions('music/sheet/create')")
-    public HttpResponseResult<Object> create(@Valid @RequestBody MusicSheetDto musicSheetDto) {
-        SysUser sysUser = sysUserFeignService.queryUserInfo();
-        if (sysUser == null  || sysUser.getId() == null) {
-            return failed("用户信息获取失败");
-        }
-
-        if (ChargeTypeEnum.CHARGE.getCode().equals(musicSheetDto.getChargeType().getCode())
-                && musicSheetDto.getMusicPrice()==null){
-            return failed("此曲谱为收费曲谱，需要提供价格");
-        }
-
-        // 单曲时声部必填，合奏非必填,默认单曲
-        if (musicSheetDto.getMusicSheetType() == null || StringUtil.isEmpty(musicSheetDto.getMusicSheetType())) {
-            musicSheetDto.setMusicSheetType(MusicSheetTypeEnum.SINGLE);
-        }
-        if (MusicSheetTypeEnum.SINGLE.equals(musicSheetDto.getMusicSheetType())
-                && StringUtil.isEmpty(musicSheetDto.getMusicSubject())) {
-            return failed("曲目声部不能为空");
-        }
-
-        if (musicSheetDto.getNotation() == null) {
-            musicSheetDto.setNotation(YesOrNoEnum.NO);
-        }
-        String musicTag = musicSheetDto.getMusicTag();
-        List<Long> musicTagList = StringUtil.toLongList(musicTag);
-
-        //  一级曲谱标签只能选一个二级
-        if (!musicTagService.checkParentDifferent(musicTagList)) {
-            return failed("每个一级标签只能选一个二级标签");
-        }
-
-        if (musicSheetDto.getProviderType() == null) {
-            musicSheetDto.setProviderType(SourceTypeEnum.PLATFORM);
-        }
-
-        // 合奏图片不做限制
-        if (MusicSheetTypeEnum.SINGLE.equals(musicSheetDto.getMusicSheetType()) &&
-                StringUtil.isEmpty(musicSheetDto.getMusicImg())) {
-            throw new BizException("曲目渲染失败");
-        }
-
-        musicSheetDto.setUserId(sysUser.getId());
-        musicSheetDto.setAuditStatus(AuthStatusEnum.PASS);
-        musicSheetDto.setFirstPassAuditTime(new Date());
-        musicSheetDto.setDelFlag(false);
-        musicSheetDto.setSourceType(SourceTypeEnum.PLATFORM);
-
-        musicSheetDto.setFavoriteCount(0);
-        musicSheetDto.setCreateBy(sysUser.getId());
-        musicSheetDto.setCreateTime(new Date());
-        musicSheetService.saveMusicSheet(musicSheetDto,sysUser.getId());
-
-        return succeed("新增曲谱成功");
-
+        return succeed(musicSheetService.detail(id, sysUserService.getUser(), ClientEnum.SYSTEM));
     }
 
-    @ApiOperation(value = "删除", httpMethod="POST", consumes="application/json", produces="application/json")
-    @PostMapping("/delete/{id}")
-    @PreAuthorize("@pcs.hasPermissions('music/sheet/delete')")
-    public Object delete(@PathVariable Long id) {
-        SysUser sysUser = sysUserFeignService.queryUserInfo();
-        if (sysUser == null  || sysUser.getId() == null) {
-            return failed("用户信息获取失败");
-        }
-
-        boolean result = musicSheetService.del(id);
-        if (result){
-            return succeed("删除成功");
-        } else {
-            return failed("删除失败");
-        }
-    }
-
-    @ApiOperation(value = "修改", httpMethod="POST", consumes="application/json", produces="application/json")
-    @PostMapping(value="/update", consumes="application/json", produces="application/json")
-    @PreAuthorize("@pcs.hasPermissions('music/sheet/update')")
-    public HttpResponseResult<Object> update(@Valid @RequestBody MusicSheetDto musicSheet) {
-        SysUser sysUser = sysUserFeignService.queryUserInfo();
-        if (sysUser == null  || sysUser.getId() == null) {
-            return failed("用户信息获取失败");
-        }
-        if (musicSheet.getId()==null){
-            return failed("缺少ID");
-        }
-        /*MusicSheet service = musicSheetService.getById(musicSheet.getId());
-        if (YesOrNoEnum.YES.getCode().equals(service.getState().getCode())) {
-            return failed("启用状态不许修改");
-        }*/
-
-        if (musicSheet.getNotation() == null) {
-            musicSheet.setNotation(YesOrNoEnum.NO);
-        }
-
-        // 合奏时图片不做限制
-        if (MusicSheetTypeEnum.SINGLE.equals(musicSheet.getMusicSheetType())
-                && StringUtil.isEmpty(musicSheet.getMusicImg())) {
-            throw new BizException("曲目渲染失败");
-        }
-
-        musicSheet.setUpdateBy(sysUser.getId());
-        musicSheet.setAuditStatus(AuthStatusEnum.PASS);
-        musicSheet.setUpdateTime(new Date());
-        if ( musicSheetService.saveMusicSheet(musicSheet,sysUser.getId())){
-            return succeed("修改成功");
-        } else {
-            return failed("修改失败");
-        }
-    }
-
-    @ApiOperation(value = "修改", httpMethod="POST", consumes="application/json", produces="application/json")
-    @PostMapping(value="/updateRenderFile", consumes="application/json", produces="application/json")
-    @PreAuthorize("@pcs.hasPermissions('music/sheet/updateRenderFile')")
-    public HttpResponseResult<Object> updateRenderFile(@Valid @RequestBody MusicSheetRenderDto musicSheetRenderDto) {
-        SysUser sysUser = sysUserFeignService.queryUserInfo();
-        if (sysUser == null  || sysUser.getId() == null) {
-            return failed("用户信息获取失败");
-        }
-        if (musicSheetRenderDto.getMusicSheetId()==null){
-            return failed("缺少ID");
-        }
-        MusicSheet musicSheet = musicSheetService.getById(musicSheetRenderDto.getMusicSheetId());
-        
-        if(musicSheet == null){
-        	return failed("参数异常");
-        }
-        musicSheet.setMusicFirstSvg(musicSheetRenderDto.getMusicFirstSvg());
-        musicSheet.setMusicJianSvg(musicSheetRenderDto.getMusicJianSvg());
-        musicSheet.setMusicJSON(musicSheetRenderDto.getMusicJSON());
-        musicSheet.setMusicSvg(musicSheetRenderDto.getMusicSvg());
-
-        musicSheet.setUpdateBy(sysUser.getId());
-        musicSheet.setUpdateTime(new Date());
-        if ( musicSheetService.updateById(musicSheet)){
-            return succeed("修改成功");
-        } else {
-            return failed("修改失败");
-        }
-    }
-
-    @ApiOperation(value = "分页查询", httpMethod="POST", consumes="application/json", produces="application/json")
-    @PostMapping(value="/list", consumes="application/json", produces="application/json")
+    @ApiOperation(value = "分页查询")
+    @PostMapping(value="music/sheet/list")
     @PreAuthorize("@pcs.hasPermissions('music/sheet/list')")
-    public HttpResponseResult<PageInfo<MusicSheetVo>> list(@RequestBody MusicSheetSearch query) {
-        SysUser sysUser = sysUserFeignService.queryUserInfo();
-        if (sysUser == null  || sysUser.getId() == null) {
-            return failed("用户信息获取失败");
-        }
-        query.setAuditStatus(AuthStatusEnum.PASS);
-        IPage<MusicSheetVo> musicSheetVoIPage = musicSheetService.selectPage(PageUtil.getPage(query), query);
-        return succeed(PageUtil.pageInfo(musicSheetVoIPage));
+    public R<com.microsvc.toolkit.common.response.paging.PageInfo<CbsMusicSheetWrapper.MusicSheetApplication>> list(@RequestBody CbsMusicSheetWrapper.MusicSheetApplicationQuery query) {
+        return cbsMusicScoreService.selectPage(query);
     }
 
-
-    /**
-     * 启用/停用
-     */
-    @PostMapping("/state/{id}")
-    @ApiOperation(value = "启用/停用", notes = "传入id")
-    @PreAuthorize("@pcs.hasPermissions('music/sheet/state')")
-    public HttpResponseResult<Boolean> state(@ApiParam(value = "曲目编号", required = true)  @PathVariable Long id, @RequestBody ReasonDto reasonDto) {
-        if (StringUtil.isEmpty(id)) {
-            return failed("参数不能为空");
-        }
-        MusicSheet musicSheet = musicSheetService.getById(id);
-        if (musicSheet == null) {
-            return failed("未找到曲目");
-        }
-        if (YesOrNoEnum.YES.equals(musicSheet.getState()) &&
-                musicSheet.getSourceType().equals(SourceTypeEnum.TEACHER) && StringUtil.isEmpty(reasonDto.getReason())) {
-            return failed("请填写下架原因");
-        }
-        return status(musicSheetService.state(id,reasonDto.getReason(),ClientEnum.SYSTEM));
+    @ApiOperation(value = "修改应用扩展信息")
+    @PreAuthorize("@pcs.hasPermissions('music/sheet/update', {'BACKEND'})")
+    @PostMapping("music/sheet/update")
+    public R<JSONObject> update(@RequestBody CbsMusicSheetApplicationExtendClientWrapper.AddMusicSheetApplicationExtend addMusicSheetApplicationExtend) {
+        cbsMusicScoreService.update(addMusicSheetApplicationExtend);
+        return R.defaultR();
     }
 
+    @ApiOperation(value = "启/停用")
+    @PreAuthorize("@pcs.hasPermissions('music/sheet/status', {'BACKEND'})")
+    @PostMapping("music/sheet/status")
+    public R<JSONObject> status(@RequestBody CbsMusicSheetApplicationExtendClientWrapper.MusicSheetApplicationExtendStatus status) {
+        cbsMusicScoreService.updateStatus(status);
+        return R.defaultR();
+    }
 
-    /**
-     * 批量启用/停用
-     */
-    @PostMapping("/stateList")
-    @ApiOperation(value = "批量启用/停用")
-    @PreAuthorize("@pcs.hasPermissions('music/sheet/stateList')")
-    public HttpResponseResult<Boolean> stateList(@RequestBody ReasonDto reasonDto) {
-        if (StringUtil.isEmpty(reasonDto.getMusicSheetIds())) {
-            return failed("参数不能为空");
-        }
-        if (reasonDto.getState() == null) {
-            return failed("启用/禁用状态不能为空");
-        }
-        if (reasonDto.getState().equals(YesOrNoEnum.NO) && StringUtil.isEmpty(reasonDto.getReason())) {
-            return failed("停用原因不能为空");
-        }
-
-        return status(musicSheetService.stateList(reasonDto));
+    @ApiOperation(value = "详情", notes = "曲目表-根据详情ID查询单条, 传入id")
+    @PreAuthorize("@pcs.hasPermissions('musicSheet/cbsDetail', {'BACKEND'})")
+    @GetMapping("musicSheet/cbsDetail/{id}")
+    public R<CbsMusicSheetWrapper.MusicSheet> cbsDetail(@PathVariable("id") Long id) {
+        return cbsMusicScoreService.musicSheetDetail(id);
     }
 
-    /**
-     * 学生详情-乐谱
-     */
-    @PostMapping(value = "/student", consumes="application/json", produces="application/json")
-    @ApiOperation(value = "学生详情-乐谱", httpMethod="POST", consumes="application/json", produces="application/json")
+    @PostMapping(value = "music/sheet/student")
+    @ApiOperation(value = "学生详情-乐谱")
     @PreAuthorize("@pcs.hasPermissions('music/sheet/student')")
     public HttpResponseResult<PageInfo<StudentMusicSheetOrderVo>> student(@Valid @RequestBody StudentMusicSheetOrderSearch query) {
         return succeed(PageUtil.pageInfo(musicSheetService.selectStudentOrderPage(PageUtil.getPage(query),query)));
     }
 
-
-    /**
-     * 老师详情-乐谱
-     */
-    @PostMapping(value = "/teacher", consumes="application/json", produces="application/json")
-    @ApiOperation(value = "老师详情-乐谱", httpMethod="POST", consumes="application/json", produces="application/json")
+    @PostMapping(value = "music/sheet/teacher")
+    @ApiOperation(value = "老师详情-乐谱")
     @PreAuthorize("@pcs.hasPermissions('music/sheet/teacher')")
     public HttpResponseResult<PageInfo<TeacherMusicSheetVo>> teacher(@Valid @RequestBody TeacherMusicSheetSearch query) {
         return succeed(PageUtil.pageInfo(musicSheetService.selectTeacherPage(PageUtil.getPage(query),query)));
     }
 
-    /**
-     * 审核中心-乐谱审核列表
-     */
-    @PostMapping(value = "/audit/list", consumes="application/json", produces="application/json")
-    @ApiOperation(value = "审核中心-乐谱审核列表", httpMethod="POST", consumes="application/json", produces="application/json")
-    @PreAuthorize("@pcs.hasPermissions('music/sheet/audit/list')")
-    public HttpResponseResult<PageInfo<TeacherMusicSheetVo>> audit(@RequestBody TeacherMusicSheetAuditSearch query) {
-        return succeed(PageUtil.pageInfo(musicSheetService.selectAuditPage(PageUtil.getPage(query),query)));
-    }
-
-    /**
-     * 审核中心-乐谱审核
-     */
-    @PostMapping(value = "/audit", consumes="application/json", produces="application/json")
-    @ApiOperation(value = "审核中心-乐谱审核", httpMethod="POST", consumes="application/json", produces="application/json")
-    @PreAuthorize("@pcs.hasPermissions('music/sheet/audit')")
-    public HttpResponseResult<Boolean> audit(@Valid @RequestBody TeacherMusicSheetAuditReq param) {
-        SysUser sysUser = sysUserFeignService.queryUserInfo();
-        if (sysUser == null  || sysUser.getId() == null) {
-            return failed("用户信息获取失败");
-        }
-        return status(musicSheetService.audit(param,sysUser.getId()));
-    }
-
-
-    /**
-     * 审核中心-乐谱审核
-     */
-    @GetMapping(value = "/auditDetail/{authMusicSheetId}")
-    @ApiOperation(value = "审核中心-乐谱审核详情",  notes = "传入曲目审核id")
-    public HttpResponseResult<MusicSheetDetailVo> auditDetail(@PathVariable Long authMusicSheetId) {
-
-        return succeed(musicSheetService.auditDetail(authMusicSheetId));
-    }
-
-
-
-    /**
-     * 审核中心-乐谱审核记录列表
-     */
-    @GetMapping(value = "/auditDetailList/{authMusicSheetId}")
-    @ApiOperation(value = "审核中心-乐谱审核详情历史记录",  notes = "传入曲目审核id")
-    public HttpResponseResult<List<MusicSheetDetailVo>> auditDetailList(@PathVariable Long authMusicSheetId) {
-
-        return succeed(musicSheetService.auditDetailList(authMusicSheetId));
-    }
-
-
-
-
-
-    @PostMapping(value = "/buySendMessage", consumes="application/json", produces="application/json")
-    @ApiOperation(value = "发送学生购买老师曲目信息", httpMethod="POST", consumes="application/json", produces="application/json")
+    @PostMapping(value = "music/sheet/buySendMessage")
+    @ApiOperation(value = "发送学生购买老师曲目信息")
     public HttpResponseResult<Boolean> buySendMessage(@Valid @RequestBody MusicSheetStudentByMessage param) {
-        SysUser sysUser = sysUserFeignService.queryUserInfo();
-        if (sysUser == null  || sysUser.getId() == null) {
-            return failed("用户信息获取失败");
-        }
         return status(musicSheetService.sendBuyMessage(param.getTeacherId(), param.getStudentId(), param.getMusicSheetId(),
                                                        ClientEnum.STUDENT, OrderTypeEnum.MUSIC));
     }
-    /**
-     * 导入
-     */
-    @PostMapping("/importExcel")
-    @ApiOperation(value = "导入", notes = "传入file")
-    public HttpResponseResult<List<ErrMsg>> importExcel(@RequestParam("file") MultipartFile file) {
-        if (null == file) {
-            return HttpResponseResult.failed("请上传文件");
-        }
-        SysUser user = sysUserFeignService.queryUserInfo();
-        if (user == null || null == user.getId()) {
-            return failed(HttpStatus.FORBIDDEN, "请登录");
-        }
-        try {
-            ExcelDataReader<MusicSheetExport> reader = ExcelUtils.getReader(MusicSheetExport.class, file);
-            musicSheetService.importExcel(reader.getDataList(), user.getId());
-            return HttpResponseResult.succeed();
-        } catch (ExcelException e) {
-            return HttpResponseResult.failed(BizHttpStatus.IMPORT.getCode(), e.getErrMsgList(), BizHttpStatus.IMPORT.getMsg());
-        }
-    }
-
 
-    /**
-     * 置顶
-     */
-    @PostMapping("/top/{id}")
-    @ApiOperation(value = "置顶曲目", notes = "传入id")
-    @PreAuthorize("@pcs.hasPermissions('music/sheet/top')")
-    public HttpResponseResult<Boolean> top(@ApiParam(value = "曲目编号", required = true)  @PathVariable Long id) {
-        if (StringUtil.isEmpty(id)) {
-            return failed("参数不能为空");
-        }
-        return status(musicSheetService.top(id));
-    }
-
-
-    /**
-     * 设置排序值 和加精
-     */
-    @PostMapping("/adjust")
+    @PostMapping("music/sheet/adjust")
     @ApiOperation(value = "曲目调整设置")
     public HttpResponseResult<Boolean> adjust(@RequestBody @Valid AdjustModel model) {
 
@@ -424,8 +112,4 @@ public class MusicSheetController extends BaseController {
 
         return succeed();
     }
-
-
-
-
 }

cooleshow-common/pom.xml

@@ -21,6 +21,11 @@
 
 	<dependencies>
 		<dependency>
+			<groupId>com.dayaedu.cbs.openfeign</groupId>
+			<artifactId>dayaedu-openfeign-client</artifactId>
+			<version>1.0.0</version>
+		</dependency>
+		<dependency>
 			<groupId>com.plumelog</groupId>
 			<artifactId>plumelog-logback</artifactId>
 			<version>3.5.3</version>

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

@@ -0,0 +1,16 @@
+package com.yonge.cooleshow.biz.dal.service.cbs;
+
+import com.dayaedu.cbs.openfeign.wrapper.music.CbsMusicSheetApplicationExtendClientWrapper;
+import com.dayaedu.cbs.openfeign.wrapper.music.CbsMusicSheetWrapper;
+import com.microsvc.toolkit.common.response.paging.PageInfo;
+import com.microsvc.toolkit.common.response.template.R;
+
+public interface CbsMusicScoreService {
+    R<PageInfo<CbsMusicSheetWrapper.MusicSheetApplication>> selectPage(CbsMusicSheetWrapper.MusicSheetApplicationQuery query);
+
+    void update(CbsMusicSheetApplicationExtendClientWrapper.AddMusicSheetApplicationExtend addMusicSheetApplicationExtend);
+
+    void updateStatus(CbsMusicSheetApplicationExtendClientWrapper.MusicSheetApplicationExtendStatus status);
+
+    R<CbsMusicSheetWrapper.MusicSheet> musicSheetDetail(Long id);
+}

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

@@ -0,0 +1,53 @@
+package com.yonge.cooleshow.biz.dal.service.cbs.impl;
+
+import com.alibaba.fastjson.JSONObject;
+import com.dayaedu.cbs.openfeign.client.MusicFeignClientService;
+import com.dayaedu.cbs.openfeign.wrapper.music.CbsMusicSheetApplicationExtendClientWrapper;
+import com.dayaedu.cbs.openfeign.wrapper.music.CbsMusicSheetWrapper;
+import com.microsvc.toolkit.common.response.paging.PageInfo;
+import com.microsvc.toolkit.common.response.template.R;
+import com.yonge.cooleshow.biz.dal.service.cbs.CbsMusicScoreService;
+import com.yonge.toolset.base.exception.BizException;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+
+@Slf4j
+@Service
+public class CbsMusicScoreServiceImpl implements CbsMusicScoreService {
+
+    @Value("${openfeign-client.app-id:1744906758234759169}")
+    public Long applicationId;
+    @Resource
+    private MusicFeignClientService musicFeignClientService;
+
+    @Override
+    public R<PageInfo<CbsMusicSheetWrapper.MusicSheetApplication>> selectPage(CbsMusicSheetWrapper.MusicSheetApplicationQuery query) {
+        query.setApplicationId(applicationId);
+        return musicFeignClientService.musicSheetPageByApplication(query);
+    }
+
+    @Override
+    public void update(CbsMusicSheetApplicationExtendClientWrapper.AddMusicSheetApplicationExtend addMusicSheetApplicationExtend) {
+        addMusicSheetApplicationExtend.setApplicationId(applicationId);
+        R<JSONObject> jsonObjectR = musicFeignClientService.musicSheetApplicationExtendUpdate(addMusicSheetApplicationExtend);
+        if (jsonObjectR.getCode() != 200) {
+            throw new BizException("修改失败,{}",jsonObjectR.getMessage());
+        }
+    }
+
+    @Override
+    public void updateStatus(CbsMusicSheetApplicationExtendClientWrapper.MusicSheetApplicationExtendStatus status) {
+        R<JSONObject> jsonObjectR = musicFeignClientService.musicSheetApplicationExtendStatus(status);
+        if (jsonObjectR.getCode() != 200) {
+            throw new BizException("修改状态失败,{}",jsonObjectR.getMessage());
+        }
+    }
+
+    @Override
+    public R<CbsMusicSheetWrapper.MusicSheet> musicSheetDetail(Long id) {
+        return musicFeignClientService.musicSheetDetail(id, applicationId);
+    }
+}

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

@@ -10,7 +10,6 @@ import com.dayaedu.cbs.openfeign.wrapper.music.CbsMusicSheetExtendWrapper;
 import com.dayaedu.cbs.openfeign.wrapper.music.CbsMusicSheetTagWrapper;
 import com.microsvc.toolkit.common.response.paging.PageInfo;
 import com.microsvc.toolkit.common.response.paging.QueryInfo;
-import com.yonge.cooleshow.biz.dal.dao.MusicSheetDao;
 import com.yonge.cooleshow.biz.dal.entity.MusicSheet;
 import com.yonge.cooleshow.biz.dal.service.MusicSheetService;
 import com.yonge.cooleshow.biz.dal.service.MusicTagService;
@@ -18,7 +17,6 @@ import com.yonge.toolset.base.exception.BizException;
 import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 

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

@@ -822,7 +822,7 @@
         </foreach>
     </update>
     <update id="batchEnable">
-        update music_sheet set state_ = #{state} where FIND_IN_SET(cbs_music_sheet_id_,#{ids})
+        update music_sheet set state_ = #{status} where FIND_IN_SET(cbs_music_sheet_id_,#{ids})
     </update>
     <update id="batchDel">
         DELETE FROM music_sheet where FIND_IN_SET(cbs_music_sheet_id_,#{ids})
@@ -882,8 +882,9 @@
     <select id="personOwnerList"
             resultType="com.dayaedu.cbs.openfeign.wrapper.music.CbsMusicSheetExtendWrapper$MusicSheetExtend">
         select su.id_ userId,su.username_ username
-             ,'TEACHER' clientType,su.phone_ phone from sys_user su
-        where su.user_type_ LIKE '%TEACHER%' AND su.del_flag_ = 0 AND su.lock_flag_ = 0
+        ,'TEACHER' clientType,su.phone_ phone from teacher t
+        left join sys_user su ON su.id_ = t.user_id_
+        where su.user_type_ LIKE '%TEACHER%' AND su.del_flag_ = 0 AND su.lock_flag_ = 0 AND t.lock_flag_ = 0
         <if test="param.name != null and param.name != ''">
             AND (su.phone_ LIKE CONCAT('%',#{param.name},'%') OR su.username_ LIKE CONCAT('%',#{param.name},'%'))
         </if>