Procházet zdrojové kódy

接口文档修改

linhuili před 3 roky
rodič
revize
359b4f60a2

+ 1 - 0
src/main/java/com/persagy/dmp/middleware/constant/CommonConsant.java

@@ -48,4 +48,5 @@ public class CommonConsant {
     /** 商铺bimTypeID */
     public final static String STORE_BIMTYPEID= "1.3.2.0";
 
+
 }

+ 3 - 0
src/main/java/com/persagy/dmp/middleware/controller/SpaceController.java

@@ -75,6 +75,9 @@ public class SpaceController {
         if(StringUtils.isEmpty(request.getSpaceId())){
             throw new Exception("空间ID不能为空");
         }
+        if(StringUtils.isEmpty(request.getSystemCode())){
+            throw new Exception("系统编码不能为空");
+        }
         //查询空间内的设备/阀门
         CommonResult response = spaceService.relQuery(context,request);
         return  response;

+ 4 - 2
src/main/java/com/persagy/dmp/middleware/service/impl/FloorServiceImpl.java

@@ -10,6 +10,7 @@ import com.persagy.dmp.middleware.constant.CommonConsant;
 import com.persagy.dmp.middleware.constant.enums.ClassCodeEnum;
 import com.persagy.dmp.middleware.constant.enums.RelationTypeEnum;
 import com.persagy.dmp.middleware.constant.enums.WdDefTypeEnum;
+import com.persagy.dmp.middleware.constant.enums.WdModeCodeEnum;
 import com.persagy.dmp.middleware.entity.dto.CommonRequestDTO;
 import com.persagy.dmp.middleware.entity.dto.InstanceUrlParam;
 import com.persagy.dmp.middleware.entity.response.CommonResult;
@@ -114,13 +115,14 @@ public class FloorServiceImpl implements IFloorService {
         //查询广联达空间类型
         WdDefineTypeRel defineTypeRel = new WdDefineTypeRel();
         defineTypeRel.setObjType(WdDefTypeEnum.SPACE.getValue());
+        defineTypeRel.setWdModelCode(WdModeCodeEnum.LC.getValue());
         List<WdDefineTypeRel> defineTypeRels = iWdDefineTypeRelService.query(context,defineTypeRel);
 
         //过滤不需要的类型,只需要楼层功能相关的空间
-        List<WdDefineTypeRel> floorDefineTypeRels = defineTypeRels.stream().filter(k->"LC".equals(k.getWdModelCode())).collect(Collectors.toList());
+        //List<WdDefineTypeRel> floorDefineTypeRels = defineTypeRels.stream().filter(k->"LC".equals(k.getWdModelCode())).collect(Collectors.toList());
 
         //根据广联达空间类型查询空间信息
-        List<JSONObject> spaceList = spaceService.querySpaceByGldTypeRel(context, floorDefineTypeRels, request);
+        List<JSONObject> spaceList = spaceService.querySpaceByGldTypeRel(context, defineTypeRels, request);
         return spaceList;
     }
 

+ 8 - 10
src/main/java/com/persagy/dmp/middleware/service/impl/SpaceServiceImpl.java

@@ -14,6 +14,7 @@ import com.persagy.dmp.middleware.constant.CommonConsant;
 import com.persagy.dmp.middleware.constant.enums.ClassCodeEnum;
 import com.persagy.dmp.middleware.constant.enums.RelationTypeEnum;
 import com.persagy.dmp.middleware.constant.enums.WdDefTypeEnum;
+import com.persagy.dmp.middleware.constant.enums.WdModeCodeEnum;
 import com.persagy.dmp.middleware.entity.dto.CommonRequestDTO;
 import com.persagy.dmp.middleware.entity.dto.InstanceUrlParam;
 import com.persagy.dmp.middleware.entity.response.CommonResult;
@@ -103,15 +104,6 @@ public class SpaceServiceImpl implements ISpaceService {
         //获取空间的BIM构建编码
         String bimTypeId = space.getString(CommonConsant.ROOM_LOCAL_FUNC_TYPE_ID);
 
-        //查询中台基础空间类型
-        List<JSONObject> dmpSpaceTypeList = getDmpBaseSpaceType(context);
-        Set<String> dmpSpaceTypeCodes= new HashSet<>();
-        if(CollUtil.isNotEmpty(dmpSpaceTypeList)){
-            dmpSpaceTypeCodes = dmpSpaceTypeList.stream().map(k->k.getString("code")).collect(Collectors.toSet());
-        }
-        if(dmpSpaceTypeCodes.contains(bimTypeId)){
-            bimTypeId = space.getString(CommonConsant.CLASS_CODE);
-        }
         //查询指定空间类型下的设备
         List<JSONObject> content = queryEquipInSpace(context, request, bimTypeId);
         return CommonResult.success(content);
@@ -132,17 +124,23 @@ public class SpaceServiceImpl implements ISpaceService {
         //查询空间映射表
         WdDefineTypeRel defineTypeRel = new WdDefineTypeRel();
         defineTypeRel.setObjType(WdDefTypeEnum.SPACE.getValue());
+        defineTypeRel.setWdModelCode(WdModeCodeEnum.EQ.getValue());
+        defineTypeRel.setWdSystemCode(request.getSystemCode());
         List<WdDefineTypeRel> spaceTypeRelList = iWdDefineTypeRelService.query(context,defineTypeRel);
 
         //根据空间的BimTypeId构建编码获取所在系统
+/*
         Map<String, List<WdDefineTypeRel>> spaceTypeRelMap = spaceTypeRelList.stream().collect(Collectors.groupingBy(WdDefineTypeRel::getBimTypeId));
         List<WdDefineTypeRel> defineTypeRels = spaceTypeRelMap.get(bimTypeId);
         if(CollUtil.isEmpty(defineTypeRels)){
             throw new Exception("空间所属系统不存在");
         }
         Set<String> wdSystemCodes = defineTypeRels.stream().filter(k-> StringUtils.isNotEmpty(k.getWdSystemCode())).map(k->k.getWdSystemCode()).collect(Collectors.toSet());
+*/
 
         //获取万达系统类下的设备类/阀门
+        Set<String> wdSystemCodes = new HashSet<>();
+        wdSystemCodes.add(request.getSystemCode());
         List<WdDefineTypeRel> equipByWdObjectType = getEquipByWdObjectType(wdSystemCodes);
         List<JSONObject> objects = new ArrayList<>();
         Set<String> bimTypeIds = new HashSet<>();
@@ -190,7 +188,7 @@ public class SpaceServiceImpl implements ISpaceService {
     private List<JSONObject> queryDmpEquipInSpace(InstanceUrlParam context, CommonRequestDTO request,Set<String> bimTypeIds){
         List<JSONObject> result = new ArrayList<>();
         ObjectNode criteria = JsonNodeFactory.instance.objectNode();
-        ArrayNode arrayNode = criteria.withArray("bimTypeId");
+        ArrayNode arrayNode = criteria.withArray(CommonConsant.BIM_TYPE_ID);
         bimTypeIds.forEach(item->arrayNode.add(item));
 
         //处理空间id

+ 16 - 17
src/main/resources/md/管理说明书接口缺失整理-后台.md

@@ -28,7 +28,7 @@
        “id”:"Fl******",   //楼层id
        “localId”:"#1",    //楼层本地编码
        "localName":"B2",  //楼层本地名称
-       "gcname":"B2",    
+       "wD_gcname":"B2",  //工程信息化楼层名称  
        "height":50,  //高度
        "area":120    //面积
     }
@@ -214,7 +214,7 @@
 {
     “buildId”:"****",    //建筑id(非必传,楼层ID为空时,必传)
     "floorId":"****",    //楼层id (非必传,不传查全楼)
-    “systemCode”:"****", //系统编码(必传,可根据系统筛选,不传时查所有
+    “systemCode”:"****", //系统编码(必传)
     “spaceId”:"*****"    //空间id(必传)
 }
 ```
@@ -364,23 +364,22 @@
    "count":12,
    "content":[
      {
-      "id":"***",             //空间id
-      "name":"***",           //空间名称
-      “localId”:"****",       //空间本地编码
-      “localName”:"****",     //空间本地名称
-      "fireZoneName":"***",   //防火分区
-      "hostNumber":"***",     //主机编号
-      "loopNumber":"***",     //回路编号
-      "smokeNum": ***,        //烟感数量
-      "warmNum": ***,         //温感数量
-      "handNum": ***,         //手报数量
-      "hydrantsNum": ***,     //消火栓数量
-      "moldNum": ***,          //模块数量 
-      “bimId":"***",       //bimID
+      "id":"***",                  //空间id
+      "name":"***",                //空间名称
+      “localId”:"****",            //空间本地编码
+      “localName”:"****",          //空间本地名称
+      "wD_zhujibianhao":"***",     //主机编号
+      "wD_huilubianhao":"***",     //回路编号
+      "wD_yanganshuliang": ***,    //烟感数量
+      "wD_wenganshuliang": ***,    //温感数量
+      "wD_shoubaoshuliang": ***,   //手报数量
+      "wD_xiaohuoshuanshuliang": ***,     //消火栓数量
+      "wD_mokuaishuliang": ***,           //模块数量 
+      “bimId":"***",                      //bimID
       "bimLocation":"-178.1,126.3,225.9", //bim坐标
-      “bimTypeId”:"***",   //BIM构建编码
+      “roomFunc”:"***",                  //BIM构建编码
       “outLine”:[{"x":123.2,"y":210,"z":227.9}],  //轮廓坐标
-      “objType”:"***",     //对象类型:space-空间
+      “roomLocalFuncTypeID”:"***",     //空间bimTypeId
      }
    ]
 }