浏览代码

群主转让、群注销

zouxuan 1 年之前
父节点
当前提交
609297d7ce

+ 0 - 4
mec-application/src/main/java/com/ym/mec/teacher/controller/ImGroupMemberController.java

@@ -36,10 +36,6 @@ public class ImGroupMemberController extends BaseController {
 		if (CollectionUtils.isEmpty(member.getUserIds())) {
 			throw BizException.from("群成员不能为空");
 		}
-		// 群成员禁言时长无效
-		if (member.getGroupMute() && Optional.of(member.getMuteTime()).orElse(0) <= 0) {
-			throw BizException.from("群成员禁言时长无效");
-		}
 		// 更新群成员禁言
 		imGroupMemberService.groupMemberMute(member);
 		return succeed();

+ 0 - 4
mec-application/src/main/java/com/ym/mec/web/controller/ImGroupMemberController.java

@@ -40,10 +40,6 @@ public class ImGroupMemberController extends BaseController {
 		if (CollectionUtils.isEmpty(member.getUserIds())) {
 			throw BizException.from("群成员不能为空");
 		}
-		// 群成员禁言时长无效
-		if (member.getGroupMute() && Optional.of(member.getMuteTime()).orElse(0) <= 0) {
-			throw BizException.from("群成员禁言时长无效");
-		}
 		// 更新群成员禁言
 		imGroupMemberService.groupMemberMute(member);
 		return succeed();

+ 0 - 4
mec-application/src/main/java/com/ym/mec/web/controller/education/EduImGroupMemberController.java

@@ -36,10 +36,6 @@ public class EduImGroupMemberController extends BaseController {
 		if (CollectionUtils.isEmpty(member.getUserIds())) {
 			throw BizException.from("群成员不能为空");
 		}
-		// 群成员禁言时长无效
-		if (member.getGroupMute() && Optional.of(member.getMuteTime()).orElse(0) <= 0) {
-			throw BizException.from("群成员禁言时长无效");
-		}
 		// 更新群成员禁言
 		imGroupMemberService.groupMemberMute(member);
 		return succeed();

+ 4 - 4
mec-biz/src/main/java/com/ym/mec/biz/dal/wrapper/ImGroupMemberWrapper.java

@@ -158,8 +158,8 @@ public class ImGroupMemberWrapper {
         @ApiModelProperty(value = "群ID",required = true)
         private String groupId;
 
-        @ApiModelProperty("禁言时长(分钟), 0取消禁方;不能小于0")
-        private Integer muteTime;
+//        @ApiModelProperty("禁言时长(分钟), 0取消禁方;不能小于0")
+//        private Integer muteTime;
 
         @ApiModelProperty("群禁言状态")
         private Boolean groupMute;
@@ -167,13 +167,13 @@ public class ImGroupMemberWrapper {
         @ApiModelProperty("群成员ID")
         private List<String> userIds;
 
-        public Integer getMuteTime() {
+        /*public Integer getMuteTime() {
             // 禁言时长不能小于0,最小为1分钟
             if (Objects.nonNull(muteTime) && muteTime < 0) {
                 return 1;
             }
             return Optional.ofNullable(muteTime).orElse(0);
-        }
+        }*/
 
         public String jsonString() {
             return JSON.toJSONString(this);

+ 1 - 1
mec-biz/src/main/java/com/ym/mec/biz/service/impl/ImGroupMemberServiceImpl.java

@@ -656,7 +656,7 @@ public class ImGroupMemberServiceImpl extends BaseServiceImpl<Long, ImGroupMembe
 			ImPluginService pluginService = imPluginContext.getPluginService();
 			if (member.getGroupMute()) {
 				// 群成员禁言
-				pluginService.groupUserGagCreate(member.getUserIds(), member.getGroupId(), member.getMuteTime().longValue());
+				pluginService.groupUserGagCreate(member.getUserIds(), member.getGroupId(), -1L);
 			} else {
 				// 群成员解除禁言
 				pluginService.groupUserGagRemove(member.getUserIds(), member.getGroupId());