From 69074977a7fcef0e0060826f63a2feace463c67b Mon Sep 17 00:00:00 2001
From: Your Name <you@example.com>
Date: 星期四, 09 二月 2023 12:31:54 +0800
Subject: [PATCH] 优化楼栋名称
---
service-community/src/main/java/com/java110/community/cmd/room/QueryRoomsCmd.java | 34 ++++++++++++++++++++++++++++++----
1 files changed, 30 insertions(+), 4 deletions(-)
diff --git a/service-community/src/main/java/com/java110/community/cmd/room/QueryRoomsCmd.java b/service-community/src/main/java/com/java110/community/cmd/room/QueryRoomsCmd.java
index ac2955c..e3ca62a 100644
--- a/service-community/src/main/java/com/java110/community/cmd/room/QueryRoomsCmd.java
+++ b/service-community/src/main/java/com/java110/community/cmd/room/QueryRoomsCmd.java
@@ -1,6 +1,7 @@
package com.java110.community.cmd.room;
import com.alibaba.fastjson.JSONObject;
+import com.java110.community.bmo.room.IQueryRoomStatisticsBMO;
import com.java110.core.annotation.Java110Cmd;
import com.java110.core.context.ICmdDataFlowContext;
import com.java110.core.event.cmd.Cmd;
@@ -10,11 +11,9 @@
import com.java110.dto.RoomDto;
import com.java110.dto.UnitDto;
import com.java110.dto.basePrivilege.BasePrivilegeDto;
+import com.java110.dto.dataPrivilegeStaff.DataPrivilegeStaffDto;
import com.java110.dto.owner.OwnerDto;
-import com.java110.intf.community.IFloorInnerServiceSMO;
-import com.java110.intf.community.IMenuInnerServiceSMO;
-import com.java110.intf.community.IRoomInnerServiceSMO;
-import com.java110.intf.community.IUnitInnerServiceSMO;
+import com.java110.intf.community.*;
import com.java110.intf.user.IOwnerInnerServiceSMO;
import com.java110.intf.user.IOwnerRoomRelInnerServiceSMO;
import com.java110.utils.constant.ResponseConstant;
@@ -84,7 +83,13 @@
private IOwnerRoomRelInnerServiceSMO ownerRoomRelInnerServiceSMOImpl;
@Autowired
+ private IDataPrivilegeUnitV1InnerServiceSMO dataPrivilegeUnitV1InnerServiceSMOImpl;
+
+ @Autowired
private IMenuInnerServiceSMO menuInnerServiceSMOImpl;
+
+ @Autowired
+ private IQueryRoomStatisticsBMO queryRoomStatisticsBMOImpl;
protected static final int MAX_ROW = 10000;
@@ -126,6 +131,15 @@
// roomDto.setRoomNumLike("");
// }
// }
+
+ //鍛樺伐鏁版嵁鏉冮檺
+ String staffId = cmdDataFlowContext.getReqHeaders().get("user-id");
+ DataPrivilegeStaffDto dataPrivilegeStaffDto = new DataPrivilegeStaffDto();
+ dataPrivilegeStaffDto.setStaffId(staffId);
+ String[] unitIds = dataPrivilegeUnitV1InnerServiceSMOImpl.queryDataPrivilegeUnitsByStaff(dataPrivilegeStaffDto);
+
+
+
String roomId = "";
String unitId = "";
if (reqJson.containsKey("flag") && "0".equals(reqJson.getString("flag"))
@@ -141,6 +155,9 @@
UnitDto unitDto = new UnitDto();
unitDto.setFloorId(floor.getFloorId());
unitDto.setUnitNum(reqJson.getString("unitNum"));
+ if(unitIds != null && unitIds.length>0){
+ unitDto.setUnitIds(unitIds);
+ }
List<UnitDto> unitDtos = unitInnerServiceSMOImpl.queryUnits(unitDto);
if (unitDtos != null && unitDtos.size() > 0) {
for (UnitDto unit : unitDtos) {
@@ -197,6 +214,11 @@
}
}
ApiRoomVo apiRoomVo = new ApiRoomVo();
+
+ //鍛樺伐鏄惁 鏈夋潈闄愭煡璇�
+ if(unitIds != null && unitIds.length>0){
+ roomDto.setUnitIds(unitIds);
+ }
//鏌ヨ鎬昏褰曟暟
int total = roomInnerServiceSMOImpl.queryRoomsCount(roomDto);
apiRoomVo.setTotal(total);
@@ -204,6 +226,9 @@
if (total > 0) {
roomDtoList = roomInnerServiceSMOImpl.queryRooms(roomDto);
refreshRoomOwners(reqJson.getString("loginUserId"), reqJson.getString("communityId"), roomDtoList);
+
+ // 鏌ヨ鎴垮眿缁熻鏁版嵁
+ roomDtoList = queryRoomStatisticsBMOImpl.query(roomDtoList);
} else {
roomDtoList = new ArrayList<>();
}
@@ -258,6 +283,7 @@
}
//瀵逛笟涓绘墜鏈哄彿闅愯棌澶勭悊
String link = tmpOwnerDto.getLink();
+ roomDto.setOwnerTel(link); //绋嬪簭鐢� 涓昏鐢ㄤ互鏌ヨ 鎶ヤ慨绛夌粺璁′俊鎭�
if (mark.size() == 0 && link != null && !link.equals("") && link.length() > 10) {
link = link.substring(0, 3) + "****" + link.substring(7);
}
--
Gitblit v1.8.0