From 357100150bd0ba266d78d8d0f3b02c37b22435d8 Mon Sep 17 00:00:00 2001
From: 陈昶聿 <chychen@nbjetron.com>
Date: 星期一, 02 十一月 2026 10:17:19 +0800
Subject: [PATCH] 【丽水】1、指标查询与随访统计条件不同问题 2、微信发送重复问题
---
ruoyi-admin/src/main/java/com/ruoyi/web/component/RedisMqReceiver.java | 203 +++++++++++++++++++++++++++++++++++---------------
1 files changed, 141 insertions(+), 62 deletions(-)
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/component/RedisMqReceiver.java b/ruoyi-admin/src/main/java/com/ruoyi/web/component/RedisMqReceiver.java
index 5f4c09f..ed37825 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/component/RedisMqReceiver.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/component/RedisMqReceiver.java
@@ -31,6 +31,7 @@
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.collections4.CollectionUtils;
import org.apache.commons.lang3.ObjectUtils;
+import org.apache.commons.lang3.math.NumberUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.data.redis.connection.Message;
@@ -738,10 +739,15 @@
continue;
}
//鍦ㄥ瓙浠诲姟琛ㄩ噷璁板綍涓�涓�
- setFailPreachForm(serviceSubtask, sendPreachform, "鍏紬鍙峰彂閫佹垚鍔�", "2");
+ Boolean stateUpdated = setFailPreachForm(serviceSubtask, sendPreachform, "鍏紬鍙峰彂閫佹垚鍔�", "2");
+ if (!Boolean.TRUE.equals(stateUpdated)) {
+ log.error("鍏紬鍙峰彂閫佹垚鍔熶絾鏇存柊瀛愪换鍔＄姸鎬佸け璐ワ紝subid锛歿}锛宲reachform锛歿}", serviceSubtask.getId(), sendPreachform);
+ continue;
+ }
//浠诲姟鍙戦�佽褰�
ServiceSubtaskRecord serviceSubtaskRecord = new ServiceSubtaskRecord();
serviceSubtaskRecord.setTaskid(serviceSubtask.getTaskid().toString());
+ serviceSubtaskRecord.setSubtaskId(serviceSubtask.getId());
serviceSubtaskRecord.setUuid(UUID.randomUUID().toString());
serviceSubtaskRecord.setTasktype(serviceSubtask.getType());
serviceSubtaskRecord.setPreachform("5");
@@ -792,15 +798,15 @@
List<ServiceSubtaskPreachform> serviceSubtaskPreachforms = serviceSubtaskPreachformMapper.selectServiceSubtaskPreachformList(serviceSubtaskPreachform);
if (CollectionUtils.isNotEmpty(serviceSubtaskPreachforms)) {
- Optional<String> ct = serviceSubtaskPreachforms.stream().filter(item -> currentPreachform.equals(item.getPreachform())).map(ServiceSubtaskPreachform::getCompensateTime).findFirst();
- String compensateTime = "0";
- if (ct.isPresent()) compensateTime = ct.get();
- int hoursToAdd = Integer.valueOf(compensateTime) * 24;
+ Optional<String> ct = serviceSubtaskPreachforms.stream()
+ .filter(item -> Objects.equals(currentPreachform, item.getPreachform()))
+ .map(ServiceSubtaskPreachform::getCompensateTime)
+ .findFirst();
+ int daysToAdd = ct.map(value -> NumberUtils.toInt(value, 0)).orElse(0);
Calendar calendar = Calendar.getInstance();
- calendar.setTime(visitTime);
- calendar.add(Calendar.HOUR_OF_DAY, hoursToAdd);
- Date newDate = calendar.getTime();
- return newDate;
+ calendar.setTime(visitTime == null ? new Date() : visitTime);
+ calendar.add(Calendar.HOUR_OF_DAY, daysToAdd * 24);
+ return calendar.getTime();
}
return visitTime;
}
@@ -895,7 +901,7 @@
*/
public Boolean setFailPreachForm(ServiceSubtask serviceSubtask, String preachform, String remark, String failSendstate) {
log.info("^^^^^^^^^--------setFailPreachForm鐨勫叆鍙備负serviceSubtask锛歿} 锛宲reachform鍊间负锛歿}锛� failSendstate锛歿}", serviceSubtask, preachform, failSendstate);
- if (preachform.equals("-1")) {
+ if ("-1".equals(preachform)) {
//璇存槑閮戒笉闇�瑕佹墽琛屼簡
ServiceSubtaskPreachform serviceSubtaskPreachform = new ServiceSubtaskPreachform();
serviceSubtaskPreachform.setSubid(serviceSubtask.getId());
@@ -903,73 +909,142 @@
serviceSubtaskPreachform.setOrgid(serviceSubtask.getOrgid());
serviceSubtaskPreachform.setSendstate(failSendstate);
serviceSubtaskPreachform.setCurrentSendTime(new Date());
- if (serviceSubtask.getType().equals("3") || serviceSubtask.getType().equals("4")) {
+ if (isEducationOrNotice(serviceSubtask) && "2".equals(failSendstate)) {
//濡傛灉鏄鏁欐垨閫氱煡锛屽苟涓斿彂閫佹垚鍔燂紝鐩存帴灏嗗彂閫佺姸鎬佹敼鎴�9
- if (failSendstate.equals("2")) serviceSubtaskPreachform.setSendstate("9");
+ serviceSubtaskPreachform.setSendstate("9");
}
serviceSubtaskPreachformMapper.updateSSPByCondition(serviceSubtaskPreachform);
return true;
}
- //灏嗙姸鎬佽缃负澶辫触
- ServiceSubtaskPreachform serviceSubtaskPreachform = new ServiceSubtaskPreachform();
- serviceSubtaskPreachform.setSubid(serviceSubtask.getId());
- serviceSubtaskPreachform.setTaskid(serviceSubtask.getTaskid());
- serviceSubtaskPreachform.setOrgid(serviceSubtask.getOrgid());
- //鑾峰彇璇ユ偅鑰呯殑鍙戦�佹柟寮忔�绘暟
- List<ServiceSubtaskPreachform> spSize = serviceSubtaskPreachformMapper.selectServiceSubtaskPreachformList(serviceSubtaskPreachform);
- log.error("-------spSize鐨勫�间负锛歿}", spSize);
- serviceSubtaskPreachform.setPreachform(preachform);
- //1:鏈彂閫佺姸鎬�
- serviceSubtaskPreachform.setSendstate("1");
- log.info("---serviceSubtaskPreachform鍏ュ弬涓猴細{}", serviceSubtaskPreachform);
- List<ServiceSubtaskPreachform> serviceSubtaskPreachforms = serviceSubtaskPreachformMapper.selectServiceSubtaskPreachformList(serviceSubtaskPreachform);
- log.info("---serviceSubtaskPreachform杩斿弬涓猴細{}", serviceSubtaskPreachforms);
- //鐢佃瘽鐨勬湭鍙戦�佺姸鎬侊紝闇�瑕佹煡2锛屽洜涓猴紝鏁版嵁鍙兘鍗″湪闃熷垪閲屼簡(涔熸湁鍙兘娌℃湁鎷夊彇锛宻endstate=1,鎵�浠ュ鏋滄槸鐢佃瘽鐘舵�佸垽鏂璼erviceSubtaskPreachforms鏄笉鏄负绌�)
- if (preachform.equals("3") && CollectionUtils.isEmpty(serviceSubtaskPreachforms)) {
- serviceSubtaskPreachform.setSendstate("2");
- serviceSubtaskPreachforms = serviceSubtaskPreachformMapper.selectServiceSubtaskPreachformList(serviceSubtaskPreachform);
- }
- if (CollectionUtils.isNotEmpty(serviceSubtaskPreachforms)) {
- ServiceSubtaskPreachform serviceSubtaskPreachform1 = serviceSubtaskPreachforms.get(0);
- serviceSubtaskPreachform1.setSendstate(failSendstate);
- if (serviceSubtask.getType().equals("3") || serviceSubtask.getType().equals("4")) {
- //濡傛灉鏄鏁欐垨閫氱煡锛屽苟涓斿彂閫佹垚鍔燂紝鐩存帴灏嗗彂閫佺姸鎬佹敼鎴�9
- if (failSendstate.equals("2")) serviceSubtaskPreachform1.setSendstate("9");
- }
- serviceSubtaskPreachform1.setRemark(remark);
- serviceSubtaskPreachformMapper.updateServiceSubtaskPreachform(serviceSubtaskPreachform1);
- //濡傛灉褰撳墠鐨刾reachform宸茬粡鏄渶鍚庝竴涓簡,骞朵笖鏈杩樻槸鍙戦�佸け璐ワ紝閭ｇ洿鎺ュ皢serviceSubtask鐨剆endstate鐘舵�佹敼鎴�5灏辫浜�(鍏ㄥけ璐ヤ簡)
- if (CollectionUtils.isNotEmpty(spSize) && serviceSubtaskPreachform1.getSort() == spSize.size()
- && isSubtaskDeadline(serviceSubtask, serviceSubtaskPreachforms)) {
- if (serviceSubtaskPreachform1.getSort() == spSize.size()) {
- if (failSendstate.equals("4") || failSendstate.equals("5")) {
- serviceSubtask.setCurrentPreachform(preachform);
- serviceSubtask.setSendstate(7L);
- serviceSubtask.setFinishtime(null);
- serviceSubtask.setRemark("澶勭悊琛ュ伩浠诲姟,褰撳墠澶勭悊鏈�鍚庤ˉ鍋匡紝鍏ㄩ儴鎵ц澶辫触(瓒呮椂)");
- serviceSubtaskMapper.updateServiceSubtask(serviceSubtask);
- return true;
- }
- }
- }
- } else {
+ // 鏌ヨ璇ュ瓙浠诲姟鐨勫叏閮ㄥ彂閫佹柟寮忥紝涓嶅啀鍙煡 sendstate=1銆�
+ // 绗竴娆″彂閫佸悗璇ヨ鍙兘宸茬粡鍙樻垚 sendstate=2锛岄噸璇曟椂浠嶉渶瑕佸畾浣嶅埌鍚屼竴琛屻��
+ ServiceSubtaskPreachform query = new ServiceSubtaskPreachform();
+ query.setSubid(serviceSubtask.getId());
+ query.setTaskid(serviceSubtask.getTaskid());
+ query.setOrgid(serviceSubtask.getOrgid());
+ List<ServiceSubtaskPreachform> allPreachforms = serviceSubtaskPreachformMapper.selectServiceSubtaskPreachformList(query);
+ log.info("---serviceSubtaskPreachform杩斿弬涓猴細{}", allPreachforms);
+ if (CollectionUtils.isEmpty(allPreachforms)) {
log.error("銆怣Q涓鎮ｈ�呮病鏈夋煡璇㈠埌灞炰簬浠栫殑鍙戦�佹柟寮忥紝subid锛歿},prechform:{},orgid:{}銆�", serviceSubtask.getId(), preachform, serviceSubtask.getOrgid());
return false;
}
- log.info("^^^^^^^^^--------preachform鐨勫�间负锛歿}", preachform);
+
+ // 鎸� getSendPreachform 鐨勯�夋嫨瑙勫垯瀹氫綅鏈瀹為檯澶勭悊鐨勫彂閫佹柟寮忚銆�
+ ServiceSubtaskPreachform currentPreachformRow = findCurrentPreachformRow(allPreachforms, serviceSubtask, preachform);
+ if (currentPreachformRow == null) {
+ log.error("銆怣Q涓鎮ｈ�呮病鏈夋煡璇㈠埌褰撳墠鍙戦�佹柟寮忥紝subid锛歿},prechform:{},orgid:{}銆�", serviceSubtask.getId(), preachform, serviceSubtask.getOrgid());
+ return false;
+ }
+
+ // 鍏堣惤搴� service_subtask 鐘舵�侊紝鍐嶆洿鏂板彂閫佹柟寮忔槑缁嗐��
+ // 杩欐牱鍗充娇鍚庣画姝ラ寮傚父锛�60 绉掗噸璇曚篃涓嶄細鍐嶆閫変腑骞跺彂閫併��
serviceSubtask.setCurrentPreachform(preachform);
- serviceSubtask.setVisitTime(getNextVisitTime(serviceSubtask.getId(), serviceSubtask.getTaskid(), serviceSubtask.getVisitTime(), serviceSubtask.getCurrentPreachform()));
+ serviceSubtask.setVisitTime(getNextVisitTime(serviceSubtask.getId(), serviceSubtask.getTaskid(), serviceSubtask.getVisitTime(), preachform));
serviceSubtask.setSendstate(3L);
- if (serviceSubtask.getType().equals("3") || serviceSubtask.getType().equals("4")) {
+ if (isEducationOrNotice(serviceSubtask) && "2".equals(failSendstate)) {
//濡傛灉鏄鏁欐垨閫氱煡锛屽苟涓斿彂閫佹垚鍔燂紝鍒欑洿鎺ュ皢serviceSubtask鐘舵�佹敼鎴�6L锛堣繖涓偅鑰呮槸娌℃湁棰樺仛鐨勶紝涓嶄細鍐嶈Е鍙戞帴鍙ｈ繘琛岀姸鎬佷慨鏀癸級
- if (failSendstate.equals("2")) {
- serviceSubtask.setSendstate(6L);
- }
+ serviceSubtask.setSendstate(6L);
}
serviceSubtaskMapper.updateServiceSubtask(serviceSubtask);
+
+ // 鏇存柊褰撳墠鍙戦�佹柟寮忔槑缁嗭紱鍙戦�佹垚鍔熸椂鍏佽褰撳墠琛屽凡缁忔槸 sendstate=2銆�
+ currentPreachformRow.setSendstate(failSendstate);
+ if (isEducationOrNotice(serviceSubtask) && "2".equals(failSendstate)) {
+ currentPreachformRow.setSendstate("9");
+ }
+ currentPreachformRow.setRemark(remark);
+ serviceSubtaskPreachformMapper.updateServiceSubtaskPreachform(currentPreachformRow);
+
+ // 鍙湁鏈�鍚庝竴姝ヤ笖鍙戦�佸け璐ワ紙4/5锛夋椂鎵嶉渶瑕佸垽鏂秴鏃跺苟缃负 7銆�
+ boolean lastStep = currentPreachformRow.getSort() != null
+ && currentPreachformRow.getSort() == allPreachforms.size();
+ if (lastStep && ("4".equals(failSendstate) || "5".equals(failSendstate))
+ && isSubtaskDeadline(serviceSubtask, allPreachforms)) {
+ serviceSubtask.setSendstate(7L);
+ serviceSubtask.setFinishtime(null);
+ serviceSubtask.setRemark("澶勭悊琛ュ伩浠诲姟,褰撳墠澶勭悊鏈�鍚庤ˉ鍋匡紝鍏ㄩ儴鎵ц澶辫触(瓒呮椂)");
+ serviceSubtaskMapper.updateServiceSubtask(serviceSubtask);
+ }
return true;
+ }
+
+ /**
+ * 鍒ゆ柇鏄惁涓哄鏁欐垨閫氱煡绫诲瀷銆�
+ */
+ private boolean isEducationOrNotice(ServiceSubtask serviceSubtask) {
+ return serviceSubtask != null
+ && ("3".equals(serviceSubtask.getType()) || "4".equals(serviceSubtask.getType()));
+ }
+
+ /**
+ * 瀹氫綅鏈瀹為檯澶勭悊鐨勫彂閫佹柟寮忚銆�
+ * 閫夋嫨瑙勫垯涓� getSendPreachform 淇濇寔涓�鑷达細
+ * 1. current_preachform 涓虹┖鏃跺彇 sort=1锛�
+ * 2. current_preachform 涓嶄负绌烘椂鍙� current_preachform 瀵瑰簲 sort 鐨勪笅涓�姝ワ紱
+ * 3. 鍏滃簳鎸夊彂閫佹柟寮忓尮閰嶏紝浼樺厛鍙� current_send_time 鏈�杩戠殑涓�琛岋紝鍐嶅彇 sort 杈冨皬鐨勪竴琛屻��
+ */
+ private ServiceSubtaskPreachform findCurrentPreachformRow(List<ServiceSubtaskPreachform> rows,
+ ServiceSubtask serviceSubtask,
+ String preachform) {
+ if (StringUtils.isEmpty(serviceSubtask.getCurrentPreachform())) {
+ for (ServiceSubtaskPreachform row : rows) {
+ if (Objects.equals(preachform, row.getPreachform())
+ && row.getSort() != null && row.getSort() == 1L) {
+ return row;
+ }
+ }
+ } else {
+ Long currentSort = null;
+ for (ServiceSubtaskPreachform row : rows) {
+ if (Objects.equals(serviceSubtask.getCurrentPreachform(), row.getPreachform())) {
+ currentSort = row.getSort();
+ break;
+ }
+ }
+ if (currentSort != null) {
+ Long nextSort = currentSort + 1;
+ for (ServiceSubtaskPreachform row : rows) {
+ if (Objects.equals(nextSort, row.getSort())
+ && Objects.equals(preachform, row.getPreachform())) {
+ return row;
+ }
+ }
+ }
+ }
+
+ ServiceSubtaskPreachform target = null;
+ for (ServiceSubtaskPreachform row : rows) {
+ if (!Objects.equals(preachform, row.getPreachform())) {
+ continue;
+ }
+ if (target == null) {
+ target = row;
+ continue;
+ }
+ Date rowTime = row.getCurrentSendTime();
+ Date targetTime = target.getCurrentSendTime();
+ if (rowTime != null && (targetTime == null || rowTime.after(targetTime))) {
+ target = row;
+ } else if (Objects.equals(rowTime, targetTime) && comparePreachformSort(row, target) < 0) {
+ target = row;
+ }
+ }
+ return target;
+ }
+
+ private int comparePreachformSort(ServiceSubtaskPreachform row, ServiceSubtaskPreachform target) {
+ if (row.getSort() == null && target.getSort() == null) {
+ return 0;
+ }
+ if (row.getSort() == null) {
+ return 1;
+ }
+ if (target.getSort() == null) {
+ return -1;
+ }
+ return row.getSort().compareTo(target.getSort());
}
private String getKey() {
@@ -1114,11 +1189,15 @@
return false;
}
// 鍩哄噯鏃跺埢锛氬嚭闄㈡椂闂� + 鍙戦�佹棩锛坰endDay 缂虹渷鎸� 1锛夛紝骞跺厹搴曢伩鍏� NPE/鑴忔暟鎹�
+ if (serviceSubtask.getEndtime() == null) {
+ log.warn("銆恑sSubtaskDeadline銆憇ubid锛歿} endtime涓虹┖锛屾棤娉曡绠楄秴鏃讹紝鎸夋湭瓒呮椂澶勭悊", serviceSubtask.getId());
+ return false;
+ }
ServiceTask serviceTask = serviceTaskMapper.selectServiceTaskByTaskid(serviceSubtask.getTaskid());
int sendDay = serviceTask != null && serviceTask.getSendDay() != null ? serviceTask.getSendDay().intValue() : 1;
Date deadline = DateUtils.addDays(serviceSubtask.getEndtime(), sendDay);
int sumCompensateTime = CollectionUtils.isEmpty(serviceSubtaskPreachforms) ? 0 : serviceSubtaskPreachforms.stream()
- .mapToInt(x -> x.getCompensateTime() == null ? 0 : Integer.parseInt(x.getCompensateTime()))
+ .mapToInt(x -> NumberUtils.toInt(x.getCompensateTime(), 0))
.sum();
sumCompensateTime = sumCompensateTime + 1;
// 鍙ˉ鍋挎渶鍚庝竴姝ヨ嚜韬殑琛ュ伩鏃堕棿锛堝ぉ锛夛紝鑴忓�间竴寰嬫寜 0 鍏滃簳
--
Gitblit v1.9.3