新增海信-获取当前方案接口

引用dom4j

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-feign-service/src/main/java/net/wanji/feign/service/UtcHisenseFeignClients.java

 package net.wanji.feign.service;
 
+import net.wanji.common.framework.rest.JsonViewObject;
 import net.wanji.feign.config.FeignHisenseClientsConfig;
 import net.wanji.feign.service.common.FeignCommon;
 import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestParam;
 
 /**
  * @author duanruiming
@@ -11,4 +14,11 @@ import org.springframework.cloud.openfeign.FeignClient;
 @FeignClient(name = "UtcHisenseFeignClients", url = "${utc.hisense.service.url}",
         configuration = FeignHisenseClientsConfig.class)
 public interface UtcHisenseFeignClients extends FeignCommon {
+    /**
+     * 海信-获取方案号
+     *
+     * @return
+     */
+    @PostMapping("/staticInfo/crossSchemeNo")
+    JsonViewObject getSchemeNo(@RequestParam String crossId);
 }

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

@@ -115,4 +115,6 @@ public interface FeignCommon {
 
     @PostMapping("/control/findPlanId")
     Integer findPlanId(@RequestParam Date datetime, @RequestParam String dateStr, @RequestParam String crossId);
+
+
 }

signal-utc-hisense-service/pom.xml

@@ -13,9 +13,33 @@
         <java.version>1.8</java.version>
         <mybatis.generator.version>1.3.2</mybatis.generator.version>
         <mysql.connector.version>5.1.41</mysql.connector.version>
+        <dom4j.version>1.6.1</dom4j.version>
+        <xstream.version>1.4.11.1</xstream.version>
+        <jaxen.version>1.1.6</jaxen.version>
     </properties>
 
     <dependencies>
