[update] 优化feign接口

signal-feign-service/src/main/java/net/wanji/feign/config/FeignClientsConfig.java

 package net.wanji.feign.config;
 
+import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.cloud.openfeign.EnableFeignClients;
 import org.springframework.context.annotation.Bean;
@@ -11,12 +12,13 @@ import org.springframework.context.annotation.Configuration;
  */
 @Configuration(value = "FeignClientsConfig")
 @EnableFeignClients(basePackages = "net.wanji.feign")
+@Slf4j
 public class FeignClientsConfig {
 
     @Value("${utc.service.url}")
     private String url;
     @Bean
     public void testUrl() {
-        System.err.println("===========feign url:" + url);
+        log.info("===========feign config url utc:" + url);
     }
 }

signal-feign-service/src/main/java/net/wanji/feign/config/FeignDTClientsConfig.java

+package net.wanji.feign.config;
+
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.cloud.openfeign.EnableFeignClients;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+
+/**
+ * @author duanruiming
+ * @date 2023/05/19 9:41
+ */
+@Configuration(value = "FeignDTClientsConfig")
+@EnableFeignClients(basePackages = "net.wanji.feign")
+@Slf4j
+public class FeignDTClientsConfig {
+
+    @Value("${utc.dt.service.url}")
+    private String url;
+    @Bean
+    public void testUrl() {
+        log.info("===========feign config url dt :" + url);
+    }
+}

signal-feign-service/src/main/java/net/wanji/feign/service/UtcDTFeignClients.java

+package net.wanji.feign.service;
+
+import net.wanji.feign.config.FeignDTClientsConfig;
+import net.wanji.feign.service.common.UtcFeignCommon;
+import org.springframework.cloud.openfeign.FeignClient;
+
+/**
+ * @author duanruiming
+ * @date 2023/05/19 9:05
+ */
+@FeignClient(name = "UtcDTFeignClients", url = "${utc.dt.service.url}", configuration = FeignDTClientsConfig.class)
+public interface UtcDTFeignClients extends UtcFeignCommon {
+}

signal-feign-service/src/main/java/net/wanji/feign/service/UtcFeignClients.java

 package net.wanji.feign.service;
 
-import net.wanji.common.framework.rest.JsonViewObject;
-import net.wanji.databus.vo.*;
+import net.wanji.feign.config.FeignClientsConfig;
+import net.wanji.feign.service.common.UtcFeignCommon;
 import org.springframework.cloud.openfeign.FeignClient;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestParam;
 
 /**
  * @author duanruiming
  * @date 2023/01/09 15:29
  */
