Merge remote-tracking branch 'origin/yonge' into yonge

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

@@ -42,7 +42,7 @@ public interface SysMessageService extends BaseService<Long, SysMessage> {
 	 * @param roomId
 	 * @param content
 	 */
-	void batchSendImPlayMidiMessage(String senderId,String roomId, String content);
+//	void batchSendImPlayMidiMessage(String senderId,String roomId, String content);
 
 	/**
 	 * 批量发送消息

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

@@ -130,18 +130,26 @@ public class ClassGroupServiceImpl extends BaseServiceImpl<Integer, ClassGroup>
     	PageInfo<ClassGroup> pageInfo = new PageInfo<ClassGroup>(queryInfo.getPage(), queryInfo.getRows());
 		Map<String, Object> params = new HashMap<String, Object>();
 		MapUtil.populateMap(params, queryInfo);
-		
+
 		List<ClassGroup> dataList = new ArrayList<ClassGroup>();
 		int count = this.findCount(params);
 		if (count > 0) {
-			pageInfo.setTotal(count);
-			params.put("offset", pageInfo.getOffset());
-			dataList = this.getDAO().queryPage(params);
-		}
-		for (ClassGroup cg : dataList) {
-			cg.setTeacherMapperList(classGroupTeacherMapperDao.findClassGroupTeachers(cg.getId() + ""));
-			cg.setCourseScheduleList(courseScheduleDao.findCoursesByClassGroupId(cg.getId(), null));
-		}
+            pageInfo.setTotal(count);
+            params.put("offset", pageInfo.getOffset());
+            dataList = this.getDAO().queryPage(params);
+            List<Integer> classGroupIds = dataList.stream().map(ClassGroup::getId).collect(Collectors.toList());
+
+            List<Map<Integer, Integer>> classGroupStudentNumMaps = classGroupStudentMapperDao.countClassGroupsStudentNum(classGroupIds, null);
+            Map<Integer, Long> classGroupStudentNumMap = MapUtil.convertIntegerMap(classGroupStudentNumMaps);
+
+            for (ClassGroup cg : dataList) {
+                Long studentNum = classGroupStudentNumMap.get(cg.getId());
+                cg.setStudentNum(Objects.isNull(studentNum) ? 0 : studentNum.intValue());
+                cg.setTeacherMapperList(classGroupTeacherMapperDao.findClassGroupTeachers(cg.getId() + ""));
+                cg.setCourseScheduleList(courseScheduleDao.findCoursesByClassGroupId(cg.getId(), null));
+            }
+        }
+
 		pageInfo.setRows(dataList);
 		return pageInfo;
 	}

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

@@ -192,16 +192,16 @@ public class SysMessageServiceImpl extends BaseServiceImpl<Long, SysMessage> imp
 		imFeignService.privateSend(privateMessage);
 	}
 
-	@Override
+	/*@Override
 	public void batchSendImPlayMidiMessage(String senderId,String roomId, String content) {
 		ImGroupMessage groupMessage = new ImGroupMessage();
-//		privateMessage.setObjectName("DY:PlayMidiMessage");
+		privateMessage.setObjectName("DY:PlayMidiMessage");
 		groupMessage.setTargetId(roomId.split(","));
 		groupMessage.setSenderId(senderId);
 		groupMessage.setContent(new ImPlayMidiMessage(content,null));
 		groupMessage.setType("DY:PlayMidiMessage");
 		imFeignService.privateSendCustom(groupMessage);
-	}
+	}*/
 
 	@Override
 	public void sendPrivateMessage(String studentId, String content) {

mec-client-api/src/main/java/com/ym/mec/im/ImFeignService.java

@@ -102,9 +102,9 @@ public interface ImFeignService {
 	 * @param groupMessage
 	 * @return
 	 */
-	@PostMapping(value = "private/sendCustom")
+//	@PostMapping(value = "private/sendCustom")
 	//body模板
 	//{"senderId":"325","targetId":[1094986],"objectName":"RC:TxtMsg",
 	// "content":{"content":"www.baidu.com"}}
-	Object privateSendCustom(@RequestBody ImGroupMessage groupMessage);
+//	Object privateSendCustom(@RequestBody ImGroupMessage groupMessage);
 }

mec-client-api/src/main/java/com/ym/mec/im/fallback/ImFeignServiceFallback.java

@@ -59,9 +59,9 @@ public class ImFeignServiceFallback implements ImFeignService {
     public Object privateSend(ImPrivateMessage privateMessage) {
         return null;
     }
-
+/*
     @Override
     public Object privateSendCustom(ImGroupMessage groupMessage) {
         return null;
-    }
+    }*/
 }

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

@@ -39,7 +39,7 @@ public class PrivateController {
         return messageService.privateSend(privateMessage);
     }
 
-    @RequestMapping(value = "/sendCustom", method = RequestMethod.POST)
+    /*@RequestMapping(value = "/sendCustom", method = RequestMethod.POST)
     public Object sendCustom(@RequestBody ImGroupMessage imGroupMessage) throws Exception {
         GroupMessage groupMessage = new GroupMessage();
         ImTxtMessage content = (ImTxtMessage)imGroupMessage.getContent();
@@ -50,7 +50,7 @@ public class PrivateController {
         groupMessage.setSenderId(imGroupMessage.getSenderId());
         groupMessage.setObjectName(imGroupMessage.getType());
         return messageService.groupSend(groupMessage);
-    }
+    }*/
 
     @RequestMapping(value = "/recall", method = RequestMethod.POST)
     public Object recall(@RequestBody RecallMessage recallMessage) throws Exception {

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

@@ -1,6 +1,5 @@
 package com.ym.controller;
 
-import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
 import com.ym.common.ApiException;
 import com.ym.common.BaseResponse;
@@ -59,14 +58,12 @@ public class RoomController{
             throw new BizException("用户信息获取失败");
         }
 //        roomService.sendImPlayMidiMessage(playMidiMessageData);
-        CustomGroupMessage groupMessage = new CustomGroupMessage();
-        CustomMessage customMessage = new CustomMessage(playMidiMessageData.getContent(),null);
-        customMessage.setTYPE("DY:PlayMidiMessage");
+        GroupMessage groupMessage = new GroupMessage();
+        CustomMessage customMessage = JSONObject.parseObject(playMidiMessageData.getContent(),CustomMessage.class);
         groupMessage.setContent(customMessage);
         groupMessage.setTargetId(playMidiMessageData.getRoomId().split(","));
         groupMessage.setSenderId(sysUser.getId().toString());
         groupMessage.setObjectName("DY:PlayMidiMessage");
-        groupMessage.setCustomContent(JSON.parseObject(playMidiMessageData.getContent()));
         messageService.groupSend(groupMessage);
         return new BaseResponse<>();
     }

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

@@ -1,43 +1,57 @@
 package com.ym.pojo;
 
-import com.alibaba.fastjson.JSONObject;
 import io.rong.messages.BaseMessage;
 
 public class CustomMessage extends BaseMessage {
-    private String content = "";
-    private String extra = "";
-    private String TYPE = "";
+    private Boolean enable;
+    private int customType;
+    private int rate;
+    private int userId;
 
-    public CustomMessage(String content, String extra) {
-        this.content = content;
-        this.extra = extra;
+    public Boolean getEnable() {
+        return enable;
     }
 
-    public void setTYPE(String TYPE) {
-        this.TYPE = TYPE;
+    public void setEnable(Boolean enable) {
+        this.enable = enable;
     }
 
-    public String getType() {
-        return TYPE;
+    public int getCustomType() {
+        return customType;
+    }
+
+    public void setCustomType(int customType) {
+        this.customType = customType;
     }
 
-    public String getContent() {
-        return this.content;
+    public int getRate() {
+        return rate;
     }
 
-    public void setContent(String content) {
-        this.content = content;
+    public void setRate(int rate) {
+        this.rate = rate;
     }
 
-    public String getExtra() {
-        return this.extra;
+    public int getUserId() {
+        return userId;
     }
 
-    public void setExtra(String extra) {
-        this.extra = extra;
+    public void setUserId(int userId) {
+        this.userId = userId;
+    }
+
+    @Override
+    public String getType() {
+        return "DY:PlayMidiMessage";
     }
 
+    @Override
     public String toString() {
-        return JSONObject.toJSONString(this);
+        return "CustomMessage{" +
+                "enable=" + enable +
+                ", customType=" + customType +
+                ", rate=" + rate +
+                ", userId=" + userId +
+                '}';
     }
 }

mec-im/src/main/java/com/ym/service/Impl/RoomServiceImpl.java

@@ -1369,14 +1369,14 @@ public class RoomServiceImpl implements RoomService {
         return true;
     }
 
-    @Override
+    /*@Override
     public void sendImPlayMidiMessage(PlayMidiMessageData playMidiMessageData) {
         SysUser sysUser = sysUserFeignService.queryUserInfo();
         if(sysUser == null){
             throw new BizException("用户信息获取失败");
         }
         sysMessageService.batchSendImPlayMidiMessage(sysUser.getId().toString(),playMidiMessageData.getRoomId(),playMidiMessageData.getContent());
-    }
+    }*/
 
     private void updateDisplay(String roomId, String senderId, String display, Integer isIncludeSender) throws ApiException, Exception {
         roomDao.updateDisplayByRid(roomId, display);

mec-im/src/main/java/com/ym/service/RoomService.java

@@ -70,5 +70,5 @@ public interface RoomService {
     /**
      * 发送节拍器自定义消息
      */
-    void sendImPlayMidiMessage(PlayMidiMessageData playMidiMessageData);
+//    void sendImPlayMidiMessage(PlayMidiMessageData playMidiMessageData);
 }