管乐迷曲目来源内容平台

mec-application/src/main/java/com/ym/mec/teacher/controller/SysMusicScoreAccompanimentController.java

@@ -18,7 +18,9 @@ import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
 
 @RequestMapping("${app-config.url.teacher:}/sysMusicScoreAccompaniment")
 @Api(tags = "曲库伴奏服务")
@@ -35,20 +37,6 @@ public class SysMusicScoreAccompanimentController extends BaseController {
     @Autowired
     private TenantConfigService tenantConfigService;
 
-    @ApiOperation(value = "修改")
-    @PostMapping("/update")
-    public Object update(@RequestBody SysMusicScoreAccompaniment sysMusicScoreAccompaniment) {
-        sysMusicScoreAccompanimentService.updateAcc(sysMusicScoreAccompaniment);
-        return succeed();
-    }
-
-    @ApiOperation(value = "删除")
-    @PostMapping("/del")
-    public Object del(Integer id) {
-        sysMusicScoreAccompanimentService.delete(id);
-        return succeed();
-    }
-
     @ApiOperation(value = "获取伴奏声部列表")
     @GetMapping("/querySubjectIds")
     public Object querySubjectIds(Integer categoriesId) {

mec-application/src/main/java/com/ym/mec/web/controller/SysMusicScoreAccompanimentController.java

@@ -22,22 +22,6 @@ public class SysMusicScoreAccompanimentController extends BaseController {
     @Autowired
     private SysMusicScoreAccompanimentService sysMusicScoreAccompanimentService;
 
-    @ApiOperation(value = "修改")
-    @PostMapping("/update")
-    @PreAuthorize("@pcs.hasPermissions('sysMusicScoreAccompaniment/update')")
-    public Object update(@RequestBody SysMusicScoreAccompaniment sysMusicScoreAccompaniment) {
-        sysMusicScoreAccompanimentService.updateAcc(sysMusicScoreAccompaniment);
-        return succeed();
-    }
-
-    @ApiOperation(value = "删除")
-    @PostMapping("/del/{id}")
-    @PreAuthorize("@pcs.hasPermissions('sysMusicScoreAccompaniment/del')")
-    public Object del(@ApiParam(value = "收费类型编号", required = true) @PathVariable("id") Integer id) {
-        sysMusicScoreAccompanimentService.delete(id);
-        return succeed();
-    }
-
     @ApiOperation(value = "分页查询")
     @GetMapping("/queryPage")
     @PreAuthorize("@pcs.hasPermissions('sysMusicScoreAccompaniment/queryPage')")

mec-biz/src/main/java/com/ym/mec/biz/dal/dao/CourseScheduleStudentMusicScoreDao.java

@@ -8,7 +8,7 @@ import java.util.List;
 
 public interface CourseScheduleStudentMusicScoreDao extends BaseDAO<Integer, CourseScheduleStudentMusicScore> {
 
-    List<CourseScheduleStudentMusicScore> queryByScoreIdAndCourseId(@Param("musicScoreAccompanimentId") Integer musicScoreAccompanimentId,
+    List<CourseScheduleStudentMusicScore> queryByScoreIdAndCourseId(@Param("musicScoreAccompanimentId") String musicScoreAccompanimentId,
                                                                     @Param("courseId") Long courseId,
                                                                     @Param("userId") Integer userId,
                                                                     @Param("downStatus") Integer downStatus,

mec-biz/src/main/java/com/ym/mec/biz/dal/dao/SysMusicScoreAccompanimentDao.java

@@ -9,7 +9,7 @@ import org.apache.ibatis.annotations.Param;
 import java.util.List;
 import java.util.Map;
 
-public interface SysMusicScoreAccompanimentDao extends BaseDAO<Integer, SysMusicScoreAccompaniment> {
+public interface SysMusicScoreAccompanimentDao extends BaseDAO<String, SysMusicScoreAccompaniment> {
 
 
     void batchInsert(@Param("sysMusicScoreAccompaniments") List<SysMusicScoreAccompaniment> sysMusicScoreAccompaniments,

mec-biz/src/main/java/com/ym/mec/biz/dal/entity/CourseScheduleStudentMusicScore.java

@@ -12,7 +12,7 @@ public class CourseScheduleStudentMusicScore extends BaseEntity {
     private Integer downStatus = 0;
     private Integer userId;
     private Integer userType = 0;
-    private Integer musicScoreAccompanimentId;
+    private String musicScoreAccompanimentId;
     private Integer playStatus = 0;
     private Integer accompanimentPlayStatus = 0;
     private String speed;

mec-biz/src/main/java/com/ym/mec/biz/dal/entity/SysMusicScoreAccompaniment.java

@@ -14,7 +14,7 @@ import org.apache.commons.lang3.builder.ToStringBuilder;
 public class SysMusicScoreAccompaniment {
 
 	/**  */
-	private Integer id;
+	private String id;
 	
 	/**  */
 	private Integer examSongId;

mec-biz/src/main/java/com/ym/mec/biz/service/SysMusicScoreAccompanimentService.java

@@ -11,9 +11,7 @@ import com.ym.mec.common.service.BaseService;
 
 import java.util.List;
 
-public interface SysMusicScoreAccompanimentService extends BaseService<Integer, SysMusicScoreAccompaniment> {
-
-    void updateAcc(SysMusicScoreAccompaniment sysMusicScoreAccompaniment);
+public interface SysMusicScoreAccompanimentService extends BaseService<String, SysMusicScoreAccompaniment> {
 
     List<SysMusicScoreAccompaniment> queryAll(SysExamSongQueryInfo queryInfo);
 

mec-biz/src/main/java/com/ym/mec/biz/service/impl/SysMusicScoreAccompanimentServiceImpl.java

@@ -30,7 +30,7 @@ import java.util.function.Function;
 import java.util.stream.Collectors;
 
 @Service
-public class SysMusicScoreAccompanimentServiceImpl extends BaseServiceImpl<Integer, SysMusicScoreAccompaniment> implements SysMusicScoreAccompanimentService {
+public class SysMusicScoreAccompanimentServiceImpl extends BaseServiceImpl<String, SysMusicScoreAccompaniment> implements SysMusicScoreAccompanimentService {
 	
 	@Resource
 	private SysMusicScoreAccompanimentDao sysMusicScoreAccompanimentDao;
@@ -39,24 +39,10 @@ public class SysMusicScoreAccompanimentServiceImpl extends BaseServiceImpl<Integ
 	@Resource
 	private SysMusicScoreService sysMusicScoreService;
 	@Override
-	public BaseDAO<Integer, SysMusicScoreAccompaniment> getDAO() {
+	public BaseDAO<String, SysMusicScoreAccompaniment> getDAO() {
 		return sysMusicScoreAccompanimentDao;
 	}
 
-	@Override
-	public void updateAcc(SysMusicScoreAccompaniment sysMusicScoreAccompaniment) {
-		SysMusicScoreAccompaniment accompaniment = sysMusicScoreAccompanimentDao.get(sysMusicScoreAccompaniment.getId());
-		if(accompaniment == null){
-			throw new BizException("操作失败：伴奏信息不存在");
-		}
-		List<Integer> idList = new ArrayList<>();
-		idList.add(accompaniment.getId());
-		List<Integer> subjectIds = sysMusicScoreAccompanimentDao.findSubjectByMusicScoreId(accompaniment.getExamSongId(),idList);
-		if(CollectionUtils.isNotEmpty(subjectIds) && subjectIds.contains(accompaniment.getId())){
-			throw new BizException("操作失败：请勿提交重复的伴奏声部");
-		}
-		sysMusicScoreAccompanimentDao.update(sysMusicScoreAccompaniment);
-	}
 
 	@Override
 	public List<SysMusicScoreAccompaniment> queryAll(SysExamSongQueryInfo queryInfo) {
@@ -97,7 +83,7 @@ public class SysMusicScoreAccompanimentServiceImpl extends BaseServiceImpl<Integ
 			for (int i = 0; i < musicSheetApplication.getMusicSheetSoundList().size(); i++) {
 				CbsMusicSheetWrapper.MusicSheetSound sheetSound = musicSheetApplication.getMusicSheetSoundList().get(i);
 				SysMusicScoreAccompaniment record = new SysMusicScoreAccompaniment();
-				record.setId(sheetSound.getId().intValue());
+				record.setId(sheetSound.getId().toString());
 				record.setType(accompaniment.getType());
 				record.setRankIds("FREE".equals(musicSheetApplication.getPaymentType()) ? null : "1");
 				record.setClientType(accompaniment.getClientType());

mec-im/src/main/java/com/ym/pojo/MusicScoreData.java

@@ -1,49 +1,12 @@
 package com.ym.pojo;
 
+import lombok.Data;
+
+@Data
 public class MusicScoreData {
 	private String roomId;
-	private Integer musicScoreAccompanimentId;
+	private String musicScoreAccompanimentId;
 	private Integer userId;
 	private Integer userType;
 	private Integer status;
-
-	public Integer getUserId() {
-		return userId;
-	}
-
-	public void setUserId(Integer userId) {
-		this.userId = userId;
-	}
-
-	public Integer getUserType() {
-		return userType;
-	}
-
-	public void setUserType(Integer userType) {
-		this.userType = userType;
-	}
-
-	public Integer getMusicScoreAccompanimentId() {
-		return musicScoreAccompanimentId;
-	}
-
-	public void setMusicScoreAccompanimentId(Integer musicScoreAccompanimentId) {
-		this.musicScoreAccompanimentId = musicScoreAccompanimentId;
-	}
-
-	public Integer getStatus() {
-		return status;
-	}
-
-	public void setStatus(Integer status) {
-		this.status = status;
-	}
-
-	public String getRoomId() {
-		return roomId;
-	}
-
-	public void setRoomId(String roomId) {
-		this.roomId = roomId;
-	}
 }

mec-im/src/main/java/com/ym/service/Impl/RoomServiceImpl.java

@@ -2726,7 +2726,7 @@ public class RoomServiceImpl implements RoomService {
                         courseScheduleId, null, null, 0);
         CbsMusicSheetWrapper.MusicSheetApplicationQuery query = sysMusicScoreService.getMusicSheetApplicationQuery();
         query.setRows(1);
-        query.setMusicSheetSoundId(musicScoreData.getMusicScoreAccompanimentId().longValue());
+        query.setMusicSheetSoundId(Long.parseLong(musicScoreData.getMusicScoreAccompanimentId()));
         List<CbsMusicSheetWrapper.MusicSheetApplication> applications = sysMusicScoreService.queryCbsMusicSheetApplication(query);
         if (CollectionUtils.isEmpty(applications)) {
             throw new BizException("曲目信息不存在");
@@ -2737,7 +2737,7 @@ public class RoomServiceImpl implements RoomService {
             throw new BizException("曲目原音信息不存在");
         }
         CbsMusicSheetWrapper.MusicSheetSound sheetSound = soundList.stream().
-                filter(e -> e.getId().equals(musicScoreData.getMusicScoreAccompanimentId().longValue())).collect(Collectors.toList()).get(0);
+                filter(e -> e.getId().toString().equals(musicScoreData.getMusicScoreAccompanimentId())).collect(Collectors.toList()).get(0);
         if (scheduleStudentMusicScores.size() == 0) {
             //第一次下载,生成数据
             List<CourseScheduleStudentPayment> courseScheduleStudentPayments = courseScheduleStudentPaymentDao.findByCourseSchedule(courseScheduleId);
@@ -2838,12 +2838,12 @@ public class RoomServiceImpl implements RoomService {
         Integer studentId = authUser.getId();
         String roomId = musicScoreData.getRoomId();
         Long scheduleId = Long.parseLong(roomId.substring(1));
-        Integer accompanimentId = musicScoreData.getMusicScoreAccompanimentId();
+        String accompanimentId = musicScoreData.getMusicScoreAccompanimentId();
         List<CourseScheduleStudentMusicScore> studentMusicScores = courseScheduleStudentMusicScoreDao.queryByScoreIdAndCourseId(accompanimentId, scheduleId, studentId, null, null);
         if (accompanimentId != null) {
             CbsMusicSheetWrapper.MusicSheetApplicationQuery query = sysMusicScoreService.getMusicSheetApplicationQuery();
             query.setRows(1);
-            query.setMusicSheetSoundId(accompanimentId.longValue());
+            query.setMusicSheetSoundId(Long.parseLong(accompanimentId));
             List<CbsMusicSheetWrapper.MusicSheetApplication> applications = sysMusicScoreService.queryCbsMusicSheetApplication(query);
             if (CollectionUtils.isEmpty(applications)) {
                 throw new BizException("曲目信息不存在");
@@ -2854,13 +2854,13 @@ public class RoomServiceImpl implements RoomService {
                 throw new BizException("曲目原音信息不存在");
             }
             CbsMusicSheetWrapper.MusicSheetSound sheetSound = soundList.stream().
-                    filter(e -> e.getId().equals(musicScoreData.getMusicScoreAccompanimentId().longValue())).collect(Collectors.toList()).get(0);
+                    filter(e -> e.getId().toString().equals(musicScoreData.getMusicScoreAccompanimentId())).collect(Collectors.toList()).get(0);
             SysMusicScoreAccompaniment accompaniment = sysMusicScoreAccompanimentService.initSysMusicScoreAccompaniment(sheetApplication,sheetSound);
             if (accompaniment == null) {
                 throw new BizException("曲目信息不存在");
             }
             //修改下载状态
-            if (studentMusicScores == null || studentMusicScores.size() == 0) {
+            if (CollectionUtils.isEmpty(studentMusicScores)) {
                 throw new BizException("学员不存在此下载曲目");
             }
             CourseScheduleStudentMusicScore studentMusicScore = studentMusicScores.get(0);