实现任务2.2

internal/app/controller/device/device_controller.go

@@ -1,44 +1,30 @@
 package device
 
 import (
-	"encoding/json"
 	"errors"
-	"strconv"
-	"strings"
 
 	"git.huangwc.com/pig/pig-farm-controller/internal/app/controller"
 	"git.huangwc.com/pig/pig-farm-controller/internal/app/dto"
-	"git.huangwc.com/pig/pig-farm-controller/internal/domain/device"
+	"git.huangwc.com/pig/pig-farm-controller/internal/app/service"
 	"git.huangwc.com/pig/pig-farm-controller/internal/infra/logs"
-	"git.huangwc.com/pig/pig-farm-controller/internal/infra/models"
-	"git.huangwc.com/pig/pig-farm-controller/internal/infra/repository"
 	"github.com/labstack/echo/v4"
 	"gorm.io/gorm"
 )
 
 // Controller 设备控制器，封装了所有与设备和区域主控相关的业务逻辑
 type Controller struct {
-	deviceRepo         repository.DeviceRepository
-	areaControllerRepo repository.AreaControllerRepository
-	deviceTemplateRepo repository.DeviceTemplateRepository
-	deviceService      device.Service
-	logger             *logs.Logger
+	deviceService service.DeviceService
+	logger        *logs.Logger
 }
 
 // NewController 创建一个新的设备控制器实例
 func NewController(
-	deviceRepo repository.DeviceRepository,
-	areaControllerRepo repository.AreaControllerRepository,
-	deviceTemplateRepo repository.DeviceTemplateRepository,
-	deviceService device.Service,
+	deviceService service.DeviceService,
 	logger *logs.Logger,
 ) *Controller {
 	return &Controller{
-		deviceRepo:         deviceRepo,
-		areaControllerRepo: areaControllerRepo,
-		deviceTemplateRepo: deviceTemplateRepo,
-		deviceService:      deviceService,
-		logger:             logger,
+		deviceService: deviceService,
+		logger:        logger,
 	}
 }
 
@@ -62,43 +48,13 @@ func (c *Controller) CreateDevice(ctx echo.Context) error {
 		return controller.SendErrorWithAudit(ctx, controller.CodeBadRequest, "无效的请求体: "+err.Error(), actionType, "请求体绑定失败", req)
 	}
 
-	propertiesJSON, err := json.Marshal(req.Properties)
+	resp, err := c.deviceService.CreateDevice(&req)
 	if err != nil {
-		c.logger.Errorf("%s: 序列化属性失败: %v", actionType, err)
-		return controller.SendErrorWithAudit(ctx, controller.CodeBadRequest, "属性字段格式错误", actionType, "属性序列化失败", req.Properties)
+		c.logger.Errorf("%s: 服务层创建失败: %v", actionType, err)
+		return controller.SendErrorWithAudit(ctx, controller.CodeInternalError, "创建设备失败: "+err.Error(), actionType, "服务层创建失败", req)
 	}
 
-	device := &models.Device{
-		Name:             req.Name,
-		DeviceTemplateID: req.DeviceTemplateID,
-		AreaControllerID: req.AreaControllerID,
-		Location:         req.Location,
-		Properties:       propertiesJSON,
-	}
-
-	if err := device.SelfCheck(); err != nil {
-		c.logger.Errorf("%s: 设备属性自检失败: %v", actionType, err)
-		return controller.SendErrorWithAudit(ctx, controller.CodeBadRequest, "设备属性不符合要求: "+err.Error(), actionType, "设备属性自检失败", device)
-	}
-
-	if err := c.deviceRepo.Create(device); err != nil {
-		c.logger.Errorf("%s: 数据库操作失败: %v", actionType, err)
-		return controller.SendErrorWithAudit(ctx, controller.CodeInternalError, "创建设备失败: "+err.Error(), actionType, "数据库创建失败", device)
-	}
-
-	createdDevice, err := c.deviceRepo.FindByID(device.ID)
-	if err != nil {
-		c.logger.Errorf("%s: 重新加载创建的设备失败: %v", actionType, err)
-		return controller.SendErrorWithAudit(ctx, controller.CodeInternalError, "设备创建成功，但重新加载设备失败", actionType, "重新加载设备失败", device)
-	}
-
-	resp, err := dto.NewDeviceResponse(createdDevice)
-	if err != nil {
-		c.logger.Errorf("%s: 序列化响应失败: %v, Device: %+v", actionType, err, createdDevice)
-		return controller.SendErrorWithAudit(ctx, controller.CodeInternalError, "设备创建成功，但响应生成失败", actionType, "响应序列化失败", createdDevice)
-	}
-
-	c.logger.Infof("%s: 设备创建成功, ID: %d", actionType, device.ID)
+	c.logger.Infof("%s: 设备创建成功, ID: %d", actionType, resp.ID)
 	return controller.SendSuccessWithAudit(ctx, controller.CodeCreated, "设备创建成功", resp, actionType, "设备创建成功", resp)
 }
 
@@ -115,32 +71,17 @@ func (c *Controller) GetDevice(ctx echo.Context) error {
 	const actionType = "获取设备"
 	deviceID := ctx.Param("id")
 
-	if deviceID == "" {
-		c.logger.Errorf("%s: 设备ID为空", actionType)
-		return controller.SendErrorWithAudit(ctx, controller.CodeBadRequest, "设备ID不能为空", actionType, "设备ID为空", nil)
-	}
-
-	device, err := c.deviceRepo.FindByIDString(deviceID)
+	resp, err := c.deviceService.GetDevice(deviceID)
 	if err != nil {
 		if errors.Is(err, gorm.ErrRecordNotFound) {
 			c.logger.Warnf("%s: 设备不存在, ID: %s", actionType, deviceID)
 			return controller.SendErrorWithAudit(ctx, controller.CodeNotFound, "设备未找到", actionType, "设备不存在", deviceID)
 		}
-		if strings.Contains(err.Error(), "无效的设备ID格式") {
-			c.logger.Errorf("%s: 设备ID格式错误: %v, ID: %s", actionType, err, deviceID)
-			return controller.SendErrorWithAudit(ctx, controller.CodeBadRequest, err.Error(), actionType, "设备ID格式错误", deviceID)
-		}
-		c.logger.Errorf("%s: 数据库查询失败: %v, ID: %s", actionType, err, deviceID)
-		return controller.SendErrorWithAudit(ctx, controller.CodeInternalError, "获取设备信息失败: "+err.Error(), actionType, "数据库查询失败", deviceID)
+		c.logger.Errorf("%s: 服务层获取失败: %v, ID: %s", actionType, err, deviceID)
+		return controller.SendErrorWithAudit(ctx, controller.CodeInternalError, "获取设备信息失败: "+err.Error(), actionType, "服务层获取失败", deviceID)
 	}
 
-	resp, err := dto.NewDeviceResponse(device)
-	if err != nil {
-		c.logger.Errorf("%s: 序列化响应失败: %v, Device: %+v", actionType, err, device)
-		return controller.SendErrorWithAudit(ctx, controller.CodeInternalError, "获取设备信息失败: 内部数据格式错误", actionType, "响应序列化失败", device)
-	}
-
-	c.logger.Infof("%s: 获取设备信息成功, ID: %d", actionType, device.ID)
+	c.logger.Infof("%s: 获取设备信息成功, ID: %d", actionType, resp.ID)
 	return controller.SendSuccessWithAudit(ctx, controller.CodeSuccess, "获取设备信息成功", resp, actionType, "获取设备信息成功", resp)
 }
 
