From 5c1c4d0e7266d7301b6cbc3d5ab30e265b879b95 Mon Sep 17 00:00:00 2001
From: pengjie <17373303529@163.com>
Date: Sat, 25 May 2024 23:40:04 +0800
Subject: [PATCH 1/6] =?UTF-8?q?=E6=9D=90=E6=96=99=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/java/com/zhgd/xmgl/task/ExamTask.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/java/com/zhgd/xmgl/task/ExamTask.java b/src/main/java/com/zhgd/xmgl/task/ExamTask.java
index e7153c201..2950ba9a0 100644
--- a/src/main/java/com/zhgd/xmgl/task/ExamTask.java
+++ b/src/main/java/com/zhgd/xmgl/task/ExamTask.java
@@ -79,7 +79,7 @@ public class ExamTask {
                 }
             }
         }
-        List<CarInfo> carInfos = carInfoService.list(Wrappers.<CarInfo>lambdaQuery().ne(CarInfo::getCarType, 1));
+        List<CarInfo> carInfos = carInfoService.list(Wrappers.<CarInfo>lambdaQuery().eq(CarInfo::getCarModuleType, 3));
         if (carInfos.size() > 0) {
             carInfos = carInfos.stream().filter(c -> carNumber.contains(c.getCarNumber())).collect(Collectors.toList());
             if (carInfos.size() > 0) {

From 8abd1df9b82b109846f1323d17d11778dba0c300 Mon Sep 17 00:00:00 2001
From: GUO <1923636941@qq.com>
Date: Sun, 26 May 2024 00:52:32 +0800
Subject: [PATCH 2/6] =?UTF-8?q?join=E5=81=9A=E6=95=B0=E6=8D=AE=E6=9D=83?=
 =?UTF-8?q?=E9=99=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../zhgd/mybatis/DataScopeInterceptor.java    | 27 ++++++++++++++++---
 1 file changed, 23 insertions(+), 4 deletions(-)

diff --git a/src/main/java/com/zhgd/mybatis/DataScopeInterceptor.java b/src/main/java/com/zhgd/mybatis/DataScopeInterceptor.java
index f398505a9..511ed8a2f 100644
--- a/src/main/java/com/zhgd/mybatis/DataScopeInterceptor.java
+++ b/src/main/java/com/zhgd/mybatis/DataScopeInterceptor.java
@@ -1,5 +1,6 @@
 package com.zhgd.mybatis;
 
+import cn.hutool.core.collection.CollUtil;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.parser.SqlParserHelper;
@@ -30,10 +31,7 @@ import javax.servlet.http.HttpServletRequest;
 import java.lang.reflect.Method;
 import java.sql.Connection;
 import java.sql.SQLException;
-import java.util.Arrays;
-import java.util.Map;
-import java.util.Objects;
-import java.util.Optional;
+import java.util.*;
 
 @Slf4j
 public class DataScopeInterceptor extends JsqlParserSupport implements InnerInterceptor {
@@ -150,6 +148,14 @@ public class DataScopeInterceptor extends JsqlParserSupport implements InnerInte
         } else {
             processFromItem(fromItem, obj);
         }
+
+        // 如果还存在关联查询
+        List<Join> joins = plainSelect.getJoins();
+        if (CollUtil.isNotEmpty(joins)) {
+            for (Join join : joins) {
+                processJoin(join,obj);
+            }
+        }
     }
 
     protected void processFromItem(FromItem fromItem, Object obj) {
@@ -160,4 +166,17 @@ public class DataScopeInterceptor extends JsqlParserSupport implements InnerInte
             }
         }
     }
+
+    /**
+     * 处理关联查询
+     *
+     * @param join 关联查询
+     * @param obj
+     */
+    protected void processJoin(Join join, Object obj) {
+        FromItem joinTable = join.getRightItem();
+        if (joinTable instanceof SubSelect) {
+            processSelectBody(((SubSelect) joinTable).getSelectBody(),obj);
+        }
+    }
 }

From 8b94230d7832668f366568045e8cdd39edbf815f Mon Sep 17 00:00:00 2001
From: GUO <1923636941@qq.com>
Date: Sun, 26 May 2024 00:56:13 +0800
Subject: [PATCH 3/6] =?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

---
 .../xmgl/modules/checking/mapper/xml/XzCheckingRouteMapper.xml   | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/main/java/com/zhgd/xmgl/modules/checking/mapper/xml/XzCheckingRouteMapper.xml b/src/main/java/com/zhgd/xmgl/modules/checking/mapper/xml/XzCheckingRouteMapper.xml
index e407c13c5..523b26b4e 100644
--- a/src/main/java/com/zhgd/xmgl/modules/checking/mapper/xml/XzCheckingRouteMapper.xml
+++ b/src/main/java/com/zhgd/xmgl/modules/checking/mapper/xml/XzCheckingRouteMapper.xml
@@ -16,7 +16,6 @@
               from xz_checking_route as t
                        join enterprise_info ei on find_in_set(ei.id, t.enterprise_id)
               group by t.id) as t