-@FeignClient(name = "UtcFeignClients", url = "${utc.service.url}")
-public interface UtcFeignClients {
-
-    @PostMapping("/signalStatus/runningStatusAlarm")
-    JsonViewObject runningStatusAlarm();
-
-    @PostMapping("/controlCommand/schemeSend")
-    JsonViewObject schemeSend(@RequestBody SchemeSendVO schemeSendVO);
-
-    @PostMapping("/controlCommand/planSend")
-    JsonViewObject planSend(@RequestBody PlanSendVO planSendVO);
-
-    @PostMapping("/controlCommand/scheduleSend")
-    JsonViewObject scheduleSend(@RequestBody ScheduleSendVO scheduleSendVO);
-
-    @PostMapping("/controlCommand/phaseTimingSend")
-    JsonViewObject phaseTimingSend(@RequestBody PhaseTimingSendVO phaseTimingSendVO);
-
-    @PostMapping("/controlCommand/allRedControl")
-    JsonViewObject allRedControl(@RequestBody ControlCommandVO commandVO);
-
-    @PostMapping("/controlCommand/yellowLightControl")
-    JsonViewObject yellowLightControl(@RequestBody ControlCommandVO commandVO);
-
-    @PostMapping("/controlCommand/closeLightControl")
-    JsonViewObject closeLightControl(@RequestBody ControlCommandVO commandVO);
-
-    @PostMapping("/controlCommand/stepControl")
-    JsonViewObject stepControl(@RequestParam String crossCode, @RequestParam Integer command, @RequestParam int stepNum);
-
-    @PostMapping("/controlCommand/recoverSchedule")
-    JsonViewObject recoverSchedule(@RequestParam String crossCode);
-
-    @PostMapping("/controlCommand/lockControl")
-    JsonViewObject lockControl(@RequestBody LockControlVO lockControlVO);
-
-    @PostMapping("/controlCommand/phaseDiffSend")
-    JsonViewObject phaseDiffSend();
-
-    @PostMapping("/controlCommand/delBaseConfig")
-    JsonViewObject delBaseConfig(DelBaseConfigVO delBaseConfigVO);
-
-    /**
-     * 方案数据-方案信息、相位信息、灯组信息
-     */
-    @PostMapping("/staticInfo/schemePhaseLights")
-    JsonViewObject schemePhaseLights(@RequestBody CrossIdVO crossIdVO);
-
-    @PostMapping("/manufacturer/list")
-    JsonViewObject listManufacturerInfo(ManufacturerVO manufacturerPO);
-
-    @PostMapping("/crossInfo/list")
-    JsonViewObject listCrossInfo(CrossInfoPageVO crossInfoPageVO);
+@FeignClient(name = "UtcFeignClients", url = "${utc.service.url}", configuration = FeignClientsConfig.class)
+public interface UtcFeignClients extends UtcFeignCommon {
 }

signal-feign-service/src/main/java/net/wanji/feign/service/common/UtcFeignCommon.java

+package net.wanji.feign.service.common;
+
+import net.wanji.common.framework.rest.JsonViewObject;
+import net.wanji.databus.vo.*;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestParam;
+
+/**
+ * @author duanruiming
+ * @date 2023/05/19 15:48
+ */
+public interface UtcFeignCommon {
+
+    @PostMapping("/signalStatus/runningStatusAlarm")
+    JsonViewObject runningStatusAlarm() ;
+
+    @PostMapping("/controlCommand/schemeSend")
+    JsonViewObject schemeSend(@RequestBody SchemeSendVO schemeSendVO);
+
+    @PostMapping("/controlCommand/planSend")
+    JsonViewObject planSend(@RequestBody PlanSendVO planSendVO);
+
+    @PostMapping("/controlCommand/scheduleSend")
+    JsonViewObject scheduleSend(@RequestBody ScheduleSendVO scheduleSendVO);
+
+    @PostMapping("/controlCommand/phaseTimingSend")
+    JsonViewObject phaseTimingSend(@RequestBody PhaseTimingSendVO phaseTimingSendVO);
+
+    @PostMapping("/controlCommand/allRedControl")
+    JsonViewObject allRedControl(@RequestBody ControlCommandVO commandVO);
+
+    @PostMapping("/controlCommand/yellowLightControl")
+    JsonViewObject yellowLightControl(@RequestBody ControlCommandVO commandVO);
+
+    @PostMapping("/controlCommand/closeLightControl")
+    JsonViewObject closeLightControl(@RequestBody ControlCommandVO commandVO);
+
+    @PostMapping("/controlCommand/stepControl")
+    JsonViewObject stepControl(@RequestParam String crossCode, @RequestParam Integer command, @RequestParam int stepNum);
+
+    @PostMapping("/controlCommand/recoverSchedule")
+    JsonViewObject recoverSchedule(@RequestParam String crossCode);
+
+    @PostMapping("/controlCommand/lockControl")
+    JsonViewObject lockControl(@RequestBody LockControlVO lockControlVO);
+
+    @PostMapping("/controlCommand/phaseDiffSend")
+    JsonViewObject phaseDiffSend();
+
+    @PostMapping("/controlCommand/delBaseConfig")
+    JsonViewObject delBaseConfig(DelBaseConfigVO delBaseConfigVO);
+
+    /**
+     * 方案数据-方案信息、相位信息、灯组信息
+     */
+    @PostMapping("/staticInfo/schemePhaseLights")
+    JsonViewObject schemePhaseLights(@RequestBody CrossIdVO crossIdVO);
+
+    @PostMapping("/manufacturer/list")
+    JsonViewObject listManufacturerInfo(ManufacturerVO manufacturerPO);
+
+    @PostMapping("/crossInfo/list")
+    JsonViewObject listCrossInfo(CrossInfoPageVO crossInfoPageVO);
+}

signal-feign-service/src/main/resources/META-INF/spring.factories

 org.springframework.boot.autoconfigure.EnableAutoConfiguration=\
-net.wanji.feign.config.FeignClientsConfig
\ No newline at end of file
+net.wanji.feign.config.FeignDTClientsConfig,\
+net.wanji.feign.config.FeignClientsConfig

signal-feign-service/src/main/resources/application-dev.properties

-utc.service.url=http://10.102.1.182:32000/utc
\ No newline at end of file
+utc.service.url=http://10.102.1.182:32000/utc
+utc.dt.service.url=http://10.102.1.182:39002/utc-dt
\ No newline at end of file

signal-feign-service/src/main/resources/application-local.properties

-utc.service.url=http://localhost:32000/utc
\ No newline at end of file
+utc.service.url=http://localhost:32000/utc
+utc.dt.service.url=http://localhost:39002/utc-dt
\ No newline at end of file