From f90b37cb8990d8e9dd05774a004c64fadfc3c362 Mon Sep 17 00:00:00 2001
From: wl <173@qq.com>
Date: 星期二, 10 一月 2023 11:48:18 +0800
Subject: [PATCH] fix: 消息接受栏目设置和用户消息查询

---
 ycl-platform/src/main/java/com/ycl/service/message/IMessageColumnService.java         |    2 ++
 ycl-platform/src/main/java/com/ycl/controller/message/MessageColumnController.java    |    7 +++++++
 ycl-platform/src/main/java/com/ycl/service/message/impl/MessageColumnServiceImpl.java |    5 +++++
 ycl-platform/src/main/resources/mapper/message/MessageColumnSetMapper.xml             |    3 ++-
 ycl-platform/src/main/java/com/ycl/mapper/message/MessageColumnMapper.java            |    1 +
 ycl-platform/src/main/resources/mapper/message/MessageColumnMapper.xml                |   25 +++++++++++--------------
 ycl-platform/src/main/java/com/ycl/controller/message/MessageController.java          |    1 +
 ycl-platform/src/main/java/com/ycl/service/message/impl/MessageServiceImpl.java       |    3 +++
 8 files changed, 32 insertions(+), 15 deletions(-)

diff --git a/ycl-platform/src/main/java/com/ycl/controller/message/MessageColumnController.java b/ycl-platform/src/main/java/com/ycl/controller/message/MessageColumnController.java
index f529be7..6b87fb3 100644
--- a/ycl-platform/src/main/java/com/ycl/controller/message/MessageColumnController.java
+++ b/ycl-platform/src/main/java/com/ycl/controller/message/MessageColumnController.java
@@ -70,6 +70,13 @@
         return CommonResult.success(iMessageColumnService.listColumnUser(id));
     }
 
+    @ApiOperation(value = "鑾峰彇灞曠ず鏍忕洰")
+    @RequestMapping(value = "/show", method = RequestMethod.GET)
+    @ResponseBody
+    public CommonResult getShowColumn() {
+        return CommonResult.success(iMessageColumnService.listShowColumn());
+    }
+
     @ApiOperation(value = "鑾峰彇鏍忕洰鍒嗛〉鏌ヨ")
     @RequestMapping(value = "/list", method = RequestMethod.POST)
     @ResponseBody
diff --git a/ycl-platform/src/main/java/com/ycl/controller/message/MessageController.java b/ycl-platform/src/main/java/com/ycl/controller/message/MessageController.java
index f6babfb..46cb904 100644
--- a/ycl-platform/src/main/java/com/ycl/controller/message/MessageController.java
+++ b/ycl-platform/src/main/java/com/ycl/controller/message/MessageController.java
@@ -73,6 +73,7 @@
         message.setCreateUser(user.getUserId());
         message.setCreateTime(new Date());
         message.setTargetFrom(umsAdminMapper.selectById(user.getUserId()).getUsername());
+        message.setIsView(0);
         return CommonResult.success(iMessageService.save(message));
     }
 
diff --git a/ycl-platform/src/main/java/com/ycl/mapper/message/MessageColumnMapper.java b/ycl-platform/src/main/java/com/ycl/mapper/message/MessageColumnMapper.java
index afffd96..6cda5d6 100644
--- a/ycl-platform/src/main/java/com/ycl/mapper/message/MessageColumnMapper.java
+++ b/ycl-platform/src/main/java/com/ycl/mapper/message/MessageColumnMapper.java
@@ -16,4 +16,5 @@
  */
 public interface MessageColumnMapper extends BaseMapper<MessageColumn> {
     List<MessageColumnVO> selectAllColumn();
+
 }
diff --git a/ycl-platform/src/main/java/com/ycl/service/message/IMessageColumnService.java b/ycl-platform/src/main/java/com/ycl/service/message/IMessageColumnService.java
index 3eec194..188a813 100644
--- a/ycl-platform/src/main/java/com/ycl/service/message/IMessageColumnService.java
+++ b/ycl-platform/src/main/java/com/ycl/service/message/IMessageColumnService.java
@@ -25,4 +25,6 @@
     List<MessageColumnUserVO> listColumnUser(Integer id);
 
     List<MessageColumnVO> listAllColumn();
