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 bcc337c3..4123af24 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 @@ -56,13 +56,14 @@ public class SceneManageController extends BaseController { } /** - * 查询 + * 查询小程序 */ - @PostMapping("/listAll") + @PostMapping("/listApp") @ResponseBody - public ZDResponse listAll(@RequestBody SceneManage sceneManage) { - List list = sceneManageService.selectSceneManageListAll(sceneManage); - return ZDResponse.success("成功", list); + public TableDataInfo listApp(@RequestBody SceneManage sceneManage) { + startPage(); + List list = sceneManageService.selectSceneManageList(sceneManage); + return getDataTable(list); } /** 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 4a1865fb..29763465 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,11 +1,11 @@ package com.zdxt.knowledge.domain; 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; @@ -16,7 +16,7 @@ import java.util.Map; * @author ruoyi * @date 2023-12-25 */ -public class SceneManage implements Serializable { +public class SceneManage extends PageDomain { private static final long serialVersionUID = 1L; /** diff --git a/lib/EmergencyService/zdxtEmergencyKnowledgeService/src/main/java/com/zdxt/knowledge/mapper/SceneManageMapper.java b/lib/EmergencyService/zdxtEmergencyKnowledgeService/src/main/java/com/zdxt/knowledge/mapper/SceneManageMapper.java index e6ca108c..1b14a4a3 100755 --- a/lib/EmergencyService/zdxtEmergencyKnowledgeService/src/main/java/com/zdxt/knowledge/mapper/SceneManageMapper.java +++ b/lib/EmergencyService/zdxtEmergencyKnowledgeService/src/main/java/com/zdxt/knowledge/mapper/SceneManageMapper.java @@ -28,8 +28,6 @@ public interface SceneManageMapper { */ public List selectSceneManageList(SceneManage sceneManage); - public List selectSceneManageListAll(SceneManage sceneManage); - /** * 新增【请填写功能名称】 * diff --git a/lib/EmergencyService/zdxtEmergencyKnowledgeService/src/main/java/com/zdxt/knowledge/service/ISceneManageService.java b/lib/EmergencyService/zdxtEmergencyKnowledgeService/src/main/java/com/zdxt/knowledge/service/ISceneManageService.java index 1998efbe..4ab47655 100755 --- a/lib/EmergencyService/zdxtEmergencyKnowledgeService/src/main/java/com/zdxt/knowledge/service/ISceneManageService.java +++ b/lib/EmergencyService/zdxtEmergencyKnowledgeService/src/main/java/com/zdxt/knowledge/service/ISceneManageService.java @@ -32,14 +32,6 @@ public interface ISceneManageService { */ public List selectSceneManageList(SceneManage sceneManage); - /** - * 查询列表 - * - * @param sceneManage 【请填写功能名称】 - * @return 请填写功能名称】集合 - */ - public List selectSceneManageListAll(SceneManage sceneManage); - /** * 新增【请填写功能名称】 * diff --git a/lib/EmergencyService/zdxtEmergencyKnowledgeService/src/main/java/com/zdxt/knowledge/service/impl/SceneManageServiceImpl.java b/lib/EmergencyService/zdxtEmergencyKnowledgeService/src/main/java/com/zdxt/knowledge/service/impl/SceneManageServiceImpl.java index 89f060e9..b67fa8d1 100755 --- a/lib/EmergencyService/zdxtEmergencyKnowledgeService/src/main/java/com/zdxt/knowledge/service/impl/SceneManageServiceImpl.java +++ b/lib/EmergencyService/zdxtEmergencyKnowledgeService/src/main/java/com/zdxt/knowledge/service/impl/SceneManageServiceImpl.java @@ -85,17 +85,6 @@ public class SceneManageServiceImpl implements ISceneManageService { return sceneManageMapper.selectSceneManageList(sceneManage); } - /** - * 查询列表 - * - * @param sceneManage 【请填写功能名称】 - * @return 【请填写功能名称】 - */ - @Override - public List selectSceneManageListAll(SceneManage sceneManage) { - return sceneManageMapper.selectSceneManageListAll(sceneManage); - } - /** * 新增【请填写功能名称】 *