-                 join xz_checking_route t1 on t1.id = t.id
     </sql>
     <select id="queryList" resultType="com.zhgd.xmgl.modules.checking.entity.XzCheckingRoute">
         <include refid="selectTable">

From 8ed205a4eac9dcaceb520196aae7ddb624f285ef Mon Sep 17 00:00:00 2001
From: pengjie <17373303529@163.com>
Date: Sun, 26 May 2024 11:41:19 +0800
Subject: [PATCH 4/6] =?UTF-8?q?=E8=BD=A6=E8=BE=86=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/java/com/zhgd/xmgl/task/ExamTask.java | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/src/main/java/com/zhgd/xmgl/task/ExamTask.java b/src/main/java/com/zhgd/xmgl/task/ExamTask.java
index 2950ba9a0..18007dd2f 100644
--- a/src/main/java/com/zhgd/xmgl/task/ExamTask.java
+++ b/src/main/java/com/zhgd/xmgl/task/ExamTask.java
@@ -5,6 +5,7 @@ import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.toolkit.StringUtils;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.zhgd.xmgl.async.AsyncHikvision;
 import com.zhgd.xmgl.modules.car.entity.CarInfo;
 import com.zhgd.xmgl.modules.car.service.ICarInfoService;
 import com.zhgd.xmgl.modules.exam.entity.*;
