资产列表接口

@@ -81,9 +81,9 @@ public class AssetsController {
       Result<List<EquipmentTreeVO>> result = new Result<>();
       Result<List<EquipmentTreeVO>> result = new Result<>();
       List<EquipmentTreeVO> resultData = new LinkedList<>();
       List<EquipmentTreeVO> resultData = new LinkedList<>();
       for (TreeData treeData : treeList) {
       for (TreeData treeData : treeList) {
-         EquipmentTreeVO vo = new EquipmentTreeVO(treeData.getTitle(), treeData.getTitle(), "md-settings");
+         EquipmentTreeVO vo = new EquipmentTreeVO(treeData.getTitle(), treeData.getTitle(), "md-settings", treeData.getExt().get("code"));
          resultData.add(vo);
          resultData.add(vo);
-         vo.setChildren(treeData.getChildren().stream().map(v -> new EquipmentTreeVO(v.getTitle(), v.getKey(),"md-settings")).collect(Collectors.toList()));
+         vo.setChildren(treeData.getChildren().stream().map(v -> new EquipmentTreeVO(v.getTitle(), v.getKey(),"md-settings",v.getExt().get("code"))).collect(Collectors.toList()));
       }
       }
       result.setResult(resultData);
       result.setResult(resultData);
       result.setSuccess(true);
       result.setSuccess(true);

@@ -43,7 +43,7 @@
             '0' AS parent_id,
             '0' AS parent_id,
             ss.struct_name AS title,
             ss.struct_name AS title,
             '0' AS nodeType,
             '0' AS nodeType,
-            ss.struct_code AS code,
+            '' AS code,
             ss.sort_num AS sno
             ss.sort_num AS sno
         FROM
         FROM
             fm_twin_equip fe
             fm_twin_equip fe
@@ -70,7 +70,7 @@
             e.struct_id AS parent_id,
             e.struct_id AS parent_id,
             e.equip_name AS title,
             e.equip_name AS title,
             '1' AS nodeType,
             '1' AS nodeType,
-            e.equip_unit AS code,
+            t.twin_id AS code,
             '1' AS sno
             '1' AS sno
         FROM
         FROM
             fm_twin_equip t
             fm_twin_equip t

@@ -17,12 +17,16 @@ public class EquipmentTreeVO {
     @ApiModelProperty(value = "icon")
     @ApiModelProperty(value = "icon")
     private String icon;
     private String icon;
 
 
+    @ApiModelProperty(value = "twinId")
+    private String twinId;
+
     @ApiModelProperty(value = "children")
     @ApiModelProperty(value = "children")
     private List<EquipmentTreeVO> children;
     private List<EquipmentTreeVO> children;
 
 
-    public EquipmentTreeVO(String name, String value, String icon) {
+    public EquipmentTreeVO(String name, String value, String icon, String twinId) {
         this.name = name;
         this.name = name;
         this.value = value;
         this.value = value;
         this.icon = icon;
         this.icon = icon;
+        this.twinId = twinId;
     }
     }
 }
 }