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

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

@@ -59,19 +59,13 @@ import java.util.Optional;
 public class MusicSheetController extends BaseController {
     @Resource
     private SysUserService sysUserService;
-
 	@Resource
 	private MusicSheetService musicSheetService;
-
     @Resource
     private AppVersionInfoService appVersionInfoService;
-
     @Resource
     private TeacherService teacherService;
 
-//    @Resource
-//    private CbsMusicScoreService cbsMusicScoreService;
-
     /**
      * 查询单条
      */

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

@@ -398,5 +398,7 @@ public interface MusicSheetService extends IService<MusicSheet> {
 
     MusicSheet initMusicSheet(CbsMusicSheetWrapper.AddMusicSheet addMusicSheet);
 
+    void initMusicSheetDetailVo(CbsMusicSheetWrapper.AddMusicSheet addMusicSheet,MusicSheetDetailVo sheetDetailVo);
+
     void sync();
 }

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

@@ -20,18 +20,17 @@ import com.yonge.cooleshow.biz.dal.service.*;
 import com.yonge.cooleshow.biz.dal.vo.MusicSheetDetailVo;
 import com.yonge.cooleshow.biz.dal.vo.TeacherMusicSheetVo;
 import com.yonge.cooleshow.biz.dal.wrapper.AddMusicSheetWrapper;
-import com.yonge.cooleshow.biz.dal.wrapper.InstrumentWrapper;
 import com.yonge.cooleshow.common.enums.YesOrNoEnum;
 import com.yonge.cooleshow.common.service.IdGeneratorService;
 import com.yonge.toolset.base.exception.BizException;
 import com.yonge.toolset.thirdparty.message.MessageSenderPluginContext;
 import org.apache.commons.collections.CollectionUtils;
+import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
-import org.springframework.util.StringUtils;
 
 import javax.annotation.Resource;
 import java.util.ArrayList;
@@ -253,14 +252,14 @@ public class MusicSheetAuthRecordServiceImpl extends ServiceImpl<MusicSheetAuthR
         musicSheet.setCbsMusicSheetId(musicSheet1.getCbsMusicSheetId());
         musicSheetService.removeById(record.getMusicSheetId());
         musicSheetAccompanimentService.delByMusicSheetId(record.getMusicSheetId());
-        //保存曲目信息
-        musicSheetService.save(musicSheet);
-        List<MusicSheetAccompaniment> musicSheetAccompaniments = musicSheetAccompanimentService.initMusicSheetAccompaniment(musicSheetAuthRecord.getMusicSheetJson(),musicSheet.getId());
-        musicSheetAccompanimentService.saveBatch(musicSheetAccompaniments);
-        record.setMusicSheetId(musicSheet.getId());
-        record.setMusicSheetJson(musicSheetAuthRecord.getMusicSheetJson());
-        baseMapper.updateById(record);
-        /*if(record.getAuditState() == AuthStatusEnum.DOING){
+        if(record.getAuditState() == AuthStatusEnum.DOING){
+            //保存曲目信息
+            musicSheetService.save(musicSheet);
+            List<MusicSheetAccompaniment> musicSheetAccompaniments = musicSheetAccompanimentService.initMusicSheetAccompaniment(musicSheetAuthRecord.getMusicSheetJson(),musicSheet.getId());
+            musicSheetAccompanimentService.saveBatch(musicSheetAccompaniments);
+            record.setMusicSheetId(musicSheet.getId());
+            record.setMusicSheetJson(musicSheetAuthRecord.getMusicSheetJson());
+            baseMapper.updateById(record);
         }else {
             //保存曲目信息
             musicSheetService.save(musicSheet);
@@ -271,7 +270,7 @@ public class MusicSheetAuthRecordServiceImpl extends ServiceImpl<MusicSheetAuthR
             musicSheetAuthRecord.setAuditState(AuthStatusEnum.DOING);
             musicSheetAuthRecord.setMusicSheetJson(JSON.toJSONString(addMusicSheet));
             baseMapper.insert(musicSheetAuthRecord);
-        }*/
+        }
     }
 
     @Override
