From 4e522e5ad098c2c2c9203f6fdddf40ae200831dd Mon Sep 17 00:00:00 2001
From: HuangXin <xajhuang@163.com>
Date: Tue, 22 Aug 2023 21:55:44 +0800
Subject: [PATCH] =?UTF-8?q?1.=20sensor=5Ftask=20=E8=A1=A8=E5=A2=9E?=
 =?UTF-8?q?=E5=8A=A0=E9=80=9A=E9=81=93=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../zjyr/beidouservice/pojo/entry/SensorTask.java  | 14 ++++++++------
 .../service/impl/SensorTaskServiceImpl.java        |  1 +
 src/main/resources/mappers/SensorTask.xml          |  7 +++++++
 3 files changed, 16 insertions(+), 6 deletions(-)

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 @@
         <result column="sensorId" property="sensorId"/>
         <result column="deviceId" property="deviceId"/>
         <result column="taskResult" property="taskResult"/>
+        <result column="channel" property="channel"/>
         <result column="reportTime" property="reportTime"/>
     </resultMap>
 
@@ -16,6 +17,7 @@
                sensorId,
                deviceId,
                taskResult,
+               channel,
                reportTime
         FROM sensor_task
     </select>
@@ -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}))
     </insert>
 
@@ -51,6 +56,7 @@
         sensorId,
         deviceId,
         taskResult,
+        channel,
         reportTime)
         VALUES
         <foreach collection="taskLists" item="itme" separator=",">
@@ -58,6 +64,7 @@
             #{itme.sensorId},
             #{itme.deviceId},
             #{itme.taskResult},
+            #{itme.channel},
             TIMESTAMP(#{itme.reportTime}))
         </foreach>
     </insert>