cms dev

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{