From fc3187fa726a5eb749a74ed08045caa544374438 Mon Sep 17 00:00:00 2001
From: guoshengxiong <1923636941@qq.com>
Date: Wed, 12 Jun 2024 21:25:27 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B5=B7=E5=BA=B7bug=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/java/com/zhgd/xmgl/async/AsyncHikvision.java | 1 +
 src/main/java/com/zhgd/xmgl/call/HikvisionCall.java   | 6 ++++--
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/src/main/java/com/zhgd/xmgl/async/AsyncHikvision.java b/src/main/java/com/zhgd/xmgl/async/AsyncHikvision.java
index dc7777497..18640bf78 100644
--- a/src/main/java/com/zhgd/xmgl/async/AsyncHikvision.java
+++ b/src/main/java/com/zhgd/xmgl/async/AsyncHikvision.java
@@ -357,6 +357,7 @@ public class AsyncHikvision {
                     hikvisionCall.updatePersonAuth(workerInfo, ds, sucSb, failSb, 0);
                 }
             } catch (Exception e) {
+                log.error("e", e);
                 if (HttpUtils.isTimeOut(e)) {
                     noticeService.addUserNotice(ThreadLocalUtil.getByKey(Cts.TL_AUTH_USER, UserInfo.class).getUserId(), "失败原因：平台连接isc网络异常", "人员下发设备提醒", "1");
                 } else {
diff --git a/src/main/java/com/zhgd/xmgl/call/HikvisionCall.java b/src/main/java/com/zhgd/xmgl/call/HikvisionCall.java
index 9f8bef59c..b60f39a1a 100644
--- a/src/main/java/com/zhgd/xmgl/call/HikvisionCall.java
+++ b/src/main/java/com/zhgd/xmgl/call/HikvisionCall.java
@@ -1181,10 +1181,12 @@ public class HikvisionCall {
                 queryWrapper.ne(XzHikvisionSync::getOperate, 3);
             }
         }
-        XzHikvisionSync xzHikvisionSync = xzHikvisionSyncMapper.selectOne(queryWrapper);
-        if (xzHikvisionSync == null) {
+        List<XzHikvisionSync> xzHikvisionSyncs = xzHikvisionSyncMapper.selectList(queryWrapper);
+        if (CollUtil.isEmpty(xzHikvisionSyncs)) {
             return;
         }
+        xzHikvisionSyncs.stream().sorted((o1, o2) -> o2.getCreateDate().compareTo(o1.getCreateDate()));
+        XzHikvisionSync xzHikvisionSync = xzHikvisionSyncs.get(0);
         xzHikvisionSync.setIsSuccess(isSuccess ? 1 : 0);
         xzHikvisionSyncMapper.updateById(xzHikvisionSync);