From ab2884ade73fed97d1e7d7daf4b9b5b6dee83fdd Mon Sep 17 00:00:00 2001
From: liusheng <337615773@qq.com>
Date: 星期四, 29 十月 2026 09:26:12 +0800
Subject: [PATCH] 代码提交
---
ruoyi-inhospvisit/src/main/java/com/ruoyi/inhospvisit/service/VisitPreachformWriter.java | 30 ++++++++++++++++++++++++++----
1 files changed, 26 insertions(+), 4 deletions(-)
diff --git a/ruoyi-inhospvisit/src/main/java/com/ruoyi/inhospvisit/service/VisitPreachformWriter.java b/ruoyi-inhospvisit/src/main/java/com/ruoyi/inhospvisit/service/VisitPreachformWriter.java
index d609f5a..92e0df9 100644
--- a/ruoyi-inhospvisit/src/main/java/com/ruoyi/inhospvisit/service/VisitPreachformWriter.java
+++ b/ruoyi-inhospvisit/src/main/java/com/ruoyi/inhospvisit/service/VisitPreachformWriter.java
@@ -3,10 +3,10 @@
import com.fasterxml.jackson.core.type.TypeReference;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.ruoyi.common.core.service.VisitTaskCreateApi;
+import com.ruoyi.common.core.service.PreachformApi;
import com.ruoyi.common.core.service.dto.VisitSubtaskDraft;
import com.ruoyi.common.utils.StringUtils;
import com.ruoyi.common.core.service.dto.VisitPreachformRow;
-import com.ruoyi.inhospvisit.mapper.VisitPreachformMapper;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.collections4.CollectionUtils;
import org.springframework.beans.factory.ObjectProvider;
@@ -59,7 +59,7 @@
private static final String DEFAULT_SENDSTATE = "1";
@Autowired
- private VisitPreachformMapper preachformMapper;
+ private ObjectProvider<PreachformApi> preachformApiProvider;
@Autowired
private ObjectProvider<VisitTaskCreateApi> taskCreateApiProvider;
@@ -94,6 +94,12 @@
return;
}
// 鍘� L1084-1098
+ PreachformApi preachformApi = preachformApi();
+ if (preachformApi == null) {
+ log.error("瀹ｆ暀鍗曞绾� PreachformApi 涓嶅彲鐢紙service_subtask_preachform 宸插綊 ruoyi-task锛夛紝"
+ + "璺宠繃preachform瀛愯〃鐢熸垚锛宼askid涓猴細{}", serviceSubtask.getTaskid());
+ return;
+ }
for (VisitPreachformRow row : list) {
row.setTaskid(serviceSubtask.getTaskid());
row.setSubid(serviceSubtask.getId());
@@ -103,7 +109,7 @@
query.setSubid(row.getSubid());
query.setTaskid(row.getTaskid());
query.setPreachform(row.getPreachform());
- List<VisitPreachformRow> exists = preachformMapper.selectList(query);
+ List<VisitPreachformRow> exists = preachformApi.findList(query);
if (CollectionUtils.isNotEmpty(exists)) {
continue;
}
@@ -116,7 +122,7 @@
// 鍘� L1096-1097
row.setOrgid(serviceSubtask.getOrgid());
- preachformMapper.insert(row);
+ preachformApi.insert(row);
}
}
@@ -135,6 +141,22 @@
}
}
+ /**
+ * 鍙栧鏁欏崟濂戠害瀹炵幇锛�2026-11 璧� {@code service_subtask_preachform} 褰� {@code ruoyi-task}锛�
+ * 鏈ā鍧椾笉鑳藉弽鍚戜緷璧栧畠锛屽彧鑳界粡 {@code ruoyi-common} 鐨勫绾﹀湪杩愯鏈熷彇瀹炵幇锛夈��
+ */
+ private PreachformApi preachformApi() {
+ if (preachformApiProvider == null) {
+ return null;
+ }
+ try {
+ return preachformApiProvider.stream().findFirst().orElse(null);
+ } catch (Exception e) {
+ log.warn("銆愬嚭鍏ラ櫌闅忚銆戣幏鍙� PreachformApi 澶辫触锛歿}", e.toString());
+ return null;
+ }
+ }
+
/** 渚涙祴璇曟柇瑷�锛氱‘璁ゆ湰绫绘嬁鍒扮殑 ObjectMapper 闈炵┖锛堝師瀹炵幇鏄柟娉曞唴 new锛岃繖閲屾彁涓哄瓧娈碉級 */
boolean hasObjectMapper() {
return Objects.nonNull(objectMapper);
--
Gitblit v1.9.3