海信-适配系统 步进控制优化

signal-control-service/pom.xml

@@ -40,25 +40,25 @@
             <groupId>org.springframework.cloud</groupId>
             <artifactId>spring-cloud-starter-oauth2</artifactId>
         </dependency>
-<!--        <dependency>-->
-<!--            <groupId>com.wanji</groupId>-->
-<!--            <artifactId>identity-client-starter</artifactId>-->
-<!--            <version>1.2</version>-->
-<!--            <exclusions>-->
-<!--                <exclusion>-->
-<!--                    <artifactId>springfox-spring-web</artifactId>-->
-<!--                    <groupId>io.springfox</groupId>-->
-<!--                </exclusion>-->
-<!--                <exclusion>-->
-<!--                    <artifactId>swagger-annotations</artifactId>-->
-<!--                    <groupId>io.swagger</groupId>-->
-<!--                </exclusion>-->
-<!--                <exclusion>-->
-<!--                    <artifactId>springfox-core</artifactId>-->
-<!--                    <groupId>io.springfox</groupId>-->
-<!--                </exclusion>-->
-<!--            </exclusions>-->
-<!--        </dependency>-->
+        <dependency>
+            <groupId>com.wanji</groupId>
+            <artifactId>identity-client-starter</artifactId>
+            <version>1.2</version>
+            <exclusions>
+                <exclusion>
+                    <artifactId>springfox-spring-web</artifactId>
+                    <groupId>io.springfox</groupId>
+                </exclusion>
+                <exclusion>
+                    <artifactId>swagger-annotations</artifactId>
+                    <groupId>io.swagger</groupId>
+                </exclusion>
+                <exclusion>
+                    <artifactId>springfox-core</artifactId>
+                    <groupId>io.springfox</groupId>
+                </exclusion>
+            </exclusions>
+        </dependency>
         <!-- 鉴权包 end -->
         <dependency>
             <groupId>io.swagger</groupId>

signal-control-service/src/main/resources/bootstrap-docker.yaml

@@ -5,7 +5,7 @@ spring:
   cloud:
     nacos:
       config:
-        server-addr: 173.17.0.1:8848
+        server-addr: 37.12.182.29:8848
         file-extension: yaml
         group: signal
         namespace: signal

signal-control-service/src/main/resources/bootstrap.yaml

 spring:
   profiles:
-    active: dev
+    active: docker
\ No newline at end of file

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

-utc.service.url=http://173.17.0.1:32000/utc
+utc.service.url=http://192.168.150.1:32000/utc
 utc.dt.service.url=http://173.17.0.1:39002/utc-dt
 utc.hisense.service.url=http://192.168.150.1:39003/utc-hisense
 control.url=http://173.17.0.1:32001/web

signal-utc-hisense-service/src/main/java/net/wanji/utc/hisense/service/impl/ControlCommandServiceImpl.java

@@ -77,6 +77,8 @@ public class ControlCommandServiceImpl implements ControlCommandService {
         JsonViewObject jsonViewObject = JsonViewObject.newInstance();
         //给海信发送http请求
         for (int i = 0; i < stepNum; i++) {
+            //步进需要下发两次命令
+            OkHttpClientUtil.xmlPost(hisenseUrl, document.asXML());
             String post = OkHttpClientUtil.xmlPost(hisenseUrl, document.asXML());
             if (StringUtils.isNotBlank(post)) {
                 Document postResult = DocumentHelper.parseText(post);

signal-utc-hisense-service/src/main/resources/bootstrap.yaml

 spring:
   profiles:
-    active: dev
+    active: docker
\ No newline at end of file

signal-utc-service/src/main/resources/bootstrap.yaml

 spring:
   profiles:
-    active: dev
+    active: docker
\ No newline at end of file