pig/pig-farm-controller
1
0
Fork 0
Code Issues 12 Pull Requests Actions Packages Projects Releases Wiki Activity

优化设备服务方法的入参

Browse Source
This commit is contained in:
huang
2025-11-03 17:27:29 +08:00
parent f0b71b47a0
commit 9127eeaf31
5 changed files with 220 additions and 81 deletions
Download Patch File Download Diff File Expand all files Collapse all files

80
internal/app/controller/device/device_controller.go
View File

@@ -2,6 +2,7 @@ package device
import (
"errors"
"strconv"
"git.huangwc.com/pig/pig-farm-controller/internal/app/controller"
"git.huangwc.com/pig/pig-farm-controller/internal/app/dto"
@@ -71,7 +72,13 @@ func (c *Controller) GetDevice(ctx echo.Context) error {
const actionType = "获取设备"
deviceID := ctx.Param("id")
resp, err := c.deviceService.GetDevice(deviceID)
id, err := strconv.ParseUint(deviceID, 10, 64)
if err != nil {
c.logger.Errorf("%s: 无效的ID: %s", actionType, deviceID)
return controller.SendErrorWithAudit(ctx, controller.CodeBadRequest, "无效的ID: "+deviceID, actionType, "无效的ID", deviceID)
}
resp, err := c.deviceService.GetDevice(uint(id))
if err != nil {
if errors.Is(err, gorm.ErrRecordNotFound) {
c.logger.Warnf("%s: 设备不存在, ID: %s", actionType, deviceID)
@@ -126,7 +133,13 @@ func (c *Controller) UpdateDevice(ctx echo.Context) error {
return controller.SendErrorWithAudit(ctx, controller.CodeBadRequest, "无效的请求体: "+err.Error(), actionType, "请求体绑定失败", req)
}
resp, err := c.deviceService.UpdateDevice(deviceID, &req)
id, err := strconv.ParseUint(deviceID, 10, 64)
if err != nil {
c.logger.Errorf("%s: 无效的ID: %s", actionType, deviceID)
return controller.SendErrorWithAudit(ctx, controller.CodeBadRequest, "无效的ID: "+deviceID, actionType, "无效的ID", deviceID)
}
resp, err := c.deviceService.UpdateDevice(uint(id), &req)
if err != nil {
if errors.Is(err, gorm.ErrRecordNotFound) {
c.logger.Warnf("%s: 设备不存在, ID: %s", actionType, deviceID)
@@ -153,7 +166,13 @@ func (c *Controller) DeleteDevice(ctx echo.Context) error {
const actionType = "删除设备"
deviceID := ctx.Param("id")
if err := c.deviceService.DeleteDevice(deviceID); err != nil {
id, err := strconv.ParseUint(deviceID, 10, 64)
if err != nil {
c.logger.Errorf("%s: 无效的ID: %s", actionType, deviceID)
return controller.SendErrorWithAudit(ctx, controller.CodeBadRequest, "无效的ID: "+deviceID, actionType, "无效的ID", deviceID)
}
if err := c.deviceService.DeleteDevice(uint(id)); err != nil {
switch {
case errors.Is(err, gorm.ErrRecordNotFound):
c.logger.Warnf("%s: 设备不存在, ID: %s", actionType, deviceID)
@@ -193,7 +212,13 @@ func (c *Controller) ManualControl(ctx echo.Context) error {
return controller.SendErrorWithAudit(ctx, controller.CodeBadRequest, "无效的请求体: "+err.Error(), actionType, "请求体绑定失败", req)
}
if err := c.deviceService.ManualControl(deviceID, &req); err != nil {
id, err := strconv.ParseUint(deviceID, 10, 64)
if err != nil {
c.logger.Errorf("%s: 无效的ID: %s", actionType, deviceID)
return controller.SendErrorWithAudit(ctx, controller.CodeBadRequest, "无效的ID: "+deviceID, actionType, "无效的ID", deviceID)
}
if err := c.deviceService.ManualControl(uint(id), &req); err != nil {
if errors.Is(err, gorm.ErrRecordNotFound) {
c.logger.Warnf("%s: 设备不存在, ID: %s", actionType, deviceID)
return controller.SendErrorWithAudit(ctx, controller.CodeNotFound, "设备未找到", actionType, "设备不存在", deviceID)
@@ -248,7 +273,13 @@ func (c *Controller) GetAreaController(ctx echo.Context) error {
const actionType = "获取区域主控"
acID := ctx.Param("id")
resp, err := c.deviceService.GetAreaController(acID)
id, err := strconv.ParseUint(acID, 10, 64)
if err != nil {
c.logger.Errorf("%s: 无效的ID: %s", actionType, acID)
return controller.SendErrorWithAudit(ctx, controller.CodeBadRequest, "无效的ID: "+acID, actionType, "无效的ID", acID)
}
resp, err := c.deviceService.GetAreaController(uint(id))
if err != nil {
if errors.Is(err, gorm.ErrRecordNotFound) {
c.logger.Warnf("%s: 区域主控不存在, ID: %s", actionType, acID)
@@ -302,8 +333,13 @@ func (c *Controller) UpdateAreaController(ctx echo.Context) error {
c.logger.Errorf("%s: 参数绑定失败: %v", actionType, err)
return controller.SendErrorWithAudit(ctx, controller.CodeBadRequest, "无效的请求体: "+err.Error(), actionType, "请求体绑定失败", req)
}
id, err := strconv.ParseUint(acID, 10, 64)
if err != nil {
c.logger.Errorf("%s: 无效的ID: %s", actionType, acID)
return controller.SendErrorWithAudit(ctx, controller.CodeBadRequest, "无效的ID: "+acID, actionType, "无效的ID", acID)
}
resp, err := c.deviceService.UpdateAreaController(acID, &req)
resp, err := c.deviceService.UpdateAreaController(uint(id), &req)
if err != nil {
if errors.Is(err, gorm.ErrRecordNotFound) {
c.logger.Warnf("%s: 区域主控不存在, ID: %s", actionType, acID)
@@ -330,7 +366,13 @@ func (c *Controller) DeleteAreaController(ctx echo.Context) error {
const actionType = "删除区域主控"
acID := ctx.Param("id")
if err := c.deviceService.DeleteAreaController(acID); err != nil {
id, err := strconv.ParseUint(acID, 10, 64)
if err != nil {
c.logger.Errorf("%s: 无效的ID: %s", actionType, acID)
return controller.SendErrorWithAudit(ctx, controller.CodeBadRequest, "无效的ID: "+acID, actionType, "无效的ID", acID)
}
if err := c.deviceService.DeleteAreaController(uint(id)); err != nil {
switch {
case errors.Is(err, gorm.ErrRecordNotFound):
c.logger.Warnf("%s: 区域主控不存在, ID: %s", actionType, acID)
@@ -391,7 +433,13 @@ func (c *Controller) GetDeviceTemplate(ctx echo.Context) error {
const actionType = "获取设备模板"
dtID := ctx.Param("id")
resp, err := c.deviceService.GetDeviceTemplate(dtID)
id, err := strconv.ParseUint(dtID, 10, 64)
if err != nil {
c.logger.Errorf("%s: 无效的ID: %s", actionType, dtID)
return controller.SendErrorWithAudit(ctx, controller.CodeBadRequest, "无效的ID: "+dtID, actionType, "无效的ID", dtID)
}
resp, err := c.deviceService.GetDeviceTemplate(uint(id))
if err != nil {
if errors.Is(err, gorm.ErrRecordNotFound) {
c.logger.Warnf("%s: 设备模板不存在, ID: %s", actionType, dtID)
@@ -446,7 +494,13 @@ func (c *Controller) UpdateDeviceTemplate(ctx echo.Context) error {
return controller.SendErrorWithAudit(ctx, controller.CodeBadRequest, "无效的请求体: "+err.Error(), actionType, "请求体绑定失败", req)
}
resp, err := c.deviceService.UpdateDeviceTemplate(dtID, &req)
id, err := strconv.ParseUint(dtID, 10, 64)
if err != nil {
c.logger.Errorf("%s: 无效的ID: %s", actionType, dtID)
return controller.SendErrorWithAudit(ctx, controller.CodeBadRequest, "无效的ID: "+dtID, actionType, "无效的ID", dtID)
}
resp, err := c.deviceService.UpdateDeviceTemplate(uint(id), &req)
if err != nil {
if errors.Is(err, gorm.ErrRecordNotFound) {
c.logger.Warnf("%s: 设备模板不存在, ID: %s", actionType, dtID)
@@ -473,7 +527,13 @@ func (c *Controller) DeleteDeviceTemplate(ctx echo.Context) error {
const actionType = "删除设备模板"
dtID := ctx.Param("id")
if err := c.deviceService.DeleteDeviceTemplate(dtID); err != nil {
id, err := strconv.ParseUint(dtID, 10, 64)
if err != nil {
c.logger.Errorf("%s: 无效的ID: %s", actionType, dtID)
return controller.SendErrorWithAudit(ctx, controller.CodeBadRequest, "无效的ID: "+dtID, actionType, "无效的ID", dtID)
}
if err := c.deviceService.DeleteDeviceTemplate(uint(id)); err != nil {
switch {
case errors.Is(err, gorm.ErrRecordNotFound):
c.logger.Warnf("%s: 设备模板不存在, ID: %s", actionType, dtID)

107
internal/app/service/device_service.go
View File

@@ -4,7 +4,6 @@ import (
"encoding/json"
"errors"
"fmt"
"strconv"
"git.huangwc.com/pig/pig-farm-controller/internal/app/dto"
"git.huangwc.com/pig/pig-farm-controller/internal/domain/device"
@@ -23,26 +22,27 @@ var (
ErrDeviceTemplateInUse = errors.New("设备模板正在被一个或多个设备使用，无法删除")
)
// DeviceService 定义了应用层的设备服务接口，用于协调设备相关的业务逻辑。
// DeviceService 定义了应用层的设备服务接口，用于协调设备相关的业务逻辑。
type DeviceService interface {
CreateDevice(req *dto.CreateDeviceRequest) (*dto.DeviceResponse, error)
GetDevice(id string) (*dto.DeviceResponse, error)
GetDevice(id uint) (*dto.DeviceResponse, error)
ListDevices() ([]*dto.DeviceResponse, error)
UpdateDevice(id string, req *dto.UpdateDeviceRequest) (*dto.DeviceResponse, error)
DeleteDevice(id string) error
ManualControl(id string, req *dto.ManualControlDeviceRequest) error
UpdateDevice(id uint, req *dto.UpdateDeviceRequest) (*dto.DeviceResponse, error)
DeleteDevice(id uint) error
ManualControl(id uint, req *dto.ManualControlDeviceRequest) error
CreateAreaController(req *dto.CreateAreaControllerRequest) (*dto.AreaControllerResponse, error)
GetAreaController(id string) (*dto.AreaControllerResponse, error)
GetAreaController(id uint) (*dto.AreaControllerResponse, error)
ListAreaControllers() ([]*dto.AreaControllerResponse, error)
UpdateAreaController(id string, req *dto.UpdateAreaControllerRequest) (*dto.AreaControllerResponse, error)
DeleteAreaController(id string) error
UpdateAreaController(id uint, req *dto.UpdateAreaControllerRequest) (*dto.AreaControllerResponse, error)
DeleteAreaController(id uint) error
CreateDeviceTemplate(req *dto.CreateDeviceTemplateRequest) (*dto.DeviceTemplateResponse, error)
GetDeviceTemplate(id string) (*dto.DeviceTemplateResponse, error)
GetDeviceTemplate(id uint) (*dto.DeviceTemplateResponse, error)
ListDeviceTemplates() ([]*dto.DeviceTemplateResponse, error)
UpdateDeviceTemplate(id string, req *dto.UpdateDeviceTemplateRequest) (*dto.DeviceTemplateResponse, error)
DeleteDeviceTemplate(id string) error
UpdateDeviceTemplate(id uint, req *dto.UpdateDeviceTemplateRequest) (*dto.DeviceTemplateResponse, error)
DeleteDeviceTemplate(id uint) error
}
// deviceService 是 DeviceService 接口的具体实现。
@@ -100,8 +100,8 @@ func (s *deviceService) CreateDevice(req *dto.CreateDeviceRequest) (*dto.DeviceR
return dto.NewDeviceResponse(createdDevice)
}
func (s *deviceService) GetDevice(id string) (*dto.DeviceResponse, error) {
device, err := s.deviceRepo.FindByIDString(id)
func (s *deviceService) GetDevice(id uint) (*dto.DeviceResponse, error) {
device, err := s.deviceRepo.FindByID(id)
if err != nil {
return nil, err
}
@@ -116,8 +116,8 @@ func (s *deviceService) ListDevices() ([]*dto.DeviceResponse, error) {
return dto.NewListDeviceResponse(devices)
}
func (s *deviceService) UpdateDevice(id string, req *dto.UpdateDeviceRequest) (*dto.DeviceResponse, error) {
existingDevice, err := s.deviceRepo.FindByIDString(id)
func (s *deviceService) UpdateDevice(id uint, req *dto.UpdateDeviceRequest) (*dto.DeviceResponse, error) {
existingDevice, err := s.deviceRepo.FindByID(id)
if err != nil {
return nil, err
}
@@ -149,21 +149,16 @@ func (s *deviceService) UpdateDevice(id string, req *dto.UpdateDeviceRequest) (*
return dto.NewDeviceResponse(updatedDevice)
}
func (s *deviceService) DeleteDevice(id string) error {
idUint, err := strconv.ParseUint(id, 10, 64)
if err != nil {
return err
}
deviceID := uint(idUint)
func (s *deviceService) DeleteDevice(id uint) error {
// 检查设备是否存在
_, err = s.deviceRepo.FindByID(deviceID)
_, err := s.deviceRepo.FindByID(id)
if err != nil {
return err // 如果未找到，会返回 gorm.ErrRecordNotFound
}
// 在删除前检查设备是否被任务使用
inUse, err := s.deviceRepo.IsDeviceInUse(deviceID)
inUse, err := s.deviceRepo.IsDeviceInUse(id)
if err != nil {
// 如果检查过程中发生数据库错误，则返回错误
return fmt.Errorf("检查设备使用情况失败: %w", err)
@@ -174,11 +169,11 @@ func (s *deviceService) DeleteDevice(id string) error {
}
// 只有在未被使用时，才执行删除操作
return s.deviceRepo.Delete(deviceID)
return s.deviceRepo.Delete(id)
}
func (s *deviceService) ManualControl(id string, req *dto.ManualControlDeviceRequest) error {
dev, err := s.deviceRepo.FindByIDString(id)
func (s *deviceService) ManualControl(id uint, req *dto.ManualControlDeviceRequest) error {
dev, err := s.deviceRepo.FindByID(id)
if err != nil {
return err
}
@@ -225,12 +220,8 @@ func (s *deviceService) CreateAreaController(req *dto.CreateAreaControllerReques
return dto.NewAreaControllerResponse(ac)
}
func (s *deviceService) GetAreaController(id string) (*dto.AreaControllerResponse, error) {
idUint, err := strconv.ParseUint(id, 10, 64)
if err != nil {
return nil, err
}
ac, err := s.areaControllerRepo.FindByID(uint(idUint))
func (s *deviceService) GetAreaController(id uint) (*dto.AreaControllerResponse, error) {
ac, err := s.areaControllerRepo.FindByID(id)
if err != nil {
return nil, err
}
@@ -245,13 +236,8 @@ func (s *deviceService) ListAreaControllers() ([]*dto.AreaControllerResponse, er
return dto.NewListAreaControllerResponse(acs)
}
func (s *deviceService) UpdateAreaController(id string, req *dto.UpdateAreaControllerRequest) (*dto.AreaControllerResponse, error) {
idUint, err := strconv.ParseUint(id, 10, 64)
if err != nil {
return nil, err
}
existingAC, err := s.areaControllerRepo.FindByID(uint(idUint))
func (s *deviceService) UpdateAreaController(id uint, req *dto.UpdateAreaControllerRequest) (*dto.AreaControllerResponse, error) {
existingAC, err := s.areaControllerRepo.FindByID(id)
if err != nil {
return nil, err
}
@@ -277,21 +263,16 @@ func (s *deviceService) UpdateAreaController(id string, req *dto.UpdateAreaContr
return dto.NewAreaControllerResponse(existingAC)
}
func (s *deviceService) DeleteAreaController(id string) error {
idUint, err := strconv.ParseUint(id, 10, 64)
if err != nil {
return fmt.Errorf("无效的ID格式: %w", err)
}
acID := uint(idUint)
func (s *deviceService) DeleteAreaController(id uint) error {
// 1. 检查是否存在
_, err = s.areaControllerRepo.FindByID(acID)
_, err := s.areaControllerRepo.FindByID(id)
if err != nil {
return err // 如果未找到，gorm会返回 ErrRecordNotFound
}
// 2. 检查是否被使用（业务逻辑）
inUse, err := s.deviceRepo.IsAreaControllerInUse(acID)
inUse, err := s.deviceRepo.IsAreaControllerInUse(id)
if err != nil {
return err // 返回数据库检查错误
}
@@ -300,7 +281,7 @@ func (s *deviceService) DeleteAreaController(id string) error {
}
// 3. 执行删除
return s.areaControllerRepo.Delete(acID)
return s.areaControllerRepo.Delete(id)
}
// --- Device Templates ---
@@ -336,12 +317,8 @@ func (s *deviceService) CreateDeviceTemplate(req *dto.CreateDeviceTemplateReques
return dto.NewDeviceTemplateResponse(deviceTemplate)
}
func (s *deviceService) GetDeviceTemplate(id string) (*dto.DeviceTemplateResponse, error) {
idUint, err := strconv.ParseUint(id, 10, 64)
if err != nil {
return nil, err
}
deviceTemplate, err := s.deviceTemplateRepo.FindByID(uint(idUint))
func (s *deviceService) GetDeviceTemplate(id uint) (*dto.DeviceTemplateResponse, error) {
deviceTemplate, err := s.deviceTemplateRepo.FindByID(id)
if err != nil {
return nil, err
}
@@ -356,13 +333,8 @@ func (s *deviceService) ListDeviceTemplates() ([]*dto.DeviceTemplateResponse, er
return dto.NewListDeviceTemplateResponse(deviceTemplates)
}
func (s *deviceService) UpdateDeviceTemplate(id string, req *dto.UpdateDeviceTemplateRequest) (*dto.DeviceTemplateResponse, error) {
idUint, err := strconv.ParseUint(id, 10, 64)
if err != nil {
return nil, err
}
existingDeviceTemplate, err := s.deviceTemplateRepo.FindByID(uint(idUint))
func (s *deviceService) UpdateDeviceTemplate(id uint, req *dto.UpdateDeviceTemplateRequest) (*dto.DeviceTemplateResponse, error) {
existingDeviceTemplate, err := s.deviceTemplateRepo.FindByID(id)
if err != nil {
return nil, err
}
@@ -395,21 +367,16 @@ func (s *deviceService) UpdateDeviceTemplate(id string, req *dto.UpdateDeviceTem
return dto.NewDeviceTemplateResponse(existingDeviceTemplate)
}
func (s *deviceService) DeleteDeviceTemplate(id string) error {
idUint, err := strconv.ParseUint(id, 10, 64)
if err != nil {
return fmt.Errorf("无效的ID格式: %w", err)
}
dtID := uint(idUint)
func (s *deviceService) DeleteDeviceTemplate(id uint) error {
// 1. 检查是否存在
_, err = s.deviceTemplateRepo.FindByID(dtID)
_, err := s.deviceTemplateRepo.FindByID(id)
if err != nil {
return err
}
// 2. 检查是否被使用（业务逻辑）
inUse, err := s.deviceTemplateRepo.IsInUse(dtID)
inUse, err := s.deviceTemplateRepo.IsInUse(id)
if err != nil {
return err
}
@@ -418,5 +385,5 @@ func (s *deviceService) DeleteDeviceTemplate(id string) error {
}
// 3. 执行删除
return s.deviceTemplateRepo.Delete(dtID)
return s.deviceTemplateRepo.Delete(id)
}