From 9ac149efc825b9237d5e483d63dd15604f0bc30b Mon Sep 17 00:00:00 2001
From: zhoushihao <zsh19950802@163.com>
Date: 星期二, 01 四月 2025 17:01:32 +0800
Subject: [PATCH] 1、切割识别界面提供原片尺寸。 2、fixbug：当工程下的版图切割完毕后，界面显示工程号+最大版序+1bug 3、系统参数配置：新增系统参数配置，存入redis，方便后续各个模块调用。后续工作：将各个模块的配置参数由配置文件调整为数据库记录。
---
hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/opctask/entity/EdgStorageDeviceTaskHistory.java | 25 +++++++++++++++++++++++++
1 files changed, 25 insertions(+), 0 deletions(-)
diff --git a/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/opctask/entity/EdgStorageDeviceTaskHistory.java b/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/opctask/entity/EdgStorageDeviceTaskHistory.java
index 9a992c4..a35c5f7 100644
--- a/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/opctask/entity/EdgStorageDeviceTaskHistory.java
+++ b/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/opctask/entity/EdgStorageDeviceTaskHistory.java
@@ -3,7 +3,11 @@
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.extension.activerecord.Model;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
+import org.springframework.format.annotation.DateTimeFormat;
import java.util.Date;
@@ -13,51 +17,72 @@
* @author makejava
* @since 2024-10-27 21:04:33
*/
+@ApiModel(description = "(EdgStorageDeviceTaskHistory)琛ㄥ疄浣撶被")
@SuppressWarnings("serial")
@Data
public class EdgStorageDeviceTaskHistory extends Model<EdgStorageDeviceTaskHistory> {
/**
* 宸ョ▼琛╥d
*/
+ @ApiModelProperty(value = "宸ョ▼琛╥d", position = 1)
@TableId(value = "id", type = IdType.AUTO)
private Long id;
/**
* 杩涚墖鐜荤拑id
*/
+ @ApiModelProperty(value = "杩涚墖鐜荤拑id", position = 2)
private String glassIdIn;
/**
* 鍑虹墖鐜荤拑id
*/
+ @ApiModelProperty(value = "鍑虹墖鐜荤拑id", position = 3)
private String glassIdOut;
/**
* 褰撳墠灞傚彿
*/
+ @ApiModelProperty(value = "褰撳墠灞傚彿", position = 4)
private Integer currentCell;
/**
* 灞傚彿
*/
+ @ApiModelProperty(value = "鐩爣灞傚彿", position = 5)
private Integer startCell;
/**
* 棰勭暀灞傚彿
*/
+ @ApiModelProperty(value = "棰勭暀灞傚彿", position = 6)
private Integer endCell;
/**
* 浠诲姟鐘舵�� 0榛樿绌轰换鍔� 1 杩涚墖 2鍑虹墖 3 鐩撮�� 4鎵ц涓� 5缁撴潫浠诲姟 6鍏朵粬
*/
+ @ApiModelProperty(value = "浠诲姟鐘舵�� 0榛樿绌轰换鍔� 1 杩涚墖 2鍑虹墖 3 鐩撮�� 4鎵ц涓� 5缁撴潫浠诲姟 6鍏朵粬", position = 7)
private Integer taskState;
/**
* 浠诲姟鐘舵�� 0榛樿绌轰换鍔� 1 杩涚墖 2鍑虹墖 3 鐩撮�� 4鎵ц涓� 5缁撴潫浠诲姟 6鍏朵粬
*/
+ @ApiModelProperty(value = "浠诲姟鐘舵�� 0榛樿绌轰换鍔� 1 杩涚墖 2鍑虹墖 3 鐩撮�� 4鎵ц涓� 5缁撴潫浠诲姟 6鍏朵粬", position = 8)
private Integer taskType;
/**
* 鍒涘缓鏃堕棿
*/
+ @ApiModelProperty(value = "鍒涘缓鏃堕棿", position = 9)
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private Date createTime;
/**
* 鏇存柊鏃堕棿
*/
+ @ApiModelProperty(value = "鏇存柊鏃堕棿", position = 10)
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private Date updateTime;
+ /**
+ * 璁惧淇℃伅
+ */
+ @ApiModelProperty(value = "璁惧淇℃伅", position = 11)
+ private Integer deviceId;
+
}
--
Gitblit v1.8.0