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

src/main/java/com/ycwl/basic/integration/scenic/service/ScenicConfigIntegrationService.java

@@ -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 fallbackService.executeWithFallback(
-        return handleResponse(response, "获取景区配置列表失败");
+            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 fallbackService.executeWithFallback(
-        return handleResponse(response, "根据键获取景区配置失败");
+            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) {

src/main/java/com/ycwl/basic/repository/ScenicRepository.java

@@ -24,10 +24,11 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.redis.core.RedisTemplate;
 import org.springframework.stereotype.Component;
 
+import java.util.Collections;
 import java.util.List;
 import java.util.Map;
 import java.util.HashMap;
-import java.util.stream.Collectors;
+import java.util.Objects;
 
 @Component
 public class ScenicRepository {
@@ -335,10 +336,7 @@ public class ScenicRepository {
     public ScenicConfigManager getScenicConfigManager(Long scenicId) {
         try {
             List<ScenicConfigV2DTO> configList = scenicConfigIntegrationService.listConfigs(scenicId);
-            if (configList != null) {
+            return new ScenicConfigManager(Objects.requireNonNullElse(configList, Collections.emptyList()));
-                return new ScenicConfigManager(configList);
-            }
-            return null;
         } catch (Exception e) {
             return null;
         }