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

Merge branch 'dev' of http://git.znkjfw.com/ak/zn-cloud-wcs into aikai

Browse Source
This commit is contained in:
aikai 2025-01-13 14:54:47 +08:00
commit e490462195
4 changed files with 29 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/robot/vo/RobotInformationPageReqVO.java
View File

@ -14,7 +14,7 @@ import static cn.iocoder.yudao.framework.common.util.date.DateUtils.FORMAT_YEAR_
@ToString(callSuper = true)
public class RobotInformationPageReqVO extends PageParam {
@Schema(description = "车辆类型表id", example = "26319")
@Schema(description = "车辆类型表id", example = "28234")
private Long robotModelId;
@Schema(description = "车辆类型")
@ -32,9 +32,12 @@ public class RobotInformationPageReqVO extends PageParam {
@Schema(description = "上传图片附件", example = "https://www.iocoder.cn")
private String url;
@Schema(description = "AGV状态（0：暂停且无任务、1：暂停(有处理中的任务)、2：任务中、3：待命）", example = "1")
@Schema(description = "AGV状态（0：暂停且无任务、1：暂停(有处理中的任务)、2：任务中、3：待命）", example = "2")
private Integer robotStatus;
@Schema(description = "楼层/区域(json)")
private String floorAreaJson;
@Schema(description = "创建时间")
@DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
private LocalDateTime[] createTime;

11
yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/robot/vo/RobotInformationRespVO.java
View File

@ -2,7 +2,6 @@ package cn.iocoder.yudao.module.system.controller.admin.robot.vo;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.*;
import java.time.LocalDateTime;
import com.alibaba.excel.annotation.*;
@ -11,11 +10,11 @@ import com.alibaba.excel.annotation.*;
@ExcelIgnoreUnannotated
public class RobotInformationRespVO {
@Schema(description = "主键ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "24068")
@Schema(description = "主键ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "21881")
@ExcelProperty("主键ID")
private Long id;
@Schema(description = "车辆类型表id", example = "26319")
@Schema(description = "车辆类型表id", example = "28234")
@ExcelProperty("车辆类型表id")
private Long robotModelId;
@ -39,10 +38,14 @@ public class RobotInformationRespVO {
@ExcelProperty("上传图片附件")
private String url;
@Schema(description = "AGV状态（0：暂停且无任务、1：暂停(有处理中的任务)、2：任务中、3：待命）", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
@Schema(description = "AGV状态（0：暂停且无任务、1：暂停(有处理中的任务)、2：任务中、3：待命）", requiredMode = Schema.RequiredMode.REQUIRED, example = "2")
@ExcelProperty("AGV状态（0：暂停且无任务、1：暂停(有处理中的任务)、2：任务中、3：待命）")
private Integer robotStatus;
@Schema(description = "楼层/区域(json)")
@ExcelProperty("楼层/区域(json)")
private String floorAreaJson;
@Schema(description = "创建时间", requiredMode = Schema.RequiredMode.REQUIRED)
@ExcelProperty("创建时间")
private LocalDateTime createTime;

17
yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/robot/vo/RobotInformationSaveReqVO.java
View File

@ -3,34 +3,43 @@ package cn.iocoder.yudao.module.system.controller.admin.robot.vo;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.*;
import javax.validation.constraints.*;
import javax.validation.constraints.NotEmpty;
@Schema(description = "管理后台 - 车辆信息新增/修改 Request VO")
@Data
public class RobotInformationSaveReqVO {
@Schema(description = "主键ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "24068")
@Schema(description = "主键ID", requiredMode = Schema.RequiredMode.REQUIRED, example = "21881")
private Long id;
@Schema(description = "车辆类型表id", example = "26319")
@Schema(description = "车辆类型表id", example = "28234")
@NotEmpty(message = "车辆类型不能为空")
private Long robotModelId;
@Schema(description = "车辆类型")
@NotEmpty(message = "车辆类型不能为空")
private String robotModelNumber;
@Schema(description = "AGV编号")
@NotEmpty(message = "AGV编号不能为空")
private String robotNo;
@Schema(description = "任务模式（0：拒收任务、1：正常）", requiredMode = Schema.RequiredMode.REQUIRED)
@NotEmpty(message = "任务模式不能为空")
private Integer robotTaskModel;
@Schema(description = "mac地址")
@NotEmpty(message = "mac地址不能为空")
private String macAddress;
@Schema(description = "上传图片附件", example = "https://www.iocoder.cn")
private String url;
@Schema(description = "AGV状态（0：暂停且无任务、1：暂停(有处理中的任务)、2：任务中、3：待命）", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
@Schema(description = "AGV状态（0：暂停且无任务、1：暂停(有处理中的任务)、2：任务中、3：待命）", requiredMode = Schema.RequiredMode.REQUIRED, example = "2")
private Integer robotStatus;
@Schema(description = "楼层/区域(json)")
@NotEmpty(message = "楼层/区域不能为空")
private String floorAreaJson;
}

7
yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/dataobject/robot/RobotInformationDO.java
View File

@ -1,9 +1,6 @@
package cn.iocoder.yudao.module.system.dal.dataobject.robot;
import lombok.*;
import java.util.*;
import java.time.LocalDateTime;
import java.time.LocalDateTime;
import com.baomidou.mybatisplus.annotation.*;
import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO;
@ -55,5 +52,9 @@ public class RobotInformationDO extends BaseDO {
* AGV状态（0：暂停且无任务、1：暂停(有处理中的任务)、2：任务中、3：待命）
*/
private Integer robotStatus;
/**
* 楼层/区域(json)
*/
private String floorAreaJson;
}