|
@@ -169,6 +169,8 @@ public class ProjectService {
|
|
}
|
|
}
|
|
|
|
|
|
public JSONArray bimList(long id) {
|
|
public JSONArray bimList(long id) {
|
|
|
|
+ JSONArray jsonArray = new JSONArray();
|
|
|
|
+
|
|
Project p = projectDao.get(id);
|
|
Project p = projectDao.get(id);
|
|
List<ProjectItem> projectItemList = p.getProjectItemList();
|
|
List<ProjectItem> projectItemList = p.getProjectItemList();
|
|
Map<Long, ProjectItem> itemMap = new HashMap<>();
|
|
Map<Long, ProjectItem> itemMap = new HashMap<>();
|
|
@@ -178,14 +180,20 @@ public class ProjectService {
|
|
itemMap.put(projectItem.getId(), projectItem);
|
|
itemMap.put(projectItem.getId(), projectItem);
|
|
}
|
|
}
|
|
|
|
|
|
- List<ProjectItemTarget> projectItemTargetList = projectItemTargetDao.getProjectItemIds(itemIds);
|
|
|
|
- Map<Long, ProjectItemTarget> itemTargetMap = new HashMap<>();
|
|
|
|
|
|
+ if (itemIds.size() == 0) {
|
|
|
|
+ return jsonArray;
|
|
|
|
+ }
|
|
List<Long> targetIds = new ArrayList<>();
|
|
List<Long> targetIds = new ArrayList<>();
|
|
|
|
+ Map<Long, ProjectItemTarget> itemTargetMap = new HashMap<>();
|
|
|
|
+ List<ProjectItemTarget> projectItemTargetList = projectItemTargetDao.getProjectItemIds(itemIds);
|
|
for (ProjectItemTarget projectItemTarget : projectItemTargetList) {
|
|
for (ProjectItemTarget projectItemTarget : projectItemTargetList) {
|
|
targetIds.add(projectItemTarget.getId());
|
|
targetIds.add(projectItemTarget.getId());
|
|
itemTargetMap.put(projectItemTarget.getId(), projectItemTarget);
|
|
itemTargetMap.put(projectItemTarget.getId(), projectItemTarget);
|
|
}
|
|
}
|
|
|
|
|
|
|
|
+ if (targetIds.size() == 0) {
|
|
|
|
+ return jsonArray;
|
|
|
|
+ }
|
|
Map<String, Long> bimModelMap = new HashMap<>();
|
|
Map<String, Long> bimModelMap = new HashMap<>();
|
|
List<String> bimIds = new ArrayList<>();
|
|
List<String> bimIds = new ArrayList<>();
|
|
List<BimModelTarget> bimList = bimModelTargetDao.getProjectItemTargetIds(targetIds);
|
|
List<BimModelTarget> bimList = bimModelTargetDao.getProjectItemTargetIds(targetIds);
|
|
@@ -196,8 +204,12 @@ public class ProjectService {
|
|
bimModelMap.put(split[i], bim.getProjectItemTargetId());
|
|
bimModelMap.put(split[i], bim.getProjectItemTargetId());
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
+
|
|
|
|
+ if (bimIds.size() == 0) {
|
|
|
|
+ return jsonArray;
|
|
|
|
+ }
|
|
String join = String.join(",", bimIds);
|
|
String join = String.join(",", bimIds);
|
|
- JSONArray jsonArray = JSONObject.parseArray(bimClient.getBimIds(join));
|
|
|
|
|
|
+ jsonArray = JSONObject.parseArray(bimClient.getBimIds(join));
|
|
for (int i = 0; i < jsonArray.size(); i++) {
|
|
for (int i = 0; i < jsonArray.size(); i++) {
|
|
JSONObject jo = jsonArray.getJSONObject(i);
|
|
JSONObject jo = jsonArray.getJSONObject(i);
|
|
long targetId = bimModelMap.get(jo.getString("id"));
|
|
long targetId = bimModelMap.get(jo.getString("id"));
|