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

feat(ed-data): 新增ED数据管理和设备版本功能

Browse Source 
- 重命名crcInfo字段为crc
- 添加findByCondition和addEdDataFirst接口方法
- 在CsEdDataController中实现新接口
- 在CsEdDataFeignClient中添加对应feign接口
- 实现CsEdDataQueryParm参数类并添加相关字段
- 扩展CsEdDataService服务接口
- 实现CsEdDataServiceImpl中的业务逻辑
- 修改CsEquipmentDeliveryServiceImpl增强设备管理功能
- 更新CsEquipmentDeliveryVO添加前置进程号字段
- 优化CsUpgradeLogs数据结构和相关接口
- 重构DataTaskServiceImpl中的通知消息内容
- 调整DevVersionVO中的版本日期格式和添加crc字段
This commit is contained in:
xy
2026-07-17 13:43:07 +08:00
parent a07a0fe6ed
commit dbfd6e2b52
17 changed files with 221 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
cs-system/cs-system-boot/src/main/java/com/njcn/cssystem/service/impl/DataTaskServiceImpl.java
View File

@@ -501,7 +501,7 @@ public class DataTaskServiceImpl implements IDataTaskService {
NoticeUserDto.Payload payload = new NoticeUserDto.Payload();
noticeUserDto.setPushClientId(harmonicDevCodes);
noticeUserDto.setTitle("稳态事件");
noticeUserDto.setContent(time + "发生稳态事件"+harmonicList.size()+"次，点击查看详情");
noticeUserDto.setContent(time + "发生稳态事件，点击查看详情");
payload.setType(1);
payload.setPath("/pages/index/message1?type="+payload.getType());
noticeUserDto.setPayload(payload);
@@ -512,7 +512,7 @@ public class DataTaskServiceImpl implements IDataTaskService {
NoticeUserDto.Payload payload = new NoticeUserDto.Payload();
noticeUserDto.setPushClientId(alarmDevCodes);
noticeUserDto.setTitle("告警事件");
noticeUserDto.setContent(time + "发生告警事件"+alarmList.size()+"次，点击查看详情");
noticeUserDto.setContent(time + "发生告警事件，点击查看详情");
payload.setType(2);
payload.setPath("/pages/index/message1?type="+payload.getType());
noticeUserDto.setPayload(payload);
@@ -571,7 +571,7 @@ public class DataTaskServiceImpl implements IDataTaskService {
NoticeUserDto.Payload payload = new NoticeUserDto.Payload();
noticeUserDto.setPushClientId(Collections.singletonList(item.getDevCode()));
noticeUserDto.setTitle("稳态事件");
noticeUserDto.setContent(time + "发生稳态事件"+harmonicData.size()+"次，点击查看详情");
noticeUserDto.setContent(time + "发生稳态事件，点击查看详情");
payload.setType(1);
payload.setPath("/pages/index/message1?type="+payload.getType());
noticeUserDto.setPayload(payload);
@@ -579,7 +579,7 @@ public class DataTaskServiceImpl implements IDataTaskService {
}
});
}
//普通用户不为空，推送暂态消息
//普通用户不为空，推送告警消息
if (CollectionUtil.isNotEmpty(alarmUser) && CollectionUtil.isNotEmpty(alarmList)) {
alarmUser.forEach(item->{
//根据用户获取设备
@@ -592,7 +592,7 @@ public class DataTaskServiceImpl implements IDataTaskService {
NoticeUserDto.Payload payload = new NoticeUserDto.Payload();
noticeUserDto.setPushClientId(Collections.singletonList(item.getDevCode()));
noticeUserDto.setTitle("告警事件");
noticeUserDto.setContent(time + "发生告警事件"+alarmList.size()+"次，点击查看详情");
noticeUserDto.setContent(time + "发生告警事件，点击查看详情");
payload.setType(2);
payload.setPath("/pages/index/message1?type="+payload.getType());
noticeUserDto.setPayload(payload);