From 570e342038b47555c9c22a175e6735d0fac1c776 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=BE=BE=E5=AF=8C=E6=96=8C?= <norton618@163.com>
Date: Sun, 21 Sep 2025 22:41:03 +0800
Subject: [PATCH] =?UTF-8?q?fix=20(farm):=20=E8=AE=BE=E5=A4=87=E4=B8=AD?=
 =?UTF-8?q?=E5=BF=83,=20=E5=86=9C=E4=BA=8B=E8=AE=B0=E5=BD=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 获取image,imageList
- 农事记录新增bug
---
 .../admin/deviceinfo/vo/v2/DeviceInfoDetailV2RespVO.java | 7 +++++++
 .../farm/service/deviceinfo/DeviceInfoServiceImpl.java   | 9 ++++++---
 2 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/deviceinfo/vo/v2/DeviceInfoDetailV2RespVO.java b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/deviceinfo/vo/v2/DeviceInfoDetailV2RespVO.java
index 6cb716bb..0730be68 100644
--- a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/deviceinfo/vo/v2/DeviceInfoDetailV2RespVO.java
+++ b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/deviceinfo/vo/v2/DeviceInfoDetailV2RespVO.java
@@ -5,6 +5,8 @@ import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
+import java.util.List;
+
 /**
  * @description: 设备详情 请求实体
  * @author: binda
@@ -40,12 +42,17 @@ public class DeviceInfoDetailV2RespVO {
     @Schema(description = "设备坐标")
     private String point;
 
+    private String image;
+    private List<String> imageList;
+
     @Schema(description = "基地iD")
     private String baseId;
+    private String baseName;
     @Schema(description = "基地坐标")
     private String basePoint;
     @Schema(description = "地块ID")
     private String plotId;
+    private String plotName;
     @Schema(description = "地块坐标")
     private String plotPoint;
 
diff --git a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/service/deviceinfo/DeviceInfoServiceImpl.java b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/service/deviceinfo/DeviceInfoServiceImpl.java
index 959dc277..157741a5 100644
--- a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/service/deviceinfo/DeviceInfoServiceImpl.java
+++ b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/service/deviceinfo/DeviceInfoServiceImpl.java
@@ -103,9 +103,12 @@ private void validateDeviceInfoExists(String id) {
         DeviceInfoDO deviceInfo = deviceInfoMapper.selectById(id);
         if (deviceInfo != null) {
             // 触发图片集合转换，确保返回的DO对象包含转换后的图片集合
-            deviceInfo.getImageList();
-            deviceInfo.getAlarmImageList();
-            deviceInfo.getOfflineImageList();
+//            deviceInfo.getImageList();
+//            deviceInfo.getAlarmImageList();
+//            deviceInfo.getOfflineImageList();
+            DeviceClassifyDO dc = deviceClassifyMapper.selectOne(DeviceClassifyDO::getId, deviceInfo.getDeviceType());
+            deviceInfo.setImage(dc.getImage());
+            deviceInfo.setImageList(dc.getImageList());
         }
         return deviceInfo;
     }