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 6ba86178b6b8e151f1795ede00a862124b4f6b21..b535acf73dde863e51f6daee61ec4654bb70007b 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/SyncUserFaceImpl.java b/iot-accessControl/src/main/java/com/java110/accessControl/manufactor/adapt/accessControl/yiteSmart/SyncUserFaceImpl.java index 9ba3e0d4860b7bcabc8b7c296e0aa331a27e5a9a..fb0211f1e3d483e7d6b02443e92887d6bd915072 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 e30e7952ec347c060bfa6f97ff36d418ef4b00ba..a851255870913b612821d450cac3c9b36d54a4d1 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,15 +122,18 @@ 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)[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]); 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/YiteSmartHal.java b/iot-hal/src/main/java/com/java110/hal/http/yiteSmart/YiteSmartHal.java index 352a02ff223af3e2d8e25d6f038551a77cc1d9c2..18ddbf30c4f821eee4a108f4ad183250c901e948 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 356718dd161812dd455b2ffbf72457401d476191..51c15f46b7684db4dc464d33c606739c9e7a3512 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/SyncFaceBmoImpl.java b/iot-hal/src/main/java/com/java110/hal/http/yiteSmart/bmo/impl/SyncFaceBmoImpl.java index 72ebad9148dad6992f819a17c6b5b803ceeacb07..8f948b35bed8e65f1eb1bd8eb399db6399623a6f 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); } 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 dcfe4779ab365213f971b86663c03d4569a3db9a..9c7d0665be77c5e5ebf81799814ebdf987e43033 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())));