From 539c3737214ced4eecb23f874670e365253d4439 Mon Sep 17 00:00:00 2001
From: wl <173@qq.com>
Date: 星期一, 14 十一月 2022 16:07:07 +0800
Subject: [PATCH] 消息管理bug
---
ycl-platform/src/main/resources/application-dev.yml | 2
ycl-platform/src/main/java/com/ycl/mapper/message/MessageMapper.java | 3 +
ycl-platform/src/main/java/com/ycl/service/message/IMessageService.java | 3 +
ycl-platform/src/main/resources/mapper/message/MessageMapper.xml | 47 +++++++++++++++++++++++
ycl-platform/src/main/java/com/ycl/controller/message/MessageController.java | 6 +-
ycl-platform/src/main/java/com/ycl/service/message/impl/MessageServiceImpl.java | 3 +
6 files changed, 57 insertions(+), 7 deletions(-)
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 5518ca2..7c4f590 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
@@ -7,9 +7,9 @@
import com.ycl.dto.message.MessageParam;
import com.ycl.entity.message.Message;
import com.ycl.service.message.IMessageService;
+import com.ycl.vo.message.MessageVO;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
-import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.security.core.context.SecurityContextHolder;
import org.springframework.validation.annotation.Validated;
@@ -20,7 +20,7 @@
/**
* <p>
- * 娑堟伅绠＄悊 鍓嶇鎺у埗鍣�
+ * 娑堟伅绠＄悊 鍓嶇鎺у埗鍣�
* </p>
*
* @author mg
@@ -58,7 +58,7 @@
@ApiOperation(value = "鑾峰彇娑堟伅鍒嗛〉鏌ヨ")
@RequestMapping(value = "/list", method = RequestMethod.GET)
@ResponseBody
- public CommonResult<IPage<Message>> list(MessageParam messageParam) {
+ public CommonResult<IPage<MessageVO>> list(MessageParam messageParam) {
return CommonResult.success(iMessageService.list(messageParam));
}
diff --git a/ycl-platform/src/main/java/com/ycl/mapper/message/MessageMapper.java b/ycl-platform/src/main/java/com/ycl/mapper/message/MessageMapper.java
index 5a3e663..181a7e3 100644
--- a/ycl-platform/src/main/java/com/ycl/mapper/message/MessageMapper.java
+++ b/ycl-platform/src/main/java/com/ycl/mapper/message/MessageMapper.java
@@ -4,6 +4,7 @@
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ycl.dto.message.MessageParam;
import com.ycl.entity.message.Message;
+import com.ycl.vo.message.MessageVO;
/**
* <p>
@@ -14,5 +15,5 @@
* @since 2022-10-08
*/
public interface MessageMapper extends BaseMapper<Message> {
- Page<Message> selectMessagePage(Page<Message> page, MessageParam messageParam);
+ Page<MessageVO> selectMessagePage(Page<Message> page, MessageParam messageParam);
}
diff --git a/ycl-platform/src/main/java/com/ycl/service/message/IMessageService.java b/ycl-platform/src/main/java/com/ycl/service/message/IMessageService.java
index b9c9bda..571a72e 100644
--- a/ycl-platform/src/main/java/com/ycl/service/message/IMessageService.java
+++ b/ycl-platform/src/main/java/com/ycl/service/message/IMessageService.java
@@ -4,6 +4,7 @@
import com.baomidou.mybatisplus.extension.service.IService;
import com.ycl.dto.message.MessageParam;
import com.ycl.entity.message.Message;
+import com.ycl.vo.message.MessageVO;
import java.util.List;
@@ -19,7 +20,7 @@
String sendMessage(Message message);
- Page<Message> list(MessageParam messageParam);
+ Page<MessageVO> list(MessageParam messageParam);
Boolean deleteMessages(List<Long> ids);
}
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 8c09bae..a0e5d92 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
@@ -19,6 +19,7 @@
import com.ycl.mapper.user.UmsAdminMapper;
import com.ycl.service.message.IMessageService;
import com.ycl.utils.MD5Util;
+import com.ycl.vo.message.MessageVO;
import lombok.SneakyThrows;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.BeanUtils;
@@ -195,7 +196,7 @@
}
@Override
- public Page<Message> list(MessageParam messageParam) {
+ public Page<MessageVO> list(MessageParam messageParam) {
Page<Message> page = new Page<>(messageParam.getCurrent(), messageParam.getPageSize());
return messageMapper.selectMessagePage(page,messageParam);
}
diff --git a/ycl-platform/src/main/resources/application-dev.yml b/ycl-platform/src/main/resources/application-dev.yml
index 5b4153a..d6b0744 100644
--- a/ycl-platform/src/main/resources/application-dev.yml
+++ b/ycl-platform/src/main/resources/application-dev.yml
@@ -62,5 +62,5 @@
ecName: ycl
apId: 1
sign: sign
- url: http://localhost:8082/sccg/text/sms_res/fail
+ url: http://localhost:8082/sccg/text/sms_res
diff --git a/ycl-platform/src/main/resources/mapper/message/MessageMapper.xml b/ycl-platform/src/main/resources/mapper/message/MessageMapper.xml
index f7827ce..c0962e3 100644
--- a/ycl-platform/src/main/resources/mapper/message/MessageMapper.xml
+++ b/ycl-platform/src/main/resources/mapper/message/MessageMapper.xml
@@ -33,4 +33,51 @@
id, parent_id, head, channel_code, message_type, body, target_from, target_to, message_number, random_code, over_time, send_time, is_scan, status, is_view, remark, version, create_user, create_time, update_user, update_time, respond_result
</sql>
+ <select id="selectMessagePage" parameterType="com.ycl.dto.message.MessageParam"
+ resultType="com.ycl.vo.message.MessageVO">
+ SELECT
+ t1.id,
+ t2.username as targetFrom,
+ t3.column_name as messageTypeName,
+ t1.`status`,
+ t1.body,
+ t1.send_time,
+ t1.create_time,
+ t1.respond_result,
+ t1.head,
+ t4.username as createUser
+ FROM
+ `ums_message` t1
+ LEFT JOIN ums_admin t2 ON t1.target_from = t2.id
+ left join ums_admin t4 on t1.create_user = t4.id
+ LEFT JOIN ums_message_column t3 ON t3.id = t1.message_type
+ <where>
+ <if test="messageParam.head !=null and messageParam.head !=''">
+ t1.head like concat('%',#{messageParam.head},'%')
+ </if>
+ <if test="messageParam.channelCode !='' and messageParam.channelCode != null">
+ and t1.channel_code=#{messageParam.channelCode}
+ </if>
+ <if test="messageParam.messageType != null">
+ and t1.message_type=#{messageParam.messageType}
+ </if>
+ <if test="messageParam.startTime != null and messageParam.startTime != '' and messageParam.endTime != null and messageParam.endTime != '' ">
+ and t1.create_time between #{messageParam.startTime} and #{messageParam.endTime}
+ </if>
+
+ <if test="messageParam.status != null">
+ and t1.status=#{messageParam.status}
+ </if>
+ <if test="messageParam.respondResult !=null and messageParam.respondResult !='' ">
+ and t1.respond_result={messageParam.respondResult}
+ </if>
+ <if test="messageParam.sort==1">
+ ORDER BY t1.create_time desc
+ </if>
+ <if test="messageParam.sort==0">
+ ORDER BY t1.create_time asc
+ </if>
+ </where>
+ </select>
+
</mapper>
--
Gitblit v1.8.0