From b789f365026cb520b624e4e7ca6d9ac13cd645e0 Mon Sep 17 00:00:00 2001
From: yanyan <evelyn_yanyan@sina.cn>
Date: Fri, 2 Feb 2024 12:52:58 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B6=88=E6=81=AF=E7=AE=A1=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/resources/templates/project/mes/view.html   | 12 ++++++------
 .../knowledge/controller/SceneMessageController.java | 10 ++++++++++
 .../src/main/resources/mapper/SceneMessageMapper.xml |  1 +
 3 files changed, 17 insertions(+), 6 deletions(-)

diff --git a/lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/project/mes/view.html b/lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/project/mes/view.html
index da516e80..f60202c2 100644
--- a/lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/project/mes/view.html
+++ b/lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/project/mes/view.html
@@ -57,15 +57,15 @@
                 {
                     field: 'title',
                     title: '消息标题'
-                    // , formatter: function (value, index) {
-                    //     if (value.length > 10) {
-                    //         return  "....";
-                    //     }
-                    // }
                 },
                 {
                     field: 'content',
-                    title: '消息内容'
+                    title: '消息内容' ,
+                    formatter: function (value, index) {
+                        if (value.length > 10) {
+                            return "....";
+                        }
+                    }
                 },
                 {
                     field: 'open',
diff --git a/lib/EmergencyService/zdxtEmergencyKnowledgeService/src/main/java/com/zdxt/knowledge/controller/SceneMessageController.java b/lib/EmergencyService/zdxtEmergencyKnowledgeService/src/main/java/com/zdxt/knowledge/controller/SceneMessageController.java
index a09d2084..681eb6a7 100755
--- a/lib/EmergencyService/zdxtEmergencyKnowledgeService/src/main/java/com/zdxt/knowledge/controller/SceneMessageController.java
+++ b/lib/EmergencyService/zdxtEmergencyKnowledgeService/src/main/java/com/zdxt/knowledge/controller/SceneMessageController.java
@@ -58,6 +58,16 @@ public class SceneMessageController extends BaseController {
         return ZDResponse.success("成功", list);
     }
 
+    /**
+     * 查询
+     */
+    @PostMapping("/getById")
+    @ResponseBody
+    public ZDResponse getById(@RequestBody SceneMessage sceneMessage) {
+        SceneMessage message = sceneMessageService.selectSceneMessageById(sceneMessage.getGuid());
+        return ZDResponse.success("成功", message);
+    }
+
     /**
      * 查看详情
      */
diff --git a/lib/EmergencyService/zdxtEmergencyKnowledgeService/src/main/resources/mapper/SceneMessageMapper.xml b/lib/EmergencyService/zdxtEmergencyKnowledgeService/src/main/resources/mapper/SceneMessageMapper.xml
index 309140ab..00ca1385 100644
--- a/lib/EmergencyService/zdxtEmergencyKnowledgeService/src/main/resources/mapper/SceneMessageMapper.xml
+++ b/lib/EmergencyService/zdxtEmergencyKnowledgeService/src/main/resources/mapper/SceneMessageMapper.xml
@@ -31,6 +31,7 @@
     <select id="selectSceneMessageList" parameterType="SceneMessage" resultMap="SceneMessageResult">
         <include refid="selectSceneMessageVo"/>
         <where>
+            <if test="open != null">and `open` = #{open}</if>
             <if test="title != null and title != ''">and `title` = #{title}</if>
             <if test="creator != null  and creator != ''">and creator = #{creator}</if>
         </where>