donglang пре 2 месеци
родитељ
комит
9ace1ec533

+ 0 - 1
iot-platform-manager/src/main/java/com/platform/api/request/VehicleDataRequest.java

@@ -1,6 +1,5 @@
 package com.platform.api.request;
 
-import com.platform.request.PageRequest;
 import lombok.Data;
 
 import java.time.LocalDateTime;

+ 10 - 0
iot-platform-manager/src/main/java/com/platform/api/request/VehicleDataSaveRequest.java

@@ -91,4 +91,14 @@ public class VehicleDataSaveRequest extends PageRequest {
      */
     private VehicleDataVO vehicleDataVO;
 
+
+    //需要保留,勿删
+    public void setwOrderNo(String wOrderNo) {
+        this.wOrderNo = wOrderNo;
+    }
+
+    public String getwOrderNo() {
+        return wOrderNo;
+    }
+
 }

+ 2 - 0
iot-platform-manager/src/main/java/com/platform/api/request/VehicleDataVO.java

@@ -3,6 +3,7 @@ package com.platform.api.request;
 
 import com.baomidou.mybatisplus.annotation.TableField;
 import jakarta.validation.constraints.NotBlank;
+import jakarta.validation.constraints.Pattern;
 import lombok.Data;
 
 /**
@@ -18,6 +19,7 @@ public class VehicleDataVO {
      * 车牌
      */
     @NotBlank(message = "车牌car_no不能为空")
+    @Pattern(regexp = "^\\d+$", message = "车牌car_no只能包含数字")
     private String carNo;
 
     /**

+ 11 - 1
iot-platform-manager/src/main/java/com/platform/api/response/VehicleDataResp.java

@@ -81,6 +81,16 @@ public class VehicleDataResp {
      */
     private String carNo;
 
+    //需要保留,勿删
+    public void setwOrderNo(String wOrderNo) {
+        this.wOrderNo = wOrderNo;
+    }
+
+    public String getwOrderNo() {
+        return wOrderNo;
+    }
+
+
 
     private static VehicleDataResp getInstance(){
         return new VehicleDataResp();
@@ -101,7 +111,7 @@ public class VehicleDataResp {
         devicePageResp.setEngineTemp(seriesData.getEngineTemp());
         devicePageResp.setBatteryVoltage(seriesData.getBatteryVoltage());
         devicePageResp.setStatus(seriesData.getStatus());
-        devicePageResp.setWOrderNo(seriesData.getWOrderNo());
+        devicePageResp.setwOrderNo(seriesData.getwOrderNo());
         devicePageResp.setAlarmCode(seriesData.getAlarmCode());
         devicePageResp.setCarNo(seriesData.getCarNo());
         return devicePageResp;

+ 12 - 0
iot-platform-manager/src/main/java/com/platform/entity/VehicleTimeSeriesData.java

@@ -81,4 +81,16 @@ public class VehicleTimeSeriesData {
      */
     private Integer alarmCode;
 
+    //需要保留,勿删
+    public void setwOrderNo(String wOrderNo) {
+        this.wOrderNo = wOrderNo;
+    }
+
+    public String getwOrderNo() {
+        return wOrderNo;
+    }
+
+
+
+
 }

+ 2 - 2
iot-platform-manager/src/main/resources/mapper/TaosMapper.xml

@@ -51,8 +51,8 @@
             #{request.engineTemp},
             #{request.batteryVoltage},
             #{request.status},
-            #{request.wOrderNo},
-            #{request.alarmCode}
+            #{request.alarmCode},
+            #{request.wOrderNo}
             )
         </foreach>
     </insert>