소스 검색

增加cachedConfiguration

zhou-hao 4 년 전
부모
커밋
44416e5c38
1개의 변경된 파일6개의 추가작업 그리고 1개의 파일을 삭제
  1. 6 1
      jetlinks-manager/device-manager/src/main/java/org/jetlinks/community/device/response/DeviceDetail.java

+ 6 - 1
jetlinks-manager/device-manager/src/main/java/org/jetlinks/community/device/response/DeviceDetail.java

@@ -100,6 +100,10 @@ public class DeviceDetail {
     @Schema(description = "配置信息")
     @Schema(description = "配置信息")
     private Map<String, Object> configuration = new HashMap<>();
     private Map<String, Object> configuration = new HashMap<>();
 
 
+    //已生效的配置信息
+    @Schema(description = "已生效的配置信息")
+    private Map<String, Object> cachedConfiguration = new HashMap<>();
+
     //设备单独的配置信息
     //设备单独的配置信息
     @Schema(description = "是否为单独的配置,false表示部分配置信息继承自产品.")
     @Schema(description = "是否为单独的配置,false表示部分配置信息继承自产品.")
     private boolean aloneConfiguration;
     private boolean aloneConfiguration;
@@ -145,7 +149,8 @@ public class DeviceDetail {
                        .map(DeviceTagEntity::of)
                        .map(DeviceTagEntity::of)
                        .collect(Collectors.toList()));
                        .collect(Collectors.toList()));
                 Map<String, Object> cachedConfigs = tp.getT5().getAllValues();
                 Map<String, Object> cachedConfigs = tp.getT5().getAllValues();
-                cachedConfigs.forEach(configuration::putIfAbsent);
+                cachedConfiguration.putAll(cachedConfigs);
+//                cachedConfigs.forEach(configuration::putIfAbsent);
             })
             })
             .thenReturn(this);
             .thenReturn(this);
     }
     }