From 263f7ef12d2d7b3cc93b70a6fe5407745b02b21c Mon Sep 17 00:00:00 2001
From: guo <guo@guo>
Date: Fri, 8 Mar 2024 11:19:14 +0800
Subject: [PATCH] =?UTF-8?q?bug=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/java/com/zhgd/xmgl/call/HikvisionCall.java | 13 +++++--------
 .../service/impl/WorkerAttendanceServiceImpl.java   |  1 +
 2 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/src/main/java/com/zhgd/xmgl/call/HikvisionCall.java b/src/main/java/com/zhgd/xmgl/call/HikvisionCall.java
index 069a28810..7f8c6a206 100644
--- a/src/main/java/com/zhgd/xmgl/call/HikvisionCall.java
+++ b/src/main/java/com/zhgd/xmgl/call/HikvisionCall.java
@@ -94,12 +94,6 @@ public class HikvisionCall {
                         JSONObject dataJo = jo1.getJSONObject("data");
                         String happenTime = jo1.getString("happenTime");
                         String srcIndex = jo1.getString("srcIndex");
-                        JSONObject extEventIdentityCardInfoJo = dataJo.getJSONObject("ExtEventIdentityCardInfo");
-                        if (extEventIdentityCardInfoJo == null) {
-                            String s = "extEventIdentityCardInfoJo为null";
-                            log.info(s);
-                            return Result.error(s);
-                        }
                         String extEventPersonNo = dataJo.getString("ExtEventPersonNo");
                         String extEventCardNo = dataJo.getString("ExtEventCardNo");
                         WorkerInfo workerInfo = workerInfoMapper.selectById(extEventPersonNo);
@@ -123,8 +117,8 @@ public class HikvisionCall {
                         map.put("projectCode", workerInfo.getProjectSn());
                         map.put("devCode", srcIndex);
                         try {
-                            String extEventPictureURL = extEventIdentityCardInfoJo.getString("ExtEventPictureURL");
-                            String svrIndexCode = extEventIdentityCardInfoJo.getString("svrIndexCode");
+                            String extEventPictureURL = dataJo.getString("ExtEventPictureURL");
+                            String svrIndexCode = dataJo.getString("svrIndexCode");
                             HikvisionEventsPictureRq rq = new HikvisionEventsPictureRq();
                             rq.setPicUri(extEventPictureURL);
                             rq.setSvrIndexCode(svrIndexCode);
@@ -1193,6 +1187,9 @@ public class HikvisionCall {
 
 
     public String saveToLocal(String url) {
+        if (StringUtils.isBlank(url)) {
+            return null;
+        }
         String fileName = IdUtil.simpleUUID() + ".png";
         CompletableFuture.runAsync(() -> {
             try {
diff --git a/src/main/java/com/zhgd/xmgl/modules/worker/service/impl/WorkerAttendanceServiceImpl.java b/src/main/java/com/zhgd/xmgl/modules/worker/service/impl/WorkerAttendanceServiceImpl.java
index a3969d8e8..21ec6adbe 100644
--- a/src/main/java/com/zhgd/xmgl/modules/worker/service/impl/WorkerAttendanceServiceImpl.java
+++ b/src/main/java/com/zhgd/xmgl/modules/worker/service/impl/WorkerAttendanceServiceImpl.java
@@ -830,6 +830,7 @@ public class WorkerAttendanceServiceImpl extends ServiceImpl<WorkerAttendanceMap
                     resultMap.put("status", "0");
                 }
             } else {
+                log.info("请先上传对应设备信息，idCard:{}", idCard);
                 resultMap.put("msg", "请先上传对应设备信息");
                 resultMap.put("status", "0");
             }