Merge branch 'develop' of git.ailuowan.com:zzw/lone-services into develop

services/equipment/equipmentclient/equipment.go

@@ -33,7 +33,9 @@ type (
 	ItemsRequest            = equipment.ItemsRequest
 	MaskItemsRequest        = equipment.MaskItemsRequest
 	Response                = equipment.Response
+	SetExpiryRequest        = equipment.SetExpiryRequest
 	StatusRequest           = equipment.StatusRequest
+	UserBindRequest         = equipment.UserBindRequest
 
 	Equipment interface {
 		Items(ctx context.Context, in *ItemsRequest, opts ...grpc.CallOption) (*Response, error)
@@ -44,6 +46,7 @@ type (
 		MaskItems(ctx context.Context, in *MaskItemsRequest, opts ...grpc.CallOption) (*Response, error)
 		BeansItems(ctx context.Context, in *BeansItemsRequest, opts ...grpc.CallOption) (*Response, error)
 		BindExpiry(ctx context.Context, in *BindExpiryRequest, opts ...grpc.CallOption) (*Response, error)
+		UserBind(ctx context.Context, in *UserBindRequest, opts ...grpc.CallOption) (*Response, error)
 		// API
 		ApiMaskAdd(ctx context.Context, in *ApiMaskAddRequest, opts ...grpc.CallOption) (*Response, error)
 		ApiBindItems(ctx context.Context, in *EmptyRequest, opts ...grpc.CallOption) (*Response, error)
@@ -112,6 +115,11 @@ func (m *defaultEquipment) BindExpiry(ctx context.Context, in *BindExpiryRequest
 	return client.BindExpiry(ctx, in, opts...)
 }
 
+func (m *defaultEquipment) UserBind(ctx context.Context, in *UserBindRequest, opts ...grpc.CallOption) (*Response, error) {
+	client := equipment.NewEquipmentClient(m.cli.Conn())
+	return client.UserBind(ctx, in, opts...)
+}
+
 // API
 func (m *defaultEquipment) ApiMaskAdd(ctx context.Context, in *ApiMaskAddRequest, opts ...grpc.CallOption) (*Response, error) {
 	client := equipment.NewEquipmentClient(m.cli.Conn())

services/equipment/internal/logic/userBindLogic.go

@@ -0,0 +1,56 @@
+package logic
+
+import (
+	"context"
+	"lone-services/pkg/modelbase"
+	"lone-services/pkg/utils"
+	"lone-services/pkg/validate"
+	"lone-services/services/equipment/internal/dao"
+	"lone-services/services/equipment/internal/model"
+	"strconv"
+
+	"lone-services/rpc/equipment/pb"
+	"lone-services/services/equipment/internal/svc"
+
+	"github.com/zeromicro/go-zero/core/logx"
+)
+
+type UserBindLogic struct {
+	ctx    context.Context
+	svcCtx *svc.ServiceContext
+	logx.Logger
+	BaseLogic
+}
+
+func NewUserBindLogic(ctx context.Context, svcCtx *svc.ServiceContext) *UserBindLogic {
+	return &UserBindLogic{
+		ctx:    ctx,
+		svcCtx: svcCtx,
+		Logger: logx.WithContext(ctx),
+	}
+}
+
+func (l *UserBindLogic) UserBind(in *equipment.UserBindRequest) (*equipment.Response, error) {
+	var v validate.InfoValidator
+	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{
+			"id": strconv.FormatInt(in.Id, utils.NumberTen),
+		},
+	}
+
+	var items []dao.BindInfo
+	err := model.BindModel{}.Init().Items(w, &items)
+	if err != nil {
+		l.Logger.Error(err)
+		return l.fail(utils.Fail)
+	}
+
+	return l.ok(items)
+}

services/equipment/internal/server/equipmentServer.go

@@ -63,6 +63,11 @@ func (s *EquipmentServer) BindExpiry(ctx context.Context, in *equipment.BindExpi
 	return l.BindExpiry(in)
 }
 
+func (s *EquipmentServer) UserBind(ctx context.Context, in *equipment.UserBindRequest) (*equipment.Response, error) {
+	l := logic.NewUserBindLogic(ctx, s.svcCtx)
+	return l.UserBind(in)
+}
+
 // API
 func (s *EquipmentServer) ApiMaskAdd(ctx context.Context, in *equipment.ApiMaskAddRequest) (*equipment.Response, error) {
 	l := logic.NewApiMaskAddLogic(ctx, s.svcCtx)

services/percutaneous/.gitignore

@@ -0,0 +1,3 @@
+etc/percutaneous.yaml
+run.toml
+tmp

services/percutaneous/internal/logic/addUserLogic.go

@@ -52,8 +52,8 @@ func (l *AddUserLogic) AddUser(in *percutaneous.AddUserRequest) (*percutaneous.R
 	}
 	if info.Id < utils.NumberOne {
 		info.HostCode = in.HostCode
-		info.HostUserId = adminInfo.ID
-		info.UserId = in.UserId
+		info.HostUserId = in.UserId
+		info.UserId = adminInfo.ID
 		err = model.GroupModel{}.Init().Create(&info)
 		if err != nil {
 			l.Logger.Error(err)

services/percutaneous/run.toml

@@ -1,48 +0,0 @@
-[base]
-    port = 8060
-    name = "percutaneous-service"
-    listenOn = "0.0.0.0:11600"
-    mode = "dev"
-[log]
-    path = "logs"
-    serviceName = "percutaneous-service"
-    mode = "file"
-    encoding = "plain"
-    level = "info"
-    keepDays = 7
-    maxSize = 50
-    maxBackups = 5
-    compress = false
-# 测试的地址
-[mysql]
-   host = '39.106.171.204'
-   port = 33066
-   user = 'root'
-   password = 'MOLXRZNOU4Y4'
-   database = 'dms-percutaneous'
-   charset = 'utf8mb4'
-   prefix = ''
-   debug = true
-[mysql_read]
-   host = '39.106.171.204'
-   port = 33066
-   user = 'root'
-   password = 'MOLXRZNOU4Y4'
-   database = 'dms-percutaneous'
-   charset = 'utf8mb4'
-   prefix = ''
-
-[redis]
-    host = '39.106.171.204'
-    password = 'lLMLcuPpzSj'
-    port = 6379
-    db = 1
-[log-redis]
-    host = '39.106.171.204'
-    password = 'lLMLcuPpzSj'
-    port = 6379
-    db = 3
-[services]
-    user = "user-service"
-[encrypt]
-    data_key = "u2t9T3luZtoRfhBstkFN6TiIMW38BA8a" #内容数据,