From b21ff5592601751510b3c78a88073bd80965a8d9 Mon Sep 17 00:00:00 2001
From: zhangyuan <zhangyuan@sarnasea.com>
Date: Wed, 14 Sep 2022 14:11:54 +0800
Subject: [PATCH] =?UTF-8?q?=E9=A1=BA=E5=BE=B7=E5=B1=85=E9=80=BB=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../impl/IcResiCollectServiceImpl.java        | 25 +++++++++++--------
 .../impl/IcResiCollectVisitorServiceImpl.java |  7 +++++-
 2 files changed, 21 insertions(+), 11 deletions(-)

diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiCollectServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiCollectServiceImpl.java
index 0461ce2cba..97c39e04b7 100644
--- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiCollectServiceImpl.java
+++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiCollectServiceImpl.java
@@ -189,16 +189,21 @@ public class IcResiCollectServiceImpl extends BaseServiceImpl<IcResiCollectDao,
 
         // 如果是顺德居小区的人还要下放门禁
         if (formDTO.getVillageName().contains("顺德居")) {
-            formDTO.getMemberList().forEach(item -> {
-                if (StringUtils.isNotBlank(item.getFaceImg())) {
-                    VisitVisitorFormDTO visitor = new VisitVisitorFormDTO();
-                    visitor.setIdCard(item.getIdNum());
-                    visitor.setMobile(item.getMobile());
-                    visitor.setName(item.getName());
-                    visitor.setFaceImg(item.getFaceImg());
-                    dhDeviceUtil.sendAuth(visitor);
-                }
-            });
+            try {
+                formDTO.getMemberList().forEach(item -> {
+                    if (StringUtils.isNotBlank(item.getFaceImg())) {
+                        VisitVisitorFormDTO visitor = new VisitVisitorFormDTO();
+                        visitor.setIdCard(item.getIdNum());
+                        visitor.setMobile(item.getMobile());
+                        visitor.setName(item.getName());
+                        visitor.setFaceImg(item.getFaceImg());
+                        dhDeviceUtil.sendAuth(visitor);
+                    }
+                });
+                return new Result().ok("今日您可通过人脸设备便捷出入小区，明天及后续进入请再次登记，谢谢！");
+            } catch (Exception e) {
+                return new Result().ok("访客信息登记成功");
+            }
         }
 
         return new Result().ok("提交成功");
diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiCollectVisitorServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiCollectVisitorServiceImpl.java
index a73d022548..34c56f8928 100644
--- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiCollectVisitorServiceImpl.java
+++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiCollectVisitorServiceImpl.java
@@ -165,7 +165,12 @@ public class IcResiCollectVisitorServiceImpl extends BaseServiceImpl<IcResiColle
             visitor.setName(dto.getName());
             visitor.setIdCard(dto.getIdCard());
             visitor.setFaceImg(dto.getFaceImg());
-            dhDeviceUtil.sendAuth(visitor);
+            try {
+                dhDeviceUtil.sendAuth(visitor);
+                return new Result().ok("今日您可通过人脸设备便捷出入小区，明天及后续进入请再次登记，谢谢！");
+            } catch (Exception e) {
+                return new Result().ok("访客信息登记成功");
+            }
         }
         return new Result().ok("提交成功");
     }