调整04-02

lichao
1 parent ceb1e84e
Showing 1 changed file with 23 additions and 1 deletions
trash-garbage/src/main/java/com/trash/garbage/controller/GarCarController.java
@@ -19,7 +19,9 @@ import com.trash.driver.service.IDriverService;
 import com.trash.enterprise.domain.TransportationEnterprise;
 import com.trash.garbage.global.Result;
 import com.trash.garbage.pojo.dto.GarCarInfoVo;
+import com.trash.garbage.pojo.domain.GarOrderMatchAsk;
 import com.trash.garbage.service.GarCarServer;
+import com.trash.garbage.service.GarOrderMatchAskService;
 //import javafx.scene.controlra.SplitPane;
 import com.trash.garbage.utils.HttpUtil;
 import lombok.extern.slf4j.Slf4j;
@@ -54,6 +56,8 @@ public class GarCarController {
     private IDriverService driverService;
     @Autowired
     private GarCarServer garCarServer;
+    @Autowired
+    private GarOrderMatchAskService garOrderMatchAskService;
     public GarCarController(CarInfoServiceImpl carInfoServiceImpl) {
         this.carInfoServiceImpl = carInfoServiceImpl;
@@ -119,8 +123,9 @@ public class GarCarController {
     }
     @GetMapping("/queryMileage")
-    public Result<?> queryMileage(String carNo , String startTime) {
+    public Result<?> queryMileage(String carNo) {
         String vehicleId = queryAllVehicleInfo(carNo);
+        String startTime = resolveStartTimeByCarNo(carNo);
         Date currentDate = new Date();
         String currentTime = new SimpleDateFormat("yyyy-MM-dd+HH:mm:ss").format(currentDate);
         Map<String, Object> params = new HashMap<>();
@@ -162,6 +167,23 @@ public class GarCarController {
         return Result.OK(result);
     }
+    private String resolveStartTimeByCarNo(String carNo) {
+        String defaultStartTime = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss")
+                .format(new Date(System.currentTimeMillis() - 6 * 60 * 60 * 1000L));
+        if (StringUtils.isBlank(carNo)) {
+            return defaultStartTime;
+        }
+        GarOrderMatchAsk latestAsk = garOrderMatchAskService.lambdaQuery()
+                .eq(GarOrderMatchAsk::getGarHandlerCarCode, carNo)
+                .orderByDesc(GarOrderMatchAsk::getGarCreateTime)
+                .last("limit 1")
+                .one();
+        if (Objects.nonNull(latestAsk) && Objects.nonNull(latestAsk.getGarCreateTime())) {
+            return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(latestAsk.getGarCreateTime());
+        }
+        return defaultStartTime;
+    }
+
     @GetMapping("/requestStrByEnergyType")
     public Result<?> requestStrByEnergyType(String energyType) {
         List<String> json = garCarServer.getAllCompanyNamesByEnergyType(energyType);