优化

car-wash-entity/src/main/java/com/kym/entity/miniapp/queryParams/DeviceParams.java

@@ -1,9 +1,10 @@
 package com.kym.entity.miniapp.queryParams;
 
+import com.kym.entity.common.PageParams;
 import lombok.Data;
 
 @Data
-public class DeviceParams {
+public class DeviceParams extends PageParams {
     private String productKey;
     private String deviceName;
 }

car-wash-entity/src/main/java/com/kym/entity/miniapp/queryParams/WashOrderParams.java

@@ -0,0 +1,14 @@
+package com.kym.entity.miniapp.queryParams;
+
+import com.kym.entity.common.PageParams;
+import lombok.Data;
+
+/**
+ * @author skyline
+ * @description 订单查询
+ * @date 2023-11-06 11:59
+ */
+@Data
+public class WashOrderParams extends DeviceParams {
+    private String orderId;
+}

car-wash-miniapp/src/main/java/com/kym/miniapp/controller/WashOrderController.java

@@ -1,12 +1,11 @@
 package com.kym.miniapp.controller;
 
 import com.kym.common.R;
+import com.kym.common.controller.IController;
 import com.kym.entity.miniapp.queryParams.DeviceParams;
+import com.kym.entity.miniapp.queryParams.WashOrderParams;
 import com.kym.service.miniapp.WashOrderService;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 
 /**
  * <p>
@@ -18,7 +17,7 @@ import org.springframework.web.bind.annotation.RestController;
  */
 @RestController
 @RequestMapping("/wash-order")
-public class WashOrderController {
+public class WashOrderController extends IController {
 
     private final WashOrderService washOrderService;
 
@@ -27,8 +26,19 @@ public class WashOrderController {
     }
 
 
+    /**
+     * 创建订单（启动洗车机）
+     *
+     * @param params
+     * @return
+     */
     @PostMapping(value = "/createOrder")
-    R<?> createOrder(@RequestBody DeviceParams params){
-        return R.success(washOrderService.createOrder(params));
+    R<?> createOrder(@RequestBody DeviceParams params) {
+        return resp(() -> washOrderService.createOrder(params));
+    }
+
+    @GetMapping(value = "/createOrder")
+    R<?> queryOrder(@RequestBody WashOrderParams params) {
+        return resp(() -> washOrderService.queryOrder(params));
     }
 }

car-wash-service/src/main/java/com/kym/service/jobs/DelayedItem.java

@@ -29,13 +29,26 @@ public class DelayedItem<T> implements Delayed {
     }
 
 
+    /**
+     * 获取过期时间
+     *
+     * @param unit the time unit
+     * @return
+     */
     @Override
     public long getDelay(@NotNull TimeUnit unit) {
         return unit.convert(delayTime.toInstant(ZoneOffset.ofHours(+8)).toEpochMilli() - System.currentTimeMillis(), TimeUnit.MILLISECONDS);
     }
 
+    /**
+     * 比较排序
+     *
+     * @param o the object to be compared.
+     * @return
+     */
     @Override
     public int compareTo(@NotNull Delayed o) {
-        return (int) (getDelay(TimeUnit.MILLISECONDS) - o.getDelay(TimeUnit.MILLISECONDS));
+        var flag = getDelay(TimeUnit.MILLISECONDS) - o.getDelay(TimeUnit.MILLISECONDS);
+        return flag > 0 ? 1 : flag < 0 ? -1 : 0;
     }
 }

car-wash-service/src/main/java/com/kym/service/miniapp/WashOrderService.java

@@ -2,6 +2,7 @@ package com.kym.service.miniapp;
 
 import com.kym.entity.miniapp.WashOrder;
 import com.kym.entity.miniapp.queryParams.DeviceParams;
+import com.kym.entity.miniapp.queryParams.WashOrderParams;
 import com.kym.service.awoara.entity.response.CreateOrder;
 import com.kym.service.mybatisplus.MyBaseService;
 
@@ -16,4 +17,6 @@ import com.kym.service.mybatisplus.MyBaseService;
 public interface WashOrderService extends MyBaseService<WashOrder> {
 
     WashOrder createOrder(DeviceParams params);
+
+    WashOrder queryOrder(WashOrderParams params);
 }

car-wash-service/src/main/java/com/kym/service/miniapp/impl/WashOrderServiceImpl.java

@@ -4,6 +4,7 @@ import cn.dev33.satoken.stp.StpUtil;
 import com.kym.common.utils.OrderUtils;
 import com.kym.entity.miniapp.WashOrder;
 import com.kym.entity.miniapp.queryParams.DeviceParams;
+import com.kym.entity.miniapp.queryParams.WashOrderParams;
 import com.kym.mapper.miniapp.WashOrderMapper;
 import com.kym.service.awoara.AwoaraService;
 import com.kym.service.awoara.entity.response.CreateOrder;
@@ -25,7 +26,6 @@ import java.time.LocalDateTime;
 @Service
 public class WashOrderServiceImpl extends MyBaseServiceImpl<WashOrderMapper, WashOrder> implements WashOrderService {
 
-
     private final AwoaraService awoaraService;
     private final AccountService accountService;
 
@@ -64,4 +64,19 @@ public class WashOrderServiceImpl extends MyBaseServiceImpl<WashOrderMapper, Was
         save(washOrder);
         return washOrder;
     }
+
+    /**
+     * 查询订单详情
+     * @param params
+     * @return
+     */
+    @Override
+    public WashOrder queryOrder(WashOrderParams params) {
+        // 非实时数据
+        return lambdaQuery()
+                .eq(WashOrder::getOrderId, params.getOrderId())
+                .eq(WashOrder::getProductKey, params.getProductKey())
+                .eq(WashOrder::getDeviceName, params.getDeviceName())
+                .one();
+    }
 }