Microservice/iot
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

代码调整

Browse Source
This commit is contained in:
xuyang
2023-11-07 14:44:34 +08:00
parent bb2400b747
commit e71448fcd7
2 changed files with 14 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
iot-access/access-boot/src/main/java/com/njcn/access/service/impl/CsDevModelServiceImpl.java
View File

@@ -1029,7 +1029,7 @@ public class CsDevModelServiceImpl implements ICsDevModelService {
switch (name) { switch (name) {
//数据集 //数据集
case "Ds$Apf$Master$01": case "Ds$Apf$Master$01":
showName = "主模块数据"; showName = "APF模块数据";
break; break;
case "Ds$Apf$module$01": case "Ds$Apf$module$01":
showName = "模块1数据"; showName = "模块1数据";

15
iot-analysis/analysis-zl-event/zl-event-boot/src/main/java/com/njcn/zlevent/utils/SendEventUtils.java
View File

@@ -1,9 +1,14 @@
package com.njcn.zlevent.utils; package com.njcn.zlevent.utils;
import cn.hutool.core.collection.CollectionUtil; import cn.hutool.core.collection.CollectionUtil;
import cn.hutool.core.date.DatePattern;
import cn.hutool.core.date.DateUnit;
import cn.hutool.core.date.DateUtil;
import com.alibaba.nacos.shaded.com.google.gson.Gson; import com.alibaba.nacos.shaded.com.google.gson.Gson;
import com.njcn.csdevice.api.CsDeviceUserFeignClient; import com.njcn.csdevice.api.CsDeviceUserFeignClient;
import com.njcn.csdevice.api.CsLedgerFeignClient;
import com.njcn.csdevice.api.EventLogsFeignClient; import com.njcn.csdevice.api.EventLogsFeignClient;
import com.njcn.csdevice.pojo.dto.DevDetailDTO;
import com.njcn.csdevice.pojo.po.CsEventSendMsg; import com.njcn.csdevice.pojo.po.CsEventSendMsg;
import com.njcn.csharmonic.pojo.po.CsEventUserPO; import com.njcn.csharmonic.pojo.po.CsEventUserPO;
import com.njcn.system.api.EpdFeignClient; import com.njcn.system.api.EpdFeignClient;
@@ -65,6 +70,9 @@ public class SendEventUtils {
@Resource @Resource
private ICsEventUserService csEventUserService; private ICsEventUserService csEventUserService;
@Resource
private CsLedgerFeignClient csLedgerFeignclient;
/** /**
* 事件推送给相关用户 * 事件推送给相关用户
* @param eventType 事件类型 1:事件 2:告警 * @param eventType 事件类型 1:事件 2:告警
@@ -135,7 +143,9 @@ public class SendEventUtils {
default: default:
break; break;
} }
content = ndid + "于" +eventTime+ "发生" + eventName; //获取台账信息
DevDetailDTO devDetailDto = csLedgerFeignclient.queryDevDetail(devId).getData();
content = devDetailDto.getEngineeringName() + "-" + devDetailDto.getProjectName() + "-" + devDetailDto.getEquipmentName() + "于" + eventTime.format(DatePattern.NORM_DATETIME_MS_FORMATTER) + "发生" + eventName;
noticeUserDto.setContent(content); noticeUserDto.setContent(content);
payload.setType(Integer.parseInt(type)); payload.setType(Integer.parseInt(type));
payload.setPath("/pages/message/message?type="+payload.getType()); payload.setPath("/pages/message/message?type="+payload.getType());
@@ -177,7 +187,8 @@ public class SendEventUtils {
break; break;
} }
noticeUserDto.setTitle("告警事件"); noticeUserDto.setTitle("告警事件");
content = ndid + "于" +eventTime+ "发生告警,告警故障编码为:" + eventName; DevDetailDTO devDetailDto = csLedgerFeignclient.queryDevDetail(devId).getData();
content = devDetailDto.getEngineeringName() + "-" + devDetailDto.getProjectName() + "-" + devDetailDto.getEquipmentName() + "于" + eventTime.format(DatePattern.NORM_DATETIME_MS_FORMATTER) + "发生告警,告警故障编码为:" + eventName;
noticeUserDto.setContent(content); noticeUserDto.setContent(content);
payload.setType(3); payload.setType(3);
payload.setPath("/pages/message/message?type="+payload.getType()); payload.setPath("/pages/message/message?type="+payload.getType());