From 05683f2b2bdbdbe21cf17ad523c21ab338bd1c54 Mon Sep 17 00:00:00 2001
From: wuxw <928255095@qq.com>
Date: 星期二, 19 七月 2022 21:49:55 +0800
Subject: [PATCH] 优化添加设备 功能
---
service-community/src/main/java/com/java110/community/cmd/room/QueryRoomsCmd.java | 15 +++++++++++++--
1 files changed, 13 insertions(+), 2 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 c636440..a1f3ebc 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
@@ -21,6 +21,7 @@
import com.java110.utils.util.Assert;
import com.java110.utils.util.BeanConvertUtil;
import com.java110.utils.util.DateUtil;
+import com.java110.utils.util.StringUtil;
import com.java110.vo.api.ApiRoomDataVo;
import com.java110.vo.api.ApiRoomVo;
import org.springframework.beans.factory.annotation.Autowired;
@@ -82,9 +83,19 @@
public void doCmd(CmdEvent event, ICmdDataFlowContext cmdDataFlowContext, JSONObject reqJson) throws CmdException {
RoomDto roomDto = BeanConvertUtil.covertBean(reqJson, RoomDto.class);
+ //瀵艰嚧涓氬姟鍙楃悊鎼滅储鏌ヨ
+// if (reqJson.containsKey("flag") && reqJson.getString("flag").equals("1")) {
+// if (reqJson.containsKey("roomNumLike") && !StringUtil.isEmpty(reqJson.getString("roomNumLike"))) {
+// String[] roomNumLikes = reqJson.getString("roomNumLike").split("-");
+// roomDto.setFloorNum(roomNumLikes[0]);
+// roomDto.setUnitNum(roomNumLikes[1]);
+// roomDto.setRoomNum(roomNumLikes[2]);
+// roomDto.setRoomNumLike("");
+// }
+// }
ApiRoomVo apiRoomVo = new ApiRoomVo();
//鏌ヨ鎬昏褰曟暟
- int total = roomInnerServiceSMOImpl.queryRoomsCount(BeanConvertUtil.covertBean(reqJson, RoomDto.class));
+ int total = roomInnerServiceSMOImpl.queryRoomsCount(roomDto);
apiRoomVo.setTotal(total);
List<RoomDto> roomDtoList = null;
if (total > 0) {
@@ -132,7 +143,7 @@
try {
roomDto.setStartTime(DateUtil.getDateFromString(tmpOwnerDto.getStartTime(), DateUtil.DATE_FORMATE_STRING_A));
roomDto.setEndTime(DateUtil.getDateFromString(tmpOwnerDto.getEndTime(), DateUtil.DATE_FORMATE_STRING_A));
- }catch (Exception e){
+ } catch (Exception e) {
//
}
roomDto.setOwnerId(tmpOwnerDto.getOwnerId());
--
Gitblit v1.8.0