数据大屏重车列表

performance-web/src/main/java/com/clx/performance/controller/largescreen/LargeScreenController.java

@@ -47,11 +47,11 @@ public class LargeScreenController {
         return JSONUtil.toJsonStr(orderChildService.emptyCarList(data));
     }
 
-    @ApiOperation(value = "空车列表", notes = "<br>By:胡宇帆")
-    @GetMapping("/emptyCarList1")
-    public JSON emptyCarList1() {
+    @ApiOperation(value = "重车列表", notes = "<br>By:胡宇帆")
+    @GetMapping("/weightCarList")
+    public String weightCarList() {
         List<String> data = driverFeign.driverTruckList().getData();
-        return JSONUtil.parse(orderChildService.emptyCarList(data));
+        return JSONUtil.toJsonStr(orderChildService.weightCarList(data));
     }
 
 }

performance-web/src/main/java/com/clx/performance/service/OrderChildService.java

 package com.clx.performance.service;
 
+import cn.hutool.json.JSON;
 import cn.hutool.json.JSONObject;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.clx.performance.model.OrderChild;
@@ -84,4 +85,6 @@ public interface OrderChildService {
     DriverCancelOrderChildInfo driverCancelOrderChildInfo(String orderChildNo);
 
     List<JSONObject> emptyCarList(List<String> data);
+
+    List<JSONObject> weightCarList(List<String> data);
 }

performance-web/src/main/java/com/clx/performance/service/impl/OrderChildServiceImpl.java

@@ -1292,6 +1292,41 @@ public class OrderChildServiceImpl implements OrderChildService {
 
     }
 
+    @Override
+    public List<JSONObject> weightCarList(List<String> data) {
+        String now = DateUtils.formatDateTime(LocalDateTime.now(), "yyyy-MM-dd HH:mm:ss").get();
+        List<OrderChild> orderChildList = orderChildDao.selectListWithEmptyCarList();
+        if (CollectionUtils.isEmpty(orderChildList)) {
+            return null;
+        }
+        List<String> list = orderChildList.stream().map(OrderChild::getTruckNo).collect(Collectors.toList());
+        List<JSONObject> result = new LinkedList<>();
+        int index = 0;
+        for (String truckNo : data) {
+            if (!list.contains(truckNo)) {
+                continue;
+            }
+
+            List<TruckTraceDTO> truckTrace = zjxlGpsService.getTruckTrace(truckNo, now,
+                    now);
+            if(CollectionUtils.isNotEmpty(truckTrace)){
+                JSONObject jsonObject = new JSONObject();
+                BigDecimal[] location = truckTrace.get(truckTrace.size() - 1).getLocation();
+                BigDecimal longitude = location[0].setScale(4, BigDecimal.ROUND_DOWN);
+                BigDecimal latitude = location[1].setScale(4, BigDecimal.ROUND_DOWN);
+                jsonObject.set("id", ++index);
+                jsonObject.set("lng", longitude);
+                jsonObject.set("lat", latitude);
+                jsonObject.set("info", "");
+                jsonObject.set("value", "");
+                jsonObject.set("iconField", "ok");
+                result.add(jsonObject);
+            }
+
+        }
+        return result;
+    }
+
     /**
      * 生成计费单
      */