From 5af3d2fa829a7a454c8ddbb6ffb2a7685ceb9c77 Mon Sep 17 00:00:00 2001
From: liujie <1793218484@qq.com>
Date: 星期一, 16 六月 2025 17:33:50 +0800
Subject: [PATCH] 新增优化1.0
---
springcloud_k8s_panzhihuazhihuishequ/service_westcommittee/src/main/java/com/panzhihua/westcommittee/scheduled/ComplaintTasks.java | 189 ++++++++++++++++++++++++++++++++++++++++-------
1 files changed, 161 insertions(+), 28 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_westcommittee/src/main/java/com/panzhihua/westcommittee/scheduled/ComplaintTasks.java b/springcloud_k8s_panzhihuazhihuishequ/service_westcommittee/src/main/java/com/panzhihua/westcommittee/scheduled/ComplaintTasks.java
index 524158d..6234d5d 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_westcommittee/src/main/java/com/panzhihua/westcommittee/scheduled/ComplaintTasks.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_westcommittee/src/main/java/com/panzhihua/westcommittee/scheduled/ComplaintTasks.java
@@ -1,6 +1,7 @@
package com.panzhihua.westcommittee.scheduled;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
import com.panzhihua.common.exceptions.ServiceException;
import com.panzhihua.common.model.vos.LoginUserInfoVO;
import com.panzhihua.common.model.vos.R;
@@ -28,14 +29,13 @@
private final ComplaintAuditRecordMapper complaintAuditRecordMapper;
private final IWorkOrderItemConfigService workOrderItemConfigService;
private final ISystemUserService systemUserService;;
- private final UserService userService;
- private final IMessageNotificationService messageNotificationService;
+ private final IDepartmentService departmentService;
private final IComplaintCommentService complaintCommentService;
/**
* 诉求超时处理(每天凌晨两点执行)
*/
-// @Scheduled(cron = "0 0 2 * * ?")
+ @Scheduled(fixedRate = 600000)
public void complaintTimeout() {
WorkOrderItemConfig config = workOrderItemConfigService.getById(1);
@@ -78,7 +78,7 @@
/**
* 自动完成诉求评价
*/
-// @Scheduled(cron = "0 1 0 * * ?")
+ @Scheduled(cron = "0 1 0 * * ?")
public void automaticEvaluation() {
// 诉求超时提醒
List<Complaint> complaintList = complaintService.getTimeoutAndNotComment();
@@ -111,49 +111,182 @@
// 区县超时
List<ComplaintTimeout> districtTimeOutList = timeOutMap.get(2);
if (!CollectionUtils.isEmpty(districtTimeOutList)){
- districtTimeOutList.forEach(complaintTimeout -> {
- // 查询状态正常 是区纪委和管理员
- List<SystemUser> districtUserList = systemUserService.list(new LambdaQueryWrapper<SystemUser>()
- .eq(SystemUser::getAccountLevel, 2)
- .in(SystemUser::getSystemRoleId,1,2)
- .eq(SystemUser::getStatus, 1));
- List<String> districtPhoneList = districtUserList.stream().map(SystemUser::getPhone).collect(Collectors.toList());
-
+ // 没有分配的 需要发给层级管理员和纪委
+ List<ComplaintTimeout> collect = districtTimeOutList.stream().filter(e -> e.getAssignStatus() == 0).collect(Collectors.toList());
+ // 查询状态正常 是区纪委和管理员
+ List<SystemUser> districtUserList = systemUserService.list(new LambdaQueryWrapper<SystemUser>()
+ .eq(SystemUser::getAccountLevel, 2)
+ .in(SystemUser::getSystemRoleId,1,2)
+ .eq(SystemUser::getStatus, 1));
+ List<String> districtPhoneList = districtUserList.stream().filter(e->e.getSystemRoleId()==1).map(SystemUser::getPhone).collect(Collectors.toList());
+ List<String> districtPhoneList1 = districtUserList.stream().filter(e->e.getSystemRoleId()==2).map(SystemUser::getPhone).collect(Collectors.toList());
+ collect.forEach(complaintTimeout -> {
// 发送短信
- AliSmsUtil.sendTimeoutMessage(districtPhoneList,complaintTimeout.getTitle());
+ if(!districtPhoneList.isEmpty()){
+ AliSmsUtil.sendTimeoutMessageAdmin(districtPhoneList,complaintTimeout.getSerialNumber());
+ }
+ if(!districtPhoneList1.isEmpty()){
+ AliSmsUtil.sendTimeoutMessage(districtPhoneList1,complaintTimeout.getSerialNumber());
+ }
});
+
+
+ // 分配了 查询是否有管理员 没有找层级管理员
+ List<ComplaintTimeout> collect1 = districtTimeOutList.stream().filter(e -> e.getAssignStatus() == 1).collect(Collectors.toList());
+ if(!collect1.isEmpty()){
+ // 分配的单位id
+ List<Integer> deptIds = collect1.stream().map(ComplaintTimeout::getAssignPersonId).collect(Collectors.toList());
+ // 这些单位的管理员
+ List<SystemUser> list = systemUserService.list(new LambdaQueryWrapper<SystemUser>().in(SystemUser::getOneDepartmentId, deptIds).in(SystemUser::getSystemRoleId,1,2).eq(SystemUser::getStatus,1));
+ collect1.forEach(complaintTimeout -> {
+ // 当前单位的管理员
+ List<SystemUser> systemUsers = list.stream().filter(e -> e.getOneDepartmentId().equals(complaintTimeout.getAssignPersonId())).collect(Collectors.toList());
+ if(!systemUsers.isEmpty()){
+ // 找出当前单位的管理员 纪委
+ List<String> districtPhoneList2 = systemUsers.stream().filter(e->e.getSystemRoleId()==1).map(SystemUser::getPhone).collect(Collectors.toList());
+ List<String> districtPhoneList3 = systemUsers.stream().filter(e->e.getSystemRoleId()==2).map(SystemUser::getPhone).collect(Collectors.toList());
+ // 发送短信
+ if(!districtPhoneList2.isEmpty()){
+ AliSmsUtil.sendTimeoutMessageAdmin(districtPhoneList2,complaintTimeout.getSerialNumber());
+ }
+ if(!districtPhoneList3.isEmpty()){
+ AliSmsUtil.sendTimeoutMessage(districtPhoneList3,complaintTimeout.getSerialNumber());
+ }
+ }else {
+ // 发送短信
+ if(!districtPhoneList.isEmpty()){
+ AliSmsUtil.sendTimeoutMessageAdmin(districtPhoneList,complaintTimeout.getSerialNumber());
+ }
+ if(!districtPhoneList1.isEmpty()){
+ AliSmsUtil.sendTimeoutMessage(districtPhoneList1,complaintTimeout.getSerialNumber());
+ }
+ }
+ });
+ }
+
}
// 街道超时
List<ComplaintTimeout> streetTimeOutList = timeOutMap.get(3);
if (!CollectionUtils.isEmpty(streetTimeOutList)){
- streetTimeOutList.forEach(complaintTimeout -> {
- List<SystemUser> streetUserList = systemUserService.list(new LambdaQueryWrapper<SystemUser>()
- .eq(SystemUser::getAccountLevel, 3)
- .in(SystemUser::getSystemRoleId,1,2)
- .eq(SystemUser::getStatus, 1));
- List<String> streetPhoneList = streetUserList.stream().map(SystemUser::getPhone).collect(Collectors.toList());
- // 发送短信
- AliSmsUtil.sendTimeoutMessage(streetPhoneList,complaintTimeout.getTitle());
+ // 没有分配的 需要发给层级管理员和纪委
+ List<ComplaintTimeout> collect = streetTimeOutList.stream().filter(e -> e.getAssignStatus() == 0).collect(Collectors.toList());
+
+ List<SystemUser> streetUserList = systemUserService.list(new LambdaQueryWrapper<SystemUser>()
+ .eq(SystemUser::getAccountLevel, 3)
+ .in(SystemUser::getSystemRoleId,1,2)
+ .eq(SystemUser::getStatus, 1));
+ collect.forEach(complaintTimeout -> {
+ List<String> streetPhoneList = streetUserList.stream().filter(e->e.getSystemRoleId()==1 && e.getStreetId().equals(complaintTimeout.getSuperiorId().toString())).map(SystemUser::getPhone).collect(Collectors.toList());
+ List<String> streetPhoneList1 = streetUserList.stream().filter(e->e.getSystemRoleId()==2 && e.getStreetId().equals(complaintTimeout.getSuperiorId().toString())).map(SystemUser::getPhone).collect(Collectors.toList());
+ // 发送短信
+ if(!streetPhoneList.isEmpty()){
+ AliSmsUtil.sendTimeoutMessageAdmin(streetPhoneList,complaintTimeout.getSerialNumber());
+ }
+ if(!streetPhoneList1.isEmpty()){
+ AliSmsUtil.sendTimeoutMessage(streetPhoneList1,complaintTimeout.getSerialNumber());
+ }
});
+
+
+ // 分配了
+ List<ComplaintTimeout> collect1 = streetTimeOutList.stream().filter(e -> e.getAssignStatus() == 1).collect(Collectors.toList());
+ if(!collect1.isEmpty()){
+ List<Integer> deptIds = collect1.stream().map(ComplaintTimeout::getAssignPersonId).collect(Collectors.toList());
+ List<SystemUser> list = systemUserService.list(new LambdaQueryWrapper<SystemUser>().in(SystemUser::getOneDepartmentId, deptIds).in(SystemUser::getSystemRoleId,1,2).eq(SystemUser::getStatus,1));
+ collect1.forEach(complaintTimeout -> {
+ List<SystemUser> systemUsers = list.stream().filter(e -> e.getOneDepartmentId().equals(complaintTimeout.getAssignPersonId())).collect(Collectors.toList());
+ if(!systemUsers.isEmpty()){
+ List<String> streetPhoneList2 = systemUsers.stream().filter(e->e.getSystemRoleId()==1).map(SystemUser::getPhone).collect(Collectors.toList());
+ List<String> streetPhoneList3 = systemUsers.stream().filter(e->e.getSystemRoleId()==2).map(SystemUser::getPhone).collect(Collectors.toList());
+ // 发送短信
+ if(!streetPhoneList2.isEmpty()){
+ AliSmsUtil.sendTimeoutMessageAdmin(streetPhoneList2,complaintTimeout.getSerialNumber());
+ }
+ if(!streetPhoneList3.isEmpty()){
+ AliSmsUtil.sendTimeoutMessage(streetPhoneList3,complaintTimeout.getSerialNumber());
+ }
+ }else {
+ List<String> streetPhoneList = streetUserList.stream().filter(e->e.getSystemRoleId()==1 && e.getStreetId().equals(complaintTimeout.getSuperiorId().toString())).map(SystemUser::getPhone).collect(Collectors.toList());
+ List<String> streetPhoneList1 = streetUserList.stream().filter(e->e.getSystemRoleId()==2 && e.getStreetId().equals(complaintTimeout.getSuperiorId().toString())).map(SystemUser::getPhone).collect(Collectors.toList());
+ // 发送短信
+ if(!streetPhoneList.isEmpty()){
+ AliSmsUtil.sendTimeoutMessageAdmin(streetPhoneList,complaintTimeout.getSerialNumber());
+ }
+ if(!streetPhoneList1.isEmpty()){
+ AliSmsUtil.sendTimeoutMessage(streetPhoneList1,complaintTimeout.getSerialNumber());
+ }
+ }
+ });
+ }
+
+
+
}
// 社区超时
List<ComplaintTimeout> communityTimeOutList = timeOutMap.get(4);
if (!CollectionUtils.isEmpty(communityTimeOutList)){
- communityTimeOutList.forEach(complaintTimeout -> {
- List<SystemUser> communityUserList = systemUserService.list(new LambdaQueryWrapper<SystemUser>()
- .eq(SystemUser::getAccountLevel, 4)
- .in(SystemUser::getSystemRoleId,1,2)
- .eq(SystemUser::getStatus, 1));
- List<String> communityPhoneList = communityUserList.stream().map(SystemUser::getPhone).collect(Collectors.toList());
+ List<ComplaintTimeout> collect = communityTimeOutList.stream().filter(e -> e.getAssignStatus() == 0).collect(Collectors.toList());
+
+
+
+ List<SystemUser> communityUserList = systemUserService.list(new LambdaQueryWrapper<SystemUser>()
+ .eq(SystemUser::getAccountLevel, 4)
+ .in(SystemUser::getSystemRoleId,1,2)
+ .eq(SystemUser::getStatus, 1));
+ collect.forEach(complaintTimeout -> {
+ List<String> communityPhoneList = communityUserList.stream().filter(e->e.getSystemRoleId()==1 && e.getCommunityId().equals(complaintTimeout.getSuperiorId())).map(SystemUser::getPhone).collect(Collectors.toList());
+ List<String> communityPhoneList1 = communityUserList.stream().filter(e->e.getSystemRoleId()==2 && e.getCommunityId().equals(complaintTimeout.getSuperiorId())).map(SystemUser::getPhone).collect(Collectors.toList());
// 发送短信
- AliSmsUtil.sendTimeoutMessage(communityPhoneList,complaintTimeout.getTitle());
+ if(!communityPhoneList.isEmpty()){
+ AliSmsUtil.sendTimeoutMessageAdmin(communityPhoneList, complaintTimeout.getSerialNumber());
+ }
+ if(!communityPhoneList1.isEmpty()){
+ AliSmsUtil.sendTimeoutMessage(communityPhoneList1,complaintTimeout.getSerialNumber());
+ }
});
+
+
+ // 分配了
+ List<ComplaintTimeout> collect1 = communityTimeOutList.stream().filter(e -> e.getAssignStatus() == 1).collect(Collectors.toList());
+ if(!collect1.isEmpty()){
+ List<Integer> deptIds = collect1.stream().map(ComplaintTimeout::getAssignPersonId).collect(Collectors.toList());
+ List<SystemUser> list = systemUserService.list(new LambdaQueryWrapper<SystemUser>().in(SystemUser::getOneDepartmentId, deptIds).in(SystemUser::getSystemRoleId,1,2).eq(SystemUser::getStatus,1));
+ collect1.forEach(complaintTimeout -> {
+ List<SystemUser> systemUsers = list.stream().filter(e -> e.getOneDepartmentId().equals(complaintTimeout.getAssignPersonId())).collect(Collectors.toList());
+ if(!systemUsers.isEmpty()){
+ List<String> communityPhoneList2 = systemUsers.stream().filter(e->e.getSystemRoleId()==1).map(SystemUser::getPhone).collect(Collectors.toList());
+ List<String> communityPhoneList3 = systemUsers.stream().filter(e->e.getSystemRoleId()==2).map(SystemUser::getPhone).collect(Collectors.toList());
+ // 发送短信
+ if(!communityPhoneList2.isEmpty()){
+ AliSmsUtil.sendTimeoutMessageAdmin(communityPhoneList2, complaintTimeout.getSerialNumber());
+ }
+ if(!communityPhoneList3.isEmpty()){
+ AliSmsUtil.sendTimeoutMessage(communityPhoneList3,complaintTimeout.getSerialNumber());
+ }
+ }else {
+ List<String> communityPhoneList = communityUserList.stream().filter(e->e.getSystemRoleId()==1 && e.getCommunityId().equals(complaintTimeout.getSuperiorId())).map(SystemUser::getPhone).collect(Collectors.toList());
+ List<String> communityPhoneList1 = communityUserList.stream().filter(e->e.getSystemRoleId()==2 && e.getCommunityId().equals(complaintTimeout.getSuperiorId())).map(SystemUser::getPhone).collect(Collectors.toList());
+ // 发送短信
+ if(!communityPhoneList.isEmpty()){
+ AliSmsUtil.sendTimeoutMessageAdmin(communityPhoneList, complaintTimeout.getSerialNumber());
+ }
+ if(!communityPhoneList1.isEmpty()){
+ AliSmsUtil.sendTimeoutMessage(communityPhoneList1,complaintTimeout.getSerialNumber());
+ }
+ }
+ });
+ }
}
+
+ if(!complaintTimeoutList.isEmpty()) {
+ // 短信发送完成 当前不在发送
+ complaintService.update(new LambdaUpdateWrapper<Complaint>().in(Complaint::getId, complaintTimeoutList.stream().map(ComplaintTimeout::getComplaintId).collect(Collectors.toList())).set(Complaint::getNowLevelSms, 1));
+ }
}
}
--
Gitblit v1.7.1