From 61152b3db3c95709561ce26a9bcf3038c53c41c0 Mon Sep 17 00:00:00 2001 From: "ljqhello2008@126.com" Date: Thu, 15 Jun 2023 18:01:13 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E9=87=87=E9=9B=86=E6=95=B0?= =?UTF-8?q?=E6=8D=AE=E7=9A=84=E5=AD=90=E8=AE=BE=E5=A4=87=E7=BC=96=E5=8F=B7?= =?UTF-8?q?child=5Fsn,=E4=BE=BF=E4=BA=8E=E5=90=8E=E6=9C=9F=E6=9F=A5?= =?UTF-8?q?=E6=89=BE=E6=95=B0=E6=8D=AE=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/iteaj/iboot/msn/iot/collect/CollectActionTask.java | 2 +- .../java/com/iteaj/iboot/msn/iot/entity/CollectData.java | 6 ++++++ docs/sql/iboot.sql | 1 + docs/sql/msn/iboot_iot.sql | 1 + 4 files changed, 9 insertions(+), 1 deletion(-) diff --git a/bootstrap/src/main/java/com/iteaj/iboot/msn/iot/collect/CollectActionTask.java b/bootstrap/src/main/java/com/iteaj/iboot/msn/iot/collect/CollectActionTask.java index 175c6415..b5c5c685 100644 --- a/bootstrap/src/main/java/com/iteaj/iboot/msn/iot/collect/CollectActionTask.java +++ b/bootstrap/src/main/java/com/iteaj/iboot/msn/iot/collect/CollectActionTask.java @@ -39,7 +39,7 @@ public class CollectActionTask implements Runnable { .setCid(cid).setReason("") .setStatus(false).setCreateTime(date) .setUid(item.getUid()).setSignalId(signal.getId()) - .setCollectTaskId(taskDto.getId()); + .setCollectTaskId(taskDto.getId()).setChildSn(item.getChildSn()); try { data.setAddress(signal.getAddress()); diff --git a/bootstrap/src/main/java/com/iteaj/iboot/msn/iot/entity/CollectData.java b/bootstrap/src/main/java/com/iteaj/iboot/msn/iot/entity/CollectData.java index 0d0bdbb8..0da25949 100644 --- a/bootstrap/src/main/java/com/iteaj/iboot/msn/iot/entity/CollectData.java +++ b/bootstrap/src/main/java/com/iteaj/iboot/msn/iot/entity/CollectData.java @@ -27,6 +27,12 @@ public class CollectData extends BaseEntity { @IotField private Long uid; + /** + * 子设备编号child_sn + */ + @IotField("child_sn") + private String childSn; + /** * 信号id */ diff --git a/docs/sql/iboot.sql b/docs/sql/iboot.sql index 9362f493..70ef938f 100644 --- a/docs/sql/iboot.sql +++ b/docs/sql/iboot.sql @@ -26,6 +26,7 @@ CREATE TABLE `iot_collect_data` ( `id` bigint NOT NULL AUTO_INCREMENT, `cid` bigint NOT NULL COMMENT '任务执行标识', `uid` bigint DEFAULT NULL COMMENT '设备uid', + `child_sn` varchar(64) DEFAULT NULL COMMENT '子设备编号', `signal_id` bigint NOT NULL COMMENT '信号id', `field_type` tinyint DEFAULT NULL COMMENT '数据类型', `collect_task_id` bigint NOT NULL COMMENT '任务id', diff --git a/docs/sql/msn/iboot_iot.sql b/docs/sql/msn/iboot_iot.sql index 4bcb1002..e2c33e04 100644 --- a/docs/sql/msn/iboot_iot.sql +++ b/docs/sql/msn/iboot_iot.sql @@ -26,6 +26,7 @@ CREATE TABLE `iot_collect_data` ( `id` bigint NOT NULL AUTO_INCREMENT, `cid` bigint NOT NULL COMMENT '任务执行标识', `uid` bigint DEFAULT NULL COMMENT '设备uid', + `child_sn` varchar(64) DEFAULT NULL COMMENT '子设备编号', `signal_id` bigint NOT NULL COMMENT '信号id', `field_type` tinyint DEFAULT NULL COMMENT '数据类型', `collect_task_id` bigint NOT NULL COMMENT '任务id', -- Gitee