java/Robotaxi.git

			@@ -27,6 +27,7 @@
			import com.xiaopeng.operation.mapper.XpElectronicFenceMapper;
			import com.xiaopeng.operation.mapper.XpPointMapper;
			import com.xiaopeng.operation.mapper.XpRegionMapper;
			import com.xiaopeng.operation.service.IXpElectronicFenceAreaService;
			import com.xiaopeng.operation.service.IXpElectronicFenceService;
			import com.xiaopeng.operation.utils.GDMapGeocodingUtil;
			import com.xiaopeng.operation.utils.PolygonOverlapService;
			@@ -70,6 +71,9 @@
			private XpRegionMapper xpRegionMapper;
			@Autowired
			private GDMapGeocodingUtil gdMapGeocodingUtil;

			@Resource
			private IXpElectronicFenceAreaService xpElectronicFenceAreaService;

			@Override
			public PageInfo<XpElectronicFence> pageList(ElectronicPageListQuery query) {
			@@ -389,9 +393,7 @@
			dto.setCityCode(cityCode);
			xpElectronicFence.setCityCode(dto.getCityCode());
			this.updateById(xpElectronicFence);
			// 删除旧的区域数据，然后保存新的区域数据
			xpElectronicFenceAreaMapper.delete(new LambdaQueryWrapper<XpElectronicFenceArea>()
			.eq(XpElectronicFenceArea::getElectronicId, dto.getId()));

			if (xpElectronicFence.getStatus() == 2) {
			// 设置电子围栏ID并保存区域数据
			for (XpElectronicFenceArea area : updatedElectronicFenceAreas) {
			@@ -399,7 +401,7 @@
			area.setAreaStatus(1);
			area.setArea(area.getArea());
			area.setCityCode(dto.getCityCode());
			xpElectronicFenceAreaMapper.insert(area);
			xpElectronicFenceAreaService.saveOrUpdate(area);
			}
			}else{
			// 设置电子围栏ID并保存区域数据
			@@ -408,7 +410,7 @@
			area.setAreaStatus(2);
			area.setArea(area.getArea());
			area.setCityCode(dto.getCityCode());
			xpElectronicFenceAreaMapper.insert(area);
			xpElectronicFenceAreaService.saveOrUpdate(area);
			}
			}
			if (dto.getStatus() == 1 \|\| dto.getStatus() == 2) {

	xp-robotaxi-api/src/main/java/com/xiaopeng/api/dto/operation/ElectronicFenceUpdateDto.java	3 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	xp-robotaxi-operation-boot/src/main/java/com/xiaopeng/operation/service/impl/XpElectronicFenceServiceImpl.java	12 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史

			@@ -19,8 +19,7 @@
			@ApiModelProperty(value = "id")
			@NotNull(message = "id不能为空")
			private Long id;
			@ApiModelProperty(value = "围栏名称")
			@NotEmpty(message = "所属市区不能为空")
			@ApiModelProperty(value = "城市code")
			private String cityCode;
			@ApiModelProperty(value = "围栏名称")
			@NotEmpty(message = "围栏名称不能为空")