admin/wisdomisite-java
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

设备报警通知bug修复

Browse Source
This commit is contained in:
guoshengxiong 2025-12-26 15:50:17 +08:00
parent c0e29aec93
commit 318db06ca3
2 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/main/java/com/zhgd/xmgl/modules/project/controller/EnableMessageDevRuleController.java
View File

@ -228,6 +228,7 @@ public class EnableMessageDevRuleController {
v.setEnableSystemMessagePush(0); v.setEnableSystemMessagePush(0);
v.setEnableSystemMessagePromptTone(0); v.setEnableSystemMessagePromptTone(0);
v.setEnableBroadcastNotification(0); v.setEnableBroadcastNotification(0);
v.setParameterId(parameterId);
return v; return v;
}); });
} }

9
src/main/java/com/zhgd/xmgl/modules/project/service/impl/EnableMessageDevRuleServiceImpl.java
View File

@ -22,6 +22,7 @@ import com.zhgd.xmgl.modules.basicdata.service.ISystemUserService;
import com.zhgd.xmgl.modules.basicdata.service.impl.NoticeServiceImpl; import com.zhgd.xmgl.modules.basicdata.service.impl.NoticeServiceImpl;
import com.zhgd.xmgl.modules.project.entity.EnableMessageDev; import com.zhgd.xmgl.modules.project.entity.EnableMessageDev;
import com.zhgd.xmgl.modules.project.entity.EnableMessageDevRule; import com.zhgd.xmgl.modules.project.entity.EnableMessageDevRule;
import com.zhgd.xmgl.modules.project.entity.Project;
import com.zhgd.xmgl.modules.project.entity.dto.EnableMessageDevRuleDto; import com.zhgd.xmgl.modules.project.entity.dto.EnableMessageDevRuleDto;
import com.zhgd.xmgl.modules.project.entity.vo.EnableMessageDevRuleVo; import com.zhgd.xmgl.modules.project.entity.vo.EnableMessageDevRuleVo;
import com.zhgd.xmgl.modules.project.mapper.EnableMessageDevRuleMapper; import com.zhgd.xmgl.modules.project.mapper.EnableMessageDevRuleMapper;
@ -55,6 +56,9 @@ public class EnableMessageDevRuleServiceImpl extends ServiceImpl<EnableMessageDe
@Lazy @Lazy
@Resource @Resource
BroadcastManufacturerFactory broadcastManufacturerFactory; BroadcastManufacturerFactory broadcastManufacturerFactory;
@Lazy
@Autowired
ProjectServiceImpl projectService;
@Autowired @Autowired
private EnableMessageDevRuleMapper enableMessageDevRuleMapper; private EnableMessageDevRuleMapper enableMessageDevRuleMapper;
@Lazy @Lazy
@ -235,9 +239,12 @@ public class EnableMessageDevRuleServiceImpl extends ServiceImpl<EnableMessageDe
} }
String title = "设备报警通知"; String title = "设备报警通知";
String msg = rule.getMessageTemplateContent(); String msg = rule.getMessageTemplateContent();
Project project = projectService.getProjectInfoBySn(rule.getProjectSn());
List<Long> companyUsers = systemUserService.getCompanyUserIdsByProjectSn(rule.getProjectSn()); List<Long> companyUsers = systemUserService.getCompanyUserIdsByProjectSn(rule.getProjectSn());
if (CollUtil.isNotEmpty(companyUsers)) { if (CollUtil.isNotEmpty(companyUsers)) {
ids.addAll(companyUsers); for (Long id : companyUsers) {
noticeService.addUserNoticeAndApp(id, title, project.getProjectName() + "," + msg, type, tone);
}
} }
List<SystemUser> systemUsers = systemUserService.getSystemUsersBySn(new MapBuilder<String, Object>().put(Cts.SN, rule.getProjectSn()).put(Cts.QUERY_TYPE, Cts.PROJECT_LEVEL).build()); List<SystemUser> systemUsers = systemUserService.getSystemUsersBySn(new MapBuilder<String, Object>().put(Cts.SN, rule.getProjectSn()).put(Cts.QUERY_TYPE, Cts.PROJECT_LEVEL).build());
if (CollUtil.isNotEmpty(systemUsers)) { if (CollUtil.isNotEmpty(systemUsers)) {