add apis

services/percutaneous/internal/logic/usedLogLogic.go

@@ -63,6 +63,10 @@ func (l *UsedLogLogic) UsedLog(in *percutaneous.UsedLogRequest) (*percutaneous.R
 			w.Between = map[string][2]string{"create_time": {
 				in.Time[utils.NumberZero], in.Time[utils.NumberOne]}}
 		}
+		if len(in.Time) > utils.NumberOne {
+			w.Between = map[string][2]string{"create_time": {
+				in.Time[utils.NumberZero], in.Time[utils.NumberOne]}}
+		}
 
 		items, err := model.UsedLogModel{}.Init().Page(w, &info)
 		if err != nil {

services/percutaneous/internal/logic/usedStoreLogLogic.go

@@ -0,0 +1,81 @@
+package logic
+
+import (
+	"context"
+	"lone-services/pkg/modelbase"
+	"lone-services/pkg/utils"
+	"lone-services/services/percutaneous/internal/dao"
+	"lone-services/services/percutaneous/internal/model"
+	"lone-services/services/percutaneous/validator"
+	"strconv"
+
+	"lone-services/rpc/percutaneous/pb"
+	"lone-services/services/percutaneous/internal/svc"
+
+	"github.com/zeromicro/go-zero/core/logx"
+)
+
+type UsedStoreLogLogic struct {
+	ctx    context.Context
+	svcCtx *svc.ServiceContext
+	logx.Logger
+	BaseLogic
+}
+
+func NewUsedStoreLogLogic(ctx context.Context, svcCtx *svc.ServiceContext) *UsedStoreLogLogic {
+	return &UsedStoreLogLogic{
+		ctx:    ctx,
+		svcCtx: svcCtx,
+		Logger: logx.WithContext(ctx),
+	}
+}
+
+func (l *UsedStoreLogLogic) UsedStoreLog(in *percutaneous.UsedLogRequest) (*percutaneous.Response, error) {
+	var v validator.UsedStoreLogValidator
+	if fail := l.checkParams(in, &v); fail != nil {
+		return fail, nil
+	}
+	adminInfo := utils.GetUserFromCtx(l.ctx)
+	if adminInfo.ID < utils.NumberOne {
+		return l.fail(utils.ErrorNoLoginInfo)
+	}
+
+	var info []dao.UsedLogInfo
+	if in.Stamp != utils.StringEmpty {
+		w := modelbase.Params{
+			Eq: map[string]string{
+				"stamp":     in.Stamp,
+				"user_id":   strconv.FormatInt(adminInfo.ID, utils.NumberTen),
+				"host_code": in.HostCode,
+			},
+		}
+		if len(in.Time) > utils.NumberOne {
+			w.Between = map[string][2]string{"create_time": {
+				in.Time[utils.NumberZero], in.Time[utils.NumberOne]}}
+		}
+		err := model.UsedLogModel{}.Init().Items(w, &info)
+		if err != nil {
+			l.Logger.Error(err)
+			return l.fail(utils.ErrorNotFund)
+		}
+		return l.ok(info)
+	} else {
+		w := modelbase.Params{
+			Page:  int(in.Page),
+			Size:  int(in.Size),
+			Order: "id desc",
+			Eq:    map[string]string{"user_id": strconv.FormatInt(adminInfo.ID, utils.NumberTen)},
+		}
+		if len(in.Time) > utils.NumberOne {
+			w.Between = map[string][2]string{"create_time": {
+				in.Time[utils.NumberZero], in.Time[utils.NumberOne]}}
+		}
+
+		items, err := model.UsedLogModel{}.Init().Page(w, &info)
+		if err != nil {
+			l.Logger.Error(err)
+			return l.fail(utils.ErrorNotFund)
+		}
+		return l.ok(items)
+	}
+}

services/percutaneous/internal/logic/userDeleteLogic.go

@@ -31,7 +31,7 @@ func NewUserDeleteLogic(ctx context.Context, svcCtx *svc.ServiceContext) *UserDe
 }
 
 func (l *UserDeleteLogic) UserDelete(in *percutaneous.AddUserRequest) (*percutaneous.Response, error) {
-	var v validator.GroupValidator
+	var v validator.GroupDeleteValidator
 	if fail := l.checkParams(in, &v); fail != nil {
 		return fail, nil
 	}
@@ -40,7 +40,6 @@ func (l *UserDeleteLogic) UserDelete(in *percutaneous.AddUserRequest) (*percutan
 		return l.fail(utils.ErrorNoLoginInfo)
 	}
 	w := modelbase.Params{Eq: map[string]string{
-		"host_code":    in.HostCode,
 		"host_user_id": strconv.FormatInt(in.UserId, utils.NumberTen),
 		"user_id":      strconv.FormatInt(adminInfo.ID, utils.NumberTen),
 	}}
@@ -52,9 +51,6 @@ func (l *UserDeleteLogic) UserDelete(in *percutaneous.AddUserRequest) (*percutan
 		return l.fail(utils.Fail)
 	}
 	if info.Id > utils.NumberZero {
-		info.HostCode = in.HostCode
-		info.HostUserId = in.UserId
-		info.UserId = adminInfo.ID
 		info.Status = utils.StatusFail
 		_, err = model.GroupModel{}.Init().Edit(w, &info)
 		if err != nil {

services/percutaneous/internal/logic/userStoreDeleteLogic.go

@@ -0,0 +1,67 @@
+package logic
+
+import (
+	"context"
+	"lone-services/pkg/modelbase"
+	"lone-services/pkg/utils"
+	"lone-services/services/percutaneous/internal/dao"
+	"lone-services/services/percutaneous/internal/model"
+	"lone-services/services/percutaneous/validator"
+	"strconv"
+
+	"lone-services/rpc/percutaneous/pb"
+	"lone-services/services/percutaneous/internal/svc"
+
+	"github.com/zeromicro/go-zero/core/logx"
+)
+
+type UserStoreDeleteLogic struct {
+	ctx    context.Context
+	svcCtx *svc.ServiceContext
+	logx.Logger
+	BaseLogic
+}
+
+func NewUserStoreDeleteLogic(ctx context.Context, svcCtx *svc.ServiceContext) *UserStoreDeleteLogic {
+	return &UserStoreDeleteLogic{
+		ctx:    ctx,
+		svcCtx: svcCtx,
+		Logger: logx.WithContext(ctx),
+	}
+}
+
+func (l *UserStoreDeleteLogic) UserStoreDelete(in *percutaneous.AddUserRequest) (*percutaneous.Response, error) {
+	var v validator.GroupValidator
+	if fail := l.checkParams(in, &v); fail != nil {
+		return fail, nil
+	}
+	adminInfo := utils.GetUserFromCtx(l.ctx)
+	if adminInfo.ID < utils.NumberOne {
+		return l.fail(utils.ErrorNoLoginInfo)
+	}
+	w := modelbase.Params{Eq: map[string]string{
+		"host_code":    in.HostCode,
+		"host_user_id": strconv.FormatInt(in.UserId, utils.NumberTen),
+		"user_id":      strconv.FormatInt(adminInfo.ID, utils.NumberTen),
+	}}
+
+	var info dao.Group
+	err := model.GroupModel{}.Init().GetOne(w, &info)
+	if err != nil {
+		l.Logger.Error(err)
+		return l.fail(utils.Fail)
+	}
+	if info.Id > utils.NumberZero {
+		info.HostCode = in.HostCode
+		info.HostUserId = in.UserId
+		info.UserId = adminInfo.ID
+		info.Status = utils.StatusFail
+		_, err = model.GroupModel{}.Init().Edit(w, &info)
+		if err != nil {
+			l.Logger.Error(err)
+			return l.fail(utils.Fail)
+		}
+	}
+
+	return l.ok(utils.NumberOne)
+}

services/percutaneous/internal/logic/userStoreItemsLogic.go

@@ -0,0 +1,104 @@
+package logic
+
+import (
+	"context"
+	"lone-services/pkg/modelbase"
+	"lone-services/pkg/utils"
+	user "lone-services/rpc/user/pb"
+	"lone-services/services/percutaneous/internal/dao"
+	"lone-services/services/percutaneous/internal/model"
+	"lone-services/services/percutaneous/validator"
+	"strconv"
+
+	"lone-services/rpc/percutaneous/pb"
+	"lone-services/services/percutaneous/internal/svc"
+
+	"github.com/zeromicro/go-zero/core/logx"
+)
+
+type UserStoreItemsLogic struct {
+	ctx    context.Context
+	svcCtx *svc.ServiceContext
+	logx.Logger
+	BaseLogic
+}
+
+func NewUserStoreItemsLogic(ctx context.Context, svcCtx *svc.ServiceContext) *UserStoreItemsLogic {
+	return &UserStoreItemsLogic{
+		ctx:    ctx,
+		svcCtx: svcCtx,
+		Logger: logx.WithContext(ctx),
+	}
+}
+
+func (l *UserStoreItemsLogic) UserStoreItems(in *percutaneous.UserItemsRequest) (*percutaneous.Response, error) {
+	var v validator.GroupItemsValidator
+	if fail := l.checkParams(in, &v); fail != nil {
+		return fail, nil
+	}
+	adminInfo := utils.GetUserFromCtx(l.ctx)
+	if adminInfo.ID < utils.NumberOne {
+		return l.fail(utils.ErrorNoLoginInfo)
+	}
+
+	w := modelbase.Params{
+		Eq: map[string]string{
+			"host_user_id": strconv.FormatInt(adminInfo.ID, utils.NumberTen),
+			"host_code":    in.HostCode,
+			"status":       utils.StringStatusOk,
+		},
+		Page:  int(in.Page),
+		Size:  int(in.Size),
+		Order: "id desc",
+	}
+	var info []dao.GroupInfo
+	items, err := model.GroupModel{}.Init().Page(w, &info)
+	if err != nil {
+		logx.Errorf("get group err: %v", err)
+		return l.fail(utils.Fail)
+	}
+	var ids []int64
+	for _, item := range info {
+		ids = append(ids, item.UserId)
+	}
+	l.setUserItems(&info, ids)
+
+	items.Items = info
+	return l.ok(items)
+}
+
+func (l *UserStoreItemsLogic) setUserItems(info *[]dao.GroupInfo, ids []int64) {
+	if len(ids) == utils.NumberZero {
+		return
+	}
+
+	cli, err := svc.GetRpcClient(l.svcCtx.UserName)
+	if err != nil {
+		logx.Errorf("get user err: %v", err)
+		return
+	}
+
+	client := user.NewUserClient(cli.Conn())
+
+	data := user.InternalUsersByIdsReq{
+		Ids: ids,
+	}
+	res, err := client.InternalUsersByIds(context.Background(), &data)
+	if err != nil {
+		logx.Errorf("get order err: %v", err)
+		return
+	}
+
+	type UserItem struct {
+		Name   string `json:"name"`
+		Avatar string `json:"avatar"`
+	}
+	names := make(map[int64]UserItem)
+	for _, item := range res.Items {
+		names[item.Id] = UserItem{Name: item.Name, Avatar: item.Avatar}
+	}
+	for key, item := range *info {
+		(*info)[key].UserName = names[item.UserId].Name
+		(*info)[key].UserAvatar = names[item.UserId].Avatar
+	}
+}