From f79474dfd7b4c49f6bd5c517a364eacc26aa1adb Mon Sep 17 00:00:00 2001
From: "583641232@qq.com" <583641232@qq.com>
Date: Fri, 9 Aug 2024 11:04:30 +0800
Subject: [PATCH] =?UTF-8?q?:sparkles:=20=20=E8=BD=A6=E8=BE=86=E4=BF=A1?=
 =?UTF-8?q?=E6=81=AF=E6=9B=B4=E6=96=B0=EF=BC=8C=E6=9B=B4=E6=96=B0=E8=BD=A6?=
 =?UTF-8?q?=E7=89=8C=E5=AE=9E=E9=99=85=E6=8C=81=E6=9C=89=E4=BA=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/CarInfoServiceImpl.java      | 31 +++++++++++--------
 .../service/impl/PlateNumberServiceImpl.java  |  1 +
 2 files changed, 19 insertions(+), 13 deletions(-)

diff --git a/cas-system/src/main/java/com/inscloudtech/datacenter/service/impl/CarInfoServiceImpl.java b/cas-system/src/main/java/com/inscloudtech/datacenter/service/impl/CarInfoServiceImpl.java
index 236c6cf..f08987c 100644
--- a/cas-system/src/main/java/com/inscloudtech/datacenter/service/impl/CarInfoServiceImpl.java
+++ b/cas-system/src/main/java/com/inscloudtech/datacenter/service/impl/CarInfoServiceImpl.java
@@ -184,16 +184,13 @@ public class CarInfoServiceImpl implements ICarInfoService {
     @Override
     @Transactional
     public Boolean insertByBo(CarInfo bo) {
-        boolean flag = baseMapper.insert(bo) > 0;
-        if (flag) {
-            BeanUtils.beanAttributeValueTrim(bo);
-            String uniqueKey = BeanUtils.getUniqueKey(bo);
-            String md5Id = HelperUtil.generateMD5(uniqueKey);
-            bo.setId(md5Id);
-            esMapper.insert(bo);
-        }
+        BeanUtils.beanAttributeValueTrim(bo);
+        String uniqueKey = BeanUtils.getUniqueKey(bo);
+        String md5Id = HelperUtil.generateMD5(uniqueKey);
+        bo.setId(md5Id);
+        esMapper.insert(bo);
         plateNumberService.updateHolder(bo.getCaseId());
-        return flag;
+        return true;
     }
 
     /**
@@ -202,7 +199,7 @@ public class CarInfoServiceImpl implements ICarInfoService {
     @Override
     @Transactional
     public Boolean updateByBo(CarInfo bo) {
-        baseMapper.deleteById(bo.getId());
+        esMapper.deleteById(bo.getId());
         BeanUtils.beanAttributeValueTrim(bo);
         String uniqueKey = BeanUtils.getUniqueKey(bo);
         String md5Id = HelperUtil.generateMD5(uniqueKey);
@@ -217,7 +214,7 @@ public class CarInfoServiceImpl implements ICarInfoService {
     @Override
     @Transactional
     public Boolean deleteWithValidByIds(Collection<String> ids, Boolean isValid) {
-        baseMapper.deleteBatchIds(ids);
+//        baseMapper.deleteBatchIds(ids);
         esMapper.deleteBatchIds(ids);
         return true;
     }
@@ -307,8 +304,16 @@ public class CarInfoServiceImpl implements ICarInfoService {
     }
 
     @UpdateLog(title = "车辆信息",mapperClass = CarInfoMapper.class)
-    public boolean updateR(CarInfo update) {
-        return baseMapper.updateById(update) > 0;
+    public boolean updateR(CarInfo bo) {
+
+        esMapper.deleteById(bo.getId());
+        BeanUtils.beanAttributeValueTrim(bo);
+        String uniqueKey = BeanUtils.getUniqueKey(bo);
+        String md5Id = HelperUtil.generateMD5(uniqueKey);
+        bo.setId(md5Id);
+        esMapper.insert(bo);
+        plateNumberService.updateHolder(bo.getCaseId());
+        return true;
     }
 
     private CarInfoServiceImpl getServiceImpl() {
diff --git a/cas-system/src/main/java/com/inscloudtech/datacenter/service/impl/PlateNumberServiceImpl.java b/cas-system/src/main/java/com/inscloudtech/datacenter/service/impl/PlateNumberServiceImpl.java
index 6a55895..0c40ba5 100644
--- a/cas-system/src/main/java/com/inscloudtech/datacenter/service/impl/PlateNumberServiceImpl.java
+++ b/cas-system/src/main/java/com/inscloudtech/datacenter/service/impl/PlateNumberServiceImpl.java
@@ -228,6 +228,7 @@ public class PlateNumberServiceImpl implements PlateNumberService {
                 addList.add(plateNumberInfo);
             }
             esMapper.insertBatch(addList);
+            esMapper.refresh();
         }
     }