|
@@ -2,9 +2,11 @@ package com.persagy.proxy.report.controller;
|
|
|
|
|
|
|
|
|
import cn.hutool.core.collection.CollUtil;
|
|
|
+import cn.hutool.core.comparator.CompareUtil;
|
|
|
import cn.hutool.core.map.MapUtil;
|
|
|
import cn.hutool.core.text.TextSimilarity;
|
|
|
import cn.hutool.core.util.BooleanUtil;
|
|
|
+import cn.hutool.core.util.NumberUtil;
|
|
|
import cn.hutool.core.util.StrUtil;
|
|
|
import com.fasterxml.jackson.databind.node.JsonNodeFactory;
|
|
|
import com.fasterxml.jackson.databind.node.ObjectNode;
|
|
@@ -166,7 +168,7 @@ public class AdmEquipShaftController {
|
|
|
continue;
|
|
|
}
|
|
|
|
|
|
- spInSh.setSpaceIdList(trafficMap.get(spInFlId));
|
|
|
+ spInSh.setSpaceIdList(trafficMap.getOrDefault(spInFlId,new HashSet<>()));
|
|
|
spaceList.add(spInSh);
|
|
|
|
|
|
List<AdmSpace> matchSpaces = aiSpaceMap.get(spInFlId);
|
|
@@ -176,15 +178,17 @@ public class AdmEquipShaftController {
|
|
|
for(AdmSpace matchSpace:matchSpaces) {
|
|
|
if(spaceList.add(matchSpace)) {
|
|
|
|
|
|
- matchSpace.setSpaceIdList(trafficMap.get(matchSpace.getId()));
|
|
|
+ matchSpace.setSpaceIdList(trafficMap.getOrDefault(matchSpace.getId(),new HashSet<>()));
|
|
|
}
|
|
|
}
|
|
|
}
|
|
|
if(CollUtil.isEmpty(spaceList)) {
|
|
|
+ floor.setSpaceList(new ArrayList<>());
|
|
|
continue;
|
|
|
}
|
|
|
floor.setSpaceList(CollUtil.newArrayList(spaceList));
|
|
|
}
|
|
|
+ floors.sort((f1,f2)-> CompareUtil.compare(f2.getFloorSequenceID(),f1.getFloorSequenceID(),false));
|
|
|
}
|
|
|
|
|
|
|