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

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

@@ -50,6 +50,7 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 
+import javax.annotation.Resource;
 import javax.validation.Valid;
 import java.util.ArrayList;
 import java.util.Date;
@@ -65,19 +66,19 @@ import java.util.Optional;
 @RequestMapping("${app-config.url.student:}/music/sheet")
 @Api(tags = "曲谱表 API接口")
 public class MusicSheetController extends BaseController {
-    @Autowired
+    @Resource
     private SysUserFeignService sysUserFeignService;
 
-	@Autowired
+	@Resource
 	private MusicSheetService musicSheetService;
 
-    @Autowired
+    @Resource
     private MusicAlbumService musicAlbumService;
 
-    @Autowired
+    @Resource
     private AppVersionInfoService appVersionInfoService;
 
-    @Autowired
+    @Resource
     private StudentService studentService;
 
 
@@ -136,35 +137,6 @@ public class MusicSheetController extends BaseController {
         return succeed(PageUtil.pageInfo(musicSheetVoIPage));
     }
 
-    @ApiOperation(value = "修改", httpMethod="POST", consumes="application/json", produces="application/json")
-    @PostMapping(value="/updateRenderFile", consumes="application/json", produces="application/json")
-    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="/albumAndSheetList", consumes="application/json", produces="application/json")
     public HttpResponseResult<AlbumAndSheetVo> albumAndSheetList(@RequestBody StudentMusicSheetSearch query) {

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

@@ -8,6 +8,7 @@ import com.yonge.cooleshow.auth.api.entity.SysUser;
 import com.yonge.cooleshow.biz.dal.dto.AppMusicSheetVo;
 import com.yonge.cooleshow.biz.dal.dto.MusicSheetDto;
 import com.yonge.cooleshow.biz.dal.dto.MusicSheetRenderDto;
+import com.yonge.cooleshow.biz.dal.dto.ReasonDto;
 import com.yonge.cooleshow.biz.dal.dto.search.MusicSheetRelatedQueryInfo;
 import com.yonge.cooleshow.biz.dal.dto.search.StudentMusicSheetSearch;
 import com.yonge.cooleshow.biz.dal.entity.MusicSheet;
@@ -131,37 +132,6 @@ public class MusicSheetController extends BaseController {
         }
     }
 
-/*	@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();
-        if (sysUser == null  || sysUser.getId() == null) {
-            return failed("用户信息获取失败");
-        }
-
-        if (ChargeTypeEnum.CHARGE.getCode().equals(musicSheetDto.getChargeType().getCode())
-                && musicSheetDto.getMusicPrice()==null){
-            return failed("此曲谱为收费曲谱，需要提供价格");
-        }
-        if (musicSheetDto.getNotation() == null) {
-            musicSheetDto.setNotation(YesOrNoEnum.NO);
-        }
-
-        if (musicSheetDto.getProviderType() == null) {
-            musicSheetDto.setProviderType(SourceTypeEnum.PLATFORM);
-        }
-        musicSheetDto.setUserId(sysUser.getId());
-        musicSheetDto.setAuditStatus(AuthStatusEnum.DOING);
-        musicSheetDto.setSubmitAuditTime(new Date());
-        musicSheetDto.setSourceType(SourceTypeEnum.TEACHER);
-
-        musicSheetDto.setFavoriteCount(0);
-        musicSheetDto.setCreateBy(sysUser.getId());
-        musicSheetDto.setCreateTime(new Date());
-        musicSheetService.saveMusicSheet(musicSheetDto,sysUser.getId());
-        return succeed("新增曲谱成功");
-    }*/
-
     @ApiOperation(value = "新增/修改", notes = "曲目表- 传入 MusicSheetWrapper.MusicSheet")
     @PreAuthorize("@auditsvc.hasPermissions('music/sheet/save', {'BACKEND'})")
     @PostMapping("music/sheet/save")
@@ -169,35 +139,6 @@ public class MusicSheetController extends BaseController {
         return succeed(cbsMusicScoreService.musicSheetAdd(addMusicSheet));
     }
 
