|
@@ -1,6 +1,7 @@
|
|
|
package com.persagy.proxy.object.service.impl;
|
|
|
|
|
|
import cn.hutool.core.collection.CollUtil;
|
|
|
+import cn.hutool.core.map.MapUtil;
|
|
|
import cn.hutool.core.util.StrUtil;
|
|
|
import cn.hutool.json.JSONUtil;
|
|
|
import com.fasterxml.jackson.databind.ObjectMapper;
|
|
@@ -16,7 +17,9 @@ import org.springframework.stereotype.Service;
|
|
|
|
|
|
import java.io.IOException;
|
|
|
import java.util.ArrayList;
|
|
|
+import java.util.HashMap;
|
|
|
import java.util.List;
|
|
|
+import java.util.Map;
|
|
|
|
|
|
/**
|
|
|
* ADM 楼层 实现类
|
|
@@ -46,15 +49,26 @@ public class AdmFloorServiceImpl extends AbstractAdmBaseServiceImpl<AdmFloor> im
|
|
|
list.add("name");
|
|
|
list.add("localId");
|
|
|
list.add("localName");
|
|
|
+ list.add("classCode");
|
|
|
list.add("outline");
|
|
|
list.add("floorSequenceId");
|
|
|
list.add("modelId");
|
|
|
+ list.add("floorElevation");
|
|
|
+ list.add("floorMap");
|
|
|
+ list.add("floorSequenceID");
|
|
|
+ list.add("height");
|
|
|
list.add("infos");
|
|
|
list.add("properties");
|
|
|
request.setProjection(list);
|
|
|
AdmResponse rs = doQuery(context, request, clazz);
|
|
|
List<AdmFloor> vos = (List<AdmFloor>) rs.getContent();
|
|
|
ensureSpecialValues(context, vos, QUERY);
|
|
|
+ vos.forEach(vo->{
|
|
|
+ Map<String, Object> objectMap = MapUtil.defaultIfEmpty(vo.getInfos(), new HashMap<>());
|
|
|
+ objectMap.put("floorSequenceID",vo.getFloorSequenceID());
|
|
|
+ vo.setFloorSequenceID(null);
|
|
|
+ vo.setInfos(objectMap);
|
|
|
+ });
|
|
|
rs.setContent(vos);
|
|
|
return rs;
|
|
|
}
|