@@ -154,19 +95,13 @@ func (c *Controller) GetDevice(ctx echo.Context) error {
 // @Router       /api/v1/devices [get]
 func (c *Controller) ListDevices(ctx echo.Context) error {
 	const actionType = "获取设备列表"
-	devices, err := c.deviceRepo.ListAll()
+	resp, err := c.deviceService.ListDevices()
 	if err != nil {
-		c.logger.Errorf("%s: 数据库查询失败: %v", actionType, err)
-		return controller.SendErrorWithAudit(ctx, controller.CodeInternalError, "获取设备列表失败: "+err.Error(), actionType, "数据库查询失败", nil)
+		c.logger.Errorf("%s: 服务层获取列表失败: %v", actionType, err)
+		return controller.SendErrorWithAudit(ctx, controller.CodeInternalError, "获取设备列表失败: "+err.Error(), actionType, "服务层获取列表失败", nil)
 	}
 
-	resp, err := dto.NewListDeviceResponse(devices)
-	if err != nil {
-		c.logger.Errorf("%s: 序列化响应失败: %v, Devices: %+v", actionType, err, devices)
-		return controller.SendErrorWithAudit(ctx, controller.CodeInternalError, "获取设备列表失败: 内部数据格式错误", actionType, "响应序列化失败", devices)
-	}
-
-	c.logger.Infof("%s: 获取设备列表成功, 数量: %d", actionType, len(devices))
+	c.logger.Infof("%s: 获取设备列表成功, 数量: %d", actionType, len(resp))
 	return controller.SendSuccessWithAudit(ctx, controller.CodeSuccess, "获取设备列表成功", resp, actionType, "获取设备列表成功", resp)
 }
 
@@ -185,61 +120,23 @@ func (c *Controller) UpdateDevice(ctx echo.Context) error {
 	const actionType = "更新设备"
 	deviceID := ctx.Param("id")
 
-	existingDevice, err := c.deviceRepo.FindByIDString(deviceID)
-	if err != nil {
-		if errors.Is(err, gorm.ErrRecordNotFound) {
-			c.logger.Warnf("%s: 设备不存在, ID: %s", actionType, deviceID)
-			return controller.SendErrorWithAudit(ctx, controller.CodeNotFound, "设备未找到", actionType, "设备不存在", deviceID)
-		}
-		if strings.Contains(err.Error(), "无效的设备ID格式") {
-			c.logger.Errorf("%s: 设备ID格式错误: %v, ID: %s", actionType, err, deviceID)
-			return controller.SendErrorWithAudit(ctx, controller.CodeBadRequest, err.Error(), actionType, "设备ID格式错误", deviceID)
-		}
-		c.logger.Errorf("%s: 数据库查询失败: %v, ID: %s", actionType, err, deviceID)
-		return controller.SendErrorWithAudit(ctx, controller.CodeInternalError, "更新设备失败: "+err.Error(), actionType, "数据库查询失败", deviceID)
-	}
-
 	var req dto.UpdateDeviceRequest
 	if err := ctx.Bind(&req); err != nil {
 		c.logger.Errorf("%s: 参数绑定失败: %v", actionType, err)
 		return controller.SendErrorWithAudit(ctx, controller.CodeBadRequest, "无效的请求体: "+err.Error(), actionType, "请求体绑定失败", req)
 	}
 
-	propertiesJSON, err := json.Marshal(req.Properties)
+	resp, err := c.deviceService.UpdateDevice(deviceID, &req)
 	if err != nil {
-		c.logger.Errorf("%s: 序列化属性失败: %v", actionType, err)
-		return controller.SendErrorWithAudit(ctx, controller.CodeBadRequest, "属性字段格式错误", actionType, "属性序列化失败", req.Properties)
+		if errors.Is(err, gorm.ErrRecordNotFound) {
+			c.logger.Warnf("%s: 设备不存在, ID: %s", actionType, deviceID)
+			return controller.SendErrorWithAudit(ctx, controller.CodeNotFound, "设备未找到", actionType, "设备不存在", deviceID)
+		}
+		c.logger.Errorf("%s: 服务层更新失败: %v, ID: %s", actionType, err, deviceID)
+		return controller.SendErrorWithAudit(ctx, controller.CodeInternalError, "更新设备失败: "+err.Error(), actionType, "服务层更新失败", deviceID)
 	}
 
-	existingDevice.Name = req.Name
-	existingDevice.DeviceTemplateID = req.DeviceTemplateID
-	existingDevice.AreaControllerID = req.AreaControllerID
-	existingDevice.Location = req.Location
-	existingDevice.Properties = propertiesJSON
-
-	if err := existingDevice.SelfCheck(); err != nil {
-		c.logger.Errorf("%s: 设备属性自检失败: %v", actionType, err)
-		return controller.SendErrorWithAudit(ctx, controller.CodeBadRequest, "设备属性不符合要求: "+err.Error(), actionType, "设备属性自检失败", existingDevice)
-	}
-
-	if err := c.deviceRepo.Update(existingDevice); err != nil {
-		c.logger.Errorf("%s: 数据库更新失败: %v, Device: %+v", actionType, err, existingDevice)
-		return controller.SendErrorWithAudit(ctx, controller.CodeInternalError, "更新设备失败: "+err.Error(), actionType, "数据库更新失败", deviceID)
-	}
-
-	updatedDevice, err := c.deviceRepo.FindByID(existingDevice.ID)
-	if err != nil {
-		c.logger.Errorf("%s: 重新加载更新的设备失败: %v", actionType, err)
-		return controller.SendErrorWithAudit(ctx, controller.CodeInternalError, "设备更新成功，但重新加载设备失败", actionType, "重新加载设备失败", existingDevice)
-	}
-
-	resp, err := dto.NewDeviceResponse(updatedDevice)
-	if err != nil {
-		c.logger.Errorf("%s: 序列化响应失败: %v, Device: %+v", actionType, err, updatedDevice)
-		return controller.SendErrorWithAudit(ctx, controller.CodeInternalError, "设备更新成功，但响应生成失败", actionType, "响应序列化失败", updatedDevice)
-	}
-
-	c.logger.Infof("%s: 设备更新成功, ID: %d", actionType, existingDevice.ID)
+	c.logger.Infof("%s: 设备更新成功, ID: %d", actionType, resp.ID)
 	return controller.SendSuccessWithAudit(ctx, controller.CodeSuccess, "设备更新成功", resp, actionType, "设备更新成功", resp)
 }
 
@@ -256,28 +153,16 @@ func (c *Controller) DeleteDevice(ctx echo.Context) error {
 	const actionType = "删除设备"
 	deviceID := ctx.Param("id")
 
-	idUint, err := strconv.ParseUint(deviceID, 10, 64)
-	if err != nil {
-		c.logger.Errorf("%s: 设备ID格式错误: %v, ID: %s", actionType, err, deviceID)
-		return controller.SendErrorWithAudit(ctx, controller.CodeBadRequest, "无效的设备ID格式", actionType, "设备ID格式错误", deviceID)
-	}
-
-	_, err = c.deviceRepo.FindByIDString(deviceID)
-	if err != nil {
+	if err := c.deviceService.DeleteDevice(deviceID); err != nil {
 		if errors.Is(err, gorm.ErrRecordNotFound) {
 			c.logger.Warnf("%s: 设备不存在, ID: %s", actionType, deviceID)
 			return controller.SendErrorWithAudit(ctx, controller.CodeNotFound, "设备未找到", actionType, "设备不存在", deviceID)
 		}
-		c.logger.Errorf("%s: 查找设备失败: %v, ID: %s", actionType, err, deviceID)
-		return controller.SendErrorWithAudit(ctx, controller.CodeInternalError, "删除设备失败: 查找设备时发生内部错误", actionType, "数据库查询失败", deviceID)
+		c.logger.Errorf("%s: 服务层删除失败: %v, ID: %s", actionType, err, deviceID)
+		return controller.SendErrorWithAudit(ctx, controller.CodeInternalError, "删除设备失败: "+err.Error(), actionType, "服务层删除失败", deviceID)
 	}
 
-	if err := c.deviceRepo.Delete(uint(idUint)); err != nil {
-		c.logger.Errorf("%s: 数据库删除失败: %v, ID: %d", actionType, err, idUint)
-		return controller.SendErrorWithAudit(ctx, controller.CodeInternalError, "删除设备失败: "+err.Error(), actionType, "数据库删除失败", deviceID)
-	}
-
-	c.logger.Infof("%s: 设备删除成功, ID: %d", actionType, idUint)
+	c.logger.Infof("%s: 设备删除成功, ID: %s", actionType, deviceID)
 	return controller.SendSuccessWithAudit(ctx, controller.CodeSuccess, "设备删除成功", nil, actionType, "设备删除成功", deviceID)
 }
 
@@ -302,45 +187,16 @@ func (c *Controller) ManualControl(ctx echo.Context) error {
 		return controller.SendErrorWithAudit(ctx, controller.CodeBadRequest, "无效的请求体: "+err.Error(), actionType, "请求体绑定失败", req)
 	}
 
-	dev, err := c.deviceRepo.FindByIDString(deviceID)
-	if err != nil {
+	if err := c.deviceService.ManualControl(deviceID, &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)
 		}
-		if strings.Contains(err.Error(), "无效的设备ID格式") {
-			c.logger.Errorf("%s: 设备ID格式错误: %v, ID: %s", actionType, err, deviceID)
-			return controller.SendErrorWithAudit(ctx, controller.CodeBadRequest, err.Error(), actionType, "设备ID格式错误", deviceID)
-		}
-		c.logger.Errorf("%s: 数据库查询失败: %v, ID: %s", actionType, err, deviceID)
-		return controller.SendErrorWithAudit(ctx, controller.CodeInternalError, "手动控制失败: "+err.Error(), actionType, "数据库查询失败", deviceID)
+		c.logger.Errorf("%s: 服务层手动控制失败: %v, ID: %s", actionType, err, deviceID)
+		return controller.SendErrorWithAudit(ctx, controller.CodeInternalError, "手动控制失败: "+err.Error(), actionType, "服务层手动控制失败", deviceID)
 	}
 
-	c.logger.Infof("%s: 接收到指令, 设备ID: %s, 动作: %s", actionType, deviceID, req.Action)
-	if req.Action == nil {
-		err = c.deviceService.Collect(dev.AreaControllerID, []*models.Device{dev})
-		if err != nil {
-			c.logger.Errorf("%s: 获取设备状态失败: %v, 设备ID: %s", actionType, err, deviceID)
-			return controller.SendErrorWithAudit(ctx, controller.CodeInternalError, "获取设备状态失败: "+err.Error(), actionType, "获取设备状态失败", deviceID)
-		}
-	} else {
-		action := device.DeviceActionStart
-		switch *req.Action {
-		case "off":
-			action = device.DeviceActionStop
-		case "on":
-		default:
-			c.logger.Errorf("%s: 无效的动作: %s, 设备ID: %s", actionType, *req.Action, deviceID)
-			return controller.SendErrorWithAudit(ctx, controller.CodeBadRequest, "无效的动作: "+*req.Action, actionType, "无效的动作", req.Action)
-		}
-		err = c.deviceService.Switch(dev, action)
-		if err != nil {
-			c.logger.Errorf("%s: 设备控制失败: %v, 设备ID: %s", actionType, err, deviceID)
-			return controller.SendErrorWithAudit(ctx, controller.CodeInternalError, "设备控制失败: "+err.Error(), actionType, "设备控制失败", deviceID)
-		}
-	}
-
-	return controller.SendSuccessWithAudit(ctx, controller.CodeSuccess, "指令已发送", map[string]interface{}{"device_id": deviceID}, actionType, "指令发送成功", map[string]interface{}{"device_id": deviceID, "action": req.Action})
+	return controller.SendSuccessWithAudit(ctx, controller.CodeSuccess, "指令已发送", nil, actionType, "指令发送成功", nil)
 }
 
 // --- Controller Methods: Area Controllers ---
