Compare commits

..

No commits in common. "a743e1aff7711c3c65c35c2fb1adf1fbfca00f05" and "28d30da941598388d20f1d0faace15a616abd1f4" have entirely different histories.

7 changed files with 9 additions and 25 deletions

View File

@ -7,6 +7,7 @@ import lombok.Data;
import lombok.NoArgsConstructor;
import java.math.BigDecimal;
import java.time.LocalDateTime;
@Data
@Builder
@ -61,23 +62,6 @@ public class PositionMapLineDTO {
@Schema(description = "膨胀区域右")
private BigDecimal expansionZoneRight;
@Schema(description = "车头朝向( 0:正正 1:正反 2:反正 3:反反)", example = "15890")
@Schema(description = "车头朝向( 0:正向 1:反向)", example = "15890")
private Integer toward;
/**
* 双向车道 反向行走变更车头朝向
* @param toward
* @return
*/
public Integer changeToward(Integer toward) {
if (toward == 0) {
return 3;
} else if (toward == 1) {
return 2;
} else if (toward == 2) {
return 1;
} else {
return 0;
}
}
}

View File

@ -59,6 +59,6 @@ public class PositionMapLineDTO {
@Schema(description = "膨胀区域右")
private BigDecimal expansionZoneRight;
@Schema(description = "车头朝向( 0:正正 1:正反 2:反正 3:反反)")
@Schema(description = "车头朝向( 0:正向 1:反向)")
private Integer toward;
}

View File

@ -78,7 +78,7 @@ public class PositionMapLinePageReqVO extends PageParam {
private LocalDateTime[] createTime;
@Schema(description = "车头朝向( 0:正正 1:正反 2:反正 3:反反)", example = "15890")
@Schema(description = "车头朝向( 0:正向 1:反向)", example = "15890")
private Integer toward;
}

View File

@ -90,8 +90,8 @@ public class PositionMapLineRespVO {
@ExcelProperty("创建时间")
private LocalDateTime createTime;
@Schema(description = "车头朝向( 0:正正 1:正反 2:反正 3:反反)", example = "15890")
@ExcelProperty("车头朝向( 0:正正 1:正反 2:反正 3:反反)")
@Schema(description = "车头朝向( 0:正向 1:反向)", example = "15890")
@ExcelProperty("车头朝向( 0:正向 1:反向)")
private Integer toward;
}

View File

@ -71,7 +71,7 @@ public class PositionMapLineSaveReqVO {
private BigDecimal reverseSpeedLimit;
@Schema(description = "车头朝向( 0:正正 1:正反 2:反正 3:反反)", example = "15890")
@Schema(description = "车头朝向( 0:正向 1:反向)", example = "15890")
private Integer toward;
}

View File

@ -108,7 +108,7 @@ public class PositionMapLineDO extends BaseDO {
private BigDecimal reverseSpeedLimit;
/**
* 车头朝向(0:正正 1:正反 2:反正 3:反反)
* 车头朝向( 0:正向 1:反向)
*/
private Integer toward;
}

View File

@ -367,7 +367,7 @@ public class PathPlanningServiceImpl implements PathPlanningService {
.expansionZoneAfter(positionMapLineDO.getExpansionZoneFront())
.expansionZoneLeft(positionMapLineDO.getExpansionZoneRight())
.expansionZoneRight(positionMapLineDO.getExpansionZoneLeft())
.toward(positionMapLineDO.changeToward(positionMapLineDO.getToward()))
.toward(positionMapLineDO.getToward())
.build();
return build;
}