分页

lib/EmergencyService/zdxtEmergencyKnowledgeService/src/main/java/com/zdxt/knowledge/controller/SceneManageController.java

@@ -1,7 +1,9 @@
 package com.zdxt.knowledge.controller;
 
+import com.github.pagehelper.PageHelper;
 import com.zdxt.common.ZDResponse;
 import com.zdxt.common.controller.BaseController;
+import com.zdxt.common.util.StringUtils;
 import com.zdxt.common.util.TableDataInfo;
 import com.zdxt.knowledge.domain.QuestionFre;
 import com.zdxt.knowledge.domain.SceneImportDataModel;
@@ -74,7 +76,9 @@ public class SceneManageController extends BaseController {
     @PostMapping("/listApp")
     @ResponseBody
     public TableDataInfo listApp(@RequestBody SceneManage sceneManage) {
-        startPage();
+        if (StringUtils.isNotNull(sceneManage.getPageNum()) && StringUtils.isNotNull(sceneManage.getPageSize())) {
+            PageHelper.startPage(sceneManage.getPageNum(), sceneManage.getPageSize());
+        }
         List<SceneManage> list = sceneManageService.selectSceneManageListAll(sceneManage);
         if (CollectionUtils.isNotEmpty(list)) {
             list = list.stream()

lib/EmergencyService/zdxtEmergencyKnowledgeService/src/main/java/com/zdxt/knowledge/controller/SceneMessageController.java

@@ -1,7 +1,10 @@
 package com.zdxt.knowledge.controller;
 
+import com.github.pagehelper.PageHelper;
 import com.zdxt.common.ZDResponse;
 import com.zdxt.common.controller.BaseController;
+import com.zdxt.common.util.SqlUtil;
+import com.zdxt.common.util.StringUtils;
 import com.zdxt.common.util.TableDataInfo;
 import com.zdxt.knowledge.domain.SceneMessage;
 import com.zdxt.knowledge.service.ISceneMessageService;
@@ -50,12 +53,14 @@ public class SceneMessageController extends BaseController {
     /**
      * 查询
      */
-    @PostMapping("/listAll")
+    @PostMapping("/listByApp")
     @ResponseBody
-    public ZDResponse listAll(@RequestBody SceneMessage sceneMessage) {
-        sceneMessage.setOpen(0);
+    public TableDataInfo listByApp(@RequestBody SceneMessage sceneMessage) {
+        if (StringUtils.isNotNull(sceneMessage.getPageNum()) && StringUtils.isNotNull(sceneMessage.getPageSize())) {
+            PageHelper.startPage(sceneMessage.getPageNum(), sceneMessage.getPageSize());
+        }
         List<SceneMessage> list = sceneMessageService.selectSceneMessageList(sceneMessage);
-        return ZDResponse.success("成功", list);
+        return getDataTable(list);
     }
 
     /**

lib/EmergencyService/zdxtEmergencyKnowledgeService/src/main/java/com/zdxt/knowledge/domain/SceneManage.java

@@ -6,6 +6,7 @@ import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 import org.springframework.format.annotation.DateTimeFormat;
 
+import java.io.Serializable;
 import java.util.Date;
 import java.util.Map;
 
@@ -16,7 +17,7 @@ import java.util.Map;
  * @author ruoyi
  * @date 2023-12-25
  */
-public class SceneManage extends PageDomain {
+public class SceneManage extends PageDomain implements Serializable {
     private static final long serialVersionUID = 1L;
 
     /**

lib/EmergencyService/zdxtEmergencyKnowledgeService/src/main/java/com/zdxt/knowledge/domain/SceneMessage.java

@@ -1,8 +1,8 @@
 package com.zdxt.knowledge.domain;
 
+import com.zdxt.common.BaseDomain;
 import org.springframework.format.annotation.DateTimeFormat;
 
-import java.io.Serializable;
 import java.util.Date;
 import java.util.Map;
 
@@ -12,7 +12,7 @@ import java.util.Map;
  * @author ruoyi
  * @date 2023-01-24
  */
-public class SceneMessage implements Serializable {
+public class SceneMessage extends BaseDomain {
 
     private static final long serialVersionUID = 1L;
 
@@ -63,6 +63,17 @@ public class SceneMessage implements Serializable {
     @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private Date updateTime;
 
+
+    /**
+     * 当前记录起始索引
+     */
+    private Integer pageNum;
+
+    /**
+     * 每页显示记录数
+     */
+    private Integer pageSize;
+
     /**
      * 请求参数
      */
@@ -147,4 +158,20 @@ public class SceneMessage implements Serializable {
     public void setUploadPath(String uploadPath) {
         this.uploadPath = uploadPath;
     }
+
+    public Integer getPageNum() {
+        return pageNum;
+    }
+
+    public void setPageNum(Integer pageNum) {
+        this.pageNum = pageNum;
+    }
+
+    public Integer getPageSize() {
+        return pageSize;
+    }
+
+    public void setPageSize(Integer pageSize) {
+        this.pageSize = pageSize;
+    }
 }

lib/EmergencyService/zdxtEmergencyKnowledgeService/src/main/java/com/zdxt/knowledge/service/impl/SceneMessageServiceImpl.java

@@ -2,6 +2,7 @@ package com.zdxt.knowledge.service.impl;
 
 import com.zdxt.auth.dto.UserBean;
 import com.zdxt.auth.feign.UserApi;
+import com.zdxt.common.annotation.DataScope;
 import com.zdxt.common.util.Convert;
 import com.zdxt.common.util.DateUtils;
 import com.zdxt.common.util.StringUtils;