酷乐秀曲目来源改为内容平台

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

@@ -118,14 +118,14 @@ public class MusicSheetController extends BaseController {
         }
     }
 
-    @ApiOperation(value = "新增/修改", notes = "曲目表- 传入 MusicSheetWrapper.MusicSheet")
+    /*@ApiOperation(value = "新增/修改", notes = "曲目表- 传入 MusicSheetWrapper.MusicSheet")
     @PostMapping("/save")
     public HttpResponseResult<Long> cbsAdd(@Validated @RequestBody CbsMusicSheetWrapper.AddMusicSheet addMusicSheet) {
         SysUser sysUser = sysUserService.getUser();
         addMusicSheet.setCreateBy(sysUser.getId());
         addMusicSheet.setSourceType(EMusicSourceType.PERSON);
         return succeed(cbsMusicScoreService.musicSheetAdd(addMusicSheet));
-    }
+    }*/
 
     @ApiOperation(value = "曲目分页查询", httpMethod="POST", consumes="application/json", produces="application/json")
     @PostMapping(value="/list", consumes="application/json", produces="application/json")

cooleshow-app/src/main/java/com/yonge/cooleshow/website/controller/MusicSheetAuthRecordController.java

@@ -0,0 +1,42 @@
+package com.yonge.cooleshow.website.controller;
+
+import com.yonge.cooleshow.auth.api.entity.SysUser;
+import com.yonge.cooleshow.biz.dal.entity.MusicSheetAuthRecord;
+import com.yonge.cooleshow.biz.dal.service.MusicSheetAuthRecordService;
+import com.yonge.cooleshow.biz.dal.service.SysUserService;
+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.validation.annotation.Validated;
+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.RestController;
+
+import javax.annotation.Resource;
+
+@RestController
+@RequestMapping("${app-config.url.website:}/musicSheetAuthRecord")
+@Api(tags = "曲谱审核表 API接口")
+public class MusicSheetAuthRecordController extends BaseController {
+    @Resource
+    private MusicSheetAuthRecordService musicSheetAuthRecordService;
+	@Resource
+	private SysUserService sysUserService;
+
+    @ApiOperation(value = "新增", notes = " 传入 MusicSheetAuthRecord")
+    @PostMapping("/save")
+    public HttpResponseResult<Integer> cbsAdd(@RequestBody MusicSheetAuthRecord musicSheetAuthRecord) {
+        SysUser sysUser = sysUserService.getUser();
+        musicSheetAuthRecord.setSubmitUserId(sysUser.getId());
+        return succeed(musicSheetAuthRecordService.addRecord(musicSheetAuthRecord));
+    }
+
+    @ApiOperation(value = "修改", notes = " 传入 MusicSheetAuthRecord")
+    @PostMapping("/update")
+    public HttpResponseResult update(@Validated @RequestBody MusicSheetAuthRecord musicSheetAuthRecord) {
+        musicSheetAuthRecordService.updateRecord(musicSheetAuthRecord);
+        return succeed();
+    }
+}

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

@@ -171,7 +171,7 @@ public class MusicSheetController extends BaseController {
         return succeed(teacherAuditMusicSheetVo);
     }
 
-    @ApiOperation(value = "老师新增曲目", httpMethod="POST", consumes="application/json", produces="application/json")
+    /*@ApiOperation(value = "老师新增曲目", httpMethod="POST", consumes="application/json", produces="application/json")
     @PostMapping(value="/create", consumes="application/json", produces="application/json")
     public HttpResponseResult<Object> create(@Valid @RequestBody MusicSheetDto musicSheetDto) {
         SysUser sysUser = sysUserFeignService.queryUserInfo();
@@ -194,7 +194,7 @@ public class MusicSheetController extends BaseController {
         musicSheetDto.setCreateTime(new Date());
         musicSheetService.saveMusicSheet(musicSheetDto,sysUser.getId());
         return succeed("新增曲谱成功");
-    }
+    }*/
 
     /**
      * 启用/停用
@@ -217,7 +217,7 @@ public class MusicSheetController extends BaseController {
     }
 
 
-    @ApiOperation(value = "修改", httpMethod="POST", consumes="application/json", produces="application/json")
+    /*@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 MusicSheetDto musicSheet) {
         SysUser sysUser = sysUserFeignService.queryUserInfo();
@@ -241,7 +241,7 @@ public class MusicSheetController extends BaseController {
         } else {
             return failed("修改失败");
         }
-    }
+    }*/
 
     @ApiOperation(value = "关联的曲目列表")
     @GetMapping(value="/queryRelatedList")

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