@@ -68,12 +69,15 @@ public class ExamTask {
     @Autowired
     private ICarInfoService carInfoService;
 
+    @Autowired
+    private AsyncHikvision asyncHikvision;
+
     @Scheduled(cron = "0 0/1 * * * ?")
     public void xzMaterial() {
         List<XzMaterial> list = xzMaterialService.list();
         List<String> carNumber = new ArrayList<>();
         for (XzMaterial xzMaterial : list) {
-            if (xzMaterial.getEntryEndTime().compareTo(new Date()) < 0) {
+            if (xzMaterial.getEntryEndTime() != null && xzMaterial.getEntryEndTime().compareTo(new Date()) < 0) {
                 if (StringUtils.isNotBlank(xzMaterial.getCarNumber())) {
                     carNumber.add(xzMaterial.getCarNumber());
                 }
@@ -84,6 +88,10 @@ public class ExamTask {
             carInfos = carInfos.stream().filter(c -> carNumber.contains(c.getCarNumber())).collect(Collectors.toList());
             if (carInfos.size() > 0) {
                 carInfoService.removeByIds(carInfos.stream().map(c -> c.getId()).collect(Collectors.toSet()));
+                for (CarInfo carInfo : carInfos) {
+                    //同步海康
+                    asyncHikvision.deleteCarInfoForHikvision(carInfo);
+                }
             }
         }
     }

From 7f5e9aaa1ea7a88462eb20c2a94680234b85e976 Mon Sep 17 00:00:00 2001
From: pengjie <17373303529@163.com>
Date: Mon, 27 May 2024 13:28:32 +0800
Subject: [PATCH 5/6] =?UTF-8?q?=E8=BD=A6=E8=BE=86=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/java/com/zhgd/xmgl/call/HikvisionCall.java          | 5 +++--
 .../zhgd/xmgl/modules/car/controller/CarInfoController.java  | 1 +
 src/main/java/com/zhgd/xmgl/modules/car/entity/CarInfo.java  | 2 ++
 .../xmgl/modules/car/service/impl/CarInfoServiceImpl.java    | 2 ++
 4 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/src/main/java/com/zhgd/xmgl/call/HikvisionCall.java b/src/main/java/com/zhgd/xmgl/call/HikvisionCall.java
index 6a8c9d4b0..723a1bfdb 100644
--- a/src/main/java/com/zhgd/xmgl/call/HikvisionCall.java
+++ b/src/main/java/com/zhgd/xmgl/call/HikvisionCall.java
@@ -1086,11 +1086,12 @@ public class HikvisionCall {
         }
         if (SecurityUtils.getUser() != null && SecurityUtils.getUser().getUserId() != null) {
             noticeService.addUserNotice(SecurityUtils.getUser().getUserId(), msg, title, "24");
-        }
-        if (carInfo.getUserIds() != null && carInfo.getUserIds().size() > 0) {
+        } else  if (carInfo.getUserIds() != null && carInfo.getUserIds().size() > 0) {
             for (String userId : carInfo.getUserIds()) {
                 noticeService.addUserNotice(Long.valueOf(userId), msg, title, "24");
             }
+        } else if (carInfo.getCreateBy() != null) {
+            noticeService.addUserNotice(carInfo.getCreateBy(), msg, title, "24");
         }
     }
 
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 14feff938..839c7125b 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
@@ -109,6 +109,7 @@ public class CarInfoController {
 			 carInfo.setAlarmPushWorkerId(alarmPushWorkerIds.get(0).toString());
 		 }
 		 if (userId != null) {
+			 carInfo.setCreateBy(Long.valueOf(userId));
 			 Long workerId = systemUserService.getOne(Wrappers.<SystemUser>lambdaQuery().eq(SystemUser::getUserId, userId)).getWorkerId();
 			 carInfo.setEnterpriseId(workerInfoService.getById(workerId).getEnterpriseId());
 		 }
diff --git a/src/main/java/com/zhgd/xmgl/modules/car/entity/CarInfo.java b/src/main/java/com/zhgd/xmgl/modules/car/entity/CarInfo.java
index 5c25b1f85..c7619ca9b 100644
--- a/src/main/java/com/zhgd/xmgl/modules/car/entity/CarInfo.java
+++ b/src/main/java/com/zhgd/xmgl/modules/car/entity/CarInfo.java
@@ -117,6 +117,8 @@ public class CarInfo implements Serializable {
     private Integer entryAndExitPermit;
     @ApiModelProperty(value = "企业id")
     private Long enterpriseId;
+    @ApiModelProperty(value = "创建人ID")
+    private Long createBy;
 
     @ApiModelProperty(value = "驾驶证")
     private java.lang.String jsz;
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 97476bfd6..a246a7018 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
@@ -17,6 +17,7 @@ import com.zhgd.xmgl.modules.car.mapper.*;
 import com.zhgd.xmgl.modules.car.service.ICarInfoService;
 import com.zhgd.xmgl.modules.worker.mapper.WorkerInfoMapper;
 import com.zhgd.xmgl.modules.worker.service.impl.EnterpriseInfoServiceImpl;
+import com.zhgd.xmgl.security.util.SecurityUtils;
 import com.zhgd.xmgl.util.MessageUtil;
 import org.apache.commons.collections.MapUtils;
 import org.apache.commons.lang3.StringUtils;
@@ -110,6 +111,7 @@ public class CarInfoServiceImpl extends ServiceImpl<CarInfoMapper, CarInfo> impl
                 return Result.ok("车辆已存在，预约时间已覆盖更新");
             }
         } else {
+            c.setCreateBy(SecurityUtils.getUser().getUserId());
             carInfoMapper.insert(c);
             //同步海康
             asyncHikvision.addCarInfoForHikvision(c);

From 374457baf530a16e1e367362a680541ce5f50435 Mon Sep 17 00:00:00 2001
From: pengjie <17373303529@163.com>
Date: Mon, 27 May 2024 14:00:54 +0800
Subject: [PATCH 6/6] =?UTF-8?q?=E8=BD=A6=E8=BE=86=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../zhgd/xmgl/modules/car/controller/CarInfoController.java  | 5 ++++-
 .../xmgl/modules/car/service/impl/CarInfoServiceImpl.java    | 1 -
 2 files changed, 4 insertions(+), 2 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 839c7125b..73f44cf6a 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
@@ -77,6 +77,7 @@ public class CarInfoController {
 	@ApiOperation(value = "添加车辆黑白名单管理信息", notes = "添加车辆黑白名单管理信息", httpMethod = "POST")
 	@PostMapping(value = "/add")
 	public Result add(@RequestBody CarInfo carInfo) {
+		carInfo.setCreateBy(SecurityUtils.getUser().getUserId());
 		return carInfoService.addCarInfo(carInfo);
 	}
 
@@ -172,6 +173,9 @@ public class CarInfoController {
 				 otherProveList.add(teMap);
 			 }
 		 }
+		 if (userIds != null && userIds.size() > 0) {
+			 carInfo.setUserIds(userIds);
+		 }
 		 carInfo.setCarPhotosUrl(JSON.toJSONString(carPhotosUrls));
 		 carInfo.setJsz(JSON.toJSONString(jszList));
 		 carInfo.setXsz(JSON.toJSONString(xszList));
@@ -179,7 +183,6 @@ public class CarInfoController {
 		 carInfo.setOtherProve(JSON.toJSONString(otherProveList));
 		 carInfo.setProjectSn(map.get("projectSn").toString());
 		 carInfo.setIsBlack(MapUtils.getInteger(map, "isBlack"));
-		 carInfo.setUserIds(userIds);
 		 Object outsideDriverIdCard = map.get("outsideDriverIdCard");
 		 if (outsideDriverIdCard != null) {
 			 carInfo.setOutsideDriverIdCard(outsideDriverIdCard.toString());
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 a246a7018..eb393b0df 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
@@ -111,7 +111,6 @@ public class CarInfoServiceImpl extends ServiceImpl<CarInfoMapper, CarInfo> impl
                 return Result.ok("车辆已存在，预约时间已覆盖更新");
             }
         } else {
-            c.setCreateBy(SecurityUtils.getUser().getUserId());
             carInfoMapper.insert(c);
             //同步海康
             asyncHikvision.addCarInfoForHikvision(c);