Merge pull request 'master' (#43) from master into V3

Reviewed-on: http://git.lrdaiot.cn:9000/thing/thing_api/pulls/43

modules/thing/src/main/java/com/thing/device/source/service/impl/IotThingSourceServiceImpl.java

@@ -449,7 +449,8 @@ public class IotThingSourceServiceImpl extends BaseServiceImpl<IotThingSourceMap
         // 根据 thingAttrName 和 thingAttrCode 去重
         Set<String> 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<IotThingSourceMap
         // 根据 thingAttrGroup 去重
         Set<String> 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();
     }
 

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)")

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;
 }