Commit 22315b3b authored by hanbing's avatar hanbing

态势监测,返回当前时间相位列表

parent d897966e
...@@ -8,6 +8,7 @@ import net.wanji.feign.pojo.result.JsonViewObject; ...@@ -8,6 +8,7 @@ import net.wanji.feign.pojo.result.JsonViewObject;
import net.wanji.web.dto.CrossIdAndPhaseIdsDTO; import net.wanji.web.dto.CrossIdAndPhaseIdsDTO;
import net.wanji.web.dto.CrossIdAndTimeDTO; import net.wanji.web.dto.CrossIdAndTimeDTO;
import net.wanji.web.dto.CrossIdDTO; import net.wanji.web.dto.CrossIdDTO;
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.service.impl.PlanSendServiceImpl; import net.wanji.web.service.impl.PlanSendServiceImpl;
...@@ -17,6 +18,8 @@ import org.springframework.web.bind.annotation.RequestBody; ...@@ -17,6 +18,8 @@ import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController; import org.springframework.web.bind.annotation.RestController;
import java.util.List;
/** /**
* @author hanbing * @author hanbing
* @date 2023/01/04 16:10 * @date 2023/01/04 16:10
...@@ -99,4 +102,17 @@ public class PlanSendController { ...@@ -99,4 +102,17 @@ public class PlanSendController {
return jsonViewObject.success(phaseListByTimeVO); return jsonViewObject.success(phaseListByTimeVO);
} }
@ApiOperation(value = "根据当前时间返回相位列表(单环)", notes = "根据当前时间返回相位列表(单环)")
@PostMapping("/phaseListByTimeSingleRing")
@ApiResponses({
@ApiResponse(code = 200, message = "OK", response = SaveSchemeConfigDTO.PhaseListElement.class),
})
public JsonViewObject phaseListByTimeSingleRing(@RequestBody CrossIdAndTimeDTO crossIdAndTimeDTO) {
List<SaveSchemeConfigDTO.PhaseListElement> phaseListByTime
= planSendService.phaseListByTimeSingleRing(crossIdAndTimeDTO);
JsonViewObject jsonViewObject = JsonViewObject.newInstance();
return jsonViewObject.success(phaseListByTime);
}
} }
...@@ -18,6 +18,7 @@ public interface CrossDirInfoMapper { ...@@ -18,6 +18,7 @@ public interface CrossDirInfoMapper {
void updateIsPedestrian(@Param("isPersonCross") Integer isPersonCross, @Param("id") String id); void updateIsPedestrian(@Param("isPersonCross") Integer isPersonCross, @Param("id") String id);
// todo 只返回进口
CrossDirInfoPO selectByCrossIdAndDirType(@Param("crossId") String crossId, @Param("dirType") Integer dirType); CrossDirInfoPO selectByCrossIdAndDirType(@Param("crossId") String crossId, @Param("dirType") Integer dirType);
List<CrossDirInfoPO> selectByCrossId(String crossId); List<CrossDirInfoPO> selectByCrossId(String crossId);
......
...@@ -4,10 +4,13 @@ import net.wanji.feign.pojo.result.JsonViewObject; ...@@ -4,10 +4,13 @@ import net.wanji.feign.pojo.result.JsonViewObject;
import net.wanji.web.dto.CrossIdAndTimeDTO; import net.wanji.web.dto.CrossIdAndTimeDTO;
import net.wanji.web.dto.CrossIdDTO; import net.wanji.web.dto.CrossIdDTO;
import net.wanji.web.dto.CrossIdAndPhaseIdsDTO; import net.wanji.web.dto.CrossIdAndPhaseIdsDTO;
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.vo.PhaseListByTimeVO; import net.wanji.web.vo.PhaseListByTimeVO;
import java.util.List;
/** /**
* @author Kent HAN * @author Kent HAN
* @date 2022/11/3 16:14 * @date 2022/11/3 16:14
...@@ -30,4 +33,6 @@ public interface PlanSendService { ...@@ -30,4 +33,6 @@ public interface PlanSendService {
JsonViewObject syncScheme(CrossIdDTO crossIdDTO); JsonViewObject syncScheme(CrossIdDTO crossIdDTO);
PhaseListByTimeVO phaseListByTime(CrossIdAndTimeDTO crossIdAndTimeDTO); PhaseListByTimeVO phaseListByTime(CrossIdAndTimeDTO crossIdAndTimeDTO);
List<SaveSchemeConfigDTO.PhaseListElement> phaseListByTimeSingleRing(CrossIdAndTimeDTO crossIdAndTimeDTO);
} }
...@@ -333,6 +333,26 @@ public class PlanSendServiceImpl implements PlanSendService { ...@@ -333,6 +333,26 @@ public class PlanSendServiceImpl implements PlanSendService {
return phaseListByTimeVO; return phaseListByTimeVO;
} }
@Override
public List<SaveSchemeConfigDTO.PhaseListElement> phaseListByTimeSingleRing(CrossIdAndTimeDTO crossIdAndTimeDTO) {
List<SaveSchemeConfigDTO.PhaseListElement> phaseListByTime = new ArrayList<>();
PhaseListByTimeVO phaseListByTimeVO = phaseListByTime(crossIdAndTimeDTO);
SaveSchemeConfigDTO.PhaseScheme phaseScheme = phaseListByTimeVO.getPhaseScheme();
if (phaseScheme != null) {
List<SaveSchemeConfigDTO.RingListElement> ringList = phaseScheme.getRingList();
SaveSchemeConfigDTO.RingListElement ringListElement = ringList.get(0);
List<SaveSchemeConfigDTO.GroupListElement> groupList = ringListElement.getGroupList();
for (SaveSchemeConfigDTO.GroupListElement groupListElement : groupList) {
List<SaveSchemeConfigDTO.PhaseListElement> phaseList = groupListElement.getPhaseList();
phaseListByTime.addAll(phaseList);
}
}
return phaseListByTime;
}
private PhaseListByTimeVO getPhaseListByTimeVO(String planName, Date datetime, RunningPlanDTO runningPlanDTO, private PhaseListByTimeVO getPhaseListByTimeVO(String planName, Date datetime, RunningPlanDTO runningPlanDTO,
CrossIdDTO crossIdDTO) { CrossIdDTO crossIdDTO) {
PhaseListByTimeVO phaseListByTimeVO = new PhaseListByTimeVO(); PhaseListByTimeVO phaseListByTimeVO = new PhaseListByTimeVO();
......
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