+        <dependency>
+            <groupId>com.squareup.okhttp3</groupId>
+            <artifactId>okhttp</artifactId>
+            <version>4.9.3</version>
+        </dependency>
+        <dependency>
+            <groupId>dom4j</groupId>
+            <artifactId>dom4j</artifactId>
+            <version>${dom4j.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>jaxen</groupId>
+            <artifactId>jaxen</artifactId>
+            <version>${jaxen.version}</version>
+        </dependency>
+        <!-- https://mvnrepository.com/artifact/com.thoughtworks.xstream/xstream 支持xml转bean -->
+        <dependency>
+            <groupId>com.thoughtworks.xstream</groupId>
+            <artifactId>xstream</artifactId>
+            <version>${xstream.version}</version>
+        </dependency>
         <dependency>
             <groupId>net.wanji</groupId>
             <artifactId>signal-feign-service</artifactId>

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

@@ -34,6 +34,6 @@ public class HisenseApplication implements CommandLineRunner {
     public void run(String... args) throws Exception {
         //UdpClient.connection(localPort, remoteProt);
         //TcpClient.connection(remoteIp, remoteProt);
-        TcpClient.connection("127.0.0.1", remoteProt);
+//        TcpClient.connection("127.0.0.1", remoteProt);
     }
 }

signal-utc-hisense-service/src/main/java/net/wanji/utc/hisense/common/OperationBaseDom.java

+package net.wanji.utc.hisense.common;
+
+import net.wanji.common.utils.tool.LocalDateTimeUtil;
+import net.wanji.common.utils.tool.RandomUtil;
+import net.wanji.utc.hisense.common.constants.HttpConstants;
+import org.dom4j.Document;
+import org.dom4j.DocumentException;
+import org.dom4j.DocumentHelper;
+import org.dom4j.Element;
+
+
+/**
+ * @author zhouleilei
+ * @version 1.0
+ * @date 2024/11/3 12:46
+ */
+public class OperationBaseDom {
+
+    private OperationBaseDom() {
+    }
+
+    /**
+     * 产生一个基本操作dom
+     *
+     * @return
+     */
+    public static Document generateBaseDoc() {
+        Document document = DocumentHelper.createDocument();
+        Element message = document.addElement("systemScription")
+                .addAttribute("System", "TCIP")
+                .addAttribute("Version", "1.0");
+        message.addElement("subSystem").setText("Hisense");
+        message.addElement("isRequest").setText("1");
+        message.addElement("seq").setText(LocalDateTimeUtil.formatNow(LocalDateTimeUtil.SIMPLE) + RandomUtil.generateFromSource(6, RandomUtil.NUMBER_SOURCE));
+        message.addElement("needResponse").setText("1");
+        message.addElement("result").setText("0");
+        message.addElement("flag").setText("0");
+        message.addElement("messageContent");
+        return document;
+    }
+
+    public static void main(String[] args) throws DocumentException {
+        Document document = OperationBaseDom.generateBaseDoc();
+        Element element = (Element) document.selectSingleNode("/systemScription");
+        element.addElement("messageType").setText("12");
+        Element messageContent = (Element) document.selectSingleNode("/systemScription/messageContent");
+        messageContent.addElement("Spot").setText("101");
+        System.out.println(document.asXML());
+
+        String post = "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n" +
+                "<systemScription  System=\"TCIP\" Version=\"1.0\">\n" +
+                "    <subSystem>Hisense</subSystem>\n" +
+                "    <messageType>12</messageType>\n" +
+                "    <isRequest>0</isRequest>\n" +
+                "    <seq>20241103155205549244</seq>\n" +
+                "    <needResponse>1</needResponse>\n" +
+                "    <result>1</result>\n" +
+                "    <flag>0</flag>\n" +
+                "    <tStamp>1730623180670</tStamp>\n" +
+                "    <messageContent>\n" +
+                "        <Spot>882530</Spot>\n" +
+                "        <CoordPatternStatus>58</CoordPatternStatus>\n" +
+                "        <CoordCycleStatus>200</CoordCycleStatus>\n" +
+                "        <CoordSyncStatus>41</CoordSyncStatus>\n" +
+                "    </messageContent>\n" +
+                "</systemScription>";
+        Document postResult = DocumentHelper.parseText(post);
+        String result = postResult.selectSingleNode(HttpConstants.SYSTEMSCRIPTION_RESULT).getText();
+        if (HttpConstants.RESULT_1.equals(result)){
+            //成功
+            String spot = postResult.selectSingleNode(HttpConstants.SYSTEMSCRIPTION_MESSAGECONTENT).valueOf("Spot");
+            System.out.println(spot);
+        }else {
+            //失败
+        }
+
+    }
+
+
+}

signal-utc-hisense-service/src/main/java/net/wanji/utc/hisense/common/constants/HttpConstants.java

+package net.wanji.utc.hisense.common.constants;
+
+/**
+ * @ClassName HttpConstants
+ * @Description 海信Http请求需要的常量
+ * @Author zhouleilei
+ * @Date 2024/11/3 16:47
+ */
+public class HttpConstants {
+    //MESSAGETYPE
+    public static final String MESSAGETYPE = "messageType";
+    // /systemScription
+    public static final String SYSTEMSCRIPTION = "/systemScription";
+    //  systemScription/messageContent
+    public static final String SYSTEMSCRIPTION_MESSAGECONTENT = "/systemScription/messageContent";
+    //  /systemScription/result
+    public static final String SYSTEMSCRIPTION_RESULT = "/systemScription/result";
+    //Spot
+    public static final String SPOT = "Spot";
+    //5.7协调状态 获取方案号
+    public static final String MESSAGETYPE_12 = "12";
+    // result = 0 失败
+    public static final String RESULT_0 = "0";
+    // result = 1 成功
+    public static final String RESULT_1 = "1";
+
+
+}

signal-utc-hisense-service/src/main/java/net/wanji/utc/hisense/config/Swagger2.java

@@ -21,7 +21,7 @@ public class Swagger2 {
                 .apiInfo(apiInfo())
                 .select()
                 //为当前包路径
-                .apis(RequestHandlerSelectors.basePackage("net.wanji.utc.hisense.controller"))
+                .apis(RequestHandlerSelectors.basePackage("net.wanji.utc.hisense.controller.*"))
                 .paths(PathSelectors.any())
                 .build();
     }

signal-utc-hisense-service/src/main/java/net/wanji/utc/hisense/controller/StaticInfoController.java

@@ -5,7 +5,6 @@ import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiResponse;
 import io.swagger.annotations.ApiResponses;
 import lombok.RequiredArgsConstructor;
-import net.wanji.utc.hisense.service.StaticInfoService;
 import net.wanji.common.annotation.aspect.AspectLog;
 import net.wanji.common.enums.BaseEnum;
 import net.wanji.common.framework.rest.JsonViewObject;
@@ -15,12 +14,13 @@ import net.wanji.databus.dto.PlanSectionDTO;
 import net.wanji.databus.dto.SchemePhaseLightsDTO;
 import net.wanji.databus.vo.PlanSectionVO;
 import net.wanji.databus.vo.SchemePhaseLightsVO;
+import net.wanji.utc.hisense.pojo.result.CoordinationStatus;
+import net.wanji.utc.hisense.service.StaticInfoService;
+import org.apache.commons.lang3.ObjectUtils;
 import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 
+import javax.validation.constraints.NotNull;
 import javax.ws.rs.core.MediaType;
 import java.util.List;
 
@@ -76,4 +76,21 @@ public class StaticInfoController {
         List<CrossSchedulesPO> crossSchedulesPOS = staticInfoService.crossSchedules(crossSchedulesDTO);
         return JsonViewObject.newInstance().success(crossSchedulesPOS);
     }
+
+    @AspectLog(description = "5.7协调状态-获取当前方案号", operationType = BaseEnum.OperationTypeEnum.QUERY)
+    @GetMapping(value = "/crossSchemeNo")
+    @ApiOperation(value = "5.7协调状态-获取当前方案号", notes = "协调状态-获取当前方案号", response = CrossSchedulesPO.class,
+            produces = MediaType.APPLICATION_JSON, consumes = MediaType.APPLICATION_JSON)
+    @ApiResponses({
+            @ApiResponse(code = 200, message = "OK", response = CrossSchedulesPO.class)
+    })
+    public JsonViewObject crossPlanId(@NotNull String crossId) throws Exception {
+        CoordinationStatus coordinationStatus = staticInfoService.crossPlan(crossId);
+        if (ObjectUtils.isNotEmpty(coordinationStatus)) {
+            return JsonViewObject.newInstance().success(coordinationStatus);
+        } else {
+            return JsonViewObject.newInstance().fail("获取当前方案号 失败");
+
+        }
+    }
 }