+
+    List<MessageColumn> listShowColumn();
 }
diff --git a/ycl-platform/src/main/java/com/ycl/service/message/impl/MessageColumnServiceImpl.java b/ycl-platform/src/main/java/com/ycl/service/message/impl/MessageColumnServiceImpl.java
index 54b8e2d..5b7a7bc 100644
--- a/ycl-platform/src/main/java/com/ycl/service/message/impl/MessageColumnServiceImpl.java
+++ b/ycl-platform/src/main/java/com/ycl/service/message/impl/MessageColumnServiceImpl.java
@@ -64,4 +64,9 @@
     public List<MessageColumnVO> listAllColumn() {
         return messageColumnMapper.selectAllColumn();
     }
+
+    @Override
+    public List<MessageColumn> listShowColumn() {
+        return this.list(new LambdaQueryWrapper<MessageColumn>().eq(MessageColumn::getIsShow,1));
+    }
 }
diff --git a/ycl-platform/src/main/java/com/ycl/service/message/impl/MessageServiceImpl.java b/ycl-platform/src/main/java/com/ycl/service/message/impl/MessageServiceImpl.java
index 6411a96..015b95e 100644
--- a/ycl-platform/src/main/java/com/ycl/service/message/impl/MessageServiceImpl.java
+++ b/ycl-platform/src/main/java/com/ycl/service/message/impl/MessageServiceImpl.java
@@ -103,6 +103,9 @@
                 sendMessage.setTargetTo(receive);
                 sendMessage.setSendTime(new Date());
                 sendMessage.setPhoneNumber(umsAdminMapper.selectById(receive).getMobile());
+                if (ChannelCode.INNER.equals(message.getChannelCode())){
+                    sendMessage.setIsView(0);
+                }
                 this.save(sendMessage);
                 ids.add(sendMessage.getId());
             }
diff --git a/ycl-platform/src/main/resources/mapper/message/MessageColumnMapper.xml b/ycl-platform/src/main/resources/mapper/message/MessageColumnMapper.xml
index a024c62..04a7a0a 100644
--- a/ycl-platform/src/main/resources/mapper/message/MessageColumnMapper.xml
+++ b/ycl-platform/src/main/resources/mapper/message/MessageColumnMapper.xml
@@ -2,18 +2,15 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.ycl.mapper.message.MessageColumnMapper">
 
-<select id="selectAllColumn" resultType="com.ycl.vo.message.MessageColumnVO">
-    SELECT
-        t1.id,
-        COUNT( t1.id ) AS notice_amount,
-        t1.column_name,
-        t1.update_time,
-        t1.is_show,
-        t1.description
-    FROM
-        ums_message_column t1
-            LEFT JOIN ums_message t2 ON t1.id = t2.message_type
-    GROUP BY
-        t1.id
-</select>
+    <select id="selectAllColumn" resultType="com.ycl.vo.message.MessageColumnVO">
+        SELECT t1.id,
+               COUNT(t1.id) AS notice_amount,
+               t1.column_name,
+               t1.update_time,
+               t1.is_show,
+               t1.description
+        FROM ums_message_column t1
+                 LEFT JOIN ums_message t2 ON t1.id = t2.message_type
+        GROUP BY t1.id
+    </select>
 </mapper>
diff --git a/ycl-platform/src/main/resources/mapper/message/MessageColumnSetMapper.xml b/ycl-platform/src/main/resources/mapper/message/MessageColumnSetMapper.xml
index 88b0188..0362b38 100644
--- a/ycl-platform/src/main/resources/mapper/message/MessageColumnSetMapper.xml
+++ b/ycl-platform/src/main/resources/mapper/message/MessageColumnSetMapper.xml
@@ -45,7 +45,8 @@
           and t3.target_to=#{userId}
           AND t2.id=#{id}
           AND t3.is_view=0
-
+          And t3.channel_code='01'
+          and t3.status=1
     </select>
 
 </mapper>

--
Gitblit v1.8.0