zhangqiankun 3 år sedan
förälder
incheckning
e5ec6ac4ba

+ 1 - 0
src/main/java/com/persagy/proxy/common/entity/RelationDTO.java

@@ -39,6 +39,7 @@ public class RelationDTO {
     /**
      * 关系值
      */
+    @JSONField(name = "rel_value")
     private String relValue;
 
     /**

+ 7 - 7
src/main/java/com/persagy/proxy/object/service/impl/AdmSpaceServiceImpl.java

@@ -140,7 +140,7 @@ public class AdmSpaceServiceImpl extends AbstractAdmBaseServiceImpl<AdmSpace> im
             //明确建筑,明确楼层
             ObjectNode relationTo = JsonNodeFactory.instance.objectNode();
             relationTo.put("relCode", "Fl2Sp");
-            relationTo.put("graphCode", "MechInArch");
+            relationTo.put("graphCode", "ArchSubset");
             relationTo.put("objFrom", request.getFloorId());
             request.setRelationFrom(relationTo);
 
@@ -159,7 +159,7 @@ public class AdmSpaceServiceImpl extends AbstractAdmBaseServiceImpl<AdmSpace> im
                 //查询 建筑 不在楼层下 的空间
                 ObjectNode relationTo = JsonNodeFactory.instance.objectNode();
                 relationTo.put("relCode", "Fl2Sp");
-                relationTo.put("graphCode", "MechInArch");
+                relationTo.put("graphCode", "ArchSubset");
                 ArrayNode arrayNode = relationTo.putObject("objFrom").putArray("$in");
                 objectRelationMap.keySet().stream().forEach(floorId -> arrayNode.add(floorId));
                 relationTo.put("$bindFlag", false);
@@ -169,7 +169,7 @@ public class AdmSpaceServiceImpl extends AbstractAdmBaseServiceImpl<AdmSpace> im
                 //查询建筑下的空间
                 ObjectNode relationTo = JsonNodeFactory.instance.objectNode();
                 relationTo.put("relCode", "Bd2Sp");
-                relationTo.put("graphCode", "MechInArch");
+                relationTo.put("graphCode", "ArchSubset");
                 relationTo.put("objFrom", request.getBuildingId());
                 request.setRelationFrom(relationTo);
             }
@@ -178,7 +178,7 @@ public class AdmSpaceServiceImpl extends AbstractAdmBaseServiceImpl<AdmSpace> im
             //查询建筑下的空间
             ObjectNode relationTo = JsonNodeFactory.instance.objectNode();
             relationTo.put("relCode", "Bd2Sp");
-            relationTo.put("graphCode", "MechInArch");
+            relationTo.put("graphCode", "ArchSubset");
             relationTo.put("objFrom", request.getBuildingId());
             request.setRelationFrom(relationTo);
         }else if(StrUtil.isNotEmpty(request.getBuildingId()) && StrUtil.isEmpty(request.getFloorId()) && request.getBuildingId().equals("isnull")){
@@ -186,7 +186,7 @@ public class AdmSpaceServiceImpl extends AbstractAdmBaseServiceImpl<AdmSpace> im
             //查询建筑下的空间
             ObjectNode relationTo = JsonNodeFactory.instance.objectNode();
             relationTo.put("relCode", "Bd2Sp");
-            relationTo.put("graphCode", "MechInArch");
+            relationTo.put("graphCode", "ArchSubset");
             relationTo.put("$bindFlag", false);
             request.setRelationFrom(relationTo);
         }else if(StrUtil.isEmpty(request.getBuildingId()) && StrUtil.isEmpty(request.getFloorId())){
@@ -466,10 +466,10 @@ public class AdmSpaceServiceImpl extends AbstractAdmBaseServiceImpl<AdmSpace> im
             List<RelationDTO> relationDTOS = new ArrayList<>(vosR.size());
             vosR.forEach(admSpace -> {
                 if (StrUtil.isNotEmpty(admSpace.getBuildingId())) {
-                    relationDTOS.add(new RelationDTO("GtArchSubset001", "ArchSubset", "Bd2Sp", null, admSpace.getBuildingId(), admSpace.getId()));
+                    relationDTOS.add(new RelationDTO("GtArchSubset001", "ArchSubset", "Bd2Sp", admSpace.getClassCode(), admSpace.getBuildingId(), admSpace.getId()));
                 }
                 if (StrUtil.isNotEmpty(admSpace.getFloorId())) {
-                    relationDTOS.add(new RelationDTO("GtArchSubset001", "ArchSubset", "Fl2Sp", null, admSpace.getFloorId(), admSpace.getId()));
+                    relationDTOS.add(new RelationDTO("GtArchSubset001", "ArchSubset", "Fl2Sp", admSpace.getClassCode(), admSpace.getFloorId(), admSpace.getId()));
                 }
             });
             if (CollUtil.isNotEmpty(relationDTOS)) {