Commit dec59194 authored by zhouleilei's avatar zhouleilei

优化 - 方案下发

parent 7985eca1
...@@ -30,7 +30,7 @@ import net.wanji.utc.common.typeenum.HttpCode; ...@@ -30,7 +30,7 @@ import net.wanji.utc.common.typeenum.HttpCode;
import net.wanji.utc.po.hk.request.DelBaseConfigPO; import net.wanji.utc.po.hk.request.DelBaseConfigPO;
import net.wanji.utc.service.control.ControlCommandService; import net.wanji.utc.service.control.ControlCommandService;
import net.wanji.utc.service.control.ControlCommandStrategyService; import net.wanji.utc.service.control.ControlCommandStrategyService;
import net.wanji.utc.service.staticinfo.StaticInfoService; import net.wanji.utc.service.staticinfo.WanJiCommonStaticInfoService;
import net.wanji.utc.task.SignalCommandSyncTask; import net.wanji.utc.task.SignalCommandSyncTask;
import net.wanji.utc.task.SignalStatusTask; import net.wanji.utc.task.SignalStatusTask;
import net.wanji.utc.util.StringUtils; import net.wanji.utc.util.StringUtils;
...@@ -78,7 +78,8 @@ public class ControlCommandStrategyServiceImpl implements ControlCommandStrategy ...@@ -78,7 +78,8 @@ public class ControlCommandStrategyServiceImpl implements ControlCommandStrategy
private final SignalCommandPOMapper signalCommandPOMapper; private final SignalCommandPOMapper signalCommandPOMapper;
private final CrossPhaseDirTurnCache crossPhaseDirTurnCache; private final CrossPhaseDirTurnCache crossPhaseDirTurnCache;
private final CrossSchemePhaseTimeCountCache crossSchemePhaseTimeCountCache; private final CrossSchemePhaseTimeCountCache crossSchemePhaseTimeCountCache;
private final StaticInfoService staticInfoService; @Resource
WanJiCommonStaticInfoService wanjiCommonStaticInfoService;
@Override @Override
...@@ -697,7 +698,7 @@ public class ControlCommandStrategyServiceImpl implements ControlCommandStrategy ...@@ -697,7 +698,7 @@ public class ControlCommandStrategyServiceImpl implements ControlCommandStrategy
CrossSchemeRingsDTO crossSchemeRingsDTO = new CrossSchemeRingsDTO(); CrossSchemeRingsDTO crossSchemeRingsDTO = new CrossSchemeRingsDTO();
crossSchemeRingsDTO.setCrossId(crossId); crossSchemeRingsDTO.setCrossId(crossId);
crossSchemeRingsDTO.setPattern(String.valueOf(schemeId)); crossSchemeRingsDTO.setPattern(String.valueOf(schemeId));
JsonViewObject jsonViewObject = staticInfoService.selectCrossSchemeRingsToStages(crossSchemeRingsDTO); JsonViewObject jsonViewObject = wanjiCommonStaticInfoService.selectCrossSchemeRingsToStages(crossSchemeRingsDTO);
if (Objects.nonNull(jsonViewObject) && Objects.equals(200, jsonViewObject.getCode())) { if (Objects.nonNull(jsonViewObject) && Objects.equals(200, jsonViewObject.getCode())) {
String contentStr = String.valueOf(jsonViewObject.getContent()); String contentStr = String.valueOf(jsonViewObject.getContent());
CrossSchemeRingsToStagesPO crossSchemeRingsToStagesPO = mapper.convertValue(contentStr, CrossSchemeRingsToStagesPO.class); CrossSchemeRingsToStagesPO crossSchemeRingsToStagesPO = mapper.convertValue(contentStr, CrossSchemeRingsToStagesPO.class);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment