From 27aabc082a6972a44b61a3d8dce007f7707736fe Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E4=BA=94=E8=80=81=E5=B3=B0?= Date: Wed, 30 Oct 2024 20:13:58 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E8=BF=94=E5=9B=9E0=E4=B9=8B=E5=89=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../adapt/accessControl/yiteSmart/SyncUserCardImpl.java | 2 +- .../adapt/accessControl/yiteSmart/SyncUserImpl.java | 7 ++----- .../java/com/java110/hal/http/yiteSmart/YiteSmartHal.java | 2 +- .../hal/http/yiteSmart/bmo/impl/SyncCardsBidBmoImpl.java | 2 +- .../hal/http/yiteSmart/bmo/impl/SyncUserBidBmoImpl.java | 2 +- 5 files changed, 6 insertions(+), 9 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 b535acf7..6ba86178 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 @@ -190,7 +190,7 @@ public class SyncUserCardImpl implements ISyncUserCard { String roomName = accessControlFacePo.getRoomName(); if (!StringUtil.isEmpty(roomName) && roomName.split("-", 3).length == 3) { //addCard.put("roomnum", roomName.split("-", 3)[0] + roomName.split("-", 3)[1] + "-" + roomName.split("-", 3)[2]); - addCard.put("roomnum", String.format("%02d%02d-%s", + addCard.put("roomnum", String.format("%02d%02d-%04d", Integer.parseInt(roomName.split("-", 3)[0]), Integer.parseInt(roomName.split("-", 3)[1]), Integer.parseInt(roomName.split("-", 3)[2]))); 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 a8512558..48a1bf09 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 @@ -122,7 +122,7 @@ public class SyncUserImpl implements ISyncUser { if (!StringUtil.isEmpty(roomName) && roomName.split("-", 3).length == 3) { addRoom.put("name", roomName.split("-", 3)[2]); //addRoom.put("num", roomName.split("-", 3)[0] + roomName.split("-", 3)[1] + "-" + roomName.split("-", 3)[2]); //添加楼栋单元号 - addRoom.put("num", String.format("%02d%02d-%s", + addRoom.put("num", String.format("%02d%02d-%4d", Integer.parseInt(roomName.split("-", 3)[0]), Integer.parseInt(roomName.split("-", 3)[1]), Integer.parseInt(roomName.split("-", 3)[2]))); @@ -130,10 +130,7 @@ public class SyncUserImpl implements ISyncUser { RoomDto roomDto = new RoomDto(); roomDto.setFloorNum(roomName.split("-", 3)[0]); roomDto.setUnitNum(roomName.split("-", 3)[1]); - roomDto.setRoomNum(String.format("%02d%02d-%s", - Integer.parseInt(roomName.split("-", 3)[0]), - Integer.parseInt(roomName.split("-", 3)[1]), - Integer.parseInt(roomName.split("-", 3)[2]))); + roomDto.setRoomNum(roomName.split("-", 3)[2]); roomDto.setCommunityId(accessControlFaceDtos.get(0).getCommunityId()); List roomDtos = roomV1InnerServiceSMOImpl.queryRooms(roomDto); if (ListUtil.isNull(roomDtos)) { 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 18ddbf30..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 @@ -187,7 +187,7 @@ public class YiteSmartHal { data.put("gate_button_room_input", "1"); data.put("gate_call_manager", "0"); data.put("gate_capture_picture", "1"); - data.put("gate_check_face_switch", "0"); + data.put("gate_check_face_switch", "1"); data.put("gate_open_face", "1"); data.put("gate_qr_pwd_state", "1"); data.put("gate_register_face", "0"); 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 51c15f46..356718dd 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 @@ -248,7 +248,7 @@ public class SyncCardsBidBmoImpl implements ISyncCardsBidBmo { addCard = new JSONObject(); addCard.put("card", tmpOwnerRoomRelDto.getCardNumber()); //addCard.put("roomnum", unitDtos.get(0).getFloorNum() + unitDtos.get(0).getUnitNum() + "-" + tmpRoomDto.getRoomNum());//添加楼栋单元号 - addCard.put("roomnum", String.format("%02d%02d-%s", + addCard.put("roomnum", String.format("%02d%02d-%04d", Integer.parseInt(unitDtos.get(0).getFloorNum()), Integer.parseInt(unitDtos.get(0).getUnitNum()), Integer.parseInt( tmpRoomDto.getRoomNum()))); 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 9c7d0665..dcfe4779 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 @@ -243,7 +243,7 @@ public class SyncUserBidBmoImpl implements ISyncUserBidBmo { addRoom.put("uid", tmpRoomDto.getRoomId()); addRoom.put("name", tmpRoomDto.getRoomNum()); //addRoom.put("num", unitDtos.get(0).getFloorNum() + unitDtos.get(0).getUnitNum() + "-" + tmpRoomDto.getRoomNum());//添加楼栋单元号 - addRoom.put("num", String.format("%02d%02d-%s", + addRoom.put("num", String.format("%02d%02d-%04d", Integer.parseInt(unitDtos.get(0).getFloorNum()), Integer.parseInt(unitDtos.get(0).getUnitNum()), Integer.parseInt(tmpRoomDto.getRoomNum()))); -- Gitee From 15fbdaaae0041ec9164c8e3a1c0a04e46ca25886 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E4=BA=94=E8=80=81=E5=B3=B0?= Date: Wed, 30 Oct 2024 20:34:02 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E7=89=A9=E4=B8=9A=E4=B8=AD=E5=BF=830000-90?= =?UTF-8?q?9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../adapt/accessControl/yiteSmart/SyncUserCardImpl.java | 2 +- .../manufactor/adapt/accessControl/yiteSmart/SyncUserImpl.java | 2 +- .../hal/http/yiteSmart/bmo/impl/SyncCardsBidBmoImpl.java | 2 +- .../java110/hal/http/yiteSmart/bmo/impl/SyncUserBidBmoImpl.java | 2 +- 4 files changed, 4 insertions(+), 4 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 6ba86178..d08abf90 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", "9909-909");//添加楼栋单元号 + addCard.put("roomnum", "0000-909");//添加楼栋单元号 long timestrap = DateUtil.getDateFromStringA(accessControlFacePo.getEndTime()).getTime(); timestrap = timestrap / 1000; addCard.put("expired", timestrap); 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 48a1bf09..a89b432d 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 @@ -117,7 +117,7 @@ public class SyncUserImpl implements ISyncUser { addRoom.put("id", 1); addRoom.put("uid", 1); addRoom.put("name", "管理处"); //修改物业中心名称 - addRoom.put("num", "9909-909");//添加楼栋单元号 + addRoom.put("num", "0000-909");//添加楼栋单元号 String roomName = accessControlFaceDtos.get(0).getRoomName(); if (!StringUtil.isEmpty(roomName) && roomName.split("-", 3).length == 3) { addRoom.put("name", roomName.split("-", 3)[2]); 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 356718dd..4181ec75 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", "9909-909");//添加楼栋单元号 + addCard.put("roomnum", "0000-909");//添加楼栋单元号 long timestrap = DateUtil.getDateFromStringA(tmpAccessControlFaceDto.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 dcfe4779..633c799b 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 @@ -134,7 +134,7 @@ public class SyncUserBidBmoImpl implements ISyncUserBidBmo { addRoom.put("id", 1); addRoom.put("uid", 1); addRoom.put("name", "管理处");//修改物业中心名称 - addRoom.put("num", "9909-909");//添加楼栋单元号 + addRoom.put("num", "0000-909");//添加楼栋单元号 users = new JSONArray(); addRoom.put("user", users); -- Gitee