ak/zn-cloud-wcs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

处理冲突

Browse Source
This commit is contained in:
cbs 2025-02-15 09:26:02 +08:00
parent 570852382f
commit 30e724afe8
6 changed files with 18 additions and 114 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/constant/path/PathPlanningTopicConstant.java
View File

@ -5,9 +5,24 @@ package cn.iocoder.yudao.module.system.constant.path;
*/
public class PathPlanningTopicConstant {
/**
* 同步地图点位
* 同步全部地图点位
*/
public static String SYNCHRONOUS_MAP_POINT = "SYNCHRONOUS_MAP_POINT";
public static String SYNCHRONOUS_ALL_MAP_POINT = "SYNCHRONOUS_MAP_POINT";
/**
* 添加地图点位给PP
*/
public static String ADD_MAP_POINT = "ADD_MAP_POINT";
/**
* 删除地图点位
*/
public static String DELETE_MAP_POINT = "DELETE_MAP_POINT";
/**
* 更新地图点位
*/
public static String UPDATE_MAP_POINT = "UPDATE_MAP_POINT";

23
yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/positionmap/vo/PositionMapLinePageReqVO.java
View File

@ -68,29 +68,6 @@ public class PositionMapLinePageReqVO extends PageParam {
@DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
private LocalDateTime[] createTime;
@Schema(description = "开始控制点x轴")
private String beginControlX;
@Schema(description = "开始控制点y轴")
private String beginControlY;
@Schema(description = "结束控制点x轴")
private String endControlX;
@Schema(description = "结束控制点y轴")
private String endControlY;
@Schema(description = "膨胀区域前")
private BigDecimal expansionZoneFront;
@Schema(description = "膨胀区域后")
private BigDecimal expansionZoneAfter;
@Schema(description = "膨胀区域左")
private BigDecimal expansionZoneLeft;
@Schema(description = "膨胀区域右")
private BigDecimal expansionZoneRight;
@Schema(description = "车头朝向( 0:正向 1:反向)", example = "15890")
private Integer toward;

32
yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/positionmap/vo/PositionMapLineRespVO.java
View File

@ -81,38 +81,6 @@ public class PositionMapLineRespVO {
@ExcelProperty("创建时间")
private LocalDateTime createTime;
@Schema(description = "开始控制点x轴")
@ExcelProperty("开始控制点x轴")
private String beginControlX;
@Schema(description = "开始控制点y轴")
@ExcelProperty("开始控制点y轴")
private String beginControlY;
@Schema(description = "结束控制点x轴")
@ExcelProperty("结束控制点x轴")
private String endControlX;
@Schema(description = "结束控制点y轴")
@ExcelProperty("结束控制点y轴")
private String endControlY;
@Schema(description = "膨胀区域前")
@ExcelProperty("膨胀区域前")
private BigDecimal expansionZoneFront;
@Schema(description = "膨胀区域后")
@ExcelProperty("膨胀区域后")
private BigDecimal expansionZoneAfter;
@Schema(description = "膨胀区域左")
@ExcelProperty("膨胀区域左")
private BigDecimal expansionZoneLeft;
@Schema(description = "膨胀区域右")
@ExcelProperty("膨胀区域右")
private BigDecimal expansionZoneRight;
@Schema(description = "车头朝向( 0:正向 1:反向)", example = "15890")
@ExcelProperty("车头朝向( 0:正向 1:反向)")
private Integer toward;

23
yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/positionmap/vo/PositionMapLineSaveReqVO.java
View File

@ -61,29 +61,6 @@ public class PositionMapLineSaveReqVO {
@Schema(description = "反向限速(m/s)", example = "15890")
private BigDecimal reverseSpeedLimit;
@Schema(description = "开始控制点x轴")
private String beginControlX;
@Schema(description = "开始控制点y轴")
private String beginControlY;
@Schema(description = "结束控制点x轴")
private String endControlX;
@Schema(description = "结束控制点y轴")
private String endControlY;
@Schema(description = "膨胀区域前")
private BigDecimal expansionZoneFront;
@Schema(description = "膨胀区域后")
private BigDecimal expansionZoneAfter;
@Schema(description = "膨胀区域左")
private BigDecimal expansionZoneLeft;
@Schema(description = "膨胀区域右")
private BigDecimal expansionZoneRight;
@Schema(description = "车头朝向( 0:正向 1:反向)", example = "15890")
private Integer toward;

33
yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/dataobject/positionmap/PositionMapLineDO.java
View File

@ -91,39 +91,6 @@ public class PositionMapLineDO extends BaseDO {
*/
private BigDecimal reverseSpeedLimit;
/**
* 开始控制点x轴
*/
private String beginControlX;
/**
* 开始控制点y轴
*/
private String beginControlY;
/**
* 结束控制点x轴
*/
private String endControlX;
/**
* 结束控制点y轴
*/
private String endControlY;
/**
* 膨胀区域前
*/
private BigDecimal expansionZoneFront;
/**
* 膨胀区域后
*/
private BigDecimal expansionZoneAfter;
/**
* 膨胀区域左
*/
private BigDecimal expansionZoneLeft;
/**
* 膨胀区域右
*/
private BigDecimal expansionZoneRight;
/**
* 车头朝向( 0:正向 1:反向)
*/

2
yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/path/PathPlanningServiceImpl.java
View File

@ -116,7 +116,7 @@ public class PathPlanningServiceImpl implements PathPlanningService {
relatedPathNode.setControl_nodes(list);
pathPlanningApi.synchronousPointToPP(relatedPathNode, PathPlanningTopicConstant.SYNCHRONOUS_MAP_POINT);
pathPlanningApi.synchronousPointToPP(relatedPathNode, PathPlanningTopicConstant.SYNCHRONOUS_ALL_MAP_POINT);
});
}