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

services/water/internal/dao/users.go

@@ -20,3 +20,7 @@ type UsersInfo struct {
 	UpdateTime utils.CustomTime `json:"update_time" gorm:"update_time"`
 	CarteTime  utils.CustomTime `json:"carte_time" gorm:"carte_time"`
 }
+
+type UsersStatus struct {
+	Status int32 `gorm:"column:status;type:tinyint(1);not null;default:3" json:"status"` // 状态：1为正常，2为禁用，3为申请
+}

services/water/internal/logic/applyStatusLogic.go

@@ -7,6 +7,7 @@ import (
 	"lone-services/services/water/internal/dao"
 	"lone-services/services/water/model"
 	"lone-services/services/water/validator"
+	"strconv"
 
 	"lone-services/rpc/water/pb"
 	"lone-services/services/water/internal/svc"
@@ -40,7 +41,7 @@ func (l *ApplyStatusLogic) ApplyStatus(in *water.ApplyStatusRequest) (*water.Res
 		return l.fail(utils.ErrorNoLoginInfo)
 	}
 
-	w := modelbase.Params{Eq: map[string]string{"id": string(in.Id)}}
+	w := modelbase.Params{Eq: map[string]string{"id": strconv.FormatInt(in.Id, utils.NumberTen)}}
 
 	var info dao.UsersInfo
 	err := model.UsersModel{}.Init().GetOne(w, &info)
@@ -51,9 +52,9 @@ func (l *ApplyStatusLogic) ApplyStatus(in *water.ApplyStatusRequest) (*water.Res
 		return l.fail(utils.ErrorNotFund)
 	}
 
-	info.Status = in.Status
+	up := dao.UsersStatus{Status: in.Status}
 
-	_, err = model.UsersModel{}.Init().Edit(w, &info)
+	_, err = model.UsersModel{}.Init().Edit(w, &up)
 	if err != nil {
 		return l.fail(utils.Fail)
 	}

services/water/internal/logic/applyUserLogic.go

@@ -7,6 +7,7 @@ import (
 	"lone-services/services/water/internal/dao"
 	"lone-services/services/water/model"
 	"lone-services/services/water/validator"
+	"strconv"
 
 	"lone-services/rpc/water/pb"
 	"lone-services/services/water/internal/svc"
@@ -29,7 +30,7 @@ func NewApplyUserLogic(ctx context.Context, svcCtx *svc.ServiceContext) *ApplyUs
 	}
 }
 
