海信-方案环形请求配置feign

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

@@ -8,10 +8,7 @@ import net.wanji.common.annotation.aspect.AspectLog;
 import net.wanji.common.enums.BaseEnum;
 import net.wanji.common.framework.rest.JsonViewObject;
 import net.wanji.databus.dao.entity.CrossSchedulesPO;
-import net.wanji.databus.dto.CrossInfoDTO;
-import net.wanji.databus.dto.CrossSchedulesDTO;
-import net.wanji.databus.dto.PlanSectionDTO;
-import net.wanji.databus.dto.SchemePhaseLightsDTO;
+import net.wanji.databus.dto.*;
 import net.wanji.databus.po.CrossInfoPO;
 import net.wanji.databus.vo.PlanSectionVO;
 import net.wanji.databus.vo.SchemePhaseLightsVO;
@@ -133,6 +130,14 @@ public class StaticInfoController {
     public JsonViewObject crossSchemeNo(@RequestParam String crossId) throws Exception {
         return staticInfoService.crossSchemeNo(crossId);
     }
+    @AspectLog(description = "方案环图请求", operationType = BaseEnum.OperationTypeEnum.QUERY)
+    @PostMapping(value = "/crossSchemeRings", produces = MediaType.APPLICATION_JSON)
+    @ApiResponses({
+            @ApiResponse(code = 200, message = "OK", response = CrossSchedulesPO.class)
+    })
+    public JsonViewObject crossSchemeRings(@Validated @RequestBody CrossSchemeRingsDTO crossSchemeRingsDTO) throws Exception {
+        return staticInfoService.crossSchemeRings(crossSchemeRingsDTO);
+    }
 
 
 }

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

@@ -2,10 +2,7 @@ package net.wanji.utc.service.staticinfo;
 
 import net.wanji.common.framework.rest.JsonViewObject;
 import net.wanji.databus.dao.entity.CrossSchedulesPO;
-import net.wanji.databus.dto.CrossInfoDTO;
-import net.wanji.databus.dto.CrossSchedulesDTO;
-import net.wanji.databus.dto.PlanSectionDTO;
-import net.wanji.databus.dto.SchemePhaseLightsDTO;
+import net.wanji.databus.dto.*;
 import net.wanji.databus.po.CrossInfoPO;
 import net.wanji.databus.vo.PlanSectionVO;
 import net.wanji.databus.vo.SchemePhaseLightsVO;
@@ -32,4 +29,5 @@ public interface StaticInfoService {
 
     JsonViewObject signalTime(String crossId) throws Exception;
     JsonViewObject crossSchemeNo(String crossId) throws Exception;
+    JsonViewObject crossSchemeRings(CrossSchemeRingsDTO crossSchemeRingsDTO) throws Exception;
 }

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

@@ -2,6 +2,7 @@ package net.wanji.utc.service.staticinfo;
 
 import net.wanji.common.framework.rest.JsonViewObject;
 import net.wanji.databus.dao.entity.CrossSchedulesPO;
+import net.wanji.databus.dto.CrossSchemeRingsDTO;
 import net.wanji.utc.common.Result;
 
 import java.util.List;
@@ -46,4 +47,10 @@ public interface WanJiCommonStaticInfoService {
     **/
 
     JsonViewObject crossSchemeNo(String crossId) throws Exception;
+    /**
+    * @Description 方案环图请求
+    * @return net.wanji.common.framework.rest.JsonViewObject
+    **/
+
+    JsonViewObject crossSchemeRings(CrossSchemeRingsDTO crossSchemeRingsDTO) throws Exception;
 }

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

@@ -4,10 +4,7 @@ import lombok.RequiredArgsConstructor;
 import net.wanji.common.framework.rest.JsonViewObject;
 import net.wanji.databus.dao.entity.*;
 import net.wanji.databus.dao.mapper.*;
-import net.wanji.databus.dto.CrossInfoDTO;
-import net.wanji.databus.dto.CrossSchedulesDTO;
-import net.wanji.databus.dto.PlanSectionDTO;
-import net.wanji.databus.dto.SchemePhaseLightsDTO;
+import net.wanji.databus.dto.*;
 import net.wanji.databus.po.CrossInfoPO;
 import net.wanji.databus.po.ManufacturerInfoPO;
 import net.wanji.databus.vo.PlanSectionVO;
@@ -215,4 +212,11 @@ public class StaticInfoServiceImpl implements StaticInfoService {
         jsonViewObject = wanjiCommonStaticInfoService.crossSchemeNo(crossId);
         return jsonViewObject;
     }
+
+    @Override
+    public JsonViewObject crossSchemeRings(CrossSchemeRingsDTO crossSchemeRingsDTO) throws Exception {
+        JsonViewObject jsonViewObject = JsonViewObject.newInstance();
+        jsonViewObject = wanjiCommonStaticInfoService.crossSchemeRings(crossSchemeRingsDTO);
+        return jsonViewObject;
+    }
 }

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

@@ -9,6 +9,7 @@ import net.wanji.common.utils.tool.JacksonUtils;
 import net.wanji.databus.dao.entity.*;
 import net.wanji.databus.dao.mapper.*;
 import net.wanji.databus.dto.CrossSchedulesDTO;
+import net.wanji.databus.dto.CrossSchemeRingsDTO;
 import net.wanji.databus.dto.PlanSectionDTO;
 import net.wanji.databus.vo.CrossIdVO;
 import net.wanji.databus.vo.PlanSectionVO;
@@ -183,7 +184,18 @@ public class WanJiCommonStaticInfoServiceImpl implements WanJiCommonStaticInfoSe
         FeignCommon utcFeignClientService = utcFeignClientCache.getUtcFeignClientService(manufacturerIdCode);
         JsonViewObject jsonViewObject = utcFeignClientService.getSchemeNo(crossId);
         if (Objects.isNull(jsonViewObject) || jsonViewObject.getCode() != 200) {
-            throw new Exception("获取信号机时间远程服务调用异常，异常信息" + jsonViewObject.getMessage());
+            throw new Exception("获取当前运行的方案号远程服务调用异常，异常信息" + jsonViewObject.getMessage());
+        }
+        return jsonViewObject;
+    }
+
+    @Override
+    public JsonViewObject crossSchemeRings(CrossSchemeRingsDTO crossSchemeRingsDTO) throws Exception {
+        String manufacturerIdCode = crossInfoCache.getManufacturerCodeByCrossId(crossSchemeRingsDTO.getCrossId());
+        FeignCommon utcFeignClientService = utcFeignClientCache.getUtcFeignClientService(manufacturerIdCode);
+        JsonViewObject jsonViewObject = utcFeignClientService.crossSchemeRings(crossSchemeRingsDTO);
+        if (Objects.isNull(jsonViewObject) || jsonViewObject.getCode() != 200) {
+            throw new Exception("方案环图请求远程服务调用异常，异常信息" + jsonViewObject.getMessage());
         }
         return jsonViewObject;
     }