@@ -363,36 +219,13 @@ func (c *Controller) CreateAreaController(ctx echo.Context) error {
 		return controller.SendErrorWithAudit(ctx, controller.CodeBadRequest, "无效的请求体: "+err.Error(), actionType, "请求体绑定失败", req)
 	}
 
-	propertiesJSON, err := json.Marshal(req.Properties)
+	resp, err := c.deviceService.CreateAreaController(&req)
 	if err != nil {
-		c.logger.Errorf("%s: 序列化属性失败: %v", actionType, err)
-		return controller.SendErrorWithAudit(ctx, controller.CodeBadRequest, "属性字段格式错误", actionType, "属性序列化失败", req.Properties)
+		c.logger.Errorf("%s: 服务层创建失败: %v", actionType, err)
+		return controller.SendErrorWithAudit(ctx, controller.CodeInternalError, "创建区域主控失败: "+err.Error(), actionType, "服务层创建失败", req)
 	}
 
-	ac := &models.AreaController{
-		Name:       req.Name,
-		NetworkID:  req.NetworkID,
-		Location:   req.Location,
-		Properties: propertiesJSON,
-	}
-
-	if err := ac.SelfCheck(); err != nil {
-		c.logger.Errorf("%s: 区域主控自检失败: %v", actionType, err)
-		return controller.SendErrorWithAudit(ctx, controller.CodeBadRequest, "区域主控参数不符合要求: "+err.Error(), actionType, "区域主控自检失败", ac)
-	}
-
-	if err := c.areaControllerRepo.Create(ac); err != nil {
-		c.logger.Errorf("%s: 数据库操作失败: %v", actionType, err)
-		return controller.SendErrorWithAudit(ctx, controller.CodeInternalError, "创建区域主控失败: "+err.Error(), actionType, "数据库创建失败", ac)
-	}
-
-	resp, err := dto.NewAreaControllerResponse(ac)
-	if err != nil {
-		c.logger.Errorf("%s: 序列化响应失败: %v", actionType, err)
-		return controller.SendErrorWithAudit(ctx, controller.CodeInternalError, "区域主控创建成功，但响应生成失败", actionType, "响应序列化失败", ac)
-	}
-
-	c.logger.Infof("%s: 区域主控创建成功, ID: %d", actionType, ac.ID)
+	c.logger.Infof("%s: 区域主控创建成功, ID: %d", actionType, resp.ID)
 	return controller.SendSuccessWithAudit(ctx, controller.CodeCreated, "区域主控创建成功", resp, actionType, "区域主控创建成功", resp)
 }
 