@@ -181,7 +181,7 @@ public interface MusicSheetService extends IService<MusicSheet> {
      * @param query 查询条件
      * @return page
      */
-    IPage<TeacherMusicSheetVo> selectAuditPage(IPage<TeacherMusicSheetVo> page, TeacherMusicSheetAuditSearch query);
+//    IPage<TeacherMusicSheetVo> selectAuditPage(IPage<TeacherMusicSheetVo> page, TeacherMusicSheetAuditSearch query);
 
     /**
      * 审核曲目
@@ -190,9 +190,9 @@ public interface MusicSheetService extends IService<MusicSheet> {
      * @param userId 审核员id
      * @return boolean
      */
-    boolean audit(TeacherMusicSheetAuditReq param, Long userId);
+//    boolean audit(TeacherMusicSheetAuditReq param, Long userId);
 
-    void auditSyncCbs(Long cbsMusicSheetId);
+//    void auditSyncCbs(Long cbsMusicSheetId);
 
     /**
      * 假删除曲目
@@ -215,7 +215,7 @@ public interface MusicSheetService extends IService<MusicSheet> {
      * @param musicSheetDto
      * @return
      */
-    boolean saveMusicSheet(MusicSheetDto musicSheetDto,Long userId);
+//    boolean saveMusicSheet(MusicSheetDto musicSheetDto,Long userId);
 
     /**
      * 曲目购买前的验证
@@ -286,7 +286,7 @@ public interface MusicSheetService extends IService<MusicSheet> {
      * @param dataList 导入信息
      * @param userId 导入人id
      */
-    void importExcel(List<ExcelDataReaderProperty<MusicSheetExport>> dataList, Long userId);
+//    void importExcel(List<ExcelDataReaderProperty<MusicSheetExport>> dataList, Long userId);
 
     /**
      * 官网曲目详情

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

@@ -10,7 +10,7 @@ import org.springframework.web.bind.annotation.RequestBody;
 public interface CbsMusicScoreService {
     R<PageInfo<CbsMusicSheetWrapper.MusicSheetApplication>> selectPage(CbsMusicSheetWrapper.MusicSheetApplicationQuery query);
 
-    Long musicSheetAdd(CbsMusicSheetWrapper.AddMusicSheet addMusicSheet);
+//    Long musicSheetAdd(CbsMusicSheetWrapper.AddMusicSheet addMusicSheet);
 
     void update(CbsMusicSheetApplicationExtendClientWrapper.AddMusicSheetApplicationExtend addMusicSheetApplicationExtend);
 

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

@@ -41,7 +41,7 @@ public class CbsMusicScoreServiceImpl implements CbsMusicScoreService {
         return musicFeignClientService.musicSheetPageByApplication(query);
     }
 
-    @Override
+    /*@Override
     @Transactional(rollbackFor = Exception.class)
     public Long musicSheetAdd(CbsMusicSheetWrapper.AddMusicSheet addMusicSheet) {
         List<CbsMusicSheetApplicationExtendClientWrapper.AddMusicSheetApplicationExtend> addMusicSheetApplicationExtend = addMusicSheet.getAddMusicSheetApplicationExtend();
@@ -87,9 +87,9 @@ public class CbsMusicScoreServiceImpl implements CbsMusicScoreService {
         musicSheetService.updateById(musicSheet);
         musicSheetAuthRecordService.setAuditDoing(musicSheet.getId(),addMusicSheetId,null);
         return musicSheet.getId();
-    }
+    }*/
 
-    @Transactional(rollbackFor = Exception.class)
+    /*@Transactional(rollbackFor = Exception.class)
     public Long musicSheetAdd1(CbsMusicSheetWrapper.AddMusicSheet addMusicSheet) {
         List<CbsMusicSheetApplicationExtendClientWrapper.AddMusicSheetApplicationExtend> addMusicSheetApplicationExtend = addMusicSheet.getAddMusicSheetApplicationExtend();
         if(CollectionUtils.isEmpty(addMusicSheetApplicationExtend)){
@@ -134,7 +134,7 @@ public class CbsMusicScoreServiceImpl implements CbsMusicScoreService {
         musicSheetService.updateById(musicSheet);
         musicSheetAuthRecordService.setAuditDoing(musicSheet.getId(),addMusicSheetId,null);
         return musicSheet.getId();
-    }
+    }*/
 
     @Override
     public void update(CbsMusicSheetApplicationExtendClientWrapper.AddMusicSheetApplicationExtend addMusicSheetApplicationExtend) {

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

@@ -58,7 +58,6 @@ public class MusicSheetAuthRecordServiceImpl extends ServiceImpl<MusicSheetAuthR
     @Override
     @Transactional(rollbackFor = Exception.class)
     public void audit(TeacherMusicSheetAuditReq param, Long userId) {
-        musicSheetService.audit(param, userId);
         // 查询到审核记录
         List<MusicSheetAuthRecord> list = this.lambdaQuery()
                                               .eq(MusicSheetAuthRecord::getMusicSheetId, param.getMusicSheetId())

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

@@ -1090,12 +1090,12 @@ public class MusicSheetServiceImpl extends ServiceImpl<MusicSheetDao, MusicSheet
         return page.setRecords(baseMapper.selectTeacherPage(page, query));
     }
 
-    @Override
+    /*@Override
     public IPage<TeacherMusicSheetVo> selectAuditPage(IPage<TeacherMusicSheetVo> page, TeacherMusicSheetAuditSearch query) {
         return page.setRecords(baseMapper.selectAuditPage(page, query));
-    }
+    }*/
 
-    @Override
+    /*@Override
     @Transactional(rollbackFor = Exception.class)
     public boolean audit(TeacherMusicSheetAuditReq param, Long userId) {
 
@@ -1111,9 +1111,9 @@ public class MusicSheetServiceImpl extends ServiceImpl<MusicSheetDao, MusicSheet
         Long originalMusicSheetId = musicSheetAuthRecordService.audit(param, userId);
         musicSheet.setAuditStatus(param.getAuthStatus());
         // 生成图片统一使用开放接口，去掉当前校验规则
-        /*if (param.getAuthStatus().equals(AuthStatusEnum.PASS) && StringUtil.isEmpty(param.getMusicImg())) {
+        *//*if (param.getAuthStatus().equals(AuthStatusEnum.PASS) && StringUtil.isEmpty(param.getMusicImg())) {
             throw new BizException("曲目渲染失败");
-        } else*/
+        } else*//*
 
         if (param.getAuthStatus().equals(AuthStatusEnum.PASS) && !StringUtil.isEmpty(param.getMusicImg())) {
             musicSheet.setMusicImg(param.getMusicImg());
@@ -1161,9 +1161,9 @@ public class MusicSheetServiceImpl extends ServiceImpl<MusicSheetDao, MusicSheet
         }
 
         return flag;
-    }
+    }*/
 
