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

大屏通知bug修改

Browse Source
This commit is contained in:
guoshengxiong 2024-05-12 23:51:19 +08:00
parent c156b3a9fd
commit da0d13053a
4 changed files with 11 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/main/java/com/zhgd/xmgl/modules/basicdata/mapper/xml/NoticeMapper.xml
View File

@ -27,10 +27,7 @@
AND not find_in_set(type, #{param.notInType})
</if>
<if test="param.isBigScreen == null or param.isBigScreen == '0'.toString()">
AND type != 31
</if>
<if test="param.isBigScreen == '1'.toString()">
AND type = 31
AND type not in (31,32)
</if>
ORDER BY send_time DESC
</select>

2
src/main/java/com/zhgd/xmgl/modules/xz.security/service/IXzSecurityQualityInspectionRecordService.java
View File

@ -92,7 +92,7 @@ public interface IXzSecurityQualityInspectionRecordService extends IService<XzSe
BigDecimal getRiskScore(String projectSn, Date time);
void noticeBigScreen(XzSecurityQualityInspectionRecord tempQualityInspectionRecord, String rectifyTime, String format);
void noticeBigScreen(String type, XzSecurityQualityInspectionRecord tempQualityInspectionRecord, String rectifyTime, String format);
List<XzSecurityQualityInspectionRecordTotalVo> riskChart(Map<String, Object> map);
}

12
src/main/java/com/zhgd/xmgl/modules/xz.security/service/impl/XzSecurityXzSecurityQualityInspectionRecordServiceImpl.java
View File

