rsf-server/src/main/java/com/vincent/rsf/server/manager/service/CusItemSyncViewQueryService.java
@@ -1,6 +1,6 @@ package com.vincent.rsf.server.manager.service; import com.vincent.rsf.server.manager.mapper.MatnrMapper; 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; @@ -14,33 +14,30 @@ 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; /** 当前视图查询实际使用的数据源说明 */ public String effectiveDataSourceLabel() { return cusItemSyncJdbcTemplate != null ? "cus-item-sync" : "primary"; return cusItemSyncJdbcTemplate != null ? "cus-item-sync" : "none"; } /** * 取视图前若干行,用于连通性验证(与业务查询同一套路由:副库优先) * 取视图前若干行 */ public List<Map<String, Object>> probeSample(int limit) { if (cusItemSyncJdbcTemplate == null) { return Collections.emptyList(); } int n = Math.min(50, Math.max(1, limit)); JdbcTemplate tpl = cusItemSyncJdbcTemplate != null ? cusItemSyncJdbcTemplate : jdbcTemplate; return tpl.queryForList( return cusItemSyncJdbcTemplate.queryForList( "SELECT item_no, item_spec, unit_no FROM cus_item_sync_view LIMIT " + n); } @@ -58,11 +55,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 (cusItemSyncJdbcTemplate == 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 cusItemSyncJdbcTemplate.queryForList(sql, codes.toArray()); } } rsf-server/src/main/java/com/vincent/rsf/server/system/service/impl/ConfigServiceImpl.java
@@ -12,6 +12,7 @@ import com.vincent.rsf.server.system.enums.StatusType; import com.vincent.rsf.server.system.mapper.ConfigMapper; import com.vincent.rsf.server.system.service.ConfigService; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; import javax.annotation.PostConstruct; @@ -24,15 +25,21 @@ * Created by vincent on 8/30/2024 */ @Service("configService") @Slf4j public class ConfigServiceImpl extends ServiceImpl<ConfigMapper, Config> implements ConfigService { public static final Map<String, Config> CONFIG_CACHE = new ConcurrentHashMap<>(); @PostConstruct public void init() { List<Config> list = this.list(new LambdaQueryWrapper<Config>().eq(Config::getStatus, StatusType.ENABLE.val)); for (Config config : list) { CONFIG_CACHE.put(config.getFlag(), config); try { // List<Config> list = this.list(new LambdaQueryWrapper<Config>().eq(Config::getStatus, StatusType.ENABLE.val)); List<Config> list = safeList(new LambdaQueryWrapper<Config>().eq(Config::getStatus, StatusType.ENABLE.val)); for (Config config : list) { CONFIG_CACHE.put(config.getFlag(), config); } } catch (Exception e) { log.warn("配置缓存初始化失败,跳过配置表加载,后续按默认流程处理", e); } } @@ -41,7 +48,8 @@ public <T> T getVal(String key, Class<T> clazz) { Config config = CONFIG_CACHE.get(key); if (config == null) { List<Config> list = this.list(new LambdaQueryWrapper<Config>().eq(Config::getFlag, key)); // List<Config> list = this.list(new LambdaQueryWrapper<Config>().eq(Config::getFlag, key)); List<Config> list = safeList(new LambdaQueryWrapper<Config>().eq(Config::getFlag, key)); config = list.stream().findFirst().orElse(null); if (null == config) { return null; @@ -80,7 +88,8 @@ public <T> boolean setVal(String key, T val) { Config config = CONFIG_CACHE.get(key); if (config == null) { List<Config> list = this.list(new LambdaQueryWrapper<Config>().eq(Config::getFlag, key)); // List<Config> list = this.list(new LambdaQueryWrapper<Config>().eq(Config::getFlag, key)); List<Config> list = safeList(new LambdaQueryWrapper<Config>().eq(Config::getFlag, key)); config = list.stream().findFirst().orElse(null); if (null == config) { return false; @@ -124,6 +133,15 @@ return this.updateById(config); } private List<Config> safeList(LambdaQueryWrapper<Config> wrapper) { try { return this.list(wrapper); } catch (Exception e) { log.warn("配置查询失败,跳过配置表读取,按默认流程处理", e); return java.util.Collections.emptyList(); } } /** * 修改配置 * @param config