Commit 4a9796fc authored by duanruiming's avatar duanruiming

[update] 解决项目报错问题

parent ff2c5c18
......@@ -326,34 +326,6 @@ public class CrossOptimizeServiceImpl implements CrossOptimizeService {
}
}
// /**
// * 当前路口异常转向列表 element:进口方向
// *
// * @param cross
// * @return
// */
// private static List<String> getOptCrossInDirList(CrossDataRealtimePO cross) {
// List<String> crossIdDirList = new ArrayList<>();
// List<CrossDirInfoDTO> dirList = cross.getDirList();
// List<CrossTurnInfoDTO> turnList = cross.getTurnList();
// if (!CollectionUtils.isEmpty(dirList) && !CollectionUtils.isEmpty(turnList)) {
// for (CrossDirInfoDTO crossDirInfoDTO : dirList) {
// Integer dirType = crossDirInfoDTO.getDirType();
// Integer inOutType = crossDirInfoDTO.getInOutType();
// for (CrossTurnInfoDTO crossTurnInfoDTO : turnList) {
// Integer inDir = crossTurnInfoDTO.getInDir();
// // 路口方向进口=驶入方向
// if (Objects.equals(dirType, inDir) && Objects.equals(1, inOutType)) {
// String str = String.valueOf(crossDirInfoDTO.getDirType());
// if (!crossIdDirList.contains(str)) {
// crossIdDirList.add(str);
// }
// }
// }
// }
// }
// return crossIdDirList;
// }
private List<Integer> getOptCrossInDirList(String crossId) {
LambdaQueryWrapper<CrossDirDataRealtimePO> dirWrapper = new LambdaQueryWrapper<>();
dirWrapper.eq(CrossDirDataRealtimePO::getCrossId, crossId);
......
......@@ -100,7 +100,15 @@ public class CrossMonitorTask {
* @return
*/
public List<CrossDataRealtimePO> listCrossDataRealtime() {
List<CrossDataRealtimePO> crossDataRealtimePOS = crossDataRealtimeMapper.selectList(new LambdaQueryWrapper<>());
// todo 测试数据
LambdaQueryWrapper<CrossDataRealtimePO> queryWrapper = new LambdaQueryWrapper<>();
queryWrapper.eq(CrossDataRealtimePO::getCrossId, "14Q0S09IQB0")
.or().eq(CrossDataRealtimePO::getCrossId, "14Q1409IRF0")
.or().eq(CrossDataRealtimePO::getCrossId, "14PU609IQA0")
.or().eq(CrossDataRealtimePO::getCrossId, "14Q1509ISH0")
.or().eq(CrossDataRealtimePO::getCrossId, "14Q1S09IR70")
.or().eq(CrossDataRealtimePO::getCrossId, "14Q0O09INT0");
List<CrossDataRealtimePO> crossDataRealtimePOS = crossDataRealtimeMapper.selectList(queryWrapper);
return crossDataRealtimePOS;
}
......
......@@ -13,7 +13,7 @@ import java.util.Date;
* @desc CrossDataRealtimePO
*/
@Data
@TableName("t_lane_data_realtime")
@TableName("t_cross_turn_data_realtime")
@ApiModel(value = "CrossTurnDataRealtimePO", description = "路口转向实时数据")
public class CrossTurnDataRealtimePO {
/** 转向ID(路口ID_驶入方向_转向类型) */
......
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