Merge remote-tracking branch 'origin/master'

Pu Zhibing

2024-10-12 bbb448443ab183d3c967ea0b799bf38da86c2038

 ruoyi-service/ruoyi-integration/src/main/java/com/ruoyi/integration/barrierGate/server/ParkingOrderService.java

@@ -47,7 +47,7 @@
      TParkingRecord parkingRecord = new TParkingRecord();
      parkingRecord.setLicensePlate(order.getPlate());
      SimpleDateFormat sdf = new SimpleDateFormat("yyyyMMddHHmmssSSS");
      String code = "TC" + Math.random() * 1000 + sdf.format(new Date());
      String code = "TC" + Double.valueOf(Math.random() * 1000).intValue() + sdf.format(new Date());
      parkingRecord.setCode(code);
      parkingRecord.setVehicleColor(order.getPlateColor());
      TParkingLot data = parkingLotClient.getParkingLotByAppKey(order.getAppkey()).getData();
@@ -95,7 +95,7 @@
      TParkingRecord parkingRecord = new TParkingRecord();
      parkingRecord.setLicensePlate(order.getPlatenumber());
      SimpleDateFormat sdf = new SimpleDateFormat("yyyyMMddHHmmssSSS");
      String code = "TC" + Math.random() * 1000 + sdf.format(new Date());
      String code = "TC" + Double.valueOf(Math.random() * 1000).intValue() + sdf.format(new Date());
      parkingRecord.setCode(code);
      parkingRecord.setVehicleColor(order.getPlatecolor());
      TParkingLot data = parkingLotClient.getParkingLotByAppKey(order.getAppkey()).getData();