From 99e72b52aa2a20363592388603236e6b4037a5d3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E4=BA=94=E8=80=81=E5=B3=B0?= Date: Sat, 26 Oct 2024 21:40:31 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BA=BF=E7=89=B9?= =?UTF-8?q?=E9=97=A8=E7=A6=81=E6=A5=BC=E6=A0=8B=E5=8D=95=E5=85=83=E5=8F=B7?= =?UTF-8?q?=E5=92=8C=E4=BA=BA=E8=84=B8idbug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../adapt/accessControl/yiteSmart/SyncUserFaceImpl.java | 2 +- .../adapt/accessControl/yiteSmart/SyncUserImpl.java | 4 ++-- .../java110/hal/http/yiteSmart/bmo/impl/SyncFaceBmoImpl.java | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/iot-accessControl/src/main/java/com/java110/accessControl/manufactor/adapt/accessControl/yiteSmart/SyncUserFaceImpl.java b/iot-accessControl/src/main/java/com/java110/accessControl/manufactor/adapt/accessControl/yiteSmart/SyncUserFaceImpl.java index 9ba3e0d4..fb0211f1 100644 --- a/iot-accessControl/src/main/java/com/java110/accessControl/manufactor/adapt/accessControl/yiteSmart/SyncUserFaceImpl.java +++ b/iot-accessControl/src/main/java/com/java110/accessControl/manufactor/adapt/accessControl/yiteSmart/SyncUserFaceImpl.java @@ -76,7 +76,7 @@ public class SyncUserFaceImpl implements ISyncUserFace { Random random = new Random(); int faceId = random.nextInt(100); //d.put("face_id", phone.substring(6) + faceId); - d.put("face_id", user_uid.substring(9)); + d.put("face_id", user_uid.substring(user_uid.length() - 9)); d.put("source", "1"); ds.add(d); } 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 e30e7952..ce20f82a 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 @@ -124,8 +124,8 @@ public class SyncUserImpl implements ISyncUser { //addRoom.put("num", roomName.split("-", 3)[0] + roomName.split("-", 3)[1] + "-" + roomName.split("-", 3)[2]); //添加楼栋单元号 addRoom.put("num", String.format("%02d%02d-%04d", Integer.parseInt(roomName.split("-", 3)[0]), - Integer.parseInt(roomName.split("-", 3)[0]), - Integer.parseInt(roomName.split("-", 3)[0]))); + Integer.parseInt(roomName.split("-", 3)[1]), + Integer.parseInt(roomName.split("-", 3)[2]))); RoomDto roomDto = new RoomDto(); roomDto.setFloorNum(roomName.split("-", 3)[0]); diff --git a/iot-hal/src/main/java/com/java110/hal/http/yiteSmart/bmo/impl/SyncFaceBmoImpl.java b/iot-hal/src/main/java/com/java110/hal/http/yiteSmart/bmo/impl/SyncFaceBmoImpl.java index 72ebad91..8f948b35 100644 --- a/iot-hal/src/main/java/com/java110/hal/http/yiteSmart/bmo/impl/SyncFaceBmoImpl.java +++ b/iot-hal/src/main/java/com/java110/hal/http/yiteSmart/bmo/impl/SyncFaceBmoImpl.java @@ -80,7 +80,7 @@ public class SyncFaceBmoImpl implements ISyncFaceBmo { d.put("feature","8da496105de1101541a69b980e38631c61c81581dda4a50535264b083aa5ff0cee7cca3082e27b3575efa13865a38c3d4f819ca017dbc9a404572c288a479dad04b1d0d0026f6754f13c2cda22d359dc87156a40b5f06444cd8ed9481282364dc095f6f0cee2b3743c9b62f9ebccde03458eaae28d1a766405f07ee812e06c6d3e0cbe907ee0249565fdb1980082989d510b38803a44268475c2688890a8fe0cdbcd98b024860bb4a81c28b8677208c3a04bc1a0d367d5a4fff3a629613b6a2cc77a5a50bb7ae5549c916b58c6f5c45d7b4016405107b3c5d4a122c8b857d44d7869668fa00dedf48962f7f8991891fc3cadf7e07b9ecc657ecf74e80369ccec422ac81068bb699458c03799ac94329dcfd9440009f0c904bfce2388f119bef38342a8300961f4b5035f15b96ed96bbdd756a520fb486f25cfb3fca8b72b38ace37c7b508ed77d54fd376e588ac382dcc4e521c07dc0de4532ba7c49a57a704d6a8f7ef0cc57daf46ce9bbf97bdac67e8cd5c1e04e6e726486aad86884aa7bec6311ff90569a019430ce0719825eac1c6b239682c5e18884ed4f0b89197bb78d4c63b03124d295b5f15c01b84efaa6bcf31cd121df59c325b3d807d74393262c38060b510b88dfd4a08bcb598277ba5d861d034304863ec461e09349cc7cf8cc8d65cef1975dc875d54650789a49e7fdbc5e1562366b47e4bc6c9f68d04167ec"); d.put("open","0"); String user_uid = d.getString("user_uid"); - d.put("face_id",user_uid.substring(9)); + d.put("face_id",user_uid.substring(user_uid.length() - 9)); d.put("source","1"); ds.add(d); } -- Gitee From e8df1b256d6ff544c23c12b9280c784c7ba5466a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E4=BA=94=E8=80=81=E5=B3=B0?= Date: Sun, 27 Oct 2024 13:35:54 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E6=81=A2=E5=A4=8D=E6=88=BF=E5=8F=B7?= =?UTF-8?q?=E4=B8=BA=E9=BB=98=E8=AE=A4?= 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..b535acf7 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-%04d", + addCard.put("roomnum", String.format("%02d%02d-%s", 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 ce20f82a..a074cd20 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-%04d", + addRoom.put("num", String.format("%02d%02d-%s", Integer.parseInt(roomName.split("-", 3)[0]), Integer.parseInt(roomName.split("-", 3)[1]), Integer.parseInt(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..51c15f46 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-%04d", + addCard.put("roomnum", String.format("%02d%02d-%s", 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 dcfe4779..9c7d0665 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-%04d", + addRoom.put("num", String.format("%02d%02d-%s", Integer.parseInt(unitDtos.get(0).getFloorNum()), Integer.parseInt(unitDtos.get(0).getUnitNum()), Integer.parseInt(tmpRoomDto.getRoomNum()))); -- Gitee From b6dc13b3cbd9b6fafeaad7f60e7efccbeed864e0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E4=BA=94=E8=80=81=E5=B3=B0?= Date: Sun, 27 Oct 2024 21:08:57 +0800 Subject: [PATCH 3/4] 0 --- .../accessControl/yiteSmart/SyncUserCardImpl.java | 15 ++++++++------- .../accessControl/yiteSmart/SyncUserImpl.java | 11 ++++++----- .../java110/hal/http/yiteSmart/YiteSmartHal.java | 2 +- .../yiteSmart/bmo/impl/SyncCardsBidBmoImpl.java | 10 +++++----- .../yiteSmart/bmo/impl/SyncUserBidBmoImpl.java | 11 ++++++----- 5 files changed, 26 insertions(+), 23 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..a5a4a41f 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 @@ -188,14 +188,15 @@ public class SyncUserCardImpl implements ISyncUserCard { addCard = new JSONObject(); addCard.put("card", accessControlFacePo.getCardNumber()); 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", - Integer.parseInt(roomName.split("-", 3)[0]), - Integer.parseInt(roomName.split("-", 3)[1]), - Integer.parseInt(roomName.split("-", 3)[2]))); + // if (!StringUtil.isEmpty(roomName) && roomName.split("-", 3).length == 3) { + addCard.put("roomnum",roomName); + //addCard.put("roomnum", roomName.split("-", 3)[0] + roomName.split("-", 3)[1] + "-" + roomName.split("-", 3)[2]); + //addCard.put("roomnum", String.format("%02d%02d-%s", + // Integer.parseInt(roomName.split("-", 3)[0]), + // Integer.parseInt(roomName.split("-", 3)[1]), + // Integer.parseInt(roomName.split("-", 3)[2]))); - } + // } 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 a074cd20..bbd7029b 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 @@ -121,11 +121,12 @@ public class SyncUserImpl implements ISyncUser { 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)[0] + roomName.split("-", 3)[1] + "-" + roomName.split("-", 3)[2]); //添加楼栋单元号 - addRoom.put("num", String.format("%02d%02d-%s", - Integer.parseInt(roomName.split("-", 3)[0]), - Integer.parseInt(roomName.split("-", 3)[1]), - Integer.parseInt(roomName.split("-", 3)[2]))); + addRoom.put("num", roomName); + //addRoom.put("num", roomName.split("-", 3)[0] + roomName.split("-", 3)[1] + "-" + roomName.split("-", 3)[2]); //添加楼栋单元号 + // addRoom.put("num", String.format("%02d%02d-%s", + // Integer.parseInt(roomName.split("-", 3)[0]), + // Integer.parseInt(roomName.split("-", 3)[1]), + // Integer.parseInt(roomName.split("-", 3)[2]))); RoomDto roomDto = new RoomDto(); roomDto.setFloorNum(roomName.split("-", 3)[0]); 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 352a02ff..18ddbf30 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", "1"); + data.put("gate_check_face_switch", "0"); 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..7dbe47ef 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 @@ -247,11 +247,11 @@ public class SyncCardsBidBmoImpl implements ISyncCardsBidBmo { if (tmpRoomDto.getRoomId().equals(tmpOwnerRoomRelDto.getRoomId())) { 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", - Integer.parseInt(unitDtos.get(0).getFloorNum()), - Integer.parseInt(unitDtos.get(0).getUnitNum()), - Integer.parseInt( tmpRoomDto.getRoomNum()))); + addCard.put("roomnum", unitDtos.get(0).getFloorNum() + unitDtos.get(0).getUnitNum() + "-" + tmpRoomDto.getRoomNum());//添加楼栋单元号 + // addCard.put("roomnum", String.format("%02d%02d-%s", + // Integer.parseInt(unitDtos.get(0).getFloorNum()), + // Integer.parseInt(unitDtos.get(0).getUnitNum()), + // Integer.parseInt( tmpRoomDto.getRoomNum()))); long timestrap = tmpOwnerRoomRelDto.getEndTime().getTime(); timestrap = timestrap / 1000; 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..d2b0c628 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 @@ -242,11 +242,12 @@ public class SyncUserBidBmoImpl implements ISyncUserBidBmo { addRoom.put("id", tmpRoomDto.getRoomId()); 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", - Integer.parseInt(unitDtos.get(0).getFloorNum()), - Integer.parseInt(unitDtos.get(0).getUnitNum()), - Integer.parseInt(tmpRoomDto.getRoomNum()))); + + addRoom.put("num", unitDtos.get(0).getFloorNum() + unitDtos.get(0).getUnitNum() + "-" + tmpRoomDto.getRoomNum());//添加楼栋单元号 + // addRoom.put("num", String.format("%02d%02d-%s", + // Integer.parseInt(unitDtos.get(0).getFloorNum()), + // Integer.parseInt(unitDtos.get(0).getUnitNum()), + // Integer.parseInt(tmpRoomDto.getRoomNum()))); users = new JSONArray(); addRoom.put("user", users); -- Gitee From 77852a4cfda1bd8e9ad2fa880e9c43201d2a9239 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E4=BA=94=E8=80=81=E5=B3=B0?= Date: Sun, 27 Oct 2024 21:27:38 +0800 Subject: [PATCH 4/4] 0 --- .../yiteSmart/SyncUserCardImpl.java | 15 +++++++-------- .../accessControl/yiteSmart/SyncUserImpl.java | 16 +++++++++------- .../yiteSmart/bmo/impl/SyncCardsBidBmoImpl.java | 10 +++++----- .../yiteSmart/bmo/impl/SyncUserBidBmoImpl.java | 11 +++++------ 4 files changed, 26 insertions(+), 26 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 a5a4a41f..b535acf7 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 @@ -188,15 +188,14 @@ public class SyncUserCardImpl implements ISyncUserCard { addCard = new JSONObject(); addCard.put("card", accessControlFacePo.getCardNumber()); String roomName = accessControlFacePo.getRoomName(); - // if (!StringUtil.isEmpty(roomName) && roomName.split("-", 3).length == 3) { - addCard.put("roomnum",roomName); - //addCard.put("roomnum", roomName.split("-", 3)[0] + roomName.split("-", 3)[1] + "-" + roomName.split("-", 3)[2]); - //addCard.put("roomnum", String.format("%02d%02d-%s", - // Integer.parseInt(roomName.split("-", 3)[0]), - // Integer.parseInt(roomName.split("-", 3)[1]), - // Integer.parseInt(roomName.split("-", 3)[2]))); + 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", + Integer.parseInt(roomName.split("-", 3)[0]), + Integer.parseInt(roomName.split("-", 3)[1]), + Integer.parseInt(roomName.split("-", 3)[2]))); - // } + } 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 bbd7029b..a8512558 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 @@ -121,17 +121,19 @@ public class SyncUserImpl implements ISyncUser { 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); - //addRoom.put("num", roomName.split("-", 3)[0] + roomName.split("-", 3)[1] + "-" + roomName.split("-", 3)[2]); //添加楼栋单元号 - // addRoom.put("num", String.format("%02d%02d-%s", - // Integer.parseInt(roomName.split("-", 3)[0]), - // Integer.parseInt(roomName.split("-", 3)[1]), - // Integer.parseInt(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", + Integer.parseInt(roomName.split("-", 3)[0]), + Integer.parseInt(roomName.split("-", 3)[1]), + Integer.parseInt(roomName.split("-", 3)[2]))); RoomDto roomDto = new RoomDto(); roomDto.setFloorNum(roomName.split("-", 3)[0]); roomDto.setUnitNum(roomName.split("-", 3)[1]); - roomDto.setRoomNum(roomName.split("-", 3)[2]); + 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.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/bmo/impl/SyncCardsBidBmoImpl.java b/iot-hal/src/main/java/com/java110/hal/http/yiteSmart/bmo/impl/SyncCardsBidBmoImpl.java index 7dbe47ef..51c15f46 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 @@ -247,11 +247,11 @@ public class SyncCardsBidBmoImpl implements ISyncCardsBidBmo { if (tmpRoomDto.getRoomId().equals(tmpOwnerRoomRelDto.getRoomId())) { 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", - // Integer.parseInt(unitDtos.get(0).getFloorNum()), - // Integer.parseInt(unitDtos.get(0).getUnitNum()), - // Integer.parseInt( tmpRoomDto.getRoomNum()))); + //addCard.put("roomnum", unitDtos.get(0).getFloorNum() + unitDtos.get(0).getUnitNum() + "-" + tmpRoomDto.getRoomNum());//添加楼栋单元号 + addCard.put("roomnum", String.format("%02d%02d-%s", + Integer.parseInt(unitDtos.get(0).getFloorNum()), + Integer.parseInt(unitDtos.get(0).getUnitNum()), + Integer.parseInt( tmpRoomDto.getRoomNum()))); long timestrap = tmpOwnerRoomRelDto.getEndTime().getTime(); timestrap = timestrap / 1000; 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 d2b0c628..9c7d0665 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 @@ -242,12 +242,11 @@ public class SyncUserBidBmoImpl implements ISyncUserBidBmo { addRoom.put("id", tmpRoomDto.getRoomId()); 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", - // Integer.parseInt(unitDtos.get(0).getFloorNum()), - // Integer.parseInt(unitDtos.get(0).getUnitNum()), - // Integer.parseInt(tmpRoomDto.getRoomNum()))); + //addRoom.put("num", unitDtos.get(0).getFloorNum() + unitDtos.get(0).getUnitNum() + "-" + tmpRoomDto.getRoomNum());//添加楼栋单元号 + addRoom.put("num", String.format("%02d%02d-%s", + Integer.parseInt(unitDtos.get(0).getFloorNum()), + Integer.parseInt(unitDtos.get(0).getUnitNum()), + Integer.parseInt(tmpRoomDto.getRoomNum()))); users = new JSONArray(); addRoom.put("user", users); -- Gitee