道闸加入黑名单车辆

src/main/java/com/charging/chargingparking/entity/ParkingChannel.java

@@ -33,6 +33,11 @@ public class ParkingChannel implements Serializable {
      * 车道名称
      */
     private String channelName;
+    /**
+     * add by hbjzws 2024-5-11
+     * 道闸车辆黑名单
+     */
+    private String carNumRemark;
 
     /**
      * 车道类型（1：入口，2：出口）

src/main/java/com/charging/chargingparking/service/impl/ParkingRecordServiceImpl.java

@@ -117,6 +117,7 @@ public class ParkingRecordServiceImpl extends ServiceImpl<ParkingRecordMapper, P
 
         ParkingInfo parkingInfo = parkingInfoService.getById(parkingChannel.getParkId());
 
+
         //传递的时间参数
         String dataStr = StringUtils.getAlarmInfoPlateTimeStr(alarmInfoPlate.getResult().getPlateResult().getTimeStamp().getTimeval());
 
@@ -142,7 +143,12 @@ public class ParkingRecordServiceImpl extends ServiceImpl<ParkingRecordMapper, P
             throw new Exception(StrUtil.format("车牌错误:{}", license));
         }
 
-
+        //add by hbjzws 2024-05-14 道闸设置车辆黑名单
+        if("1".equals(parkingChannel.getParkId())&&"1".equals(parkingChannel.getChannelType())){
+            if(StringUtils.isNotEmpty(parkingChannel.getCarNumRemark())&&parkingChannel.getCarNumRemark().contains(license)){
+                throw new Exception(StrUtil.format("道闸设置黑名单车辆的车牌号:{}", license));
+            }
+        }
 
         //锦添物业停车场2分钟内对同一车牌处理1次
         if ("5f8d343e-63d1-4ef0-9844-855ca020d92b".equals(parkingInfo.getId())) {
@@ -201,7 +207,7 @@ public class ParkingRecordServiceImpl extends ServiceImpl<ParkingRecordMapper, P
                 parkingEnableVo.setOpen(true);
             }
         }
-        //parkingEnableVo.setOpen(true); 这句话正式环境不要打开（调试用）
+        //parkingEnableVo.setOpen(true); //这句话正式环境不要打开（调试用）
         if (!parkingEnableVo.getOpen()) {
             ParkingChannelVoice parkingChannelVoice = new ParkingChannelVoice();
             parkingChannelVoice.setChannelId(parkingChannel.getId());

src/main/resources/application-dev.yml

@@ -1,6 +1,6 @@
 spring:
   datasource:
-    url: jdbc:log4jdbc:mysql://127.0.0.1:3306/charging_parking?autoReconnect=true&characterEncoding=utf8&serverTimezone=GMT%2B8
+    url: jdbc:log4jdbc:mysql://127.0.0.1:3307/charging_parking?autoReconnect=true&characterEncoding=utf8&serverTimezone=GMT%2B8
     username: root
     password: root
     #url: jdbc:log4jdbc:mysql://47.92.161.104:3336/charging_parking?autoReconnect=true&characterEncoding=utf8&serverTimezone=GMT%2B8&useSSL=false

src/test/java/com/charging/chargingparking/ChargingParkingApplicationTests.java

@@ -104,15 +104,23 @@ class ChargingParkingApplicationTests {
     private TimeSetService timeSetService;
     @Test
     void testService()  {
-        ParkingChannel parkingChannel = parkingChannelService.getById(1541608391538962434l);
-
-        String yqll="1541608391538962434";
-        if(yqll.equals(parkingChannel.getId())){
-            System.out.println("11111");
-        }else{
-            System.out.println("000000");
-
-        }
+        ParkingChannel parkingChannel = new ParkingChannel();
+        parkingChannel.setDelFlag(false);
+        parkingChannel.setCreateBy("1");
+        parkingChannel.setCreateTime(new Date());
+        parkingChannel.setCarNumRemark("鄂DF59895");
+        boolean affect = parkingChannelService.save(parkingChannel);
+        parkingChannel.setCarNumRemark("鄂DF59895,鄂DF99999");
+        parkingChannelService.updateById(parkingChannel);
+//        ParkingChannel parkingChannel = parkingChannelService.getById(1541608391538962434l);
+//
+//        String yqll="1541608391538962434";
+//        if(yqll.equals(parkingChannel.getId())){
+//            System.out.println("11111");
+//        }else{
+//            System.out.println("000000");
+//
+//        }
     }
 //    @Test
 //    void testService()  {

src/test/java/com/charging/chargingparking/MainTestAll2.java

@@ -3,23 +3,31 @@ package com.charging.chargingparking;
 import cn.hutool.core.date.DateUnit;
 import cn.hutool.core.date.DateUtil;
 import com.charging.chargingparking.utils.BetweenTimeUtil;
+import com.ijpay.core.enums.SignType;
+import com.ijpay.core.kit.WxPayKit;
 
 import java.util.Calendar;
 import java.util.Date;
+import java.util.Map;
 
 
 public class MainTestAll2 {
 
     public static void main(String[] args) {
 
-        String temStartDate01="2023-08-03 03:02:21";//停车进出场时间区间
-        String temStartDate02="2023-08-03 07:45:52";
-        String temStartDate1="2022-07-22 00:00:00";//会员开始结束时间区间
-        String temStartDate2="2025-07-22 23:59:59";
-        String startT="01:00:00";//免费开始时间点
-        String endT="09:00:00";//免费结束时间点
-        long decTimeMins= BetweenTimeUtil.getDecTimeMins(temStartDate01,temStartDate02,temStartDate1,temStartDate2,startT,endT);
-        System.out.println("结果:"+decTimeMins);
+//        String temStartDate01="2023-08-03 03:02:21";//停车进出场时间区间
+//        String temStartDate02="2023-08-03 07:45:52";
+//        String temStartDate1="2022-07-22 00:00:00";//会员开始结束时间区间
+//        String temStartDate2="2025-07-22 23:59:59";
+//        String startT="01:00:00";//免费开始时间点
+//        String endT="09:00:00";//免费结束时间点
+//        long decTimeMins= BetweenTimeUtil.getDecTimeMins(temStartDate01,temStartDate02,temStartDate1,temStartDate2,startT,endT);
+//        System.out.println("结果:"+decTimeMins);
+
+
+        Map<String, String> packageParams = WxPayKit.prepayIdCreateSign("1", "2",
+                "3", SignType.HMACSHA256);
+        System.out.println("11111111111");
     }
 
 }