提交app端代码修改

sckw-modules/sckw-fleet/src/main/java/com/sckw/fleet/service/KwfTruckService.java

@@ -1479,7 +1479,8 @@ public class KwfTruckService {
         truck.setTruckId(String.valueOf(t.getId()));
         truck.setTruckNo(t.getTruckNo());
         truck.setBusinessStatus(String.valueOf(t.getBusinessStatus()));
-        VehicleReturnData vehicleReturnData = getVehicleReturnData(t.getTruckNo());
+        //根据车牌id查询
+        VehicleReturnData vehicleReturnData = getVehicleReturnData(String.valueOf(t.getId()));
         if (Objects.nonNull(vehicleReturnData)){
             truck.setLatitude(vehicleReturnData.getLatitude());
             truck.setLongitude(vehicleReturnData.getLongitude());
@@ -1487,9 +1488,9 @@ public class KwfTruckService {
         return truck;
     }
 
-    public VehicleReturnData getVehicleReturnData(String carNo) {
+    public VehicleReturnData getVehicleReturnData(String truckId) {
         VehicleDataDTO vehicleDataDTO = new VehicleDataDTO();
-        vehicleDataDTO.setCarNo(carNo);
+        vehicleDataDTO.setCarNo(truckId);
         String s;
         try {
             s = HttpUtil.postJson(urlConfigProperties.getApiBaseUrl()+ UrlConstants.QUERY_REAL_TIME_TRACE_URL, JSON.toJSONString(vehicleDataDTO), null);

sckw-modules/sckw-transport/src/main/java/com/sckw/transport/model/param/TruckInfoReq.java

@@ -29,4 +29,9 @@ public class TruckInfoReq implements Serializable {
      */
     @Schema(description = "运单号")
     private String wOrderNo;
+    /**
+     * 车辆id
+     */
+    @Schema(description = "车辆id")
+    private String truckId;
 }

sckw-modules/sckw-transport/src/main/java/com/sckw/transport/service/kwfTruckTraceService.java

@@ -178,8 +178,8 @@ public class kwfTruckTraceService {
     public TruckInfoVo queryTruckInfo(TruckInfoReq req) {
         log.info("查询车辆实时位置信息参数：{}", req);
         //先查缓存 缓存没有 在查询数据中台 数据中台没有 则查询中交
-        if (StringUtils.isNotBlank(req.getTruckNo()) && StringUtils.isNotBlank(req.getTruckNo())){
-            return getTruckInfo(req.getTruckNo(),req.getWOrderNo());
+        if (StringUtils.isNotBlank(req.getTruckId()) && StringUtils.isNotBlank(req.getWOrderNo()) && StringUtils.isNotBlank(req.getTruckNo())){
+            return getTruckInfo(req.getTruckNo(),req.getWOrderNo(),req.getTruckNo());
         }
 
         //如果车牌为空那么查询车队的第一条数据 （从tab页面直接进来）
@@ -190,12 +190,12 @@ public class kwfTruckTraceService {
         if (Objects.isNull(dataFirstTruck) || Objects.isNull(dataFirstTruck.getTruckNo())){
             return new TruckInfoVo();
         }
-        return getTruckInfo(dataFirstTruck.getTruckNo(),"");
+        return getTruckInfo(req.getTruckId(),req.getWOrderNo(),dataFirstTruck.getTruckNo());
     }
 
-    private TruckInfoVo getTruckInfo(String truckNo, String wOrderNo) {
+    private TruckInfoVo getTruckInfo(String truckId, String wOrderNo,String truckNo) {
         //先查询缓存 如果缓存没有就查数据中台 数据中台没有就查中交
-        String location = RedissonUtils.getString(CommonConstants.TRUCK_LOCATION + truckNo+CommonConstants.UNDERSCORE+wOrderNo);
+        String location = RedissonUtils.getString(CommonConstants.TRUCK_LOCATION + truckId+CommonConstants.UNDERSCORE+wOrderNo);
         if (StringUtils.isBlank(location)){
             return new TruckInfoVo();
         }
@@ -205,7 +205,7 @@ public class kwfTruckTraceService {
             return TruckInfoVo.toTruckInfoVo(truckDto);
         }
         //缓存没有则查询数据中台
-        VehicleReturnData vehicleReturnData = getVehicleReturnData(truckNo);
+        VehicleReturnData vehicleReturnData = getVehicleReturnData(truckId);
         if (Objects.nonNull(vehicleReturnData)){
             return buildTruckInfo(wOrderNo, vehicleReturnData);
         }
@@ -336,9 +336,9 @@ public class kwfTruckTraceService {
         return JSON.parseArray(s, VehicleReturnData.class);
     }
 
-    public VehicleReturnData getVehicleReturnData(String truckNo) {
+    public VehicleReturnData getVehicleReturnData(String truckId) {
         VehicleDataDTO vehicleDataDTO = new VehicleDataDTO();
-        vehicleDataDTO.setCarNo(truckNo);
+        vehicleDataDTO.setCarNo(truckId);
         String s;
         try {
             s = HttpUtil.postJson(urlConfigProperties.getApiBaseUrl()+ UrlConstants.QUERY_REAL_TIME_TRACE_URL, JSON.toJSONString(vehicleDataDTO), null);
@@ -394,11 +394,12 @@ public class kwfTruckTraceService {
 
 
         VehiclesTrajectoryReq.VehicleDataVO vehicleDataVO = new VehiclesTrajectoryReq.VehicleDataVO();
-        String truckNo = Optional.ofNullable(waybillOrder)
-                .map(KwtWaybillOrder::getTruckNo)
-                .orElse("");
-        req.setTruckNo(truckNo);
-        vehicleDataVO.setCarNo(truckNo);
+        //车牌id
+        Long truckId = Optional.ofNullable(waybillOrder)
+                .map(KwtWaybillOrder::getTruckId)
+                .orElse(null);
+        req.setTruckNo(String.valueOf(truckId));
+        vehicleDataVO.setCarNo(String.valueOf(truckId));
 
         vehicleDataVO.setFleetId(String.valueOf(Optional.ofNullable(fleetByDriveId)
                 .map(RFleetDriverVo::getFleetId)
@@ -414,11 +415,11 @@ public class kwfTruckTraceService {
         }
 
         //先删除缓存
-        RedissonUtils.delete(CommonConstants.TRUCK_LOCATION + req.getTruckNo()+CommonConstants.UNDERSCORE+req.getWOrderNo());
+        RedissonUtils.delete(CommonConstants.TRUCK_LOCATION + truckId+CommonConstants.UNDERSCORE+req.getWOrderNo());
         //组织缓存数据
         TruckDto truckDto = getTruckDto(req);
         //放入缓存
-        RedissonUtils.add(CommonConstants.TRUCK_LOCATION + req.getTruckNo()+CommonConstants.UNDERSCORE+req.getWOrderNo(),JSON.toJSONString(truckDto));
+        RedissonUtils.add(CommonConstants.TRUCK_LOCATION + truckId+CommonConstants.UNDERSCORE+req.getWOrderNo(),JSON.toJSONString(truckDto));
         return null;
     }