diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/job/attendance/AttendanceReminderJob.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/job/attendance/AttendanceReminderJob.java index 8eb7e253..49e85b90 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/job/attendance/AttendanceReminderJob.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/job/attendance/AttendanceReminderJob.java @@ -20,6 +20,7 @@ import org.springframework.stereotype.Component; import java.util.List; import java.util.Set; +import java.util.concurrent.CompletableFuture; import java.util.stream.Collectors; @Slf4j @@ -69,7 +70,13 @@ public class AttendanceReminderJob { Set list1 = list.stream().map(SubConstructionUser::getSysUserId).collect(Collectors.toSet()); for (Long userId : list1) { - chatServerHandler.sendSystemMessageToUser(userId, message,"1"); + CompletableFuture.runAsync(() -> { + try { + chatServerHandler.sendSystemMessageToUser(userId, message,"1"); + } catch (Exception e) { + log.error("异步发送系统消息失败,用户ID: {}, 消息: {}", userId, message, e); + } + }); } } @@ -101,7 +108,13 @@ public class AttendanceReminderJob { Set list1 = list.stream().map(SubConstructionUser::getSysUserId).collect(Collectors.toSet()); for (Long userId : list1) { - chatServerHandler.sendSystemMessageToUser(userId, message,"1"); + CompletableFuture.runAsync(() -> { + try { + chatServerHandler.sendSystemMessageToUser(userId, message,"1"); + } catch (Exception e) { + log.error("异步发送系统消息失败,用户ID: {}, 消息: {}", userId, message, e); + } + }); } } diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/service/impl/BusAttendanceServiceImpl.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/service/impl/BusAttendanceServiceImpl.java index 83a093d6..65b25d4e 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/service/impl/BusAttendanceServiceImpl.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/service/impl/BusAttendanceServiceImpl.java @@ -57,6 +57,7 @@ import java.io.OutputStream; import java.time.*; import java.time.format.DateTimeFormatter; import java.util.*; +import java.util.concurrent.CompletableFuture; import java.util.stream.Collectors; /** @@ -396,7 +397,14 @@ public class BusAttendanceServiceImpl extends ServiceImpl { + try { + chatServerHandler.sendSystemMessageToUser(userId, "打卡成功", "1"); + } catch (Exception e) { + log.error("异步发送系统消息失败,用户ID: {}, 消息: {}", userId, "打卡成功", e); + } + }); + boolean save = this.save(attendance); //插入工资 userSalaryDetailService.insertByAttendance(userId, attendance.getClockDate()); @@ -444,7 +452,14 @@ public class BusAttendanceServiceImpl extends ServiceImpl { + try { + chatServerHandler.sendSystemMessageToUser(userId, "打卡成功", "1"); + } catch (Exception e) { + log.error("异步发送系统消息失败,用户ID: {}, 消息: {}", userId, "打卡成功", e); + } + }); boolean save = this.save(attendance); //插入工资 userSalaryDetailService.insertByAttendance(userId, attendance.getClockDate()); diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/service/impl/BusReissueCardServiceImpl.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/service/impl/BusReissueCardServiceImpl.java index a0c69a25..c23e2c3d 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/service/impl/BusReissueCardServiceImpl.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/service/impl/BusReissueCardServiceImpl.java @@ -47,6 +47,9 @@ import org.springframework.transaction.annotation.Transactional; import java.time.LocalDateTime; import java.time.LocalTime; import java.util.*; +import java.util.concurrent.CompletableFuture; +import java.util.concurrent.ScheduledExecutorService; +import java.util.concurrent.TimeUnit; import java.util.stream.Collectors; /** @@ -81,7 +84,6 @@ public class BusReissueCardServiceImpl extends ServiceImpl { + try { + chatServerHandler.sendSystemMessageToUser(bean.getGangerId(),"["+bean.getUserName()+ "]"+"提交了新的补卡申请","1"); + } catch (Exception e) { + log.error("异步发送系统消息失败,用户ID: {}, 消息: {}", bean.getGangerId(), "提交了新的补卡申请", e); + } + }); return bean.getId(); } @@ -398,13 +407,27 @@ public class BusReissueCardServiceImpl extends ServiceImpl { + try { + chatServerHandler.sendSystemMessageToUser(bean.getUserId(),"补卡申请已通过","1"); + } catch (Exception e) { + log.error("异步发送系统消息失败,用户ID: {}, 消息: {}", bean.getUserId(), "补卡申请已通过", e); + } + }); + } if("3".equals(bean.getGangerOpinion())){ BusAttendance byId = attendanceService.getById(attendanceId); byId.setHandle("0"); attendanceService.updateById(byId); - chatServerHandler.sendSystemMessageToUser(bean.getUserId(),"补卡申请未通过","1"); + CompletableFuture.runAsync(() -> { + try { + chatServerHandler.sendSystemMessageToUser(bean.getUserId(),"补卡申请未通过","1"); + } catch (Exception e) { + log.error("异步发送系统消息失败,用户ID: {}, 消息: {}", bean.getUserId(), "补卡申请未通过", e); + } + }); + } return b; } diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/quality/service/impl/QltQualityInspectionServiceImpl.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/quality/service/impl/QltQualityInspectionServiceImpl.java index 3d8dab63..318fb2c1 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/quality/service/impl/QltQualityInspectionServiceImpl.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/quality/service/impl/QltQualityInspectionServiceImpl.java @@ -59,6 +59,7 @@ import java.nio.file.Path; import java.nio.file.Paths; import java.time.LocalDate; import java.util.*; +import java.util.concurrent.CompletableFuture; import java.util.stream.Collectors; import java.util.zip.ZipOutputStream; @@ -204,11 +205,19 @@ public class QltQualityInspectionServiceImpl extends ServiceImpl { + try { + String title = req.getIsReply().equals("1") + ? "您有新的质量巡检工单需要整改,请及时处理!" + : "您有新的质量巡检工单,请及时查看!"; + chatServerHandler.sendSystemMessageToUser(req.getCorrectorId(), title, "3"); + } catch (Exception e) { + String title = req.getIsReply().equals("1") + ? "您有新的质量巡检工单需要整改,请及时处理!" + : "您有新的质量巡检工单,请及时查看!"; + log.error("异步发送系统消息失败,用户ID: {}, 消息: {}", req.getCorrectorId(), title, e); + } + }); } // 返回新写入的数据 return qualityInspection.getId(); @@ -233,8 +242,15 @@ public class QltQualityInspectionServiceImpl extends ServiceImpl { + try { + chatServerHandler.sendSystemMessageToUser(oldQualityInspection.getCreateBy(), title, "3"); + } catch (Exception e) { + log.error("异步发送系统消息失败,用户ID: {}, 消息: {}", oldQualityInspection.getCreateBy(), title, e); + } + }); + } if("2".equals(req.getVerificationType())){ handleFail(oldQualityInspection); diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/service/impl/HseSafetyInspectionServiceImpl.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/service/impl/HseSafetyInspectionServiceImpl.java index 9a37ca10..6c092997 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/service/impl/HseSafetyInspectionServiceImpl.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/service/impl/HseSafetyInspectionServiceImpl.java @@ -60,6 +60,7 @@ import java.nio.file.Files; import java.nio.file.Path; import java.nio.file.Paths; import java.util.*; +import java.util.concurrent.CompletableFuture; import java.util.stream.Collectors; import java.util.zip.ZipOutputStream; @@ -230,11 +231,19 @@ public class HseSafetyInspectionServiceImpl extends ServiceImpl { + try { + String title = req.getIsReply().equals("1") + ? "您有新的安全巡检工单需要整改,请及时处理!" + : "您有新的安全巡检工单,请及时查看!"; + chatServerHandler.sendSystemMessageToUser(correctorId, title, "2"); + } catch (Exception e) { + String title = req.getIsReply().equals("1") + ? "您有新的安全巡检工单需要整改,请及时处理!" + : "您有新的安全巡检工单,请及时查看!"; + log.error("异步发送系统消息失败,用户ID: {}, 消息: {}", correctorId, title, e); + } + }); } // 返回新写入的数据 return safetyInspection.getId(); @@ -481,8 +490,16 @@ public class HseSafetyInspectionServiceImpl extends ServiceImpl { + try { + chatServerHandler.sendSystemMessageToUser(safetyInspection.getCreateBy(), title, "2"); + } catch (Exception e) { + log.error("异步发送系统消息失败,用户ID: {}, 消息: {}", safetyInspection.getCreateBy(), title, e); + } + }); + + } // 填充默认值 updateInspection.setId(id);