From 1cdd97cd1a305bd771048ac75c337f02ac04f332 Mon Sep 17 00:00:00 2001
From: GUO <1923636941@qq.com>
Date: Fri, 3 May 2024 21:26:30 +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

---
 .../java/com/zhgd/xmgl/async/AsyncHikvision.java    |  4 ++--
 src/main/java/com/zhgd/xmgl/call/HikvisionCall.java |  2 +-
 .../xz/service/impl/XzHikvisionSyncServiceImpl.java | 13 +++++++++++--
 3 files changed, 14 insertions(+), 5 deletions(-)

diff --git a/src/main/java/com/zhgd/xmgl/async/AsyncHikvision.java b/src/main/java/com/zhgd/xmgl/async/AsyncHikvision.java
index ea1b415f5..2ee2d2dd8 100644
--- a/src/main/java/com/zhgd/xmgl/async/AsyncHikvision.java
+++ b/src/main/java/com/zhgd/xmgl/async/AsyncHikvision.java
@@ -146,7 +146,7 @@ public class AsyncHikvision {
         if (Objects.equals(carInfo.getCarModuleType(), 1)) {
             xzHikvisionSyncMapper.insert(new XzHikvisionSync().setProjectSn(carInfo.getProjectSn()).setType(4).setOperate(1).setWhoId(carInfo.getId()).setCreateDate(now));
             xzHikvisionSyncMapper.insert(new XzHikvisionSync().setProjectSn(carInfo.getProjectSn()).setType(5).setOperate(1).setWhoId(carInfo.getId()).setCreateDate(now));
-        } else if (Objects.equals(carInfo.getCarModuleType(), 2)) {
+        } else if (Objects.equals(carInfo.getCarModuleType(), 2) || Objects.equals(carInfo.getCarModuleType(), 3)) {
             xzHikvisionSyncMapper.insert(new XzHikvisionSync().setProjectSn(carInfo.getProjectSn()).setType(6).setOperate(1).setWhoId(carInfo.getId()).setCreateDate(now));
         }
         asyncHikvision.addCarInfoForHikvisionAsyc(carInfo, now);
@@ -184,7 +184,7 @@ public class AsyncHikvision {
         if (Objects.equals(carInfo.getCarModuleType(), 1)) {
             xzHikvisionSyncMapper.insert(new XzHikvisionSync().setProjectSn(carInfo.getProjectSn()).setType(4).setOperate(1).setWhoId(carInfo.getId()).setCreateDate(now));
             xzHikvisionSyncMapper.insert(new XzHikvisionSync().setProjectSn(carInfo.getProjectSn()).setType(5).setOperate(1).setWhoId(carInfo.getId()).setCreateDate(now));
-        } else if (Objects.equals(carInfo.getCarModuleType(), 2)) {
+        } else if (Objects.equals(carInfo.getCarModuleType(), 2) || Objects.equals(carInfo.getCarModuleType(), 3)) {
             xzHikvisionSyncMapper.insert(new XzHikvisionSync().setProjectSn(carInfo.getProjectSn()).setType(6).setOperate(1).setWhoId(carInfo.getId()).setCreateDate(now));
         }
         asyncHikvision.editCarInfoForHikvisionAsync(carInfo, old, now);
diff --git a/src/main/java/com/zhgd/xmgl/call/HikvisionCall.java b/src/main/java/com/zhgd/xmgl/call/HikvisionCall.java
index 7627f7587..67abe374a 100644
--- a/src/main/java/com/zhgd/xmgl/call/HikvisionCall.java
+++ b/src/main/java/com/zhgd/xmgl/call/HikvisionCall.java
@@ -1153,7 +1153,7 @@ public class HikvisionCall {
         }
         if (Objects.equals(carInfo.getCarModuleType(), 1)) {
             addFixedCar(carInfo, project);
-        } else if (Objects.equals(carInfo.getCarModuleType(), 2)) {
+        } else if (Objects.equals(carInfo.getCarModuleType(), 2) || Objects.equals(carInfo.getCarModuleType(), 3)) {
             reservationCar(project, carInfo);
         }
     }
diff --git a/src/main/java/com/zhgd/xmgl/modules/xz/service/impl/XzHikvisionSyncServiceImpl.java b/src/main/java/com/zhgd/xmgl/modules/xz/service/impl/XzHikvisionSyncServiceImpl.java
index 011c33631..69629d8ad 100644
--- a/src/main/java/com/zhgd/xmgl/modules/xz/service/impl/XzHikvisionSyncServiceImpl.java
+++ b/src/main/java/com/zhgd/xmgl/modules/xz/service/impl/XzHikvisionSyncServiceImpl.java
@@ -119,7 +119,7 @@ public class XzHikvisionSyncServiceImpl extends ServiceImpl<XzHikvisionSyncMappe
             String devName = xzHikvisionSync.getDevName();
             String deviceSn = xzHikvisionSync.getDeviceSn();
             if (StrUtil.isBlank(deviceSn)) {
-                xzHikvisionSync.setDetail(StrUtil.format("{}{}到ISC{}", getOperateName(operate), getTypeName(type), getIsSuccessName(isSuccess)));
+                xzHikvisionSync.setDetail(StrUtil.format("{}{}到ISC{}", getOperateName(operate, type), getTypeName(type), getIsSuccessName(isSuccess)));
             } else {
                 xzHikvisionSync.setDetail(StrUtil.format("{}{}到{}{}", getOperateNameForDev(operate), getTypeName(type), devName, getIsSuccessName(isSuccess)));
             }
@@ -139,6 +139,12 @@ public class XzHikvisionSyncServiceImpl extends ServiceImpl<XzHikvisionSyncMappe
                 return "人员照片";
             case 3:
                 return "人员权限";
+            case 4:
+                return "固定车辆";
+            case 5:
+                return "固定车辆群组";
+            case 6:
+                return "临时车";
         }
         return null;
     }
@@ -153,7 +159,10 @@ public class XzHikvisionSyncServiceImpl extends ServiceImpl<XzHikvisionSyncMappe
         return null;
     }
 
-    private String getOperateName(Integer operate) {
+    private String getOperateName(Integer operate, Integer type) {
+        if (operate == 1 && type >= 4) {
+            return "保存";
+        }
         switch (operate) {
             case 1:
                 return "新增";