@ -300,20 +300,20 @@ public class XzSecurityXzSecurityQualityInspectionRecordServiceImpl extends Serv
noticeService.addUserNoticeAndApp(record.getChangeId(), "您有一条安全检查待整改，问题：" + record.getDangerItemContent(), "安全管理待整改", "10",
PushPayloads.buildPushPayload(10, record));
if (record.getEngineeringId() == null) {
noticeBigScreen(record, record.getInspectTime(), StrUtil.format("{}检查到一条{}的{}安全隐患问题，请注意监督整改！",
noticeBigScreen("31", record, record.getInspectTime(), StrUtil.format("{}检查到一条{}的{}安全隐患问题，请注意监督整改！",
record.getRegionName(), enterpriseInfo.getEnterpriseName(), StrUtil.subAfter(record.getDangerItemContent(), "/", true)));
} else {
DangerousEngineeringRecord d = dangerousEngineeringRecordMapper.selectById(record.getEngineeringId());
noticeBigScreen(record, record.getInspectTime(), StrUtil.format("{}的{}的{}发现一条{}，请注意监督整改！",
noticeBigScreen("32", record, record.getInspectTime(), StrUtil.format("{}的{}的{}发现一条{}，请注意监督整改！",
enterpriseInfo.getEnterpriseName(), d.getEngineeringName(), record.getRegionName(), record.getDangerItemContent()));
}
} else if (record.getRecordType() == 2) {
if (record.getEngineeringId() == null) {
noticeBigScreen(record, record.getInspectTime(), StrUtil.format("{}已排查了{}的安全隐患问题，今日排查暂无次安全隐患！",
noticeBigScreen("31", record, record.getInspectTime(), StrUtil.format("{}已排查了{}的安全隐患问题，今日排查暂无次安全隐患！",
record.getRegionName(), StrUtil.subAfter(record.getDangerItemContent(), "/", true)));
} else {
DangerousEngineeringRecord d = dangerousEngineeringRecordMapper.selectById(record.getEngineeringId());
noticeBigScreen(record, record.getInspectTime(), StrUtil.format("{}的{}的{}今日排查暂无隐患",
noticeBigScreen("32", record, record.getInspectTime(), StrUtil.format("{}的{}的{}今日排查暂无隐患",
enterpriseInfo.getEnterpriseName(), d.getEngineeringName(), record.getRegionName()));
}
}
@ -728,11 +728,11 @@ public class XzSecurityXzSecurityQualityInspectionRecordServiceImpl extends Serv
}
@Override
public void noticeBigScreen(XzSecurityQualityInspectionRecord qualityInspectionRecord, String time, String format) {
public void noticeBigScreen(String type, XzSecurityQualityInspectionRecord qualityInspectionRecord, String time, String format) {
List<SystemUser> systemUsers = systemUserMapper.getSystemUsers(new MapBuilder<String, Object>().put("sn", qualityInspectionRecord.getProjectSn()).put("type", 3).build());
for (SystemUser systemUser : systemUsers) {
Notice notice = new Notice();
notice.setType("31");
notice.setType(type);
notice.setMsg(format);
notice.setAccountId(systemUser.getUserId());
notice.setTitle("大屏通知");

6
src/main/java/com/zhgd/xmgl/modules/xz.security/service/impl/XzSecurityXzSecurityQualityRectifyRecordServiceImpl.java
View File

@ -86,7 +86,7 @@ public class XzSecurityXzSecurityQualityRectifyRecordServiceImpl extends Service
tempQualityInspectionRecord.setStatus(3);
noticeService.addUserNoticeAndApp(tempQualityInspectionRecord.getReviewId(), "您有一条安全检查的整改结果需要复查，请及时查看。", "安全管理整改结果待复查", "10",
PushPayloads.buildPushPayload(10, tempQualityInspectionRecord));
qualityInspectionRecordService.noticeBigScreen(tempQualityInspectionRecord, qualityRectifyRecord.getRectifyTime(), StrUtil.format("{}整改了{}的一条{}安全隐患问题，请注意监督复查！",
qualityInspectionRecordService.noticeBigScreen("31", tempQualityInspectionRecord, qualityRectifyRecord.getRectifyTime(), StrUtil.format("{}整改了{}的一条{}安全隐患问题，请注意监督复查！",
enterpriseInfo.getEnterpriseName(), tempQualityInspectionRecord.getRegionName(), StrUtil.subAfter(tempQualityInspectionRecord.getDangerItemContent(), "/", true)));
} else {
tempQualityInspectionRecord.setStatus(2);
@ -97,7 +97,7 @@ public class XzSecurityXzSecurityQualityRectifyRecordServiceImpl extends Service
tempQualityInspectionRecord.setStatus(4);
noticeService.addUserNoticeAndApp(tempQualityInspectionRecord.getVerifyManId(), "您有一条安全检查的整改结果需要核验，请及时查看。", "安全管理整改结果核验通知", "10",
PushPayloads.buildPushPayload(10, tempQualityInspectionRecord));
qualityInspectionRecordService.noticeBigScreen(tempQualityInspectionRecord, qualityRectifyRecord.getRectifyTime(), StrUtil.format("{}复查了{}的一条{}安全隐患问题，请注意监督复核！",
qualityInspectionRecordService.noticeBigScreen("31", tempQualityInspectionRecord, qualityRectifyRecord.getRectifyTime(), StrUtil.format("{}复查了{}的一条{}安全隐患问题，请注意监督复核！",
enterpriseInfo.getEnterpriseName(), tempQualityInspectionRecord.getRegionName(), StrUtil.subAfter(tempQualityInspectionRecord.getDangerItemContent(), "/", true)));
} else {
tempQualityInspectionRecord.setStatus(2);
@ -110,7 +110,7 @@ public class XzSecurityXzSecurityQualityRectifyRecordServiceImpl extends Service
tempQualityInspectionRecord.setStatus(5);
noticeService.addUserNoticeAndApp(tempQualityInspectionRecord.getChangeId(), "您提交的安全检查的整改结果已通过核验。", "安全管理整改结果核验通知", "10",
PushPayloads.buildPushPayload(10, tempQualityInspectionRecord));
qualityInspectionRecordService.noticeBigScreen(tempQualityInspectionRecord, qualityRectifyRecord.getRectifyTime(), StrUtil.format("{}核验了{}的一条{}安全隐患问题，请注意查看！",
qualityInspectionRecordService.noticeBigScreen("31", tempQualityInspectionRecord, qualityRectifyRecord.getRectifyTime(), StrUtil.format("{}核验了{}的一条{}安全隐患问题，请注意查看！",
enterpriseInfo.getEnterpriseName(), tempQualityInspectionRecord.getRegionName(), StrUtil.subAfter(tempQualityInspectionRecord.getDangerItemContent(), "/", true)));
} else {
tempQualityInspectionRecord.setStatus(2);