signal-utc-hisense-service/src/main/java/net/wanji/utc/hisense/pojo/result/CoordinationStatus.java

+package net.wanji.utc.hisense.pojo.result;
+
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+/**
+ * @ClassName CoordinationStatus
+ * @Description 5.7. 协调状态
+ * @Author zhouleilei
+ * @Date 2024/11/3 12:31
+ */
+@Data
+@NoArgsConstructor
+@AllArgsConstructor
+@Builder
+public class CoordinationStatus {
+    /**
+     * 控制点编号
+     */
+    private String spot;
+    /**
+     * 当前信号机的运行方案号
+     */
+    private String coordPatternStatus;
+    /**
+     * 当前信号机运行方案的周期长
+     */
+    private String coordCycleStatus;
+    /**
+     * 当前信号机运行方案的周期倒计时
+     */
+    private String coordSyncStatus;
+}

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

@@ -88,4 +88,10 @@ public interface ControlCommandService {
      * @return
      */
 //    JsonViewObject delBaseConfig(DelBaseConfigPOfigPO delBaseConfigPO) throws Exception;
+
+    /**
+     * 临时方案下发
+     */
+    JsonViewObject tempSchemeSend(SchemeSendVO schemeSendVO) throws Exception;
+
 }

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

@@ -8,6 +8,7 @@ import net.wanji.databus.dto.SchemePhaseLightsDTO;
 import net.wanji.databus.po.CrossInfoPO;
 import net.wanji.databus.vo.PlanSectionVO;
 import net.wanji.databus.vo.SchemePhaseLightsVO;
+import net.wanji.utc.hisense.pojo.result.CoordinationStatus;
 
 import java.util.List;
 
@@ -20,5 +21,10 @@ public interface StaticInfoService {
     List<PlanSectionVO> planSection(PlanSectionDTO planSectionDTO) throws Exception;
 
     List<CrossSchedulesPO> crossSchedules(CrossSchedulesDTO crossSchedulesDTO) throws Exception;
+    /**
+    * @Description : 5.7. 协调状态 - 获取当前方案
+    * @Param crossId  路口编号
+    **/
+    CoordinationStatus crossPlan(String crossId) throws Exception;
 
 }

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

