Merge branch 'scenic-microservice'

# Conflicts:
#	src/main/java/com/ycwl/basic/integration/scenic/service/ScenicConfigIntegrationService.java
#	src/main/java/com/ycwl/basic/repository/ScenicRepository.java
This commit is contained in:
2025-09-09 14:04:43 +08:00
2 changed files with 25 additions and 13 deletions

View File

@@ -24,14 +24,28 @@ public class ScenicConfigIntegrationService {
public List<ScenicConfigV2DTO> listConfigs(Long scenicId) {
log.debug("获取景区配置列表, scenicId: {}", scenicId);
CommonResponse<List<ScenicConfigV2DTO>> response = scenicConfigV2Client.listConfigs(scenicId);
return handleResponse(response, "获取景区配置列表失败");
return fallbackService.executeWithFallback(
SERVICE_NAME,
"scenic:configs:" + scenicId,
() -> {
CommonResponse<List<ScenicConfigV2DTO>> response = scenicConfigV2Client.listConfigs(scenicId);
return handleResponse(response, "获取景区配置列表失败");
},
List.class
);
}
public ScenicConfigV2DTO getConfigByKey(Long scenicId, String configKey) {
log.debug("根据键获取景区配置, scenicId: {}, configKey: {}", scenicId, configKey);
CommonResponse<ScenicConfigV2DTO> response = scenicConfigV2Client.getConfigByKey(scenicId, configKey);
return handleResponse(response, "根据键获取景区配置失败");
return fallbackService.executeWithFallback(
SERVICE_NAME,
"scenic:config:" + scenicId + ":" + configKey,
() -> {
CommonResponse<ScenicConfigV2DTO> response = scenicConfigV2Client.getConfigByKey(scenicId, configKey);
return handleResponse(response, "根据键获取景区配置失败");
},
ScenicConfigV2DTO.class
);
}
public Map<String, Object> getFlatConfigs(Long scenicId) {