From a710dead4cf7272dfe51a61247498e855df16a83 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=BE=BE=E5=AF=8C=E6=96=8C?= <norton618@163.com>
Date: Fri, 24 Oct 2025 19:34:37 +0800
Subject: [PATCH] =?UTF-8?q?feat=20(farm):=20=E8=AE=BE=E5=A4=87=E4=B8=AD?=
 =?UTF-8?q?=E5=BF=83?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 设备分类
---
 .../controller/admin/deviceinfo/vo/DeviceInfoSaveReqVO.java     | 1 +
 .../admin/deviceinfo/vo/v2/DeviceInfoSaveV2ReqVO.java           | 1 +
 .../deviceclassify/vo/DeviceModelRespVO.java                    | 2 ++
 .../basicdatamanagement/deviceclassify/vo/DeviceTypeRespVO.java | 2 ++
 .../farm/service/deviceclassify/DeviceClassifyServiceImpl.java  | 2 ++
 5 files changed, 8 insertions(+)

diff --git a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/deviceinfo/vo/DeviceInfoSaveReqVO.java b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/deviceinfo/vo/DeviceInfoSaveReqVO.java
index d0eb2293..0962931d 100644
--- a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/deviceinfo/vo/DeviceInfoSaveReqVO.java
+++ b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/deviceinfo/vo/DeviceInfoSaveReqVO.java
@@ -52,6 +52,7 @@ public class DeviceInfoSaveReqVO {
 
     @Schema(description = "预留类型字段", example = "1")
     private String type;
+    private String deviceUrl;
 
     @Schema(description = "设备厂商")
     private String vendor;
diff --git a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/deviceinfo/vo/v2/DeviceInfoSaveV2ReqVO.java b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/deviceinfo/vo/v2/DeviceInfoSaveV2ReqVO.java
index 6f86a7f1..ca36031a 100644
--- a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/deviceinfo/vo/v2/DeviceInfoSaveV2ReqVO.java
+++ b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/deviceinfo/vo/v2/DeviceInfoSaveV2ReqVO.java
@@ -28,6 +28,7 @@ public class DeviceInfoSaveV2ReqVO {
 
     @Schema(description = "设备名称(本服务自定义名称)")
     private String deviceName;
+    private String deviceUrl;
 
     @Schema(description = "负责人")
     private String managerId;
diff --git a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/managementcenter/basicdatamanagement/deviceclassify/vo/DeviceModelRespVO.java b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/managementcenter/basicdatamanagement/deviceclassify/vo/DeviceModelRespVO.java
index f055d1a5..7337d60e 100644
--- a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/managementcenter/basicdatamanagement/deviceclassify/vo/DeviceModelRespVO.java
+++ b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/managementcenter/basicdatamanagement/deviceclassify/vo/DeviceModelRespVO.java
@@ -19,6 +19,8 @@ public class DeviceModelRespVO {
 
     @Schema(description = "设备型号ID")
     private String deviceModelId;
+    @Schema(description = "设备型号编号")
+    private String typeCode;
     @Schema(description = "设备型号名称")
     private String deviceModelName;
 
diff --git a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/managementcenter/basicdatamanagement/deviceclassify/vo/DeviceTypeRespVO.java b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/managementcenter/basicdatamanagement/deviceclassify/vo/DeviceTypeRespVO.java
index 7f2e51e5..9b97219f 100644
--- a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/managementcenter/basicdatamanagement/deviceclassify/vo/DeviceTypeRespVO.java
+++ b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/managementcenter/basicdatamanagement/deviceclassify/vo/DeviceTypeRespVO.java
@@ -21,6 +21,8 @@ public class DeviceTypeRespVO {
     private String deviceTypeId;
     @Schema(description = "设备类型名称")
     private String deviceTypeName;
+    @Schema(description = "设备类型编号")
+    private String typeCode;
     @Schema(description = "设备类型图片")
     private String image;
     @Schema(description = "设备类型图片集合")
diff --git a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/service/deviceclassify/DeviceClassifyServiceImpl.java b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/service/deviceclassify/DeviceClassifyServiceImpl.java
index 7acc8f55..5b28c9fe 100644
--- a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/service/deviceclassify/DeviceClassifyServiceImpl.java
+++ b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/service/deviceclassify/DeviceClassifyServiceImpl.java
@@ -120,6 +120,7 @@ public class DeviceClassifyServiceImpl implements DeviceClassifyService {
                 .map(device -> new DeviceTypeRespVO(
                         String.valueOf(device.getId()),
                         device.getName(),
+                        device.getTypeCode(),
                         device.getImage(),
                         device.getImageList()
                 ))
@@ -141,6 +142,7 @@ public class DeviceClassifyServiceImpl implements DeviceClassifyService {
                 .filter(device -> device.getParentId() != null && device.getParentId().equals(parentId))
                 .map(childDevice -> new DeviceModelRespVO(
                         String.valueOf(childDevice.getId()),
+                        childDevice.getTypeCode(),
                         parentDevice.getName() + "/" + childDevice.getName()
                 ))
                 .collect(Collectors.toList());