cms dev

pkg/cms_api_struct/group.go

@@ -86,12 +86,38 @@ type GetGroupMembersRequest struct {
 type GroupMemberResponse struct {
 	MemberPosition int    `json:"member_position"`
 	MemberNickName string `json:"member_nick_name"`
-	MemberId       int    `json:"member_id"`
+	MemberId       string    `json:"member_id"`
 	JoinTime       string `json:"join_time"`
 }
 
 type GetGroupMembersResponse struct {
-	GroupMemberList []GroupMemberResponse `json:"group_member_list"`
+	GroupMembers []GroupMemberResponse    `json:"group_members"`
 	GroupMemberNums int                   `json:"group_member_nums"`
 	ResponsePagination
-}
+}
+
+type GroupMemberRequest struct {
+	GroupId string `json:"group_id"`
+	Members []string `json:"members"`
+}
+
+type GroupMemberOperateResponse struct {
+	Success []string `json:"success"`
+	Failed []string `json:"failed"`
+}
+
+type AddGroupMembersRequest struct {
+	GroupMemberRequest
+}
+
+type AddGroupMembersResponse struct {
+	GroupMemberOperateResponse
+}
+
+type RemoveGroupMembersRequest struct {
+	GroupMemberRequest
+}
+
+type RemoveGroupMembersResponse struct{
+	GroupMemberOperateResponse
+}

pkg/common/constant/constant.go

@@ -115,10 +115,8 @@ const (
 	GroupBaned          = 3
 	GroupBanPrivateChat = 4
 
-	//timeInterval
-	Day   = 1
-	Week  = 7
-	Month = 31
+	//UserJoinGroupSource
+	JoinByAdmin = 1
 )
 
 var ContentType2PushContent = map[int64]string{

pkg/common/db/mysql_model/im_mysql_model/group_member_model.go

@@ -225,6 +225,19 @@ func IsGroupOwnerAdmin(groupID, UserID string) bool {
 	return false
 }
 
+func GetGroupMembersByGroupIdCMS(groupId string, showNumber, pageNumber int32) ([]db.GroupMember, error) {
+	var groupMembers []db.GroupMember
+	dbConn, err := db.DB.MysqlDB.DefaultGormDB()
+	if err != nil {
+		return groupMembers, err
+	}
+	err = dbConn.Table("group_members").Where("group_id=?", groupId).Limit(showNumber).Offset(showNumber * (pageNumber - 1)).Find(&groupMembers).Error
+	if err != nil {
+		return nil, err
+	}
+	return groupMembers, nil
+}
+
 //
 //func SelectGroupList(groupID string) ([]string, error) {
 //	var groupUserID string

pkg/common/db/mysql_model/im_mysql_model/group_model.go

@@ -4,6 +4,7 @@ import (
 	"Open_IM/pkg/common/constant"
 	"Open_IM/pkg/common/db"
 	"Open_IM/pkg/utils"
+	"fmt"
 	"time"
 )
 
@@ -66,7 +67,7 @@ func GetGroupsByName(groupName string, pageNumber, showNumber int32) ([]db.Group
 		return groups, err
 	}
 	dbConn.LogMode(true)
-	err = dbConn.Table("groups").Where("name=?", groupName).Limit(showNumber).Offset(showNumber * (pageNumber - 1)).Find(&groups).Error
+	err = dbConn.Table("groups").Where(fmt.Sprintf(" name like '%%%s%%' ", groupName)).Limit(showNumber).Offset(showNumber * (pageNumber - 1)).Find(&groups).Error
 	return groups, err
 }
 
@@ -103,9 +104,13 @@ func DeleteGroup(groupId string) error {
 	}
 	dbConn.LogMode(true)
 	var group db.Group
+	var groupMembers []db.GroupMember
 	if err := dbConn.Table("groups").Where("").Delete(&group).Error; err != nil {
 		return err
 	}
+	if err := dbConn.Table("group_Members").Where("group_id=?", groupId).Delete(groupMembers).Error; err != nil {
+		return err
+	}
 	return nil
 }
 
@@ -136,7 +141,7 @@ func GetGroupsCountNum() (int, error) {
 	}
 	dbConn.LogMode(true)
 	var count int