@@ -18,6 +18,8 @@ public class ControlCommandServiceImpl implements ControlCommandService {
 
     @Override
     public JsonViewObject schemeSend(SchemeSendVO schemeSendVO) throws Exception {
+        // 海信方案下发
+        // 下发xml
         return null;
     }
 

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

@@ -2,6 +2,7 @@ package net.wanji.utc.hisense.service.impl;
 
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
+import net.wanji.common.utils.tool.StringUtils;
 import net.wanji.databus.dao.entity.CrossSchedulesPO;
 import net.wanji.databus.dto.CrossInfoDTO;
 import net.wanji.databus.dto.CrossSchedulesDTO;
@@ -10,7 +11,15 @@ import net.wanji.databus.dto.SchemePhaseLightsDTO;
 import net.wanji.databus.po.CrossInfoPO;
 import net.wanji.databus.vo.PlanSectionVO;
 import net.wanji.databus.vo.SchemePhaseLightsVO;
+import net.wanji.utc.hisense.common.OperationBaseDom;
+import net.wanji.utc.hisense.common.constants.HttpConstants;
+import net.wanji.utc.hisense.pojo.result.CoordinationStatus;
 import net.wanji.utc.hisense.service.StaticInfoService;
+import net.wanji.utc.hisense.util.OkHttpClientUtil;
+import org.dom4j.Document;
+import org.dom4j.DocumentHelper;
+import org.dom4j.Element;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
 
 import java.util.List;
@@ -24,6 +33,8 @@ import java.util.List;
 @Slf4j
 public class StaticInfoServiceImpl implements StaticInfoService {
 
+    @Value("${hisense.url}")
+    private String hisenseUrl;
     @Override
     public List<CrossInfoPO> crossBasicInfo(CrossInfoDTO crossInfoDTO) throws Exception {
         return null;
@@ -43,4 +54,43 @@ public class StaticInfoServiceImpl implements StaticInfoService {
     public List<CrossSchedulesPO> crossSchedules(CrossSchedulesDTO crossSchedulesDTO) throws Exception {
         return null;
     }
+
+    @Override
+    public CoordinationStatus crossPlan(String crossId) throws Exception {
+        //组装document
+        Document document = OperationBaseDom.generateBaseDoc();
+        Element element = (Element) document.selectSingleNode(HttpConstants.SYSTEMSCRIPTION);
+        element.addElement(HttpConstants.MESSAGETYPE).setText(HttpConstants.MESSAGETYPE_12);
+        Element messageContent = (Element) document.selectSingleNode(HttpConstants.SYSTEMSCRIPTION_MESSAGECONTENT);
+        messageContent.addElement(HttpConstants.SPOT).setText(crossId);
+
+        //给海信发送http请求
+        String post = OkHttpClientUtil.xmlPost(hisenseUrl, document.asXML());
+        if (StringUtils.isBlank(post)){
+            log.error("请求 5.7. 协调状态 失败");
+            return null;
+        }
+        Document postResult = DocumentHelper.parseText(post);
+        String result = postResult.selectSingleNode(HttpConstants.SYSTEMSCRIPTION_RESULT).getText();
+        if (HttpConstants.RESULT_1.equals(result)){
+            //成功
+            String spot = postResult.selectSingleNode(HttpConstants.SYSTEMSCRIPTION_MESSAGECONTENT).valueOf("Spot");
+            String CoordPatternStatus = postResult.selectSingleNode(HttpConstants.SYSTEMSCRIPTION_MESSAGECONTENT).valueOf("CoordPatternStatus");
+            String CoordCycleStatus = postResult.selectSingleNode(HttpConstants.SYSTEMSCRIPTION_MESSAGECONTENT).valueOf("CoordCycleStatus");
+            String CoordSyncStatus = postResult.selectSingleNode(HttpConstants.SYSTEMSCRIPTION_MESSAGECONTENT).valueOf("CoordSyncStatus");
+            CoordinationStatus coordinationStatus = CoordinationStatus.builder()
+                    .spot(spot)
+                    .coordPatternStatus(CoordPatternStatus)
+                    .coordCycleStatus(CoordCycleStatus)
+                    .coordSyncStatus(CoordSyncStatus)
+                    .build();
+            return coordinationStatus;
+
+        }else {
+            //失败
+            log.error("请求 5.7. 协调状态 失败");
+        }
+
+        return null;
+    }
 }

signal-utc-hisense-service/src/main/java/net/wanji/utc/hisense/util/OkHttpClientUtil.java

+package net.wanji.utc.hisense.util;
+
+
+import net.wanji.common.utils.tool.StringUtils;
+import okhttp3.*;
+
+import java.io.IOException;
+
+/**
+ * @ClassName OkHttpClient
+ * @Description OkHttpClient
+ * @Author zhouleilei
+ * @Date 2024/11/3 18:11
+ */
+public class OkHttpClientUtil {
+
+    public static String xmlPost(String url,String xmlContent){
+        if (StringUtils.isBlank(url) || StringUtils.isBlank(xmlContent)){
+            return null;
+        }
+        // 创建 OkHttpClient 实例
+        OkHttpClient client = new OkHttpClient();
+        // 创建请求体
+        RequestBody body = RequestBody.create(xmlContent, MediaType.get("application/xml; charset=utf-8"));
+        // 创建请求
+        Request request = new Request.Builder()
+                .url(url)
+                .post(body)
+                .build();
+        // 执行请求
+        try (Response response = client.newCall(request).execute()) {
+            // 获取响应体
+            if (response.code() == 200 && response.body() != null) {
+                String responseString = response.body().string();
+                return responseString;
+            }
+        } catch (IOException e) {
+            e.printStackTrace();
+        }
+        return null;
+    }
+
+    public static void main(String[] args) {
+
+        /*String post = "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n" +
+                "<systemScription  System=\"TCIP\" Version=\"1.0\">\n" +
+                "    <subSystem>Hisense</subSystem>\n" +
+                "    <messageType>12</messageType>\n" +
+                "    <isRequest>0</isRequest>\n" +
+                "    <seq>20241103155205549244</seq>\n" +
+                "    <needResponse>1</needResponse>\n" +
+                "    <result>1</result>\n" +
+                "    <flag>0</flag>\n" +
+                "    <tStamp>1730623180670</tStamp>\n" +
+                "    <messageContent>\n" +
+                "        <Spot>882530</Spot>\n" +
+                "        <CoordPatternStatus>58</CoordPatternStatus>\n" +
+                "        <CoordCycleStatus>200</CoordCycleStatus>\n" +
+                "        <CoordSyncStatus>41</CoordSyncStatus>\n" +
+                "    </messageContent>\n" +
+                "</systemScription>";*/
+        String post = "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n" +
+                "<systemScription System=\"TCIP\" Version=\"1.0\"><subSystem>Hisense</subSystem><isRequest>1</isRequest><seq>20241103190736692398</seq><needResponse>1</needResponse><result>0</result><flag>0</flag><messageContent><Spot>882530</Spot></messageContent><messageContent>12</messageContent></systemScription>";
+        String s = xmlPost("http://172.24.71.94:10013", post);
+        System.out.println(s);
+    }
+}

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

@@ -7,7 +7,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-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/java/net/wanji/utc/controller/StaticInfoController.java

@@ -124,4 +124,13 @@ public class StaticInfoController {
     public JsonViewObject signalTime(@RequestParam String crossId) throws Exception {
         return staticInfoService.signalTime(crossId);
     }
+
+    @AspectLog(description = "获取当前运行方案号", operationType = BaseEnum.OperationTypeEnum.QUERY)
+    @PostMapping(value = "/crossSchemeNo", produces = MediaType.APPLICATION_JSON)
+    @ApiResponses({
+            @ApiResponse(code = 200, message = "OK", response = CrossSchedulesPO.class)
+    })
+    public JsonViewObject crossSchemeNo(@RequestParam String crossId) throws Exception {
+        return staticInfoService.crossSchemeNo(crossId);
+    }
 }

signal-utc-service/src/main/java/net/wanji/utc/service/staticinfo/StaticInfoService.java

@@ -31,4 +31,5 @@ public interface StaticInfoService {
     List<CrossSchedulesPO> buildCrossSchedulesResponse(List<String> crossIdList);
 
     JsonViewObject signalTime(String crossId) throws Exception;
+    JsonViewObject crossSchemeNo(String crossId) throws Exception;
 }

signal-utc-service/src/main/java/net/wanji/utc/service/staticinfo/WanJiCommonStaticInfoService.java

@@ -39,4 +39,11 @@ public interface WanJiCommonStaticInfoService {
     Result<List<CrossSchedulesPO>> schedules(String crossId, String signalId) throws Exception;
 
     JsonViewObject signalTime(String crossId) throws Exception;
+    /**
+    * @Description 获取当前运行的方案号
+    * @Param [crossId] 路口编号
+    * @return net.wanji.common.framework.rest.JsonViewObject
+    **/
+
+    JsonViewObject crossSchemeNo(String crossId) throws Exception;
 }

signal-utc-service/src/main/java/net/wanji/utc/service/staticinfo/impl/StaticInfoServiceImpl.java

@@ -208,4 +208,11 @@ public class StaticInfoServiceImpl implements StaticInfoService {
         }
         return jsonViewObject;
     }
+
+    @Override
+    public JsonViewObject crossSchemeNo(String crossId) throws Exception {
+        JsonViewObject jsonViewObject = JsonViewObject.newInstance();
+        jsonViewObject = wanjiCommonStaticInfoService.crossSchemeNo(crossId);
+        return jsonViewObject;
+    }
 }

signal-utc-service/src/main/java/net/wanji/utc/service/staticinfo/impl/WanJiCommonStaticInfoServiceImpl.java

@@ -13,6 +13,8 @@ import net.wanji.databus.dto.PlanSectionDTO;
 import net.wanji.databus.vo.CrossIdVO;
 import net.wanji.databus.vo.PlanSectionVO;
 import net.wanji.databus.vo.SchemePhaseLightsVO;
+import net.wanji.feign.service.UtcHisenseFeignClients;
+import net.wanji.feign.service.common.FeignCommon;
 import net.wanji.utc.cache.CrossInfoCache;
 import net.wanji.utc.cache.UtcFeignClientCache;
 import net.wanji.utc.common.Result;
@@ -175,4 +177,15 @@ public class WanJiCommonStaticInfoServiceImpl implements WanJiCommonStaticInfoSe
         return jsonViewObject;
     }
 
