merge code

pkg/base_info/work_moments_struct.go

@@ -0,0 +1,97 @@
+package base_info
+
+import "Open_IM/pkg/proto/office"
+
+type CreateOneWorkMomentReq struct {
+	office.CreateOneWorkMomentReq
+}
+
+type CreateOneWorkMomentResp struct {
+	CommResp
+}
+
+type DeleteOneWorkMomentReq struct {
+	office.DeleteOneWorkMomentReq
+}
+
+type DeleteOneWorkMomentResp struct {
+	CommResp
+}
+
+type LikeOneWorkMomentReq struct {
+	office.LikeOneWorkMomentReq
+}
+
+type LikeOneWorkMomentResp struct {
+	CommResp
+}
+
+type CommentOneWorkMomentReq struct {
+	office.CommentOneWorkMomentReq
+}
+
+type CommentOneWorkMomentResp struct {
+	CommResp
+}
+
+type WorkMomentsUserCommonReq struct {
+	PageNumber  int32  `json:"pageNumber" binding:"required"`
+	ShowNumber  int32  `json:"showNumber" binding:"required"`
+	OperationID string `json:"operationID" binding:"required"`
+	UserID      string `json:"UserID" binding:"required"`
+}
+
+type GetUserWorkMomentsReq struct {
+	WorkMomentsUserCommonReq
+}
+
+type GetUserWorkMomentsResp struct {
+	CommResp
+	Data struct {
+		WorkMoments []*office.WorkMoment `json:"workMoments"`
+		CurrentPage int32                `json:"currentPage"`
+		ShowNumber  int32                `json:"showNumber"`
+	} `json:"data"`
+}
+
+type GetUserFriendWorkMomentsReq struct {
+	WorkMomentsUserCommonReq
+}
+
+type GetUserFriendWorkMomentsResp struct {
+	CommResp
+	Data struct {
+		WorkMoments []*office.WorkMoment `json:"workMoments"`
+		CurrentPage int32                `json:"currentPage"`
+		ShowNumber  int32                `json:"showNumber"`
+	} `json:"data"`
+}
+
+type GetUserWorkMomentsCommentsMsgReq struct {
+	WorkMomentsUserCommonReq
+}
+
+type GetUserWorkMomentsCommentsMsgResp struct {
+	CommResp
+	Data struct {
+		CommentsMsg    []*office.CommentsMsg `json:"comments"`
+		CurrentPage int32             `json:"currentPage"`
+		ShowNumber  int32             `json:"showNumber"`
+	} `json:"data"`
+}
+
+type SetUserWorkMomentsLevelReq struct {
+	office.SetUserWorkMomentsLevelReq
+}
+
+type SetUserWorkMomentsLevelResp struct {
+	CommResp
+}
+
+type ClearUserWorkMomentsCommentsMsgReq struct {
+	office.ClearUserWorkMomentsCommentsMsgReq
+}
+
+type ClearUserWorkMomentsCommentsMsgResp struct {
+	CommResp
+}

pkg/common/db/mongoModel.go

@@ -563,6 +563,14 @@ func (d *DataBases) GetTagSendLogs(userID string, showNumber, pageNumber int32)
 	return tagSendLogs, nil
 }
 
+type WorkMoment struct {
+
+}
+
+func (d *DataBases) CreateOneWorkMoment(workMoment WorkMoment) error {
+
+}
+
 func generateTagID(tagName, userID string) string {
 	return utils.Md5(tagName + userID + strconv.Itoa(rand.Int()) + time.Now().String())
 }

pkg/proto/office/office.proto

@@ -106,6 +106,138 @@ message GetUserTagByIDResp {
   Tag tag = 2;
 }
 