-    @Override
+    /*@Override
     public void auditSyncCbs(Long cbsMusicSheetId){
         CbsMusicSheetWrapper.MusicSheetApplicationQuery query = new CbsMusicSheetWrapper.MusicSheetApplicationQuery();
         query.setApplicationId(applicationId);
@@ -1178,11 +1178,11 @@ public class MusicSheetServiceImpl extends ServiceImpl<MusicSheetDao, MusicSheet
         List<CbsMusicSheetWrapper.MusicSheetApplication> rows = pageInfoR.feignData().getRows();
         if (CollectionUtils.isEmpty(rows)) {
             throw new BizException("获取曲目信息失败");
-        }/*
+        }*//*
         R<CbsMusicSheetWrapper.MusicSheet> musicSheetR = musicFeignClientService.musicSheetDetail(cbsMusicSheetId, applicationId);
         if (musicSheetR.getCode() != 200) {
             throw new BizException("获取曲目详情失败,{}", musicSheetR.getMessage());
-        }*/
+        }*//*
         CbsMusicSheetWrapper.MusicSheetApplication musicSheetApplication = rows.get(0);
         CbsMusicSheetApplicationExtendClientWrapper.MusicSheetApplicationExtendStatus extendStatus = new CbsMusicSheetApplicationExtendClientWrapper.MusicSheetApplicationExtendStatus();
         extendStatus.setIds(musicSheetApplication.getApplicationExtendId().toString());
