msb-public
/
Open-IM-Server
mirror of https://github.com/OpenIMSDK/Open-IM-Server
2
0
Code Issues Projects Releases Wiki Activity

office

Browse Source
pull/232/head
wangchuxiao 3 years ago
parent 243f5fcda4
commit 3c68ecb7f1
5 changed files with 139 additions and 62 deletions
Show Stats Download Patch File Download Diff File

54
internal/api/office/work_moments.go
Unescape View File

@ -290,16 +290,17 @@ func GetUserWorkMoments(c *gin.Context) {
//} //}
for _, v := range respPb.WorkMoments { for _, v := range respPb.WorkMoments {
workMoment := apiStruct.WorkMoment{ workMoment := apiStruct.WorkMoment{
WorkMomentID: v.WorkMomentID, WorkMomentID: v.WorkMomentID,
UserID: v.UserID, UserID: v.UserID,
Content: v.Content, Content: v.Content,
FaceURL: v.FaceURL, FaceURL: v.FaceURL,
UserName: v.UserName, UserName: v.UserName,
CreateTime: v.CreateTime, CreateTime: v.CreateTime,
Comments: make([]*apiStruct.Comment, len(v.Comments)), Comments: make([]*apiStruct.Comment, len(v.Comments)),
LikeUserList: make([]*apiStruct.WorkMomentUser, len(v.LikeUserList)), LikeUserList: make([]*apiStruct.WorkMomentUser, len(v.LikeUserList)),
AtUserList: make([]*apiStruct.WorkMomentUser, len(v.AtUserList)), AtUserList: make([]*apiStruct.WorkMomentUser, len(v.AtUserList)),
Permission: v.Permission, PermissionUserList: make([]*apiStruct.WorkMomentUser, len(v.PermissionUserList)),
Permission: v.Permission,
} }
for i, comment := range v.Comments { for i, comment := range v.Comments {
workMoment.Comments[i] = &apiStruct.Comment{ workMoment.Comments[i] = &apiStruct.Comment{
@ -324,6 +325,12 @@ func GetUserWorkMoments(c *gin.Context) {
UserName: atUser.UserName, UserName: atUser.UserName,
} }
} }
for i, permissionUser := range v.PermissionUserList {
workMoment.PermissionUserList[i] = &apiStruct.WorkMomentUser{
UserID: permissionUser.UserID,
UserName: permissionUser.UserName,
}
}
resp.Data.WorkMoments = append(resp.Data.WorkMoments, &workMoment) resp.Data.WorkMoments = append(resp.Data.WorkMoments, &workMoment)
} }
resp.Data.ShowNumber = respPb.Pagination.ShowNumber resp.Data.ShowNumber = respPb.Pagination.ShowNumber
@ -374,16 +381,17 @@ func GetUserFriendWorkMoments(c *gin.Context) {
resp.Data.WorkMoments = []*apiStruct.WorkMoment{} resp.Data.WorkMoments = []*apiStruct.WorkMoment{}
for _, v := range respPb.WorkMoments { for _, v := range respPb.WorkMoments {
workMoment := apiStruct.WorkMoment{ workMoment := apiStruct.WorkMoment{
WorkMomentID: v.WorkMomentID, WorkMomentID: v.WorkMomentID,
UserID: v.UserID, UserID: v.UserID,
Content: v.Content, Content: v.Content,
FaceURL: v.FaceURL, FaceURL: v.FaceURL,
UserName: v.UserName, UserName: v.UserName,
CreateTime: v.CreateTime, CreateTime: v.CreateTime,
Comments: make([]*apiStruct.Comment, len(v.Comments)), Comments: make([]*apiStruct.Comment, len(v.Comments)),
LikeUserList: make([]*apiStruct.WorkMomentUser, len(v.LikeUserList)), LikeUserList: make([]*apiStruct.WorkMomentUser, len(v.LikeUserList)),
AtUserList: make([]*apiStruct.WorkMomentUser, len(v.AtUserList)), AtUserList: make([]*apiStruct.WorkMomentUser, len(v.AtUserList)),
Permission: v.Permission, PermissionUserList: make([]*apiStruct.WorkMomentUser, len(v.PermissionUserList)),
Permission: v.Permission,
} }
for i, comment := range v.Comments { for i, comment := range v.Comments {
workMoment.Comments[i] = &apiStruct.Comment{ workMoment.Comments[i] = &apiStruct.Comment{
@ -408,6 +416,12 @@ func GetUserFriendWorkMoments(c *gin.Context) {
UserName: atUser.UserName, UserName: atUser.UserName,
} }
} }
for i, permissionUser := range v.PermissionUserList {
workMoment.PermissionUserList[i] = &apiStruct.WorkMomentUser{
UserID: permissionUser.UserID,
UserName: permissionUser.UserName,
}
}
resp.Data.WorkMoments = append(resp.Data.WorkMoments, &workMoment) resp.Data.WorkMoments = append(resp.Data.WorkMoments, &workMoment)
} }
resp.Data.ShowNumber = respPb.Pagination.ShowNumber resp.Data.ShowNumber = respPb.Pagination.ShowNumber

16
internal/rpc/office/office.go
Unescape View File

@ -271,8 +271,9 @@ func (s *officeServer) CreateOneWorkMoment(_ context.Context, req *pbOffice.Crea
log.NewInfo(req.OperationID, utils.GetSelfFuncName(), "req: ", req.String()) log.NewInfo(req.OperationID, utils.GetSelfFuncName(), "req: ", req.String())
resp = &pbOffice.CreateOneWorkMomentResp{CommonResp: &pbOffice.CommonResp{}} resp = &pbOffice.CreateOneWorkMomentResp{CommonResp: &pbOffice.CommonResp{}}
workMoment := db.WorkMoment{ workMoment := db.WorkMoment{
Comments: []*db.Comment{}, Comments: []*db.Comment{},
LikeUserList: []*db.LikeUser{}, LikeUserList: []*db.WorkMomentUser{},
PermissionUserList: []*db.WorkMomentUser{},
} }
createUser, err := imdb.GetUserByUserID(req.WorkMoment.UserID) createUser, err := imdb.GetUserByUserID(req.WorkMoment.UserID)
if err != nil { if err != nil {
@ -286,6 +287,17 @@ func (s *officeServer) CreateOneWorkMoment(_ context.Context, req *pbOffice.Crea
workMoment.UserName = createUser.Nickname workMoment.UserName = createUser.Nickname
workMoment.FaceURL = createUser.FaceURL workMoment.FaceURL = createUser.FaceURL
workMoment.PermissionUserIDList = s.getPermissionUserIDList(req.OperationID, req.WorkMoment.PermissionGroupList, req.WorkMoment.PermissionUserList) workMoment.PermissionUserIDList = s.getPermissionUserIDList(req.OperationID, req.WorkMoment.PermissionGroupList, req.WorkMoment.PermissionUserList)
for _, userID := range workMoment.PermissionUserIDList {
userName, err := imdb.GetUserNameByUserID(userID)
if err != nil {
log.NewError(req.OperationID, utils.GetSelfFuncName(), "GetUserNameByUserID failed", err.Error())
continue
}
workMoment.PermissionUserList = append(workMoment.PermissionUserList, &db.WorkMomentUser{
UserID: userID,
UserName: userName,
})
}
log.NewDebug(req.OperationID, utils.GetSelfFuncName(), "workMoment to create", workMoment) log.NewDebug(req.OperationID, utils.GetSelfFuncName(), "workMoment to create", workMoment)
err = db.DB.CreateOneWorkMoment(&workMoment) err = db.DB.CreateOneWorkMoment(&workMoment)
if err != nil { if err != nil {

21
pkg/base_info/work_moments_struct.go
Unescape View File

@ -58,16 +58,17 @@ type GetWorkMomentByIDReq struct {
} }
type WorkMoment struct { type WorkMoment struct {
WorkMomentID string `json:"workMomentID"` WorkMomentID string `json:"workMomentID"`
UserID string `json:"userID"` UserID string `json:"userID"`
Content string `json:"content"` Content string `json:"content"`
LikeUserList []*WorkMomentUser `json:"likeUsers"` LikeUserList []*WorkMomentUser `json:"likeUsers"`
Comments []*Comment `json:"comments"` Comments []*Comment `json:"comments"`
FaceURL string `json:"faceURL"` FaceURL string `json:"faceURL"`
UserName string `json:"userName"` UserName string `json:"userName"`
AtUserList []*WorkMomentUser `json:"atUsers"` AtUserList []*WorkMomentUser `json:"atUsers"`
CreateTime int32 `json:"createTime"` PermissionUserList []*WorkMomentUser `json:"permissionUsers"`
Permission int32 `json:"permission"` CreateTime int32 `json:"createTime"`
Permission int32 `json:"permission"`
} }
type WorkMomentUser struct { type WorkMomentUser struct {

74
pkg/common/db/model.go
Unescape View File

@ -3,6 +3,7 @@ package db
import ( import (
"Open_IM/pkg/common/config" "Open_IM/pkg/common/config"
"go.mongodb.org/mongo-driver/bson" "go.mongodb.org/mongo-driver/bson"
"go.mongodb.org/mongo-driver/x/bsonx"
//"Open_IM/pkg/common/log" //"Open_IM/pkg/common/log"
"Open_IM/pkg/utils" "Open_IM/pkg/utils"
@ -73,12 +74,25 @@ func init() {
cSendLogModels := []mongo.IndexModel{ cSendLogModels := []mongo.IndexModel{
{ {
Keys: bson.M{"user_id": -1}, Keys: bsonx.Doc{
{
Key: "send_id",
},
},
Options: options.Index().SetUnique(true),
},
{
Keys: bsonx.Doc{
{
Key: "send_time",
Value: bsonx.Int32(-1),
},
},
}, },
} }
result, err := dataBase.Collection(cSendLog).Indexes().CreateMany(context.Background(), cSendLogModels, opts) result, err := dataBase.Collection(cSendLog).Indexes().CreateMany(context.Background(), cSendLogModels, opts)
if err != nil { if err != nil {
//fmt.Println("mongodb create cSendLogModels failed", result, err.Error()) fmt.Println("mongodb create cSendLogModels failed", result, err.Error())
} }
cChatModels := []mongo.IndexModel{ cChatModels := []mongo.IndexModel{
@ -93,28 +107,68 @@ func init() {
cWorkMomentModels := []mongo.IndexModel{ cWorkMomentModels := []mongo.IndexModel{
{ {
Keys: bson.M{"work_moment_id": -1}, Keys: bsonx.Doc{
{
Key: "create_time",
Value: bsonx.Int32(-1),
},
},
}, },
{ {
Keys: bson.M{"user_id": -1}, Keys: bsonx.Doc{
{
Key: "work_moment_id",
},
},
Options: options.Index().SetUnique(true),
},
}
cWorkMomentModel2 := []mongo.IndexModel{
{
Keys: bsonx.Doc{
{
Key: "work_moment_id",
},
},
Options: options.Index().SetUnique(true),
}, },
} }
result, err = dataBase.Collection(cWorkMoment).Indexes().CreateMany(context.Background(), cWorkMomentModels, opts) result, err = dataBase.Collection(cWorkMoment).Indexes().CreateMany(context.Background(), cWorkMomentModels, opts)
if err != nil { if err != nil {
//fmt.Println("mongodb create cWorkMomentModels failed", result, err.Error()) fmt.Println("mongodb create cWorkMomentModels failed", result, err.Error())
}
result, err = dataBase.Collection(cWorkMoment).Indexes().CreateMany(context.Background(), cWorkMomentModel2, opts)
if err != nil {
fmt.Println("mongodb create cWorkMomentModels failed", result, err.Error())
} }
cTagModels := []mongo.IndexModel{ cTagModel1 := []mongo.IndexModel{
{ {
Keys: bson.M{"tag_id": -1}, Keys: bsonx.Doc{
{
Key: "tag_id",
},
},
Options: options.Index().SetUnique(true),
}, },
}
cTagModel2 := []mongo.IndexModel{
{ {
Keys: bson.M{"user_id": -1}, Keys: bsonx.Doc{
{
Key: "user_id",
},
},
Options: options.Index().SetUnique(true),
}, },
} }
result, err = dataBase.Collection(cTag).Indexes().CreateMany(context.Background(), cTagModels, opts) result, err = dataBase.Collection(cTag).Indexes().CreateMany(context.Background(), cTagModel1, opts)
if err != nil {
fmt.Println("mongodb create cTagModel1 failed", result, err.Error())
}
result, err = dataBase.Collection(cTag).Indexes().CreateMany(context.Background(), cTagModel2, opts)
if err != nil { if err != nil {
//fmt.Println("mongodb create cTagModels failed", result, err.Error()) fmt.Println("mongodb create cTagModel2 failed", result, err.Error())
} }
DB.mongoClient = mongoClient DB.mongoClient = mongoClient

36
pkg/common/db/mongoModel.go
Unescape View File

@ -666,25 +666,21 @@ func (d *DataBases) GetTagSendLogs(userID string, showNumber, pageNumber int32)
} }
type WorkMoment struct { type WorkMoment struct {
WorkMomentID string `bson:"work_moment_id"` WorkMomentID string `bson:"work_moment_id"`
UserID string `bson:"user_id"` UserID string `bson:"user_id"`
UserName string `bson:"user_name"` UserName string `bson:"user_name"`
FaceURL string `bson:"face_url"` FaceURL string `bson:"face_url"`
Content string `bson:"content"` Content string `bson:"content"`
LikeUserList []*LikeUser `bson:"like_user_list"` LikeUserList []*WorkMomentUser `bson:"like_user_list"`
AtUserList []*AtUser `bson:"at_user_list"` AtUserList []*WorkMomentUser `bson:"at_user_list"`
Comments []*Comment `bson:"comments"` PermissionUserList []*WorkMomentUser `bson:"permission_user_list"`
PermissionUserIDList []string `bson:"permission_user_id_list"` Comments []*Comment `bson:"comments"`
Permission int32 `bson:"permission"` PermissionUserIDList []string `bson:"permission_user_id_list"`
CreateTime int32 `bson:"create_time"` Permission int32 `bson:"permission"`
} CreateTime int32 `bson:"create_time"`
}
type AtUser struct {
UserID string `bson:"user_id"` type WorkMomentUser struct {
UserName string `bson:"user_name"`
}
type LikeUser struct {
UserID string `bson:"user_id"` UserID string `bson:"user_id"`
UserName string `bson:"user_name"` UserName string `bson:"user_name"`
} }
@ -749,7 +745,7 @@ func (d *DataBases) LikeOneWorkMoment(likeUserID, userName, workMomentID string)
} }
} }
if !isAlreadyLike { if !isAlreadyLike {
workMoment.LikeUserList = append(workMoment.LikeUserList, &LikeUser{UserID: likeUserID, UserName: userName}) workMoment.LikeUserList = append(workMoment.LikeUserList, &WorkMomentUser{UserID: likeUserID, UserName: userName})
} }
log.NewDebug("", utils.GetSelfFuncName(), workMoment) log.NewDebug("", utils.GetSelfFuncName(), workMoment)
ctx, _ := context.WithTimeout(context.Background(), time.Duration(config.Config.Mongo.DBTimeout)*time.Second) ctx, _ := context.WithTimeout(context.Background(), time.Duration(config.Config.Mongo.DBTimeout)*time.Second)

Write Preview
Loading…
Cancel
Save