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

Compare commits

base: ak:9b7819387e7cae2ebafe436d6a84443a8141c35f
Branches Tags
ak:master
ak:cbs
ak:dev
ak:aikai
..
compare: ak:8ed5a7aea307e3c44198c61e528d5dd69b409fc6
Branches Tags
ak:cbs
ak:dev
ak:aikai
ak:master

No commits in common. "9b7819387e7cae2ebafe436d6a84443a8141c35f" and "8ed5a7aea307e3c44198c61e528d5dd69b409fc6" have entirely different histories.
9b7819387e ... 8ed5a7aea3

8 changed files with 17 additions and 66 deletions
Show Stats Expand all files Collapse all files

48
yudao-module-mqtt/yudao-module-mqtt-api/src/main/java/cn/iocoder/yudao/module/mqtt/api/path/dto/PositionMapLineDTO.java
View File

@ -102,18 +102,16 @@ public class PositionMapLineDTO {
@Schema(description = "终点高") @Schema(description = "终点高")
private Double endHigh; private Double endHigh;
@Schema(description = "车头朝向(0:正正 1:正反 2:反正 3:反反 4正随 5随正 6随反 7反随 8随随) 如果是单向的话 0代表正 1代表反 2代表随意", example = "15890") @Schema(description = "车头朝向(0:正正 1:正反 2:反正 3:反反)", example = "15890")
private Integer toward; private Integer toward;
@Schema(description = "发送给路径规划 车头朝向(0正 1反 2随)", example = "15890") @Schema(description = "发送给路径规划 车头朝向(0正 1反)", example = "15890")
private Integer ppToward; private Integer ppToward;
/** /**
* 双向车道 反向行走变更车头朝向 * 双向车道 反向行走变更车头朝向
* *
* 车头朝向(0:正正 1:正反 2:反正 3:反反 4正随 5随正 6随反 7反随 8随随
*
* @param toward * @param toward
* @return * @return
*/ */
@ -126,48 +124,6 @@ public class PositionMapLineDTO {
return 0; return 0;
} else if (toward == 3) { } else if (toward == 3) {
return 1; return 1;
} else if (toward == 4) {
return 2;
} else if (toward == 5) {
return 0;
} else if (toward == 6) {
return 1;
} else if (toward == 7) {
return 2;
} else if (toward == 8) {
return 2;
} else {
return 0;
}
}
/**
* 双向车道 反向行走变更车头朝向
*
* 车头朝向(0:正正 1:正反 2:反正 3:反反 4正随 5随正 6随反 7反随 8随随
*
* @param toward
* @return
*/
public Integer changeTowardFirst(Integer toward) {
if (toward == 0) {
return 0;
} else if (toward == 1) {
return 0;
} else if (toward == 2) {
return 1;
} else if (toward == 3) {
return 1;
} else if (toward == 4) {
return 0;
} else if (toward == 5) {
return 2;
} else if (toward == 6) {
return 2;
} else if (toward == 7) {
return 1;
} else if (toward == 8) {
return 2;
} else { } else {
return 0; return 0;
} }

2
yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/positionmap/dto/PositionMapLineDTO.java
View File

@ -102,6 +102,6 @@ public class PositionMapLineDTO {
@Schema(description = "终点高") @Schema(description = "终点高")
private BigDecimal endHigh; private BigDecimal endHigh;
@Schema(description = "车头朝向(0:正正 1:正反 2:反正 3:反反 4正随 5随正 6随反 7反随 8随随") @Schema(description = "车头朝向( 0:正正 1:正反 2:反正 3:反反)")
private Integer toward; private Integer toward;
} }

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

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

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

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

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

@ -112,7 +112,7 @@ public class PositionMapLineSaveReqVO {
private BigDecimal reverseSpeedLimit; private BigDecimal reverseSpeedLimit;
@Schema(description = "车头朝向(0:正正 1:正反 2:反正 3:反反 4正随 5随正 6随反 7反随 8随随 如果是单向的话 0代表正 1代表反 2代表随意", example = "15890") @Schema(description = "车头朝向( 0:正正 1:正反 2:反正 3:反反)", example = "15890")
private Integer toward; private Integer toward;
} }

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

@ -169,7 +169,7 @@ public class PositionMapLineDO extends BaseDO {
private BigDecimal reverseSpeedLimit; private BigDecimal reverseSpeedLimit;
/** /**
* 车头朝向(0:正正 1:正反 2:反正 3:反反 4正随 5随正 6随反 7反随 8随随 如果是单向的话 0代表正 1代表反 2代表随意 * 车头朝向(0:正正 1:正反 2:反正 3:反反)
*/ */
private Integer toward; private Integer toward;
} }

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

