From 58e580e64dee02a4a637f928a33872818c44d639 Mon Sep 17 00:00:00 2001 From: yanyan Date: Fri, 29 Mar 2024 17:21:20 +0800 Subject: [PATCH] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E5=88=86=E9=A1=B5=E5=A4=B1?= =?UTF-8?q?=E6=95=88=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../KnowledgeLibraryController.java | 6 +++- .../controller/SceneManageController.java | 15 +++++---- .../knowledge/domain/KnowledgeLibrary.java | 21 ++++++++++++ .../zdxt/knowledge/domain/SceneManage.java | 32 +++++++++++++++++-- 4 files changed, 64 insertions(+), 10 deletions(-) diff --git a/lib/EmergencyService/zdxtEmergencyKnowledgeService/src/main/java/com/zdxt/knowledge/controller/KnowledgeLibraryController.java b/lib/EmergencyService/zdxtEmergencyKnowledgeService/src/main/java/com/zdxt/knowledge/controller/KnowledgeLibraryController.java index 8a20c157..894748e2 100755 --- a/lib/EmergencyService/zdxtEmergencyKnowledgeService/src/main/java/com/zdxt/knowledge/controller/KnowledgeLibraryController.java +++ b/lib/EmergencyService/zdxtEmergencyKnowledgeService/src/main/java/com/zdxt/knowledge/controller/KnowledgeLibraryController.java @@ -1,9 +1,11 @@ package com.zdxt.knowledge.controller; +import com.github.pagehelper.PageHelper; import com.zdxt.auth.dto.DictDataBean; import com.zdxt.auth.feign.DictDataApi; 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.KnowledgeLibrary; import com.zdxt.knowledge.service.IKnowledgeLibraryService; @@ -59,7 +61,9 @@ public class KnowledgeLibraryController extends BaseController { @PostMapping("/listApp") @ResponseBody public TableDataInfo listApp(@RequestBody KnowledgeLibrary knowledgeLibrary) { - startPage(); + if (StringUtils.isNotNull(knowledgeLibrary.getPageNum()) && StringUtils.isNotNull(knowledgeLibrary.getPageSize())) { + PageHelper.startPage(knowledgeLibrary.getPageNum(), knowledgeLibrary.getPageSize()); + } knowledgeLibrary.setPublishstate(1); List list = knowledgeLibraryService.selectKnowledgeLibraryList(knowledgeLibrary); return getDataTable(list); diff --git a/lib/EmergencyService/zdxtEmergencyKnowledgeService/src/main/java/com/zdxt/knowledge/controller/SceneManageController.java b/lib/EmergencyService/zdxtEmergencyKnowledgeService/src/main/java/com/zdxt/knowledge/controller/SceneManageController.java index a9decfa6..a2fd831f 100755 --- a/lib/EmergencyService/zdxtEmergencyKnowledgeService/src/main/java/com/zdxt/knowledge/controller/SceneManageController.java +++ b/lib/EmergencyService/zdxtEmergencyKnowledgeService/src/main/java/com/zdxt/knowledge/controller/SceneManageController.java @@ -24,7 +24,6 @@ import org.springframework.ui.ModelMap; import org.springframework.web.bind.annotation.*; import org.springframework.web.multipart.MultipartFile; -import java.util.Collection; import java.util.Collections; import java.util.HashMap; import java.util.List; @@ -65,7 +64,9 @@ public class SceneManageController extends BaseController { @PostMapping("/list") @ResponseBody public TableDataInfo list(SceneManage sceneManage) { - startPage(); + if (StringUtils.isNotNull(sceneManage.getPageNum()) && StringUtils.isNotNull(sceneManage.getPageSize())) { + PageHelper.startPage(sceneManage.getPageNum(), sceneManage.getPageSize()); + } List list = sceneManageService.selectSceneManageList(sceneManage); return getDataTable(list); } @@ -80,8 +81,10 @@ public class SceneManageController extends BaseController { PageHelper.startPage(sceneManage.getPageNum(), sceneManage.getPageSize()); } List list = sceneManageService.selectSceneManageListAll(sceneManage); - if (CollectionUtils.isNotEmpty(list)) { - list = list.stream() + TableDataInfo dataTable = getDataTable(list); + if (CollectionUtils.isNotEmpty(dataTable.getRows())) { + List rows = (List) dataTable.getRows(); + dataTable.setRows(rows.stream() .map(item -> { SceneRole sceneRole = new SceneRole(); sceneRole.setSceneId(item.getGuid()); @@ -91,9 +94,9 @@ public class SceneManageController extends BaseController { item.setUseTotal((long) questionFreService.selectQuestionFreList(questionFre).size()); return item; }) - .collect(Collectors.toList()); + .collect(Collectors.toList())); } - return getDataTable(list); + return dataTable; } /** diff --git a/lib/EmergencyService/zdxtEmergencyKnowledgeService/src/main/java/com/zdxt/knowledge/domain/KnowledgeLibrary.java b/lib/EmergencyService/zdxtEmergencyKnowledgeService/src/main/java/com/zdxt/knowledge/domain/KnowledgeLibrary.java index 8cc70c61..9b781ff3 100755 --- a/lib/EmergencyService/zdxtEmergencyKnowledgeService/src/main/java/com/zdxt/knowledge/domain/KnowledgeLibrary.java +++ b/lib/EmergencyService/zdxtEmergencyKnowledgeService/src/main/java/com/zdxt/knowledge/domain/KnowledgeLibrary.java @@ -1,6 +1,7 @@ package com.zdxt.knowledge.domain; import com.zdxt.common.BaseDomain; +import io.swagger.models.auth.In; import org.apache.commons.lang3.builder.ToStringBuilder; import org.apache.commons.lang3.builder.ToStringStyle; import java.util.Date; @@ -51,6 +52,26 @@ public class KnowledgeLibrary extends BaseDomain /** 审核状态(0:未审核,1:警员审核,2:管理科审核) */ private Integer examinestate; + private Integer pageNum; + + private Integer pageSize; + + 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; + } + public String getGuid() { return guid; } diff --git a/lib/EmergencyService/zdxtEmergencyKnowledgeService/src/main/java/com/zdxt/knowledge/domain/SceneManage.java b/lib/EmergencyService/zdxtEmergencyKnowledgeService/src/main/java/com/zdxt/knowledge/domain/SceneManage.java index 8b742a7f..14de3d55 100755 --- a/lib/EmergencyService/zdxtEmergencyKnowledgeService/src/main/java/com/zdxt/knowledge/domain/SceneManage.java +++ b/lib/EmergencyService/zdxtEmergencyKnowledgeService/src/main/java/com/zdxt/knowledge/domain/SceneManage.java @@ -1,12 +1,11 @@ package com.zdxt.knowledge.domain; +import com.zdxt.common.BaseDomain; import com.zdxt.common.annotation.Excel; -import com.zdxt.common.util.PageDomain; 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; @@ -17,7 +16,7 @@ import java.util.Map; * @author ruoyi * @date 2023-12-25 */ -public class SceneManage extends PageDomain implements Serializable { +public class SceneManage extends BaseDomain { private static final long serialVersionUID = 1L; /** @@ -118,11 +117,38 @@ public class SceneManage extends PageDomain implements Serializable { private String uploadPath; + /** + * 当前记录起始索引 + */ + private Integer pageNum; + + /** + * 每页显示记录数 + */ + private Integer pageSize; + /** * 请求参数 */ private Map params; + + 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; + } + public String getGuid() { return guid; }