-
-    @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();
-        if (sysUser == null  || sysUser.getId() == null) {
-            return failed("用户信息获取失败");
-        }
-        if (musicSheet.getId()==null){
-            return failed("缺少ID");
-        }
-        if (musicSheet.getNotation() == null) {
-            musicSheet.setNotation(YesOrNoEnum.NO);
-        }
-        musicSheet.setUserId(sysUser.getId());
-        musicSheet.setSubmitAuditTime(new Date());
-        musicSheet.setCreateTime(new Date());
-        musicSheet.setCreateBy(sysUser.getId());
-        musicSheet.setUpdateBy(sysUser.getId());
-        musicSheet.setUpdateTime(new Date());
-        musicSheet.setSubmitAuditTime(new Date());
-        musicSheet.setAuditStatus(AuthStatusEnum.DOING);
-        if ( musicSheetService.saveMusicSheet(musicSheet,sysUser.getId())){
-            return succeed("修改成功");
-        } else {
-            return failed("修改失败");
-        }
-    }
-
     @ApiOperation(value = "曲目分页查询", httpMethod="POST", consumes="application/json", produces="application/json")
     @PostMapping(value="/list", consumes="application/json", produces="application/json")
     public HttpResponseResult<PageInfo<MusicSheetVo>> list(@RequestBody StudentMusicSheetSearch query) {
@@ -205,7 +146,6 @@ public class MusicSheetController extends BaseController {
         if (sysUser == null  || sysUser.getId() == null) {
             return failed("用户信息获取失败");
         }
-
         // 老师课查看所有曲目
         if (query.getMyself() == null || query.getMyself()) {
             // 设置只查老师用户 状态为启用
@@ -229,7 +169,6 @@ public class MusicSheetController extends BaseController {
 
             // 检查app版本
             query.setAuditVersion(appVersionInfoService.getAppAuditVersion(query.getPlatform(),query.getVersion()));
-
             //  只能看通过审核 并且 启用的 曲目
             query.setState(YesOrNoEnum.YES);
             query.setAuditStatus(AuthStatusEnum.PASS);
@@ -242,24 +181,21 @@ public class MusicSheetController extends BaseController {
         return succeed(PageUtil.pageInfo(musicSheetVoIPage));
     }
 
-    /**
-     * 启用/停用
-     */
     @PostMapping("/state/{id}")
     @ApiOperation(value = "启用/停用", notes = "传入id")
-    public HttpResponseResult<Boolean> state(@ApiParam(value = "曲目编号", required = true)  @PathVariable Long id) {
-        if (StringUtil.isEmpty(id)) {
+    public HttpResponseResult<Boolean> state(@ApiParam(value = "曲目编号", required = true)  @PathVariable Long id, @RequestBody ReasonDto reasonDto) {
+        if (id == null) {
             return failed("参数不能为空");
         }
         MusicSheet musicSheet = musicSheetService.getById(id);
         if (musicSheet == null) {
             return failed("未找到曲目");
         }
-
-        if (musicSheet.getState().equals(YesOrNoEnum.NO)) {
-            return failed("曲目已被下架");
+        if (YesOrNoEnum.YES.equals(musicSheet.getState()) &&
+                musicSheet.getSourceType().equals(SourceTypeEnum.TEACHER) && StringUtil.isEmpty(reasonDto.getReason())) {
+            return failed("请填写下架原因");
         }
-        return status(musicSheetService.state(id, "", ClientEnum.TEACHER));
+        return status(musicSheetService.state(id,reasonDto.getReason(),ClientEnum.SYSTEM));
     }
 
     /**

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

@@ -6,7 +6,8 @@ import com.baomidou.mybatisplus.core.toolkit.StringUtils;
 import com.baomidou.mybatisplus.extension.service.additional.update.impl.LambdaUpdateChainWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.beust.jcommander.internal.Lists;
-import com.dayaedu.cbs.common.enums.music.*;
+import com.dayaedu.cbs.common.enums.music.EMusicAvailableType;
+import com.dayaedu.cbs.common.enums.music.EMusicSourceType;
 import com.dayaedu.cbs.common.enums.school.EMusicSheetType;
 import com.dayaedu.cbs.openfeign.client.MusicFeignClientService;
 import com.dayaedu.cbs.openfeign.properties.OpenFeignClientConfigProperties;
@@ -34,7 +35,9 @@ import com.yonge.cooleshow.biz.dal.service.cbs.CbsMusicScoreService;
 import com.yonge.cooleshow.biz.dal.support.WrapperUtil;
 import com.yonge.cooleshow.biz.dal.vo.*;
 import com.yonge.cooleshow.biz.dal.vo.res.OrderCreateRes;
-import com.yonge.cooleshow.biz.dal.wrapper.*;
+import com.yonge.cooleshow.biz.dal.wrapper.StatGroupWrapper;
+import com.yonge.cooleshow.biz.dal.wrapper.TenantGroupAlbumWrapper;
+import com.yonge.cooleshow.biz.dal.wrapper.UserPaymentOrderWrapper;
 import com.yonge.cooleshow.biz.dal.wrapper.music.MusicCompareWrapper;
 import com.yonge.cooleshow.common.constant.SysConfigConstant;
 import com.yonge.cooleshow.common.entity.HttpResponseResult;
@@ -54,7 +57,6 @@ import org.joda.time.DateTime;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.BeanUtils;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -965,14 +967,6 @@ public class MusicSheetServiceImpl extends ServiceImpl<MusicSheetDao, MusicSheet
             }
 
         }
-
-        /*if(query.getMyself() != null && query.getMyself() == false){//首页
-        	if(records == null || records.size() == 0){
-        		query.setSubjectIds(null);
-        		records = baseMapper.selectStudentMusicPage(page, query);
-        	}
-    	}*/
-
         return page.setRecords(records);
 
     }