Merge branch '2021-09-22～26' of http://git.dayaedu.com/yonge/mec

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

@@ -31,5 +31,5 @@ public interface SysMusicScoreAccompanimentDao extends BaseDAO<Integer, SysMusic
      * 获取伴奏声部列表
      * @return
      */
-    List<Subject> querySubjectIds();
+    List<Subject> querySubjectIds(@Param("categoriesIdList") List<Integer> categoriesIdList);
 }

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

@@ -18,7 +18,7 @@ public interface SysMusicScoreAccompanimentService extends BaseService<Integer,
 
     List<SysMusicScoreAccompaniment> queryAccPage(SysExamSongQueryInfo queryInfo);
 
-    List<Subject> querySubjectIds();
+    List<Subject> querySubjectIds(Integer categoriesId);
 
     PageInfo<SysMusicScoreAccompaniment> queryScorePage(SysExamSongQueryInfo queryInfo);
 }

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

@@ -79,8 +79,19 @@ public class SysMusicScoreAccompanimentServiceImpl extends BaseServiceImpl<Integ
 	}
 
 	@Override
-	public List<Subject> querySubjectIds() {
-		return sysMusicScoreAccompanimentDao.querySubjectIds();
+	public List<Subject> querySubjectIds(Integer categoriesId) {
+		List<Integer> categoriesIdList = new ArrayList<>();
+		if(categoriesId != null){
+			MusicScoreQueryInfo musicScoreQueryInfo = new MusicScoreQueryInfo();
+			musicScoreQueryInfo.setParentId(categoriesId);
+			List<SysMusicScoreCategories> scoreCategories = sysMusicScoreCategoriesService.queryTree(musicScoreQueryInfo);
+			if(scoreCategories.size() > 0){
+				categoriesIdList = scoreCategories.stream().map(e->e.getId()).collect(Collectors.toList());
+			}else {
+				categoriesIdList.add(categoriesId);
+			}
+		}
+		return sysMusicScoreAccompanimentDao.querySubjectIds(categoriesIdList);
 	}
 
     @Override

mec-biz/src/main/resources/config/mybatis/SysMusicScoreAccompanimentMapper.xml

@@ -175,7 +175,15 @@
     <select id="querySubjectIds" resultMap="com.ym.mec.biz.dal.dao.SubjectDao.Subject">
 		SELECT s.* FROM sys_music_score_accompaniment sesa
 		LEFT JOIN `subject` s ON s.id_ = sesa.subject_id_
+		LEFT JOIN sys_music_score sms ON sms.id_ = sesa.exam_song_id_
+		LEFT JOIN sys_music_score_categories sesc ON sesc.id_ = sms.music_score_categories_id_
 		WHERE sesa.del_flag_ = 0 AND sesa.subject_id_ IS NOT NULL
+		<if test="categoriesIdList != null and categoriesIdList.size > 0">
+			AND sesc.id_ IN
+			<foreach collection="categoriesIdList" separator="," item="item" open="(" close=")">
+				#{item}
+			</foreach>
+		</if>
 		GROUP BY sesa.subject_id_
 	</select>
 

mec-im/src/main/java/com/ym/controller/GroupController.java

@@ -1,7 +1,10 @@
 package com.ym.controller;
 
+import com.ym.mec.common.entity.ImBaseMessage;
 import com.ym.mec.common.entity.ImGroupMessage;
+import com.ym.mec.common.entity.ImNoticeMessage;
 import com.ym.mec.common.entity.ImTxtMessage;
+import com.ym.pojo.NoticeMessage;
 import com.ym.service.GroupService;
 import com.ym.service.MessageService;
 import io.rong.messages.TxtMessage;
@@ -12,6 +15,7 @@ import io.rong.models.message.GroupMessage;
 import io.rong.models.message.MentionMessage;
 import io.rong.models.message.PrivateMessage;
 import io.rong.models.message.RecallMessage;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -35,9 +39,15 @@ public class GroupController{
     @RequestMapping(value = "/send", method = RequestMethod.POST)
     public Object send(@RequestBody ImGroupMessage imGroupMessage) throws Exception {
         GroupMessage groupMessage = new GroupMessage();
-        ImTxtMessage content = (ImTxtMessage)imGroupMessage.getContent();
-        TxtMessage txtMessage = new TxtMessage(content.getContent(),content.getExtra());
-        groupMessage.setContent(txtMessage);
+        ImTxtMessage imTxtMessage = (ImTxtMessage) imGroupMessage.getContent();
+        String objectName = imGroupMessage.getObjectName();
+        if("DY:NoticeMsg".equals(objectName)){
+            NoticeMessage noticeMessage = new NoticeMessage(imTxtMessage.getContent(),imTxtMessage.getExtra());
+            groupMessage.setContent(noticeMessage);
+        }else {
+            TxtMessage txtMessage = new TxtMessage(imTxtMessage.getContent(),imTxtMessage.getExtra());
+            groupMessage.setContent(txtMessage);
+        }
         groupMessage.setTargetId(imGroupMessage.getTargetId());
         groupMessage.setSenderId(imGroupMessage.getSenderId());
         groupMessage.setObjectName(imGroupMessage.getObjectName());

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

@@ -0,0 +1,58 @@
+package com.ym.pojo;
+
+import io.rong.messages.BaseMessage;
+import io.rong.messages.UserInfo;
+import io.rong.util.GsonUtil;
+import lombok.Data;
+
+@Data
+public class NoticeMessage extends BaseMessage {
+    private String content = "";
+    private String extra = "";
+    private io.rong.messages.UserInfo user = null;
+    private static final transient String TYPE = "DY:NoticeMsg";
+
+    public NoticeMessage(String content, String extra) {
+        this.content = content;
+        this.extra = extra;
+    }
+
+    public NoticeMessage(String content, String extra, io.rong.messages.UserInfo user) {
+        this.content = content;
+        this.extra = extra;
+        this.user = user;
+    }
+
+    public String getType() {
+        return "DY:NoticeMsg";
+    }
+
+    public String getContent() {
+        return this.content;
+    }
+
+    public void setContent(String content) {
+        this.content = content;
+    }
+
+    public String getExtra() {
+        return this.extra;
+    }
+
+    public void setExtra(String extra) {
+        this.extra = extra;
+    }
+
+    public io.rong.messages.UserInfo getUser() {
+        return this.user;
+    }
+
+    public void setUser(UserInfo user) {
+        this.user = user;
+    }
+
+    public String toString() {
+        return GsonUtil.toJson(this, NoticeMessage.class);
+
+    }
+}

mec-student/src/main/java/com/ym/mec/student/controller/SysMusicScoreAccompanimentController.java

@@ -41,7 +41,7 @@ public class SysMusicScoreAccompanimentController extends BaseController {
 
     @ApiOperation(value = "获取伴奏声部列表")
     @GetMapping("/querySubjectIds")
-    public Object querySubjectIds() {
-        return succeed(sysMusicScoreAccompanimentService.querySubjectIds());
+    public Object querySubjectIds(Integer categoriesId) {
+        return succeed(sysMusicScoreAccompanimentService.querySubjectIds(categoriesId));
     }
 }

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

@@ -40,8 +40,8 @@ public class SysMusicScoreAccompanimentController extends BaseController {
 
     @ApiOperation(value = "获取伴奏声部列表")
     @GetMapping("/querySubjectIds")
-    public Object querySubjectIds() {
-        return succeed(sysMusicScoreAccompanimentService.querySubjectIds());
+    public Object querySubjectIds(Integer categoriesId) {
+        return succeed(sysMusicScoreAccompanimentService.querySubjectIds(categoriesId));
     }
 
     @ApiOperation(value = "分页查询")

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

@@ -45,7 +45,7 @@ public class SysMusicScoreAccompanimentController extends BaseController {
 
     @ApiOperation(value = "获取伴奏声部列表")
     @GetMapping("/querySubjectIds")
-    public Object querySubjectIds() {
-        return succeed(sysMusicScoreAccompanimentService.querySubjectIds());
+    public Object querySubjectIds(Integer categoriesId) {
+        return succeed(sysMusicScoreAccompanimentService.querySubjectIds(categoriesId));
     }
 }

mec-web/src/main/java/com/ym/mec/web/controller/education/EduMusicScoreController.java

@@ -52,7 +52,7 @@ public class EduMusicScoreController extends BaseController {
 
     @ApiOperation(value = "获取伴奏声部列表")
     @GetMapping("/querySubjectIds")
-    public Object querySubjectIds() {
-        return succeed(sysMusicScoreAccompanimentService.querySubjectIds());
+    public Object querySubjectIds(Integer categoriesId) {
+        return succeed(sysMusicScoreAccompanimentService.querySubjectIds(categoriesId));
     }
 }