-	if err := dbConn.Model(&db.Group{}).Count(&count).Error; err != nil {
+	if err := dbConn.Table("groups").Count(&count).Error; err != nil {
 		return 0, err
 	}
 	return count, nil
@@ -151,8 +156,21 @@ func GetGroupsById(groupId string) (db.Group, error) {
 		return group, err
 	}
 	dbConn.LogMode(true)
-	if err := dbConn.Find(&group).First(&group).Error; err != nil {
+	if err := dbConn.Table("groups").Find(&group).Error; err != nil {
 		return group, err
 	}
 	return group, nil
+}
+
+func GetGroupMaster(groupId string) (db.GroupMember, error) {
+	dbConn, err := db.DB.MysqlDB.DefaultGormDB()
+	groupMember := db.GroupMember{}
+	if err != nil {
+		return groupMember, err
+	}
+	dbConn.LogMode(true)
+	if err := dbConn.Table("group_members").Where("role_level=? and group_id=?", constant.GroupOwner, groupId).Find(&groupMember).Error; err != nil {
+		return groupMember, err
+	}
+	return groupMember, nil
 }

pkg/common/db/mysql_model/im_mysql_model/user_model.go

@@ -222,7 +222,7 @@ func GetBlockUserById(userId string) (BlockUserInfo, error) {
 	if err != nil {
 		return blockUserInfo, err
 	}
-	if err = dbConn.Find(&blockUser).First(&blockUser).Error; err != nil {
+	if err = dbConn.Table("black_list").Where("uid=?", userId).Find(&blockUser).Error; err != nil {
 		return blockUserInfo, err
 	}
 	user := db.Users{

pkg/proto/group/group.proto

@@ -195,6 +195,12 @@ message GetGroupAllMemberResp {
   repeated server_api_params.GroupMemberFullInfo memberList = 3;
 }
 
+message CMSGroup {
+    server_api_params.GroupInfo GroupInfo = 1;
+    string GroupMasterName = 2;
+    string GroupMasterId = 3;
+}
+
 message GetGroupReq {
     string GroupName = 1;
     server_api_params.RequestPagination Pagination = 2;
@@ -202,7 +208,7 @@ message GetGroupReq {
 }
 
 message GetGroupResp {
-    repeated server_api_params.GroupInfo GroupInfo = 1;
+    repeated CMSGroup CMSGroups = 1;
     server_api_params.RequestPagination Pagination = 2;
 }
 
@@ -212,7 +218,7 @@ message GetGroupsReq {
 }
 
 message GetGroupsResp {
-    repeated server_api_params.GroupInfo GroupInfo = 1;
+    repeated CMSGroup CMSGroups = 1;
     server_api_params.RequestPagination Pagination = 2;
     int32 GroupNum = 3;
 }
@@ -258,7 +264,40 @@ message GetGroupByIdReq {
 }
 
 message GetGroupByIdResp {
-  server_api_params.GroupInfo GroupInfo = 1;
+  CMSGroup CMSGroup = 1;
+}
+
+message GetGroupMembersCMSReq {
+   string GroupId = 1;
+   server_api_params.RequestPagination Pagination = 2;
+   string OperationID = 3;
+}
+
+message GetGroupMembersCMSResp {
+   repeated server_api_params.GroupMemberFullInfo members = 3;
+   server_api_params.RequestPagination Pagination = 2;
+}
+
+message RemoveGroupMembersCMSReq {
+  string GroupId = 1;
+  repeated string UserIds = 2;
+  string OperationID = 3;
+}
+
+message RemoveGroupMembersCMSResp {
+  repeated string success = 1;
+  repeated string failed = 2;
+}
+
+message AddGroupMembersCMSReq {
+  string GroupId = 1;
+  repeated string UserIds = 2;
+  string OperationID = 3;
+}
+
+message AddGroupMembersCMSResp {
+  repeated string success = 1;
+  repeated string failed = 2;
 }
 
 service group{
@@ -283,6 +322,9 @@ service group{
   rpc OperateGroupStatus(OperateGroupStatusReq) returns(OperateGroupStatusResp);
   rpc OperateUserRole(OperateUserRoleReq) returns(OperateUserRoleResp);
   rpc DeleteGroup(DeleteGroupReq) returns(DeleteGroupResp);
+  rpc GetGroupMembersCMS(GetGroupMembersCMSReq) returns(GetGroupMembersCMSResp);
+  rpc RemoveGroupMembersCMS(RemoveGroupMembersCMSReq) returns(RemoveGroupMembersCMSResp);
+  rpc AddGroupMembersCMS(AddGroupMembersCMSReq) returns(AddGroupMembersCMSResp);
 }
 
 

pkg/proto/proto_dir.cfg

@@ -1,10 +1,10 @@
 
 all_proto=(
-            message/message.proto
+            # message/message.proto
             # statistics/statistics.proto
             # auth/auth.proto
             # friend/friend.proto
-            # group/group.proto
+            group/group.proto
             # user/user.proto
             # chat/chat.proto
             # push/push.proto