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

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

@@ -17,6 +17,7 @@ import java.io.Serializable;
 import java.time.LocalDateTime;
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Locale;
 
 /**
  * Description
@@ -56,7 +57,8 @@ public class TencentData {
             CallbackAfterMemberExit res = new CallbackAfterMemberExit();
 
             JSONObject jsonObject = JSON.parseObject(jsonString);
-            res.setCallbackCommand(ETencentImCallbackCommand.valueOf(jsonObject.getString("CallbackCommand")));
+            res.setCallbackCommand(ETencentImCallbackCommand.valueOf(jsonObject.getString("CallbackCommand").replace(".","_").toUpperCase(
+                Locale.ROOT)));
             res.setGroupId(jsonObject.getString("GroupId"));
             res.setType(jsonObject.getObject("Type",ETencentGroupType.class));
             res.setExitType(jsonObject.getString("ExitType"));
@@ -113,7 +115,8 @@ public class TencentData {
             CallbackOnMemberStateChange res = new CallbackOnMemberStateChange();
 
             JSONObject jsonObject = JSON.parseObject(jsonString);
-            res.setCallbackCommand(ETencentImCallbackCommand.valueOf(jsonObject.getString("CallbackCommand")));
+            res.setCallbackCommand(ETencentImCallbackCommand.valueOf(jsonObject.getString("CallbackCommand").replace(".","_").toUpperCase(
+                Locale.ROOT)));
             res.setGroupId(jsonObject.getString("GroupId"));
 
             JSONArray exitMemberList = jsonObject.getJSONArray("MemberList");
@@ -162,7 +165,8 @@ public class TencentData {
             CallbackAfterNewMemberJoin res = new CallbackAfterNewMemberJoin();
 
             JSONObject jsonObject = JSON.parseObject(jsonString);
-            res.setCallbackCommand(ETencentImCallbackCommand.valueOf(jsonObject.getString("CallbackCommand")));
+            res.setCallbackCommand(ETencentImCallbackCommand.valueOf(jsonObject.getString("CallbackCommand").replace(".","_").toUpperCase(
+                Locale.ROOT)));
             res.setGroupId(jsonObject.getString("GroupId"));
             res.setType(jsonObject.getObject("Type",ETencentGroupType.class));
             res.setJoinType(jsonObject.getString("JoinType"));

mec-biz/src/main/java/com/ym/mec/biz/dal/entity/MusicGroupOrganizationCourseSettings.java

@@ -45,7 +45,8 @@ public class MusicGroupOrganizationCourseSettings extends BaseEntity {
 
     @ApiModelProperty(value="")
     private Date updateTime;
-
+    
+    private String organName;
 
     private List<MusicGroupOrganizationCourseSettingsDetail> details;
 
@@ -113,7 +114,15 @@ public class MusicGroupOrganizationCourseSettings extends BaseEntity {
         this.updateTime = updateTime;
     }
 
-    public List<MusicGroupOrganizationCourseSettingsDetail> getDetails() {
+    public String getOrganName() {
+		return organName;
+	}
+
+	public void setOrganName(String organName) {
+		this.organName = organName;
+	}
+
+	public List<MusicGroupOrganizationCourseSettingsDetail> getDetails() {
         return details;
     }
 

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

@@ -927,8 +927,6 @@ public class ImLiveBroadcastRoomServiceImpl extends ServiceImpl<ImLiveBroadcastR
                 // 直播间用户离开状态
                 roomMember.setLiveRoomStatus(0);
 
-                // 直播间用户离开直播间消息
-                sendLiveRoomLoginOutMessage(userid, roomVo);
             }
 
             // 更新用户在线状态为离线
@@ -939,6 +937,10 @@ public class ImLiveBroadcastRoomServiceImpl extends ServiceImpl<ImLiveBroadcastR
                     .update(roomMember);
 
             log.info("opsRoom>>>> looker userInfo: {}", JSONObject.toJSONString(userInfo));
+
+            // 直播间用户离开直播间消息
+            sendLiveRoomLoginOutMessage(userid, roomVo);
+
             // 在线用户消息同步
             sendOnlineUserCount(roomVo, userId, onlineUserInfo.size());
 
@@ -1033,9 +1035,9 @@ public class ImLiveBroadcastRoomServiceImpl extends ServiceImpl<ImLiveBroadcastR
         try {
             // 黑名单才发送退出消息
             //用户离开直播间发送退出房间消息给主讲人
-            if (!imLiveRoomBlackService.checkBlackUser(Integer.parseInt(userid), roomVo.getRoomUid())) {
-                return;
-            }
+            // if (!imLiveRoomBlackService.checkBlackUser(Integer.parseInt(userid), roomVo.getRoomUid())) {
+            //     return;
+            // }
             LivePluginService pluginService = livePluginContext.getPluginService(roomVo.getServiceProvider());
             pluginService.sendChatRoomMessage(message);
 
@@ -1691,7 +1693,6 @@ public class ImLiveBroadcastRoomServiceImpl extends ServiceImpl<ImLiveBroadcastR
         try {
             //生成主讲人信息到缓存
             SysUser sysUser = getSysUser(room.getSpeakerId());
-            createSpeakerInfo(room, sysUser);
 
             //去融云创建房间
             LivePluginService pluginService = livePluginContext.getPluginService(room.getServiceProvider());

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

@@ -73,7 +73,7 @@
 
     <update id="updateLiveRoomStatus">
         update im_live_broadcast_room_member
-        set live_room_status_ = #{onlineStatus}
+        set live_room_status_ = #{liveRoomStatus}
         where room_uid_ = #{groupId} and user_id_ in <foreach collection="userIds" item="userId" open="(" separator="," close=")">#{userId}</foreach>
 
     </update>

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

@@ -101,7 +101,7 @@ public class UserController {
         String optPlatform = request.getParameter("OptPlatform");
 
 
-        if(request.getParameter("CallbackCommand").equals(ETencentImCallbackCommand.GROUP_CALLBACKONMEMBERSTATECHANGE.name())) {
+        if(request.getParameter("CallbackCommand").equals(ETencentImCallbackCommand.GROUP_CALLBACKONMEMBERSTATECHANGE.getCommand())) {
             TencentData.CallbackOnMemberStateChange callbackOnMemberStateChange = TencentData.CallbackOnMemberStateChange.toObject(
                 body);
 
@@ -111,7 +111,7 @@ public class UserController {
             imLiveBroadcastRoomService.callbackOnMemberStateChange(callbackOnMemberStateChange);
 
 
-        } else if(request.getParameter("CallbackCommand").equals(ETencentImCallbackCommand.GROUP_CALLBACKAFTERMEMBEREXIT.name())) {
+        } else if(request.getParameter("CallbackCommand").equals(ETencentImCallbackCommand.GROUP_CALLBACKAFTERMEMBEREXIT.getCommand())) {
             TencentData.CallbackAfterMemberExit callbackAfterMemberExit = TencentData.CallbackAfterMemberExit.toObject(
                 body);
 
@@ -119,7 +119,7 @@ public class UserController {
             callbackAfterMemberExit.setClientIP(clientIP);
             callbackAfterMemberExit.setOptPlatform(optPlatform);
             imLiveBroadcastRoomService.callbackAfterMemberExit(callbackAfterMemberExit);
-        }  else if(request.getParameter("CallbackCommand").equals(ETencentImCallbackCommand.GROUP_CALLBACKAFTERNEWMEMBERJOIN.name())) {
+        }  else if(request.getParameter("CallbackCommand").equals(ETencentImCallbackCommand.GROUP_CALLBACKAFTERNEWMEMBERJOIN.getCommand())) {
             TencentData.CallbackAfterNewMemberJoin callbackAfterNewMemberJoin = TencentData.CallbackAfterNewMemberJoin.toObject(
                 body);
 

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

@@ -1,9 +1,12 @@
 package com.ym.mec.web.controller;
 
-import com.yonge.log.model.AuditLogAnnotation;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
+
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -13,11 +16,14 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
 import com.ym.mec.biz.dal.entity.MusicGroupOrganizationCourseSettings;
+import com.ym.mec.biz.dal.entity.Organization;
 import com.ym.mec.biz.dal.page.CourseSettingQueryInfo;
 import com.ym.mec.biz.service.MusicGroupOrganizationCourseSettingsService;
+import com.ym.mec.biz.service.OrganizationService;
 import com.ym.mec.common.controller.BaseController;
 import com.ym.mec.common.entity.HttpResponseResult;
 import com.ym.mec.common.page.PageInfo;
+import com.yonge.log.model.AuditLogAnnotation;
 
 @RequestMapping("musicGroupOrganizationCourseSettings")
 @Api(tags = "收费方式设置")
@@ -25,12 +31,27 @@ import com.ym.mec.common.page.PageInfo;
 public class MusicGroupOrganizationCourseSettingsController extends BaseController {
     @Autowired
     private MusicGroupOrganizationCourseSettingsService musicGroupOrganizationCourseSettingsService;
+    
+    @Autowired
+    private OrganizationService organizationService;
 
     @ApiOperation(value = "获取收费方式设置列表")
     @GetMapping("/queryPage")
     @PreAuthorize("@pcs.hasPermissions('musicGroupOrganizationCourseSettings/queryPage')")
     public HttpResponseResult<PageInfo<MusicGroupOrganizationCourseSettings>> queryPage(CourseSettingQueryInfo queryInfo) {
-        return succeed(musicGroupOrganizationCourseSettingsService.queryPage(queryInfo));
+    	
+    	PageInfo<MusicGroupOrganizationCourseSettings> pageInfo = musicGroupOrganizationCourseSettingsService.queryPage(queryInfo);
+    	
+    	List<Organization> organizationList = organizationService.findAllOrgans(queryInfo.getTenantId());
+    	if(organizationList != null){
+    		Map<Integer, String> organMap = organizationList.stream().collect(Collectors.toMap(Organization :: getId, Organization :: getName));
+    		
+    		for(MusicGroupOrganizationCourseSettings cs : pageInfo.getRows()){
+    			cs.setOrganName(organMap.get(cs.getOrganId()));
+    		}
+    	}
+    	
+        return succeed(pageInfo);
     }
 
     @ApiOperation(value = "收费方式添加")