From a8b32771c2d98b9db48343b660bb6496184e30f6 Mon Sep 17 00:00:00 2001
From: "feng.liu" <123456>
Date: Wed, 27 Jul 2022 14:56:33 +0800
Subject: [PATCH] =?UTF-8?q?=E3=80=90=E9=80=9A=E7=9F=A5=E5=85=AC=E5=91=8A?=
 =?UTF-8?q?=E6=8A=A5=E8=A1=A8=E3=80=91=E5=B1=95=E7=A4=BA=E6=95=B0=E6=8D=AE?=
 =?UTF-8?q?=E4=B8=8D=E5=8C=BA=E5=88=86=E5=B7=A5=E5=8E=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/base/BaseMessageController.java          | 17 +++++++++++++++++
 .../controller/cloud/SwebMessageController.java         | 11 +++++++++++
 2 files changed, 28 insertions(+)

diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/base/BaseMessageController.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/base/BaseMessageController.java
index 758c5a3..ecd60ca 100644
--- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/base/BaseMessageController.java
+++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/base/BaseMessageController.java
@@ -185,6 +185,23 @@ public class BaseMessageController extends CoreBaseController {
     }
 
     /**
+     * 松下用 - 系统消息 - 分页带条件查询
+     * @param messagePagerModel 分页及查询条件信息
+     * @return 处理结果
+     */
+    public ResultBean<SysMessage> baseQuerySysMessageByPagerSx(@RequestBody MessagePagerModel messagePagerModel) {
+        try {
+            ListPager sysMessageListPager = sysMessageService.querySysMessageByPager(messagePagerModel.getSysMessage(),
+                    messagePagerModel.getPager());
+            return ResultBean.success("操作成功").setListPager(sysMessageListPager).setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode());
+        } catch (ImppBusiException busExcep) {
+            return ResultBean.fail(busExcep);
+        } catch (Exception e) {
+            return ImppExceptionBuilder.newInstance().buildExceptionResult(e);
+        }
+    }
+
+    /**
      * 通用 - 系统消息 - 批量删除消息
      *
      * @param ids id数组
diff --git a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/cloud/SwebMessageController.java b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/cloud/SwebMessageController.java
index 9597ca0..44a3742 100644
--- a/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/cloud/SwebMessageController.java
+++ b/modules/i3plus-core-apiservice/src/main/java/cn/estsh/i3plus/core/apiservice/controller/cloud/SwebMessageController.java
@@ -93,6 +93,17 @@ public class SwebMessageController extends CoreBaseController {
     }
 
     /**
+     * SWEB - 分页带条件查询
+     * @param messagePagerModel 分页以及条件信息
+     * @return 处理结果
+     */
+    @PostMapping(value = "/sys-message/querySx")
+    @ApiOperation(value = "松下用-消息复杂查询，分页，排序",notes = "松下用-消息复杂查询，分页，排序")
+    public ResultBean<SysMessage> querySysMessageByPagerSx(@RequestBody MessagePagerModel messagePagerModel){
+        return baseSysMessage.baseQuerySysMessageByPagerSx(messagePagerModel);
+    }
+
+    /**
      * SWEB - 批量删除
      * @param ids ids数组
      * @return 处理结果