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 selectAll(); + List selectAllByTaskId(@Param("taskId") Integer taskId); + int addNewSensorTaskData(@Param("sensor") SensorTask sensorTask); int addNewSensorTaskDatas(@Param("taskLists") List 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 querySensorTaskData(int page, int nItems); + PageInfo 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 querySensorTaskData(int page, int nItems) { + public PageInfo querySensorTaskData(int taskId, int page, int nItems) { PageHelper.startPage(page, nItems); - List sensorTasks = sensorTaskMapper.selectAll(); + List sensorTasks = sensorTaskMapper.selectAllByTaskId(taskId); PageInfo 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 @@ + + 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 info = sensorTaskService.querySensorTaskData(3, 3); + PageInfo info = sensorTaskService.querySensorTaskData(2,3, 3); log.info("Total: {}", info.getList().size()); for(var c : info.getList()) {