From 2544f8e589b00fe8fb89622a5411528e5e4be240 Mon Sep 17 00:00:00 2001 From: funny <834502597@qq.com> Date: Fri, 8 May 2026 15:28:56 +0800 Subject: [PATCH] =?UTF-8?q?refactor(scheduled):=20=E4=BD=BF=E7=94=A8=20Use?= =?UTF-8?q?r=20=E5=92=8C=20UserInterior=20=E6=9B=BF=E6=8D=A2=20VUserInteri?= =?UTF-8?q?or=20=E5=8F=8A=E7=9B=B8=E5=85=B3=E6=9C=8D=E5=8A=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 替换用户信息查询由 vUserInteriorService 改为 userService 和 userInteriorService - 改用 User 实体替代 VUserInterior 实体，简化用户信息获取逻辑 - 调整部门领导查询逻辑，改用 userInteriorService 查询部门id - 更新各处用户姓名和部门领导获取方式，提高代码一致性和可维护性 - 移除对 IVUserInteriorService 的依赖，改为 IUserService 和 IUserInteriorService 注入 --- .../PdiTaskOverdueNotifyProcessor.java | 53 +++++++++---------- 1 file changed, 26 insertions(+), 27 deletions(-) diff --git a/nflg-wms-scheduled/src/main/java/com/nflg/wms/scheduled/processor/PdiTaskOverdueNotifyProcessor.java b/nflg-wms-scheduled/src/main/java/com/nflg/wms/scheduled/processor/PdiTaskOverdueNotifyProcessor.java index 30178206..9807784f 100644 --- a/nflg-wms-scheduled/src/main/java/com/nflg/wms/scheduled/processor/PdiTaskOverdueNotifyProcessor.java +++ b/nflg-wms-scheduled/src/main/java/com/nflg/wms/scheduled/processor/PdiTaskOverdueNotifyProcessor.java @@ -7,13 +7,15 @@ import com.nflg.wms.repository.entity.DictionaryItem; import com.nflg.wms.repository.entity.QmsPdiDetectionRules; import com.nflg.wms.repository.entity.QmsPdiTaskRecord; import com.nflg.wms.repository.entity.QmsTodoItem; -import com.nflg.wms.repository.entity.VUserInterior; +import com.nflg.wms.repository.entity.User; +import com.nflg.wms.repository.entity.UserInterior; import com.nflg.wms.repository.service.IDepartmentService; import com.nflg.wms.repository.service.IDictionaryItemService; import com.nflg.wms.repository.service.IQmsPdiDetectionRulesService; import com.nflg.wms.repository.service.IQmsPdiTaskRecordService; import com.nflg.wms.repository.service.IQmsTodoItemService; -import com.nflg.wms.repository.service.IVUserInteriorService; +import com.nflg.wms.repository.service.IUserInteriorService; +import com.nflg.wms.repository.service.IUserService; import jakarta.annotation.Resource; import org.springframework.stereotype.Component; import tech.powerjob.worker.core.processor.ProcessResult; @@ -40,7 +42,10 @@ public class PdiTaskOverdueNotifyProcessor implements BasicProcessor { private IQmsPdiDetectionRulesService detectionRulesService; @Resource - private IVUserInteriorService vUserInteriorService; + private IUserService userService; + + @Resource + private IUserInteriorService userInteriorService; @Resource private IDepartmentService departmentService; @@ -108,17 +113,12 @@ public class PdiTaskOverdueNotifyProcessor implements BasicProcessor { Long assistantId = task.getAssistantId(); // 查询质检人信息 - VUserInterior inspector = vUserInteriorService.lambdaQuery() - .eq(VUserInterior::getUserId, inspectorId) - .one(); - + User inspector = userService.getById(inspectorId); String inspectorName = inspector != null ? inspector.getUserName() : "未知"; String assistantName = ""; if (assistantId != null) { - VUserInterior assistant = vUserInteriorService.lambdaQuery() - .eq(VUserInterior::getUserId, assistantId) - .one(); + User assistant = userService.getById(assistantId); assistantName = assistant != null ? assistant.getUserName() : "未知"; } @@ -128,20 +128,25 @@ public class PdiTaskOverdueNotifyProcessor implements BasicProcessor { Set leaderIds = new HashSet<>(); // 质检人的部门领导 - if (inspector != null && inspector.getDeptId() != null) { - Department dept = departmentService.getById(inspector.getDeptId()); - if (dept != null && dept.getHeadUserId() != null) { - leaderIds.add(dept.getHeadUserId()); + if (inspector != null) { + UserInterior inspectorInterior = userInteriorService.lambdaQuery() + .eq(UserInterior::getUserId, inspectorId) + .one(); + if (inspectorInterior != null && inspectorInterior.getDeptId() != null) { + Department dept = departmentService.getById(inspectorInterior.getDeptId()); + if (dept != null && dept.getHeadUserId() != null) { + leaderIds.add(dept.getHeadUserId()); + } } } // 帮办人的部门领导 if (assistantId != null) { - VUserInterior assistant = vUserInteriorService.lambdaQuery() - .eq(VUserInterior::getUserId, assistantId) + UserInterior assistantInterior = userInteriorService.lambdaQuery() + .eq(UserInterior::getUserId, assistantId) .one(); - if (assistant != null && assistant.getDeptId() != null) { - Department dept = departmentService.getById(assistant.getDeptId()); + if (assistantInterior != null && assistantInterior.getDeptId() != null) { + Department dept = departmentService.getById(assistantInterior.getDeptId()); if (dept != null && dept.getHeadUserId() != null) { leaderIds.add(dept.getHeadUserId()); } @@ -153,9 +158,7 @@ public class PdiTaskOverdueNotifyProcessor implements BasicProcessor { task.getTaskNo(), inspectorName, assistantText); for (Long leaderId : leaderIds) { - VUserInterior leader = vUserInteriorService.lambdaQuery() - .eq(VUserInterior::getUserId, leaderId) - .one(); + User leader = userService.getById(leaderId); QmsTodoItem todo = new QmsTodoItem() .setCode(task.getTaskNo()) @@ -196,9 +199,7 @@ public class PdiTaskOverdueNotifyProcessor implements BasicProcessor { String messageContent = String.format("PDI检测任务[%s]将在%d小时内到期，请尽快完成", task.getTaskNo(), remainingHours); - VUserInterior inspector = vUserInteriorService.lambdaQuery() - .eq(VUserInterior::getUserId, inspectorId) - .one(); + User inspector = userService.getById(inspectorId); QmsTodoItem todoInspector = new QmsTodoItem() .setCode(task.getTaskNo()) @@ -214,9 +215,7 @@ public class PdiTaskOverdueNotifyProcessor implements BasicProcessor { // 给帮办人推送消息 if (assistantId != null) { - VUserInterior assistant = vUserInteriorService.lambdaQuery() - .eq(VUserInterior::getUserId, assistantId) - .one(); + User assistant = userService.getById(assistantId); QmsTodoItem todoAssistant = new QmsTodoItem() .setCode(task.getTaskNo())