From 77e54aec65693683bc2b9ac50e08df6a06c53493 Mon Sep 17 00:00:00 2001
From: L <L@132>
Date: 星期三, 22 四月 2026 17:03:38 +0800
Subject: [PATCH] *
---
src/main/java/com/zy/asrs/entity/BasRgvOpt.java | 78 +++++++++++++++++++++++++++------------
1 files changed, 54 insertions(+), 24 deletions(-)
diff --git a/src/main/java/com/zy/asrs/entity/BasRgvOpt.java b/src/main/java/com/zy/asrs/entity/BasRgvOpt.java
index a12bd5a..9cbcc02 100644
--- a/src/main/java/com/zy/asrs/entity/BasRgvOpt.java
+++ b/src/main/java/com/zy/asrs/entity/BasRgvOpt.java
@@ -1,10 +1,14 @@
package com.zy.asrs.entity;
-import com.core.common.Cools;import com.baomidou.mybatisplus.annotations.TableId;
-import com.baomidou.mybatisplus.enums.IdType;
-import com.baomidou.mybatisplus.annotations.TableField;
+import com.core.common.Cools;import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
import java.text.SimpleDateFormat;
import java.util.Date;
+
+import com.zy.core.enums.RgvTaskModeType;
+import com.zy.core.model.command.RgvCommand;
+import com.zy.core.model.protocol.RgvProtocol;
import org.springframework.format.annotation.DateTimeFormat;
import java.text.SimpleDateFormat;
import java.util.Date;
@@ -12,9 +16,9 @@
import com.zy.system.service.UserService;
import com.zy.system.entity.User;
-import io.swagger.annotations.ApiModelProperty;
+import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
-import com.baomidou.mybatisplus.annotations.TableName;
+import com.baomidou.mybatisplus.annotation.TableName;
import java.io.Serializable;
@Data
@@ -26,35 +30,35 @@
/**
* ID
*/
- @ApiModelProperty(value= "ID")
- @TableId(value = "id", type = IdType.INPUT)
+ @Schema(description = "ID")
+ @TableId(value = "id", type = IdType.AUTO)
private Long id;
/**
* 浠诲姟鍙�1
*/
- @ApiModelProperty(value= "浠诲姟鍙�1")
+ @Schema(description = "浠诲姟鍙�1")
@TableField("wrk_no1")
private Integer wrkNo1;
/**
* 浠诲姟鍙�2
*/
- @ApiModelProperty(value= "浠诲姟鍙�2")
+ @Schema(description = "浠诲姟鍙�2")
@TableField("wrk_no2")
private Integer wrkNo2;
/**
* 绌挎杞�
*/
- @ApiModelProperty(value= "绌挎杞�")
+ @Schema(description = "绌挎杞�")
@TableField("rgv_no")
private Integer rgvNo;
/**
* 涓嬪彂鏃堕棿
*/
- @ApiModelProperty(value= "涓嬪彂鏃堕棿")
+ @Schema(description = "涓嬪彂鏃堕棿")
@TableField("send_time")
@DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
private Date sendTime;
@@ -62,75 +66,75 @@
/**
* 浣滀笟
*/
- @ApiModelProperty(value= "浣滀笟")
+ @Schema(description = "浣滀笟")
private String mode;
/**
* 婧愭帓
*/
- @ApiModelProperty(value= "婧愭帓")
+ @Schema(description = "婧愭帓")
@TableField("source_row")
private Integer sourceRow;
/**
* 婧愬垪
*/
- @ApiModelProperty(value= "婧愬垪")
+ @Schema(description = "婧愬垪")
@TableField("source_bay")
private Integer sourceBay;
/**
* 婧愬眰
*/
- @ApiModelProperty(value= "婧愬眰")
+ @Schema(description = "婧愬眰")
@TableField("source_lev")
private Integer sourceLev;
/**
* 婧愮珯
*/
- @ApiModelProperty(value= "婧愮珯")
+ @Schema(description = "婧愮珯")
@TableField("source_sta")
private Integer sourceSta;
/**
* 鐩爣鎺�
*/
- @ApiModelProperty(value= "鐩爣鎺�")
+ @Schema(description = "鐩爣鎺�")
@TableField("pos_row")
private Integer posRow;
/**
* 鐩爣鍒�
*/
- @ApiModelProperty(value= "鐩爣鍒�")
+ @Schema(description = "鐩爣鍒�")
@TableField("pos_bay")
private Integer posBay;
/**
* 鐩爣灞�
*/
- @ApiModelProperty(value= "鐩爣灞�")
+ @Schema(description = "鐩爣灞�")
@TableField("pos_lev")
private Integer posLev;
/**
* 鐩爣绔�
*/
- @ApiModelProperty(value= "鐩爣绔�")
+ @Schema(description = "鐩爣绔�")
@TableField("pos_sta")
private Integer posSta;
/**
* 鍝嶅簲缁撴灉 1: 姝ｅ父 0: 澶辫触
*/
- @ApiModelProperty(value= "鍝嶅簲缁撴灉 1: 姝ｅ父 0: 澶辫触 ")
+ @Schema(description = "鍝嶅簲缁撴灉 1: 姝ｅ父 0: 澶辫触 ")
private Integer response;
/**
* 淇敼鏃堕棿
*/
- @ApiModelProperty(value= "淇敼鏃堕棿")
+ @Schema(description = "淇敼鏃堕棿")
@TableField("update_time")
@DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
private Date updateTime;
@@ -138,17 +142,43 @@
/**
* 淇敼浜哄憳
*/
- @ApiModelProperty(value= "淇敼浜哄憳")
+ @Schema(description = "淇敼浜哄憳")
@TableField("update_by")
private Long updateBy;
/**
* 澶囨敞
*/
- @ApiModelProperty(value= "澶囨敞")
+ @Schema(description = "澶囨敞")
private String memo;
public BasRgvOpt() {}
+ public BasRgvOpt(Integer taskNo,int rgvNo,int rgvPoi, RgvCommand command) {
+ Date now = new Date();
+ this.wrkNo1 = taskNo;
+ this.rgvNo = rgvNo;
+ this.sendTime = now;
+ this.mode = command.getTaskModeType1().name();
+ this.sourceRow = rgvPoi;//灏忚溅褰撳墠浣嶇疆
+ this.sourceSta = command.getSourceStaNo1().intValue();
+ this.posSta = command.getDestinationStaNo1().intValue();
+ this.updateTime = now;
+ this.updateBy = 9999L;
+ this.memo = "浠诲姟涓嬪彂鑷姩鐢熸垚鎸囦护鏃ュ織";
+ }
+ public BasRgvOpt(Integer taskNo,int rgvNo,int rgvPoi, Long command) {
+ Date now = new Date();
+ this.wrkNo1 = taskNo;
+ this.rgvNo = rgvNo;
+ this.sendTime = now;
+ this.mode = "婕父";
+ this.sourceRow = rgvPoi;//灏忚溅褰撳墠浣嶇疆
+ this.sourceSta = rgvPoi;
+ this.posSta = command.intValue();
+ this.updateTime = now;
+ this.updateBy = 9999L;
+ this.memo = "婕父浠诲姟瑙﹀彂";
+ }
public BasRgvOpt(Integer wrkNo1,Integer wrkNo2,Integer rgvNo,Date sendTime,String mode,Integer sourceRow,Integer sourceBay,Integer sourceLev,Integer sourceSta,Integer posRow,Integer posBay,Integer posLev,Integer posSta,Integer response,Date updateTime,Long updateBy,String memo) {
this.wrkNo1 = wrkNo1;
--
Gitblit v1.9.1