2023年9月25日09:44:55

ruoyi-admin/src/main/java/com/ruoyi/web/controller/iot/domain/Device.java

@@ -1,5 +1,7 @@
 package com.ruoyi.web.controller.iot.domain;
 
+import java.util.List;
+
 /**
  * @author :jixinyuan
  * @date : 2023/9/25
@@ -13,7 +15,7 @@ public class Device {
     /**
      * 设备名称
      */
-    private Long equipmentName;
+    private String equipmentName;
     /**
      * 企业名称
      */
@@ -21,7 +23,7 @@ public class Device {
     /**
      * 设备编号
      */
-    private Long equipmentCode;
+    private String equipmentCode;
     /**
      * 物模型id
      */
@@ -35,7 +37,7 @@ public class Device {
     /**
      * 设备图片
      */
-    private Long equipmentImg;
+    private String equipmentImg;
 
     /**
      * 设备型号
@@ -52,6 +54,11 @@ public class Device {
     private String connectionTime;
 
     /**
+     * 设备连接时间
+     */
+    private List<String> connectionTimeList;
+
+    /**
      * 序号
      */
     private Long equipmentSort;
@@ -64,6 +71,14 @@ public class Device {
      */
     private Long deptId;
 
+    public List<String> getConnectionTimeList() {
+        return connectionTimeList;
+    }
+
+    public void setConnectionTimeList(List<String> connectionTimeList) {
+        this.connectionTimeList = connectionTimeList;
+    }
+
     public String getModel() {
         return model;
     }
@@ -96,11 +111,11 @@ public class Device {
         this.id = id;
     }
 
-    public Long getEquipmentName() {
+    public String getEquipmentName() {
         return equipmentName;
     }
 
-    public void setEquipmentName(Long equipmentName) {
+    public void setEquipmentName(String equipmentName) {
         this.equipmentName = equipmentName;
     }
 
@@ -112,11 +127,11 @@ public class Device {
         this.enterpriseName = enterpriseName;
     }
 
-    public Long getEquipmentCode() {
+    public String getEquipmentCode() {
         return equipmentCode;
     }
 
-    public void setEquipmentCode(Long equipmentCode) {
+    public void setEquipmentCode(String equipmentCode) {
         this.equipmentCode = equipmentCode;
     }
 
@@ -136,11 +151,11 @@ public class Device {
         this.tslName = tslName;
     }
 
-    public Long getEquipmentImg() {
+    public String getEquipmentImg() {
         return equipmentImg;
     }
 
-    public void setEquipmentImg(Long equipmentImg) {
+    public void setEquipmentImg(String equipmentImg) {
         this.equipmentImg = equipmentImg;
     }
 

ruoyi-admin/src/main/java/com/ruoyi/web/controller/iot/service/impl/OrderServiceImpl.java

@@ -150,9 +150,9 @@ public class OrderServiceImpl implements IOrderService {
         if (!ObjectUtils.isEmpty(device.getEnterpriseName())) {
             condition += "and order_status = " + device.getEnterpriseName();
         }
-        if (!ObjectUtils.isEmpty(device.getConnectionTime())) {
-            condition += "and equipment_code >= '" + device.getConnectionTime() + "'";
-            condition += "and equipment_code <= '" + device.getConnectionTime() + "'";
+        if (!ObjectUtils.isEmpty(device.getConnectionTimeList()) && device.getConnectionTimeList().size() > 0) {
+            condition += "and equipment_code >= '" + device.getConnectionTimeList().get(0) + "'";
+            condition += "and equipment_code <= '" + device.getConnectionTimeList().get(1) + "'";
         }
         Integer count = 0;
         try {