@@ -294,14 +293,12 @@ public class MusicSheetAuthRecordServiceImpl extends ServiceImpl<MusicSheetAuthR
     public List<MusicSheetDetailVo> auditDetailList(String batchNo) {
         List<MusicSheetDetailVo> sheetDetailVos = musicSheetService.getDao().auditDetailList(null, batchNo);
         if (CollectionUtils.isNotEmpty(sheetDetailVos)) {
-            List<Long> musicSheetIds = sheetDetailVos.stream().map(e -> e.getId()).collect(Collectors.toList());
-            List<MusicSheetAccompaniment> musicSheetAccompaniments = musicSheetAccompanimentService.lambdaQuery()
-                                                                                                    .in(MusicSheetAccompaniment::getMusicSheetId, musicSheetIds)
-                                                                                                    .list();
-            if (CollectionUtils.isNotEmpty(musicSheetAccompaniments)) {
-                Map<Long, List<MusicSheetAccompaniment>> musicSheetAccompanimentMap = musicSheetAccompaniments.stream().collect(Collectors.groupingBy(MusicSheetAccompaniment::getMusicSheetId));
-                for (MusicSheetDetailVo sheetDetailVo : sheetDetailVos) {
-                    sheetDetailVo.setBackground(musicSheetAccompanimentMap.get(sheetDetailVo.getId()));
+            for (MusicSheetDetailVo sheetDetailVo : sheetDetailVos) {
+                String musicSheetJson = sheetDetailVo.getMusicSheetJson();
+                if(StringUtils.isNotEmpty(musicSheetJson)){
+                    CbsMusicSheetWrapper.AddMusicSheet addMusicSheet = JSON.parseObject(musicSheetJson, CbsMusicSheetWrapper.AddMusicSheet.class);
+                    musicSheetService.initMusicSheetDetailVo(addMusicSheet,sheetDetailVo);
+                    sheetDetailVo.setSubmitAuditTime(sheetDetailVo.getCreateTime());
                 }
             }
         }

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

@@ -2061,6 +2061,69 @@ public class MusicSheetServiceImpl extends ServiceImpl<MusicSheetDao, MusicSheet
         return musicSheetAudit;
     }
 
+    @Override
+    public void initMusicSheetDetailVo(CbsMusicSheetWrapper.AddMusicSheet addMusicSheet, MusicSheetDetailVo musicSheetAudit) {
+        musicSheetAudit.setProviderType(SourceTypeEnum.TEACHER);
+        musicSheetAudit.setSourceType(SourceTypeEnum.TEACHER);
+        musicSheetAudit.setMusicSheetName(addMusicSheet.getName());
+        musicSheetAudit.setMusicSubject(addMusicSheet.getSubjectIds());
+        musicSheetAudit.setMusicSvg(addMusicSheet.getMusicSvg());
+        musicSheetAudit.setComposer(addMusicSheet.getComposer());
+        musicSheetAudit.setTitleImg(addMusicSheet.getMusicCover());
+        musicSheetAudit.setExtConfigJson(addMusicSheet.getExtConfigJson());
+        musicSheetAudit.setRemark(addMusicSheet.getRemark());
+        if(addMusicSheet.getAudioType() != null){
+            musicSheetAudit.setAccompanimentType(AccompanimentTypeEnum.valueOf(addMusicSheet.getAudioType().getCode()));
+        }
+        musicSheetAudit.setPlaySpeed(addMusicSheet.getPlaySpeed());
+        if(addMusicSheet.getIsConvertibleScore() != null){
+            musicSheetAudit.setNotation(addMusicSheet.getIsConvertibleScore()? YesOrNoEnum.YES: YesOrNoEnum.NO);
+        }
+        if(addMusicSheet.getMusicSheetType() != null){
+            musicSheetAudit.setMusicSheetType(MusicSheetTypeEnum.valueOf(addMusicSheet.getMusicSheetType().getCode()));
+        }
+        if(addMusicSheet.getPlayMode() != null){
+            musicSheetAudit.setAudioType(AudioTypeEnum.valueOf(addMusicSheet.getPlayMode().getCode()));
+        }
+        if(addMusicSheet.getIsShowFingering() != null){
+            musicSheetAudit.setShowFingering(addMusicSheet.getIsShowFingering()? YesOrNoEnum.YES: YesOrNoEnum.NO);
+        }
+        if(addMusicSheet.getIsEvaluated() != null){
+            musicSheetAudit.setCanEvaluate(addMusicSheet.getIsEvaluated()? YesOrNoEnum.YES: YesOrNoEnum.NO);
+        }
+        //兼容审核流程修改，是否自带节拍器
+        if(addMusicSheet.getIsUseSystemBeat() == null || !addMusicSheet.getIsUseSystemBeat()){
+            musicSheetAudit.setHasBeat(YesOrNoEnum.NO);
+            musicSheetAudit.setMp3Type(AudioTypeEnum.MP3);
+        }else {
+            musicSheetAudit.setHasBeat(YesOrNoEnum.YES);
+            musicSheetAudit.setMp3Type(AudioTypeEnum.MP3_METRONOME);
+        }
+        List<CbsMusicSheetWrapper.MusicSheetAccompaniment> accompanimentList = addMusicSheet.getMusicSheetAccompanimentList();
+        if (CollectionUtils.isNotEmpty(accompanimentList)) {
+            musicSheetAudit.setMetronomeUrl(accompanimentList.get(0).getAudioFileUrl());
+        }
+        musicSheetAudit.setXmlFileUrl(addMusicSheet.getXmlFileUrl());
+        musicSheetAudit.setMidiUrl(addMusicSheet.getMidiFileUrl());
+        List<CbsMusicSheetApplicationExtendClientWrapper.AddMusicSheetApplicationExtend> extend = addMusicSheet.getAddMusicSheetApplicationExtend();
+        if(CollectionUtils.isNotEmpty(extend)){
+            CbsMusicSheetApplicationExtendClientWrapper.AddMusicSheetApplicationExtend applicationExtend = extend.get(0);
+            musicSheetAudit.setMusicTag(applicationExtend.getMusicTagIds());
+            if(applicationExtend.getPaymentType() != null){
+                musicSheetAudit.setPaymentType(applicationExtend.getPaymentType());
+                musicSheetAudit.setChargeType(ChargeTypeEnum.valueOf(applicationExtend.getPaymentType()));
+            }
+            if(applicationExtend.getTopFlag() != null){
+                musicSheetAudit.setTopFlag(applicationExtend.getTopFlag()? YesOrNoEnum.YES: YesOrNoEnum.NO);
+            }
+            if(applicationExtend.getExquisiteFlag() != null){
+                musicSheetAudit.setExquisiteFlag(applicationExtend.getExquisiteFlag()? YesOrNoEnum.YES: YesOrNoEnum.NO);
+            }
+            musicSheetAudit.setSortNumber(applicationExtend.getSortNo());
+            musicSheetAudit.setMusicPrice(applicationExtend.getMusicPrice());
+        }
+    }
+
 
     @Override
     public void sync() {

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/vo/MusicSheetDetailVo.java

@@ -79,5 +79,8 @@ public class MusicSheetDetailVo extends MusicSheet {
 
     @ApiModelProperty("课件id")
     private Long coursewareId;
+
+    @ApiModelProperty("曲目json文件")
+    private String musicSheetJson;
 }
 

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

@@ -60,7 +60,6 @@
         t.payment_type_ as paymentType,
         t.provider_type_ as providerType,
         t.state_ as state,
-        t.audit_status_ as auditStatus,
         t.sort_number_ as sortNumber,
         t.top_flag_ as topFlag,
         t.exquisite_flag_ as exquisiteFlag,
@@ -78,7 +77,6 @@
         t.del_flag_ as delFlag,
         t.audit_version_ as auditVersion,
         t.source_type_ as sourceType,
-        t.submit_audit_time_ as submitAuditTime,
         t.accompaniment_type_ as accompanimentType,
         t.remark_ as remark,
         t.first_tone_ as firstTone,
@@ -390,6 +388,7 @@
         <result column="musicJianSvg" jdbcType="VARCHAR" property="musicJianSvg"/>
         <result column="musicFirstSvg" jdbcType="VARCHAR" property="musicFirstSvg"/>
         <result column="musicSheetType" jdbcType="VARCHAR" property="musicSheetType"/>
+        <result column="musicSheetType" jdbcType="VARCHAR" property="musicSheetJson"/>
         <collection property="background" ofType="com.yonge.cooleshow.biz.dal.entity.MusicSheetAccompaniment">
             <id column="accompanimentId" jdbcType="BIGINT" property="id"/>
             <result column="accompanimentMusicSheetId" jdbcType="BIGINT" property="musicSheetId"/>
@@ -777,8 +776,11 @@
         ,s2.ai_default_frequency_ as aiDefaultFrequency
         ,su.real_name_ as realName
         ,msar.update_time_ as auditTime
+        ,msar.create_time_ as submitAuditTime
+        ,msar.audit_state_ as auditStatus
         ,su2.username_ as auditName
         ,msar.reason_ as auditReason
+        ,msar.music_sheet_json_ as musicSheetJson
         from music_sheet_auth_record  msar
         left join music_sheet t on t.id_ = msar.music_sheet_id_
         left join sys_user su on su.id_ = t.create_by_