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 175c6415b002637a89c06699c0872a3920db10df..b5c5c68582f91617c1cff2f0bfad70745669aa18 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 0d0bdbb86b4fae4373d8db6ec9893f6fe27d4616..0da25949eb8adf14df804f9f6a082708e8fb254e 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 9362f493e7b420ad5840c2d75ef8a8e401c00a30..70ef938fe8e36dec0ae8ae80f6f9cfaa2ba9aed9 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 4bcb10025fe74b6c5643426420c1e336145d9c50..e2c33e04fe992c1a055ac4c3d06787a7dc302f12 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',