+    @Override
+    public JsonViewObject crossSchemeNo(String crossId) throws Exception {
+        String manufacturerIdCode = crossInfoCache.getManufacturerCodeByCrossId(crossId);
+        UtcHisenseFeignClients utcFeignClientService = (UtcHisenseFeignClients)utcFeignClientCache.getUtcFeignClientService(manufacturerIdCode);
+        JsonViewObject jsonViewObject = utcFeignClientService.getSchemeNo(crossId);
+        if (Objects.isNull(jsonViewObject) || jsonViewObject.getCode() != 200) {
+            throw new Exception("获取信号机时间远程服务调用异常，异常信息" + jsonViewObject.getMessage());
+        }
+        return jsonViewObject;
+    }
+
 }

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

@@ -7,7 +7,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-utc-service/src/main/resources/bootstrap-jinan.yaml

-spring:
-  application:
-    # dubbo启动需要程序名称
-    name: utc
-  main:
-    allow-circular-references: true
-  cloud:
-    nacos:
-      config:
-        server-addr: 172.17.0.1:8848
-        file-extension: yaml
-        group: signal
-        namespace: signal
-        username: nacos
-        password: nacos
\ No newline at end of file

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

-spring:
-  application:
-    # dubbo启动需要程序名称
-    name: utc
-  main:
-    allow-circular-references: true
-  cloud:
-    nacos:
-      config:
-        server-addr: 10.102.1.182:8848
-        file-extension: yaml
-        group: signal
-        namespace: signal
-        username: nacos
-        password: nacos
\ No newline at end of file

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