+/// WorkMoment
+
+message LikeUser {
+  string userID = 1;
+  string userName = 2;
+}
+
+message Comment {
+  string userID = 1;
+  string userName = 2;
+  string replyUserID = 3;
+  string replyUserName = 4;
+  string contentID = 5;
+  string content = 6;
+  string createTime = 7;
+}
+
+message WorkMoment {
+  string workMomentID = 1;
+  string userID = 2;
+  string content = 3;
+  repeated LikeUser likeUsers = 4;
+  repeated Comment comments = 5;
+  repeated string whoCanSeeUserIDList = 6;
+  repeated string whoCantSeeUserIDList = 7;
+  bool isPrivate = 8;
+  bool isPublic = 9;
+  int32 CreateTime = 10;
+}
+
+message CreateOneWorkMomentReq {
+  WorkMoment workMoment = 1;
+  string userID = 2;
+  string operationID = 3;
+}
+
+message CreateOneWorkMomentResp {
+  CommonResp commonResp = 1;
+}
+
+message DeleteOneWorkMomentReq {
+  string workMomentID = 1;
+  string userID = 2;
+  string operationID = 3;
+}
+
+message DeleteOneWorkMomentResp {
+  CommonResp commonResp = 1;
+}
+
+message LikeOneWorkMomentReq {
+  string userID = 1;
+  string WorkMomentID = 2;
+  string operationID = 3;
+}
+
+message LikeOneWorkMomentResp {
+  CommonResp commonResp = 1;
+}
+
+message CommentOneWorkMomentReq {
+  string userID = 1;
+  string workMomentID = 2;
+  string content = 3;
+  string operationID = 4;
+}
+
+message CommentOneWorkMomentResp {
+  CommonResp commonResp = 1;
+}
+
+message GetUserWorkMomentsReq {
+  string userID = 1;
+  server_api_params.RequestPagination Pagination = 2;
+  string operationID = 3;
+}
+
+message GetUserWorkMomentsResp {
+  CommonResp commonResp = 1;
+  repeated WorkMoment workMoments = 2;
+  server_api_params.ResponsePagination Pagination = 3;
+}
+
+message GetUserFriendWorkMomentsReq {
+  string userID = 1;
+  server_api_params.RequestPagination Pagination = 2;
+  string operationID = 3;
+}
+
+message GetUserFriendWorkMomentsResp {
+  CommonResp commonResp = 1;
+  repeated WorkMoment workMoments = 2;
+  server_api_params.ResponsePagination Pagination = 3;
+}
+
+message CommentsMsg {
+  Comment comment = 1;
+  string workMomentsID = 2;
+  string content = 3;
+}
+
+message GetUserWorkMomentsCommentsMsgReq {
+  string userID = 1;
+  string operationID = 2;
+  server_api_params.RequestPagination Pagination = 3;
+}
+
+message GetUserWorkMomentsCommentsMsgResp {
+  CommonResp commonResp = 1;
+  repeated CommentsMsg commentsMsg = 2;
+  server_api_params.ResponsePagination Pagination = 3;
+}
+
+message ClearUserWorkMomentsCommentsMsgReq {
+  string userID = 1;
+  string operationID = 2;
+}
+
+message ClearUserWorkMomentsCommentsMsgResp {
+  CommonResp commonResp = 1;
+}
+
+message SetUserWorkMomentsLevelReq {
+  string userID = 1;
+  int32 level = 2;
+  string operationID = 3;
+}
+
+message SetUserWorkMomentsLevelResp {
+  CommonResp commonResp = 1;
+}
+
 service OfficeService {
   rpc GetUserTags(GetUserTagsReq) returns(GetUserTagsResp);
   rpc CreateTag(CreateTagReq) returns(CreateTagResp);
@@ -114,5 +246,17 @@ service OfficeService {
   rpc SendMsg2Tag(SendMsg2TagReq) returns(SendMsg2TagResp);
   rpc GetTagSendLogs(GetTagSendLogsReq) returns(GetTagSendLogsResp);
   rpc GetUserTagByID(GetUserTagByIDReq) returns(GetUserTagByIDResp);
+
+  rpc CreateOneWorkMoment(CreateOneWorkMomentReq) returns(CreateOneWorkMomentResp);
+  rpc DeleteOneWorkMoment(DeleteOneWorkMomentReq) returns(DeleteOneWorkMomentResp);
+  rpc LikeOneWorkMoment(LikeOneWorkMomentReq) returns(LikeOneWorkMomentResp);
+  rpc CommentOneWorkMoment(CommentOneWorkMomentReq) returns(CommentOneWorkMomentResp);
+  /// user self
+  rpc GetUserWorkMoments(GetUserWorkMomentsReq) returns(GetUserWorkMomentsResp);
+  /// users friend
+  rpc GetUserFriendWorkMoments(GetUserFriendWorkMomentsReq) returns(GetUserFriendWorkMomentsResp);
+  rpc GetUserWorkMomentsCommentsMsg(GetUserWorkMomentsCommentsMsgReq) returns(GetUserWorkMomentsCommentsMsgResp);
+  rpc ClearUserWorkMomentsCommentsMsg(ClearUserWorkMomentsCommentsMsgReq) returns(ClearUserWorkMomentsCommentsMsgResp);
+  rpc SetUserWorkMomentsLevel(SetUserWorkMomentsLevelReq) returns(SetUserWorkMomentsLevelResp);
 }