@@ -409,29 +242,17 @@ func (c *Controller) GetAreaController(ctx echo.Context) error {
 	const actionType = "获取区域主控"
 	acID := ctx.Param("id")
 
-	idUint, err := strconv.ParseUint(acID, 10, 64)
-	if err != nil {
-		c.logger.Errorf("%s: 区域主控ID格式错误: %v, ID: %s", actionType, err, acID)
-		return controller.SendErrorWithAudit(ctx, controller.CodeBadRequest, "无效的区域主控ID格式", actionType, "ID格式错误", acID)
-	}
-
-	ac, err := c.areaControllerRepo.FindByID(uint(idUint))
+	resp, err := c.deviceService.GetAreaController(acID)
 	if err != nil {
 		if errors.Is(err, gorm.ErrRecordNotFound) {
 			c.logger.Warnf("%s: 区域主控不存在, ID: %s", actionType, acID)
 			return controller.SendErrorWithAudit(ctx, controller.CodeNotFound, "区域主控未找到", actionType, "区域主控不存在", acID)
 		}
-		c.logger.Errorf("%s: 数据库查询失败: %v, ID: %s", actionType, err, acID)
-		return controller.SendErrorWithAudit(ctx, controller.CodeInternalError, "获取区域主控信息失败: "+err.Error(), actionType, "数据库查询失败", acID)
+		c.logger.Errorf("%s: 服务层获取失败: %v, ID: %s", actionType, err, acID)
+		return controller.SendErrorWithAudit(ctx, controller.CodeInternalError, "获取区域主控信息失败: "+err.Error(), actionType, "服务层获取失败", acID)
 	}
 
-	resp, err := dto.NewAreaControllerResponse(ac)
-	if err != nil {
-		c.logger.Errorf("%s: 序列化响应失败: %v, AreaController: %+v", actionType, err, ac)
-		return controller.SendErrorWithAudit(ctx, controller.CodeInternalError, "获取区域主控信息失败: 内部数据格式错误", actionType, "响应序列化失败", ac)
-	}
-
-	c.logger.Infof("%s: 获取区域主控信息成功, ID: %d", actionType, ac.ID)
+	c.logger.Infof("%s: 获取区域主控信息成功, ID: %d", actionType, resp.ID)
 	return controller.SendSuccessWithAudit(ctx, controller.CodeSuccess, "获取区域主控信息成功", resp, actionType, "获取区域主控信息成功", resp)
 }
 
