From c1413aeb9fe5d736af38e25285ac8d88074a89bf Mon Sep 17 00:00:00 2001
From: wuxw <928255095@qq.com>
Date: 星期五, 28 二月 2025 01:01:23 +0800
Subject: [PATCH] 开发完成运营房屋查询
---
service-report/src/main/java/com/java110/report/cmd/community/QueryCommunityUnitTreeCmd.java | 122 +++++++++++++++++++++++++++++++++++++---
1 files changed, 113 insertions(+), 9 deletions(-)
diff --git a/service-report/src/main/java/com/java110/report/cmd/community/QueryCommunityUnitTreeCmd.java b/service-report/src/main/java/com/java110/report/cmd/community/QueryCommunityUnitTreeCmd.java
index 12c5b64..6fca452 100644
--- a/service-report/src/main/java/com/java110/report/cmd/community/QueryCommunityUnitTreeCmd.java
+++ b/service-report/src/main/java/com/java110/report/cmd/community/QueryCommunityUnitTreeCmd.java
@@ -11,6 +11,7 @@
import com.java110.intf.report.IReportCommunityInnerServiceSMO;
import com.java110.utils.exception.CmdException;
import com.java110.utils.util.ListUtil;
+import com.java110.utils.util.StringUtil;
import com.java110.vo.ResultVo;
import org.springframework.beans.factory.annotation.Autowired;
@@ -48,22 +49,125 @@
}
JSONObject communityInfo = null;
- for(UnitDto tmpUnitDto:unitDtos){
- if(!hasInCommunitys(tmpUnitDto,communitys)){
+ for (UnitDto tmpUnitDto : unitDtos) {
+ if (!hasInCommunity(tmpUnitDto, communitys)) {
communityInfo = new JSONObject();
- communityInfo.put("id","c_"+tmpUnitDto.getCommunityId());
- communityInfo.put("communityId",tmpUnitDto.getCommunityId());
- communityInfo.put("text",tmpUnitDto.getCommunityName());
- communityInfo.put("icon","/img/org.png");
- communityInfo.put("children",new JSONArray());
+ communityInfo.put("id", "c_" + tmpUnitDto.getCommunityId());
+ communityInfo.put("communityId", tmpUnitDto.getCommunityId());
+ communityInfo.put("text", tmpUnitDto.getCommunityName());
+ communityInfo.put("icon", "/img/org.png");
+ communityInfo.put("children", new JSONArray());
communitys.add(communityInfo);
+ }
+ }
+
+ JSONObject community = null;
+ for (int cIndex = 0; cIndex < communitys.size(); cIndex++) {
+ community = communitys.getJSONObject(cIndex);
+ // find floor data in unitDtos
+ findFloor(community, unitDtos);
+ }
+ context.setResponseEntity(ResultVo.createResponseEntity(communitys));
+
+
+ }
+
+ /**
+ * find community floor data
+ *
+ * @param community current community
+ * @param unitDtos all units data
+ */
+ private void findFloor(JSONObject community, List<UnitDto> unitDtos) {
+ JSONArray floors = community.getJSONArray("children");
+ JSONObject floorInfo = null;
+ for (UnitDto tmpUnitDto : unitDtos) {
+ if (!hasInFloor(tmpUnitDto, floors)) {
+ floorInfo = new JSONObject();
+ floorInfo.put("id", "f_" + tmpUnitDto.getFloorId());
+ floorInfo.put("floorId", tmpUnitDto.getFloorId());
+ floorInfo.put("text", tmpUnitDto.getFloorNum()+"鏍�");
+ floorInfo.put("icon", "/img/floor.png");
+ floorInfo.put("children", new JSONArray());
+ floors.add(floorInfo);
+ }
+ }
+
+
+ JSONObject floor = null;
+ for (int cIndex = 0; cIndex < floors.size(); cIndex++) {
+ floor = floors.getJSONObject(cIndex);
+ // find floor data in unitDtos
+ findUnit(floor, unitDtos);
+ }
+ }
+
+ private void findUnit(JSONObject floor, List<UnitDto> unitDtos) {
+ JSONArray units = floor.getJSONArray("children");
+ JSONObject unitInfo = null;
+ for (UnitDto tmpUnitDto : unitDtos) {
+ if (!hasInUnit(tmpUnitDto, units)) {
+ unitInfo = new JSONObject();
+ unitInfo.put("id", "u_" + tmpUnitDto.getUnitId());
+ unitInfo.put("unitId", tmpUnitDto.getUnitId());
+ unitInfo.put("text", tmpUnitDto.getUnitNum()+"鍗曞厓");
+ unitInfo.put("icon", "/img/unit.png");
+ units.add(unitInfo);
}
}
}
- private boolean hasInCommunitys(UnitDto tmpUnitDto,JSONArray communitys) {
- return true;
+ private boolean hasInUnit(UnitDto unitDto, JSONArray units) {
+ JSONObject unit = null;
+ for (int cIndex = 0; cIndex < units.size(); cIndex++) {
+ unit = units.getJSONObject(cIndex);
+ if (!unit.containsKey("unitId")) {
+ continue;
+ }
+ if (StringUtil.isEmpty(unit.getString("unitId"))) {
+ continue;
+ }
+ if (unit.getString("unitId").equals(unitDto.getUnitId())) {
+ return true;
+ }
+ }
+ return false;
+ }
+
+ private boolean hasInFloor(UnitDto tmpUnitDto, JSONArray floors) {
+ JSONObject floor = null;
+ for (int cIndex = 0; cIndex < floors.size(); cIndex++) {
+ floor = floors.getJSONObject(cIndex);
+ if (!floor.containsKey("floorId")) {
+ continue;
+ }
+ if (StringUtil.isEmpty(floor.getString("floorId"))) {
+ continue;
+ }
+ if (floor.getString("floorId").equals(tmpUnitDto.getFloorId())) {
+ return true;
+ }
+ }
+ return false;
+ }
+
+
+ private boolean hasInCommunity(UnitDto tmpUnitDto, JSONArray communitys) {
+ JSONObject community = null;
+ for (int cIndex = 0; cIndex < communitys.size(); cIndex++) {
+ community = communitys.getJSONObject(cIndex);
+ if (!community.containsKey("communityId")) {
+ continue;
+ }
+ if (StringUtil.isEmpty(community.getString("communityId"))) {
+ continue;
+ }
+ if (community.getString("communityId").equals(tmpUnitDto.getCommunityId())) {
+ return true;
+ }
+ }
+ return false;
}
--
Gitblit v1.8.0