Commit dc703c7a authored by duanruiming's avatar duanruiming

[update] 添加web数据下发到utc数据库

parent a9b2d08c
...@@ -131,4 +131,11 @@ public class PlanSendController { ...@@ -131,4 +131,11 @@ public class PlanSendController {
return jsonViewObject.success(phaseListByTime); return jsonViewObject.success(phaseListByTime);
} }
@AspectLog(description = "下发数据到UTC", operationType = BaseEnum.OperationTypeEnum.UPDATE)
@ApiOperation(value = "下发数据到UTC", notes = "下发数据到UTC")
@PostMapping("/saveToUtc")
public JsonViewObject saveToUtc(String crossId) {
return planSendService.saveToUtc(crossId);
}
} }
...@@ -31,4 +31,11 @@ public interface PlanSendService { ...@@ -31,4 +31,11 @@ public interface PlanSendService {
PhaseListByTimeVO phaseListByTime(CrossIdAndTimeDTO crossIdAndTimeDTO); PhaseListByTimeVO phaseListByTime(CrossIdAndTimeDTO crossIdAndTimeDTO);
List<SaveSchemeConfigDTO.PhaseListElement> phaseListByTimeSingleRing(CrossIdAndTimeDTO crossIdAndTimeDTO); List<SaveSchemeConfigDTO.PhaseListElement> phaseListByTimeSingleRing(CrossIdAndTimeDTO crossIdAndTimeDTO);
}
/**
* 下发数据到utc数据库
*
* @param crossId
* @return
*/
JsonViewObject saveToUtc(String crossId);}
...@@ -154,8 +154,8 @@ public class FeignProxyServiceImpl implements FeignProxyService { ...@@ -154,8 +154,8 @@ public class FeignProxyServiceImpl implements FeignProxyService {
if (Objects.isNull(jsonViewObject) || jsonViewObject.getCode() != 200) { if (Objects.isNull(jsonViewObject) || jsonViewObject.getCode() != 200) {
return jsonViewObject.fail("删除信号机参数UTC服务调用异常"); return jsonViewObject.fail("删除信号机参数UTC服务调用异常");
} }
return jsonViewObject.success("删除信号机参数成功"); } return jsonViewObject.success("删除信号机参数成功");
}
/** /**
* 特殊控制插入本地控制历史表 * 特殊控制插入本地控制历史表
* *
......
...@@ -7,15 +7,16 @@ import com.fasterxml.jackson.core.type.TypeReference; ...@@ -7,15 +7,16 @@ import com.fasterxml.jackson.core.type.TypeReference;
import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.databind.ObjectMapper;
import com.google.gson.Gson; import com.google.gson.Gson;
import com.google.gson.GsonBuilder; import com.google.gson.GsonBuilder;
import net.wanji.databus.bo.CrossIdBO;
import net.wanji.common.framework.rest.JsonViewObject; import net.wanji.common.framework.rest.JsonViewObject;
import net.wanji.common.utils.tool.JacksonUtils; import net.wanji.common.utils.tool.JacksonUtils;
import net.wanji.databus.bo.CrossIdBO;
import net.wanji.databus.dao.entity.*; import net.wanji.databus.dao.entity.*;
import net.wanji.databus.dao.mapper.*; import net.wanji.databus.dao.mapper.*;
import net.wanji.databus.dto.CrossSchedulesDTO; import net.wanji.databus.dto.CrossSchedulesDTO;
import net.wanji.databus.dto.PlanSectionDTO; import net.wanji.databus.dto.PlanSectionDTO;
import net.wanji.databus.dto.RunningPlanDTO; import net.wanji.databus.dto.RunningPlanDTO;
import net.wanji.databus.po.BaseCrossLightsPO; import net.wanji.databus.po.BaseCrossLightsPO;
import net.wanji.databus.po.SaveToUtcPO;
import net.wanji.databus.vo.*; import net.wanji.databus.vo.*;
import net.wanji.feign.service.UtcFeignClients; import net.wanji.feign.service.UtcFeignClients;
import net.wanji.web.dto.*; import net.wanji.web.dto.*;
...@@ -41,6 +42,7 @@ import java.util.stream.Collectors; ...@@ -41,6 +42,7 @@ import java.util.stream.Collectors;
*/ */
@Service @Service
public class PlanSendServiceImpl implements PlanSendService { public class PlanSendServiceImpl implements PlanSendService {
//@Lazy
private final UtcFeignClients utcFeignClients; private final UtcFeignClients utcFeignClients;
private final FeignProxyService feignProxyService; private final FeignProxyService feignProxyService;
private final BaseCrossSchedulesPlanMapper baseCrossSchedulesPlanMapper; private final BaseCrossSchedulesPlanMapper baseCrossSchedulesPlanMapper;
...@@ -799,4 +801,41 @@ public class PlanSendServiceImpl implements PlanSendService { ...@@ -799,4 +801,41 @@ public class PlanSendServiceImpl implements PlanSendService {
BaseCrossPlanPO crossPlanPO = baseCrossPlanMapper.selectById(planId); BaseCrossPlanPO crossPlanPO = baseCrossPlanMapper.selectById(planId);
return crossPlanPO.getPlanNo(); return crossPlanPO.getPlanNo();
} }
@Override
public JsonViewObject saveToUtc(String crossId) {
SaveToUtcPO saveToUtcPO = buildSaveToUtcPO(crossId);
if (Objects.isNull(saveToUtcPO)) {
return JsonViewObject.newInstance().fail("下发到UTC数据参数异常");
}
JsonViewObject jsonViewObject = utcFeignClients.saveToUtc(saveToUtcPO);
if (Objects.isNull(jsonViewObject) || jsonViewObject.getCode() != 200) {
return jsonViewObject.fail("下发信号机参数UTC服务调用异常");
}
//return JsonViewObject.newInstance().success();
return jsonViewObject.success("下发信号机参数成功");
}
private SaveToUtcPO buildSaveToUtcPO(String crossId) {
SaveToUtcPO saveToUtcPO = new SaveToUtcPO();
List<BaseCrossLightsPO> baseCrossLightsPOS = baseCrossLightsMapper.selectByCrossId(crossId);
CrossPhasePO crossPhasePO = new CrossPhasePO();
crossPhasePO.setCrossId(crossId);
List<CrossPhasePO> crossPhasePOS = baseCrossPhaseMapper.listCrossPhasePO(crossPhasePO);
CrossPhaseLightsPO crossPhaseLightsPO = new CrossPhaseLightsPO();
crossPhaseLightsPO.setCrossId(crossId);
List<CrossPhaseLightsPO> crossPhaseLightsPOList = baseCrossPhaseLightsMapper.listCrossPhaseLightsPO(crossPhaseLightsPO);
List<BaseCrossPlanPO> baseCrossPlanPOS = baseCrossPlanMapper.selectByCrossId(crossId);
List<BaseCrossSchemePO> baseCrossSchemePOS = baseCrossSchemeMapper.selectByCrossId(crossId);
List<CrossSectionPO> crossSectionPOS = baseCrossSectionMapper.selectByCrossId(crossId);
List<CrossSchedulesPO> schedulesPOS = baseCrossSchedulesMapper.listCrossSchedulesInfo(crossId);
saveToUtcPO.setLightsPOS(baseCrossLightsPOS);
saveToUtcPO.setPhaseLightsPOS(crossPhaseLightsPOList);
saveToUtcPO.setPhasePOS(crossPhasePOS);
saveToUtcPO.setSchemePOS(baseCrossSchemePOS);
saveToUtcPO.setPlanPOS(baseCrossPlanPOS);
saveToUtcPO.setSectionPOS(crossSectionPOS);
saveToUtcPO.setSchedulesPOS(schedulesPOS);
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