Merge branch 'zx_online_cbs' of http://git.dayaedu.com/yonge/cooleshow into test

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

@@ -21,6 +21,7 @@ import com.yonge.cooleshow.biz.dal.enums.TeacherTagEnum;
 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.common.service.IdGeneratorService;
 import com.yonge.toolset.base.exception.BizException;
 import com.yonge.toolset.thirdparty.message.MessageSenderPluginContext;
@@ -33,6 +34,7 @@ import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.StringUtils;
 
 import javax.annotation.Resource;
+import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -170,16 +172,21 @@ public class MusicSheetAuthRecordServiceImpl extends ServiceImpl<MusicSheetAuthR
         if(StringUtils.isEmpty(musicSheetAuthRecord.getMusicSheetJson())){
             throw new BizException("曲目信息不能为空");
         }
-        CbsMusicSheetWrapper.AddMusicSheet addMusicSheet = JSON.parseObject(musicSheetAuthRecord.getMusicSheetJson(), CbsMusicSheetWrapper.AddMusicSheet.class);
-        List<CbsMusicSheetApplicationExtendClientWrapper.AddMusicSheetApplicationExtend> addMusicSheetApplicationExtend = addMusicSheet.getAddMusicSheetApplicationExtend();
-        if(org.apache.commons.collections.CollectionUtils.isEmpty(addMusicSheetApplicationExtend)){
-            throw new BizException("曲目应用不能为空");
-        }
-        for (CbsMusicSheetApplicationExtendClientWrapper.AddMusicSheetApplicationExtend applicationExtend : addMusicSheetApplicationExtend) {
-            if(applicationExtend.getExquisiteFlag() == null){
-                applicationExtend.setExquisiteFlag(false);
-            }
-        }
+        AddMusicSheetWrapper.AddMusicSheet addMusicSheet = JSON.parseObject(musicSheetAuthRecord.getMusicSheetJson(), AddMusicSheetWrapper.AddMusicSheet.class);
+        List<CbsMusicSheetApplicationExtendClientWrapper.AddMusicSheetApplicationExtend> extendList = new ArrayList<>();
+        CbsMusicSheetApplicationExtendClientWrapper.AddMusicSheetApplicationExtend extend = new CbsMusicSheetApplicationExtendClientWrapper.AddMusicSheetApplicationExtend();
+        extend.setApplicationId(applicationId);
+        extend.setMusicSheetCategoryId(addMusicSheet.getMusicSheetCategoryId());
+        extend.setStatus(addMusicSheet.getStatus());
+        extend.setSortNo(addMusicSheet.getSortNo());
+        extend.setPaymentType(addMusicSheet.getPaymentType());
+        extend.setTopFlag(addMusicSheet.getTopFlag());
+        extend.setExquisiteFlag(addMusicSheet.getExquisiteFlag());
+        extend.setAvailableType(addMusicSheet.getAvailableType());
+        extend.setMusicTagIds(addMusicSheet.getMusicTagIds());
+        extend.setMusicPrice(addMusicSheet.getMusicPrice());
+        extendList.add(extend);
+        addMusicSheet.setAddMusicSheetApplicationExtend(extendList);
         return addMusicSheet;
     }
 
