diff --git a/pom.xml b/pom.xml
index 73cb832..9085e9f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -56,11 +56,6 @@
common-operation-logging
0.0.1-SNAPSHOT
-
- org.springframework.boot
- spring-boot-devtools
- true
-
diff --git a/src/main/java/com/qniao/zsh/api/command/controlspider/admin/SpiderStateAdminCommandController.java b/src/main/java/com/qniao/zsh/api/command/controlspider/admin/SpiderStateAdminCommandController.java
index 7ce4cd1..ca0727c 100644
--- a/src/main/java/com/qniao/zsh/api/command/controlspider/admin/SpiderStateAdminCommandController.java
+++ b/src/main/java/com/qniao/zsh/api/command/controlspider/admin/SpiderStateAdminCommandController.java
@@ -1,9 +1,11 @@
package com.qniao.zsh.api.command.controlspider.admin;
-import cn.hutool.json.JSONUtil;
+import com.qniao.domain.QnPage;
+import com.qniao.framework.utils.PageUtil;
import com.qniao.zsh.api.command.controlspider.admin.request.SpiderCreateDto;
import com.qniao.zsh.application.service.createspider.CreateSpiderApplicationService;
import com.qniao.zsh.application.service.startspider.SpiderStateApplicationService;
+import com.qniao.zsh.domain.aggregate.spiderstate.entity.SpiderState;
import com.qniao.zsh.query.spider.SpiderQueryService;
import io.swagger.annotations.ApiOperation;
import org.springframework.validation.annotation.Validated;
@@ -48,11 +50,10 @@ public class SpiderStateAdminCommandController {
@ApiOperation("查询爬虫列表")
@GetMapping("/query/spider")
- public String query() {
-
- return JSONUtil.toJsonStr(spiderQueryService.selectSpider());
-
+ public QnPage adminPageAiAlarm(PageUtil pageUtil) {
+ return spiderQueryService.adminPage(pageUtil);
}
+
}
diff --git a/src/main/java/com/qniao/zsh/infrastructure/config/MybatisPlusPageConfig.java b/src/main/java/com/qniao/zsh/infrastructure/config/MybatisPlusPageConfig.java
new file mode 100644
index 0000000..8ccd427
--- /dev/null
+++ b/src/main/java/com/qniao/zsh/infrastructure/config/MybatisPlusPageConfig.java
@@ -0,0 +1,21 @@
+package com.qniao.zsh.infrastructure.config;
+
+import com.baomidou.mybatisplus.annotation.DbType;
+import com.baomidou.mybatisplus.extension.plugins.MybatisPlusInterceptor;
+import com.baomidou.mybatisplus.extension.plugins.inner.PaginationInnerInterceptor;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+
+/**
+ * @author wh
+ * @date 2023/3/22
+ */
+@Configuration
+public class MybatisPlusPageConfig {
+ @Bean
+ public MybatisPlusInterceptor mybatisPlusInterceptor(){
+ MybatisPlusInterceptor interceptor = new MybatisPlusInterceptor();
+ interceptor.addInnerInterceptor(new PaginationInnerInterceptor(DbType.MYSQL));
+ return interceptor;
+ }
+}
diff --git a/src/main/java/com/qniao/zsh/query/spider/SpiderQueryService.java b/src/main/java/com/qniao/zsh/query/spider/SpiderQueryService.java
index 2cf016d..abb322c 100644
--- a/src/main/java/com/qniao/zsh/query/spider/SpiderQueryService.java
+++ b/src/main/java/com/qniao/zsh/query/spider/SpiderQueryService.java
@@ -1,9 +1,11 @@
package com.qniao.zsh.query.spider;
+
+
+import com.qniao.domain.QnPage;
+import com.qniao.framework.utils.PageUtil;
import com.qniao.zsh.domain.aggregate.spiderstate.entity.SpiderState;
-import org.springframework.stereotype.Component;
-import java.util.List;
/**
* @author wh
@@ -12,9 +14,12 @@ import java.util.List;
public interface SpiderQueryService {
/**
- * 查询爬虫
- * @return 返回爬虫列表
+ * admin页面
+ *
+ * @param pageUtil 分页参数
+ * @return {@link QnPage}
*/
- List selectSpider();
+ QnPage adminPage(PageUtil pageUtil);
+
}
diff --git a/src/main/java/com/qniao/zsh/query/spider/impl/SpiderQueryServiceImpl.java b/src/main/java/com/qniao/zsh/query/spider/impl/SpiderQueryServiceImpl.java
index c432443..cf4e4d5 100644
--- a/src/main/java/com/qniao/zsh/query/spider/impl/SpiderQueryServiceImpl.java
+++ b/src/main/java/com/qniao/zsh/query/spider/impl/SpiderQueryServiceImpl.java
@@ -1,6 +1,9 @@
package com.qniao.zsh.query.spider.impl;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.qniao.domain.QnPage;
+import com.qniao.framework.utils.PageUtil;
import com.qniao.zsh.domain.aggregate.spiderstate.entity.SpiderState;
import com.qniao.zsh.infrastructure.dao.SpiderStateDao;
import com.qniao.zsh.query.spider.SpiderQueryService;
@@ -8,7 +11,6 @@ import com.qniao.zsh.query.spider.SpiderQueryService;
import org.springframework.stereotype.Service;
import javax.annotation.Resource;
-import java.util.List;
@@ -20,9 +22,12 @@ import java.util.List;
public class SpiderQueryServiceImpl implements SpiderQueryService {
@Resource
private SpiderStateDao spiderStateDao;
+
@Override
- public List selectSpider() {
- return spiderStateDao.selectList(new QueryWrapper<>());
+ public QnPage adminPage(PageUtil pageUtil) {
+ IPage iPage = spiderStateDao.selectPage(pageUtil.toPageWithoutOrders(),null);
+ return PageUtil.convert(iPage,SpiderState.class);
+
}
}