@@ -445,19 +266,13 @@ func (c *Controller) GetAreaController(ctx echo.Context) error {
 // @Router       /api/v1/area-controllers [get]
 func (c *Controller) ListAreaControllers(ctx echo.Context) error {
 	const actionType = "获取区域主控列表"
-	acs, err := c.areaControllerRepo.ListAll()
+	resp, err := c.deviceService.ListAreaControllers()
 	if err != nil {
-		c.logger.Errorf("%s: 数据库查询失败: %v", actionType, err)
-		return controller.SendErrorWithAudit(ctx, controller.CodeInternalError, "获取区域主控列表失败: "+err.Error(), actionType, "数据库查询失败", nil)
+		c.logger.Errorf("%s: 服务层获取列表失败: %v", actionType, err)
+		return controller.SendErrorWithAudit(ctx, controller.CodeInternalError, "获取区域主控列表失败: "+err.Error(), actionType, "服务层获取列表失败", nil)
 	}
 
-	resp, err := dto.NewListAreaControllerResponse(acs)
-	if err != nil {
-		c.logger.Errorf("%s: 序列化响应失败: %v, AreaControllers: %+v", actionType, err, acs)
-		return controller.SendErrorWithAudit(ctx, controller.CodeInternalError, "获取区域主控列表失败: 内部数据格式错误", actionType, "响应序列化失败", acs)
-	}
-
-	c.logger.Infof("%s: 获取区域主控列表成功, 数量: %d", actionType, len(acs))
+	c.logger.Infof("%s: 获取区域主控列表成功, 数量: %d", actionType, len(resp))
 	return controller.SendSuccessWithAudit(ctx, controller.CodeSuccess, "获取区域主控列表成功", resp, actionType, "获取区域主控列表成功", resp)
 }
 
@@ -476,56 +291,23 @@ func (c *Controller) UpdateAreaController(ctx echo.Context) error {
 	const actionType = "更新区域主控"
 	acID := ctx.Param("id")
 
-	idUint, err := strconv.ParseUint(acID, 10, 64)
-	if err != nil {
-		c.logger.Errorf("%s: 区域主控ID格式错误: %v, ID: %s", actionType, err, acID)
-		return controller.SendErrorWithAudit(ctx, controller.CodeBadRequest, "无效的区域主控ID格式", actionType, "ID格式错误", acID)
-	}
-
-	existingAC, err := c.areaControllerRepo.FindByID(uint(idUint))
-	if err != nil {
-		if errors.Is(err, gorm.ErrRecordNotFound) {
-			c.logger.Warnf("%s: 区域主控不存在, ID: %s", actionType, acID)
-			return controller.SendErrorWithAudit(ctx, controller.CodeNotFound, "区域主控未找到", actionType, "区域主控不存在", acID)
-		}
-		c.logger.Errorf("%s: 数据库查询失败: %v, ID: %s", actionType, err, acID)
-		return controller.SendErrorWithAudit(ctx, controller.CodeInternalError, "更新区域主控失败: "+err.Error(), actionType, "数据库查询失败", acID)
-	}
-
 	var req dto.UpdateAreaControllerRequest
 	if err := ctx.Bind(&req); err != nil {
 		c.logger.Errorf("%s: 参数绑定失败: %v", actionType, err)
 		return controller.SendErrorWithAudit(ctx, controller.CodeBadRequest, "无效的请求体: "+err.Error(), actionType, "请求体绑定失败", req)
 	}
 
-	propertiesJSON, err := json.Marshal(req.Properties)
+	resp, err := c.deviceService.UpdateAreaController(acID, &req)
 	if err != nil {
-		c.logger.Errorf("%s: 序列化属性失败: %v", actionType, err)
-		return controller.SendErrorWithAudit(ctx, controller.CodeBadRequest, "属性字段格式错误", actionType, "属性序列化失败", req.Properties)
+		if errors.Is(err, gorm.ErrRecordNotFound) {
+			c.logger.Warnf("%s: 区域主控不存在, ID: %s", actionType, acID)
+			return controller.SendErrorWithAudit(ctx, controller.CodeNotFound, "区域主控未找到", actionType, "区域主控不存在", acID)
+		}
+		c.logger.Errorf("%s: 服务层更新失败: %v, ID: %s", actionType, err, acID)
+		return controller.SendErrorWithAudit(ctx, controller.CodeInternalError, "更新区域主控失败: "+err.Error(), actionType, "服务层更新失败", acID)
 	}
 
-	existingAC.Name = req.Name
-	existingAC.NetworkID = req.NetworkID
-	existingAC.Location = req.Location
-	existingAC.Properties = propertiesJSON
-
-	if err := existingAC.SelfCheck(); err != nil {
-		c.logger.Errorf("%s: 区域主控自检失败: %v", actionType, err)
-		return controller.SendErrorWithAudit(ctx, controller.CodeBadRequest, "区域主控参数不符合要求: "+err.Error(), actionType, "区域主控自检失败", existingAC)
-	}
-
-	if err := c.areaControllerRepo.Update(existingAC); err != nil {
-		c.logger.Errorf("%s: 数据库更新失败: %v, AreaController: %+v", actionType, err, existingAC)
-		return controller.SendErrorWithAudit(ctx, controller.CodeInternalError, "更新区域主控失败: "+err.Error(), actionType, "数据库更新失败", acID)
-	}
-
-	resp, err := dto.NewAreaControllerResponse(existingAC)
-	if err != nil {
-		c.logger.Errorf("%s: 序列化响应失败: %v, AreaController: %+v", actionType, err, existingAC)
-		return controller.SendErrorWithAudit(ctx, controller.CodeInternalError, "区域主控更新成功，但响应生成失败", actionType, "响应序列化失败", existingAC)
-	}
-
-	c.logger.Infof("%s: 区域主控更新成功, ID: %d", actionType, existingAC.ID)
+	c.logger.Infof("%s: 区域主控更新成功, ID: %d", actionType, resp.ID)
 	return controller.SendSuccessWithAudit(ctx, controller.CodeSuccess, "区域主控更新成功", resp, actionType, "区域主控更新成功", resp)
 }
 
@@ -542,28 +324,16 @@ func (c *Controller) DeleteAreaController(ctx echo.Context) error {
 	const actionType = "删除区域主控"
 	acID := ctx.Param("id")
 
-	idUint, err := strconv.ParseUint(acID, 10, 64)
-	if err != nil {
-		c.logger.Errorf("%s: 区域主控ID格式错误: %v, ID: %s", actionType, err, acID)
-		return controller.SendErrorWithAudit(ctx, controller.CodeBadRequest, "无效的区域主控ID格式", actionType, "ID格式错误", acID)
-	}
-
-	_, err = c.areaControllerRepo.FindByID(uint(idUint))
-	if err != nil {
+	if err := c.deviceService.DeleteAreaController(acID); err != nil {
 		if errors.Is(err, gorm.ErrRecordNotFound) {
 			c.logger.Warnf("%s: 区域主控不存在, ID: %s", actionType, acID)
 			return controller.SendErrorWithAudit(ctx, controller.CodeNotFound, "区域主控未找到", actionType, "区域主控不存在", acID)
 		}
-		c.logger.Errorf("%s: 查找区域主控失败: %v, ID: %s", actionType, err, acID)
-		return controller.SendErrorWithAudit(ctx, controller.CodeInternalError, "删除区域主控失败: 查找时发生内部错误", actionType, "数据库查询失败", acID)
+		c.logger.Errorf("%s: 服务层删除失败: %v, ID: %s", actionType, err, acID)
+		return controller.SendErrorWithAudit(ctx, controller.CodeInternalError, "删除区域主控失败: "+err.Error(), actionType, "服务层删除失败", acID)
 	}
 
-	if err := c.areaControllerRepo.Delete(uint(idUint)); err != nil {
-		c.logger.Errorf("%s: 数据库删除失败: %v, ID: %d", actionType, err, idUint)
-		return controller.SendErrorWithAudit(ctx, controller.CodeInternalError, "删除区域主控失败: "+err.Error(), actionType, "数据库删除失败", acID)
-	}
-
-	c.logger.Infof("%s: 区域主控删除成功, ID: %d", actionType, idUint)
+	c.logger.Infof("%s: 区域主控删除成功, ID: %s", actionType, acID)
 	return controller.SendSuccessWithAudit(ctx, controller.CodeSuccess, "区域主控删除成功", nil, actionType, "区域主控删除成功", acID)
 }
 
@@ -587,44 +357,13 @@ func (c *Controller) CreateDeviceTemplate(ctx echo.Context) error {
 		return controller.SendErrorWithAudit(ctx, controller.CodeBadRequest, "无效的请求体: "+err.Error(), actionType, "请求体绑定失败", req)
 	}
 
-	commandsJSON, err := json.Marshal(req.Commands)
+	resp, err := c.deviceService.CreateDeviceTemplate(&req)
 	if err != nil {
-		c.logger.Errorf("%s: 序列化命令失败: %v", actionType, err)
-		return controller.SendErrorWithAudit(ctx, controller.CodeBadRequest, "命令字段格式错误", actionType, "命令序列化失败", req.Commands)
+		c.logger.Errorf("%s: 服务层创建失败: %v", actionType, err)
+		return controller.SendErrorWithAudit(ctx, controller.CodeInternalError, "创建设备模板失败: "+err.Error(), actionType, "服务层创建失败", req)
 	}
 
-	valuesJSON, err := json.Marshal(req.Values)
-	if err != nil {
-		c.logger.Errorf("%s: 序列化值描述符失败: %v", actionType, err)
-		return controller.SendErrorWithAudit(ctx, controller.CodeBadRequest, "值描述符字段格式错误", actionType, "值描述符序列化失败", req.Values)
-	}
-
-	deviceTemplate := &models.DeviceTemplate{
-		Name:         req.Name,
-		Manufacturer: req.Manufacturer,
-		Description:  req.Description,
-		Category:     req.Category,
-		Commands:     commandsJSON,
-		Values:       valuesJSON,
-	}
-
-	if err := deviceTemplate.SelfCheck(); err != nil {
-		c.logger.Errorf("%s: 设备模板自检失败: %v", actionType, err)
-		return controller.SendErrorWithAudit(ctx, controller.CodeBadRequest, "设备模板参数不符合要求: "+err.Error(), actionType, "设备模板自检失败", deviceTemplate)
-	}
-
-	if err := c.deviceTemplateRepo.Create(deviceTemplate); err != nil {
-		c.logger.Errorf("%s: 数据库操作失败: %v", actionType, err)
-		return controller.SendErrorWithAudit(ctx, controller.CodeInternalError, "创建设备模板失败: "+err.Error(), actionType, "数据库创建失败", deviceTemplate)
-	}
-
-	resp, err := dto.NewDeviceTemplateResponse(deviceTemplate)
-	if err != nil {
-		c.logger.Errorf("%s: 序列化响应失败: %v", actionType, err)
-		return controller.SendErrorWithAudit(ctx, controller.CodeInternalError, "设备模板创建成功，但响应生成失败", actionType, "响应序列化失败", deviceTemplate)
-	}
-
-	c.logger.Infof("%s: 设备模板创建成功, ID: %d", actionType, deviceTemplate.ID)
+	c.logger.Infof("%s: 设备模板创建成功, ID: %d", actionType, resp.ID)
 	return controller.SendSuccessWithAudit(ctx, controller.CodeCreated, "设备模板创建成功", resp, actionType, "设备模板创建成功", resp)
 }
 
@@ -641,29 +380,17 @@ func (c *Controller) GetDeviceTemplate(ctx echo.Context) error {
 	const actionType = "获取设备模板"
 	dtID := ctx.Param("id")
 
-	idUint, err := strconv.ParseUint(dtID, 10, 64)
-	if err != nil {
-		c.logger.Errorf("%s: 设备模板ID格式错误: %v, ID: %s", actionType, err, dtID)
-		return controller.SendErrorWithAudit(ctx, controller.CodeBadRequest, "无效的设备模板ID格式", actionType, "ID格式错误", dtID)
-	}
-
-	deviceTemplate, err := c.deviceTemplateRepo.FindByID(uint(idUint))
+	resp, err := c.deviceService.GetDeviceTemplate(dtID)
 	if err != nil {
 		if errors.Is(err, gorm.ErrRecordNotFound) {
 			c.logger.Warnf("%s: 设备模板不存在, ID: %s", actionType, dtID)
 			return controller.SendErrorWithAudit(ctx, controller.CodeNotFound, "设备模板未找到", actionType, "设备模板不存在", dtID)
 		}
-		c.logger.Errorf("%s: 数据库查询失败: %v, ID: %s", actionType, err, dtID)
-		return controller.SendErrorWithAudit(ctx, controller.CodeInternalError, "获取设备模板信息失败: "+err.Error(), actionType, "数据库查询失败", dtID)
+		c.logger.Errorf("%s: 服务层获取失败: %v, ID: %s", actionType, err, dtID)
+		return controller.SendErrorWithAudit(ctx, controller.CodeInternalError, "获取设备模板信息失败: "+err.Error(), actionType, "服务层获取失败", dtID)
 	}
 
-	resp, err := dto.NewDeviceTemplateResponse(deviceTemplate)
-	if err != nil {
-		c.logger.Errorf("%s: 序列化响应失败: %v, DeviceTemplate: %+v", actionType, err, deviceTemplate)
-		return controller.SendErrorWithAudit(ctx, controller.CodeInternalError, "获取设备模板信息失败: 内部数据格式错误", actionType, "响应序列化失败", deviceTemplate)
-	}
-
-	c.logger.Infof("%s: 获取设备模板信息成功, ID: %d", actionType, deviceTemplate.ID)
+	c.logger.Infof("%s: 获取设备模板信息成功, ID: %d", actionType, resp.ID)
 	return controller.SendSuccessWithAudit(ctx, controller.CodeSuccess, "获取设备模板信息成功", resp, actionType, "获取设备模板信息成功", resp)
 }
 
@@ -677,19 +404,13 @@ func (c *Controller) GetDeviceTemplate(ctx echo.Context) error {
 // @Router       /api/v1/device-templates [get]
 func (c *Controller) ListDeviceTemplates(ctx echo.Context) error {
 	const actionType = "获取设备模板列表"
-	deviceTemplates, err := c.deviceTemplateRepo.ListAll()
+	resp, err := c.deviceService.ListDeviceTemplates()
 	if err != nil {
-		c.logger.Errorf("%s: 数据库查询失败: %v", actionType, err)
-		return controller.SendErrorWithAudit(ctx, controller.CodeInternalError, "获取设备模板列表失败: "+err.Error(), actionType, "数据库查询失败", nil)
+		c.logger.Errorf("%s: 服务层获取列表失败: %v", actionType, err)
+		return controller.SendErrorWithAudit(ctx, controller.CodeInternalError, "获取设备模板列表失败: "+err.Error(), actionType, "服务层获取列表失败", nil)
 	}
 
-	resp, err := dto.NewListDeviceTemplateResponse(deviceTemplates)
-	if err != nil {
-		c.logger.Errorf("%s: 序列化响应失败: %v, DeviceTemplates: %+v", actionType, err, deviceTemplates)
-		return controller.SendErrorWithAudit(ctx, controller.CodeInternalError, "获取设备模板列表失败: 内部数据格式错误", actionType, "响应序列化失败", deviceTemplates)
-	}
-
-	c.logger.Infof("%s: 获取设备模板列表成功, 数量: %d", actionType, len(deviceTemplates))
+	c.logger.Infof("%s: 获取设备模板列表成功, 数量: %d", actionType, len(resp))
 	return controller.SendSuccessWithAudit(ctx, controller.CodeSuccess, "获取设备模板列表成功", resp, actionType, "获取设备模板列表成功", resp)
 }
 
@@ -708,64 +429,23 @@ func (c *Controller) UpdateDeviceTemplate(ctx echo.Context) error {
 	const actionType = "更新设备模板"
 	dtID := ctx.Param("id")
 
-	idUint, err := strconv.ParseUint(dtID, 10, 64)
-	if err != nil {
-		c.logger.Errorf("%s: 设备模板ID格式错误: %v, ID: %s", actionType, err, dtID)
-		return controller.SendErrorWithAudit(ctx, controller.CodeBadRequest, "无效的设备模板ID格式", actionType, "ID格式错误", dtID)
-	}
-
-	existingDeviceTemplate, err := c.deviceTemplateRepo.FindByID(uint(idUint))
-	if err != nil {
-		if errors.Is(err, gorm.ErrRecordNotFound) {
-			c.logger.Warnf("%s: 设备模板不存在, ID: %s", actionType, dtID)
-			return controller.SendErrorWithAudit(ctx, controller.CodeNotFound, "设备模板未找到", actionType, "设备模板不存在", dtID)
-		}
-		c.logger.Errorf("%s: 数据库查询失败: %v, ID: %s", actionType, err, dtID)
-		return controller.SendErrorWithAudit(ctx, controller.CodeInternalError, "更新设备模板失败: "+err.Error(), actionType, "数据库查询失败", dtID)
-	}
-
 	var req dto.UpdateDeviceTemplateRequest
 	if err := ctx.Bind(&req); err != nil {
 		c.logger.Errorf("%s: 参数绑定失败: %v", actionType, err)
 		return controller.SendErrorWithAudit(ctx, controller.CodeBadRequest, "无效的请求体: "+err.Error(), actionType, "请求体绑定失败", req)
 	}
 
-	commandsJSON, err := json.Marshal(req.Commands)
+	resp, err := c.deviceService.UpdateDeviceTemplate(dtID, &req)
 	if err != nil {
-		c.logger.Errorf("%s: 序列化命令失败: %v", actionType, err)
-		return controller.SendErrorWithAudit(ctx, controller.CodeBadRequest, "命令字段格式错误", actionType, "命令序列化失败", req.Commands)
+		if errors.Is(err, gorm.ErrRecordNotFound) {
+			c.logger.Warnf("%s: 设备模板不存在, ID: %s", actionType, dtID)
+			return controller.SendErrorWithAudit(ctx, controller.CodeNotFound, "设备模板未找到", actionType, "设备模板不存在", dtID)
+		}
+		c.logger.Errorf("%s: 服务层更新失败: %v, ID: %s", actionType, err, dtID)
+		return controller.SendErrorWithAudit(ctx, controller.CodeInternalError, "更新设备模板失败: "+err.Error(), actionType, "服务层更新失败", dtID)
 	}
 
-	valuesJSON, err := json.Marshal(req.Values)
-	if err != nil {
-		c.logger.Errorf("%s: 序列化值描述符失败: %v", actionType, err)
-		return controller.SendErrorWithAudit(ctx, controller.CodeBadRequest, "值描述符字段格式错误", actionType, "值描述符序列化失败", req.Values)
-	}
-
-	existingDeviceTemplate.Name = req.Name
-	existingDeviceTemplate.Manufacturer = req.Manufacturer
-	existingDeviceTemplate.Description = req.Description
-	existingDeviceTemplate.Category = req.Category
-	existingDeviceTemplate.Commands = commandsJSON
-	existingDeviceTemplate.Values = valuesJSON
-
-	if err := existingDeviceTemplate.SelfCheck(); err != nil {
-		c.logger.Errorf("%s: 设备模板自检失败: %v", actionType, err)
-		return controller.SendErrorWithAudit(ctx, controller.CodeBadRequest, "设备模板参数不符合要求: "+err.Error(), actionType, "设备模板自检失败", existingDeviceTemplate)
-	}
-
-	if err := c.deviceTemplateRepo.Update(existingDeviceTemplate); err != nil {
-		c.logger.Errorf("%s: 数据库更新失败: %v, DeviceTemplate: %+v", actionType, err, existingDeviceTemplate)
-		return controller.SendErrorWithAudit(ctx, controller.CodeInternalError, "更新设备模板失败: "+err.Error(), actionType, "数据库更新失败", dtID)
-	}
-
-	resp, err := dto.NewDeviceTemplateResponse(existingDeviceTemplate)
-	if err != nil {
-		c.logger.Errorf("%s: 序列化响应失败: %v, DeviceTemplate: %+v", actionType, err, existingDeviceTemplate)
-		return controller.SendErrorWithAudit(ctx, controller.CodeInternalError, "设备模板更新成功，但响应生成失败", actionType, "响应序列化失败", existingDeviceTemplate)
-	}
-
-	c.logger.Infof("%s: 设备模板更新成功, ID: %d", actionType, existingDeviceTemplate.ID)
+	c.logger.Infof("%s: 设备模板更新成功, ID: %d", actionType, resp.ID)
 	return controller.SendSuccessWithAudit(ctx, controller.CodeSuccess, "设备模板更新成功", resp, actionType, "设备模板更新成功", resp)
 }
 
@@ -782,35 +462,15 @@ func (c *Controller) DeleteDeviceTemplate(ctx echo.Context) error {
 	const actionType = "删除设备模板"
 	dtID := ctx.Param("id")
 
-	idUint, err := strconv.ParseUint(dtID, 10, 64)
-	if err != nil {
-		c.logger.Errorf("%s: 设备模板ID格式错误: %v, ID: %s", actionType, err, dtID)
-		return controller.SendErrorWithAudit(ctx, controller.CodeBadRequest, "无效的设备模板ID格式", actionType, "ID格式错误", dtID)
-	}
-
-	// 在尝试删除之前，先检查设备模板是否存在
-	_, err = c.deviceTemplateRepo.FindByID(uint(idUint))
-	if err != nil {
+	if err := c.deviceService.DeleteDeviceTemplate(dtID); err != nil {
 		if errors.Is(err, gorm.ErrRecordNotFound) {
 			c.logger.Warnf("%s: 设备模板不存在, ID: %s", actionType, dtID)
 			return controller.SendErrorWithAudit(ctx, controller.CodeNotFound, "设备模板未找到", actionType, "设备模板不存在", dtID)
 		}
-		c.logger.Errorf("%s: 查找设备模板失败: %v, ID: %s", actionType, err, dtID)
-		return controller.SendErrorWithAudit(ctx, controller.CodeInternalError, "删除设备模板失败: 查找时发生内部错误", actionType, "数据库查询失败", dtID)
+		c.logger.Errorf("%s: 服务层删除失败: %v, ID: %s", actionType, err, dtID)
+		return controller.SendErrorWithAudit(ctx, controller.CodeInternalError, "删除设备模板失败: "+err.Error(), actionType, "服务层删除失败", dtID)
 	}
 
-	// 调用仓库层的删除方法，该方法会检查模板是否被使用
-	if err := c.deviceTemplateRepo.Delete(uint(idUint)); err != nil {
-		c.logger.Errorf("%s: 数据库删除失败: %v, ID: %d", actionType, err, idUint)
-		// 如果错误信息包含“设备模板正在被设备使用，无法删除”，则返回特定的错误码
-		if strings.Contains(err.Error(), "设备模板正在被设备使用，无法删除") {
-			return controller.SendErrorWithAudit(ctx, controller.CodeBadRequest, err.Error(), actionType, "设备模板正在使用", dtID)
-		} else {
-			// 其他数据库错误
-			return controller.SendErrorWithAudit(ctx, controller.CodeInternalError, "删除设备模板失败: "+err.Error(), actionType, "数据库删除失败", dtID)
-		}
-	}
-
-	c.logger.Infof("%s: 设备模板删除成功, ID: %d", actionType, idUint)
+	c.logger.Infof("%s: 设备模板删除成功, ID: %s", actionType, dtID)
 	return controller.SendSuccessWithAudit(ctx, controller.CodeSuccess, "设备模板删除成功", nil, actionType, "设备模板删除成功", dtID)
 }

internal/app/service/device_service.go

@@ -0,0 +1,373 @@
+package service
+
+import (
+	"encoding/json"
+	"errors"
+	"strconv"
+
+	"git.huangwc.com/pig/pig-farm-controller/internal/app/dto"
+	"git.huangwc.com/pig/pig-farm-controller/internal/domain/device"
+	"git.huangwc.com/pig/pig-farm-controller/internal/infra/models"
+	"git.huangwc.com/pig/pig-farm-controller/internal/infra/repository"
+)
+
+// DeviceService 定义了应用层的设备服务接口，用于协调设备相关的业务逻辑。
+type DeviceService interface {
+	CreateDevice(req *dto.CreateDeviceRequest) (*dto.DeviceResponse, error)
+	GetDevice(id string) (*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
+
+	CreateAreaController(req *dto.CreateAreaControllerRequest) (*dto.AreaControllerResponse, error)
+	GetAreaController(id string) (*dto.AreaControllerResponse, error)
+	ListAreaControllers() ([]*dto.AreaControllerResponse, error)
+	UpdateAreaController(id string, req *dto.UpdateAreaControllerRequest) (*dto.AreaControllerResponse, error)
+	DeleteAreaController(id string) error
+
+	CreateDeviceTemplate(req *dto.CreateDeviceTemplateRequest) (*dto.DeviceTemplateResponse, error)
+	GetDeviceTemplate(id string) (*dto.DeviceTemplateResponse, error)
+	ListDeviceTemplates() ([]*dto.DeviceTemplateResponse, error)
+	UpdateDeviceTemplate(id string, req *dto.UpdateDeviceTemplateRequest) (*dto.DeviceTemplateResponse, error)
+	DeleteDeviceTemplate(id string) error
+}
+
+// deviceService 是 DeviceService 接口的具体实现。
+type deviceService struct {
+	deviceRepo         repository.DeviceRepository
+	areaControllerRepo repository.AreaControllerRepository
+	deviceTemplateRepo repository.DeviceTemplateRepository
+	deviceDomainSvc    device.Service // 依赖领域服务
+}
+
+// NewDeviceService 创建一个新的 DeviceService 实例。
+func NewDeviceService(
+	deviceRepo repository.DeviceRepository,
+	areaControllerRepo repository.AreaControllerRepository,
+	deviceTemplateRepo repository.DeviceTemplateRepository,
+	deviceDomainSvc device.Service,
+) DeviceService {
+	return &deviceService{
+		deviceRepo:         deviceRepo,
+		areaControllerRepo: areaControllerRepo,
+		deviceTemplateRepo: deviceTemplateRepo,
+		deviceDomainSvc:    deviceDomainSvc,
+	}
+}
+
+// --- Devices ---
+
+func (s *deviceService) CreateDevice(req *dto.CreateDeviceRequest) (*dto.DeviceResponse, error) {
+	propertiesJSON, err := json.Marshal(req.Properties)
+	if err != nil {
+		return nil, err // Consider wrapping this error for better context
+	}
+
+	device := &models.Device{
+		Name:             req.Name,
+		DeviceTemplateID: req.DeviceTemplateID,
+		AreaControllerID: req.AreaControllerID,
+		Location:         req.Location,
+		Properties:       propertiesJSON,
+	}
+
+	if err := device.SelfCheck(); err != nil {
+		return nil, err
+	}
+
+	if err := s.deviceRepo.Create(device); err != nil {
+		return nil, err
+	}
+
+	createdDevice, err := s.deviceRepo.FindByID(device.ID)
+	if err != nil {
+		return nil, err
+	}
+
+	return dto.NewDeviceResponse(createdDevice)
+}
+
+func (s *deviceService) GetDevice(id string) (*dto.DeviceResponse, error) {
+	device, err := s.deviceRepo.FindByIDString(id)
+	if err != nil {
+		return nil, err
+	}
+	return dto.NewDeviceResponse(device)
+}
+
+func (s *deviceService) ListDevices() ([]*dto.DeviceResponse, error) {
+	devices, err := s.deviceRepo.ListAll()
+	if err != nil {
+		return nil, err
+	}
+	return dto.NewListDeviceResponse(devices)
+}
+
+func (s *deviceService) UpdateDevice(id string, req *dto.UpdateDeviceRequest) (*dto.DeviceResponse, error) {
+	existingDevice, err := s.deviceRepo.FindByIDString(id)
+	if err != nil {
+		return nil, err
+	}
+
+	propertiesJSON, err := json.Marshal(req.Properties)
+	if err != nil {
+		return nil, err
+	}
+
+	existingDevice.Name = req.Name
+	existingDevice.DeviceTemplateID = req.DeviceTemplateID
+	existingDevice.AreaControllerID = req.AreaControllerID
+	existingDevice.Location = req.Location
+	existingDevice.Properties = propertiesJSON
+
+	if err := existingDevice.SelfCheck(); err != nil {
+		return nil, err
+	}
+
+	if err := s.deviceRepo.Update(existingDevice); err != nil {
+		return nil, err
+	}
+
+	updatedDevice, err := s.deviceRepo.FindByID(existingDevice.ID)
+	if err != nil {
+		return nil, err
+	}
+
+	return dto.NewDeviceResponse(updatedDevice)
+}
+
+func (s *deviceService) DeleteDevice(id string) error {
+	idUint, err := strconv.ParseUint(id, 10, 64)
+	if err != nil {
+		return err
+	}
+
+	// Check if device exists before deleting
+	_, err = s.deviceRepo.FindByID(uint(idUint))
+	if err != nil {
+		return err
+	}
+
+	return s.deviceRepo.Delete(uint(idUint))
+}
+
+func (s *deviceService) ManualControl(id string, req *dto.ManualControlDeviceRequest) error {
+	dev, err := s.deviceRepo.FindByIDString(id)
+	if err != nil {
+		return err
+	}
+
+	if req.Action == nil {
+		return s.deviceDomainSvc.Collect(dev.AreaControllerID, []*models.Device{dev})
+	} else {
+		action := device.DeviceActionStart
+		switch *req.Action {
+		case "off":
+			action = device.DeviceActionStop
+		case "on":
+			action = device.DeviceActionStart
+		default:
+			return errors.New("invalid action")
+		}
+		return s.deviceDomainSvc.Switch(dev, action)
+	}
+}
+
+// --- Area Controllers ---
+
+func (s *deviceService) CreateAreaController(req *dto.CreateAreaControllerRequest) (*dto.AreaControllerResponse, error) {
+	propertiesJSON, err := json.Marshal(req.Properties)
+	if err != nil {
+		return nil, err
+	}
+
+	ac := &models.AreaController{
+		Name:       req.Name,
+		NetworkID:  req.NetworkID,
+		Location:   req.Location,
+		Properties: propertiesJSON,
+	}
+
+	if err := ac.SelfCheck(); err != nil {
+		return nil, err
+	}
+
+	if err := s.areaControllerRepo.Create(ac); err != nil {
+		return nil, err
+	}
+
+	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))
+	if err != nil {
+		return nil, err
+	}
+	return dto.NewAreaControllerResponse(ac)
+}
+
+func (s *deviceService) ListAreaControllers() ([]*dto.AreaControllerResponse, error) {
+	acs, err := s.areaControllerRepo.ListAll()
+	if err != nil {
+		return nil, err
+	}
+	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))
+	if err != nil {
+		return nil, err
+	}
+
+	propertiesJSON, err := json.Marshal(req.Properties)
+	if err != nil {
+		return nil, err
+	}
+
+	existingAC.Name = req.Name
+	existingAC.NetworkID = req.NetworkID
+	existingAC.Location = req.Location
+	existingAC.Properties = propertiesJSON
+
+	if err := existingAC.SelfCheck(); err != nil {
+		return nil, err
+	}
+
+	if err := s.areaControllerRepo.Update(existingAC); err != nil {
+		return nil, err
+	}
+
+	return dto.NewAreaControllerResponse(existingAC)
+}
+
+func (s *deviceService) DeleteAreaController(id string) error {
+	idUint, err := strconv.ParseUint(id, 10, 64)
+	if err != nil {
+		return err
+	}
+
+	_, err = s.areaControllerRepo.FindByID(uint(idUint))
+	if err != nil {
+		return err
+	}
+
+	return s.areaControllerRepo.Delete(uint(idUint))
+}
+
+// --- Device Templates ---
+
+func (s *deviceService) CreateDeviceTemplate(req *dto.CreateDeviceTemplateRequest) (*dto.DeviceTemplateResponse, error) {
+	commandsJSON, err := json.Marshal(req.Commands)
+	if err != nil {
+		return nil, err
+	}
+
+	valuesJSON, err := json.Marshal(req.Values)
+	if err != nil {
+		return nil, err
+	}
+
+	deviceTemplate := &models.DeviceTemplate{
+		Name:         req.Name,
+		Manufacturer: req.Manufacturer,
+		Description:  req.Description,
+		Category:     req.Category,
+		Commands:     commandsJSON,
+		Values:       valuesJSON,
+	}
+
+	if err := deviceTemplate.SelfCheck(); err != nil {
+		return nil, err
+	}
+
+	if err := s.deviceTemplateRepo.Create(deviceTemplate); err != nil {
+		return nil, err
+	}
+
+	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))
+	if err != nil {
+		return nil, err
+	}
+	return dto.NewDeviceTemplateResponse(deviceTemplate)
+}
+
+func (s *deviceService) ListDeviceTemplates() ([]*dto.DeviceTemplateResponse, error) {
+	deviceTemplates, err := s.deviceTemplateRepo.ListAll()
+	if err != nil {
+		return nil, err
+	}
+	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))
+	if err != nil {
+		return nil, err
+	}
+
+	commandsJSON, err := json.Marshal(req.Commands)
+	if err != nil {
+		return nil, err
+	}
+
+	valuesJSON, err := json.Marshal(req.Values)
+	if err != nil {
+		return nil, err
+	}
+
+	existingDeviceTemplate.Name = req.Name
+	existingDeviceTemplate.Manufacturer = req.Manufacturer
+	existingDeviceTemplate.Description = req.Description
+	existingDeviceTemplate.Category = req.Category
+	existingDeviceTemplate.Commands = commandsJSON
+	existingDeviceTemplate.Values = valuesJSON
+
+	if err := existingDeviceTemplate.SelfCheck(); err != nil {
+		return nil, err
+	}
+
+	if err := s.deviceTemplateRepo.Update(existingDeviceTemplate); err != nil {
+		return nil, err
+	}
+
+	return dto.NewDeviceTemplateResponse(existingDeviceTemplate)
+}
+
+func (s *deviceService) DeleteDeviceTemplate(id string) error {
+	idUint, err := strconv.ParseUint(id, 10, 64)
+	if err != nil {
+		return err
+	}
+
+	_, err = s.deviceTemplateRepo.FindByID(uint(idUint))
+	if err != nil {
+		return err
+	}
+
+	return s.deviceTemplateRepo.Delete(uint(idUint))
+}