Commit f1743075 authored by duanruiming's avatar duanruiming

[update] 优化异常处理

parent dd5650d0
...@@ -135,7 +135,7 @@ public class PlanSendController { ...@@ -135,7 +135,7 @@ public class PlanSendController {
@AspectLog(description = "下发数据到UTC", operationType = BaseEnum.OperationTypeEnum.UPDATE) @AspectLog(description = "下发数据到UTC", operationType = BaseEnum.OperationTypeEnum.UPDATE)
@ApiOperation(value = "下发数据到UTC", notes = "下发数据到UTC") @ApiOperation(value = "下发数据到UTC", notes = "下发数据到UTC")
@PostMapping("/saveToUtc") @PostMapping("/saveToUtc")
public JsonViewObject saveToUtc(String crossId) { public JsonViewObject saveToUtc(String crossId) throws Exception {
return planSendService.saveToUtc(crossId); return planSendService.saveToUtc(crossId);
} }
} }
...@@ -38,4 +38,5 @@ public interface PlanSendService { ...@@ -38,4 +38,5 @@ public interface PlanSendService {
* @param crossId * @param crossId
* @return * @return
*/ */
JsonViewObject saveToUtc(String crossId);} JsonViewObject saveToUtc(String crossId) throws Exception;
}
...@@ -803,7 +803,7 @@ public class PlanSendServiceImpl implements PlanSendService { ...@@ -803,7 +803,7 @@ public class PlanSendServiceImpl implements PlanSendService {
} }
@Override @Override
public JsonViewObject saveToUtc(String crossId) { public JsonViewObject saveToUtc(String crossId) throws Exception{
SaveToUtcPO saveToUtcPO = buildSaveToUtcPO(crossId); SaveToUtcPO saveToUtcPO = buildSaveToUtcPO(crossId);
if (Objects.isNull(saveToUtcPO)) { if (Objects.isNull(saveToUtcPO)) {
return JsonViewObject.newInstance().fail("下发到UTC数据参数异常"); return JsonViewObject.newInstance().fail("下发到UTC数据参数异常");
...@@ -816,26 +816,30 @@ public class PlanSendServiceImpl implements PlanSendService { ...@@ -816,26 +816,30 @@ public class PlanSendServiceImpl implements PlanSendService {
return jsonViewObject.success("下发信号机参数成功"); return jsonViewObject.success("下发信号机参数成功");
} }
private SaveToUtcPO buildSaveToUtcPO(String crossId) { private SaveToUtcPO buildSaveToUtcPO(String crossId) throws Exception {
SaveToUtcPO saveToUtcPO = new SaveToUtcPO(); SaveToUtcPO saveToUtcPO = new SaveToUtcPO();
List<BaseCrossLightsPO> baseCrossLightsPOS = baseCrossLightsMapper.selectByCrossId(crossId); try {
CrossPhasePO crossPhasePO = new CrossPhasePO(); List<BaseCrossLightsPO> baseCrossLightsPOS = baseCrossLightsMapper.selectByCrossId(crossId);
crossPhasePO.setCrossId(crossId); CrossPhasePO crossPhasePO = new CrossPhasePO();
List<CrossPhasePO> crossPhasePOS = baseCrossPhaseMapper.listCrossPhasePO(crossPhasePO); crossPhasePO.setCrossId(crossId);
CrossPhaseLightsPO crossPhaseLightsPO = new CrossPhaseLightsPO(); List<CrossPhasePO> crossPhasePOS = baseCrossPhaseMapper.listCrossPhasePO(crossPhasePO);
crossPhaseLightsPO.setCrossId(crossId); CrossPhaseLightsPO crossPhaseLightsPO = new CrossPhaseLightsPO();
List<CrossPhaseLightsPO> crossPhaseLightsPOList = baseCrossPhaseLightsMapper.listCrossPhaseLightsPO(crossPhaseLightsPO); crossPhaseLightsPO.setCrossId(crossId);
List<BaseCrossPlanPO> baseCrossPlanPOS = baseCrossPlanMapper.selectByCrossId(crossId); List<CrossPhaseLightsPO> crossPhaseLightsPOList = baseCrossPhaseLightsMapper.listCrossPhaseLightsPO(crossPhaseLightsPO);
List<BaseCrossSchemePO> baseCrossSchemePOS = baseCrossSchemeMapper.selectByCrossId(crossId); List<BaseCrossPlanPO> baseCrossPlanPOS = baseCrossPlanMapper.selectByCrossId(crossId);
List<CrossSectionPO> crossSectionPOS = baseCrossSectionMapper.selectByCrossId(crossId); List<BaseCrossSchemePO> baseCrossSchemePOS = baseCrossSchemeMapper.selectByCrossId(crossId);
List<CrossSchedulesPO> schedulesPOS = baseCrossSchedulesMapper.listCrossSchedulesInfo(crossId); List<CrossSectionPO> crossSectionPOS = baseCrossSectionMapper.selectByCrossId(crossId);
saveToUtcPO.setLightsPOS(baseCrossLightsPOS); List<CrossSchedulesPO> schedulesPOS = baseCrossSchedulesMapper.listCrossSchedulesInfo(crossId);
saveToUtcPO.setPhaseLightsPOS(crossPhaseLightsPOList); saveToUtcPO.setLightsPOS(baseCrossLightsPOS);
saveToUtcPO.setPhasePOS(crossPhasePOS); saveToUtcPO.setPhaseLightsPOS(crossPhaseLightsPOList);
saveToUtcPO.setSchemePOS(baseCrossSchemePOS); saveToUtcPO.setPhasePOS(crossPhasePOS);
saveToUtcPO.setPlanPOS(baseCrossPlanPOS); saveToUtcPO.setSchemePOS(baseCrossSchemePOS);
saveToUtcPO.setSectionPOS(crossSectionPOS); saveToUtcPO.setPlanPOS(baseCrossPlanPOS);
saveToUtcPO.setSchedulesPOS(schedulesPOS); saveToUtcPO.setSectionPOS(crossSectionPOS);
saveToUtcPO.setSchedulesPOS(schedulesPOS);
} catch (Exception e) {
throw new Exception(e);
}
return saveToUtcPO; return saveToUtcPO;
} }
} }
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