From e43297404e0d77b9af0c297430c2eedab978dd5e Mon Sep 17 00:00:00 2001
From: zhanghua <314079846@qq.com>
Date: 星期一, 24 十月 2022 17:30:12 +0800
Subject: [PATCH] Merge branch 'master' of http://42.193.1.25:9521/r/sccg_server
---
ycl-platform/src/main/resources/mapper/store/UmsStoreInfoMapper.xml | 2
ycl-platform/src/main/java/com/ycl/vo/store/StoreInfoVO.java | 2
ycl-platform/src/main/java/com/ycl/controller/store/StoreInfoController.java | 2 +
ycl-platform/src/main/java/com/ycl/service/message/factory/SmsSender.java | 49 ++++++++++++++++++++++++
ycl-platform/src/main/java/com/ycl/service/message/impl/MessageServiceImpl.java | 45 +++++++++++++++++-----
5 files changed, 87 insertions(+), 13 deletions(-)
diff --git a/ycl-platform/src/main/java/com/ycl/controller/store/StoreInfoController.java b/ycl-platform/src/main/java/com/ycl/controller/store/StoreInfoController.java
index 4af016d..1ffd7d9 100644
--- a/ycl-platform/src/main/java/com/ycl/controller/store/StoreInfoController.java
+++ b/ycl-platform/src/main/java/com/ycl/controller/store/StoreInfoController.java
@@ -2,6 +2,7 @@
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.ycl.annotation.LogSave;
import com.ycl.api.CommonPage;
import com.ycl.api.CommonResult;
import com.ycl.common.util.UtilNumber;
@@ -59,6 +60,7 @@
@ApiOperation(value = "娣诲姞闂ㄥ簵淇℃伅")
@RequestMapping(value = "/add", method = RequestMethod.POST)
@ResponseBody
+ @LogSave(operationType = "闂ㄥ簵绠＄悊",contain = "娣诲姞闂ㄥ簵")
public CommonResult<StoreInfo> add(@Validated @RequestBody UmsStoreInfoParam umsStoreInfoParam) {
StoreInfo storeInfo = StoreInfo.builder()
.owner(umsStoreInfoParam.getOwner())
diff --git a/ycl-platform/src/main/java/com/ycl/service/message/factory/SmsSender.java b/ycl-platform/src/main/java/com/ycl/service/message/factory/SmsSender.java
index a44c8d0..6676ba9 100644
--- a/ycl-platform/src/main/java/com/ycl/service/message/factory/SmsSender.java
+++ b/ycl-platform/src/main/java/com/ycl/service/message/factory/SmsSender.java
@@ -1,8 +1,15 @@
package com.ycl.service.message.factory;
+import com.ycl.common.util.PropertyValueUtil;
import com.ycl.dto.message.MessageParam;
import com.ycl.entity.message.Message;
+import com.ycl.exception.ApiException;
import com.ycl.service.message.Sender;
+import com.ycl.service.user.UmsAdminService;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
/**
* <p>
@@ -12,9 +19,49 @@
* @author mg
* @since 2022-10-09
*/
+@Component
public class SmsSender implements Sender {
+
+ private final Logger logger = LoggerFactory.getLogger(getClass());
+
+ private static InnerSender innerSender;
+ @Autowired
+ public void setIMessageService(InnerSender innerSender) {
+ SmsSender.innerSender = innerSender;
+ }
+
+ private static PropertyValueUtil propertyValueUtil;
+ @Autowired
+ public void setPropertyValueUtil(PropertyValueUtil propertyValueUtil) {
+ SmsSender.propertyValueUtil = propertyValueUtil;
+ }
+ private static UmsAdminService adminService;
+ @Autowired
+ public void setUmsAdminService(UmsAdminService adminService) {
+ SmsSender.adminService = adminService;
+ }
+
@Override
public Message sendMessage(MessageParam messageParam) {
- return null;
+ //鍏ュ簱淇濆瓨
+ Message message = innerSender.sendMessage(messageParam);
+ //鍙戦�佺煭淇″彂閫�
+ sendSms(message);
+ return message;
+ }
+
+ public Message sendSms(Message message) {
+ //缁勮鐭俊鍙戦��
+
+ try {
+ logger.info("缁勮鐭俊鍙戦��");
+
+ }catch (Exception e){
+ e.printStackTrace();
+ logger.error("鍙戦�佺粍瑁呯煭淇″紓甯革紒", e);
+ e.printStackTrace();
+ throw new ApiException("鍙戦�佺粍瑁呯煭淇″紓甯�");
+ }
+ return message;
}
}
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 0a03a44..f25618d 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
@@ -5,10 +5,13 @@
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ycl.common.constant.ChannelCode;
+import com.ycl.common.util.CommonUtils;
import com.ycl.dto.message.MessageParam;
import com.ycl.entity.message.Message;
+import com.ycl.entity.user.UmsAdmin;
import com.ycl.exception.ApiException;
import com.ycl.mapper.message.MessageMapper;
+import com.ycl.mapper.user.UmsAdminMapper;
import com.ycl.service.message.IMessageService;
import com.ycl.service.message.Provider;
import com.ycl.service.message.Sender;
@@ -16,6 +19,10 @@
import com.ycl.service.message.factory.MailFactory;
import com.ycl.service.message.factory.SmsFactory;
import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+import java.util.List;
+import java.util.stream.Collectors;
/**
* <p>
@@ -27,6 +34,10 @@
*/
@Service
public class MessageServiceImpl extends ServiceImpl<MessageMapper, Message> implements IMessageService {
+
+
+ @Resource
+ private UmsAdminMapper umsAdminMapper;
@Override
public Message sendMessage(MessageParam messageParam) {
@@ -41,16 +52,10 @@
//閭欢鍙戦��
case ChannelCode.SMS:
provider = new MailFactory();
- //id鎹㈡垚閭鍙�
- //String targetToMail = adminService.getTargetTo(messageParam.getTargetTo(), messageParam.getChannelCode());
- //messageParam.setTargetTo(targetToMail);
break;
- //鐭俊鍙戦��
+ //鐭俊鍙戦��
case ChannelCode.MAIL:
provider = new SmsFactory();
- //id鎹㈡垚鎵嬫満鍙�
- //String targetToPhone = adminService.getTargetTo(messageParam.getTargetTo(), messageParam.getChannelCode());
- //messageParam.setTargetTo(targetToPhone);
break;
default:
throw new ApiException("鏈尮閰嶅埌璇ョ被鍨�");
@@ -64,14 +69,34 @@
public IPage<Message> list(MessageParam messageParam) {
Page<Message> page = new Page<>(messageParam.getCurrent(), messageParam.getPageSize());
LambdaQueryWrapper<Message> queryWrapper = new LambdaQueryWrapper<>();
- if (messageParam.getMessageType() != null) {
- queryWrapper.eq(Message::getMessageType, messageParam.getMessageType());
+ queryWrapper.eq(Message::getParentId, 0);
+ if (!CommonUtils.isEmpty(messageParam.getHead())) {
+ queryWrapper.eq(Message::getHead, messageParam.getHead());
}
- if (messageParam.getStatus() != null) {
+ if (!CommonUtils.isEmpty(messageParam.getChannelCode())) {
+ queryWrapper.eq(Message::getChannelCode, messageParam.getChannelCode());
+ }
+ if (!CommonUtils.isEmpty(messageParam.getStatus())) {
queryWrapper.eq(Message::getStatus, messageParam.getStatus());
}
queryWrapper.orderByDesc(Message::getCreateTime);
Page<Message> result = baseMapper.selectPage(page, queryWrapper);
+ List<Message> messages = result.getRecords();
+ if (!CommonUtils.isEmpty(messages)) {
+ List<Long> ids = messages.stream().map(e -> Long.parseLong(e.getTargetFrom().trim())).collect(Collectors.toList());
+ LambdaQueryWrapper<UmsAdmin> queryUSers = new LambdaQueryWrapper<>();
+ queryUSers.in(UmsAdmin::getId, ids);
+ List<UmsAdmin> users = umsAdminMapper.selectList(queryUSers);
+ if (!CommonUtils.isEmpty(users)) {
+ for (UmsAdmin user : users) {
+ for (Message message : messages) {
+ if (message.getTargetFrom().equals(user.getId()+"")) {
+ message.setTargetFrom(user.getUsername());
+ }
+ }
+ }
+ }
+ }
return result;
}
diff --git a/ycl-platform/src/main/java/com/ycl/vo/store/StoreInfoVO.java b/ycl-platform/src/main/java/com/ycl/vo/store/StoreInfoVO.java
index 8245c27..716de33 100644
--- a/ycl-platform/src/main/java/com/ycl/vo/store/StoreInfoVO.java
+++ b/ycl-platform/src/main/java/com/ycl/vo/store/StoreInfoVO.java
@@ -74,7 +74,7 @@
@ApiModelProperty("闂ㄥ簵绫诲瀷")
@TableField("type")
- private String type;
+ private String typeName;
@ApiModelProperty("鎻忚堪")
@TableField("description")
diff --git a/ycl-platform/src/main/resources/mapper/store/UmsStoreInfoMapper.xml b/ycl-platform/src/main/resources/mapper/store/UmsStoreInfoMapper.xml
index 2355f19..d253955 100644
--- a/ycl-platform/src/main/resources/mapper/store/UmsStoreInfoMapper.xml
+++ b/ycl-platform/src/main/resources/mapper/store/UmsStoreInfoMapper.xml
@@ -17,7 +17,7 @@
<select id="selectStorePage" resultType="com.ycl.vo.store.StoreInfoVO">
SELECT
t1.*,
- t2.`name`
+ t2.`name` as typeName
FROM
ums_store_store_info t1
left JOIN ums_data_dictionary t2 ON t1.type = t2.id
--
Gitblit v1.8.0