|
@@ -210,12 +210,21 @@ public class ZoneInfoService {
|
210
|
210
|
Map<String, ModelInfo> modelPathIdMap = modelInfoList
|
211
|
211
|
.stream()
|
212
|
212
|
.collect(Collectors.toMap(ModelInfo::getOriginalPath, ModelInfo -> ModelInfo));
|
|
213
|
+ Map<String, String> collect = null;
|
|
214
|
+ if (zoneInfo1.getTypeNumber() == 1) {
|
|
215
|
+ collect = modelInfoList.stream().collect(Collectors.toMap(ModelInfo::getModelName, ModelInfo::getOriginalPath));
|
|
216
|
+ }
|
213
|
217
|
List<GeomInfo> geomInfoList = new ArrayList<>();
|
214
|
218
|
GeometryFactory geometryFactory = new GeometryFactory();
|
215
|
219
|
int j = 1;
|
216
|
220
|
for (TemplateInfo templateInfo : templateInfoList) {
|
217
|
221
|
String modelName = templateInfo.getModelPath();
|
|
222
|
+ if (zoneInfo1.getTypeNumber() == 1) {
|
|
223
|
+ assert collect != null;
|
|
224
|
+ modelName = collect.get(modelName.substring(0, modelName.lastIndexOf(".")).toLowerCase());
|
|
225
|
+ }
|
218
|
226
|
ModelInfo modelInfo = modelPathIdMap.get(modelName);
|
|
227
|
+
|
219
|
228
|
for (int i = 0; i < templateInfo.getLocation().size(); i++) {
|
220
|
229
|
JSONObject trans = templateInfo.getLocation().get(i);
|
221
|
230
|
GeomInfo geomInfo = new GeomInfo();
|