From 72d55f3e52e2b9848f19f552d2df024c2cce27d5 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 17:39:31 +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

- 设备监控
---
 .../deviceinfo/DeviceInfoController.java      |  2 +-
 .../controller/admin/dict/DictController.java | 31 +++++++------------
 .../deviceinfo/DeviceInfoServiceImpl.java     |  4 +++
 3 files changed, 17 insertions(+), 20 deletions(-)

diff --git a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/deviceinfo/DeviceInfoController.java b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/deviceinfo/DeviceInfoController.java
index 32040d4d..48f90758 100644
--- a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/deviceinfo/DeviceInfoController.java
+++ b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/deviceinfo/DeviceInfoController.java
@@ -192,7 +192,7 @@ public class DeviceInfoController {
     }
 
     @GetMapping("/statistics")
-    @Operation(summary = "订阅设备上报并持久化")
+    @Operation(summary = "设备统计信息")
     @Parameter(name = "baseId", description = "基地编号")
     public CommonResult<DeviceStatisticsRespVO> getStatisticsInfo(@RequestParam("baseId") String baseId) {
         DeviceStatisticsRespVO res = deviceInfoService.getStatisticsInfo(baseId);
diff --git a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/dict/DictController.java b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/dict/DictController.java
index 1d39ab91..c5cfe5a9 100644
--- a/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/dict/DictController.java
+++ b/yudao-module-farm/src/main/java/cn/iocoder/yudao/module/farm/controller/admin/dict/DictController.java
@@ -294,26 +294,19 @@ public class DictController {
         List<BaseNamePlanRespVO> res = productionPlanService.getBaseNameAndPlanList();
         return success(res);
     }
-//
-//    @GetMapping("/list/invest-goods")
-//    @Operation(summary = "字典数据维护-下拉框列表-投入品")
-//    public CommonResult<List<InputLibraryRespVO>> getInvestGoodsList() {
-//        List<InputLibraryRespVO> res = sysDictService.getInvestGoodsList();
-//        return success(res);
+
+//    @Operation(summary = "字典数据维护-下拉框列表-通用字典分类查询")
+//    @GetMapping("/list/{dictTypeCode}")
+//    public CommonResult<List<SysDictRespVO>> getSysDictList(@PathVariable("dictTypeCode") String dictTypeCode) {
+//        List<SysDictDO> res = sysDictService.getByTypeCode(dictTypeCode);
+//        return success(BeanUtils.toBean(res, SysDictRespVO.class));
 //    }
 //
-    @Operation(summary = "字典数据维护-下拉框列表-通用字典分类查询")
-    @GetMapping("/list/{dictTypeCode}")
-    public CommonResult<List<SysDictRespVO>> getSysDictList(@PathVariable("dictTypeCode") String dictTypeCode) {
-        List<SysDictDO> res = sysDictService.getByTypeCode(dictTypeCode);
-        return success(BeanUtils.toBean(res, SysDictRespVO.class));
-    }
-
-    @Operation(summary = "字典数据维护-下拉框列表-字典分类名称")
-    @GetMapping("/list")
-    public CommonResult<List<SysDictTypeCodeRespVO>> getSysDictList() {
-        List<SysDictDO> res = sysDictService.groupByTypeCode();
-        return success(BeanUtils.toBean(res, SysDictTypeCodeRespVO.class));
-    }
+//    @Operation(summary = "字典数据维护-下拉框列表-字典分类名称")
+//    @GetMapping("/list")
+//    public CommonResult<List<SysDictTypeCodeRespVO>> getSysDictList() {
+//        List<SysDictDO> res = sysDictService.groupByTypeCode();
+//        return success(BeanUtils.toBean(res, SysDictTypeCodeRespVO.class));
+//    }
 
 }
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 fb36cdbc..14b41dfe 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
@@ -526,6 +526,10 @@ public class DeviceInfoServiceImpl implements DeviceInfoService {
         List<DeviceMonitorDataRespVO.Row> rows = new ArrayList<>();
 
         RealTimeDeviceDataRespVO realTimeDeviceDataRespVO = (RealTimeDeviceDataRespVO) wfInfo.getRealTimeData().getData();
+        if (ObjectUtils.isEmpty(realTimeDeviceDataRespVO)) {
+            return rows;
+        }
+
         List<RealTimeDeviceDataRespVO.DataRow> data = realTimeDeviceDataRespVO.getData();
         for (RealTimeDeviceDataRespVO.DataRow d : data) {
             rows.add(new DeviceMonitorDataRespVO.Row(d.getPropertyName(), d.getFormatValue(), ""));