Merge remote-tracking branch 'origin/master'

mec-biz/src/main/java/com/ym/mec/biz/dal/dto/MusicGroupClassGroupDto.java

@@ -29,10 +29,10 @@ public class MusicGroupClassGroupDto {
     private Integer currentClassTimes;
 
     @ApiModelProperty(value = "跟班人数", required = true)
-    private String studyNum;
+    private Integer studyNum;
 
     @ApiModelProperty(value = "退班人数", required = true)
-    private String quitNum;
+    private Integer quitNum;
 
     public Integer getClassGroupId() {
         return classGroupId;
@@ -82,19 +82,19 @@ public class MusicGroupClassGroupDto {
         this.currentClassTimes = currentClassTimes;
     }
 
-    public String getStudyNum() {
+    public Integer getStudyNum() {
         return studyNum;
     }
 
-    public void setStudyNum(String studyNum) {
+    public void setStudyNum(Integer studyNum) {
         this.studyNum = studyNum;
     }
 
-    public String getQuitNum() {
+    public Integer getQuitNum() {
         return quitNum;
     }
 
-    public void setQuitNum(String quitNum) {
+    public void setQuitNum(Integer quitNum) {
         this.quitNum = quitNum;
     }
 }

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

@@ -1,6 +1,7 @@
 package com.ym.mec.biz.service.impl;
 
 import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
 import com.ym.mec.auth.api.client.SysUserFeignService;
 import com.ym.mec.auth.api.entity.SysUser;
 import com.ym.mec.biz.dal.dao.*;
@@ -1460,13 +1461,13 @@ public class ClassGroupServiceImpl extends BaseServiceImpl<Integer, ClassGroup>
             Set<Integer> classGroups = dataList.stream().map(e -> e.getClassGroupId()).collect(Collectors.toSet());
             String join = StringUtils.join(classGroups, ",");
             //获取主教老师
-            Map<Integer, String> masterTeachers = MapUtil.convertMybatisMap(classGroupDao.countStudentNum(join, "BISHOP"));
+            Map<Integer, String> masterTeachers = JSONObject.parseObject(JSONObject.toJSONString(MapUtil.convertMybatisMap(classGroupDao.countStudentNum(join, "BISHOP"))),HashMap.class);
             //获取助教老师
-            Map<Integer, String> subTeachers = MapUtil.convertMybatisMap(classGroupDao.countStudentNum(join, "TEACHING"));
+            Map<Integer, String> subTeachers = JSONObject.parseObject(JSONObject.toJSONString(MapUtil.convertMybatisMap(classGroupDao.countStudentNum(join, "TEACHING"))),HashMap.class);
             //获取在读人数
-            Map<Integer, String> studyNums = MapUtil.convertMybatisMap(classGroupDao.countStudyNum(join));
+            Map<Integer, Integer> studyNums = JSONObject.parseObject(JSONObject.toJSONString(MapUtil.convertMybatisMap(classGroupDao.countStudyNum(join))),HashMap.class);
             //获取退班人数
-            Map<Integer, String> quitNums = MapUtil.convertMybatisMap(classGroupDao.countQuitNum(join));
+            Map<Integer, Integer> quitNums = JSONObject.parseObject(JSONObject.toJSONString(MapUtil.convertMybatisMap(classGroupDao.countQuitNum(join))),HashMap.class);
             dataList.forEach(e -> {
                 e.setMasterTeacher(masterTeachers.get(e.getClassGroupId()));
                 e.setSubTeacher(subTeachers.get(e.getClassGroupId()));

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

@@ -1,5 +1,6 @@
 package com.ym.controller;
 
+import com.ym.mec.common.controller.BaseController;
 import com.ym.service.GroupService;
 import io.rong.models.conversation.ConversationModel;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -13,18 +14,23 @@ import org.springframework.web.bind.annotation.RestController;
  */
 @RestController
 @RequestMapping("/conversation")
-public class ConversationController{
+public class ConversationController extends BaseController {
 
     @Autowired
     GroupService groupService;
 
     @RequestMapping(value = "/mute", method = RequestMethod.POST)
     public Object mute(@RequestBody ConversationModel conversationModel) throws Exception {
-        return groupService.conversationMute(conversationModel);
+        return succeed(groupService.conversationMute(conversationModel));
     }
 
     @RequestMapping(value = "/unmute", method = RequestMethod.POST)
     public Object unmute(@RequestBody ConversationModel conversationModel) throws Exception {
-        return groupService.conversationUnmute(conversationModel);
+        return succeed(groupService.conversationUnmute(conversationModel));
+    }
+
+    @RequestMapping(value = "/get", method = RequestMethod.POST)
+    public Object get(@RequestBody ConversationModel conversationModel) throws Exception {
+        return succeed(groupService.conversationGet(conversationModel));
     }
 }

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

@@ -52,4 +52,6 @@ public interface GroupService {
     Result conversationMute(ConversationModel conversationModel) throws Exception;
 
     Result conversationUnmute(ConversationModel conversationModel) throws Exception;
+
+    Result conversationGet(ConversationModel conversationModel) throws Exception;
 }

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

@@ -41,7 +41,10 @@ public class GroupServiceImpl implements GroupService {
         return new User(appKey,appSecret,rongCloud);
     }
     private Conversation getConversation(){
-        return new Conversation(appKey,appSecret);
+        RongCloud rongCloud = RongCloud.getInstance(appKey, appSecret);
+        Conversation conversation = new Conversation(appKey, appSecret);
+        conversation.setRongCloud(rongCloud);
+        return conversation;
     }
 
     @Override
@@ -133,4 +136,9 @@ public class GroupServiceImpl implements GroupService {
     public Result conversationUnmute(ConversationModel conversationModel) throws Exception {
         return getConversation().unMute(conversationModel);
     }
+
+    @Override
+    public Result conversationGet(ConversationModel conversationModel) throws Exception {
+        return getConversation().get(conversationModel);
+    }
 }

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

@@ -82,7 +82,7 @@ public class RoomServiceImpl implements RoomService {
     @Autowired
     private SysUserFeignService sysUserFeignService;
 
-    @Transactional
+    @Transactional(rollbackFor = Exception.class)
     @Override
     public RoomResult joinRoom(String userName, String roomId, boolean isAudience, boolean isDisableCamera) throws ApiException, Exception {
         CheckUtils.checkArgument(userName != null, "userName must't be null");

mec-student/src/main/resources/application.yml

@@ -12,9 +12,9 @@ spring:
   application:
     name: student-server
     
-  server:
+  servlet:
     multipart:
-      max-file-size: 5M
+      max-file-size: 5MB
     
   datasource:
     name: test

mec-teacher/src/main/resources/application.yml

@@ -12,9 +12,9 @@ spring:
   application:
     name: teacher-server
     
-  server:
+  servlet:
     multipart:
-      max-file-size: 10M
+      max-file-size: 10MB
     
   datasource:
     name: test