java/Robotaxi.git

			@@ -2,13 +2,13 @@


			import cn.hutool.core.collection.CollUtil;
			import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
			import com.baomidou.mybatisplus.core.toolkit.Wrappers;
			import com.xiaopeng.api.dto.operation.ElectronicFenceAddDto;
			import com.xiaopeng.api.dto.operation.ElectronicFenceAreaUpdateStatusDto;
			import com.xiaopeng.api.dto.operation.ElectronicFenceUpdateDto;
			import com.xiaopeng.api.model.operation.XpElectronicFence;
			import com.xiaopeng.api.model.operation.XpElectronicFenceArea;
			import com.xiaopeng.api.model.operation.XpRegion;
			import com.xiaopeng.api.feignClient.map.XpStationClient;
			import com.xiaopeng.api.model.operation.*;
			import com.xiaopeng.api.query.operation.ElectronicPageListQuery;
			import com.xiaopeng.api.vo.operation.ElectronicFenceDetailVo;
			import com.xiaopeng.common.core.domain.R;
			@@ -16,9 +16,7 @@
			import com.xiaopeng.common.core.utils.bean.BeanUtils;
			import com.xiaopeng.common.core.web.page.PageInfo;
			import com.xiaopeng.operation.constant.I18nKeyConstant;
			import com.xiaopeng.operation.service.IXpElectronicFenceAreaService;
			import com.xiaopeng.operation.service.IXpElectronicFenceService;
			import com.xiaopeng.operation.service.XpRegionService;
			import com.xiaopeng.operation.service.*;
			import io.swagger.annotations.ApiOperation;
			import lombok.extern.slf4j.Slf4j;
			import org.apache.shardingsphere.transaction.annotation.ShardingSphereTransactionType;
			@@ -31,6 +29,7 @@
			import java.util.Collection;
			import java.util.Collections;
			import java.util.List;
			import java.util.stream.Collectors;

			/**
			* <p>
			@@ -55,6 +54,15 @@

			@Resource
			private XpRegionService regionService;

			@Resource
			private XpPointService xpPointService;

			@Resource
			private XpStationClient stationClient;



			/**
			* 查询省市管理
			*/
			@@ -127,6 +135,11 @@
			List<XpElectronicFenceArea> electronicFenceAreaList = xpElectronicFenceAreaService.lambdaQuery().eq(XpElectronicFenceArea::getElectronicId, id)
			.list();
			res.setElectronicFenceAreas(electronicFenceAreaList);
			List<Long> longList = electronicFenceAreaList.stream().map(XpElectronicFenceArea::getId).collect(Collectors.toList());
			List<XpPoint> xpPointList = xpPointService.list(new QueryWrapper<XpPoint>().in("electronic_area_id", longList));
			res.setXpPointList(xpPointList);
			List<XpStation> data = stationClient.getXpStationByElectronicId(id).getData();
			res.setXpStationList(data);
			return R.ok(res);
			}