提交app端代码修改

sckw-common/sckw-common-core/src/main/java/com/sckw/core/utils/HttpUtil.java

@@ -32,8 +32,9 @@ public class HttpUtil {
         Request request = builder.build();
         try (Response response = client.newCall(request).execute()) {
             if (response.isSuccessful() && response.body() != null) {
-                log.info("同步 GET 响应结果：{}", response.body().string());
-                return response.body().string();
+                String result = response.body().string();
+                log.info("同步 GET 响应结果：{}", result);
+                return result;
             } else if (!response.isSuccessful()) {
                 throw new BusinessException("同步 GET 请求请求异常: " + response.code());
             } else {
@@ -71,8 +72,9 @@ public class HttpUtil {
         Request request = builder.build();
         try (Response response = client.newCall(request).execute()) {
             if (response.isSuccessful() && response.body() != null) {
-                log.info("同步 POST - 表单响应结果：{}", response.body().string());
-                return response.body().string();
+                String result = response.body().string();
+                log.info("同步 POST - 表单响应结果：{}", result);
+                return result;
             } else if (!response.isSuccessful()) {
                 throw new BusinessException("同步 POST - 表单请求异常: " + response.code());
             } else {
@@ -92,8 +94,9 @@ public class HttpUtil {
         Request request = builder.build();
         try (Response response = client.newCall(request).execute()) {
             if (response.isSuccessful() && response.body() != null) {
-                log.info("同步 POST - JSON响应结果：{}", response.body().string());
-                return response.body().string();
+                String result =  response.body().string();
+                log.info("同步 POST - JSON响应结果：{}",result );
+                return result;
             } else if (!response.isSuccessful()) {
                 throw new BusinessException("同步 POST - JSON 请求异常: " + response.code());
             } else {

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

@@ -1446,11 +1446,7 @@ public class KwfTruckService {
                 .collect(Collectors.toList());
         //获取车辆信息
         List<KwfTruck> truckList = kwfTruckRepository.queryByEntIds(entIds);
-//        if (StringUtils.isNotBlank(req.getTruckNo())){
-//            truckList = truckList.stream()
-//                    .filter(x -> org.apache.commons.lang3.StringUtils.equals(x.getTruckNo(), req.getTruckNo()))
-//                    .collect(Collectors.toList());
-//        }
+
         //将车辆信息按照企业id进行分组
         Map<Long, List<KwfTruck>> entIdAndTruckMap = truckList.stream()
                 .filter(x->StringUtils.isNotBlank(req.getTruckNo()) && org.apache.commons.lang3.StringUtils.equals(x.getTruckNo(), req.getTruckNo()) )
@@ -1483,11 +1479,11 @@ public class KwfTruckService {
         truck.setTruckId(String.valueOf(t.getId()));
         truck.setTruckNo(t.getTruckNo());
         truck.setBusinessStatus(String.valueOf(t.getBusinessStatus()));
-       // VehicleReturnData vehicleReturnData = getVehicleReturnData(t.getTruckNo());
-//        if (Objects.nonNull(vehicleReturnData)){
-//            truck.setLatitude(vehicleReturnData.getLatitude());
-//            truck.setLongitude(vehicleReturnData.getLongitude());
-//        }
+        VehicleReturnData vehicleReturnData = getVehicleReturnData(t.getTruckNo());
+        if (Objects.nonNull(vehicleReturnData)){
+            truck.setLatitude(vehicleReturnData.getLatitude());
+            truck.setLongitude(vehicleReturnData.getLongitude());
+        }
         return truck;
     }
 
@@ -1504,6 +1500,7 @@ public class KwfTruckService {
         if (org.apache.commons.lang3.StringUtils.isBlank(s)){
             return null;
         }
-        return JSON.parseObject(s, VehicleReturnData.class);
+        JSONObject jsonObject  = JSON.parseObject(s);
+        return JSON.parseObject(jsonObject.get("data").toString(), VehicleReturnData.class);
     }
 }