-spring:
-  application:
-    # dubbo启动需要程序名称
-    name: utc
-  main:
-    allow-circular-references: true
-  cloud:
-    nacos:
-      config:
-        server-addr: 10.102.1.182:8848
-        file-extension: yaml
-        group: signal
-        namespace: signal
-        username: nacos
-        password: nacos
\ 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

wj-common/src/main/java/net/wanji/common/utils/tool/RandomUtil.java

+package net.wanji.common.utils.tool;
+
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.List;
+import java.util.Random;
+
+/**
+ * @author zhouleilei
+ * @version 1.0
+ * @date 2024/11/3 13:24
+ */
+public class RandomUtil {
+    /**
+     * 字符源，可以剔除O、L、0和1，避免0和1与O和L混淆，这里没有剔除<br/>
+     * 可以根据需要加入小写英文字母和特殊字符等
+     */
+    public static final String[] GENERATE_SOURCE = new String[]{"0", "1", "2", "3", "4", "5", "6", "7",
+            "8", "9", "A", "B", "C", "D", "E", "F", "G", "H", "I", "J",
+            "K", "L", "M", "N", "O", "P", "Q", "R", "S", "T", "U", "V",
+            "W", "X", "Y", "Z"};
+    private static final int STR_LEN = GENERATE_SOURCE.length;
+
+    public static final String[] NUMBER_SOURCE = new String[]{"0", "1", "2", "3", "4", "5", "6", "7","8", "9"};
+    /**
+     * 使用 Collections.shuffle 生成六位随机字符串
+     *
+     * @return
+     */
+    private static String generateByShuffle() {
+        List<String> list = Arrays.asList(GENERATE_SOURCE);
+        //打乱元素排序，增加反推难度
+        Collections.shuffle(list);
+        StringBuilder randomStr = new StringBuilder();
+        for (int i = 0; i < STR_LEN; i++) {
+            randomStr.append(list.get(i));
+        }
+        //更改下面两个数字可以取到不同位数的随机数哦
+        return randomStr.substring(4, 10);
+    }
+
+
+    /**
+     * 生成数字和字母组合，字母区分大小写
+     *
+     * @param length 随机字符串的长度
+     * @return
+     */
+    public static String generateByRandom(final int length) {
+        StringBuilder randomSb = new StringBuilder(length);
+        Random random = new Random();
+        for (int i = 0; i < length; i++) {
+            // 输出字母还是数字
+            String charOrNum = random.nextInt(2) % 2 == 0 ? "char" : "num";
+            // 字符串
+            if ("char".equals(charOrNum)) {
+                // 判断字母大小写
+                int choice = random.nextInt(2) % 2 == 0 ? 65 : 97;
+                randomSb = randomSb.append((char) (choice + random.nextInt(26)));
+            } else {
+                randomSb = randomSb.append(random.nextInt(10));
+            }
+        }
+        return randomSb.toString();
+    }
+    /**
+     * 生成随机字符串，generateByRandom的简化版
+     * @param count 随机字符串的长度
+     * @param source 源字符集
+     * @return
+     */
+    public static String generateFromSource(int count, String[] source) {
+        StringBuilder sb = new StringBuilder(count);
+        int sourceLen = source.length;
+        for (int i = 0; i < count; i++) {
+            final int index = new Random().nextInt(sourceLen);
+            sb.append(source[index]);
+        }
+        return sb.toString();
+    }
+    /**
+     * @param begin 自增长序列
+     * @return
+     */
+    public static String generateByOrder(final int begin) {
+        List<String> src = Arrays.asList(GENERATE_SOURCE);
+        Collections.shuffle(src);
+        StringBuilder randomSb = new StringBuilder(6);
+        int i4 = (begin) % 36;
+        int i3 = (begin / (36)) % 36;
+        int i2 = (begin / (36 * 36)) % 36;
+        int i1 = (begin / (36 * 36 * 36)) % 36;
+        int i0 = (begin / (36 * 36 * 36 * 36)) % 36;
+        int i  = (begin / (36 * 36 * 36 * 36 * 36)) % 36;
+        randomSb = randomSb.append(src.get(i0)).append(src.get(i1))
+                .append(src.get(i2)).append(src.get(i3))
+                .append(src.get(i4)).append(src.get(i));
+        return randomSb.toString();
+    }
+
+    public static void main(String[] args) {
+        String s = generateByRandom(10);
+        System.out.println(s);
+        String ss = generateByOrder(1);
+        System.out.println(ss);
+        String sss = generateFromSource(6,RandomUtil.NUMBER_SOURCE);
+        System.out.println(sss);
+    }
+}