小小训练营

mec-biz/src/main/java/com/ym/mec/biz/dal/dao/ImGroupDao.java

@@ -1,12 +1,11 @@
 package com.ym.mec.biz.dal.dao;
 
-import java.util.List;
-
-import org.apache.ibatis.annotations.Param;
-
 import com.ym.mec.biz.dal.dto.ImGroupMemberDto;
 import com.ym.mec.biz.dal.entity.ImGroup;
 import com.ym.mec.common.dal.BaseDAO;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
 
 public interface ImGroupDao extends BaseDAO<Long, ImGroup> {
 

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

@@ -10,7 +10,7 @@ import com.ym.mec.common.entity.BaseEntity;
 public class ImGroup extends BaseEntity {
 
 	/**  */
-	private Long id;
+	private String id;
 	
 	/** 群名称 */
 	private String name;
@@ -37,11 +37,11 @@ public class ImGroup extends BaseEntity {
 	/**  */
 	private java.util.Date updateTime;
 	
-	public void setId(Long id){
+	public void setId(String id){
 		this.id = id;
 	}
 	
-	public Long getId(){
+	public String getId(){
 		return this.id;
 	}
 			

mec-biz/src/main/java/com/ym/mec/biz/service/ImGroupMemberService.java

@@ -3,7 +3,6 @@ package com.ym.mec.biz.service;
 import com.ym.mec.auth.api.entity.SysUser;
 import com.ym.mec.biz.dal.entity.ImGroup;
 import com.ym.mec.biz.dal.entity.ImGroupMember;
-import com.ym.mec.biz.dal.entity.ImSendGroupMessage;
 import com.ym.mec.common.service.BaseService;
 
 import java.util.List;

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

@@ -5,7 +5,6 @@ import com.ym.mec.auth.api.entity.SysUser;
 import com.ym.mec.biz.dal.dao.ImGroupDao;
 import com.ym.mec.biz.dal.dao.ImGroupMemberDao;
 import com.ym.mec.biz.dal.dao.ImGroupNoticeDao;
-import com.ym.mec.biz.dal.dao.ImSendGroupMessageDao;
 import com.ym.mec.biz.dal.dto.ImGroupMemberDto;
 import com.ym.mec.biz.dal.entity.ImGroup;
 import com.ym.mec.biz.service.ImGroupMemberService;
@@ -43,8 +42,6 @@ public class ImGroupServiceImpl extends BaseServiceImpl<Long, ImGroup> implement
 
 	@Autowired
 	private SysUserFeignService sysUserFeignService;
-	@Autowired
-	private ImSendGroupMessageDao imSendGroupMessageDao;
 
 	@Override
 	public BaseDAO<Long, ImGroup> getDAO() {
@@ -63,7 +60,7 @@ public class ImGroupServiceImpl extends BaseServiceImpl<Long, ImGroup> implement
 
 		Date date = new Date();
 
-		imGroup.setId(id);
+		imGroup.setId(id.toString());
 		imGroup.setCreateTime(date);
 		imGroup.setIntroduce(introduce);
 		
@@ -80,10 +77,10 @@ public class ImGroupServiceImpl extends BaseServiceImpl<Long, ImGroup> implement
 		imGroup.setUpdateTime(date);
 		imGroupDao.insert(imGroup);
 
-		String groupId = imGroup.getId().toString();
+		String groupId = imGroup.getId();
 		
 		if(userId != null){
-			imGroupMemberService.join(imGroup.getId(), userId, null, true);
+			imGroupMemberService.join(id, userId, null, true);
 
 			GroupMember groupMember = new GroupMember(userId.toString(), groupId);
 

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

@@ -12,8 +12,6 @@ public interface MessageService {
     Result privateRecall(RecallMessage recallMessage) throws Exception;
 
     Result privateSendTemplate(TemplateMessage templateMessage) throws Exception;
-
-
     //群组消息
     Result groupSend(GroupMessage groupMessage) throws Exception;
 

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

@@ -15,7 +15,10 @@ import com.ym.mec.common.page.PageInfo;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
 
 import java.util.Optional;