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

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

@@ -61,6 +61,9 @@ public class ImLiveBroadcastRoomDto implements Serializable {
         @ApiModelProperty(value = "是否允许保存直播回放 0允许 1不允许")
         private Integer whether_video = 1;
 
+        @ApiModelProperty(value = "是否允许连麦 0允许 1不允许")
+        private Integer whether_mic = 0;
+
         public Integer getWhether_like() {
             return whether_like;
         }
@@ -84,6 +87,14 @@ public class ImLiveBroadcastRoomDto implements Serializable {
         public void setWhether_video(Integer whether_video) {
             this.whether_video = whether_video;
         }
+
+        public Integer getWhether_mic() {
+            return whether_mic;
+        }
+
+        public void setWhether_mic(Integer whether_mic) {
+            this.whether_mic = whether_mic;
+        }
     }
 
     public Integer getId() {

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

@@ -3,6 +3,7 @@ package com.ym.mec.biz.dal.dto;
 import com.ym.mec.biz.dal.enums.GradeTypeEnum;
 import com.ym.mec.biz.dal.enums.YesOrNoEnum;
 import com.ym.mec.common.enums.UserGenderEnum;
+
 import io.swagger.annotations.ApiModelProperty;
 
 import java.math.BigDecimal;
@@ -118,7 +119,9 @@ public class StudentManageListDto {
     private Boolean hasNoStartCloudTeacher = false;
 
     private Integer recordUserId;
-
+	
+	private String extSubjectIds;
+	
     public Integer getRecordUserId() {
         return recordUserId;
     }
@@ -492,4 +495,12 @@ public class StudentManageListDto {
 	public void setMembershipEndTime(Date membershipEndTime) {
 		this.membershipEndTime = membershipEndTime;
 	}
+
+	public String getExtSubjectIds() {
+		return extSubjectIds;
+	}
+
+	public void setExtSubjectIds(String extSubjectIds) {
+		this.extSubjectIds = extSubjectIds;
+	}
 }

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

@@ -1,10 +1,14 @@
 package com.ym.mec.biz.dal.entity;
 
-import com.ym.mec.auth.api.entity.SysUser;
 import io.swagger.annotations.ApiModelProperty;
-import org.apache.commons.lang3.builder.ToStringBuilder;
 
 import java.util.Date;
+import java.util.HashMap;
+import java.util.Map;
+
+import org.apache.commons.lang3.builder.ToStringBuilder;
+
+import com.ym.mec.auth.api.entity.SysUser;
 
 /**
  * 对应数据库表(student):
@@ -78,6 +82,8 @@ public class Student extends SysUser {
 	private Integer countFlag;
 	
 	private String extSubjectIds;
+	
+	private Map<Integer,String> extSjectNamesMap = new HashMap<Integer, String>();
 
 	@ApiModelProperty(value = "家长姓名")
 	private String parentName;
@@ -326,4 +332,12 @@ public class Student extends SysUser {
 	public void setExtSubjectIds(String extSubjectIds) {
 		this.extSubjectIds = extSubjectIds;
 	}
+
+	public Map<Integer, String> getExtSjectNamesMap() {
+		return extSjectNamesMap;
+	}
+
+	public void setExtSjectNamesMap(Map<Integer, String> extSjectNamesMap) {
+		this.extSjectNamesMap = extSjectNamesMap;
+	}
 }

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

@@ -157,8 +157,7 @@ public class ImLiveBroadcastRoomServiceImpl extends ServiceImpl<ImLiveBroadcastR
         ImLiveBroadcastRoom obj = new ImLiveBroadcastRoom();
         BeanUtils.copyProperties(dto, obj);
         Date now = new Date();
-        String nano = now.getTime() + "";
-        String roomUid = "LIVE-" + sysUser.getId() + "-" + nano;
+        String roomUid = "LIVE-" + sysUser.getId() + "-" + now.getTime();
         obj.setTenantId(TenantContextHolder.getTenantId());
         obj.setRoomUid(roomUid);
         obj.setRoomConfig(JSONObject.toJSONString(dto.getRoomConfig()));
@@ -259,6 +258,7 @@ public class ImLiveBroadcastRoomServiceImpl extends ServiceImpl<ImLiveBroadcastR
     }
 
     private void destroyExpiredLiveRoom(Date now, ImLiveBroadcastRoom room, int expiredMinute) {
+        log.error("roomDestroy destroyExpiredLiveRoom >>>> now {} roomInfo : {} expiredMinute:{}", now, JSONObject.toJSONString(room), expiredMinute);
         //过期时间= 房间正式开始时间+expiredMinute 分钟
         Date expiredTime = DateUtil.addMinutes(room.getCreatedTime(), expiredMinute);
         // 现在 大于等于 过期时间
@@ -309,6 +309,7 @@ public class ImLiveBroadcastRoomServiceImpl extends ServiceImpl<ImLiveBroadcastR
     }
 
     public void roomDestroy(ImLiveBroadcastRoom room) {
+        log.error("roomDestroy>>>> room : {}", JSONObject.toJSONString(room));
         String roomUid = room.getRoomUid();
         Integer speakerId = room.getSpeakerId();
         try {

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

@@ -78,6 +78,7 @@
         <result column="experience_membership_day_" property="experienceMembershipDay"/>
         <result column="experience_membership_end_time_" property="experienceMembershipEndTime"/>
         <result column="record_user_id_" property="recordUserId"/>
+        <result column="ext_subject_ids_" property="extSubjectIds"/>
     </resultMap>
 
     <update id="updateUser" parameterType="com.ym.mec.auth.api.entity.SysUser">
@@ -145,7 +146,7 @@
     </update>
 
     <select id="findStudentsByOrganId" resultMap="studentManageListDto">
-        SELECT o.`name_` organ_name_,o.grade_type_,s.`user_id_` ,su.`username_` ,su.`phone_` parents_phone_,
+        SELECT o.`name_` organ_name_,o.grade_type_,s.`user_id_` ,su.`username_` ,su.`phone_` parents_phone_,s.ext_subject_ids_,
         sut.name_ real_name_,su.`gender_` , su.organ_id_,
 		tu.`real_name_` teacher_name_,CASE s.service_tag_ WHEN 2 THEN 0 ELSE s.service_tag_ END service_tag_ ,s.`operating_tag_` ,
         s.care_package_, s.come_on_package_, suca.`course_balance_` ,suca.balance_,

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

@@ -159,6 +159,12 @@ public class StudentManageController extends BaseController {
 			List<Subject> subjectList = subjectService.findBySubjectByIdList(student.getSubjectIdList());
 			student.setSubjectNames(subjectList.stream().map(t -> t.getName()).collect(Collectors.joining(",")));
 		}
+		
+		if(StringUtils.isNotBlank(student.getExtSubjectIds())){
+			List<Subject> subjectList = subjectService.findBySubjectByIdList(student.getExtSubjectIds());
+			
+			student.setExtSjectNamesMap(subjectList.stream().collect(Collectors.toMap(Subject :: getId, Subject :: getName)));
+		}
 
 		Map<String, Object> datas = new HashMap<String, Object>();
 		datas.put("student", student);

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

@@ -72,7 +72,6 @@ public class ImLiveBroadcastRoomController extends BaseController {
 
     @ApiOperation("修改直播间信息-已开播无法修改")
     @PostMapping("/update")
-    @PreAuthorize("@pcs.hasPermissions('imLiveBroadcastRoom/update')")
     public HttpResponseResult update(@Valid @RequestBody ImLiveBroadcastRoomDto dto) {
         imLiveBroadcastRoomService.update(dto);
         return succeed();