From 9cb0a6de9b198c1ed87690b6905f0b772df34b5c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E4=BA=94=E8=80=81=E5=B3=B0?= Date: Fri, 18 Oct 2024 23:08:50 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=A5=BC=E6=A0=8B=E5=8D=95?= =?UTF-8?q?=E5=85=83=E5=8F=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../adapt/accessControl/yiteSmart/SyncUserCardImpl.java | 4 ++-- .../adapt/accessControl/yiteSmart/SyncUserImpl.java | 6 +++--- .../java/com/java110/hal/http/yiteSmart/YiteSmartHal.java | 2 +- .../hal/http/yiteSmart/bmo/impl/SyncCardsBidBmoImpl.java | 4 ++-- .../hal/http/yiteSmart/bmo/impl/SyncUserBidBmoImpl.java | 6 +++--- 5 files changed, 11 insertions(+), 11 deletions(-) diff --git a/iot-accessControl/src/main/java/com/java110/accessControl/manufactor/adapt/accessControl/yiteSmart/SyncUserCardImpl.java b/iot-accessControl/src/main/java/com/java110/accessControl/manufactor/adapt/accessControl/yiteSmart/SyncUserCardImpl.java index ffe4089c..2ad77afc 100644 --- a/iot-accessControl/src/main/java/com/java110/accessControl/manufactor/adapt/accessControl/yiteSmart/SyncUserCardImpl.java +++ b/iot-accessControl/src/main/java/com/java110/accessControl/manufactor/adapt/accessControl/yiteSmart/SyncUserCardImpl.java @@ -106,7 +106,7 @@ public class SyncUserCardImpl implements ISyncUserCard { addCard = new JSONObject(); addCard.put("card", accessControlFacePo.getCardNumber()); - addCard.put("roomnum", "9999"); + addCard.put("roomnum", "9909-909");//添加楼栋单元号 long timestrap = DateUtil.getDateFromStringA(accessControlFacePo.getEndTime()).getTime(); timestrap = timestrap / 1000; addCard.put("expired", timestrap); @@ -189,7 +189,7 @@ public class SyncUserCardImpl implements ISyncUserCard { addCard.put("card", accessControlFacePo.getCardNumber()); String roomName = accessControlFacePo.getRoomName(); if (!StringUtil.isEmpty(roomName) && roomName.split("-", 3).length == 3) { - addCard.put("roomnum", roomName.split("-", 3)[2]); + addCard.put("roomnum", roomName.split("-", 3)[0] + roomName.split("-", 3)[1] + "-" + roomName.split("-", 3)[2]); } long timestrap = DateUtil.getDateFromStringA(accessControlFacePo.getEndTime()).getTime(); timestrap = timestrap / 1000; diff --git a/iot-accessControl/src/main/java/com/java110/accessControl/manufactor/adapt/accessControl/yiteSmart/SyncUserImpl.java b/iot-accessControl/src/main/java/com/java110/accessControl/manufactor/adapt/accessControl/yiteSmart/SyncUserImpl.java index 07af3987..a832d32e 100644 --- a/iot-accessControl/src/main/java/com/java110/accessControl/manufactor/adapt/accessControl/yiteSmart/SyncUserImpl.java +++ b/iot-accessControl/src/main/java/com/java110/accessControl/manufactor/adapt/accessControl/yiteSmart/SyncUserImpl.java @@ -116,12 +116,12 @@ public class SyncUserImpl implements ISyncUser { addRoom = new JSONObject(); addRoom.put("id", 1); addRoom.put("uid", 1); - addRoom.put("name", "9999"); - addRoom.put("num", "9999"); + addRoom.put("name", "管理处"); //修改物业中心名称 + addRoom.put("num", "9909-909");//添加楼栋单元号 String roomName = accessControlFaceDtos.get(0).getRoomName(); if (!StringUtil.isEmpty(roomName) && roomName.split("-", 3).length == 3) { addRoom.put("name", roomName.split("-", 3)[2]); - addRoom.put("num", roomName.split("-", 3)[2]); + addRoom.put("num", roomName.split("-", 3)[0] + roomName.split("-", 3)[1] + "-" + roomName.split("-", 3)[2]); //添加楼栋单元号 RoomDto roomDto = new RoomDto(); roomDto.setFloorNum(roomName.split("-", 3)[0]); roomDto.setUnitNum(roomName.split("-", 3)[1]); diff --git a/iot-hal/src/main/java/com/java110/hal/http/yiteSmart/YiteSmartHal.java b/iot-hal/src/main/java/com/java110/hal/http/yiteSmart/YiteSmartHal.java index 78a6400c..352a02ff 100644 --- a/iot-hal/src/main/java/com/java110/hal/http/yiteSmart/YiteSmartHal.java +++ b/iot-hal/src/main/java/com/java110/hal/http/yiteSmart/YiteSmartHal.java @@ -185,7 +185,7 @@ public class YiteSmartHal { data.put("gate_button_phone", "0"); data.put("gate_button_room", "1"); data.put("gate_button_room_input", "1"); - data.put("gate_call_manager", "1"); + data.put("gate_call_manager", "0"); data.put("gate_capture_picture", "1"); data.put("gate_check_face_switch", "1"); data.put("gate_open_face", "1"); diff --git a/iot-hal/src/main/java/com/java110/hal/http/yiteSmart/bmo/impl/SyncCardsBidBmoImpl.java b/iot-hal/src/main/java/com/java110/hal/http/yiteSmart/bmo/impl/SyncCardsBidBmoImpl.java index c5a712e9..76860de9 100644 --- a/iot-hal/src/main/java/com/java110/hal/http/yiteSmart/bmo/impl/SyncCardsBidBmoImpl.java +++ b/iot-hal/src/main/java/com/java110/hal/http/yiteSmart/bmo/impl/SyncCardsBidBmoImpl.java @@ -154,7 +154,7 @@ public class SyncCardsBidBmoImpl implements ISyncCardsBidBmo { for (AccessControlFaceDto tmpAccessControlFaceDto : accessControlFaceDtos) { addCard = new JSONObject(); addCard.put("card", tmpAccessControlFaceDto.getCardNumber()); - addCard.put("roomnum", "9999"); + addCard.put("roomnum", "9909-909");//添加楼栋单元号 long timestrap = DateUtil.getDateFromStringA(tmpAccessControlFaceDto.getEndTime()).getTime(); timestrap = timestrap / 1000; addCard.put("expired", timestrap); @@ -247,7 +247,7 @@ public class SyncCardsBidBmoImpl implements ISyncCardsBidBmo { if (tmpRoomDto.getRoomId().equals(tmpOwnerRoomRelDto.getRoomId())) { addCard = new JSONObject(); addCard.put("card", tmpOwnerRoomRelDto.getCardNumber()); - addCard.put("roomnum", tmpRoomDto.getRoomNum()); + addCard.put("roomnum", unitDtos.get(0).getFloorNum() + unitDtos.get(0).getUnitNum() + "-" + tmpRoomDto.getRoomNum());//添加楼栋单元号 long timestrap = tmpOwnerRoomRelDto.getEndTime().getTime(); timestrap = timestrap / 1000; addCard.put("expired", timestrap); diff --git a/iot-hal/src/main/java/com/java110/hal/http/yiteSmart/bmo/impl/SyncUserBidBmoImpl.java b/iot-hal/src/main/java/com/java110/hal/http/yiteSmart/bmo/impl/SyncUserBidBmoImpl.java index 2d1b760f..3a8aab7c 100644 --- a/iot-hal/src/main/java/com/java110/hal/http/yiteSmart/bmo/impl/SyncUserBidBmoImpl.java +++ b/iot-hal/src/main/java/com/java110/hal/http/yiteSmart/bmo/impl/SyncUserBidBmoImpl.java @@ -133,8 +133,8 @@ public class SyncUserBidBmoImpl implements ISyncUserBidBmo { addRoom = new JSONObject(); addRoom.put("id", 1); addRoom.put("uid", 1); - addRoom.put("name", "9999"); - addRoom.put("num", "9999"); + addRoom.put("name", "管理处");//修改物业中心名称 + addRoom.put("num", "9909-909");//添加楼栋单元号 users = new JSONArray(); addRoom.put("user", users); @@ -242,7 +242,7 @@ public class SyncUserBidBmoImpl implements ISyncUserBidBmo { addRoom.put("id", tmpRoomDto.getRoomId()); addRoom.put("uid", tmpRoomDto.getRoomId()); addRoom.put("name", tmpRoomDto.getRoomNum()); - addRoom.put("num", tmpRoomDto.getRoomNum()); + addRoom.put("num", unitDtos.get(0).getFloorNum() + unitDtos.get(0).getUnitNum() + "-" + tmpRoomDto.getRoomNum());//添加楼栋单元号 users = new JSONArray(); addRoom.put("user", users); if (ListUtil.isNull(ownerRoomRelDtos)) { -- Gitee