设备继承来的属性只能修改备注

doge-you · Aug 29, 2021 · 357a0e9 · 357a0e9
1 parent 1d488a6
commit 357a0e9
Showing 1 changed file with 9 additions and 6 deletions.
diff --git a/zeus-webapp/src/main/java/com/zmops/iot/web/device/service/DeviceModelService.java b/zeus-webapp/src/main/java/com/zmops/iot/web/device/service/DeviceModelService.java
@@ -147,15 +147,18 @@ public void createProductAttr(ProductAttr productAttr, String zbxId) {
     }
 
     private ProductAttribute buildProdAttribute(ProductAttribute prodAttribute, ProductAttr productAttr) {
+        if(null == prodAttribute.getTemplateId()){
+            prodAttribute.setName(productAttr.getAttrName());
+            prodAttribute.setKey(productAttr.getKey());
+            prodAttribute.setSource(productAttr.getSource());
+            prodAttribute.setUnits(productAttr.getUnits());
+            prodAttribute.setDepAttrId(productAttr.getDepAttrId());
+            prodAttribute.setValueType(productAttr.getValueType());
+        }
         prodAttribute.setProductId(productAttr.getProductId());
-        prodAttribute.setName(productAttr.getAttrName());
-        prodAttribute.setKey(productAttr.getKey());
-        prodAttribute.setSource(productAttr.getSource());
-        prodAttribute.setUnits(productAttr.getUnits());
         prodAttribute.setRemark(productAttr.getRemark());
-        prodAttribute.setValueType(productAttr.getValueType());
         prodAttribute.setAttrId(productAttr.getAttrId());
-        prodAttribute.setDepAttrId(productAttr.getDepAttrId());
+
         return prodAttribute;
     }