提交全图监控

sckw-modules-api/sckw-transport-api/src/main/java/com/sckw/transport/api/feign/VehicleTraceClient.java

@@ -19,8 +19,8 @@ import java.util.List;
  */
 @FeignClient(
     name = "iot-platform",
-    url = "${vehicle.trace.api.base-url}",
-    path = "/api/transfer",
+    url = "${vehicle.trace.api.base-url}/api/transfer",
+   // path = "/api/transfer",
     configuration = VehicleTraceFeignConfig.class
 )
 @ConditionalOnProperty(name = "vehicle.trace.api.base-url")

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

@@ -1631,7 +1631,7 @@ public class KwfTruckService {
             // 使用 Feign 调用查询实时位置
             BaseResult<VehicleReturnData> result = vehicleTraceClient.queryRealTimeLocation(vehicleDataDTO);
             
-            if (result == null || result.getCode() != HttpStatus.SUCCESS_CODE || result.getData() == null) {
+            if (result == null || result.getCode() != 0 || result.getData() == null) {
                 log.warn("查询实时轨迹返回空数据, 运单号: {}", odrderNo);
                 return null;
             }
@@ -1651,7 +1651,7 @@ public class KwfTruckService {
             // 使用 Feign 调用查询实时位置
             BaseResult<VehicleReturnData> result = vehicleTraceClient.queryRealTimeLocation(vehicleDataDTO);
             
-            if (result == null || result.getCode() != HttpStatus.SUCCESS_CODE || result.getData() == null) {
+            if (result == null || result.getCode() != 0 || result.getData() == null) {
                 log.warn("查询实时轨迹返回空数据, 车牌号: {}", truckId);
                 return null;
             }

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

@@ -2208,7 +2208,7 @@ public class KwtWaybillOrderV1Service {
                     vehicleDataDTO.setWOrderNo(waybillOrder.getWOrderNo());
                     BaseResult<List<com.sckw.transport.api.model.dto.VehicleReturnData>> result = vehicleTraceClient.queryVehicleDataList(vehicleDataDTO1);
                     
-                    if (result != null && result.getCode()!= HttpStatus.SUCCESS_CODE && result.getData() != null) {
+                    if (result != null && result.getCode()== 0 && result.getData() != null) {
                         List<com.sckw.transport.api.model.dto.VehicleReturnData> vehicleReturn = result.getData();
                         List<VehicleRouteData> vehicleReturnData = vehicleReturn.stream().map(x->{
                             VehicleRouteData vehicleRouteData = new VehicleRouteData();

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

@@ -144,7 +144,7 @@ public class VehicleExceptionService {
                 // 默认离线
                 Integer locationStatus = 0;
                 
-                if (result != null && result.getCode() == 200 && result.getData() != null) {
+                if (result != null && result.getCode() == 0 && result.getData() != null) {
                     VehicleReturnData vehicleData = result.getData();
                     
                     // 判断30分钟内有定位数据为在线

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

@@ -547,7 +547,7 @@ public class kwfTruckTraceService {
             // 使用 Feign 调用查询实时位置
             BaseResult<VehicleReturnData> result = vehicleTraceClient.queryRealTimeLocation(vehicleDataDTO);
 
-            if (result == null || result.getCode() != HttpStatus.SUCCESS_CODE || result.getData() == null) {
+            if (result == null || result.getCode() != 0 || result.getData() == null) {
                 log.warn("查询实时轨迹返回空数据, 车牌号: {}", truckId);
                 return null;
             }
@@ -622,7 +622,7 @@ public class kwfTruckTraceService {
             // 使用 Feign 调用上报车辆轨迹
             BaseResult<Void> result = vehicleTraceClient.saveVehicleData(req);
             
-            if (result == null || result.getCode() != HttpStatus.SUCCESS_CODE) {
+            if (result == null || result.getCode() != 0) {
                 log.error("app上报车辆轨迹失败, 响应: {}", result);
                 throw new BusinessException("app上报车辆轨迹异常");
             }
@@ -723,7 +723,7 @@ public class kwfTruckTraceService {
                 vehicleDataDTO.setCarNo(truckNo);
                 BaseResult<VehicleReturnData> result = vehicleTraceClient.queryRealTimeLocation(vehicleDataDTO);
 
-                if (result == null || result.getCode() != HttpStatus.SUCCESS_CODE || result.getData() == null) {
+                if (result == null || result.getCode() != 0 || result.getData() == null) {
                     // 无定位数据，设置为离线
                     truckLocationStatusMap.put(truckNo, 0);
                     return truckLocationStatusMap;
@@ -1039,7 +1039,7 @@ public class kwfTruckTraceService {
                 
                 VehicleLocationInfo locationInfo = new VehicleLocationInfo();
                 
-                if (result != null && result.getCode() == 200 && result.getData() != null) {
+                if (result != null && result.getCode() == 0 && result.getData() != null) {
                     VehicleReturnData vehicleData = result.getData();
                     
                     // 判断定位状态
@@ -1095,7 +1095,7 @@ public class kwfTruckTraceService {
                 BaseResult<List<com.sckw.transport.api.model.dto.VehicleReturnData>> result = 
                         vehicleTraceClient.queryVehicleDataList(vehicleDataDTO);
                 
-                if (result != null && result.getCode() == HttpStatus.SUCCESS_CODE && result.getData() != null) {
+                if (result != null && result.getCode() == 0 && result.getData() != null) {
                     List<com.sckw.transport.api.model.dto.VehicleReturnData> traceDataList = result.getData();
                     
                     // 统计alarmCode不为null且不为0的记录数量（表示有异常报警）
@@ -1273,7 +1273,7 @@ public class kwfTruckTraceService {
         try {
             // 调用数据中台保存轨迹数据
             BaseResult<Void> result = vehicleTraceClient.saveVehicleData(vehiclesTrajectoryReq);
-            if (result.getCode() != HttpStatus.SUCCESS_CODE) {
+            if (result.getCode() != 0) {
                 log.error("保存车辆轨迹数据失败：{}", result.getMessage());
                 throw new BusinessException("生成轨迹失败：" + result.getMessage());
             }
@@ -1321,7 +1321,7 @@ public class kwfTruckTraceService {
     @NotNull
     private static VehiclesTrajectoryReq getVehiclesTrajectoryReq(GenerateTraceReq req, KwtWaybillOrder order, String longitude, String latitude, KwtLogisticsOrder logisticsOrder, RFleetVo fleetByTruckId) {
         VehiclesTrajectoryReq vehiclesTrajectoryReq = new VehiclesTrajectoryReq();
-        vehiclesTrajectoryReq.setTs(req.getDate() + " " + LocalDateTime.now().format(DateTimeFormatter.ofPattern("HH:mm:ss")));
+        vehiclesTrajectoryReq.setTs(req.getDate());
         vehiclesTrajectoryReq.setMobile(order.getDriverPhone());
         vehiclesTrajectoryReq.setTruckNo(req.getTruckNo());
         vehiclesTrajectoryReq.setLongitude(longitude);