From a56d4ba7c487b94e3e38ce04dee3eba898ca3b5f Mon Sep 17 00:00:00 2001
From: pengjie <17373303529@163.com>
Date: Fri, 12 Jul 2024 11:50:13 +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/controller/CarInfoController.java     | 36 ++++++++++++++-----
 1 file changed, 27 insertions(+), 9 deletions(-)

diff --git a/src/main/java/com/zhgd/xmgl/modules/car/controller/CarInfoController.java b/src/main/java/com/zhgd/xmgl/modules/car/controller/CarInfoController.java
index ef1e374fd..4693b4742 100644
--- a/src/main/java/com/zhgd/xmgl/modules/car/controller/CarInfoController.java
+++ b/src/main/java/com/zhgd/xmgl/modules/car/controller/CarInfoController.java
@@ -5,6 +5,7 @@ import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.util.StrUtil;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.google.gson.JsonObject;
@@ -214,16 +215,20 @@ public class CarInfoController {
         if (outsideDriverIdCard != null) {
             carInfo.setOutsideDriverIdCard(outsideDriverIdCard.toString());
         }
+
+        QueryWrapper<CarInfo> queryWrapper = new QueryWrapper<>();
+        queryWrapper.lambda().eq(CarInfo::getProjectSn, carInfo.getProjectSn())
+                .eq(CarInfo::getCarNumber, carInfo.getCarNumber());
+        CarInfo old = carInfoService.getOne(queryWrapper);
+        if (Objects.equals(old.getIsBlack(), 1)) {
+            List<String> collect = getUserIds(carInfo.getProjectSn(), carInfo.getUserIds());
+            for (String s : collect) {
+                noticeService.addUserNotice(Long.valueOf(s), StrUtil.format("【({})车辆已被拉黑，无法再进行新增】", carInfo.getCarNumber()),
+                        "新增车辆通知", "24");
+            }
+        }
         if (DateUtil.compare(carInfo.getReserveEndTime(), new Date()) < 0) {
-            List<SystemUser> systemUserList = systemUserService.list(Wrappers.<SystemUser>lambdaQuery()
-                    .eq(SystemUser::getAccountType, SystemUserAccountTypeEnum.PROJECT_ACCOUNT.getValue())
-                    .eq(SystemUser::getSn, carInfo.getProjectSn()));
-            List<XzSystemUserToCompanyProject> xzSystemUserToCompanyProjects = xzSystemUserToCompanyProjectService.list(Wrappers.<XzSystemUserToCompanyProject>lambdaQuery()
-                    .eq(XzSystemUserToCompanyProject::getType, 2)
-                    .eq(XzSystemUserToCompanyProject::getSn, carInfo.getProjectSn()));
-            List<String> collect = systemUserList.stream().map(s -> s.getUserId().toString()).collect(Collectors.toList());
-            collect.addAll(xzSystemUserToCompanyProjects.stream().map(x -> x.getUserId().toString()).collect(Collectors.toList()));
-            collect.addAll(carInfo.getUserIds());
+            List<String> collect = getUserIds(carInfo.getProjectSn(), carInfo.getUserIds());
             for (String s : collect) {
                 noticeService.addUserNotice(Long.valueOf(s), StrUtil.format("【预约时间已过期，({})车辆无法下发】", carInfo.getCarNumber()),
                         "车辆下发道闸通知", "24");
@@ -234,6 +239,19 @@ public class CarInfoController {
         return Result.ok();
     }
 
+    private List<String> getUserIds(String projectSn, List<String> userIds) {
+        List<SystemUser> systemUserList = systemUserService.list(Wrappers.<SystemUser>lambdaQuery()
+                .eq(SystemUser::getAccountType, SystemUserAccountTypeEnum.PROJECT_ACCOUNT.getValue())
+                .eq(SystemUser::getSn, projectSn));
+        List<XzSystemUserToCompanyProject> xzSystemUserToCompanyProjects = xzSystemUserToCompanyProjectService.list(Wrappers.<XzSystemUserToCompanyProject>lambdaQuery()
+                .eq(XzSystemUserToCompanyProject::getType, 2)
+                .eq(XzSystemUserToCompanyProject::getSn, projectSn));
+        List<String> collect = systemUserList.stream().map(s -> s.getUserId().toString()).collect(Collectors.toList());
+        collect.addAll(xzSystemUserToCompanyProjects.stream().map(x -> x.getUserId().toString()).collect(Collectors.toList()));
+        collect.addAll(userIds);
+        return collect;
+    }
+
     /**
      * 编辑
      *