代码优化

iot-platform-manager/src/main/java/com/platform/api/manager/TransferVehicleManage.java

@@ -131,15 +131,15 @@ public class TransferVehicleManage implements ApplicationContextAware {
      * 接收单条数据，暂存到队列
      */
     public List<VehicleDataResp> queryVehicleDataList(VehicleDataRequest request) {
-        if (request == null || (StringUtils.isEmpty(request.getCarNo())) && StringUtils.isEmpty(request.getWOrderNo())) {
+        if (request == null || (StringUtils.isEmpty(request.getCarNo()) && StringUtils.isEmpty(request.getwOrderNo()))) {
             throw new IotException(ErrorCodeEnum.ILLEGAL_PARAM, "接口参数为null!");
         }
 
         List<VehicleTimeSeriesData> timeSeriesData;
         //通过运单号查询车辆信息
-        if (StringUtils.isNotEmpty(request.getWOrderNo())) {
+        if (StringUtils.isNotEmpty(request.getwOrderNo())) {
             timeSeriesData = taosService.selectByWOrderNo(request);
-            log.info("按运单号查询, 运单号：{}, 时间范围：{}~{}, 结果条数：{}", request.getWOrderNo(), request.getStartTime(),
+            log.info("按运单号查询, 运单号：{}, 时间范围：{}~{}, 结果条数：{}", request.getwOrderNo(), request.getStartTime(),
                     request.getEndTime(), timeSeriesData.size());
         } else {
             //通过车牌查询车辆信息

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

@@ -13,7 +13,7 @@ import java.time.LocalDateTime;
  */
 
 @Data
-public class VehicleDataRequest extends PageRequest {
+public class VehicleDataRequest{
 
     /**
      * 运单号
@@ -35,4 +35,16 @@ public class VehicleDataRequest extends PageRequest {
      */
     private LocalDateTime endTime;
 
+
+    //需要保留，勿删
+    public void setwOrderNo(String wOrderNo) {
+        this.wOrderNo = wOrderNo;
+    }
+
+    public String getwOrderNo() {
+        return wOrderNo;
+    }
+
+
+
 }

iot-platform-manager/src/main/java/com/platform/service/impl/TaosServiceImpl.java

@@ -49,7 +49,7 @@ public class TaosServiceImpl implements TaosService {
      */
     @Override
     public List<VehicleTimeSeriesData> selectByWOrderNo(VehicleDataRequest request) {
-        return taosMapper.selectByWOrderNo(request.getWOrderNo(), request.getStartTime(), request.getEndTime());
+        return taosMapper.selectByWOrderNo(request.getwOrderNo(), request.getStartTime(), request.getEndTime());
     }
 
     /**

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

@@ -116,6 +116,7 @@
             longitude,
             latitude,
             ts,
+            speed,
             '${carNo}' AS carNo
         FROM ${subTableName}
         ORDER BY ts DESC