You've already forked FrameTour-BE
refactor(integration): 重构设备和服务配置
- 修改 DefaultConfigIntegrationService 类名以更准确地反映其功能 - 移除不必要的导入和注解 - 统一命名规范 # Conflicts: # src/main/java/com/ycwl/basic/integration/questionnaire/config/QuestionnaireIntegrationConfig.java
This commit is contained in:
@@ -1,7 +1,7 @@
|
|||||||
package com.ycwl.basic.controller.pc;
|
package com.ycwl.basic.controller.pc;
|
||||||
|
|
||||||
import com.ycwl.basic.integration.scenic.dto.config.DefaultConfigDTO;
|
import com.ycwl.basic.integration.scenic.dto.config.DefaultConfigDTO;
|
||||||
import com.ycwl.basic.integration.scenic.service.DefaultConfigIntegrationService;
|
import com.ycwl.basic.integration.scenic.service.ScenicDefaultConfigIntegrationService;
|
||||||
import com.ycwl.basic.utils.ApiConst;
|
import com.ycwl.basic.utils.ApiConst;
|
||||||
import com.ycwl.basic.utils.ApiResponse;
|
import com.ycwl.basic.utils.ApiResponse;
|
||||||
import lombok.RequiredArgsConstructor;
|
import lombok.RequiredArgsConstructor;
|
||||||
@@ -20,7 +20,7 @@ import java.util.List;
|
|||||||
@RequiredArgsConstructor
|
@RequiredArgsConstructor
|
||||||
public class DefaultConfigController {
|
public class DefaultConfigController {
|
||||||
|
|
||||||
private final DefaultConfigIntegrationService defaultConfigIntegrationService;
|
private final ScenicDefaultConfigIntegrationService scenicDefaultConfigIntegrationService;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 获取默认配置列表
|
* 获取默认配置列表
|
||||||
@@ -29,7 +29,7 @@ public class DefaultConfigController {
|
|||||||
public ApiResponse<List<DefaultConfigDTO>> listDefaultConfigs() {
|
public ApiResponse<List<DefaultConfigDTO>> listDefaultConfigs() {
|
||||||
log.info("获取默认配置列表");
|
log.info("获取默认配置列表");
|
||||||
try {
|
try {
|
||||||
List<DefaultConfigDTO> configs = defaultConfigIntegrationService.listDefaultConfigs();
|
List<DefaultConfigDTO> configs = scenicDefaultConfigIntegrationService.listDefaultConfigs();
|
||||||
return ApiResponse.success(configs);
|
return ApiResponse.success(configs);
|
||||||
} catch (Exception e) {
|
} catch (Exception e) {
|
||||||
log.error("获取默认配置列表失败", e);
|
log.error("获取默认配置列表失败", e);
|
||||||
@@ -44,7 +44,7 @@ public class DefaultConfigController {
|
|||||||
public ApiResponse<DefaultConfigDTO> getDefaultConfig(@PathVariable String configKey) {
|
public ApiResponse<DefaultConfigDTO> getDefaultConfig(@PathVariable String configKey) {
|
||||||
log.info("获取默认配置, configKey: {}", configKey);
|
log.info("获取默认配置, configKey: {}", configKey);
|
||||||
try {
|
try {
|
||||||
DefaultConfigDTO config = defaultConfigIntegrationService.getDefaultConfig(configKey);
|
DefaultConfigDTO config = scenicDefaultConfigIntegrationService.getDefaultConfig(configKey);
|
||||||
return ApiResponse.success(config);
|
return ApiResponse.success(config);
|
||||||
} catch (Exception e) {
|
} catch (Exception e) {
|
||||||
log.error("获取默认配置失败, configKey: {}", configKey, e);
|
log.error("获取默认配置失败, configKey: {}", configKey, e);
|
||||||
@@ -59,7 +59,7 @@ public class DefaultConfigController {
|
|||||||
public ApiResponse<DefaultConfigDTO> createDefaultConfig(@RequestBody DefaultConfigDTO request) {
|
public ApiResponse<DefaultConfigDTO> createDefaultConfig(@RequestBody DefaultConfigDTO request) {
|
||||||
log.info("创建默认配置, configKey: {}", request.getConfigKey());
|
log.info("创建默认配置, configKey: {}", request.getConfigKey());
|
||||||
try {
|
try {
|
||||||
DefaultConfigDTO config = defaultConfigIntegrationService.createDefaultConfig(request);
|
DefaultConfigDTO config = scenicDefaultConfigIntegrationService.createDefaultConfig(request);
|
||||||
return ApiResponse.success(config);
|
return ApiResponse.success(config);
|
||||||
} catch (Exception e) {
|
} catch (Exception e) {
|
||||||
log.error("创建默认配置失败, configKey: {}", request.getConfigKey(), e);
|
log.error("创建默认配置失败, configKey: {}", request.getConfigKey(), e);
|
||||||
@@ -75,7 +75,7 @@ public class DefaultConfigController {
|
|||||||
@RequestBody DefaultConfigDTO request) {
|
@RequestBody DefaultConfigDTO request) {
|
||||||
log.info("更新默认配置, configKey: {}", configKey);
|
log.info("更新默认配置, configKey: {}", configKey);
|
||||||
try {
|
try {
|
||||||
DefaultConfigDTO config = defaultConfigIntegrationService.updateDefaultConfig(configKey, request);
|
DefaultConfigDTO config = scenicDefaultConfigIntegrationService.updateDefaultConfig(configKey, request);
|
||||||
return ApiResponse.success(config);
|
return ApiResponse.success(config);
|
||||||
} catch (Exception e) {
|
} catch (Exception e) {
|
||||||
log.error("更新默认配置失败, configKey: {}", configKey, e);
|
log.error("更新默认配置失败, configKey: {}", configKey, e);
|
||||||
@@ -90,7 +90,7 @@ public class DefaultConfigController {
|
|||||||
public ApiResponse<Void> deleteDefaultConfig(@PathVariable String configKey) {
|
public ApiResponse<Void> deleteDefaultConfig(@PathVariable String configKey) {
|
||||||
log.info("删除默认配置, configKey: {}", configKey);
|
log.info("删除默认配置, configKey: {}", configKey);
|
||||||
try {
|
try {
|
||||||
defaultConfigIntegrationService.deleteDefaultConfig(configKey);
|
scenicDefaultConfigIntegrationService.deleteDefaultConfig(configKey);
|
||||||
return ApiResponse.buildResponse(ApiConst.Code.CODE_SUCCESS.code(), null, "删除成功");
|
return ApiResponse.buildResponse(ApiConst.Code.CODE_SUCCESS.code(), null, "删除成功");
|
||||||
} catch (Exception e) {
|
} catch (Exception e) {
|
||||||
log.error("删除默认配置失败, configKey: {}", configKey, e);
|
log.error("删除默认配置失败, configKey: {}", configKey, e);
|
||||||
|
@@ -2,7 +2,7 @@ package com.ycwl.basic.integration.device.example;
|
|||||||
|
|
||||||
import com.ycwl.basic.integration.common.response.PageResponse;
|
import com.ycwl.basic.integration.common.response.PageResponse;
|
||||||
import com.ycwl.basic.integration.device.dto.defaults.*;
|
import com.ycwl.basic.integration.device.dto.defaults.*;
|
||||||
import com.ycwl.basic.integration.device.service.DefaultConfigIntegrationService;
|
import com.ycwl.basic.integration.device.service.DeviceDefaultConfigIntegrationService;
|
||||||
import lombok.RequiredArgsConstructor;
|
import lombok.RequiredArgsConstructor;
|
||||||
import lombok.extern.slf4j.Slf4j;
|
import lombok.extern.slf4j.Slf4j;
|
||||||
import org.springframework.boot.CommandLineRunner;
|
import org.springframework.boot.CommandLineRunner;
|
||||||
@@ -23,7 +23,7 @@ import java.util.Map;
|
|||||||
@ConditionalOnProperty(name = "integration.device.example.default-config.enabled", havingValue = "true")
|
@ConditionalOnProperty(name = "integration.device.example.default-config.enabled", havingValue = "true")
|
||||||
public class DefaultConfigIntegrationExample implements CommandLineRunner {
|
public class DefaultConfigIntegrationExample implements CommandLineRunner {
|
||||||
|
|
||||||
private final DefaultConfigIntegrationService defaultConfigService;
|
private final DeviceDefaultConfigIntegrationService defaultConfigService;
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void run(String... args) throws Exception {
|
public void run(String... args) throws Exception {
|
||||||
|
@@ -11,7 +11,6 @@ import lombok.extern.slf4j.Slf4j;
|
|||||||
import org.springframework.stereotype.Service;
|
import org.springframework.stereotype.Service;
|
||||||
|
|
||||||
import java.util.ArrayList;
|
import java.util.ArrayList;
|
||||||
import java.util.HashMap;
|
|
||||||
import java.util.Map;
|
import java.util.Map;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@@ -20,7 +19,7 @@ import java.util.Map;
|
|||||||
@Slf4j
|
@Slf4j
|
||||||
@Service
|
@Service
|
||||||
@RequiredArgsConstructor
|
@RequiredArgsConstructor
|
||||||
public class DefaultConfigIntegrationService {
|
public class DeviceDefaultConfigIntegrationService {
|
||||||
|
|
||||||
private final DefaultConfigClient defaultConfigClient;
|
private final DefaultConfigClient defaultConfigClient;
|
||||||
private final IntegrationFallbackService fallbackService;
|
private final IntegrationFallbackService fallbackService;
|
@@ -3,7 +3,6 @@ package com.ycwl.basic.integration.render.config;
|
|||||||
import com.ycwl.basic.integration.common.config.IntegrationProperties;
|
import com.ycwl.basic.integration.common.config.IntegrationProperties;
|
||||||
import lombok.RequiredArgsConstructor;
|
import lombok.RequiredArgsConstructor;
|
||||||
import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
|
import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
|
||||||
import org.springframework.cloud.openfeign.EnableFeignClients;
|
|
||||||
import org.springframework.context.annotation.Configuration;
|
import org.springframework.context.annotation.Configuration;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@@ -11,7 +10,6 @@ import org.springframework.context.annotation.Configuration;
|
|||||||
*/
|
*/
|
||||||
@Configuration
|
@Configuration
|
||||||
@ConditionalOnProperty(prefix = "integration.render", name = "enabled", havingValue = "true", matchIfMissing = true)
|
@ConditionalOnProperty(prefix = "integration.render", name = "enabled", havingValue = "true", matchIfMissing = true)
|
||||||
@EnableFeignClients(basePackages = "com.ycwl.basic.integration.render.client")
|
|
||||||
@RequiredArgsConstructor
|
@RequiredArgsConstructor
|
||||||
public class RenderWorkerIntegrationConfig {
|
public class RenderWorkerIntegrationConfig {
|
||||||
|
|
||||||
|
@@ -13,7 +13,7 @@ import java.util.List;
|
|||||||
@Slf4j
|
@Slf4j
|
||||||
@Service
|
@Service
|
||||||
@RequiredArgsConstructor
|
@RequiredArgsConstructor
|
||||||
public class DefaultConfigIntegrationService {
|
public class ScenicDefaultConfigIntegrationService {
|
||||||
|
|
||||||
private final DefaultConfigClient defaultConfigClient;
|
private final DefaultConfigClient defaultConfigClient;
|
||||||
|
|
Reference in New Issue
Block a user