@@ -1231,7 +1231,7 @@ public class MusicSheetServiceImpl extends ServiceImpl<MusicSheetDao, MusicSheet
                     receivers, null, 0, null, ClientEnum.TEACHER.getCode(), musicSheet.getMusicSheetName(),
                     param.getRemark());
         }
-    }
+    }*/
 
     @Override
     @Transactional(rollbackFor = Exception.class)
@@ -1259,7 +1259,7 @@ public class MusicSheetServiceImpl extends ServiceImpl<MusicSheetDao, MusicSheet
                 .count();
     }
 
-    @Override
+    /*@Override
     @Transactional(rollbackFor = Exception.class)
     public boolean saveMusicSheet(MusicSheetDto musicSheetDto, Long userId) {
 
@@ -1304,9 +1304,9 @@ public class MusicSheetServiceImpl extends ServiceImpl<MusicSheetDao, MusicSheet
             musicSheetDto.setMusicPrice(BigDecimal.ZERO);
         }
 
-        /*if (musicSheetDto.getChargeType().equals(ChargeTypeEnum.VIP) || musicSheetDto.getChargeType().equals(ChargeTypeEnum.FREE)) {
+        *//*if (musicSheetDto.getChargeType().equals(ChargeTypeEnum.VIP) || musicSheetDto.getChargeType().equals(ChargeTypeEnum.FREE)) {
             musicSheetDto.setMusicPrice(BigDecimal.ZERO);
-        }*/
+        }*//*
 
         // 删除曲目专辑关联
         if (oldMusicSheet != null && oldMusicSheet.getMusicSubject() != null
@@ -1341,7 +1341,7 @@ public class MusicSheetServiceImpl extends ServiceImpl<MusicSheetDao, MusicSheet
 
             return true;
         }
-    }
+    }*/
 
     /**
      * 删除专辑曲目关联
@@ -1689,7 +1689,7 @@ public class MusicSheetServiceImpl extends ServiceImpl<MusicSheetDao, MusicSheet
         return homeMusicSheetVo;
     }
 
-    @Override
+    /*@Override
     @Transactional(rollbackFor = Exception.class)
     public void importExcel(List<ExcelDataReaderProperty<MusicSheetExport>> dataList, Long userId) {
 
@@ -1801,7 +1801,7 @@ public class MusicSheetServiceImpl extends ServiceImpl<MusicSheetDao, MusicSheet
 
         musicSheetDtoList.forEach(musicSheetDto -> saveMusicSheet(musicSheetDto, userId));
 
-    }
+    }*/
 
     @Override
     public MusicSheetWebsiteDetailVo websiteDetail(Long musicSheetId, SysUser sysUser, ClientEnum clientType) {