#

luxiaotao1123

2024-09-14 2ac6ad1062319d1bfca94550097ace88d6df4a13

 zy-acs-manager/src/main/java/com/zy/acs/manager/manager/entity/Action.java

@@ -149,13 +149,13 @@
     * 租户
     */
    @ApiModelProperty(value= "租户")
    private Integer tenantId;
    private Long tenantId;

    /**
     * 添加人员
     */
    @ApiModelProperty(value= "添加人员")
    private Integer createBy;
    private Long createBy;

    /**
     * 添加时间
@@ -167,7 +167,7 @@
     * 修改人员
     */
    @ApiModelProperty(value= "修改人员")
    private Integer updateBy;
    private Long updateBy;

    /**
     * 修改时间
@@ -180,36 +180,6 @@
     */
    @ApiModelProperty(value= "备注")
    private String memo;

    public Action() {}

    public Action(String uuid,Long busId,Long taskId,String seqNum,Integer priority,String name,Double val,String code,String params,Long actionType,Long actionSts,Long agvId,Date ioTime,Date startTime,Date endTime,Date errTime,String errDesc,Integer status,Integer deleted,Integer tenantId,Integer createBy,Date createTime,Integer updateBy,Date updateTime,String memo) {
        this.uuid = uuid;
        this.busId = busId;
        this.taskId = taskId;
        this.seqNum = seqNum;
        this.priority = priority;
        this.name = name;
        this.val = val;
        this.code = code;
        this.params = params;
        this.actionType = actionType;
        this.actionSts = actionSts;
        this.agvId = agvId;
        this.ioTime = ioTime;
        this.startTime = startTime;
        this.endTime = endTime;
        this.errTime = errTime;
        this.errDesc = errDesc;
        this.status = status;
        this.deleted = deleted;
        this.tenantId = tenantId;
        this.createBy = createBy;
        this.createTime = createTime;
        this.updateBy = updateBy;
        this.updateTime = updateTime;
        this.memo = memo;
    }

    public Action(String uuid, Long busId, Long taskId, String seqNum, Integer priority, String name, Double val, String code, String params, Long actionType, Long actionSts, Long agvId, Date ioTime) {
        this.uuid = uuid;
@@ -226,34 +196,6 @@
        this.agvId = agvId;
        this.ioTime = ioTime;
    }

    //    Action action = new Action(
//            null,    // 编号
//            null,    // 总线
//            null,    // 任务
//            null,    // 动作号
//            null,    // 优先级
//            null,    // 名称
//            null,    // 属性值
//            null,    // 地面码
//            null,    // 动作参数
//            null,    // 动作类型
//            null,    // 动作进度
//            null,    // AGV
//            null,    // 工作时间
//            null,    // 开始时间
//            null,    // 结束时间
//            null,    // 异常时间
//            null,    // 异常描述
//            null,    // 状态[非空]
//            null,    // 是否删除[非空]
//            null,    // 租户
//            null,    // 添加人员
//            null,    // 添加时间[非空]
//            null,    // 修改人员
//            null,    // 修改时间
//            null    // 备注
//    );

    public String getBusId$(){
        BusService service = SpringUtils.getBean(BusService.class);
@@ -321,17 +263,18 @@
        }
    }

    public String getDeleted$(){
        if (null == this.deleted){ return null; }
        switch (this.deleted){
    public Boolean getStatusBool(){
        if (null == this.status){ return null; }
        switch (this.status){
            case 1:
                return "是";
                return true;
            case 0:
                return "否";
                return false;
            default:
                return String.valueOf(this.deleted);
                return null;
        }
    }



}