[update] UTC代码优化

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

@@ -14,7 +14,7 @@ import net.wanji.databus.dto.StepingPhaseDTO;
 import net.wanji.databus.vo.TempSchemeSendVO;
 import net.wanji.databus.po.SaveToUtcPO;
 import net.wanji.databus.vo.*;
-import net.wanji.opt.vo.SchemeOptSendVO;
+import net.wanji.databus.vo.SchemeOptSendVO;
 import net.wanji.utc.service.control.ControlCommandStrategyService;
 import org.apache.commons.lang3.ObjectUtils;
 import org.springframework.validation.annotation.Validated;

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

@@ -7,6 +7,7 @@ import io.swagger.annotations.ApiResponses;
 import net.wanji.common.annotation.aspect.AspectLog;
 import net.wanji.common.enums.BaseEnum;
 import net.wanji.common.framework.rest.JsonViewObject;
+import net.wanji.databus.bo.CrossIdBO;
 import net.wanji.databus.dao.entity.CrossSchedulesPO;
 import net.wanji.databus.dto.*;
 import net.wanji.databus.po.CrossInfoPO;
@@ -48,6 +49,20 @@ public class StaticInfoController {
         return jsonViewObject.success(crossInfoPOList);
     }
 
+    @AspectLog(description = "路口编号查询路口信息", operationType = BaseEnum.OperationTypeEnum.QUERY)
+    @PostMapping(value = "/crossInfoByCrossId",
+            produces = MediaType.APPLICATION_JSON, consumes = MediaType.APPLICATION_JSON)
+    @ApiOperation(value = "路口编号查询路口信息", notes = "路口编号查询路口信息", response = CrossInfoPO.class,
+            produces = MediaType.APPLICATION_JSON, consumes = MediaType.APPLICATION_JSON)
+    @ApiResponses({
+            @ApiResponse(code = 200, message = "OK", response = CrossInfoPO.class)
+    })
+    public JsonViewObject crossInfoByCrossId(@RequestBody @Validated CrossIdBO crossIdBO) throws Exception {
+        CrossInfoPO crossInfoPO = staticInfoService.crossInfoById(crossIdBO.getCrossId());
+        JsonViewObject jsonViewObject = JsonViewObject.newInstance();
+        return jsonViewObject.success(crossInfoPO);
+    }
+
     @AspectLog(description = "方案数据-方案信息、相位信息、灯组信息", operationType = BaseEnum.OperationTypeEnum.QUERY)
     @PostMapping(value = "/schemePhaseLights",
             produces = MediaType.APPLICATION_JSON, consumes = MediaType.APPLICATION_JSON)

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

@@ -4,7 +4,7 @@ import net.wanji.common.framework.rest.JsonViewObject;
 import net.wanji.databus.dto.ExtendPhaseDTO;
 import net.wanji.databus.dto.StepingPhaseDTO;
 import net.wanji.databus.vo.*;
-import net.wanji.opt.vo.SchemeOptSendVO;
+import net.wanji.databus.vo.SchemeOptSendVO;
 import net.wanji.utc.po.hk.request.DelBaseConfigPO;
 
 import java.util.Date;

signal-utc-service/src/main/java/net/wanji/utc/service/control/ControlCommandStrategyService.java

@@ -6,7 +6,7 @@ import net.wanji.databus.dto.StepingPhaseDTO;
 import net.wanji.databus.vo.TempSchemeSendVO;
 import net.wanji.databus.po.SaveToUtcPO;
 import net.wanji.databus.vo.*;
-import net.wanji.opt.vo.SchemeOptSendVO;
+import net.wanji.databus.vo.SchemeOptSendVO;
 
 import java.util.Date;
 

signal-utc-service/src/main/java/net/wanji/utc/service/control/impl/ControlCommandStrategyServiceImpl.java

@@ -11,7 +11,7 @@ import net.wanji.databus.po.BaseCrossLightsPO;
 import net.wanji.databus.po.CrossInfoPO;
 import net.wanji.databus.po.SaveToUtcPO;
 import net.wanji.databus.vo.*;
-import net.wanji.opt.vo.SchemeOptSendVO;
+import net.wanji.databus.vo.SchemeOptSendVO;
 import net.wanji.utc.cache.CrossInfoCache;
 import net.wanji.utc.cache.CrossPhaseDirTurnCache;
 import net.wanji.utc.cache.CrossSchemePhaseTimeCountCache;

signal-utc-service/src/main/java/net/wanji/utc/service/control/impl/HKControlCommandServiceImpl.java

