From f3fb515a0c20046ac0c23006c5cf65eb734207ee Mon Sep 17 00:00:00 2001 From: lishuai Date: Thu, 12 Sep 2024 13:46:06 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E9=85=8D=E7=BD=AE=E4=B8=AD=E5=85=B4?= =?UTF-8?q?=E5=90=AF=E7=94=A8=E5=8A=9F=E8=83=BD=202024=E5=B9=B49=E6=9C=881?= =?UTF-8?q?2=E6=97=A513:46:04?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../source/service/impl/IotThingSourceServiceImpl.java | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/modules/thing/src/main/java/com/thing/device/source/service/impl/IotThingSourceServiceImpl.java b/modules/thing/src/main/java/com/thing/device/source/service/impl/IotThingSourceServiceImpl.java index 947995d..88723b4 100644 --- a/modules/thing/src/main/java/com/thing/device/source/service/impl/IotThingSourceServiceImpl.java +++ b/modules/thing/src/main/java/com/thing/device/source/service/impl/IotThingSourceServiceImpl.java @@ -449,7 +449,8 @@ public class IotThingSourceServiceImpl extends BaseServiceImpl seen = new LinkedHashSet<>(); return iotThingSourceDTOS.stream() - .filter(dto -> seen.add(dto.getThingAttrName() + "-" + dto.getThingAttrCode())) + .filter(dto -> StringUtils.equals(dto.getStartStatus(),"0") && + seen.add(dto.getThingAttrName() + "-" + dto.getThingAttrCode())) .toList(); } @@ -588,7 +589,9 @@ public class IotThingSourceServiceImpl extends BaseServiceImpl seen = new LinkedHashSet<>(); return iotThingSourceDTOS.stream() - .filter(dto -> StringUtils.isNotBlank(dto.getThingAttrGroup()) && seen.add(dto.getThingAttrGroup())) + .filter(dto -> StringUtils.isNotBlank(dto.getThingAttrGroup()) + && StringUtils.equals(dto.getStartStatus(),"0") + && seen.add(dto.getThingAttrGroup())) .toList(); } From bcb5a4ec9afbd2d0f39f5a6439cc5d34724c7115 Mon Sep 17 00:00:00 2001 From: xiachao Date: Thu, 12 Sep 2024 13:55:27 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E9=83=A8=E4=BB=B6=E8=AE=BE=E8=AE=A1?= =?UTF-8?q?=EF=BC=8C=E6=96=B0=E5=A2=9Econfig=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/thing/visual/component/dto/IotVisualComponentDTO.java | 3 +++ .../visual/component/entity/IotVisualComponentEntity.java | 2 ++ 2 files changed, 5 insertions(+) diff --git a/modules/visual-design/src/main/java/com/thing/visual/component/dto/IotVisualComponentDTO.java b/modules/visual-design/src/main/java/com/thing/visual/component/dto/IotVisualComponentDTO.java index fc47cbf..0571f1e 100644 --- a/modules/visual-design/src/main/java/com/thing/visual/component/dto/IotVisualComponentDTO.java +++ b/modules/visual-design/src/main/java/com/thing/visual/component/dto/IotVisualComponentDTO.java @@ -47,6 +47,9 @@ public class IotVisualComponentDTO implements Serializable { private String previewOptions; @Schema(description = "部件json") private String hash; + + private String config; + @Schema(description = "备注说明") private String remarks; @Schema(description = "所属企业(租户code)") diff --git a/modules/visual-design/src/main/java/com/thing/visual/component/entity/IotVisualComponentEntity.java b/modules/visual-design/src/main/java/com/thing/visual/component/entity/IotVisualComponentEntity.java index 7476051..2e99d2c 100644 --- a/modules/visual-design/src/main/java/com/thing/visual/component/entity/IotVisualComponentEntity.java +++ b/modules/visual-design/src/main/java/com/thing/visual/component/entity/IotVisualComponentEntity.java @@ -76,4 +76,6 @@ public class IotVisualComponentEntity extends BaseInfoEntity implements Serializ * 部件排序序号 */ private Integer sort; + + private String config; } \ No newline at end of file