@@ -207,7 +214,6 @@ public class MusicSheetAuthRecordServiceImpl extends ServiceImpl<MusicSheetAuthR
     @Override
     @Transactional(rollbackFor = Exception.class)
     public void updateRecord(MusicSheetAuthRecord musicSheetAuthRecord) {
-        CbsMusicSheetWrapper.AddMusicSheet addMusicSheet = this.checkRecord(musicSheetAuthRecord);
         if(musicSheetAuthRecord.getId() == null){
             throw new BizException("先选择要修改的曲目");
         }
@@ -215,6 +221,7 @@ public class MusicSheetAuthRecordServiceImpl extends ServiceImpl<MusicSheetAuthR
         if (record == null){
             throw new BizException("曲目信息不存在");
         }
+        CbsMusicSheetWrapper.AddMusicSheet addMusicSheet = this.checkRecord(musicSheetAuthRecord);
         MusicSheet musicSheet = musicSheetService.initMusicSheet(addMusicSheet);
         MusicSheet musicSheet1 = musicSheetService.getById(record.getMusicSheetId());
         musicSheet.setCbsMusicSheetId(musicSheet1.getCbsMusicSheetId());

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

@@ -435,6 +435,8 @@ public class MusicSheetServiceImpl extends ServiceImpl<MusicSheetDao, MusicSheet
         detailVo.setShowFingering(musicSheet1.getIsShowFingering() ? YesOrNoEnum.YES : YesOrNoEnum.NO);
         detailVo.setMusicTag(musicSheet1.getMusicTag());
         detailVo.setMusicTagNames(musicSheet1.getMusicTagNames());
+        detailVo.setMusicImg(musicSheet1.getMusicImg());
+        detailVo.setTitleImg(musicSheet1.getMusicCover());
         List<CbsMusicSheetWrapper.MusicSheetAccompaniment> accompanimentList = musicSheet1.getMusicSheetAccompanimentList();
         if (CollectionUtils.isNotEmpty(accompanimentList)) {
             detailVo.setMetronomeUrl(accompanimentList.get(0).getAudioFileUrl());
@@ -769,6 +771,8 @@ public class MusicSheetServiceImpl extends ServiceImpl<MusicSheetDao, MusicSheet
         record.setFirstTone(musicSheetApplication.getMusicFirstImg());
         record.setFixedTone(musicSheetApplication.getMusicJianImg());
         record.setMusicSheetExtend(musicSheetApplication.getMusicSheetExtend());
+        record.setMusicImg(musicSheetApplication.getMusicImg());
+        record.setTitleImg(musicSheetApplication.getMusicCover());
     }
 
 
@@ -1949,11 +1953,7 @@ public class MusicSheetServiceImpl extends ServiceImpl<MusicSheetDao, MusicSheet
         return true;
     }
 
