refactor(harmonic): 重构事件通知服务并迁移至系统模块
- 移除 AppNotificationService 和 SmsNotificationService 服务类 - 新增消息发送服务相关接口和实现类到系统模块 - 迁移 AsyncConfig 配置类到 cs-system 模块 - 新增事件用户关系表的 Mapper、Service 接口及实现类 - 更新 CsEventPO 添加 landPoint 字段用于存储事件落点信息 - 修改事件处理逻辑使用新的消息发送 Feign 客户端 - 集成事件原因分析功能并更新数据库字段映射 - 更新设备详情 DTO 添加 nDid 属性支持 - 优化事件通知和短信发送的消息内容格式 - 移除旧的设备消息客户端依赖并使用新服务接口
This commit is contained in:
@@ -0,0 +1,42 @@
|
||||
package com.njcn.cssystem.config;
|
||||
|
||||
import lombok.extern.slf4j.Slf4j;
|
||||
import org.springframework.context.annotation.Bean;
|
||||
import org.springframework.context.annotation.Configuration;
|
||||
import org.springframework.scheduling.annotation.AsyncConfigurer;
|
||||
import org.springframework.scheduling.concurrent.ThreadPoolTaskExecutor;
|
||||
|
||||
import java.util.concurrent.Executor;
|
||||
import java.util.concurrent.ThreadPoolExecutor;
|
||||
|
||||
/**
|
||||
* @author xy
|
||||
*/
|
||||
@Configuration
|
||||
@Slf4j
|
||||
public class AsyncConfig implements AsyncConfigurer {
|
||||
|
||||
@Bean("eventNotificationExecutor")
|
||||
public Executor eventNotificationExecutor() {
|
||||
ThreadPoolTaskExecutor executor = new ThreadPoolTaskExecutor();
|
||||
executor.setCorePoolSize(10);
|
||||
executor.setMaxPoolSize(20);
|
||||
executor.setQueueCapacity(200);
|
||||
executor.setThreadNamePrefix("event-notify-");
|
||||
executor.setRejectedExecutionHandler(new ThreadPoolExecutor.CallerRunsPolicy());
|
||||
executor.initialize();
|
||||
return executor;
|
||||
}
|
||||
|
||||
@Bean("smsNotificationExecutor")
|
||||
public Executor smsNotificationExecutor() {
|
||||
ThreadPoolTaskExecutor executor = new ThreadPoolTaskExecutor();
|
||||
executor.setCorePoolSize(5);
|
||||
executor.setMaxPoolSize(10);
|
||||
executor.setQueueCapacity(100);
|
||||
executor.setThreadNamePrefix("sms-notify-");
|
||||
executor.setRejectedExecutionHandler(new ThreadPoolExecutor.CallerRunsPolicy());
|
||||
executor.initialize();
|
||||
return executor;
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,50 @@
|
||||
package com.njcn.cssystem.controller.sendmsg;
|
||||
|
||||
|
||||
import com.njcn.common.pojo.annotation.OperateInfo;
|
||||
import com.njcn.common.pojo.enums.common.LogEnum;
|
||||
import com.njcn.common.pojo.enums.response.CommonResponseEnum;
|
||||
import com.njcn.common.pojo.response.HttpResult;
|
||||
import com.njcn.common.utils.HttpResultUtil;
|
||||
import com.njcn.cssystem.pojo.param.MsgSendParam;
|
||||
import com.njcn.cssystem.service.IMsgSendService;
|
||||
import com.njcn.web.controller.BaseController;
|
||||
import io.swagger.annotations.Api;
|
||||
import io.swagger.annotations.ApiOperation;
|
||||
import lombok.AllArgsConstructor;
|
||||
import lombok.extern.slf4j.Slf4j;
|
||||
import org.springframework.web.bind.annotation.PostMapping;
|
||||
import org.springframework.web.bind.annotation.RequestBody;
|
||||
import org.springframework.web.bind.annotation.RequestMapping;
|
||||
import org.springframework.web.bind.annotation.RestController;
|
||||
|
||||
/**
|
||||
* @author xy
|
||||
*/
|
||||
@Slf4j
|
||||
@RestController
|
||||
@RequestMapping("/send")
|
||||
@Api(tags = "消息推送")
|
||||
@AllArgsConstructor
|
||||
public class MsgSendController extends BaseController {
|
||||
|
||||
private final IMsgSendService msgSendService;
|
||||
@OperateInfo(info = LogEnum.BUSINESS_COMMON)
|
||||
@PostMapping("/appMsgSend")
|
||||
@ApiOperation("app消息推送")
|
||||
public HttpResult<Boolean> appMsgSend(@RequestBody MsgSendParam param){
|
||||
String methodDescribe = getMethodDescribe("appMsgSend");
|
||||
msgSendService.sendAppNotification(param);
|
||||
return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, null, methodDescribe);
|
||||
}
|
||||
|
||||
@OperateInfo(info = LogEnum.BUSINESS_COMMON)
|
||||
@PostMapping("/smsMsgSend")
|
||||
@ApiOperation("短信消息推送")
|
||||
public HttpResult<Boolean> smsMsgSend(@RequestBody MsgSendParam param){
|
||||
String methodDescribe = getMethodDescribe("smsMsgSend");
|
||||
msgSendService.sendSmsForDipEvent(param);
|
||||
return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, null, methodDescribe);
|
||||
}
|
||||
|
||||
}
|
||||
@@ -0,0 +1,16 @@
|
||||
package com.njcn.cssystem.mapper;
|
||||
|
||||
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
|
||||
import com.njcn.csharmonic.pojo.po.CsEventUserPO;
|
||||
|
||||
/**
|
||||
* <p>
|
||||
* 暂态事件表 Mapper 接口
|
||||
* </p>
|
||||
*
|
||||
* @author xuyang
|
||||
* @since 2023-08-23
|
||||
*/
|
||||
public interface CsEventUserMapper extends BaseMapper<CsEventUserPO> {
|
||||
|
||||
}
|
||||
@@ -0,0 +1,16 @@
|
||||
package com.njcn.cssystem.service;
|
||||
|
||||
import com.baomidou.mybatisplus.extension.service.IService;
|
||||
import com.njcn.csharmonic.pojo.po.CsEventUserPO;
|
||||
|
||||
/**
|
||||
* <p>
|
||||
* 暂态事件表 服务类
|
||||
* </p>
|
||||
*
|
||||
* @author xuyang
|
||||
* @since 2023-08-23
|
||||
*/
|
||||
public interface ICsEventUserService extends IService<CsEventUserPO> {
|
||||
|
||||
}
|
||||
@@ -0,0 +1,15 @@
|
||||
package com.njcn.cssystem.service;
|
||||
|
||||
|
||||
import com.njcn.cssystem.pojo.param.MsgSendParam;
|
||||
|
||||
/**
|
||||
* @author xy
|
||||
*/
|
||||
public interface IMsgSendService {
|
||||
|
||||
void sendAppNotification(MsgSendParam param);
|
||||
|
||||
void sendSmsForDipEvent(MsgSendParam param);
|
||||
|
||||
}
|
||||
@@ -0,0 +1,20 @@
|
||||
package com.njcn.cssystem.service.impl;
|
||||
|
||||
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
|
||||
import com.njcn.csharmonic.pojo.po.CsEventUserPO;
|
||||
import com.njcn.cssystem.mapper.CsEventUserMapper;
|
||||
import com.njcn.cssystem.service.ICsEventUserService;
|
||||
import org.springframework.stereotype.Service;
|
||||
|
||||
/**
|
||||
* <p>
|
||||
* 暂态事件表 服务实现类
|
||||
* </p>
|
||||
*
|
||||
* @author xuyang
|
||||
* @since 2023-08-23
|
||||
*/
|
||||
@Service
|
||||
public class CsEventUserServiceImpl extends ServiceImpl<CsEventUserMapper, CsEventUserPO> implements ICsEventUserService {
|
||||
|
||||
}
|
||||
@@ -0,0 +1,286 @@
|
||||
package com.njcn.cssystem.service.impl;
|
||||
|
||||
import cn.hutool.core.collection.CollectionUtil;
|
||||
import cn.hutool.core.date.DatePattern;
|
||||
import cn.hutool.core.util.StrUtil;
|
||||
import com.njcn.access.pojo.dto.NoticeUserDto;
|
||||
import com.njcn.access.utils.SendMessageUtil;
|
||||
import com.njcn.csdevice.api.*;
|
||||
import com.njcn.csdevice.param.DeviceMessageParam;
|
||||
import com.njcn.csdevice.pojo.dto.DevDetailDTO;
|
||||
import com.njcn.csdevice.pojo.po.CsEventSendMsg;
|
||||
import com.njcn.csharmonic.pojo.po.CsEventUserPO;
|
||||
import com.njcn.cssystem.api.AppMsgSetFeignClient;
|
||||
import com.njcn.cssystem.pojo.param.MsgSendParam;
|
||||
import com.njcn.cssystem.service.ICsEventUserService;
|
||||
import com.njcn.cssystem.service.IMsgSendService;
|
||||
import com.njcn.system.api.EpdFeignClient;
|
||||
import com.njcn.user.api.UserFeignClient;
|
||||
import com.njcn.user.pojo.po.User;
|
||||
import lombok.RequiredArgsConstructor;
|
||||
import lombok.extern.slf4j.Slf4j;
|
||||
import org.springframework.beans.factory.annotation.Value;
|
||||
import org.springframework.scheduling.annotation.Async;
|
||||
import org.springframework.stereotype.Service;
|
||||
|
||||
import java.time.LocalDateTime;
|
||||
import java.util.ArrayList;
|
||||
import java.util.List;
|
||||
import java.util.Objects;
|
||||
import java.util.stream.Collectors;
|
||||
|
||||
/**
|
||||
* @author 徐扬
|
||||
*/
|
||||
@Service
|
||||
@RequiredArgsConstructor
|
||||
@Slf4j
|
||||
public class IMsgSendServiceImpl implements IMsgSendService {
|
||||
|
||||
private final DeviceMessageFeignClient deviceMessageFeignClient;
|
||||
private final EquipmentFeignClient equipmentFeignClient;
|
||||
private final EpdFeignClient epdFeignClient;
|
||||
private final ICsEventUserService csEventUserService;
|
||||
private final SendMessageUtil sendMessageUtil;
|
||||
private final EventLogsFeignClient eventLogsFeignClient;
|
||||
private final CsLedgerFeignClient csLedgerFeignClient;
|
||||
private final AppMsgSetFeignClient appMsgSetFeignClient;
|
||||
private final UserFeignClient userFeignClient;
|
||||
private final SmsSendFeignClient smsSendFeignClient;
|
||||
private final CsLedgerFeignClient csLedgerFeignclient;
|
||||
@Value("${msg.msg_sign:南京灿能电力}")
|
||||
private String msgSign;
|
||||
|
||||
@Override
|
||||
@Async("eventNotificationExecutor")
|
||||
public void sendAppNotification(MsgSendParam param) {
|
||||
int code;
|
||||
List<User> users = new ArrayList<>();
|
||||
List<String> eventUser;
|
||||
List<String> devCodeList;
|
||||
List<String> userList = new ArrayList<>();
|
||||
List<CsEventSendMsg> csEventSendMsgList = new ArrayList<>();
|
||||
NoticeUserDto noticeUserDto = new NoticeUserDto();
|
||||
NoticeUserDto.Payload payload = new NoticeUserDto.Payload();
|
||||
String content = null;
|
||||
List<CsEventUserPO> result = new ArrayList<>();
|
||||
//获取设备类型 true:治理设备 false:其他类型的设备
|
||||
boolean devModel = equipmentFeignClient.judgeDevModel(param.getNDid()).getData();
|
||||
if (devModel) {
|
||||
DevDetailDTO devDetailDto = csLedgerFeignClient.queryDevDetail(param.getDevId()).getData();
|
||||
//事件处理
|
||||
if (param.getEventType() == 1){
|
||||
param.setEventName(epdFeignClient.findByName(param.getEventName()).getData().getShowName());
|
||||
switch (param.getType()) {
|
||||
case "1":
|
||||
code = 3;
|
||||
//设备自身事件 不推送给用户，推送给业务管理
|
||||
eventUser = deviceMessageFeignClient.getEventUserByDeviceId(param.getDevId(),false).getData();
|
||||
if (CollectionUtil.isNotEmpty(eventUser)) {
|
||||
eventUser.forEach(item->{
|
||||
CsEventUserPO csEventUser = new CsEventUserPO();
|
||||
csEventUser.setUserId(item);
|
||||
csEventUser.setStatus(0);
|
||||
csEventUser.setEventId(param.getId());
|
||||
result.add(csEventUser);
|
||||
});
|
||||
|
||||
DeviceMessageParam param1 = new DeviceMessageParam();
|
||||
param1.setUserList(eventUser);
|
||||
param1.setEventType(2);
|
||||
users = deviceMessageFeignClient.getSendUserByType(param1).getData();
|
||||
if (CollectionUtil.isNotEmpty(users)){
|
||||
for (User user : users){
|
||||
userList.add(user.getDevCode());
|
||||
}
|
||||
noticeUserDto.setPushClientId(userList);
|
||||
noticeUserDto.setTitle("运行事件");
|
||||
}
|
||||
}
|
||||
break;
|
||||
case "2":
|
||||
code = 0;
|
||||
//暂态事件
|
||||
eventUser = deviceMessageFeignClient.getEventUserByDeviceId(param.getDevId(),true).getData();
|
||||
if (CollectionUtil.isNotEmpty(eventUser)) {
|
||||
eventUser.forEach(item->{
|
||||
CsEventUserPO csEventUser = new CsEventUserPO();
|
||||
csEventUser.setUserId(item);
|
||||
csEventUser.setStatus(0);
|
||||
csEventUser.setEventId(param.getId());
|
||||
result.add(csEventUser);
|
||||
});
|
||||
DeviceMessageParam param1 = new DeviceMessageParam();
|
||||
param1.setUserList(eventUser);
|
||||
param1.setEventType(0);
|
||||
users = deviceMessageFeignClient.getSendUserByType(param1).getData();
|
||||
if (CollectionUtil.isNotEmpty(users)){
|
||||
devCodeList = users.stream().map(User::getDevCode).distinct().collect(Collectors.toList());
|
||||
noticeUserDto.setPushClientId(devCodeList);
|
||||
noticeUserDto.setTitle("暂态事件");
|
||||
content = devDetailDto.getEngineeringName() + "-" + devDetailDto.getProjectName() + "-" + devDetailDto.getEquipmentName()
|
||||
+ "于" + param.getEventTime().format(DatePattern.NORM_DATETIME_MS_FORMATTER) + "发生暂态事件，事件类型："
|
||||
+ param.getEventName()
|
||||
+ "，特征幅值：" + param.getAmplitude() + "%"
|
||||
+ "，持续时间：" + param.getPersistTime() + "s"
|
||||
+ "，落点区域：" + (Objects.isNull(param.getDropZone())?"未知":param.getDropZone());
|
||||
}
|
||||
}
|
||||
break;
|
||||
// case "3":
|
||||
// code = 1;
|
||||
// //稳态事件
|
||||
// eventUser = getEventUser(devId,true);
|
||||
// if (CollectionUtil.isNotEmpty(eventUser)) {
|
||||
// eventUser.forEach(item->{
|
||||
// CsEventUserPO csEventUser = new CsEventUserPO();
|
||||
// csEventUser.setUserId(item);
|
||||
// csEventUser.setStatus(0);
|
||||
// csEventUser.setEventId(id);
|
||||
// result.add(csEventUser);
|
||||
// });
|
||||
// users = getSendUser(eventUser,1);
|
||||
// if (CollectionUtil.isNotEmpty(users)){
|
||||
// devCodeList = users.stream().map(User::getDevCode).distinct().collect(Collectors.toList());
|
||||
// noticeUserDto.setPushClientId(devCodeList);
|
||||
// noticeUserDto.setTitle("稳态事件");
|
||||
// }
|
||||
// }
|
||||
// break;
|
||||
default:
|
||||
code = 0;
|
||||
break;
|
||||
}
|
||||
//获取台账信息
|
||||
if (Objects.isNull(content)) {
|
||||
content = devDetailDto.getEngineeringName()
|
||||
+ "-" + devDetailDto.getProjectName()
|
||||
+ "-" + devDetailDto.getEquipmentName()
|
||||
+ "于" + param.getEventTime().format(DatePattern.NORM_DATETIME_MS_FORMATTER)
|
||||
+ "发生" + param.getEventName();
|
||||
}
|
||||
noticeUserDto.setContent(content);
|
||||
payload.setType(code);
|
||||
payload.setPath("/pages/index/message1?type="+payload.getType());
|
||||
noticeUserDto.setPayload(payload);
|
||||
}
|
||||
// //告警处理
|
||||
// else if (eventType == 2){
|
||||
// switch (type) {
|
||||
// case "1":
|
||||
// //Ⅰ级告警 不推送给用户，推送给业务管理
|
||||
// eventUser = getEventUser(devId,false);
|
||||
// if (CollectionUtil.isNotEmpty(eventUser)) {
|
||||
// eventUser.forEach(item->{
|
||||
// CsEventUserPO csEventUser = new CsEventUserPO();
|
||||
// csEventUser.setUserId(item);
|
||||
// csEventUser.setStatus(0);
|
||||
// csEventUser.setEventId(id);
|
||||
// result.add(csEventUser);
|
||||
// });
|
||||
// users = getSendUser(eventUser,3);
|
||||
// if (CollectionUtil.isNotEmpty(users)){
|
||||
// eventName = epdFeignClient.findByName(eventName).getData().getShowName();
|
||||
// devCodeList = users.stream().map(User::getDevCode).distinct().collect(Collectors.toList());
|
||||
// noticeUserDto.setPushClientId(devCodeList);
|
||||
// }
|
||||
// }
|
||||
// break;
|
||||
// case "2":
|
||||
// eventName = epdFeignClient.findByName(eventName).getData().getShowName();
|
||||
// case "3":
|
||||
// //Ⅱ、Ⅲ级告警推送相关用户及业务管理员
|
||||
// eventUser = getEventUser(devId,true);
|
||||
// if (CollectionUtil.isNotEmpty(eventUser)) {
|
||||
// eventUser.forEach(item->{
|
||||
// CsEventUserPO csEventUser = new CsEventUserPO();
|
||||
// csEventUser.setUserId(item);
|
||||
// csEventUser.setStatus(0);
|
||||
// csEventUser.setEventId(id);
|
||||
// result.add(csEventUser);
|
||||
// });
|
||||
// users = getSendUser(eventUser,3);
|
||||
// if (CollectionUtil.isNotEmpty(users)){
|
||||
// devCodeList = users.stream().map(User::getDevCode).distinct().collect(Collectors.toList());
|
||||
// noticeUserDto.setPushClientId(devCodeList);
|
||||
// }
|
||||
// }
|
||||
// break;
|
||||
// default:
|
||||
// break;
|
||||
// }
|
||||
// noticeUserDto.setTitle("告警事件");
|
||||
// DevDetailDTO devDetailDto = csLedgerFeignclient.queryDevDetail(devId).getData();
|
||||
// content = devDetailDto.getEngineeringName() + "-" + devDetailDto.getProjectName() + "-" + devDetailDto.getEquipmentName() + "于" + eventTime.format(DatePattern.NORM_DATETIME_MS_FORMATTER) + "发生告警,告警信息:" + eventName;
|
||||
// noticeUserDto.setContent(content);
|
||||
// payload.setType(3);
|
||||
// payload.setPath("/pages/message/message?type="+payload.getType());
|
||||
// noticeUserDto.setPayload(payload);
|
||||
// }
|
||||
if (CollectionUtil.isNotEmpty(noticeUserDto.getPushClientId())) {
|
||||
List<String> filteredList = noticeUserDto.getPushClientId().stream()
|
||||
.filter(Objects::nonNull)
|
||||
.distinct()
|
||||
.collect(Collectors.toList());
|
||||
if (CollectionUtil.isNotEmpty(filteredList)) {
|
||||
noticeUserDto.setPushClientId(filteredList);
|
||||
sendMessageUtil.sendEventToUser(noticeUserDto);
|
||||
}
|
||||
}
|
||||
//记录推送日志
|
||||
for (User item : users) {
|
||||
CsEventSendMsg csEventSendMsg = new CsEventSendMsg();
|
||||
csEventSendMsg.setUserId(item.getId());
|
||||
csEventSendMsg.setEventId(param.getId());
|
||||
csEventSendMsg.setSendTime(LocalDateTime.now());
|
||||
if (Objects.isNull(item.getDevCode())){
|
||||
csEventSendMsg.setStatus(0);
|
||||
csEventSendMsg.setRemark("用户设备识别码为空");
|
||||
} else {
|
||||
csEventSendMsg.setDevCode(item.getDevCode());
|
||||
csEventSendMsg.setStatus(1);
|
||||
}
|
||||
csEventSendMsgList.add(csEventSendMsg);
|
||||
}
|
||||
eventLogsFeignClient.addLogs(csEventSendMsgList);
|
||||
//事件用户关系入库
|
||||
if (CollectionUtil.isNotEmpty(result)){
|
||||
csEventUserService.saveBatch(result);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
@Async("smsNotificationExecutor")
|
||||
public void sendSmsForDipEvent(MsgSendParam param) {
|
||||
try {
|
||||
List<String> userIdList = appMsgSetFeignClient.queryUserIdsByDeviceId(param.getDevId()).getData();
|
||||
if (CollectionUtil.isNotEmpty(userIdList)) {
|
||||
List<User> userList = userFeignClient.getUserListByIds(userIdList).getData();
|
||||
if (CollectionUtil.isNotEmpty(userList)) {
|
||||
List<User> userList1 = userList.stream()
|
||||
.filter(item -> StrUtil.isNotBlank(item.getPhone()) && Objects.equals(item.getSmsNotice(), 1))
|
||||
.collect(Collectors.toList());
|
||||
if (CollectionUtil.isNotEmpty(userList1)) {
|
||||
DevDetailDTO devDetailDto = csLedgerFeignclient.queryDevDetail(param.getDevId()).getData();
|
||||
String msgContent = "【" + msgSign + "】" + devDetailDto.getEngineeringName()
|
||||
+ "-" + devDetailDto.getProjectName() + "-" + devDetailDto.getEquipmentName()
|
||||
+ "于" + param.getEventTime().format(DatePattern.NORM_DATETIME_MS_FORMATTER) + "发生暂降事件"
|
||||
+ "，特征幅值：" + param.getAmplitude() + "%"
|
||||
+ "，持续时间：" + param.getPersistTime() + "s"
|
||||
+ "，落点区域：" + (Objects.isNull(param.getDropZone())?"未知":param.getDropZone());
|
||||
userList1.forEach(item -> {
|
||||
try {
|
||||
smsSendFeignClient.sendSmsSimple(item.getPhone(), msgContent, "verify_code");
|
||||
} catch (Exception e) {
|
||||
log.error("发送短信失败，手机号: {}", item.getPhone(), e);
|
||||
}
|
||||
});
|
||||
}
|
||||
}
|
||||
}
|
||||
} catch (Exception e) {
|
||||
log.error("异步发送暂降事件短信失败，设备ID: {}", param.getDevId(), e);
|
||||
}
|
||||
}
|
||||
}
|
||||
Reference in New Issue
Block a user