diff --git a/config/application-local.properties b/config/application-local.properties index b018519..ae45930 100644 --- a/config/application-local.properties +++ b/config/application-local.properties @@ -29,6 +29,13 @@ mybatis.mapper-locations=classpath*:mappers/*.xml mybatis.type-aliases-package=com.zjyr.beidouservice.pojo.entry mybatis.configuration.default-enum-type-handler=com.zjyr.beidouservice.common.CommonEnumHandler #mybatis.configuration.log-impl=lombok.extern.slf4j.Slf4j + +#pagehelper +pagehelper.helper-dialect=mysql +pagehelper.reasonable=true +pagehelper.support-methods-arguments=true +pagehelper.pageSizeZero=true +pagehelper.params.count=countSql #config log logging.config=file:config/logback.xml log4j.logger.org.mybatis=debug \ No newline at end of file diff --git a/pom.xml b/pom.xml index 5b5900c..5c33442 100644 --- a/pom.xml +++ b/pom.xml @@ -108,8 +108,8 @@ com.github.pagehelper - pagehelper - 5.3.3 + pagehelper-spring-boot-starter + 1.4.7 org.yaml diff --git a/src/main/java/com/zjyr/beidouservice/service/SensorTaskService.java b/src/main/java/com/zjyr/beidouservice/service/SensorTaskService.java index da82dda..39e50d9 100644 --- a/src/main/java/com/zjyr/beidouservice/service/SensorTaskService.java +++ b/src/main/java/com/zjyr/beidouservice/service/SensorTaskService.java @@ -1,11 +1,17 @@ package com.zjyr.beidouservice.service; +import com.github.pagehelper.PageInfo; +import com.zjyr.beidouservice.pojo.entry.SensorTask; import com.zjyr.beidouservice.pojo.vo.binary.SensorTaskAck; +import java.util.List; + public interface SensorTaskService { void addSensorTaskResponse(Long controlId, SensorTaskAck sensorTaskAck); int getRespSensors(int taskId); int getRespSuccessedSensors(int taskId); + + PageInfo querySensorTaskData(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 9bc295b..6b46cbf 100644 --- a/src/main/java/com/zjyr/beidouservice/service/impl/SensorTaskServiceImpl.java +++ b/src/main/java/com/zjyr/beidouservice/service/impl/SensorTaskServiceImpl.java @@ -1,5 +1,7 @@ package com.zjyr.beidouservice.service.impl; +import com.github.pagehelper.PageHelper; +import com.github.pagehelper.PageInfo; import com.zjyr.beidouservice.mapper.SensorTaskMapper; import com.zjyr.beidouservice.pojo.entry.SensorTask; import com.zjyr.beidouservice.pojo.vo.binary.SensorTaskAck; @@ -48,4 +50,13 @@ public class SensorTaskServiceImpl implements SensorTaskService { public int getRespSuccessedSensors(int taskId) { return sensorTaskMapper.countTaskResponseSuccessedSensor(taskId); } + + @Override + public PageInfo querySensorTaskData(int page, int nItems) { + PageHelper.startPage(page, nItems); + List sensorTasks = sensorTaskMapper.selectAll(); + 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 2f7b9f9..db5c68e 100644 --- a/src/main/resources/mappers/SensorTask.xml +++ b/src/main/resources/mappers/SensorTask.xml @@ -11,12 +11,7 @@ diff --git a/src/test/java/com/zjyr/beidouservice/service/SensorTaskServiceTest.java b/src/test/java/com/zjyr/beidouservice/service/SensorTaskServiceTest.java new file mode 100644 index 0000000..8f01f31 --- /dev/null +++ b/src/test/java/com/zjyr/beidouservice/service/SensorTaskServiceTest.java @@ -0,0 +1,35 @@ +package com.zjyr.beidouservice.service; + +import com.github.pagehelper.PageInfo; +import com.zjyr.beidouservice.pojo.entry.ControlDevice; +import com.zjyr.beidouservice.pojo.entry.SensorTask; +import jakarta.annotation.Resource; +import lombok.extern.slf4j.Slf4j; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; +import org.springframework.boot.test.context.SpringBootTest; +import org.springframework.test.annotation.DirtiesContext; +import org.springframework.test.annotation.Rollback; +import org.springframework.transaction.annotation.Transactional; + +import java.util.List; + +@SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT) +@Slf4j +@DirtiesContext(classMode = DirtiesContext.ClassMode.AFTER_CLASS) +@Transactional +@Rollback +public class SensorTaskServiceTest { + @Resource + SensorTaskService sensorTaskService; + + @Test + public void a1_querySensorTaskData() { + PageInfo info = sensorTaskService.querySensorTaskData(3, 3); + log.info("Total: {}", info.getList().size()); + + for(var c : info.getList()) { + log.info("Item ID: {}", c.getId()); + } + } +}