1. sensor_task 表增加通道字段
This commit is contained in:
parent
c95f2dad85
commit
4e522e5ad0
|
@ -1,5 +1,6 @@
|
||||||
package com.zjyr.beidouservice.pojo.entry;
|
package com.zjyr.beidouservice.pojo.entry;
|
||||||
|
|
||||||
|
import com.zjyr.beidouservice.common.impl.SensorControlTunnelName;
|
||||||
import com.zjyr.beidouservice.common.impl.TaskResultName;
|
import com.zjyr.beidouservice.common.impl.TaskResultName;
|
||||||
import lombok.AllArgsConstructor;
|
import lombok.AllArgsConstructor;
|
||||||
import lombok.Builder;
|
import lombok.Builder;
|
||||||
|
@ -26,5 +27,6 @@ public class SensorTask {
|
||||||
private Long sensorId;
|
private Long sensorId;
|
||||||
private Long deviceId;
|
private Long deviceId;
|
||||||
private TaskResultName taskResult;
|
private TaskResultName taskResult;
|
||||||
|
private SensorControlTunnelName channel;
|
||||||
private String reportTime;
|
private String reportTime;
|
||||||
}
|
}
|
||||||
|
|
|
@ -34,6 +34,7 @@ public class SensorTaskServiceImpl implements SensorTaskService {
|
||||||
.sensorId((long) v.getSensorId())
|
.sensorId((long) v.getSensorId())
|
||||||
.deviceId(0L)
|
.deviceId(0L)
|
||||||
.taskResult(v.getTaskResult())
|
.taskResult(v.getTaskResult())
|
||||||
|
.channel(v.getTunnelName())
|
||||||
.reportTime(sdf.format(timeStamp))
|
.reportTime(sdf.format(timeStamp))
|
||||||
.build());
|
.build());
|
||||||
}
|
}
|
||||||
|
|
|
@ -7,6 +7,7 @@
|
||||||
<result column="sensorId" property="sensorId"/>
|
<result column="sensorId" property="sensorId"/>
|
||||||
<result column="deviceId" property="deviceId"/>
|
<result column="deviceId" property="deviceId"/>
|
||||||
<result column="taskResult" property="taskResult"/>
|
<result column="taskResult" property="taskResult"/>
|
||||||
|
<result column="channel" property="channel"/>
|
||||||
<result column="reportTime" property="reportTime"/>
|
<result column="reportTime" property="reportTime"/>
|
||||||
</resultMap>
|
</resultMap>
|
||||||
|
|
||||||
|
@ -16,6 +17,7 @@
|
||||||
sensorId,
|
sensorId,
|
||||||
deviceId,
|
deviceId,
|
||||||
taskResult,
|
taskResult,
|
||||||
|
channel,
|
||||||
reportTime
|
reportTime
|
||||||
FROM sensor_task
|
FROM sensor_task
|
||||||
</select>
|
</select>
|
||||||
|
@ -26,6 +28,7 @@
|
||||||
sensorId,
|
sensorId,
|
||||||
deviceId,
|
deviceId,
|
||||||
taskResult,
|
taskResult,
|
||||||
|
channel,
|
||||||
reportTime
|
reportTime
|
||||||
FROM sensor_task
|
FROM sensor_task
|
||||||
WHERE taskId = #{taskId}
|
WHERE taskId = #{taskId}
|
||||||
|
@ -37,11 +40,13 @@
|
||||||
sensorId,
|
sensorId,
|
||||||
deviceId,
|
deviceId,
|
||||||
taskResult,
|
taskResult,
|
||||||
|
channel,
|
||||||
reportTime)
|
reportTime)
|
||||||
VALUES (#{sensor.taskId},
|
VALUES (#{sensor.taskId},
|
||||||
#{sensor.sensorId},
|
#{sensor.sensorId},
|
||||||
#{sensor.deviceId},
|
#{sensor.deviceId},
|
||||||
#{sensor.taskResult},
|
#{sensor.taskResult},
|
||||||
|
#{sensor.channel},
|
||||||
TIMESTAMP(#{sensor.reportTime}))
|
TIMESTAMP(#{sensor.reportTime}))
|
||||||
</insert>
|
</insert>
|
||||||
|
|
||||||
|
@ -51,6 +56,7 @@
|
||||||
sensorId,
|
sensorId,
|
||||||
deviceId,
|
deviceId,
|
||||||
taskResult,
|
taskResult,
|
||||||
|
channel,
|
||||||
reportTime)
|
reportTime)
|
||||||
VALUES
|
VALUES
|
||||||
<foreach collection="taskLists" item="itme" separator=",">
|
<foreach collection="taskLists" item="itme" separator=",">
|
||||||
|
@ -58,6 +64,7 @@
|
||||||
#{itme.sensorId},
|
#{itme.sensorId},
|
||||||
#{itme.deviceId},
|
#{itme.deviceId},
|
||||||
#{itme.taskResult},
|
#{itme.taskResult},
|
||||||
|
#{itme.channel},
|
||||||
TIMESTAMP(#{itme.reportTime}))
|
TIMESTAMP(#{itme.reportTime}))
|
||||||
</foreach>
|
</foreach>
|
||||||
</insert>
|
</insert>
|
||||||
|
|
Loading…
Reference in New Issue