From 0b7f075c3352ccba4b21dba5df3ae03ae0c787fd Mon Sep 17 00:00:00 2001
From: wl <173@qq.com>
Date: 星期二, 29 十一月 2022 17:33:10 +0800
Subject: [PATCH] fix: 上传处置违建文书时间错误
---
ycl-platform/src/main/java/com/ycl/service/message/impl/MessageServiceImpl.java | 17 ++++++++++-------
1 files changed, 10 insertions(+), 7 deletions(-)
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..7739d68 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
@@ -1,9 +1,6 @@
package com.ycl.service.message.impl;
-import cn.hutool.core.net.url.UrlBuilder;
-import cn.hutool.core.net.url.UrlPath;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.fasterxml.jackson.databind.ObjectMapper;
@@ -19,6 +16,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;
@@ -83,15 +81,18 @@
@Override
@Transactional(rollbackFor = Exception.class)
public String sendMessage(Message message) {
+
Message savedMessage = messageMapper.selectOne(new LambdaQueryWrapper<Message>()
.eq(Message::getTargetTo, message.getTargetTo())
- .eq(Message::getTargetFrom, message.getTargetFrom()));
+ .eq(Message::getTargetFrom, message.getTargetFrom())
+ .eq(Message::getBody, message.getBody())
+ .eq(Message::getHead, message.getHead()));
if (savedMessage != null) {
messageMapper.deleteById(savedMessage);
}
ArrayList<Long> ids = new ArrayList<>();
-
+ message.setTargetFrom(umsAdminMapper.selectById(message.getCreateUser()).getUsername());
for (String receive : message.getTargetTo().split(",")) {
Message sendMessage = new Message();
BeanUtils.copyProperties(message, sendMessage);
@@ -110,6 +111,8 @@
//鐭俊鍙戦��
case ChannelCode.MAIL:
sendMail(message);
+ break;
+ case ChannelCode.INNER:
break;
default:
throw new ApiException("鏈尮閰嶅埌璇ョ被鍨�");
@@ -195,9 +198,9 @@
}
@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);
+ return messageMapper.selectMessagePage(page, messageParam);
}
@Override
--
Gitblit v1.8.0