From 89612c0fb494d1853757e37e1ed5e6192c4fbfeb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E4=BA=94=E8=80=81=E5=B3=B0?= Date: Wed, 23 Oct 2024 23:17:43 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E6=A5=BC=E6=A0=8B=E5=8D=95?= =?UTF-8?q?=E5=85=83%02d%02d-%04d=20=E6=9B=B4=E6=96=B0=E4=BA=BA=E8=84=B8id?= =?UTF-8?q?=E4=B8=BAuser=5Fid=E5=90=8E9=E4=BD=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../adapt/accessControl/yiteSmart/SyncUserCardImpl.java | 7 ++++++- .../adapt/accessControl/yiteSmart/SyncUserFaceImpl.java | 4 ++-- .../adapt/accessControl/yiteSmart/SyncUserImpl.java | 7 ++++++- .../hal/http/yiteSmart/bmo/impl/SyncCardsBidBmoImpl.java | 7 ++++++- .../hal/http/yiteSmart/bmo/impl/SyncFaceBmoImpl.java | 4 ++-- .../hal/http/yiteSmart/bmo/impl/SyncUserBidBmoImpl.java | 7 ++++++- 6 files changed, 28 insertions(+), 8 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 2ad77afc..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 @@ -189,7 +189,12 @@ 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)[0] + roomName.split("-", 3)[1] + "-" + roomName.split("-", 3)[2]); + //addCard.put("roomnum", roomName.split("-", 3)[0] + roomName.split("-", 3)[1] + "-" + roomName.split("-", 3)[2]); + 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]))); + } 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/SyncUserFaceImpl.java b/iot-accessControl/src/main/java/com/java110/accessControl/manufactor/adapt/accessControl/yiteSmart/SyncUserFaceImpl.java index 01fbcfc8..9ba3e0d4 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 @@ -72,11 +72,11 @@ public class SyncUserFaceImpl implements ISyncUserFace { d.put("url", tmpAccessControlFaceDto.getFacePath()); d.put("feature", "8da496105de1101541a69b980e38631c61c81581dda4a50535264b083aa5ff0cee7cca3082e27b3575efa13865a38c3d4f819ca017dbc9a404572c288a479dad04b1d0d0026f6754f13c2cda22d359dc87156a40b5f06444cd8ed9481282364dc095f6f0cee2b3743c9b62f9ebccde03458eaae28d1a766405f07ee812e06c6d3e0cbe907ee0249565fdb1980082989d510b38803a44268475c2688890a8fe0cdbcd98b024860bb4a81c28b8677208c3a04bc1a0d367d5a4fff3a629613b6a2cc77a5a50bb7ae5549c916b58c6f5c45d7b4016405107b3c5d4a122c8b857d44d7869668fa00dedf48962f7f8991891fc3cadf7e07b9ecc657ecf74e80369ccec422ac81068bb699458c03799ac94329dcfd9440009f0c904bfce2388f119bef38342a8300961f4b5035f15b96ed96bbdd756a520fb486f25cfb3fca8b72b38ace37c7b508ed77d54fd376e588ac382dcc4e521c07dc0de4532ba7c49a57a704d6a8f7ef0cc57daf46ce9bbf97bdac67e8cd5c1e04e6e726486aad86884aa7bec6311ff90569a019430ce0719825eac1c6b239682c5e18884ed4f0b89197bb78d4c63b03124d295b5f15c01b84efaa6bcf31cd121df59c325b3d807d74393262c38060b510b88dfd4a08bcb598277ba5d861d034304863ec461e09349cc7cf8cc8d65cef1975dc875d54650789a49e7fdbc5e1562366b47e4bc6c9f68d04167ec"); d.put("open", "0"); - String phone = d.getString("phone"); + String user_uid = d.getString("user_uid"); Random random = new Random(); int faceId = random.nextInt(100); //d.put("face_id", phone.substring(6) + faceId); - d.put("face_id", phone.substring(6)); + d.put("face_id", user_uid.substring(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 a832d32e..e30e7952 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,7 +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", 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]))); + 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/bmo/impl/SyncCardsBidBmoImpl.java b/iot-hal/src/main/java/com/java110/hal/http/yiteSmart/bmo/impl/SyncCardsBidBmoImpl.java index 76860de9..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 @@ -247,7 +247,12 @@ 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", unitDtos.get(0).getFloorNum() + unitDtos.get(0).getUnitNum() + "-" + tmpRoomDto.getRoomNum());//添加楼栋单元号 + addCard.put("roomnum", String.format("%02d%02d-%04d", + Integer.parseInt(unitDtos.get(0).getFloorNum()), + Integer.parseInt(unitDtos.get(0).getUnitNum()), + Integer.parseInt( 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/SyncFaceBmoImpl.java b/iot-hal/src/main/java/com/java110/hal/http/yiteSmart/bmo/impl/SyncFaceBmoImpl.java index 6a0aaca7..72ebad91 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 @@ -79,8 +79,8 @@ public class SyncFaceBmoImpl implements ISyncFaceBmo { d.put("url",tmpAccessControlFaceDto.getFacePath()); d.put("feature","8da496105de1101541a69b980e38631c61c81581dda4a50535264b083aa5ff0cee7cca3082e27b3575efa13865a38c3d4f819ca017dbc9a404572c288a479dad04b1d0d0026f6754f13c2cda22d359dc87156a40b5f06444cd8ed9481282364dc095f6f0cee2b3743c9b62f9ebccde03458eaae28d1a766405f07ee812e06c6d3e0cbe907ee0249565fdb1980082989d510b38803a44268475c2688890a8fe0cdbcd98b024860bb4a81c28b8677208c3a04bc1a0d367d5a4fff3a629613b6a2cc77a5a50bb7ae5549c916b58c6f5c45d7b4016405107b3c5d4a122c8b857d44d7869668fa00dedf48962f7f8991891fc3cadf7e07b9ecc657ecf74e80369ccec422ac81068bb699458c03799ac94329dcfd9440009f0c904bfce2388f119bef38342a8300961f4b5035f15b96ed96bbdd756a520fb486f25cfb3fca8b72b38ace37c7b508ed77d54fd376e588ac382dcc4e521c07dc0de4532ba7c49a57a704d6a8f7ef0cc57daf46ce9bbf97bdac67e8cd5c1e04e6e726486aad86884aa7bec6311ff90569a019430ce0719825eac1c6b239682c5e18884ed4f0b89197bb78d4c63b03124d295b5f15c01b84efaa6bcf31cd121df59c325b3d807d74393262c38060b510b88dfd4a08bcb598277ba5d861d034304863ec461e09349cc7cf8cc8d65cef1975dc875d54650789a49e7fdbc5e1562366b47e4bc6c9f68d04167ec"); d.put("open","0"); - String phone = d.getString("phone"); - d.put("face_id",phone.substring(6)); + String user_uid = d.getString("user_uid"); + d.put("face_id",user_uid.substring(9)); d.put("source","1"); ds.add(d); } 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 3a8aab7c..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 @@ -242,7 +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", unitDtos.get(0).getFloorNum() + unitDtos.get(0).getUnitNum() + "-" + tmpRoomDto.getRoomNum());//添加楼栋单元号 + addRoom.put("num", String.format("%02d%02d-%04d", + Integer.parseInt(unitDtos.get(0).getFloorNum()), + Integer.parseInt(unitDtos.get(0).getUnitNum()), + Integer.parseInt(tmpRoomDto.getRoomNum()))); + users = new JSONArray(); addRoom.put("user", users); if (ListUtil.isNull(ownerRoomRelDtos)) { -- Gitee