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 15:50:41 +08:00
parent e71448fcd7
commit b33791e816
2 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
iot-analysis/analysis-zl-event/zl-event-boot/src/main/java/com/njcn/zlevent/service/impl/EventServiceImpl.java
View File

@@ -165,7 +165,7 @@ public class EventServiceImpl implements IEventService {
} }
//推送事件逻辑处理 && cs_event_user入库 //推送事件逻辑处理 && cs_event_user入库
for (AppEventMessage.DataArray item : dataArray) { for (AppEventMessage.DataArray item : dataArray) {
sendEventUtils.sendUser(1,item.getType(),po.getId(),item.getName(),eventTime,appEventMessage.getId(),id); sendEventUtils.sendUser(1,item.getType(),po.getId(),item.getName(),eventTime,id);
} }
} catch (Exception e) { } catch (Exception e) {
CsEventLogs csEventLogs = new CsEventLogs(); CsEventLogs csEventLogs = new CsEventLogs();

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

@@ -80,11 +80,11 @@ public class SendEventUtils {
* @param devId 设备id * @param devId 设备id
* @param eventName 事件名称 * @param eventName 事件名称
* @param eventTime 事件发生事件 * @param eventTime 事件发生事件
* @param ndid 设备ndid
* @param id 事件id * @param id 事件id
*/ */
@Transactional(rollbackFor = Exception.class) @Transactional(rollbackFor = Exception.class)
public void sendUser(Integer eventType,String type,String devId, String eventName, LocalDateTime eventTime, String ndid, String id) { public void sendUser(Integer eventType,String type,String devId, String eventName, LocalDateTime eventTime, String id) {
int code;
List<User> users = new ArrayList<>(); List<User> users = new ArrayList<>();
List<String> devCodeList = new ArrayList<>(); List<String> devCodeList = new ArrayList<>();
List<CsEventSendMsg> csEventSendMsgList = new ArrayList<>(); List<CsEventSendMsg> csEventSendMsgList = new ArrayList<>();
@@ -97,6 +97,7 @@ public class SendEventUtils {
if (eventType == 1){ if (eventType == 1){
switch (type) { switch (type) {
case "1": case "1":
code = 2;
//设备自身事件 不推送给用户，推送给业务管理 //设备自身事件 不推送给用户，推送给业务管理
users = appUserFeignClient.getAdminInfo().getData(); users = appUserFeignClient.getAdminInfo().getData();
noticeUserDto.setPushClientId(Collections.singletonList(users.get(0).getDevCode())); noticeUserDto.setPushClientId(Collections.singletonList(users.get(0).getDevCode()));
@@ -109,6 +110,7 @@ public class SendEventUtils {
result.add(csEventUser); result.add(csEventUser);
break; break;
case "2": case "2":
code = 0;
//暂态事件 //暂态事件
users = getEventUser(devId); users = getEventUser(devId);
devCodeList = users.stream().map(User::getDevCode).collect(Collectors.toList()); devCodeList = users.stream().map(User::getDevCode).collect(Collectors.toList());
@@ -125,6 +127,7 @@ public class SendEventUtils {
}); });
break; break;
case "3": case "3":
code = 1;
//稳态事件 //稳态事件
users = getEventUser(devId); users = getEventUser(devId);
devCodeList = users.stream().map(User::getDevCode).collect(Collectors.toList()); devCodeList = users.stream().map(User::getDevCode).collect(Collectors.toList());
@@ -141,13 +144,14 @@ public class SendEventUtils {
}); });
break; break;
default: default:
code = 0;
break; break;
} }
//获取台账信息 //获取台账信息
DevDetailDTO devDetailDto = csLedgerFeignclient.queryDevDetail(devId).getData(); DevDetailDTO devDetailDto = csLedgerFeignclient.queryDevDetail(devId).getData();
content = devDetailDto.getEngineeringName() + "-" + devDetailDto.getProjectName() + "-" + devDetailDto.getEquipmentName() + "于" + eventTime.format(DatePattern.NORM_DATETIME_MS_FORMATTER) + "发生" + eventName; 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(code);
payload.setPath("/pages/message/message?type="+payload.getType()); payload.setPath("/pages/message/message?type="+payload.getType());
noticeUserDto.setPayload(payload); noticeUserDto.setPayload(payload);
} }