From e8a044b1def62f7ec5e12d150fc2ebbce2eb5642 Mon Sep 17 00:00:00 2001
From: guo <guo@guo>
Date: Fri, 12 Apr 2024 14:52:27 +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

---
 .../com/zhgd/xmgl/call/HikvisionCall.java     | 26 +++++++++++--------
 1 file changed, 15 insertions(+), 11 deletions(-)

diff --git a/src/main/java/com/zhgd/xmgl/call/HikvisionCall.java b/src/main/java/com/zhgd/xmgl/call/HikvisionCall.java
index a0bd2b8e5..e57d0ee56 100644
--- a/src/main/java/com/zhgd/xmgl/call/HikvisionCall.java
+++ b/src/main/java/com/zhgd/xmgl/call/HikvisionCall.java
@@ -219,22 +219,18 @@ public class HikvisionCall {
                             entity.setCarNumber(plateNo);
                             entity.setType(getPassType(carCamera.getPassType()));
                             entity.setPassTime(time);
-                            Integer count = carPassRecordMapper.selectCount(new LambdaQueryWrapper<CarPassRecord>()
-                                    .eq(CarPassRecord::getCarNumber, plateNo)
-                                    .eq(CarPassRecord::getPassTime, time)
-                            );
-                            if (count != 0) {
-                                continue;
-                            }
-
                             try {
                                 //车牌
                                 JSONObject picUrlJo = dataJo.getJSONObject("picUrl");
                                 String svrIndex = dataJo.getString("svrIndex");
                                 String vehiclePicUrl = picUrlJo.getString("vehiclePicUrl");
                                 String platePicUrl = picUrlJo.getString("platePicUrl");
-                                entity.setImageUrl(saveToLocal(getHikvisionEventsPicture(new HikvisionEventsPictureRq(svrIndex, platePicUrl), project.getArtemisConfigHost(), project.getArtemisConfigAppKey(), project.getArtemisConfigAppSecret())));
-                                entity.setPanoramaUrl(saveToLocal(getHikvisionEventsPicture(new HikvisionEventsPictureRq(svrIndex, vehiclePicUrl), project.getArtemisConfigHost(), project.getArtemisConfigAppKey(), project.getArtemisConfigAppSecret())));
+                                if (StringUtils.isNotBlank(platePicUrl)) {
+                                    entity.setImageUrl(saveToLocal(getHikvisionEventsPicture(new HikvisionEventsPictureRq(svrIndex, platePicUrl), project.getArtemisConfigHost(), project.getArtemisConfigAppKey(), project.getArtemisConfigAppSecret())));
+                                }
+                                if (StringUtils.isNotBlank(vehiclePicUrl)) {
+                                    entity.setPanoramaUrl(saveToLocal(getHikvisionEventsPicture(new HikvisionEventsPictureRq(svrIndex, vehiclePicUrl), project.getArtemisConfigHost(), project.getArtemisConfigAppKey(), project.getArtemisConfigAppSecret())));
+                                }
                             } catch (Exception e) {
                                 e.printStackTrace();
                             }
@@ -254,7 +250,15 @@ public class HikvisionCall {
                             } else {
                                 entity.setIsOpen(0);
                             }
-                            carPassRecordMapper.insert(entity);
+                            LambdaQueryWrapper<CarPassRecord> queryWrapper = new LambdaQueryWrapper<CarPassRecord>()
+                                    .eq(CarPassRecord::getCarNumber, plateNo)
+                                    .eq(CarPassRecord::getPassTime, time);
+                            Integer count = carPassRecordMapper.selectCount(queryWrapper);
+                            if (count != 0) {
+                                carPassRecordMapper.update(entity, queryWrapper);
+                            } else {
+                                carPassRecordMapper.insert(entity);
+                            }
                         }
                     }
                 }