lcj/xinnengyuan
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

BUG

Browse Source
This commit is contained in:
zt
2025-09-20 20:07:50 +08:00
parent 5f8d494154
commit 325547f201
5 changed files with 106 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/job/attendance/AttendanceReminderJob.java
View File

@ -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<Long> list1 = list.stream().map(SubConstructionUser::getSysUserId).collect(Collectors.toSet());
for (Long userId : list1) {
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<Long> list1 = list.stream().map(SubConstructionUser::getSysUserId).collect(Collectors.toSet());
for (Long userId : list1) {
CompletableFuture.runAsync(() -> {
try {
chatServerHandler.sendSystemMessageToUser(userId, message,"1");
} catch (Exception e) {
log.error("异步发送系统消息失败，用户ID: {}, 消息: {}", userId, message, e);
}
});
}
}

15
xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/service/impl/BusAttendanceServiceImpl.java
View File

@ -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<BusAttendanceMapper, B
// 上传人脸照
SysOssVo upload = ossService.upload(file);
attendance.setFacePic(upload.getOssId().toString());
CompletableFuture.runAsync(() -> {
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<BusAttendanceMapper, B
// 上传人脸照
SysOssVo upload = ossService.upload(file);
attendance.setFacePic(upload.getOssId().toString());
CompletableFuture.runAsync(() -> {
try {
chatServerHandler.sendSystemMessageToUser(userId, "打卡成功", "1");
} catch (Exception e) {
log.error("异步发送系统消息失败，用户ID: {}, 消息: {}", userId, "打卡成功", e);
}
});
boolean save = this.save(attendance);
//插入工资
userSalaryDetailService.insertByAttendance(userId, attendance.getClockDate());

25
xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/project/service/impl/BusReissueCardServiceImpl.java
View File

@ -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<BusReissueCardMapper,
private ISubUserSalaryDetailService userSalaryDetailService;
@Resource
private ChatServerHandler chatServerHandler;
/**
* 查询施工人员补卡申请
*
@ -374,7 +376,14 @@ public class BusReissueCardServiceImpl extends ServiceImpl<BusReissueCardMapper,
.eq(BusAttendance::getId, bean.getAttendanceId())
.set(BusAttendance::getHandle, "1"));
//发送通知
//发送通知 - 异步执行
CompletableFuture.runAsync(() -> {
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<BusReissueCardMapper,
if(BusAttendanceClockStatusEnum.UNCLOCK.getValue().equals(clockStatus)){
userSalaryDetailService.insertByAttendance(byId.getUserId(),byId.getClockDate());
}
CompletableFuture.runAsync(() -> {
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);
CompletableFuture.runAsync(() -> {
try {
chatServerHandler.sendSystemMessageToUser(bean.getUserId(),"补卡申请未通过","1");
} catch (Exception e) {
log.error("异步发送系统消息失败，用户ID: {}, 消息: {}", bean.getUserId(), "补卡申请未通过", e);
}
});
}
return b;
}

28
xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/quality/service/impl/QltQualityInspectionServiceImpl.java
View File

@ -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<QltQualityInspe
throw new ServiceException("新增检查工单信息失败，数据库异常", HttpStatus.ERROR);
}
if (req.getCorrectorId() != null) {
String title = "您有新的质量巡检工单，请及时查看！";
if (req.getIsReply().equals("1")) {
title = "您有新的质量巡检工单需要整改，请及时处理！";
}
CompletableFuture.runAsync(() -> {
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<QltQualityInspe
throw new ServiceException("修改检查工单信息失败，数据不存在", HttpStatus.NOT_FOUND);
}
if ("2".equals(req.getInspectionStatus()) && oldQualityInspection.getCreateBy() != null && oldQualityInspection.getIsReply().equals("1")) {
chatServerHandler.sendSystemMessageToUser(oldQualityInspection.getCreateBy(),
"质量巡检工单【" + oldQualityInspection.getInspectionHeadline() + "】已整改，请及时复查！", "3");
String title = "质量巡检工单【" + oldQualityInspection.getInspectionHeadline() + "】已整改，请及时复查！";
CompletableFuture.runAsync(() -> {
try {
chatServerHandler.sendSystemMessageToUser(oldQualityInspection.getCreateBy(), title, "3");
} catch (Exception e) {
log.error("异步发送系统消息失败，用户ID: {}, 消息: {}", oldQualityInspection.getCreateBy(), title, e);
}
});
}
if("2".equals(req.getVerificationType())){
handleFail(oldQualityInspection);

29
xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/safety/service/impl/HseSafetyInspectionServiceImpl.java
View File

@ -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<HseSafetyInspect
// 向整改人发送消息
Long correctorId = req.getCorrectorId();
if (correctorId != null) {
String title = "您有新的安全巡检工单，请及时查看！";
if (req.getIsReply().equals("1")) {
title = "您有新的安全巡检工单需要整改，请及时处理！";
}
CompletableFuture.runAsync(() -> {
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<HseSafetyInspect
HseSafetyInspection updateInspection = new HseSafetyInspection();
BeanUtils.copyProperties(req, updateInspection);
if (safetyInspection.getCreateBy() != null && safetyInspection.getIsReply().equals("1")) {
chatServerHandler.sendSystemMessageToUser(safetyInspection.getCreateBy(),
"安全巡检工单【" + safetyInspection.getCheckProject() + "】已整改，请及时复查！", "2");
String title = "安全巡检工单【" + safetyInspection.getCheckProject() + "】已整改，请及时复查！";
CompletableFuture.runAsync(() -> {
try {
chatServerHandler.sendSystemMessageToUser(safetyInspection.getCreateBy(), title, "2");
} catch (Exception e) {
log.error("异步发送系统消息失败，用户ID: {}, 消息: {}", safetyInspection.getCreateBy(), title, e);
}
});
}
// 填充默认值
updateInspection.setId(id);