修改 设备范围为单元

CODE/smart-community/app-api/src/main/java/com/community/huiju/service/impl/FaceServicelimpl.java

@@ -159,7 +159,7 @@ public class FaceServicelimpl implements FaceServiceI {
         face.setFaceImg(faceImg);
         face.setUpdateUser(userElement.getId());
         face.setUpdateDate(new Date());
-        ResponseBean resps = checKout(faceImg, face, false, uploadFile, activeUser, userVerify.getCommunityId(), userVerify.getRoomNoId(), tpEquipmentTree.getAppkey(), tpEquipmentTree.getSecret());
+        ResponseBean resps = checKout(faceImg, face, false, uploadFile, activeUser, userVerify.getCommunityId(), userVerify.getRoomNoId(), userVerify.getUnitId(), tpEquipmentTree.getAppkey(), tpEquipmentTree.getSecret());
         if (resps.getCode().equals("0")) {
             resps.addSuccess((Object) faceImg);
         } else {
@@ -171,7 +171,7 @@ public class FaceServicelimpl implements FaceServiceI {
     /**
      * 验证图片是否为人脸，推送海康
      */
-    public ResponseBean checKout(String faceImg, TaFace taFace, boolean isA, MultipartFile uploadFile, Integer userId, Integer communityId, Integer roomNoId, String  appkey, String secret) {
+    public ResponseBean checKout(String faceImg, TaFace taFace, boolean isA, MultipartFile uploadFile, Integer userId, Integer communityId, Integer roomNoId, Integer unitId, String  appkey, String secret) {
         ResponseBean responseBean = new ResponseBean();
         TaUser user = taUserMapper.selectByPrimaryKey(userId);
         if (user.getHkUserId() == null) {
@@ -204,7 +204,7 @@ public class FaceServicelimpl implements FaceServiceI {
                 // 设备树
                 TpEquipmentTree tpEquipmentTree = tpEquipmentTreeMapper.selectByCommunityId(communityId);
                 // 所有设备
-                List<TpEquipment> tpEquipments = tpEquipmentMapper.selectByCommunityIdAndRoomNoId(communityId, roomNoId, 4);
+                List<TpEquipment> tpEquipments = tpEquipmentMapper.selectByCommunityIdAndUnitId(communityId, unitId, 4);
                 List<Map<String, Object>> equipmentUUID = getEquipmentUUID(tpEquipments);
                 StringBuilder doorUuids = new StringBuilder();
                 StringBuilder deviceUuids = new StringBuilder();
@@ -412,7 +412,7 @@ public class FaceServicelimpl implements FaceServiceI {
         // 设备树
         TpEquipmentTree tpEquipmentTree = tpEquipmentTreeMapper.selectByCommunityId(taUserVerify.getCommunityId());
         // 所有设备
-        List<TpEquipment> tpEquipments = tpEquipmentMapper.selectByCommunityIdAndRoomNoId(taUserVerify.getCommunityId(), taUserVerify.getRoomNoId(), 4);
+        List<TpEquipment> tpEquipments = tpEquipmentMapper.selectByCommunityIdAndUnitId(taUserVerify.getCommunityId(), taUserVerify.getUnitId(), 4);
         List<Map<String, Object>> equipmentUUID = getEquipmentUUID(tpEquipments);
         StringBuilder doorUuids = new StringBuilder();
         StringBuilder deviceUuids = new StringBuilder();