洗车机列表等

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

@@ -3,17 +3,19 @@ package com.kym.entity.miniapp.queryParams;
 import com.kym.entity.common.PageParams;
 import lombok.AllArgsConstructor;
 import lombok.Data;
+import lombok.NoArgsConstructor;
 
 @Data
 @AllArgsConstructor
-public class DeviceParams extends PageParams {
+@NoArgsConstructor
+public class DeviceQueryParams extends PageParams {
 
     private String shortId;
     private String stationId;
     private String productKey;
     private String deviceName;
 
-    public DeviceParams(String shortId, String productKey, String deviceName) {
+    public DeviceQueryParams(String shortId, String productKey, String deviceName) {
         this.shortId = shortId;
         this.stationId = shortId.substring(0, 3);
         this.productKey = productKey;

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

@@ -8,7 +8,7 @@ import lombok.Data;
  * @date 2023-11-06 11:59
  */
 @Data
-public class WashOrderParams{
+public class WashOrderQueryParams {
     private String orderId;
     private String stationId;
     private String shortId;

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

@@ -2,6 +2,7 @@ package com.kym.miniapp.controller;
 
 import com.kym.common.R;
 import com.kym.common.controller.IController;
+import com.kym.entity.miniapp.queryParams.DeviceQueryParams;
 import com.kym.service.miniapp.WashDeviceService;
 import org.springframework.web.bind.annotation.*;
 
@@ -23,6 +24,10 @@ public class WashDeviceController extends IController {
         this.washDeviceService = washDeviceService;
     }
 
+    @GetMapping("/listWashDevice")
+    R<?> listWashDevice(@ModelAttribute DeviceQueryParams params){
+        return resp(() ->washDeviceService.listWashDevice(params));
+    }
 
     /**
      * 根据短编号查询设备信息

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

@@ -2,8 +2,11 @@ package com.kym.service.miniapp;
 
 import com.kym.entity.miniapp.WashDevice;
 import com.kym.entity.miniapp.WashOrder;
+import com.kym.entity.miniapp.queryParams.DeviceQueryParams;
 import com.kym.service.mybatisplus.MyBaseService;
 
+import java.util.List;
+
 /**
  * <p>
  * 洗车设备表 服务类
@@ -19,4 +22,6 @@ public interface WashDeviceService extends MyBaseService<WashDevice> {
     String startDevice(String shortId);
 
     void stopDevice(String shortId);
+
+    List<WashDevice> listWashDevice(DeviceQueryParams params);
 }

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

@@ -1,9 +1,8 @@
 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.entity.miniapp.queryParams.DeviceQueryParams;
+import com.kym.entity.miniapp.queryParams.WashOrderQueryParams;
 import com.kym.service.mybatisplus.MyBaseService;
 
 /**
@@ -16,9 +15,9 @@ import com.kym.service.mybatisplus.MyBaseService;
  */
 public interface WashOrderService extends MyBaseService<WashOrder> {
 
-    String createOrder(DeviceParams params);
+    String createOrder(DeviceQueryParams params);
 
-    void closeOrder(DeviceParams params);
+    void closeOrder(DeviceQueryParams params);
 
-    WashOrder queryOrder(WashOrderParams params);
+    WashOrder queryOrder(WashOrderQueryParams params);
 }

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

@@ -1,8 +1,8 @@
 package com.kym.service.miniapp.impl;
 
+import com.kym.common.utils.CommUtil;
 import com.kym.entity.miniapp.WashDevice;
-import com.kym.entity.miniapp.WashOrder;
-import com.kym.entity.miniapp.queryParams.DeviceParams;
+import com.kym.entity.miniapp.queryParams.DeviceQueryParams;
 import com.kym.mapper.miniapp.WashDeviceMapper;
 import com.kym.service.cache.KymCache;
 import com.kym.service.miniapp.WashDeviceService;
@@ -10,6 +10,8 @@ import com.kym.service.miniapp.WashOrderService;
 import com.kym.service.mybatisplus.MyBaseServiceImpl;
 import org.springframework.stereotype.Service;
 
+import java.util.List;
+
 /**
  * <p>
  * 洗车设备表 服务实现类
@@ -28,6 +30,17 @@ public class WashDeviceServiceImpl extends MyBaseServiceImpl<WashDeviceMapper, W
     }
 
 
+    /**
+     * 获取设备列表
+     *
+     * @param params
+     * @return
+     */
+    @Override
+    public List<WashDevice> listWashDevice(DeviceQueryParams params) {
+        return lambdaQuery().eq(CommUtil.isNotEmptyAndNull(params.getStationId()), WashDevice::getStationId, params.getStationId()).orderByAsc(WashDevice::getDeviceName).list();
+    }
+
     /**
      * 根据设备短id获取设备信息
      *
@@ -47,12 +60,13 @@ public class WashDeviceServiceImpl extends MyBaseServiceImpl<WashDeviceMapper, W
     @Override
     public String startDevice(String shortId) {
         var productKeyAndDeviceName = KymCache.INSTANCE.getProductKeyAndDeviceNameByWashShortId(shortId);
-        return washOrderService.createOrder(new DeviceParams(shortId, productKeyAndDeviceName[0], productKeyAndDeviceName[1]));
+        return washOrderService.createOrder(new DeviceQueryParams(shortId, productKeyAndDeviceName[0], productKeyAndDeviceName[1]));
     }
 
     @Override
     public void stopDevice(String shortId) {
         var productKeyAndDeviceName = KymCache.INSTANCE.getProductKeyAndDeviceNameByWashShortId(shortId);
-        washOrderService.closeOrder(new DeviceParams(shortId, productKeyAndDeviceName[0], productKeyAndDeviceName[1]));
+        washOrderService.closeOrder(new DeviceQueryParams(shortId, productKeyAndDeviceName[0], productKeyAndDeviceName[1]));
     }
+
 }

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

@@ -3,8 +3,8 @@ package com.kym.service.miniapp.impl;
 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.entity.miniapp.queryParams.DeviceQueryParams;
+import com.kym.entity.miniapp.queryParams.WashOrderQueryParams;
 import com.kym.mapper.miniapp.WashOrderMapper;
 import com.kym.service.awoara.AwoaraService;
 import com.kym.service.miniapp.AccountService;
@@ -40,7 +40,7 @@ public class WashOrderServiceImpl extends MyBaseServiceImpl<WashOrderMapper, Was
      * @return
      */
     @Override
-    public String createOrder(DeviceParams params) {
+    public String createOrder(DeviceQueryParams params) {
         var account = accountService.getAccountByUserId(StpUtil.getLoginIdAsLong());
         var memberName = StpUtil.getSession().getString("mobilePhone");
         var orderId = OrderUtils.getOrderNo();
@@ -68,7 +68,7 @@ public class WashOrderServiceImpl extends MyBaseServiceImpl<WashOrderMapper, Was
     }
 
     @Override
-    public void closeOrder(DeviceParams params) {
+    public void closeOrder(DeviceQueryParams params) {
         var order = lambdaQuery()
                 .eq(WashOrder::getProductKey, params.getProductKey())
                 .eq(WashOrder::getDeviceName, params.getDeviceName())
@@ -87,7 +87,7 @@ public class WashOrderServiceImpl extends MyBaseServiceImpl<WashOrderMapper, Was
      * @return
      */
     @Override
-    public WashOrder queryOrder(WashOrderParams params) {
+    public WashOrder queryOrder(WashOrderQueryParams params) {
         // 非实时数据
         return lambdaQuery()
                 .eq(WashOrder::getOrderId, params.getOrderId())