Merge remote-tracking branch 'origin/master_teacherSalary_2020-12-11' into master_teacherSalary_2020-12-11

mec-common/common-core/src/main/java/com/ym/mec/common/entity/ImSystemMessage.java

@@ -0,0 +1,57 @@
+package com.ym.mec.common.entity;
+
+public class ImSystemMessage extends ImMessageModel {
+    public Integer isIncludeSender;
+    public Integer isPersisted;
+    public Integer contentAvailable;
+    public String[] toUserId;
+    private String type;
+
+    public ImSystemMessage setContent(ImTxtMessage content) {
+        super.setContent(content);
+        return this;
+    }
+
+    public ImSystemMessage() {
+    }
+
+    public String getType() {
+        return type;
+    }
+
+    public void setType(String type) {
+        this.type = type;
+    }
+
+    public Integer getIsIncludeSender() {
+        return isIncludeSender;
+    }
+
+    public void setIsIncludeSender(Integer isIncludeSender) {
+        this.isIncludeSender = isIncludeSender;
+    }
+
+    public Integer getIsPersisted() {
+        return isPersisted;
+    }
+
+    public void setIsPersisted(Integer isPersisted) {
+        this.isPersisted = isPersisted;
+    }
+
+    public Integer getContentAvailable() {
+        return contentAvailable;
+    }
+
+    public void setContentAvailable(Integer contentAvailable) {
+        this.contentAvailable = contentAvailable;
+    }
+
+    public String[] getToUserId() {
+        return toUserId;
+    }
+
+    public void setToUserId(String[] toUserId) {
+        this.toUserId = toUserId;
+    }
+}

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

@@ -1,7 +1,11 @@
 package com.ym.controller;
 
+import com.ym.mec.common.entity.ImSystemMessage;
+import com.ym.mec.common.entity.ImTxtMessage;
 import com.ym.service.MessageService;
+import io.rong.messages.TxtMessage;
 import io.rong.models.message.BroadcastMessage;
+import io.rong.models.message.GroupMessage;
 import io.rong.models.message.SystemMessage;
 import io.rong.models.message.TemplateMessage;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -21,7 +25,14 @@ public class SystemController {
     MessageService messageService;
 
     @RequestMapping(value = "/send", method = RequestMethod.POST)
-    public Object send(@RequestBody SystemMessage systemMessage) throws Exception {
+    public Object send(@RequestBody ImSystemMessage imSystemMessage) throws Exception {
+        SystemMessage systemMessage = new SystemMessage();
+        ImTxtMessage content = (ImTxtMessage)imSystemMessage.getContent();
+        TxtMessage txtMessage = new TxtMessage(content.getContent(),content.getExtra());
+        systemMessage.setContent(txtMessage);
+        systemMessage.setTargetId(imSystemMessage.getTargetId());
+        systemMessage.setSenderId(imSystemMessage.getSenderId());
+        systemMessage.setObjectName(imSystemMessage.getObjectName());
         return messageService.systemSend(systemMessage);
     }
 

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

@@ -41,7 +41,10 @@ public class MessageServiceImpl implements MessageService {
         return new Chatroom(appKey,appSecret);
     }
     private MsgSystem getMsgSystem(){
-        return new MsgSystem(appKey,appSecret);
+        RongCloud rongCloud = RongCloud.getInstance(appKey, appSecret);
+        MsgSystem msgSystem = new MsgSystem(appKey, appSecret);
+        msgSystem.setRongCloud(rongCloud);
+        return msgSystem;
     }
     private History getHistory(){
         return new History(appKey,appSecret);

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

@@ -190,6 +190,7 @@ public class StudentManageController extends BaseController {
         return succeed(studentManageService.queryStudentPer());
     }
 
+
     @ApiOperation(value = "获取子集科目列表")
     @GetMapping("subject/findSubSubjects")
     public Object findSubSubjects(Integer tenantId){