zzw/lone-services
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat: internal product items

Browse Source
This commit is contained in:
zzw
2026-10-09 13:21:59 +08:00
parent 5b1b6d7daa
commit 174b585c8a
27 changed files with 735 additions and 315 deletions
Download Patch File Download Diff File Expand all files Collapse all files
services/message/internal/logic/apiMessageLogic.go
+40 -27
View File
@@ -2,14 +2,13 @@ package logic
import (
"context"
"lone-services/pkg/modelbase"
"lone-services/pkg/utils"
"lone-services/services/message/internal/dao"
"lone-services/services/message/internal/model"
"lone-services/services/message/validator"
"strconv"
"lone-services/rpc/message/pb"
"lone-services/pkg/modelbase"
"lone-services/pkg/utils"
message "lone-services/rpc/message/pb"
"lone-services/services/message/internal/dao"
"lone-services/services/message/internal/model"
"lone-services/services/message/internal/svc"
"github.com/zeromicro/go-zero/core/logx"
@@ -30,37 +29,51 @@ func NewApiMessageLogic(ctx context.Context, svcCtx *svc.ServiceContext) *ApiMes
}
}
func (l *ApiMessageLogic) ApiMessage(in *message.ItemsRequest) (*message.Response, error) {
var v validator.MessageItemsValidator
if fail := l.checkParams(in, &v); fail != nil {
return fail, nil
}
adminInfo := utils.GetUserFromCtx(l.ctx)
if adminInfo.ID < utils.NumberOne {
func (l *ApiMessageLogic) ApiMessage(in *message.ApiMessageNumberRequest) (*message.Response, error) {
loginUser := utils.GetUserFromCtx(l.ctx)
if loginUser.ID < utils.NumberOne {
return l.fail(utils.ErrorNoLoginInfo)
}
eq := map[string]string{
"target_id": strconv.FormatInt(loginUser.ID, utils.NumberTen),
}
if in.Type > utils.NumberZero {
eq["type"] = strconv.Itoa(int(in.Type))
}
var info []dao.MessageInfo
w := modelbase.Params{
Page: int(in.Page),
Size: int(in.Size),
Page: modelbase.DefaultPage,
Size: 10,
Order: "id desc",
Eq: eq,
}
items, err := model.MessageModel{}.Init().Page(w, &info)
messageModel := model.MessageModel{}.Init()
_, err := messageModel.Page(w, &info)
if err != nil {
l.Logger.Error("get message list failed", err)
l.Errorf("get message list failed: %v", err)
return l.fail(utils.Fail)
}
var ids []string
for _, v := range info {
ids = append(ids, strconv.Itoa(int(v.Id)))
if len(info) > utils.NumberZero {
ids := make([]string, 0, len(info))
for _, row := range info {
ids = append(ids, strconv.FormatInt(row.Id, utils.NumberTen))
}
_, editErr := messageModel.Edit(modelbase.Params{
In: map[string][]string{"id": ids},
Eq: map[string]string{"target_id": strconv.FormatInt(loginUser.ID, utils.NumberTen)},
}, &dao.MessageStatus{Status: utils.StatusOk})
if editErr != nil {
l.Errorf("mark message read failed: %v", editErr)
return l.fail(utils.Fail)
}
for i := range info {
info[i].Status = utils.StatusOk
}
}
if len(ids) > utils.NumberZero {
status := dao.MessageStatus{Status: utils.StatusOk}
ww := modelbase.Params{In: map[string][]string{"id": ids}}
_, err = model.MessageModel{}.Init().Edit(ww, &status)
}
return l.ok(items)
return l.ok(info)
}
services/message/internal/logic/apiMessageNumberLogic.go
+15 -9
View File
@@ -2,14 +2,15 @@ package logic
import (
"context"
"lone-services/pkg/modelbase"
"lone-services/pkg/utils"
"lone-services/services/message/internal/dao"
"lone-services/services/message/internal/model"
"strconv"
"lone-services/rpc/message/pb"
"lone-services/pkg/modelbase"
"lone-services/pkg/utils"
message "lone-services/rpc/message/pb"
"lone-services/services/message/internal/dao"
"lone-services/services/message/internal/model"
"lone-services/services/message/internal/svc"
"lone-services/services/message/validator"
"github.com/zeromicro/go-zero/core/logx"
)
@@ -30,8 +31,13 @@ func NewApiMessageNumberLogic(ctx context.Context, svcCtx *svc.ServiceContext) *
}
func (l *ApiMessageNumberLogic) ApiMessageNumber(in *message.ApiMessageNumberRequest) (*message.Response, error) {
adminInfo := utils.GetUserFromCtx(l.ctx)
if adminInfo.ID < utils.NumberOne {
var v validator.MessageNumberValidator
if fail := l.checkParams(in, &v); fail != nil {
return fail, nil
}
loginUser := utils.GetUserFromCtx(l.ctx)
if loginUser.ID < utils.NumberOne {
return l.fail(utils.ErrorNoLoginInfo)
}
@@ -39,14 +45,14 @@ func (l *ApiMessageNumberLogic) ApiMessageNumber(in *message.ApiMessageNumberReq
w := modelbase.Params{
Eq: map[string]string{
"status": strconv.Itoa(utils.StatusFail),
"target_id": strconv.FormatInt(adminInfo.ID, utils.NumberTen),
"target_id": strconv.FormatInt(loginUser.ID, utils.NumberTen),
"type": strconv.Itoa(int(in.Type)),
},
}
count, err := model.MessageModel{}.Init().Count(w, &info)
if err != nil {
utils.Logger.Error(err)
l.Errorf("count unread message failed: %v", err)
return l.fail(utils.Fail)
}
return l.ok(count)
services/message/internal/server/messageServer.go
+2 -2
View File
@@ -1,5 +1,5 @@
// Code generated by goctl. DO NOT EDIT.
// goctl 1.10.2
// goctl 1.10.1
// Source: message.proto
package server
@@ -28,7 +28,7 @@ func (s *MessageServer) AdminMessage(ctx context.Context, in *message.ItemsReque
return l.AdminMessage(in)
}
func (s *MessageServer) ApiMessage(ctx context.Context, in *message.ItemsRequest) (*message.Response, error) {
func (s *MessageServer) ApiMessage(ctx context.Context, in *message.ApiMessageNumberRequest) (*message.Response, error) {
l := logic.NewApiMessageLogic(ctx, s.svcCtx)
return l.ApiMessage(in)
}
services/message/messageclient/message.go
+3 -3
View File
@@ -1,5 +1,5 @@
// Code generated by goctl. DO NOT EDIT.
// goctl 1.10.2
// goctl 1.10.1
// Source: message.proto
package messageClient
@@ -22,7 +22,7 @@ type (
Message interface {
AdminMessage(ctx context.Context, in *ItemsRequest, opts ...grpc.CallOption) (*Response, error)
ApiMessage(ctx context.Context, in *ItemsRequest, opts ...grpc.CallOption) (*Response, error)
ApiMessage(ctx context.Context, in *ApiMessageNumberRequest, opts ...grpc.CallOption) (*Response, error)
ApiMessageNumber(ctx context.Context, in *ApiMessageNumberRequest, opts ...grpc.CallOption) (*Response, error)
MessageAdd(ctx context.Context, in *AddRequest, opts ...grpc.CallOption) (*AddResponse, error)
}
@@ -43,7 +43,7 @@ func (m *defaultMessage) AdminMessage(ctx context.Context, in *ItemsRequest, opt
return client.AdminMessage(ctx, in, opts...)
}
func (m *defaultMessage) ApiMessage(ctx context.Context, in *ItemsRequest, opts ...grpc.CallOption) (*Response, error) {
func (m *defaultMessage) ApiMessage(ctx context.Context, in *ApiMessageNumberRequest, opts ...grpc.CallOption) (*Response, error) {
client := message.NewMessageClient(m.cli.Conn())
return client.ApiMessage(ctx, in, opts...)
}
services/message/validator/message.go
+3 -5
View File
@@ -8,20 +8,18 @@ type MessageItemsValidator struct {
Type int32 `form:"type" json:"type" validate:"required"`
}
// GetMessage 提示消息
func (p MessageItemsValidator) GetMessage() validate.ValidatorMessages {
return validate.ValidatorMessages{
validate.FieldType: validate.FieldType,
validate.FieldType: validate.FieldTypeValue,
}
}
type MessageNumberValidator struct {
Type int32 `form:"type" json:"type" binding:"required"`
Type int32 `form:"type" json:"type" validate:"required"`
}
// GetMessage 提示消息
func (p MessageNumberValidator) GetMessage() validate.ValidatorMessages {
return validate.ValidatorMessages{
validate.FieldType: validate.FieldType,
validate.FieldType: validate.FieldTypeValue,
}
}