From a6b3796170000813a64380bfecc8351f53291aac Mon Sep 17 00:00:00 2001
From: HuangXin <xajhuang@163.com>
Date: Tue, 22 Aug 2023 21:14:38 +0800
Subject: [PATCH] =?UTF-8?q?1.=20=E5=A2=9E=E5=8A=A0=E6=9F=A5=E8=AF=A2?=
 =?UTF-8?q?=E6=8C=87=E5=AE=9A=E4=BB=BB=E5=8A=A1=E4=BC=A0=E6=84=9F=E5=99=A8?=
 =?UTF-8?q?=E6=89=A7=E8=A1=8C=E6=89=A7=E8=A1=8C=E4=BB=BB=E5=8A=A1=E5=88=86?=
 =?UTF-8?q?=E9=A1=B5=E6=9F=A5=E8=AF=A2=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../beidouservice/mapper/SensorTaskMapper.java |  2 ++
 .../service/SensorTaskService.java             |  2 +-
 .../service/impl/SensorTaskServiceImpl.java    |  4 ++--
 src/main/resources/mappers/SensorTask.xml      | 18 +++++++++++++++++-
 .../service/SensorTaskServiceTest.java         |  2 +-
 5 files changed, 23 insertions(+), 5 deletions(-)

diff --git a/src/main/java/com/zjyr/beidouservice/mapper/SensorTaskMapper.java b/src/main/java/com/zjyr/beidouservice/mapper/SensorTaskMapper.java
index 9395289..2aa502c 100644
--- a/src/main/java/com/zjyr/beidouservice/mapper/SensorTaskMapper.java
+++ b/src/main/java/com/zjyr/beidouservice/mapper/SensorTaskMapper.java
@@ -10,6 +10,8 @@ import java.util.List;
 public interface SensorTaskMapper {
     List<SensorTask> selectAll();
 
+    List<SensorTask> selectAllByTaskId(@Param("taskId") Integer taskId);
+
     int addNewSensorTaskData(@Param("sensor") SensorTask sensorTask);
 
     int addNewSensorTaskDatas(@Param("taskLists") List<SensorTask> taskLists);
diff --git a/src/main/java/com/zjyr/beidouservice/service/SensorTaskService.java b/src/main/java/com/zjyr/beidouservice/service/SensorTaskService.java
index 39e50d9..a1d7793 100644
--- a/src/main/java/com/zjyr/beidouservice/service/SensorTaskService.java
+++ b/src/main/java/com/zjyr/beidouservice/service/SensorTaskService.java
@@ -13,5 +13,5 @@ public interface SensorTaskService {
 
     int getRespSuccessedSensors(int taskId);
 
-    PageInfo<SensorTask> querySensorTaskData(int page, int nItems);
+    PageInfo<SensorTask> querySensorTaskData(int taskId, int page, int nItems);
 }
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 6b46cbf..810beab 100644
--- a/src/main/java/com/zjyr/beidouservice/service/impl/SensorTaskServiceImpl.java
+++ b/src/main/java/com/zjyr/beidouservice/service/impl/SensorTaskServiceImpl.java
@@ -52,9 +52,9 @@ public class SensorTaskServiceImpl implements SensorTaskService {
     }
 
     @Override
-    public PageInfo<SensorTask> querySensorTaskData(int page, int nItems) {
+    public PageInfo<SensorTask> querySensorTaskData(int taskId, int page, int nItems) {
         PageHelper.startPage(page, nItems);
-        List<SensorTask>     sensorTasks = sensorTaskMapper.selectAll();
+        List<SensorTask>     sensorTasks = sensorTaskMapper.selectAllByTaskId(taskId);
         PageInfo<SensorTask> pgInfo      = new PageInfo<>(sensorTasks);
         PageHelper.clearPage();
         return pgInfo;
diff --git a/src/main/resources/mappers/SensorTask.xml b/src/main/resources/mappers/SensorTask.xml
index db5c68e..4d8d78b 100644
--- a/src/main/resources/mappers/SensorTask.xml
+++ b/src/main/resources/mappers/SensorTask.xml
@@ -11,10 +11,26 @@
     </resultMap>
 
     <select id="selectAll" resultMap="sensor_task">
-        SELECT *
+        SELECT id,
+               taskId,
+               sensorId,
+               deviceId,
+               taskResult,
+               reportTime
         FROM sensor_task
     </select>
 
+    <select id="selectAllByTaskId" resultMap="sensor_task">
+        SELECT id,
+               taskId,
+               sensorId,
+               deviceId,
+               taskResult,
+               reportTime
+        FROM sensor_task
+        WHERE taskId = #{taskId}
+    </select>
+
     <insert id="addNewSensorTaskData" useGeneratedKeys="true" keyProperty="id"
             parameterType="com.zjyr.beidouservice.pojo.entry.SensorTask">
         INSERT INTO sensor_task(taskId,
diff --git a/src/test/java/com/zjyr/beidouservice/service/SensorTaskServiceTest.java b/src/test/java/com/zjyr/beidouservice/service/SensorTaskServiceTest.java
index 8f01f31..f4ef181 100644
--- a/src/test/java/com/zjyr/beidouservice/service/SensorTaskServiceTest.java
+++ b/src/test/java/com/zjyr/beidouservice/service/SensorTaskServiceTest.java
@@ -25,7 +25,7 @@ public class SensorTaskServiceTest {
 
     @Test
     public void a1_querySensorTaskData() {
-        PageInfo<SensorTask> info = sensorTaskService.querySensorTaskData(3, 3);
+        PageInfo<SensorTask> info = sensorTaskService.querySensorTaskData(2,3, 3);
         log.info("Total: {}", info.getList().size());
 
         for(var c : info.getList()) {