From b83ea89998ee5890ff71c2b3f0abd08d00d50725 Mon Sep 17 00:00:00 2001 From: HuangHuiKang Date: Mon, 9 Feb 2026 17:44:41 +0800 Subject: [PATCH] =?UTF-8?q?fix:=E4=BF=AE=E6=94=B9=E9=85=8D=E6=96=B9?= =?UTF-8?q?=E5=BA=93=E8=AF=BB=E5=8F=96=E6=97=B6=E4=B8=BAtd=E6=95=B0?= =?UTF-8?q?=E6=8D=AE=E5=BA=93=E6=9C=80=E6=96=B0=E5=80=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../RecipeDeviceRecordController.java | 10 ++++++---- .../recipedevicerecord/RecipeDeviceRecordDO.java | 2 +- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/controller/admin/recipedevicerecord/RecipeDeviceRecordController.java b/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/controller/admin/recipedevicerecord/RecipeDeviceRecordController.java index 75fe0c168..e3a4e86e5 100644 --- a/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/controller/admin/recipedevicerecord/RecipeDeviceRecordController.java +++ b/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/controller/admin/recipedevicerecord/RecipeDeviceRecordController.java @@ -148,7 +148,6 @@ public class RecipeDeviceRecordController { /** * 批量创建设备点位采集记录和配方点位记录 - * @param recipeId 配方ID * @return 创建结果 * @throws JsonProcessingException JSON处理异常 */ @@ -198,6 +197,8 @@ public class RecipeDeviceRecordController { Map> deviceDataMap = deviceService.createDeviceDataMap(device.getId());//recipeRespVO.getDeviceId() + Map map = tDengineService.newSelectLatestRow(device.getId()); + // OpcUtils.connect(device.getId(),device.getUrl(),device.getUsername(),device.getPassword(),10); for (RecipeDeviceAttributeDO attributeDO : attributeList) { @@ -216,9 +217,10 @@ public class RecipeDeviceRecordController { recipeDeviceRecordDO.setDeviceId(deviceContactModelDO.getDeviceId()); recipeDeviceRecordDO.setDataUnit(deviceContactModelDO.getDataUnit()); // recipeDeviceRecordDO.setValue((String) OpcUtils.readValues(device.getId(),deviceContactModelDO.getAddress())); - if (data.get("addressValue") != null && data.get("addressValue").toString() != null) { - recipeDeviceRecordDO.setValue(data.get("addressValue").toString()); - } +// if (data.get("addressValue") != null && data.get("addressValue").toString() != null) { +// recipeDeviceRecordDO.setValue(data.get("addressValue").toString()); +// } + recipeDeviceRecordDO.setValue(map.get(deviceContactModelDO.getAttributeCode())); recipeDeviceRecordService.createRecipeDeviceRecord(BeanUtils.toBean(recipeDeviceRecordDO, RecipeDeviceRecordSaveReqVO.class)); diff --git a/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/dal/dataobject/recipedevicerecord/RecipeDeviceRecordDO.java b/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/dal/dataobject/recipedevicerecord/RecipeDeviceRecordDO.java index 9c02b2c5a..1e2a1f9b4 100644 --- a/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/dal/dataobject/recipedevicerecord/RecipeDeviceRecordDO.java +++ b/yudao-module-iot/yudao-module-iot-biz/src/main/java/cn/iocoder/yudao/module/iot/dal/dataobject/recipedevicerecord/RecipeDeviceRecordDO.java @@ -66,7 +66,7 @@ public class RecipeDeviceRecordDO extends BaseDO { /** * 采集值 */ - private String value; + private Object value; /** * 配方id