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

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

@@ -5,6 +5,7 @@ import com.yonge.cooleshow.auth.api.entity.SysUser;
 import com.yonge.cooleshow.biz.dal.dto.search.SysMessageQueryInfo;
 import com.yonge.cooleshow.biz.dal.entity.SysMessage;
 import com.yonge.cooleshow.biz.dal.enums.MessageSendMode;
+import com.yonge.cooleshow.biz.dal.enums.MessageTypeEnum;
 import com.yonge.cooleshow.biz.dal.service.SysMessageService;
 import com.yonge.cooleshow.biz.dal.wrapper.SysMessageWrapper;
 import com.yonge.cooleshow.common.controller.BaseController;
@@ -71,13 +72,13 @@ public class SysMessageController extends BaseController {
 
 	@ApiOperation("一键已读")
 	@PostMapping("batchSetRead")
-	public Object batchSetRead(@RequestBody SysMessageWrapper.MessageRead messageRead) {
+	public Object batchSetRead(@RequestParam(value = "messageType", required = false) MessageTypeEnum messageType) {
 		int status = 1;
 		SysUser sysUser = sysUserFeignService.queryUserInfo();
 		if (sysUser == null) {
 			return failed(HttpStatus.FORBIDDEN, "请登录");
 		}
-		return succeed(sysMessageService.updateStatus(sysUser.getId(), status,"STUDENT",messageRead) > 0 );
+		return succeed(sysMessageService.updateStatus(sysUser.getId(), status,"STUDENT",messageType) > 0 );
 	}
 
 	@ApiOperation("设置已读")

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

@@ -6,8 +6,8 @@ import com.yonge.cooleshow.biz.dal.dao.AppVersionInfoDao;
 import com.yonge.cooleshow.biz.dal.dto.search.SysMessageQueryInfo;
 import com.yonge.cooleshow.biz.dal.entity.SysMessage;
 import com.yonge.cooleshow.biz.dal.enums.MessageSendMode;
+import com.yonge.cooleshow.biz.dal.enums.MessageTypeEnum;
 import com.yonge.cooleshow.biz.dal.service.SysMessageService;
-import com.yonge.cooleshow.biz.dal.wrapper.SysMessageWrapper;
 import com.yonge.cooleshow.common.controller.BaseController;
 import com.yonge.cooleshow.common.entity.HttpResponseResult;
 import com.yonge.cooleshow.common.entity.Mapper;
@@ -25,6 +25,7 @@ import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 
 import java.util.List;
@@ -81,13 +82,13 @@ public class SysMessageController extends BaseController {
 
 	@ApiOperation("一键已读")
 	@PostMapping("batchSetRead")
-	public Object batchSetRead(@RequestBody SysMessageWrapper.MessageRead messageRead) {
+	public Object batchSetRead(@RequestParam(value = "messageType", required = false) MessageTypeEnum messageType) {
 		int status = 1;
 		SysUser sysUser = sysUserFeignService.queryUserInfo();
 		if (sysUser == null) {
 			return failed(HttpStatus.FORBIDDEN, "请登录");
 		}
-		return succeed(sysMessageService.updateStatus(sysUser.getId(), status,"TEACHER",messageRead) > 0 );
+		return succeed(sysMessageService.updateStatus(sysUser.getId(), status,"TEACHER",messageType) > 0 );
 	}
 
 	@ApiOperation("设置已读")

cooleshow-user/user-biz/pom.xml

@@ -19,6 +19,11 @@
     </properties>
     <dependencies>
         <dependency>
+            <groupId>com.dayaedu.cbs.openfeign</groupId>
+            <artifactId>dayaedu-openfeign-api</artifactId>
+            <version>1.0.0</version>
+        </dependency>
+        <dependency>
             <groupId>com.yonge.cooleshow</groupId>
             <artifactId>cooleshow-common</artifactId>
             <version>${project.version}</version>

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/dao/MusicSheetDao.java

@@ -2,6 +2,8 @@ package com.yonge.cooleshow.biz.dal.dao;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.dayaedu.cbs.openfeign.wrapper.music.CbsMusicSheetApplicationExtendWrapper;
+import com.dayaedu.cbs.openfeign.wrapper.music.CbsMusicSheetExtendWrapper;
 import com.yonge.cooleshow.biz.dal.dto.search.*;
 import com.yonge.cooleshow.biz.dal.entity.MusicSheet;
 import com.yonge.cooleshow.biz.dal.enums.ClientEnum;
@@ -189,4 +191,17 @@ public interface MusicSheetDao extends BaseMapper<MusicSheet> {
     List<Long> searchMusic(@Param("page") IPage<TeacherMusicSheetVo> page,@Param("param") MusicCompareWrapper.MusicSearch queryInfo);
     List<Long> searchAlbum(@Param("page") IPage<TeacherMusicSheetVo> page,@Param("param") MusicCompareWrapper.MusicSearch queryInfo);
 
+    void updateBatchByCbsId(@Param("vos") List<CbsMusicSheetApplicationExtendWrapper.MusicSheetApplicationExtend> updateMusicScore);
+
+    void batchInsert(@Param("vos") List<CbsMusicSheetApplicationExtendWrapper.MusicSheetApplicationExtend> addMusicSheet);
+
+    void batchEnable(@Param("ids") String cbsMusicSheetIds, @Param("status") Boolean status);
+
+    void batchDel(@Param("ids") String cbsMusicSheetIds);
+
+    IPage<CbsMusicSheetExtendWrapper.MusicSheetExtend> personOwnerList(@Param("page") IPage<CbsMusicSheetExtendWrapper.MusicSheetExtend> page,
+                                                                 @Param("param") CbsMusicSheetExtendWrapper.MusicSheetExtendQuery query);
+
+    IPage<CbsMusicSheetExtendWrapper.MusicSheetExtend> orgOwnerList(@Param("page") IPage<CbsMusicSheetExtendWrapper.MusicSheetExtend> page,
+                                                                 @Param("param") CbsMusicSheetExtendWrapper.MusicSheetExtendQuery query);
 }

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/dao/MusicTagDao.java

@@ -2,6 +2,8 @@ package com.yonge.cooleshow.biz.dal.dao;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.dayaedu.cbs.openfeign.wrapper.music.CbsMusicSheetCategoryWrapper;
+import com.dayaedu.cbs.openfeign.wrapper.music.CbsMusicSheetTagWrapper;
 import com.yonge.cooleshow.biz.dal.dto.search.MusicTagSearch;
 import com.yonge.cooleshow.biz.dal.entity.MusicTag;
 import com.yonge.cooleshow.biz.dal.vo.MusicTagVo;
@@ -55,4 +57,8 @@ public interface MusicTagDao extends BaseMapper<MusicTag> {
 	 * @return
 	 */
     Integer checkTagBeUsedMusicAlbum(@Param("longs") List<Long> longs);
+
+    List<CbsMusicSheetTagWrapper.MusicSheetTag> tagList(@Param("queryInfo") CbsMusicSheetTagWrapper.MusicSheetTagQuery queryInfo);
+
+	List<CbsMusicSheetCategoryWrapper.MusicSheetCategory> categoryList(@Param("queryInfo") CbsMusicSheetCategoryWrapper.MusicSheetCategoryQuery queryInfo);
 }

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/dao/SubjectDao.java

@@ -1,5 +1,6 @@
 package com.yonge.cooleshow.biz.dal.dao;
 
+import com.dayaedu.cbs.openfeign.wrapper.music.CbsSubjectApiWrapper;
 import com.yonge.cooleshow.biz.dal.entity.Subject;
 import com.yonge.toolset.mybatis.dal.BaseDAO;
 import org.apache.ibatis.annotations.Param;
@@ -61,4 +62,8 @@ public interface SubjectDao extends BaseDAO<Long, Subject> {
      * @return Subject
      */
     Subject getSubjectMatchByName(@Param("name") String subjectName);
+
+    Subject getByCbsId(Integer subjectId);
+
+    List<CbsSubjectApiWrapper.Subject> queryCbsList(CbsSubjectApiWrapper.SubjectQuery query);
 }

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/entity/MusicSheet.java

@@ -7,6 +7,7 @@ import com.yonge.cooleshow.biz.dal.enums.*;
 import com.yonge.cooleshow.common.enums.YesOrNoEnum;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
 import org.apache.commons.lang3.StringUtils;
 
 import javax.validation.constraints.NotBlank;
@@ -30,6 +31,10 @@ public class MusicSheet implements Serializable {
     @ApiModelProperty(value = "主键id")
     private Long id;  //主键ID
 
+	@TableField(value = "cbs_music_sheet_id_")
+    @ApiModelProperty(value = "内容平台曲目ID")
+    private Long cbsMusicSheetId;  //主键ID
+
     @NotBlank(message = "曲谱名称不能为空!")
     @Size(max = 64, message = "曲谱名称长度不能超过64位!")
     @TableField("music_sheet_name_")
@@ -256,7 +261,15 @@ public class MusicSheet implements Serializable {
 	@ApiModelProperty(value = "曲谱类型(SINGLE:单曲，CONCERT:合奏)")
 	private MusicSheetTypeEnum musicSheetType;
 
-    public SourceTypeEnum getProviderType() {
+	public void setCbsMusicSheetId(Long cbsMusicSheetId) {
+		this.cbsMusicSheetId = cbsMusicSheetId;
+	}
+
+	public Long getCbsMusicSheetId() {
+		return cbsMusicSheetId;
+	}
+
+	public SourceTypeEnum getProviderType() {
         return providerType;
     }
 

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/entity/Subject.java

@@ -1,19 +1,21 @@
 package com.yonge.cooleshow.biz.dal.entity;
 
 import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
 
 import java.io.Serializable;
 import java.util.List;
 
-import org.apache.commons.lang3.builder.ToStringBuilder;
-
 /**
  * 对应数据库表(subject):
  */
+@Data
 public class Subject implements Serializable {
 
 	/**  */
 	private Long id;
+
+	private Integer cbsSubjectId;
 	
 	/**  */
 	@ApiModelProperty(value = "声部名称",required = false)
@@ -50,100 +52,4 @@ public class Subject implements Serializable {
 	/**  */
 	@ApiModelProperty(value = "子节点列表",required = false)
 	private List<Subject> subjects;
-
-	public Integer getAiDefaultFrequency() {
-		return aiDefaultFrequency;
-	}
-
-	public void setAiDefaultFrequency(Integer aiDefaultFrequency) {
-		this.aiDefaultFrequency = aiDefaultFrequency;
-	}
-
-	public List<Subject> getSubjects() {
-		return subjects;
-	}
-
-	public void setSubjects(List<Subject> subjects) {
-		this.subjects = subjects;
-	}
-
-	public void setId(Long id){
-		this.id = id;
-	}
-	
-	public Long getId(){
-		return this.id;
-	}
-			
-	public void setName(String name){
-		this.name = name;
-	}
-	
-	public String getName(){
-		return this.name;
-	}
-			
-	public void setCode(String code){
-		this.code = code;
-	}
-	
-	public String getCode(){
-		return this.code;
-	}
-			
-	public void setParentSubjectId(Long parentSubjectId){
-		this.parentSubjectId = parentSubjectId;
-	}
-	
-	public Long getParentSubjectId(){
-		return this.parentSubjectId;
-	}
-			
-	public String getParentSubjectName() {
-		return parentSubjectName;
-	}
-
-	public void setParentSubjectName(String parentSubjectName) {
-		this.parentSubjectName = parentSubjectName;
-	}
-
-	public void setCreateTime(java.util.Date createTime){
-		this.createTime = createTime;
-	}
-	
-	public java.util.Date getCreateTime(){
-		return this.createTime;
-	}
-			
-	public void setUpdateTime(java.util.Date updateTime){
-		this.updateTime = updateTime;
-	}
-	
-	public java.util.Date getUpdateTime(){
-		return this.updateTime;
-	}
-
-	public Boolean getDelFlag() {
-		return delFlag;
-	}
-
-	public void setDelFlag(Boolean delFlag) {
-		this.delFlag = delFlag;
-	}
-
-	public String getImg() {
-		return img;
-	}
-
-	public void setImg(String img) {
-		this.img = img;
-	}
-
-	public String getDesc() {
-		return desc;
-	}
-
-	public void setDesc(String desc) {
-		this.desc = desc;
-	}
 }

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

@@ -2,7 +2,9 @@ package com.yonge.cooleshow.biz.dal.service;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.dayaedu.cbs.openfeign.wrapper.music.CbsMusicSheetApplicationExtendWrapper;
 import com.yonge.cooleshow.auth.api.entity.SysUser;
+import com.yonge.cooleshow.biz.dal.dao.MusicSheetDao;
 import com.yonge.cooleshow.biz.dal.dto.MusicImgDto;
 import com.yonge.cooleshow.biz.dal.dto.MusicSheetDto;
 import com.yonge.cooleshow.biz.dal.dto.MusicSheetExport;
@@ -37,6 +39,8 @@ import java.util.Map;
  **/
 public interface MusicSheetService extends IService<MusicSheet> {
 
+    MusicSheetDao getDao();
+
 
     /**
      * 曲目分页查询

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

@@ -2,6 +2,7 @@ package com.yonge.cooleshow.biz.dal.service;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.yonge.cooleshow.biz.dal.dao.MusicTagDao;
 import com.yonge.cooleshow.biz.dal.dto.MusicTagSaveDto;
 import com.yonge.cooleshow.biz.dal.dto.search.MusicTagSearch;
 import com.yonge.cooleshow.biz.dal.entity.MusicTag;
@@ -15,6 +16,7 @@ import java.util.List;
  * @date 2022-03-29
  */
 public interface MusicTagService extends IService<MusicTag>  {
+	MusicTagDao getBaseMapper();
 
 	/**
      * 查询详情

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

@@ -3,12 +3,14 @@ package com.yonge.cooleshow.biz.dal.service;
 import java.util.List;
 import java.util.Map;
 
+import com.yonge.cooleshow.biz.dal.dao.SubjectDao;
 import com.yonge.cooleshow.biz.dal.entity.Subject;
 import com.yonge.cooleshow.biz.dal.queryInfo.SubjectQueryInfo;
 import com.yonge.toolset.base.page.PageInfo;
 import com.yonge.toolset.mybatis.service.BaseService;
 
 public interface SubjectService extends BaseService<Long, Subject> {
+	SubjectDao getDao();
 	/***
 	 * 通过id集合查询声部
 	 * @param: subjectIdList

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

@@ -32,9 +32,6 @@ public interface SysMessageService extends BaseService<Long, SysMessage> {
 			Integer readStatus, String url,String jpushType, Object... args);
 
 
-	void batchSendMessage(MessageSender messageSender, MessageTypeEnum type, Map<Long, String> receivers, Date triggerTime, Integer readStatus,
-						  String url, String jpushType, String title, Object... args);
-
 	public void batchSendMessage(MessageSender messageSender, String title, String content, Map<Long, String> receivers, Date triggerTime,
 								 Integer readStatus, String url, String jpushType, Object... args);
 
@@ -89,7 +86,7 @@ public interface SysMessageService extends BaseService<Long, SysMessage> {
 	 * @param status 状态/1 已读,0未读
 	 * @return
 	 */
-	public int updateStatus(Long userId, int status,String jpushType,SysMessageWrapper.MessageRead messageRead);
+	public int updateStatus(Long userId, int status,String jpushType,MessageTypeEnum messageType);
 
 	/**
 	 * 修改单条消息状态

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

@@ -0,0 +1,103 @@
+package com.yonge.cooleshow.biz.dal.service.impl;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
+import com.dayaedu.cbs.common.enums.music.EMusicSourceType;
+import com.dayaedu.cbs.openfeign.service.CbsMusicSheetService;
+import com.dayaedu.cbs.openfeign.wrapper.music.CbsMusicSheetApplicationExtendWrapper;
+import com.dayaedu.cbs.openfeign.wrapper.music.CbsMusicSheetCategoryWrapper;
+import com.dayaedu.cbs.openfeign.wrapper.music.CbsMusicSheetExtendWrapper;
+import com.dayaedu.cbs.openfeign.wrapper.music.CbsMusicSheetTagWrapper;
+import com.microsvc.toolkit.common.response.paging.PageInfo;
+import com.microsvc.toolkit.common.response.paging.QueryInfo;
+import com.yonge.cooleshow.biz.dal.dao.MusicSheetDao;
+import com.yonge.cooleshow.biz.dal.entity.MusicSheet;
+import com.yonge.cooleshow.biz.dal.service.MusicSheetService;
+import com.yonge.cooleshow.biz.dal.service.MusicTagService;
+import com.yonge.toolset.base.exception.BizException;
+import org.apache.commons.lang3.StringUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import javax.annotation.Resource;
+import java.util.List;
+import java.util.stream.Collectors;
+
+@Service
+public class CbsMusicSheetServiceImpl implements CbsMusicSheetService {
+
+    private static final Logger log = LoggerFactory.getLogger(CbsMusicSheetServiceImpl.class);
+
+    @Resource
+    private MusicSheetService musicSheetService;
+    @Resource
+    private MusicTagService musicTagService;
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public Boolean saveApplicationExtend(List<CbsMusicSheetApplicationExtendWrapper.MusicSheetApplicationExtend> addMusicSheet) {
+        if (com.baomidou.mybatisplus.core.toolkit.CollectionUtils.isEmpty(addMusicSheet)) {
+            throw new BizException("请选择曲目信息");
+        }
+        List<Long> cbsMusicSheetIds = addMusicSheet.stream().map(e -> e.getMusicSheetId()).collect(Collectors.toList());
+        //需要修改的曲目
+        List<MusicSheet> musicSheets = musicSheetService.lambdaQuery().in(MusicSheet::getId, cbsMusicSheetIds).list();
+        if (com.baomidou.mybatisplus.core.toolkit.CollectionUtils.isNotEmpty(musicSheets)){
+            List<Long> collect = musicSheets.stream().map(e -> e.getCbsMusicSheetId()).collect(Collectors.toList());
+            //获取需要修改的曲目
+            List<CbsMusicSheetApplicationExtendWrapper.MusicSheetApplicationExtend> updateMusicScore =
+                    addMusicSheet.stream().filter(e -> collect.contains(e.getMusicSheetId())).collect(Collectors.toList());
+            musicSheetService.getDao().updateBatchByCbsId(updateMusicScore);
+            //排除已经存在的曲目
+            addMusicSheet = addMusicSheet.stream().filter(e -> !collect.contains(e.getMusicSheetId())).collect(Collectors.toList());
+        }
+        if(CollectionUtils.isNotEmpty(addMusicSheet)){
+            musicSheetService.getDao().batchInsert(addMusicSheet);
+        }
+        return true;
+    }
+
+    public Boolean updateApplicationExtendStatus(CbsMusicSheetApplicationExtendWrapper.MusicSheetApplicationExtendStatus updateMusicSheet){
+        if (updateMusicSheet == null || org.apache.commons.lang3.StringUtils.isEmpty(updateMusicSheet.getIds())){
+            throw new BizException("请选择曲目");
+        }
+        if (updateMusicSheet.getStatus() == null){
+            throw new BizException("请选择状态");
+        }
+        if (!updateMusicSheet.getStatus()){
+            musicSheetService.getDao().batchEnable(updateMusicSheet.getIds(),updateMusicSheet.getStatus());
+        }
+        return true;
+    }
+
+    public Boolean delApplicationExtend(CbsMusicSheetApplicationExtendWrapper.MusicSheetApplicationExtendDel musicSheetApplicationExtendDel){
+        if (musicSheetApplicationExtendDel == null || StringUtils.isEmpty(musicSheetApplicationExtendDel.getIds())){
+            throw new BizException("请选择曲目");
+        }
+        musicSheetService.getDao().batchDel(musicSheetApplicationExtendDel.getIds());
+        return true;
+    }
+
+    public List<CbsMusicSheetTagWrapper.MusicSheetTag> tagList(CbsMusicSheetTagWrapper.MusicSheetTagQuery queryInfo){
+        return musicTagService.getBaseMapper().tagList(queryInfo);
+    }
+
+    public List<CbsMusicSheetCategoryWrapper.MusicSheetCategory> categoryList(CbsMusicSheetCategoryWrapper.MusicSheetCategoryQuery queryInfo){
+        return musicTagService.getBaseMapper().categoryList(queryInfo);
+    }
+
+    public PageInfo<CbsMusicSheetExtendWrapper.MusicSheetExtend> ownerList(CbsMusicSheetExtendWrapper.MusicSheetExtendQuery queryInfo){
+        IPage<CbsMusicSheetExtendWrapper.MusicSheetExtend> page = QueryInfo.getPage(queryInfo);
+        if (queryInfo.getSourceType() == null){
+            throw new BizException("请选择来源类型");
+        }
+        if(queryInfo.getSourceType() == EMusicSourceType.PERSON){
+            return QueryInfo.pageInfo(musicSheetService.getDao().personOwnerList(page, queryInfo));
+        }else {
+            return QueryInfo.pageInfo(musicSheetService.getDao().orgOwnerList(page, queryInfo));
+        }
+    }
+}

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

@@ -0,0 +1,33 @@
+package com.yonge.cooleshow.biz.dal.service.impl;
+
+import com.dayaedu.cbs.openfeign.service.CbsSubjectService;
+import com.dayaedu.cbs.openfeign.wrapper.music.CbsSubjectApiWrapper;
+import com.yonge.cooleshow.biz.dal.entity.Subject;
+import com.yonge.cooleshow.biz.dal.service.SubjectService;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+import java.util.List;
+
+@Service
+public class CbsSubjectServiceImpl implements CbsSubjectService {
+
+    private static final Logger log = LoggerFactory.getLogger(CbsSubjectServiceImpl.class);
+
+    @Resource
+    private SubjectService subjectService;
+
+    public Boolean checkSubjectEnable(CbsSubjectApiWrapper.CheckSubjectDto checkSubjectDto) {
+        Subject subject = subjectService.getDao().getByCbsId(checkSubjectDto.getSubjectId());
+        if (subject != null){
+            return true;
+        }
+        return false;
+    }
+
+    public List<CbsSubjectApiWrapper.Subject> list(CbsSubjectApiWrapper.SubjectQuery query) {
+        return subjectService.getDao().queryCbsList(query);
+    }
+}

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

@@ -5,6 +5,8 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 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.dayaedu.cbs.openfeign.service.CbsMusicSheetService;
+import com.dayaedu.cbs.openfeign.wrapper.music.CbsMusicSheetApplicationExtendWrapper;
 import com.yonge.cooleshow.auth.api.client.SysUserFeignService;
 import com.yonge.cooleshow.auth.api.entity.SysUser;
 import com.yonge.cooleshow.biz.dal.dao.MusicAlbumDao;
@@ -111,7 +113,7 @@ import java.util.stream.Collectors;
  * @date 2022-03-26 00:01:37
  **/
 @Service
-public class MusicSheetServiceImpl extends ServiceImpl<MusicSheetDao, MusicSheet> implements MusicSheetService {
+public class MusicSheetServiceImpl extends ServiceImpl<MusicSheetDao, MusicSheet> implements MusicSheetService, CbsMusicSheetService {
 
     private static final Logger log = LoggerFactory.getLogger(MusicSheetServiceImpl.class);
 
@@ -197,14 +199,8 @@ public class MusicSheetServiceImpl extends ServiceImpl<MusicSheetDao, MusicSheet
     private TenantAlbumMusicService tenantAlbumMusicService;
 
     @Autowired
-    private RedisCacheService redisCacheService;
-
-    @Autowired
     private TenantAlbumService tenantAlbumService;
 
-    @Autowired
-    private UserTenantAlbumRecordService userTenantAlbumRecordService;
-
     public MusicSheetDao getDao() {
         return musicSheetDao;
     }

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

@@ -34,6 +34,10 @@ public class MusicTagServiceImpl extends ServiceImpl<MusicTagDao, MusicTag> impl
     @Autowired
     private SysUserFeignService sysUserFeignService;
 
+    public MusicTagDao getBaseMapper() {
+        return musicTagDao;
+    }
+
 	@Override
     public MusicTagVo detail(Long id) {
         return baseMapper.detail(id);

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

@@ -35,6 +35,11 @@ public class SubjectServiceImpl extends BaseServiceImpl<Long, Subject> implement
     }
 
     @Override
+    public SubjectDao getDao() {
+        return subjectDao;
+    }
+
+    @Override
     public List<Subject> findBySubjectByIdList(List<Long> subjectIdList) {
         if (CollectionUtils.isEmpty(subjectIdList)) {
             return new ArrayList<>();

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

@@ -137,12 +137,7 @@ public class SysMessageServiceImpl extends BaseServiceImpl<Long, SysMessage> imp
 
 	@Override
 	public void batchSendMessage(MessageSender messageSender, MessageTypeEnum type, Map<Long, String> receivers, Date triggerTime, Integer readStatus,
-								 String url, String jpushType, Object... args) {
-		batchSendMessage(messageSender, type, receivers, triggerTime, readStatus, url, jpushType, null, args);
-	}
-	@Override
-	public void batchSendMessage(MessageSender messageSender, MessageTypeEnum type, Map<Long, String> receivers, Date triggerTime, Integer readStatus,
-			String url,String jpushType,String title, Object... args) {
+								 String url,String jpushType, Object... args) {
 		LOGGER.info("batchSendMessage msgSender {}, type {}, receivers {} ", messageSender, type, receivers);
 		if (receivers == null || receivers.size() == 0) {
 			LOGGER.error("接收地址不能为空");
@@ -156,10 +151,10 @@ public class SysMessageServiceImpl extends BaseServiceImpl<Long, SysMessage> imp
 		if(messageSender.getSendMode().equals(MessageSender.JIGUANG.getSendMode())) {
 			tos= new String[receivers.size()];
 			tos = receivers.entrySet()
-						   .stream()
-						   .map(longStringEntry -> String.valueOf(longStringEntry.getKey()))
-						   .collect(Collectors.toList())
-						   .toArray(tos);
+					.stream()
+					.map(longStringEntry -> String.valueOf(longStringEntry.getKey()))
+					.collect(Collectors.toList())
+					.toArray(tos);
 		} else {
 			tos = receivers.values().toArray(new String[receivers.size()]);
 		}
@@ -173,17 +168,13 @@ public class SysMessageServiceImpl extends BaseServiceImpl<Long, SysMessage> imp
 		Date date = new Date();
 		SendStatusEnum status = SendStatusEnum.WAIT;
 		String errorMsg = null;
-		String msgTitle = title;
-		if(StringUtils.isEmpty(msgTitle)){
-			msgTitle = messageConfig.getDescription();
-		}
 		// 立即发送
 		if (triggerTime == null || date.after(triggerTime)) {
 			status = SendStatusEnum.SENDING;
 			try {
 				if (isSendRemoteMessage(messageSender)) {
-					errorMsg = messageSenderPluginContext.batchSend(messageSender, msgTitle,
-														 MessageFormatter.arrayFormat(messageConfig.getContent(), args), tos, url,jpushType,"default",null);
+					errorMsg = messageSenderPluginContext.batchSend(messageSender, messageConfig.getDescription(),
+							MessageFormatter.arrayFormat(messageConfig.getContent(), args), tos, url,jpushType,"default",null);
 					if (StringUtils.isEmpty(errorMsg)) {
 						status = SendStatusEnum.SUCCESSED;
 					}  else {
@@ -203,10 +194,10 @@ public class SysMessageServiceImpl extends BaseServiceImpl<Long, SysMessage> imp
 		} else if (messageSender.getSendMode().equals("EMAIL")) {
 			mode = MessageSendMode.EMAIL;
 		}
-        if (ClientEnum.TENANT_STUDENT.getCode().equals(jpushType)) {
-            jpushType = ClientEnum.STUDENT.getCode();
-        }
-		addMessage(receivers, title, MessageFormatter.arrayFormat(messageConfig.getContent(), args), triggerTime, mode, status, errorMsg, readStatus,
+		if (ClientEnum.TENANT_STUDENT.getCode().equals(jpushType)) {
+			jpushType = ClientEnum.STUDENT.getCode();
+		}
+		addMessage(receivers, messageConfig.getDescription(), MessageFormatter.arrayFormat(messageConfig.getContent(), args), triggerTime, mode, status, errorMsg, readStatus,
 				url, messageConfig.getGroup(),jpushType,messageConfig.getId());
 	}
 
@@ -386,9 +377,8 @@ public class SysMessageServiceImpl extends BaseServiceImpl<Long, SysMessage> imp
 	 */
 	@Override
 	@Transactional(rollbackFor = Exception.class)
-	public int updateStatus(Long userId, int status,String jpushType,SysMessageWrapper.MessageRead messageRead) {
+	public int updateStatus(Long userId, int status,String jpushType,MessageTypeEnum messageType) {
 		// 按照类型设置一键已读
-		MessageTypeEnum messageType = messageRead.getMessageType();
 		Long messageConfigId = null;
 		if (messageType != null) {
 			SysMessageConfig sysMessageConfig = sysMessageConfigService.queryByType(messageType.getCode());

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

@@ -92,6 +92,15 @@
         t.music_first_svg_ as musicFirstSvg,
         t.music_sheet_type_ as musicSheetType
     </sql>
+    <insert id="batchInsert">
+        insert into music_sheet
+        (cbs_music_sheet_id_,provider_type_,music_tag_,payment_type_,music_price_,top_flag_,exquisite_flag_,sort_number_)
+        values
+        <foreach collection="vos" item="item" separator=",">
+            (#{item.musicSheetId},#{item.availableType},#{item.musicTagIds},#{item.paymentType},
+             #{item.musicPrice},#{item.topFlag},#{item.exquisiteFlag},#{item.sortNo})
+        </foreach>
+    </insert>
 
     <select id="selectPage" resultType="com.yonge.cooleshow.biz.dal.vo.MusicSheetVo">
         select <include refid="Base_Column_List"/>
@@ -803,6 +812,21 @@
         </choose>
         where id_ = #{musicSheetId}
     </update>
+    <update id="updateBatchByCbsId">
+        <foreach collection="vos" item="item" index="index" separator=";">
+            update sys_music_score ms set ms.provider_type_ = #{item.availableType},
+            ms.music_tag_ = #{item.musicTagIds},ms.payment_type_ = #{item.paymentType},
+            ms.music_price_ = #{item.musicPrice},ms.top_flag_ = #{item.topFlag},
+            ms.exquisite_flag_ = #{item.exquisiteFlag},ms.sort_number_ = #{item.sortNo}
+            where ms.cbs_music_sheet_id_ = #{item.musicSheetId}
+        </foreach>
+    </update>
+    <update id="batchEnable">
+        update music_sheet set state_ = #{state} where FIND_IN_SET(cbs_music_sheet_id_,#{ids})
+    </update>
+    <update id="batchDel">
+        update music_sheet set del_flag_ = 1 where FIND_IN_SET(cbs_music_sheet_id_,#{ids})
+    </update>
 
     <select id="countByUser" resultType="com.yonge.cooleshow.biz.dal.vo.MusicSheetUploadCountVo">
         select user_id_ userId, count(id_) count
@@ -855,5 +879,33 @@
         </where>
         order by  t.sort_number_ desc
     </select>
+    <select id="personOwnerList"
+            resultType="com.dayaedu.cbs.openfeign.wrapper.music.CbsMusicSheetExtendWrapper$MusicSheetExtend">
+        select su.id_ userId,su.real_name_ username,'TEACHER' clientType,su.phone_ phone from sys_user su
+        where su.user_type_ LIKE '%TEACHER%' AND su.del_flag_ = 0
+        <if test="param.name != null and param.name != ''">
+            AND (su.phone_ LIKE CONCAT('%',#{param.name},'%') OR su.real_name_ LIKE CONCAT('%',#{param.name},'%'))
+        </if>
+        <if test="param.userIdList != null and param.userIdList.size > 0">
+            AND su.id_ IN
+            <foreach collection="param.userIdList" item="item" open="(" close=")" separator=",">
+                #{item}
+            </foreach>
+        </if>
+    </select>
+
+    <select id="orgOwnerList"
+            resultType="com.dayaedu.cbs.openfeign.wrapper.music.CbsMusicSheetExtendWrapper$MusicSheetExtend">
+        select id_ userId,name_ username,'ORG' clientType,phone_ phone from tenant_info where enable_flag_ = 1
+        <if test="param.name != null and param.name != ''">
+            AND (phone_ LIKE CONCAT('%',#{param.name},'%') OR name_ LIKE CONCAT('%',#{param.name},'%'))
+        </if>
+        <if test="param.userIdList != null and param.userIdList.size > 0">
+            AND id_ IN
+            <foreach collection="param.userIdList" item="item" open="(" close=")" separator=",">
+                #{item}
+            </foreach>
+        </if>
+    </select>
     <!--单曲专辑数量统计-->
 </mapper>

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

@@ -114,4 +114,40 @@
             </if>
         </where>
     </select>
+    <select id="tagList"
+            resultType="com.dayaedu.cbs.openfeign.wrapper.music.CbsMusicSheetTagWrapper$MusicSheetTag">
+        SELECT t.id_ id,t.name_ name FROM music_tag t
+        <where>
+            <if test="param.ids != null and param.ids.size > 0">
+                and t.id_ IN
+                <foreach collection="param.ids" item="id" open="(" close=")" separator=",">
+                    #{id}
+                </foreach>
+            </if>
+            <if test="param.id != null">
+                and t.id_ = #{param.id}
+            </if>
+            <if test="param.delFlag != null">
+                and t.del_flag_ = #{param.delFlag}
+            </if>
+        </where>
+    </select>
+    <select id="categoryList"
+            resultType="com.dayaedu.cbs.openfeign.wrapper.music.CbsMusicSheetCategoryWrapper$MusicSheetCategory">
+        SELECT t.id_ id,t.name_ name,t.parent_tag_id_ parentId FROM music_tag t
+        <where>
+            <if test="param.ids != null and param.ids.size > 0">
+                and t.id_ IN
+                <foreach collection="param.ids" item="id" open="(" close=")" separator=",">
+                    #{id}
+                </foreach>
+            </if>
+            <if test="param.id != null">
+                and t.id_ = #{param.id}
+            </if>
+            <if test="param.delFlag != null">
+                and t.del_flag_ = #{param.delFlag}
+            </if>
+        </where>
+    </select>
 </mapper>

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

@@ -7,6 +7,7 @@
 <mapper namespace="com.yonge.cooleshow.biz.dal.dao.SubjectDao">
     <resultMap type="com.yonge.cooleshow.biz.dal.entity.Subject" id="Subject">
         <result column="id_" property="id"/>
+        <result column="cbs_subject_id_" property="cbsSubjectId"/>
         <result column="name_" property="name"/>
         <result column="code_" property="code"/>
         <result column="parent_subject_id_" property="parentSubjectId"/>
@@ -77,14 +78,17 @@
     <insert id="insert" parameterType="com.yonge.cooleshow.biz.dal.entity.Subject" useGeneratedKeys="true"
             keyColumn="id"
             keyProperty="id">
-        INSERT INTO subject (id_,name_,code_,parent_subject_id_,img_,create_time_,update_time_,desc_,ai_default_frequency_)
-        VALUES(#{id},#{name},#{code},#{parentSubjectId},#{img},now(),now(),#{desc},#{aiDefaultFrequency})
+        INSERT INTO subject (id_,cbs_subject_id_,name_,code_,parent_subject_id_,img_,create_time_,update_time_,desc_,ai_default_frequency_)
+        VALUES(#{id},#{cbsSubjectId},#{name},#{code},#{parentSubjectId},#{img},now(),now(),#{desc},#{aiDefaultFrequency})
     </insert>
 
     <!-- 根据主键查询一条记录 -->
     <update id="update" parameterType="com.yonge.cooleshow.biz.dal.entity.Subject">
         UPDATE subject
         <set>
+            <if test="cbsSubjectId != null">
+                cbs_subject_id_ = #{cbsSubjectId},
+            </if>
             <if test="delFlag != null">
                 del_flag_ = #{delFlag},
             </if>
@@ -204,6 +208,26 @@
     <select id="getSubjectMatchByName" resultType="com.yonge.cooleshow.biz.dal.entity.Subject">
         SELECT * FROM subject WHERE del_flag_ = 0 and name_ LIKE CONCAT('%', #{name}, '%') LIMIT 1
     </select>
+    <select id="getByCbsId" resultType="com.yonge.cooleshow.biz.dal.entity.Subject">
+        SELECT * FROM `subject` WHERE cbs_subject_id_ = #{cbsSubjectId} AND del_flag_ = 0 LIMIT 1
+    </select>
+    <select id="queryCbsList"
+            resultType="com.dayaedu.cbs.openfeign.wrapper.music.CbsSubjectApiWrapper$Subject">
+        SELECT id_ subjectId,cbs_subject_id_ cbsSubjectId,name_ subjectName FROM `subject`
+        WHERE del_flag_ = 0
+        <if test="query.cbsSubjectIds != null and query.cbsSubjectIds.size > 0">
+            AND cbs_subject_id_ IN
+            <foreach collection="query.cbsSubjectIds" item="cbsSubjectId" open="(" close=")" separator=",">
+                #{cbsSubjectId}
+            </foreach>
+        </if>
+        <if test="query.subjectIds != null and query.subjectIds.size > 0">
+            AND id_ IN
+            <foreach collection="query.subjectIds" item="subjectId" open="(" close=")" separator=",">
+                #{subjectId}
+            </foreach>
+        </if>
+    </select>
     <!--声部模糊匹配-->
 
 </mapper>

cooleshow-user/user-student/src/main/java/com/yonge/cooleshow/student/controller/SysMessageController.java

@@ -6,6 +6,7 @@ import com.yonge.cooleshow.biz.dal.dao.AppVersionInfoDao;
 import com.yonge.cooleshow.biz.dal.dto.search.SysMessageQueryInfo;
 import com.yonge.cooleshow.biz.dal.entity.SysMessage;
 import com.yonge.cooleshow.biz.dal.enums.MessageSendMode;
+import com.yonge.cooleshow.biz.dal.enums.MessageTypeEnum;
 import com.yonge.cooleshow.biz.dal.service.SysMessageService;
 import com.yonge.cooleshow.biz.dal.wrapper.SysMessageWrapper;
 import com.yonge.cooleshow.common.controller.BaseController;
@@ -76,13 +77,13 @@ public class SysMessageController extends BaseController {
 
 	@ApiOperation("一键已读")
 	@PostMapping("batchSetRead")
-	public Object batchSetRead(@RequestBody SysMessageWrapper.MessageRead messageRead) {
+	public Object batchSetRead(@RequestParam(value = "messageType", required = false) MessageTypeEnum messageType) {
 		int status = 1;
 		SysUser sysUser = sysUserFeignService.queryUserInfo();
 		if (sysUser == null) {
 			return failed(HttpStatus.FORBIDDEN, "请登录");
 		}
-		return succeed(sysMessageService.updateStatus(sysUser.getId(), status,"STUDENT",messageRead) > 0 );
+		return succeed(sysMessageService.updateStatus(sysUser.getId(), status,"STUDENT",messageType) > 0 );
 	}
 
 	@ApiOperation("设置已读")

cooleshow-user/user-teacher/src/main/java/com/yonge/cooleshow/teacher/controller/SysMessageController.java

@@ -6,6 +6,7 @@ import com.yonge.cooleshow.biz.dal.dao.AppVersionInfoDao;
 import com.yonge.cooleshow.biz.dal.dto.search.SysMessageQueryInfo;
 import com.yonge.cooleshow.biz.dal.entity.SysMessage;
 import com.yonge.cooleshow.biz.dal.enums.MessageSendMode;
+import com.yonge.cooleshow.biz.dal.enums.MessageTypeEnum;
 import com.yonge.cooleshow.biz.dal.service.SysMessageService;
 import com.yonge.cooleshow.biz.dal.wrapper.SysMessageWrapper;
 import com.yonge.cooleshow.common.controller.BaseController;
@@ -76,13 +77,13 @@ public class SysMessageController extends BaseController {
 
 	@ApiOperation("一键已读")
 	@PostMapping("batchSetRead")
-	public Object batchSetRead(@RequestBody SysMessageWrapper.MessageRead messageRead) {
+	public Object batchSetRead(@RequestParam(value = "messageType", required = false) MessageTypeEnum messageType) {
 		int status = 1;
 		SysUser sysUser = sysUserFeignService.queryUserInfo();
 		if (sysUser == null) {
 			return failed(HttpStatus.FORBIDDEN, "请登录");
 		}
-		return succeed(sysMessageService.updateStatus(sysUser.getId(), status,"TEACHER",messageRead) > 0 );
+		return succeed(sysMessageService.updateStatus(sysUser.getId(), status,"TEACHER",messageType) > 0 );
 	}
 
 	@ApiOperation("设置已读")