From 3aa2f1033b08a95b6c321a338418146434f284e5 Mon Sep 17 00:00:00 2001
From: cl <1442464845@qq.com>
Date: 星期五, 17 四月 2026 17:41:34 +0800
Subject: [PATCH] 页面优化
---
rsf-server/src/main/java/com/vincent/rsf/server/manager/service/CusItemSyncViewQueryService.java | 39 +++++++++++++++++++++++----------------
1 files changed, 23 insertions(+), 16 deletions(-)
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/CusItemSyncViewQueryService.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/CusItemSyncViewQueryService.java
index 732f5a4..932b35c 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/CusItemSyncViewQueryService.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/CusItemSyncViewQueryService.java
@@ -1,12 +1,16 @@
package com.vincent.rsf.server.manager.service;
-import com.vincent.rsf.server.manager.mapper.MatnrMapper;
+import com.vincent.rsf.server.common.datasource.DataSourceNames;
+import com.vincent.rsf.server.common.datasource.UseDataSource;
+import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Qualifier;
+import org.springframework.beans.factory.ObjectProvider;
import org.springframework.jdbc.core.JdbcTemplate;
import org.springframework.stereotype.Service;
+import javax.sql.DataSource;
import java.util.ArrayList;
import java.util.Collection;
import java.util.Collections;
@@ -14,36 +18,38 @@
import java.util.Map;
/**
- * cus_item_sync_view 鏌ヨ锛涢厤缃簡鍓簱 url 鏃惰蛋 JdbcTemplate锛屽惁鍒欒蛋涓诲簱 Mapper
+ * cus_item_sync_view 鏌ヨ锛涗粎浣跨敤鍓簱瑙嗗浘
*/
@Service
+@Slf4j
public class CusItemSyncViewQueryService {
-
- @Autowired(required = false)
- @Qualifier("cusItemSyncJdbcTemplate")
- private JdbcTemplate cusItemSyncJdbcTemplate;
@Autowired
private JdbcTemplate jdbcTemplate;
@Autowired
- private MatnrMapper matnrMapper;
+ @Qualifier("cusItemSyncDataSource")
+ private ObjectProvider<DataSource> cusItemSyncDataSourceProvider;
/** 褰撳墠瑙嗗浘鏌ヨ瀹為檯浣跨敤鐨勬暟鎹簮璇存槑 */
public String effectiveDataSourceLabel() {
- return cusItemSyncJdbcTemplate != null ? "cus-item-sync" : "primary";
+ return cusItemSyncDataSourceProvider.getIfAvailable() != null ? "cus-item-sync" : "none";
}
/**
- * 鍙栬鍥惧墠鑻ュ共琛岋紝鐢ㄤ簬杩為�氭�ч獙璇侊紙涓庝笟鍔℃煡璇㈠悓涓�濂楄矾鐢憋細鍓簱浼樺厛锛�
+ * 鍙栬鍥惧墠鑻ュ共琛�
*/
+ @UseDataSource(DataSourceNames.CUS_ITEM_SYNC)
public List<Map<String, Object>> probeSample(int limit) {
+ if (cusItemSyncDataSourceProvider.getIfAvailable() == null) {
+ return Collections.emptyList();
+ }
int n = Math.min(50, Math.max(1, limit));
- JdbcTemplate tpl = cusItemSyncJdbcTemplate != null ? cusItemSyncJdbcTemplate : jdbcTemplate;
- return tpl.queryForList(
+ return jdbcTemplate.queryForList(
"SELECT item_no, item_spec, unit_no FROM cus_item_sync_view LIMIT " + n);
}
+ @UseDataSource(DataSourceNames.CUS_ITEM_SYNC)
public List<Map<String, Object>> listByItemNos(Collection<String> itemNos) {
if (itemNos == null || itemNos.isEmpty()) {
return Collections.emptyList();
@@ -58,11 +64,12 @@
if (codes.isEmpty()) {
return Collections.emptyList();
}
- if (cusItemSyncJdbcTemplate != null) {
- String placeholders = String.join(",", Collections.nCopies(codes.size(), "?"));
- String sql = "SELECT item_no, item_spec, unit_no FROM cus_item_sync_view WHERE item_no IN (" + placeholders + ")";
- return cusItemSyncJdbcTemplate.queryForList(sql, codes.toArray());
+ if (cusItemSyncDataSourceProvider.getIfAvailable() == null) {
+ log.warn("cus-item-sync 鏁版嵁婧愭湭閰嶇疆锛岃烦杩囪鍥炬煡璇�");
+ return Collections.emptyList();
}
- return matnrMapper.selectByCusItemSyncView(codes);
+ String placeholders = String.join(",", Collections.nCopies(codes.size(), "?"));
+ String sql = "SELECT item_no, item_spec, unit_no FROM cus_item_sync_view WHERE item_no IN (" + placeholders + ")";
+ return jdbcTemplate.queryForList(sql, codes.toArray());
}
}
--
Gitblit v1.9.1