消息待办
parent
bff81db1b6
commit
57a18004da
|
|
@ -83,11 +83,7 @@ public class FireCheckListAddExe {
|
||||||
});
|
});
|
||||||
//TODO 消息提醒
|
//TODO 消息提醒
|
||||||
try{
|
try{
|
||||||
List<UserDO> userDOList = userRepository.getListById(cmd.getUserIdList());
|
|
||||||
Map<Long, String> userNameMap = userDOList.stream()
|
|
||||||
.collect(Collectors.toMap(
|
|
||||||
UserDO::getId,
|
|
||||||
UserDO::getName));
|
|
||||||
List<TodoListAddEvent> todoListAddEventList = new ArrayList<>();
|
List<TodoListAddEvent> todoListAddEventList = new ArrayList<>();
|
||||||
cmd.getUserIdList().forEach(userId -> {
|
cmd.getUserIdList().forEach(userId -> {
|
||||||
MessageSendCmd messageSendCmd = new MessageSendCmd();
|
MessageSendCmd messageSendCmd = new MessageSendCmd();
|
||||||
|
|
@ -106,8 +102,8 @@ public class FireCheckListAddExe {
|
||||||
log.info("创建清单,超期提醒发送消息结果:d: {}", JSONUtil.toJsonStr(d));
|
log.info("创建清单,超期提醒发送消息结果:d: {}", JSONUtil.toJsonStr(d));
|
||||||
//待排查 待办
|
//待排查 待办
|
||||||
TodoListAddEvent event = new TodoListAddEvent();
|
TodoListAddEvent event = new TodoListAddEvent();
|
||||||
event.setTitle(userNameMap.get(userId) + "-待排查");
|
event.setTitle("您有一条【消防检查】待处理");
|
||||||
event.setContent("您有一条[" + cmd.getFireCheckName() + "(" + cmd.getFireCheckTypeName() + ")】待检查,请您及时排查,避免超期。");
|
event.setContent("待排查");
|
||||||
event.setForeignKey(fireCheckListE.getId()); // 业务表ID -申请
|
event.setForeignKey(fireCheckListE.getId()); // 业务表ID -申请
|
||||||
event.setForeignSubsidiaryKey(fireCheckListE.getId()); // 业务附表ID 没有附表时为foreignKey的值
|
event.setForeignSubsidiaryKey(fireCheckListE.getId()); // 业务附表ID 没有附表时为foreignKey的值
|
||||||
event.setReceiveUser(userId);// user表ID
|
event.setReceiveUser(userId);// user表ID
|
||||||
|
|
|
||||||
|
|
@ -615,11 +615,6 @@ public class FireCheckListQueryExe {
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
try {
|
try {
|
||||||
List<UserDO> userDOList = userRepository.getListById(fireCheckListUserDONameMap.get(info.getFireCheckId()));
|
|
||||||
Map<Long, String> userNameMap = userDOList.stream()
|
|
||||||
.collect(Collectors.toMap(
|
|
||||||
UserDO::getId,
|
|
||||||
UserDO::getName));
|
|
||||||
List<TodoListAddEvent> todoListAddEventList = new ArrayList<>();
|
List<TodoListAddEvent> todoListAddEventList = new ArrayList<>();
|
||||||
for (Long userId : fireCheckListUserDONameMap.get(info.getFireCheckId())) {
|
for (Long userId : fireCheckListUserDONameMap.get(info.getFireCheckId())) {
|
||||||
MessageSendCmd messageSendCmd = new MessageSendCmd();
|
MessageSendCmd messageSendCmd = new MessageSendCmd();
|
||||||
|
|
@ -639,8 +634,8 @@ public class FireCheckListQueryExe {
|
||||||
|
|
||||||
//待排查 待办
|
//待排查 待办
|
||||||
TodoListAddEvent event = new TodoListAddEvent();
|
TodoListAddEvent event = new TodoListAddEvent();
|
||||||
event.setTitle(userNameMap.get(userId) + "-待排查");
|
event.setTitle("您有一条【消防检查】待处理");
|
||||||
event.setContent("您有一条[" + info.getFireCheckName() + "(" + info.getFireCheckTypeName() + ")】待检查,请您及时排查,避免超期。");
|
event.setContent("待排查");
|
||||||
event.setForeignKey(info.getId()); // 业务表ID -申请
|
event.setForeignKey(info.getId()); // 业务表ID -申请
|
||||||
event.setForeignSubsidiaryKey(info.getId()); // 业务附表ID 没有附表时为foreignKey的值
|
event.setForeignSubsidiaryKey(info.getId()); // 业务附表ID 没有附表时为foreignKey的值
|
||||||
event.setReceiveUser(userId);// user表ID
|
event.setReceiveUser(userId);// user表ID
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue