From dbbcf82a26eaee8029dc56f0193be5dc47e3e520 Mon Sep 17 00:00:00 2001
From: HuangHuiKang <HuangHuiKang@qq.com>
Date: Wed, 4 Mar 2026 16:04:23 +0800
Subject: [PATCH] =?UTF-8?q?fix:=E4=BF=AE=E5=A4=8D=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../admin/product/ErpProductController.java   | 22 +++++++++----------
 .../iot/service/device/TDengineService.java   |  9 +++++---
 .../DeviceModelAttributeServiceImpl.java      |  2 +-
 3 files changed, 18 insertions(+), 15 deletions(-)

diff --git a/yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/product/ErpProductController.java b/yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/product/ErpProductController.java
index e0fb907de..8209b4a3b 100644
--- a/yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/product/ErpProductController.java
+++ b/yudao-module-erp/yudao-module-erp-biz/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/product/ErpProductController.java
@@ -70,17 +70,17 @@ public class ErpProductController {
     @Operation(summary = "更新产品")
     @PreAuthorize("@ss.hasPermission('erp:product:update')")
     public CommonResult<Boolean> updateProduct(@Valid @RequestBody ProductSaveReqVO updateReqVO) {
-        ErpProductPageReqVO productPageReqVO =  new ErpProductPageReqVO();
-        productPageReqVO.setName(updateReqVO.getName());
-        productPageReqVO.setStandard(updateReqVO.getStandard());
-        if (productMapper.selectProductExist(productPageReqVO)) {
-            return error(400,"名称+规格不能重复");
-        }
-        productPageReqVO =  new ErpProductPageReqVO();
-        productPageReqVO.setCode(updateReqVO.getBarCode());
-        if (!productMapper.selectProductCodeExist(productPageReqVO).getList().isEmpty()) {
-            return error(400,"编码不能重复");
-        }
+//        ErpProductPageReqVO productPageReqVO =  new ErpProductPageReqVO();
+//        productPageReqVO.setName(updateReqVO.getName());
+//        productPageReqVO.setStandard(updateReqVO.getStandard());
+//        if (productMapper.selectProductExist(productPageReqVO)) {
+//            return error(400,"名称+规格不能重复");
+//        }
+//        productPageReqVO =  new ErpProductPageReqVO();
+//        productPageReqVO.setCode(updateReqVO.getBarCode());
+//        if (!productMapper.selectProductCodeExist(productPageReqVO).getList().isEmpty()) {
+//            return error(400,"编码不能重复");
+//        }
         productService.updateProduct(updateReqVO);
         return success(true);
     }
diff --git a/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/service/device/TDengineService.java b/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/service/device/TDengineService.java
index c1a629f4a..4e8f5bc43 100644
--- a/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/service/device/TDengineService.java
+++ b/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/service/device/TDengineService.java
@@ -1161,11 +1161,14 @@ public class TDengineService {
      * @return 数据列表，每条数据为 Map<String,Object>
      */
     @DS("tdengine")
-    public List<Map<String, Object>> newSelectLatestData(Long deviceId, String startTime, String endTime, int limit) {
-        if (deviceId == null || limit <= 0) {
+    public List<Map<String, Object>> newSelectLatestData(Long deviceId, String startTime, String endTime, Integer limit) {
+        if (deviceId == null ) {
             return Collections.emptyList();
         }
 
+        // 默认限制条数（防止全表扫描）
+        int safeLimit = limit == null ? 100 : limit;
+
         String tableName = "besure_server.d_" + deviceId;
 
         StringBuilder sqlBuilder = new StringBuilder();
@@ -1179,7 +1182,7 @@ public class TDengineService {
         }
 
         sqlBuilder.append(" ORDER BY ts DESC "); // 按时间倒序
-        sqlBuilder.append(" LIMIT ").append(limit); // 限制条数
+        sqlBuilder.append(" LIMIT ").append(safeLimit); // 限制条数
 
         String sql = sqlBuilder.toString();
 
diff --git a/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/service/devicemodelattribute/DeviceModelAttributeServiceImpl.java b/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/service/devicemodelattribute/DeviceModelAttributeServiceImpl.java
index bf50f9f9c..e6aa3cae2 100644
--- a/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/service/devicemodelattribute/DeviceModelAttributeServiceImpl.java
+++ b/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/service/devicemodelattribute/DeviceModelAttributeServiceImpl.java
@@ -184,7 +184,7 @@ import static cn.iocoder.yudao.module.iot.enums.ErrorCodeConstants.*;
         try {
             //  获取最新10条设备数据
             List<Map<String, Object>> deviceDataList =
-                    tdengineService.newSelectLatestData(deviceId, collectionStartTime, collectionEndTime, 10);
+                    tdengineService.newSelectLatestData(deviceId, collectionStartTime, collectionEndTime, null);
 
             //  查找 modelId 对应的 attributeCode
             DeviceContactModelDO modelDO = deviceContactModelMapper.selectById(modelId);