diff --git a/yudao-module-mqtt/yudao-module-mqtt-api/src/main/java/cn/iocoder/yudao/module/mqtt/api/path/dto/PathToRobotChangeXYArgDTO.java b/yudao-module-mqtt/yudao-module-mqtt-api/src/main/java/cn/iocoder/yudao/module/mqtt/api/path/dto/PathToRobotChangeXYArgDTO.java new file mode 100644 index 000000000..1975580b0 --- /dev/null +++ b/yudao-module-mqtt/yudao-module-mqtt-api/src/main/java/cn/iocoder/yudao/module/mqtt/api/path/dto/PathToRobotChangeXYArgDTO.java @@ -0,0 +1,19 @@ +package cn.iocoder.yudao.module.mqtt.api.path.dto; + +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Data; +import lombok.NoArgsConstructor; + +import java.util.List; + +@Data +@Builder +@NoArgsConstructor +@AllArgsConstructor +public class PathToRobotChangeXYArgDTO { + private List pose2ds; + private PathToRobotChangeXYArgPoseDTO backPose; + private PathToRobotChangeXYArgPoseDTO cargoPose; + +} diff --git a/yudao-module-mqtt/yudao-module-mqtt-api/src/main/java/cn/iocoder/yudao/module/mqtt/api/path/dto/PathToRobotChangeXYArgMovePoseDTO.java b/yudao-module-mqtt/yudao-module-mqtt-api/src/main/java/cn/iocoder/yudao/module/mqtt/api/path/dto/PathToRobotChangeXYArgMovePoseDTO.java new file mode 100644 index 000000000..e2dab4f6b --- /dev/null +++ b/yudao-module-mqtt/yudao-module-mqtt-api/src/main/java/cn/iocoder/yudao/module/mqtt/api/path/dto/PathToRobotChangeXYArgMovePoseDTO.java @@ -0,0 +1,41 @@ +package cn.iocoder.yudao.module.mqtt.api.path.dto; + +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Data; +import lombok.NoArgsConstructor; + +@Data +@Builder +@NoArgsConstructor +@AllArgsConstructor +public class PathToRobotChangeXYArgMovePoseDTO { + /** + * 开始控制点x轴 + */ + private Double actualBeginControlX; + /** + * 开始控制点y轴 + */ + private Double actualBeginControlY; + + /** + * 结束控制点x轴 + */ + private Double actualEndControlX; + /** + * 结束控制点y轴 + */ + private Double actualEndControlY; + + private String id; + + private Integer isEndPose; + private Integer isOldPose; + private Boolean isStraightEdge; + private String poseId; + private Double speed; + private Double x; + private Double y; + private Double yaw; +} diff --git a/yudao-module-mqtt/yudao-module-mqtt-api/src/main/java/cn/iocoder/yudao/module/mqtt/api/path/dto/PathToRobotChangeXYArgPoseDTO.java b/yudao-module-mqtt/yudao-module-mqtt-api/src/main/java/cn/iocoder/yudao/module/mqtt/api/path/dto/PathToRobotChangeXYArgPoseDTO.java new file mode 100644 index 000000000..d9eecb8df --- /dev/null +++ b/yudao-module-mqtt/yudao-module-mqtt-api/src/main/java/cn/iocoder/yudao/module/mqtt/api/path/dto/PathToRobotChangeXYArgPoseDTO.java @@ -0,0 +1,38 @@ +package cn.iocoder.yudao.module.mqtt.api.path.dto; + +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Data; +import lombok.NoArgsConstructor; + +@Data +@Builder +@NoArgsConstructor +@AllArgsConstructor +public class PathToRobotChangeXYArgPoseDTO { + /** + * 开始控制点x轴 + */ + private Double actualBeginControlX; + /** + * 开始控制点y轴 + */ + private Double actualBeginControlY; + + /** + * 结束控制点x轴 + */ + private Double actualEndControlX; + /** + * 结束控制点y轴 + */ + private Double actualEndControlY; + + private String id; + + private Boolean isStraightEdge; + private Double speed; + private Double x; + private Double y; + private Double yaw; +} diff --git a/yudao-module-mqtt/yudao-module-mqtt-api/src/main/java/cn/iocoder/yudao/module/mqtt/api/path/dto/PathToRobotChangeXYDTO.java b/yudao-module-mqtt/yudao-module-mqtt-api/src/main/java/cn/iocoder/yudao/module/mqtt/api/path/dto/PathToRobotChangeXYDTO.java new file mode 100644 index 000000000..cecc3876f --- /dev/null +++ b/yudao-module-mqtt/yudao-module-mqtt-api/src/main/java/cn/iocoder/yudao/module/mqtt/api/path/dto/PathToRobotChangeXYDTO.java @@ -0,0 +1,25 @@ +package cn.iocoder.yudao.module.mqtt.api.path.dto; + +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Data; +import lombok.NoArgsConstructor; + +@Data +@Builder +@NoArgsConstructor +@AllArgsConstructor +public class PathToRobotChangeXYDTO { + //这个实体类不要修改 + //这个实体类不要修改 + //这个实体类不要修改 + //这个实体类不要修改 + //这个实体类不要修改 + private String executionType; + private String orderId; + private String orderType; + private String robotNo; + private String taskType; + + private PathToRobotChangeXYDataDTO data; +} diff --git a/yudao-module-mqtt/yudao-module-mqtt-api/src/main/java/cn/iocoder/yudao/module/mqtt/api/path/dto/PathToRobotChangeXYDataDTO.java b/yudao-module-mqtt/yudao-module-mqtt-api/src/main/java/cn/iocoder/yudao/module/mqtt/api/path/dto/PathToRobotChangeXYDataDTO.java new file mode 100644 index 000000000..2df460ab3 --- /dev/null +++ b/yudao-module-mqtt/yudao-module-mqtt-api/src/main/java/cn/iocoder/yudao/module/mqtt/api/path/dto/PathToRobotChangeXYDataDTO.java @@ -0,0 +1,16 @@ +package cn.iocoder.yudao.module.mqtt.api.path.dto; + +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Data; +import lombok.NoArgsConstructor; + +@Data +@Builder +@NoArgsConstructor +@AllArgsConstructor +public class PathToRobotChangeXYDataDTO { + private PathToRobotChangeXYArgDTO arg; + private String commandType; + private Integer isCommandEnd; +} diff --git a/yudao-module-mqtt/yudao-module-mqtt-api/src/main/java/cn/iocoder/yudao/module/mqtt/api/path/dto/PathToRobotDTO.java b/yudao-module-mqtt/yudao-module-mqtt-api/src/main/java/cn/iocoder/yudao/module/mqtt/api/path/dto/PathToRobotDTO.java index fcd675e58..17c269b05 100644 --- a/yudao-module-mqtt/yudao-module-mqtt-api/src/main/java/cn/iocoder/yudao/module/mqtt/api/path/dto/PathToRobotDTO.java +++ b/yudao-module-mqtt/yudao-module-mqtt-api/src/main/java/cn/iocoder/yudao/module/mqtt/api/path/dto/PathToRobotDTO.java @@ -21,5 +21,6 @@ public class PathToRobotDTO { private Integer isCommandEnd; private String robotNo; private String commandType; + private String taskType; private PathToRobotArgDTO arg; } diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/information/DeviceInformationController.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/information/DeviceInformationController.java index cf30d12c5..ef0c4b25b 100644 --- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/information/DeviceInformationController.java +++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/information/DeviceInformationController.java @@ -75,6 +75,14 @@ public class DeviceInformationController { return success(BeanUtils.toBean(information, DeviceInformationRespVO.class)); } + @GetMapping("/getCameraCode") + @Operation(summary = "获得设备信息的摄像头code") + @Parameter(name = "id", description = "编号", required = true, example = "1024") + @PreAuthorize("@ss.hasPermission('device:information:getCameraCode')") + public CommonResult getCameraCode(@RequestParam("id") Long id) throws Exception { + return success(informationService.getCameraCode(id)); + } + @GetMapping("/list") @Operation(summary = "获得设备信息列表") public CommonResult> getList(@Valid DeviceInformationDTO dto) { diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/robot/vo/RobotModelPageReqVO.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/robot/vo/RobotModelPageReqVO.java index 6a156074d..9c3e3888e 100644 --- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/robot/vo/RobotModelPageReqVO.java +++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/robot/vo/RobotModelPageReqVO.java @@ -45,4 +45,10 @@ public class RobotModelPageReqVO extends PageParam { @Schema(description = "转弯半径(单位米)") private String robotTurningRadius; + + @Schema(description = "X轴偏移量") + private String robotXOffset; + + @Schema(description = "Y轴偏移量") + private String robotYOffset; } \ No newline at end of file diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/robot/vo/RobotModelRespVO.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/robot/vo/RobotModelRespVO.java index d7efaffed..079cba9eb 100644 --- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/robot/vo/RobotModelRespVO.java +++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/robot/vo/RobotModelRespVO.java @@ -49,4 +49,10 @@ public class RobotModelRespVO { @Schema(description = "转弯半径(单位米)") private String robotTurningRadius; + + @Schema(description = "X轴偏移量") + private String robotXOffset; + + @Schema(description = "Y轴偏移量") + private String robotYOffset; } \ No newline at end of file diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/robot/vo/RobotModelSaveReqVO.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/robot/vo/RobotModelSaveReqVO.java index 8e5bb93c0..b565cad7f 100644 --- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/robot/vo/RobotModelSaveReqVO.java +++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/robot/vo/RobotModelSaveReqVO.java @@ -36,4 +36,10 @@ public class RobotModelSaveReqVO { @Schema(description = "转弯半径(单位米)") private String robotTurningRadius; + + @Schema(description = "X轴偏移量") + private String robotXOffset; + + @Schema(description = "Y轴偏移量") + private String robotYOffset; } \ No newline at end of file diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/dataobject/robot/RobotModelDO.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/dataobject/robot/RobotModelDO.java index 7338126b5..2bdf36787 100644 --- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/dataobject/robot/RobotModelDO.java +++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/dataobject/robot/RobotModelDO.java @@ -67,4 +67,14 @@ public class RobotModelDO extends BaseDO { */ private String robotTurningRadius; + /** + * X轴偏移量 + */ + private String robotXOffset; + + /** + * Y轴偏移量 + */ + private String robotYOffset; + } \ No newline at end of file diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/information/DeviceInformationService.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/information/DeviceInformationService.java index ce787b454..c820da361 100644 --- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/information/DeviceInformationService.java +++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/information/DeviceInformationService.java @@ -143,4 +143,11 @@ public interface DeviceInformationService extends IService * @param id */ void deleteDeviceByMapId(Long id); + + /** + * 获取摄像头code + * @param id + * @return + */ + String getCameraCode(Long id) throws Exception; } diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/information/DeviceInformationServiceImpl.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/information/DeviceInformationServiceImpl.java index eceead825..be46ae37f 100644 --- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/information/DeviceInformationServiceImpl.java +++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/information/DeviceInformationServiceImpl.java @@ -474,6 +474,16 @@ public class DeviceInformationServiceImpl extends ServiceImpl