| | |
| | | import com.xiaopeng.api.model.operation.XpRegion; |
| | | import com.xiaopeng.api.model.operation.XpStation; |
| | | import com.xiaopeng.api.model.operation.XpSystemSetting; |
| | | import com.xiaopeng.api.query.operation.FenceAndStationVo; |
| | | import com.xiaopeng.api.query.operation.PointListQuery; |
| | | import com.xiaopeng.api.query.operation.PointPageListListQuery; |
| | | import com.xiaopeng.api.vo.order.XpHistoryEndPointsVo; |
| | |
| | | } |
| | | |
| | | @Override |
| | | public List<FenceAndStationVo> findListFenceAndStation(){ |
| | | return baseMapper.findListFenceAndStation(); |
| | | public List<FenceAndStationVo> findListFenceAndStation(String cityCode){ |
| | | return baseMapper.findListFenceAndStation(cityCode); |
| | | } |
| | | |
| | | @Override |
| | |
| | | |
| | | @Override |
| | | public PageInfo<XpPoint> pageList(PointPageListListQuery query) { |
| | | if(CollUtil.isNotEmpty(query.getFenceAndStationList())){ |
| | | List<String> fenceAreaIds = new ArrayList<>(); |
| | | List<String> stationIds = new ArrayList<>(); |
| | | for (FenceAndStationVo bean : query.getFenceAndStationList()) { |
| | | if(bean.getType()==1){ |
| | | fenceAreaIds.addAll(StrUtil.split(bean.getIds(),",") ); |
| | | }else{ |
| | | stationIds.addAll(StrUtil.split(bean.getIds(),",") ); |
| | | } |
| | | } |
| | | query.setFenceAreaIds(fenceAreaIds); |
| | | query.setStationIds(stationIds); |
| | | } |
| | | |
| | | |
| | | PageInfo<XpPoint> pageInfo = new PageInfo<>(query.getPageNum(),query.getPageSize()); |
| | | if (StringUtils.isNotBlank(query.getPointLonAndLat())) { |
| | | List<String> lonAndLat = query.getPointLonAndLat().trim().contains(",") ? Arrays.asList(query.getPointLonAndLat().split(",")) : |