-// 申请
+// ApplyUser 申请
 func (l *ApplyUserLogic) ApplyUser(in *water.ApplyUserRequest) (*water.Response, error) {
 	var v validator.UserApplyValidator
 	if fail := l.checkParams(in, &v); fail != nil {
@@ -40,7 +41,7 @@ func (l *ApplyUserLogic) ApplyUser(in *water.ApplyUserRequest) (*water.Response,
 		return l.fail(utils.ErrorNoLoginInfo)
 	}
 
-	w := modelbase.Params{Eq: map[string]string{"user_id": string(in.UserId), "status": utils.StringStatusOk}}
+	w := modelbase.Params{Eq: map[string]string{"user_id": strconv.FormatInt(in.UserId, utils.NumberTen), "status": utils.StringStatusOk}}
 
 	var info dao.UsersCreate
 	err := model.UsersModel{}.Init().GetOne(w, &info)

services/water/internal/logic/getWarningLogic.go

@@ -6,6 +6,7 @@ import (
 	"lone-services/pkg/utils"
 	"lone-services/services/water/internal/dao"
 	"lone-services/services/water/model"
+	"strconv"
 
 	"lone-services/rpc/water/pb"
 	"lone-services/services/water/internal/svc"
@@ -44,7 +45,7 @@ func (l *GetWarningLogic) GetWarning(in *water.GetWarningItemsRequest) (*water.R
 		w.Eq["host_code"] = in.HostCode
 	}
 	if in.Type > utils.NumberZero {
-		w.Eq["type"] = string(in.Type)
+		w.Eq["type"] = strconv.Itoa(int(in.Type))
 	}
 
 	var info []dao.WarningInfo

services/water/internal/logic/usersApplyItemsLogic.go

@@ -0,0 +1,51 @@
+package logic
+
+import (
+	"context"
+	"lone-services/pkg/modelbase"
+	"lone-services/pkg/utils"
+	"lone-services/services/water/internal/dao"
+	"lone-services/services/water/model"
+	"lone-services/services/water/validator"
+
+	"lone-services/rpc/water/pb"
+	"lone-services/services/water/internal/svc"
+
+	"github.com/zeromicro/go-zero/core/logx"
+)
+
+type UsersApplyItemsLogic struct {
+	ctx    context.Context
+	svcCtx *svc.ServiceContext
+	logx.Logger
+	BaseLogic
+}
+
+func NewUsersApplyItemsLogic(ctx context.Context, svcCtx *svc.ServiceContext) *UsersApplyItemsLogic {
+	return &UsersApplyItemsLogic{
+		ctx:    ctx,
+		svcCtx: svcCtx,
+		Logger: logx.WithContext(ctx),
+	}
+}
+
+func (l *UsersApplyItemsLogic) UsersApplyItems(in *water.UsersRequest) (*water.Response, error) {
+	var v validator.UserItemsValidator
+	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, "status": utils.StatusForbiddenString}}
+
+	var info []dao.UsersInfo
+	items, err := model.UsersModel{}.Init().Page(w, &info)
+	if err != nil {
+		return l.fail(utils.Fail)
+	}
+
+	return l.ok(items)
+}

services/water/internal/logic/warningStatusLogic.go

@@ -7,6 +7,7 @@ import (
 	"lone-services/services/water/internal/dao"
 	"lone-services/services/water/model"
 	"lone-services/services/water/validator"
+	"strconv"
 
 	"lone-services/rpc/water/pb"
 	"lone-services/services/water/internal/svc"
@@ -40,7 +41,7 @@ func (l *WarningStatusLogic) WarningStatus(in *water.WarningStatusRequest) (*wat
 		return l.fail(utils.ErrorNoLoginInfo)
 	}
 
-	w := modelbase.Params{Eq: map[string]string{"id": string(in.Id)}}
+	w := modelbase.Params{Eq: map[string]string{"id": strconv.FormatInt(in.Id, utils.NumberTen)}}
 
 	var info dao.WarningInfo
 	err := model.WarningModel{}.Init().GetOne(w, &info)

services/water/internal/server/waterServer.go

@@ -95,6 +95,11 @@ func (s *WaterServer) ChangeAdmin(ctx context.Context, in *water.ChangeAdminRequ
 	return l.ChangeAdmin(in)
 }
 
+func (s *WaterServer) UsersApplyItems(ctx context.Context, in *water.UsersRequest) (*water.Response, error) {
+	l := logic.NewUsersApplyItemsLogic(ctx, s.svcCtx)
+	return l.UsersApplyItems(in)
+}
+
 // 管理人列表
 func (s *WaterServer) Users(ctx context.Context, in *water.UsersRequest) (*water.Response, error) {
 	l := logic.NewUsersLogic(ctx, s.svcCtx)

services/water/waterClient/water.go

@@ -51,6 +51,7 @@ type (
 		ApplyStatus(ctx context.Context, in *ApplyStatusRequest, opts ...grpc.CallOption) (*Response, error)
 		// 转移管理人
 		ChangeAdmin(ctx context.Context, in *ChangeAdminRequest, opts ...grpc.CallOption) (*Response, error)
+		UsersApplyItems(ctx context.Context, in *UsersRequest, opts ...grpc.CallOption) (*Response, error)
 		// 管理人列表
 		Users(ctx context.Context, in *UsersRequest, opts ...grpc.CallOption) (*Response, error)
 	}
@@ -138,6 +139,11 @@ func (m *defaultWater) ChangeAdmin(ctx context.Context, in *ChangeAdminRequest,
 	return client.ChangeAdmin(ctx, in, opts...)
 }
 
+func (m *defaultWater) UsersApplyItems(ctx context.Context, in *UsersRequest, opts ...grpc.CallOption) (*Response, error) {
+	client := water.NewWaterClient(m.cli.Conn())
+	return client.UsersApplyItems(ctx, in, opts...)
+}
+
 // 管理人列表
 func (m *defaultWater) Users(ctx context.Context, in *UsersRequest, opts ...grpc.CallOption) (*Response, error) {
 	client := water.NewWaterClient(m.cli.Conn())