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