diff --git a/src/main/java/com/zjyr/beidouservice/pojo/entry/SensorTask.java b/src/main/java/com/zjyr/beidouservice/pojo/entry/SensorTask.java
index 771045d..0a952fa 100644
--- a/src/main/java/com/zjyr/beidouservice/pojo/entry/SensorTask.java
+++ b/src/main/java/com/zjyr/beidouservice/pojo/entry/SensorTask.java
@@ -1,5 +1,6 @@
package com.zjyr.beidouservice.pojo.entry;
+import com.zjyr.beidouservice.common.impl.SensorControlTunnelName;
import com.zjyr.beidouservice.common.impl.TaskResultName;
import lombok.AllArgsConstructor;
import lombok.Builder;
@@ -21,10 +22,11 @@ import javax.persistence.Table;
public class SensorTask {
@Id
@KeySql(useGeneratedKeys = true)
- private Long id;
- private Integer taskId;
- private Long sensorId;
- private Long deviceId;
- private TaskResultName taskResult;
- private String reportTime;
+ private Long id;
+ private Integer taskId;
+ private Long sensorId;
+ private Long deviceId;
+ private TaskResultName taskResult;
+ private SensorControlTunnelName channel;
+ private String reportTime;
}
diff --git a/src/main/java/com/zjyr/beidouservice/service/impl/SensorTaskServiceImpl.java b/src/main/java/com/zjyr/beidouservice/service/impl/SensorTaskServiceImpl.java
index 810beab..da1e10c 100644
--- a/src/main/java/com/zjyr/beidouservice/service/impl/SensorTaskServiceImpl.java
+++ b/src/main/java/com/zjyr/beidouservice/service/impl/SensorTaskServiceImpl.java
@@ -34,6 +34,7 @@ public class SensorTaskServiceImpl implements SensorTaskService {
.sensorId((long) v.getSensorId())
.deviceId(0L)
.taskResult(v.getTaskResult())
+ .channel(v.getTunnelName())
.reportTime(sdf.format(timeStamp))
.build());
}
diff --git a/src/main/resources/mappers/SensorTask.xml b/src/main/resources/mappers/SensorTask.xml
index 4d8d78b..09e31e2 100644
--- a/src/main/resources/mappers/SensorTask.xml
+++ b/src/main/resources/mappers/SensorTask.xml
@@ -7,6 +7,7 @@
+
@@ -16,6 +17,7 @@
sensorId,
deviceId,
taskResult,
+ channel,
reportTime
FROM sensor_task
@@ -26,6 +28,7 @@
sensorId,
deviceId,
taskResult,
+ channel,
reportTime
FROM sensor_task
WHERE taskId = #{taskId}
@@ -37,11 +40,13 @@
sensorId,
deviceId,
taskResult,
+ channel,
reportTime)
VALUES (#{sensor.taskId},
#{sensor.sensorId},
#{sensor.deviceId},
#{sensor.taskResult},
+ #{sensor.channel},
TIMESTAMP(#{sensor.reportTime}))
@@ -51,6 +56,7 @@
sensorId,
deviceId,
taskResult,
+ channel,
reportTime)
VALUES
@@ -58,6 +64,7 @@
#{itme.sensorId},
#{itme.deviceId},
#{itme.taskResult},
+ #{itme.channel},
TIMESTAMP(#{itme.reportTime}))