From 946e9e3154fc9859ffd19ea8345d6e6268c51369 Mon Sep 17 00:00:00 2001
From: liusheng <337615773@qq.com>
Date: 星期三, 28 一月 2026 19:08:13 +0800
Subject: [PATCH] 处理数据查询慢的问题
---
ruoyi-quartz/src/main/java/com/ruoyi/quartz/task/RyTask.java | 28 ++++++++++++++++++----------
1 files changed, 18 insertions(+), 10 deletions(-)
diff --git a/ruoyi-quartz/src/main/java/com/ruoyi/quartz/task/RyTask.java b/ruoyi-quartz/src/main/java/com/ruoyi/quartz/task/RyTask.java
index 7c60933..4b40ebf 100644
--- a/ruoyi-quartz/src/main/java/com/ruoyi/quartz/task/RyTask.java
+++ b/ruoyi-quartz/src/main/java/com/ruoyi/quartz/task/RyTask.java
@@ -891,15 +891,6 @@
Optional<Long> currentSort = serviceSubtaskPreachforms.stream().filter(item -> serviceSubtask.getCurrentPreachform().equals(item.getPreachform())).map(ServiceSubtaskPreachform::getSort).findFirst();
if (currentSort.isPresent()) {
- //寰俊宸插彂閫併�佸凡棰嗗彇瑙嗕负鍙戦�佹垚鍔燂紝涓嶅啀杩涜琛ュ伩 -涓芥按涓尰闄�
- if (active.equals("47231022633110211A2101")) {
- //鑾峰彇褰撳墠鍙戦�佹柟寮�
- ServiceSubtaskPreachform currentServiceSubtaskPreachform = serviceSubtaskPreachforms.stream().filter(item -> item.getSort().equals(currentSort.get())).findFirst().orElse(new ServiceSubtaskPreachform());
- if (currentServiceSubtaskPreachform.getPreachform().equals("5") && (currentServiceSubtaskPreachform.getSendstate().equals("2") || currentServiceSubtaskPreachform.getSendstate().equals("3"))) {
- return "-1";
- }
- }
-
// 妫�鏌ユ槸鍚︽墍鏈塻endstate涓嶇瓑浜�9
boolean allSendStateNot1AndNot9 = serviceSubtaskPreachforms.stream().allMatch(item -> !item.getSendstate().equals("9"));
if (!allSendStateNot1AndNot9) {
@@ -923,7 +914,6 @@
// 褰搒ort绛変簬鍒楄〃size鏃讹紝涓嬩竴涓猻ort涓�-1
Long nextSort = currentSort.get() + 1;
-
//濡傛灉褰撳墠鐨勫彂閫佹柟寮忎笉涓虹┖锛屽苟涓斿紑濮嬪噯澶囪鐢ㄤ笅涓�绉嶆柟寮忓彂閫佷簡锛岄偅褰撳墠鐨勮偗瀹氭病鏈夊彂閫佹垚鍔燂紝闇�瑕佽缃け璐�
// (杩欓噷涓昏鏄紝浜哄伐濡傛灉娌℃湁闅忚锛岀劧鍚庡埌鍏紬鍙风殑鏃跺�欙紝灏变笉浼氬啀鍘荤浜哄伐鏄惁鎴愬姛锛屼汉宸ョ殑鐘舵�佷細涓�鐩村崱鍦�2鐨勭姸鎬佷笂)
if (StringUtils.isNotEmpty(serviceSubtask.getCurrentPreachform())) {
@@ -933,6 +923,24 @@
// 鎵惧埌涓嬩竴涓猻ort瀵瑰簲鐨刾reachform
String nextPreachform = serviceSubtaskPreachforms.stream().filter(item -> nextSort.equals(item.getSort())).map(ServiceSubtaskPreachform::getPreachform).findFirst().orElse("-1");
+ //寰俊宸插彂閫併�佸凡棰嗗彇璺宠繃鐭俊鍙戦�侊紝杩涜浜哄伐 -涓芥按涓尰闄�
+ if (active.equals("47231022633110211A2101")) {
+ //鑾峰彇褰撳墠鍙戦�佹柟寮�
+ ServiceSubtaskPreachform currentServiceSubtaskPreachform = serviceSubtaskPreachforms.stream().filter(item -> item.getSort().equals(currentSort.get())).findFirst().orElse(new ServiceSubtaskPreachform());
+ //褰撳墠鍙戦�佹柟寮忎负寰俊鐨勶紝涓斾笅涓�鍙戦�佹柟寮忎负鐭俊鐨勶紝寰俊鍙戦�佺姸鎬佷负宸插彂閫併�佸凡棰嗗彇鐨勶紝璺宠繃鐭俊姝ラ
+ if (currentServiceSubtaskPreachform.getPreachform().equals("5")
+ && (currentServiceSubtaskPreachform.getSendstate().equals("2")
+ || currentServiceSubtaskPreachform.getSendstate().equals("3"))) {
+ if(StringUtils.isNotEmpty(nextPreachform) && nextPreachform.equals("2")){
+ log.error("銆恠fHandlle銆戝井淇″凡鍙戦�侊紝鐭俊涓嶅彂閫侊紝璺宠浆浜哄伐");
+ setSuccessPreachForm(serviceSubtask, "-1", "寰俊宸插彂閫侊紝鐭俊涓嶅彂閫侊紝璺宠浆浜哄伐", "6");
+ //璺宠繃鐭俊锛屾墽琛屼笅涓�姝�
+ Long newNextSort = nextSort + 1;
+ //鎵惧埌鐭俊鍐嶄笅涓�涓猻ort瀵瑰簲鐨刾reachform
+ nextPreachform = serviceSubtaskPreachforms.stream().filter(item -> newNextSort.equals(item.getSort())).map(ServiceSubtaskPreachform::getPreachform).findFirst().orElse("-1");
+ }
+ }
+ }
//鏇存柊涓�涓嬪綋鍓嶅彂閫佹椂闂�
if (StringUtils.isNotEmpty(nextPreachform)) {
serviceSubtaskPreachform.setCurrentSendTime(new Date());
--
Gitblit v1.9.3