@@ -19,7 +19,7 @@ import net.wanji.databus.dao.mapper.ManufacturerInfoMapper;
 import net.wanji.databus.po.CrossInfoPO;
 import net.wanji.databus.po.ManufacturerInfoPO;
 import net.wanji.databus.vo.*;
-import net.wanji.opt.vo.SchemeOptSendVO;
+import net.wanji.databus.vo.SchemeOptSendVO;
 import net.wanji.utc.common.exception.ControlException;
 import net.wanji.utc.common.typeenum.BasicEnum;
 import net.wanji.utc.common.typeenum.CrossLightsDirEnum;

signal-utc-service/src/main/java/net/wanji/utc/service/control/impl/WanJiControlCommandServiceImpl.java

@@ -6,7 +6,7 @@ import net.wanji.databus.dto.ExtendPhaseDTO;
 import net.wanji.databus.dto.StepingPhaseDTO;
 import net.wanji.databus.vo.*;
 import net.wanji.feign.service.common.FeignCommon;
-import net.wanji.opt.vo.SchemeOptSendVO;
+import net.wanji.databus.vo.SchemeOptSendVO;
 import net.wanji.utc.cache.CrossInfoCache;
 import net.wanji.utc.cache.UtcFeignClientCache;
 import net.wanji.utc.common.constant.Constants;

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

@@ -12,6 +12,7 @@ import java.util.List;
 public interface StaticInfoService {
 
     List<CrossInfoPO> crossBasicInfo(CrossInfoDTO crossInfoDTO) throws Exception;
+    CrossInfoPO crossInfoById(String crossId) throws Exception;
 
     void schemePhaseLights(SchemePhaseLightsDTO schemePhaseLightsDTO) throws Exception;
 

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

@@ -6,12 +6,14 @@ import net.wanji.databus.dao.entity.*;
 import net.wanji.databus.dao.mapper.*;
 import net.wanji.databus.dto.*;
 import net.wanji.databus.po.CrossInfoPO;
+import net.wanji.databus.po.CrossInfoPOExt;
 import net.wanji.databus.po.ManufacturerInfoPO;
 import net.wanji.databus.vo.PlanSectionVO;
 import net.wanji.databus.vo.SchemePhaseLightsVO;
 import net.wanji.utc.cache.CrossInfoCache;
 import net.wanji.utc.common.typeenum.BasicEnum;
 import net.wanji.utc.service.staticinfo.*;
+import org.springframework.beans.BeanUtils;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.CollectionUtils;
@@ -44,6 +46,14 @@ public class StaticInfoServiceImpl implements StaticInfoService {
     private final CrossInfoCache crossInfoCache;
     private final OthersStaticInfoService othersStaticInfoService;
 
+    @Override
+    public CrossInfoPO crossInfoById(String crossId) throws Exception {
+        CrossInfoPOExt crossInfoPOExt = crossInfoMapper.selectById(crossId);
+        CrossInfoPO crossInfoPO = new CrossInfoPO();
+        BeanUtils.copyProperties(crossInfoPOExt, crossInfoPO);
+        return crossInfoPO;
+    }
+
     @Override
     @Transactional
     public List<CrossInfoPO> crossBasicInfo(CrossInfoDTO crossInfoVO) throws Exception {

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

@@ -14,7 +14,6 @@ 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;
@@ -25,7 +24,9 @@ import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
 import org.springframework.util.CollectionUtils;
 
-import java.util.*;
+import java.util.Arrays;
+import java.util.List;
+import java.util.Objects;
 
 /**
  * @author duanruiming
@@ -147,7 +148,7 @@ public class WanJiCommonStaticInfoServiceImpl implements WanJiCommonStaticInfoSe
         CrossSchedulesDTO crossSchedulesDTO = new CrossSchedulesDTO();
         crossSchedulesDTO.setManufacturerCode(manufacturerIdCode);
         crossSchedulesDTO.setCrossIdList(Arrays.asList(crossId));
-        JsonViewObject jsonViewObject = utcFeignClientCache.getUtcFeignClientService(manufacturerIdCode).crossSchedules(crossId);
+        JsonViewObject jsonViewObject = utcFeignClientCache.getUtcFeignClientService(manufacturerIdCode).crossSchedules(crossSchedulesDTO);
         if (Objects.isNull(jsonViewObject) || jsonViewObject.getCode() != 200) {
             throw new Exception("获取时间表数据远程服务调用异常，异常信息" + jsonViewObject.getMessage());
         }