-    @Override
-    public MusicSheet initMusicSheet(CbsMusicSheetWrapper.AddMusicSheet addMusicSheet) {
-        Long userId = sysUserFeignService.queryUserInfo().getId();
-        addMusicSheet.setCreateBy(userId);
-        addMusicSheet.setUpdateBy(userId);
+    private void initAddMusicSheet(CbsMusicSheetWrapper.AddMusicSheet addMusicSheet){
         if (addMusicSheet.getSourceType() == null) {
             addMusicSheet.setSourceType(EMusicSourceType.PERSON);
         }
@@ -1969,6 +1969,24 @@ public class MusicSheetServiceImpl extends ServiceImpl<MusicSheetDao, MusicSheet
         if (addMusicSheet.getIsShowFingering() == null) {
             addMusicSheet.setIsShowFingering(true);
         }
+        if (addMusicSheet.getStatus() == null) {
+            addMusicSheet.setStatus(true);
+        }
+        if (addMusicSheet.getMusicSheetType() == null) {
+            addMusicSheet.setMusicSheetType(EMusicSheetType.CONCERT);
+        }
+        if (addMusicSheet.getMusicCategoryId() == null) {
+            addMusicSheet.setMusicCategoryId(-2L);
+        }
+    }
+
+    @Override
+    public MusicSheet initMusicSheet(CbsMusicSheetWrapper.AddMusicSheet addMusicSheet) {
+        Long userId = sysUserFeignService.queryUserInfo().getId();
+        addMusicSheet.setCreateBy(userId);
+        addMusicSheet.setUpdateBy(userId);
+        //初始化曲目默认值
+        this.initAddMusicSheet(addMusicSheet);
         MusicSheet musicSheetAudit = new MusicSheet();
         musicSheetAudit.setUserId(userId);
         musicSheetAudit.setCreateBy(userId);

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/wrapper/AddMusicSheetWrapper.java

@@ -0,0 +1,64 @@
+package com.yonge.cooleshow.biz.dal.wrapper;
+
+import com.alibaba.fastjson.JSON;
+import com.dayaedu.cbs.common.enums.EClientType;
+import com.dayaedu.cbs.common.enums.music.*;
+import com.dayaedu.cbs.common.enums.school.EMusicSheetType;
+import com.dayaedu.cbs.openfeign.wrapper.music.CbsMusicSheetWrapper;
+import com.microsvc.toolkit.common.response.paging.QueryInfo;
+import com.yonge.cooleshow.common.enums.YesOrNoEnum;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+import org.apache.commons.lang3.StringUtils;
+
+import java.math.BigDecimal;
+import java.util.Date;
+import java.util.List;
+import java.util.Optional;
+
+/**
+ * 曲谱表
+ * 2022-12-07 10:16:58
+ */
+@ApiModel(value = "MusicSheetWrapper对象", description = "曲谱表查询对象")
+public class AddMusicSheetWrapper {
+
+    @Data
+    @Builder
+    @NoArgsConstructor
+    @AllArgsConstructor
+	@ApiModel(" MusicSheet-曲谱表")
+    public static class AddMusicSheet extends CbsMusicSheetWrapper.AddMusicSheet{
+        @ApiModelProperty("分类ID")
+        private Long musicSheetCategoryId = -2L;
+
+        @ApiModelProperty("启用状态")
+        private Boolean status = true;
+
+        @ApiModelProperty("排序")
+        private Integer sortNo;
+
+        @ApiModelProperty("收费类型(FREE:免费;VIP:会员;CHARGE:单曲收费)")
+        private String paymentType;
+
+        @ApiModelProperty("是否置顶(0:否;1:是)")
+        private Boolean topFlag = false;
+
+        @ApiModelProperty("精品标志")
+        private Boolean exquisiteFlag = false;
+
+        @ApiModelProperty("可用途径 ORG 机构 PLATFORM 平台")
+        private EMusicAvailableType availableType;
+
+        @ApiModelProperty("曲目标签(多个标签用逗号分隔)")
+        private String musicTagIds;
+
+        @ApiModelProperty("曲目价格")
+        private BigDecimal musicPrice = BigDecimal.ZERO;
+	}
+
+}

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

@@ -97,7 +97,7 @@
     <insert id="batchInsert">
         insert into music_sheet
         (cbs_music_sheet_id_,provider_type_,music_tag_,payment_type_,charge_type_,top_flag_,exquisite_flag_,sort_number_,state_,audit_status_
-            ,music_sheet_name_,music_subject_,music_svg_,composer_,title_img_,music_img_,accompaniment_type_,play_speed_,
+            ,music_sheet_name_,music_subject_,music_svg_,composer_,accompaniment_type_,play_speed_,
          music_price_,notation_,music_sheet_type_,source_type_,audio_type_,show_fingering_,can_evaluate_,create_by_,user_id_
         )
         values
@@ -111,8 +111,6 @@
             #{item.musicSheetUpdate.subjectIds},
             #{item.musicSheetUpdate.musicSvg},
             #{item.musicSheetUpdate.composer},
-            #{item.musicSheetUpdate.musicCover},
-            #{item.musicSheetUpdate.musicCover},
             #{item.musicSheetUpdate.audioType},
             #{item.musicSheetUpdate.playSpeed},
             #{item.musicSheetUpdate.musicPrice},
@@ -840,14 +838,13 @@
             ms.charge_type_ = #{item.paymentType},
             ms.music_price_ = #{item.musicPrice},ms.top_flag_ = #{item.topFlag},
             ms.exquisite_flag_ = #{item.exquisiteFlag},ms.sort_number_ = #{item.sortNo},ms.del_flag_ = 0,
-            ms.audit_status_ = CASE WHEN #{item.delFlag} THEN 'PASS' ELSE 'DOING' END
+            ms.audit_status_ = CASE WHEN #{item.delFlag} THEN 'PASS' ELSE 'DOING' END,
+            ms.state_ = #{item.status}
             <if test="item.musicSheetUpdate != null">
                 ,ms.music_sheet_name_ = #{item.musicSheetUpdate.name},
                 ms.music_subject_ = #{item.musicSheetUpdate.subjectIds},
                 ms.music_svg_ = #{item.musicSheetUpdate.musicSvg},
                 ms.composer_ = #{item.musicSheetUpdate.composer},
-                ms.title_img_ = #{item.musicSheetUpdate.musicCover},
-                ms.music_img_ = #{item.musicSheetUpdate.musicCover},
                 ms.accompaniment_type_ = #{item.musicSheetUpdate.audioType},
                 ms.play_speed_ = #{item.musicSheetUpdate.playSpeed},
                 ms.music_price_ = #{item.musicSheetUpdate.musicPrice},

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

@@ -37,7 +37,7 @@
                 <if test="type == null or type =='MUSIC'">
                     union all
                     (select a.music_subject_ as subject_id_ from music_sheet a
-                    where a.del_flag_ = 0 and a.state_ = 1
+                    where a.del_flag_ = 0 and a.state_ = 1 a.cbs_music_sheet_id_ IS NOT NULL
                     GROUP BY a.music_subject_)
                 </if>
                 <if test="type == null or type =='ALBUM'">
@@ -71,7 +71,7 @@
             </trim>
             ) a group by a.subject_id_
         ) a on t.id_ = a.subject_id_
-        where t.parent_subject_id_ != 0
+        where t.parent_subject_id_ != 0 group by t.id_
     </select>
 
     <!-- 向数据库增加一条记录 -->