浏览代码

Merge branch 'develop' of http://39.106.8.246:3003/BDTP/adm-middleware.git into develop

zhangqiankun 3 年之前
父节点
当前提交
118dabc420

+ 22 - 17
src/main/java/com/persagy/proxy/object/controller/AdmSystemController.java

@@ -276,6 +276,12 @@ public class AdmSystemController {
             admQueryCriteriaBd.setName("buildingList");
             AdmQueryCriteria admQueryCriteriaFl = new AdmQueryCriteria();
             admQueryCriteriaFl.setName("floorList");
+            List<AdmQueryCriteria> cascadeFlBd = new ArrayList<>(1);
+            AdmQueryCriteria admQueryCriteriaBdFl = new AdmQueryCriteria();
+            admQueryCriteriaBdFl.setName("building");
+            cascadeFlBd.add(admQueryCriteriaBdFl);
+            admQueryCriteriaFl.setCascade(cascadeFlBd);
+
             List<AdmQueryCriteria> cascade = new ArrayList<>(1);
             cascade.add(admQueryCriteriaBd);
             cascade.add(admQueryCriteriaFl);
@@ -285,34 +291,33 @@ public class AdmSystemController {
             if(CollUtil.isNotEmpty(syses.getContent())){
                 admSystemList = (List<AdmSystem>) syses.getContent();
                 admSystemList.stream().forEach(admSystem -> {
-                    List<ObjectNode> buildingFloorInfoList = new ArrayList<>();
                     List<AdmBuilding> buildingList = admSystem.getBuildingList();
+                    List<ObjectNode> buildingFloorInfoList = new ArrayList<>();
                     if(CollUtil.isNotEmpty(buildingList)){
                         buildingList.stream().forEach(admBuilding -> {
                             ObjectNode info = JsonNodeFactory.instance.objectNode();
                             info.put("BuildID",admBuilding.getId());
                             info.put("BuildName",admBuilding.getLocalName());
                             buildingFloorInfoList.add(info);
-
-                            List<AdmFloor> admFloorList = admSystem.getFloorList();
-                            if(CollUtil.isNotEmpty(admFloorList)){
-                                Map<String, AdmFloor> admFloorMap = CollUtil.fieldValueMap(admFloorList, "buildingId");
-                                if(admFloorMap.containsKey(admBuilding.getId())){
-                                    ObjectNode infobd = JsonNodeFactory.instance.objectNode();
-                                    infobd.put("BuildID",admBuilding.getId());
-                                    infobd.put("BuildName",admBuilding.getLocalName());
-                                    infobd.put("FloorID",admFloorMap.get(admBuilding.getId()).getId());
-                                    infobd.put("FloorName",admFloorMap.get(admBuilding.getId()).getLocalName());
-                                    buildingFloorInfoList.add(infobd);
-                                }
-                            }
                         });
-                        admSystem.setBuildingFloorInfoList(buildingFloorInfoList);
+
                         admSystem.setBuildingList(null);
+                        Map<String, AdmBuilding> admBuildingMap = CollUtil.fieldValueMap(buildingList, BaseEntity.PROP_ID);
+                        List<AdmFloor> admFloorList = admSystem.getFloorList();
+                        if(CollUtil.isNotEmpty(admFloorList)){
+                            //Map<String, AdmFloor> admFloorMap = CollUtil.fieldValueMap(admFloorList, "buildingId");
+                            admFloorList.stream().forEach(admFloor -> {
+                                ObjectNode infobd = JsonNodeFactory.instance.objectNode();
+                                infobd.put("BuildID",admFloor.getBuildingId());
+                                infobd.put("BuildName",admFloor.getBuilding() == null ? (admBuildingMap.get(admFloor.getBuildingId()) != null ? admBuildingMap.get(admFloor.getBuildingId()).getLocalName() : "") :admFloor.getBuilding().getLocalName());
+                                infobd.put("FloorID",admFloor.getId());
+                                infobd.put("FloorName",admFloor.getLocalName());
+                                buildingFloorInfoList.add(infobd);
+                            });
+                        }
                         admSystem.setFloorList(null);
-                    } else{
-                        admSystem.setBuildingFloorInfoList(buildingFloorInfoList);
                     }
+                    admSystem.setBuildingFloorInfoList(buildingFloorInfoList);
                 });
                 syses.setContent(CollUtil.isEmpty(admSystemList) ? new ArrayList<>(1) : admSystemList);
             }

+ 4 - 0
src/main/java/com/persagy/proxy/object/model/AdmComponent.java

@@ -7,6 +7,7 @@ import lombok.Data;
 import lombok.EqualsAndHashCode;
 
 import java.util.List;
+import java.util.Map;
 
 /**
  * ADM 组件 实体 ==> Equipment
@@ -88,6 +89,9 @@ public class AdmComponent extends AdmBaseEntity<AdmComponent> {
         /** 对象类型 */
         private String objectType;
 
+        /** 部件分类 */
+        private Map<String, String> equipCategory;
+
         /** 资产信息实体类   资产对应部件设施关系 资产→部件设施*/
         @CascadeColumn(graphCode = "Property2Mech", relCode = "Pe2Eq", selectToObj = false)
         private AdmProperty property;

+ 2 - 2
src/main/java/com/persagy/proxy/object/model/AdmEquipment.java

@@ -121,10 +121,10 @@ public class AdmEquipment extends AdmBaseEntity<AdmEquipment> {
     @CascadeColumn(graphCode = "Property2Mech", relCode = "Pe2Eq", selectToObj = false)
     private AdmProperty property;
     /** 建筑信息实体类 */
-    @CascadeColumn(graphCode = "MechForArch", relCode = "Eq2Bd")
+    @CascadeColumn(graphCode = "MechInArch", relCode = "Eq2Bd")
     private AdmBuilding building;
     /** 楼层信息实体类 */
-    @CascadeColumn(graphCode = "MechForArch", relCode = "Eq2Fl")
+    @CascadeColumn(graphCode = "MechInArch", relCode = "Eq2Fl")
     private AdmFloor floor;
     /** 项目信息实体类 */
     @CascadeColumn(graphCode = "MechSubset", relCode = "Pj2Eq", selectToObj = false)