From e9fc537c1fcc2994bc0b34a2f099345c3ddaf417 Mon Sep 17 00:00:00 2001
From: GUO <1923636941@qq.com>
Date: Mon, 27 May 2024 21:04:46 +0800
Subject: [PATCH] =?UTF-8?q?=E8=BD=A6=E8=BE=86=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../car/service/impl/CarInfoServiceImpl.java       | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/src/main/java/com/zhgd/xmgl/modules/car/service/impl/CarInfoServiceImpl.java b/src/main/java/com/zhgd/xmgl/modules/car/service/impl/CarInfoServiceImpl.java
index 7ea76009f..7399e8817 100644
--- a/src/main/java/com/zhgd/xmgl/modules/car/service/impl/CarInfoServiceImpl.java
+++ b/src/main/java/com/zhgd/xmgl/modules/car/service/impl/CarInfoServiceImpl.java
@@ -11,7 +11,6 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.zhgd.jeecg.common.execption.OpenAlertException;
 import com.zhgd.xmgl.async.AsyncHikvision;
 import com.zhgd.xmgl.async.AsyncWorker;
-import com.zhgd.xmgl.constant.Cts;
 import com.zhgd.xmgl.modules.basicdata.service.impl.SystemUserServiceImpl;
 import com.zhgd.xmgl.modules.car.entity.*;
 import com.zhgd.xmgl.modules.car.entity.vo.CountCarModuleTypeVo;
@@ -21,7 +20,6 @@ import com.zhgd.xmgl.modules.project.entity.Project;
 import com.zhgd.xmgl.modules.project.mapper.ProjectMapper;
 import com.zhgd.xmgl.modules.worker.mapper.WorkerInfoMapper;
 import com.zhgd.xmgl.modules.worker.service.impl.EnterpriseInfoServiceImpl;
-import com.zhgd.xmgl.util.MapBuilder;
 import com.zhgd.xmgl.util.MessageUtil;
 import com.zhgd.xmgl.util.PageUtil;
 import lombok.extern.slf4j.Slf4j;
@@ -143,7 +141,7 @@ public class CarInfoServiceImpl extends ServiceImpl<CarInfoMapper, CarInfo> impl
             expiredCar.setReserveStartTime(flow.getReserveStartTime());
             this.editCarInfo(expiredCar);
         } else {
-            this.delete(new MapBuilder<String, Object>().put(Cts.ID, expiredCar.getId()).build());
+            deleteCar(expiredCar);
         }
     }
 
@@ -238,9 +236,7 @@ public class CarInfoServiceImpl extends ServiceImpl<CarInfoMapper, CarInfo> impl
             throw new OpenAlertException(MessageUtil.get("notFindErr"));
         }
         if (Objects.equals(carInfo.getCarModuleType(), 1)) {
-            carInfoMapper.deleteById(id);
-            //同步海康
-            asyncHikvision.deleteCarInfoForHikvision(carInfo);
+            deleteCar(carInfo);
         } else {
             deleteFromApprovalFlowIf(carInfo);
             Project project = projectMapper.selectOne(new LambdaQueryWrapper<Project>().eq(Project::getSyncHikvision, 1));
@@ -248,6 +244,12 @@ public class CarInfoServiceImpl extends ServiceImpl<CarInfoMapper, CarInfo> impl
         }
     }
 
+    private void deleteCar(CarInfo carInfo) {
+        carInfoMapper.deleteById(carInfo.getId());
+        //同步海康
+        asyncHikvision.deleteCarInfoForHikvision(carInfo);
+    }
+
     private void deleteFromApprovalFlowIf(CarInfo carInfo) {
         if (!Objects.equals(carInfo.getCarModuleType(), 1)) {
             carInfoApprovalFlowMapper.delete(new LambdaQueryWrapper<CarInfoApprovalFlow>()