实现修改管理员信息功能

internal/rpc/services/service_admin.go

@@ -3,6 +3,7 @@ package services
 import (
 	"context"
 	"github.com/TeaOSLab/EdgeAPI/internal/db/models"
+	"github.com/TeaOSLab/EdgeAPI/internal/errors"
 	rpcutils "github.com/TeaOSLab/EdgeAPI/internal/rpc/utils"
 	"github.com/TeaOSLab/EdgeAPI/internal/utils"
 	"github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb"
@@ -12,6 +13,7 @@ type AdminService struct {
 	debug bool
 }
 
+// 登录
 func (this *AdminService) LoginAdmin(ctx context.Context, req *pb.LoginAdminRequest) (*pb.LoginAdminResponse, error) {
 	_, _, err := rpcutils.ValidateRequest(ctx)
 	if err != nil {
@@ -46,6 +48,7 @@ func (this *AdminService) LoginAdmin(ctx context.Context, req *pb.LoginAdminRequ
 	}, nil
 }
 
+// 创建操作日志
 func (this *AdminService) CreateAdminLog(ctx context.Context, req *pb.CreateAdminLogRequest) (*pb.CreateAdminLogResponse, error) {
 	_, userId, err := rpcutils.ValidateRequest(ctx, rpcutils.UserTypeAdmin)
 	if err != nil {
@@ -58,6 +61,7 @@ func (this *AdminService) CreateAdminLog(ctx context.Context, req *pb.CreateAdmi
 	return &pb.CreateAdminLogResponse{}, nil
 }
 
+// 检查管理员是否存在
 func (this *AdminService) CheckAdminExists(ctx context.Context, req *pb.CheckAdminExistsRequest) (*pb.CheckAdminExistsResponse, error) {
 	_, _, err := rpcutils.ValidateRequest(ctx, rpcutils.UserTypeAdmin)
 	if err != nil {
@@ -70,7 +74,7 @@ func (this *AdminService) CheckAdminExists(ctx context.Context, req *pb.CheckAdm
 		}, nil
 	}
 
-	ok, err := models.SharedAdminDAO.ExistEnabledAdmin(int(req.AdminId))
+	ok, err := models.SharedAdminDAO.ExistEnabledAdmin(req.AdminId)
 	if err != nil {
 		return nil, err
 	}
@@ -80,8 +84,26 @@ func (this *AdminService) CheckAdminExists(ctx context.Context, req *pb.CheckAdm
 	}, nil
 }
 
+// 检查用户名是否存在
+func (this *AdminService) CheckAdminUsername(ctx context.Context, req *pb.CheckAdminUsernameRequest) (*pb.CheckAdminUsernameResponse, error) {
+	// 校验请求
+	_, _, err := rpcutils.ValidateRequest(ctx, rpcutils.UserTypeAdmin)
+	if err != nil {
+		return nil, err
+	}
+
+	exists, err := models.SharedAdminDAO.CheckAdminUsername(req.AdminId, req.Username)
+	if err != nil {
+		return nil, err
+	}
+
+	return &pb.CheckAdminUsernameResponse{Exists: exists}, nil
+}
+
+// 获取管理员名称
 func (this *AdminService) FindAdminFullname(ctx context.Context, req *pb.FindAdminFullnameRequest) (*pb.FindAdminFullnameResponse, error) {
-	_, _, err := rpcutils.ValidateRequest(ctx)
+	// 校验请求
+	_, _, err := rpcutils.ValidateRequest(ctx, rpcutils.UserTypeAdmin)
 	if err != nil {
 		return nil, err
 	}
@@ -97,8 +119,33 @@ func (this *AdminService) FindAdminFullname(ctx context.Context, req *pb.FindAdm
 	}, nil
 }
 
+// 获取管理员信息
+func (this *AdminService) FindEnabledAdmin(ctx context.Context, req *pb.FindEnabledAdminRequest) (*pb.FindEnabledAdminResponse, error) {
+	_, _, err := rpcutils.ValidateRequest(ctx, rpcutils.UserTypeAdmin)
+	if err != nil {
+		return nil, err
+	}
+
+	admin, err := models.SharedAdminDAO.FindEnabledAdmin(req.AdminId)
+	if err != nil {
+		return nil, err
+	}
+	if admin == nil {
+		return &pb.FindEnabledAdminResponse{Admin: nil}, nil
+	}
+
+	result := &pb.Admin{
+		Id:       int64(admin.Id),
+		Fullname: admin.Fullname,
+		Username: admin.Username,
+		IsOn:     admin.IsOn == 1,
+	}
+	return &pb.FindEnabledAdminResponse{Admin: result}, nil
+}
+
 // 创建或修改管理员
 func (this *AdminService) CreateOrUpdateAdmin(ctx context.Context, req *pb.CreateOrUpdateAdminRequest) (*pb.CreateOrUpdateAdminResponse, error) {
+	// 校验请求
 	_, _, err := rpcutils.ValidateRequest(ctx, rpcutils.UserTypeAdmin, rpcutils.UserTypeAPI)
 	if err != nil {
 		return nil, err
@@ -121,3 +168,41 @@ func (this *AdminService) CreateOrUpdateAdmin(ctx context.Context, req *pb.Creat
 	}
 	return &pb.CreateOrUpdateAdminResponse{AdminId: adminId}, nil
 }
+
+// 修改管理员信息
+func (this *AdminService) UpdateAdmin(ctx context.Context, req *pb.UpdateAdminRequest) (*pb.RPCUpdateSuccess, error) {
+	// 校验请求
+	_, _, err := rpcutils.ValidateRequest(ctx, rpcutils.UserTypeAdmin, rpcutils.UserTypeAPI)
+	if err != nil {
+		return nil, err
+	}
+
+	err = models.SharedAdminDAO.UpdateAdmin(req.AdminId, req.Fullname)
+	if err != nil {
+		return nil, err
+	}
+	return rpcutils.RPCUpdateSuccess()
+}
+
+// 修改管理员登录信息
+func (this *AdminService) UpdateAdminLogin(ctx context.Context, req *pb.UpdateAdminLoginRequest) (*pb.RPCUpdateSuccess, error) {
+	// 校验请求
+	_, _, err := rpcutils.ValidateRequest(ctx, rpcutils.UserTypeAdmin, rpcutils.UserTypeAPI)
+	if err != nil {
+		return nil, err
+	}
+
+	exists, err := models.SharedAdminDAO.CheckAdminUsername(req.AdminId, req.Username)
+	if err != nil {
+		return nil, err
+	}
+	if exists {
+		return nil, errors.New("username already been token")
+	}
+
+	err = models.SharedAdminDAO.UpdateAdminLogin(req.AdminId, req.Username, req.Password)
+	if err != nil {
+		return nil, err
+	}
+	return rpcutils.RPCUpdateSuccess()
+}