Merge branch 'zx_saas_cbs' of http://git.dayaedu.com/yonge/mec into dev

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

@@ -7,7 +7,6 @@ import com.ym.mec.biz.dal.page.SysExamSongQueryInfo;
 import com.ym.mec.biz.service.SysMusicScoreService;
 import com.ym.mec.common.controller.BaseController;
 import com.ym.mec.common.entity.HttpResponseResult;
-import com.ym.mec.common.exception.BizException;
 import com.ym.mec.common.page.PageInfo;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -48,12 +47,7 @@ public class SysMusicScoreController extends BaseController {
     @PostMapping("/show")
     @PreAuthorize("@pcs.hasPermissions('sysMusicScore/show')")
     public HttpResponseResult<Object> update(Integer sysMusicScoreId, Integer showFlag) {
-        SysMusicScore sysMusicScore = sysMusicScoreService.get(sysMusicScoreId);
-        if(sysMusicScore == null){
-            throw new BizException("曲目信息不存在");
-        }
-        sysMusicScore.setShowFlag(showFlag);
-        sysMusicScoreService.update(sysMusicScore);
+        sysMusicScoreService.enable(sysMusicScoreId, showFlag);
         return succeed();
     }
 

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

@@ -32,4 +32,6 @@ public interface SysMusicScoreService extends BaseService<Integer, SysMusicScore
     int updateExtStyleConfigJson(Integer id, String extStyleConfigJson);
 
     Map<Long, SysMusicScore> getMapByIds(List<Long> musicSheetIds);
+
+    void enable(Integer sysMusicScoreId, Integer showFlag);
 }

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

@@ -81,9 +81,7 @@ public class CbsMusicSheetServiceImpl implements CbsMusicSheetService {
         if (updateMusicSheet.getStatus() == null){
             throw new BizException("请选择状态");
         }
-        if (!updateMusicSheet.getStatus()){
-            sysMusicScoreService.getDao().batchEnable(updateMusicSheet.getIds(),updateMusicSheet.getStatus());
-        }
+        sysMusicScoreService.getDao().batchEnable(updateMusicSheet.getIds(),updateMusicSheet.getStatus());
         return true;
     }
 

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

@@ -3,6 +3,7 @@ package com.ym.mec.biz.service.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.dayaedu.cbs.openfeign.wrapper.music.CbsSubjectApiWrapper;
 import com.microsvc.toolkit.common.response.template.R;
@@ -431,6 +432,33 @@ public class SysMusicScoreServiceImpl extends BaseServiceImpl<Integer, SysMusicS
         return musicScoreList.stream().collect(Collectors.toMap(o -> o.getId().longValue(), e -> e));
     }
 
+    @Override
+    public void enable(Integer sysMusicScoreId, Integer showFlag) {
+        SysMusicScore sysMusicScore = this.get(sysMusicScoreId);
+        if(sysMusicScore == null){
+            throw new BizException("曲目信息不存在");
+        }
+        CbsMusicSheetWrapper.MusicSheetApplicationQuery query = new CbsMusicSheetWrapper.MusicSheetApplicationQuery();
+        query.setApplicationId(applicationId);
+        query.setMusicSheetIds(Collections.singletonList(sysMusicScore.getCbsMusicSheetId()));
+        query.setDelFlag(true);
+        query.setPage(1);
+        query.setRows(1);
+        R<com.microsvc.toolkit.common.response.paging.PageInfo<CbsMusicSheetWrapper.MusicSheetApplication>> pageInfoR = musicFeignClientService.musicSheetPageByApplication(query);
+        if (pageInfoR.getCode() != 200) {
+            throw new BizException("获取曲目信息异常,{}", pageInfoR.getMessage());
+        }
+        List<CbsMusicSheetWrapper.MusicSheetApplication> rows = pageInfoR.feignData().getRows();
+        if (CollectionUtils.isEmpty(rows)) {
+            throw new BizException("获取曲目信息失败");
+        }
+        CbsMusicSheetWrapper.MusicSheetApplication musicSheetApplication = rows.get(0);
+        CbsMusicSheetApplicationExtendClientWrapper.MusicSheetApplicationExtendStatus extendStatus = new CbsMusicSheetApplicationExtendClientWrapper.MusicSheetApplicationExtendStatus();
+        extendStatus.setIds(musicSheetApplication.getApplicationExtendId().toString());
+        extendStatus.setStatus(showFlag == 1);
+        musicFeignClientService.musicSheetApplicationExtendStatus(extendStatus);
+    }
+
     /**
      * 进行转码
      *