Commit 998ed34e authored by hanbing's avatar hanbing

[update] 信号机方案同步,灯组号去重

parent 67d2e97b
...@@ -19,6 +19,7 @@ import net.wanji.web.dto.RunningPlanDTO; ...@@ -19,6 +19,7 @@ import net.wanji.web.dto.RunningPlanDTO;
import net.wanji.web.dto.SaveSchemeConfigDTO; import net.wanji.web.dto.SaveSchemeConfigDTO;
import net.wanji.web.dto.ScheduleIdDTO; import net.wanji.web.dto.ScheduleIdDTO;
import net.wanji.web.dto.SchemeIdDTO; import net.wanji.web.dto.SchemeIdDTO;
import net.wanji.web.mapper.scheme.CrossLaneLightsMapper;
import net.wanji.web.mapper.scheme.CrossLightsMapper; import net.wanji.web.mapper.scheme.CrossLightsMapper;
import net.wanji.web.mapper.scheme.CrossPhaseLightsMapper; import net.wanji.web.mapper.scheme.CrossPhaseLightsMapper;
import net.wanji.web.mapper.scheme.CrossPhaseMapper; import net.wanji.web.mapper.scheme.CrossPhaseMapper;
...@@ -70,13 +71,14 @@ public class PlanSendServiceImpl implements PlanSendService { ...@@ -70,13 +71,14 @@ public class PlanSendServiceImpl implements PlanSendService {
private final RunningPlanServiceImpl runningPlanServiceImpl; private final RunningPlanServiceImpl runningPlanServiceImpl;
private final SchemeConfigServiceImpl schemeConfigServiceImpl; private final SchemeConfigServiceImpl schemeConfigServiceImpl;
private final CrossSchedulesMapper crossSchedulesMapper; private final CrossSchedulesMapper crossSchedulesMapper;
private final CrossLaneLightsMapper crossLaneLightsMapper;
SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd"); SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
SimpleDateFormat hourMinuteSdf = new SimpleDateFormat("HH:mm"); SimpleDateFormat hourMinuteSdf = new SimpleDateFormat("HH:mm");
private Gson gson = new GsonBuilder().setDateFormat("yyyy-MM-dd").create(); private Gson gson = new GsonBuilder().setDateFormat("yyyy-MM-dd").create();
public PlanSendServiceImpl(@Qualifier("net.wanji.feign.service.UtcFeignClients") UtcFeignClients utcFeignClients, CrossSchedulesPlanMapper crossSchedulesPlanMapper, CrossPlanMapper crossPlanMapper, CrossSchemeMapper crossSchemeMapper, CrossPhaseMapper crossPhaseMapper, CrossLightsMapper crossLightsMapper, CrossPhaseLightsMapper crossPhaseLightsMapper, RunningPlanServiceImpl runningPlanServiceImpl, SchemeConfigServiceImpl schemeConfigServiceImpl, CrossSchedulesMapper crossSchedulesMapper) { public PlanSendServiceImpl(@Qualifier("net.wanji.feign.service.UtcFeignClients") UtcFeignClients utcFeignClients, CrossSchedulesPlanMapper crossSchedulesPlanMapper, CrossPlanMapper crossPlanMapper, CrossSchemeMapper crossSchemeMapper, CrossPhaseMapper crossPhaseMapper, CrossLightsMapper crossLightsMapper, CrossPhaseLightsMapper crossPhaseLightsMapper, RunningPlanServiceImpl runningPlanServiceImpl, SchemeConfigServiceImpl schemeConfigServiceImpl, CrossSchedulesMapper crossSchedulesMapper, CrossLaneLightsMapper crossLaneLightsMapper) {
this.utcFeignClients = utcFeignClients; this.utcFeignClients = utcFeignClients;
this.crossSchedulesPlanMapper = crossSchedulesPlanMapper; this.crossSchedulesPlanMapper = crossSchedulesPlanMapper;
this.crossPlanMapper = crossPlanMapper; this.crossPlanMapper = crossPlanMapper;
...@@ -87,6 +89,7 @@ public class PlanSendServiceImpl implements PlanSendService { ...@@ -87,6 +89,7 @@ public class PlanSendServiceImpl implements PlanSendService {
this.runningPlanServiceImpl = runningPlanServiceImpl; this.runningPlanServiceImpl = runningPlanServiceImpl;
this.schemeConfigServiceImpl = schemeConfigServiceImpl; this.schemeConfigServiceImpl = schemeConfigServiceImpl;
this.crossSchedulesMapper = crossSchedulesMapper; this.crossSchedulesMapper = crossSchedulesMapper;
this.crossLaneLightsMapper = crossLaneLightsMapper;
} }
@Override @Override
...@@ -286,6 +289,7 @@ public class PlanSendServiceImpl implements PlanSendService { ...@@ -286,6 +289,7 @@ public class PlanSendServiceImpl implements PlanSendService {
crossLightsMapper.insertBatch(crossLightsSet); crossLightsMapper.insertBatch(crossLightsSet);
crossPhaseLightsMapper.deleteByCrossId(crossId); crossPhaseLightsMapper.deleteByCrossId(crossId);
crossLaneLightsMapper.deleteByCrossId(crossId);
} }
return jsonViewObject.success(); return jsonViewObject.success();
} }
......
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