@ -205,12 +205,10 @@ public class PathPlanningServiceImpl implements PathPlanningService {
List<PositionMapLineDTO> list = new ArrayList<>(); List<PositionMapLineDTO> list = new ArrayList<>();
for (PositionMapLineDTO positionMapLineDO : positionMapLineDOS) { for (PositionMapLineDTO positionMapLineDO : positionMapLineDOS) {
list.add(positionMapLineDO);
if (DirectionEnum.ONE_WAY.getType().equals(positionMapLineDO.getDirection())) { if (DirectionEnum.ONE_WAY.getType().equals(positionMapLineDO.getDirection())) {
positionMapLineDO.setPpToward(positionMapLineDO.getToward()); positionMapLineDO.setPpToward(positionMapLineDO.changeToward(positionMapLineDO.getToward()));
list.add(positionMapLineDO);
} else { } else {
positionMapLineDO.setPpToward(positionMapLineDO.changeTowardFirst(positionMapLineDO.getToward()));
list.add(positionMapLineDO);
list.add(setPositionMapLineDTOData(positionMapLineDO)); list.add(setPositionMapLineDTOData(positionMapLineDO));
} }
} }
@ -282,12 +280,10 @@ public class PathPlanningServiceImpl implements PathPlanningService {
List<PositionMapLineDTO> list = new ArrayList<>(); List<PositionMapLineDTO> list = new ArrayList<>();
for (PositionMapLineDTO positionMapLineDO : positionMapLineDOS) { for (PositionMapLineDTO positionMapLineDO : positionMapLineDOS) {
list.add(positionMapLineDO);
if (DirectionEnum.ONE_WAY.getType().equals(positionMapLineDO.getDirection())) { if (DirectionEnum.ONE_WAY.getType().equals(positionMapLineDO.getDirection())) {
positionMapLineDO.setPpToward(positionMapLineDO.getToward()); positionMapLineDO.setPpToward(positionMapLineDO.changeToward(positionMapLineDO.getToward()));
list.add(positionMapLineDO);
} else { } else {
positionMapLineDO.setPpToward(positionMapLineDO.changeTowardFirst(positionMapLineDO.getToward()));
list.add(positionMapLineDO);
list.add(setPositionMapLineDTOData(positionMapLineDO)); list.add(setPositionMapLineDTOData(positionMapLineDO));
} }
} }
@ -537,7 +533,7 @@ public class PathPlanningServiceImpl implements PathPlanningService {
.expansionZoneAfter(positionMapLineDO.getExpansionZoneFront()) .expansionZoneAfter(positionMapLineDO.getExpansionZoneFront())
.expansionZoneLeft(positionMapLineDO.getExpansionZoneRight()) .expansionZoneLeft(positionMapLineDO.getExpansionZoneRight())
.expansionZoneRight(positionMapLineDO.getExpansionZoneLeft()) .expansionZoneRight(positionMapLineDO.getExpansionZoneLeft())
.ppToward(positionMapLineDO.changeToward(positionMapLineDO.getToward())) .toward(positionMapLineDO.changeToward(positionMapLineDO.getToward()))
.build(); .build();
return build; return build;
} }
@ -552,12 +548,10 @@ public class PathPlanningServiceImpl implements PathPlanningService {
List<PositionMapLineDTO> list = new ArrayList<>(); List<PositionMapLineDTO> list = new ArrayList<>();
for (PositionMapLineDTO positionMapLineDO : positionMapLineDOS) { for (PositionMapLineDTO positionMapLineDO : positionMapLineDOS) {
list.add(positionMapLineDO);
if (DirectionEnum.ONE_WAY.getType().equals(positionMapLineDO.getDirection())) { if (DirectionEnum.ONE_WAY.getType().equals(positionMapLineDO.getDirection())) {
positionMapLineDO.setPpToward(positionMapLineDO.getToward()); positionMapLineDO.setPpToward(positionMapLineDO.changeToward(positionMapLineDO.getToward()));
list.add(positionMapLineDO);
} else { } else {
positionMapLineDO.setPpToward(positionMapLineDO.changeTowardFirst(positionMapLineDO.getToward()));
list.add(positionMapLineDO);
list.add(setPositionMapLineDTOData(positionMapLineDO)); list.add(setPositionMapLineDTOData(positionMapLineDO));
} }
} }

3
yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/positionmap/PositionMapServiceImpl.java
View File

@ -301,7 +301,8 @@ public class PositionMapServiceImpl extends ServiceImpl<PositionMapMapper, Posit
@Override @Override
public void emergencyStopOrRecovery(Long id) { public void emergencyStopOrRecovery(Long id) {
// todo 先获取当前地图上的所有AGV信息 // 先获取当前地图上的所有AGV信息
} }
@Override @Override