From c2b97e88614a8c0bb641848a4d868f54cb8382df Mon Sep 17 00:00:00 2001
From: xiaogang <905166056@qq.com>
Date: 星期二, 14 二月 2023 17:21:24 +0800
Subject: [PATCH] 1、优化访客预约2、优化报修设置3、优化缴费明细4、其他相关页面bug调整
---
service-community/src/main/java/com/java110/community/cmd/room/QueryRoomsCmd.java | 58 ++++++++++++++++++++++++++++++++++++++++++++++++++++++----
1 files changed, 54 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 025d7c0..21ec75e 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
@@ -5,15 +5,14 @@
import com.java110.core.context.ICmdDataFlowContext;
import com.java110.core.event.cmd.Cmd;
import com.java110.core.event.cmd.CmdEvent;
+import com.java110.doc.annotation.*;
import com.java110.dto.FloorDto;
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;
@@ -32,7 +31,38 @@
import java.util.ArrayList;
import java.util.List;
import java.util.Map;
+@Java110CmdDoc(title = "鏌ヨ鎴垮眿",
+ description = "鏌ヨ鎴垮眿淇℃伅",
+ httpMethod = "get",
+ url = "http://{ip}:{port}/app/room.queryRooms",
+ resource = "communityDoc",
+ author = "鍚村鏂�",
+ serviceCode = "room.queryRooms"
+)
+@Java110ParamsDoc(params = {
+ @Java110ParamDoc(name = "page", type = "int",length = 11, remark = "椤垫暟"),
+ @Java110ParamDoc(name = "row", type = "int",length = 11, remark = "琛屾暟"),
+ @Java110ParamDoc(name = "communityId", length = 30, remark = "灏忓尯ID"),
+ @Java110ParamDoc(name = "roomId", length = 30, remark = "鎴垮眿ID"),
+ @Java110ParamDoc(name = "floorId", length = 30, remark = "妤兼爧ID"),
+ @Java110ParamDoc(name = "unitId", length = 30, remark = "鍗曞厓ID"),
+})
+
+@Java110ResponseDoc(
+ params = {
+ @Java110ParamDoc(name = "records", type = "int", length = 11, remark = "鎬婚〉鏁�"),
+ @Java110ParamDoc(name = "total", type = "int", length = 11, remark = "鎬绘暟鎹�"),
+ @Java110ParamDoc(name = "rooms", type = "Object", remark = "鏈夋晥鏁版嵁"),
+ @Java110ParamDoc(parentNodeName = "rooms",name = "roomName", type = "String", remark = "鎴垮眿鍚嶇О"),
+ @Java110ParamDoc(parentNodeName = "rooms",name = "roomId", type = "String", remark = "鎴垮眿缂栧彿"),
+ }
+)
+
+@Java110ExampleDoc(
+ reqBody="http://{ip}:{port}/app/room.queryRooms?floorId=&floorName=&unitId=&roomNum=&roomId=&state=§ion=&roomType=1010301&roomSubType=&flag=0&page=1&row=10&communityId=2022081539020475",
+ resBody="{\"page\":0,\"records\":1,\"rooms\":[{\"apartment\":\"10101\",\"apartmentName\":\"涓�瀹や竴鍘匼",\"builtUpArea\":\"11.00\",\"endTime\":\"2037-01-01 00:00:00\",\"feeCoefficient\":\"1.00\",\"floorId\":\"732022081690440002\",\"floorNum\":\"D\",\"idCard\":\"\",\"layer\":\"1\",\"link\":\"18909711447\",\"ownerId\":\"772022082070860017\",\"ownerName\":\"寮犳澃\",\"remark\":\"11\",\"roomArea\":\"11.00\",\"roomAttrDto\":[{\"attrId\":\"112022082081600012\",\"listShow\":\"Y\",\"page\":-1,\"records\":0,\"roomId\":\"752022082030880010\",\"row\":0,\"specCd\":\"9035007248\",\"specName\":\"绮捐淇甛",\"statusCd\":\"0\",\"total\":0,\"value\":\"20\",\"valueName\":\"20\"}],\"roomId\":\"752022082030880010\",\"roomName\":\"D-1-1001\",\"roomNum\":\"1001\",\"roomRent\":\"0.00\",\"roomSubType\":\"110\",\"roomSubTypeName\":\"浣忓畢\",\"roomType\":\"1010301\",\"section\":\"1\",\"startTime\":\"2022-09-03 18:50:53\",\"state\":\"2001\",\"stateName\":\"宸插叆浣廫",\"unitId\":\"742022082058950007\",\"unitNum\":\"1\"}],\"rows\":0,\"total\":2}"
+)
@Java110Cmd(serviceCode = "room.queryRooms")
public class QueryRoomsCmd extends Cmd {
@@ -50,6 +80,9 @@
@Autowired
private IOwnerRoomRelInnerServiceSMO ownerRoomRelInnerServiceSMOImpl;
+
+ @Autowired
+ private IDataPrivilegeUnitV1InnerServiceSMO dataPrivilegeUnitV1InnerServiceSMOImpl;
@Autowired
private IMenuInnerServiceSMO menuInnerServiceSMOImpl;
@@ -94,6 +127,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"))
@@ -109,6 +151,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) {
@@ -165,6 +210,11 @@
}
}
ApiRoomVo apiRoomVo = new ApiRoomVo();
+
+ //鍛樺伐鏄惁 鏈夋潈闄愭煡璇�
+ if(unitIds != null && unitIds.length>0){
+ roomDto.setUnitIds(unitIds);
+ }
//鏌ヨ鎬昏褰曟暟
int total = roomInnerServiceSMOImpl.queryRoomsCount(roomDto);
apiRoomVo.setTotal(total);
--
Gitblit v1.8.0