From fc67e7de548d5fc4ba84a2c09d3e99aad2fc11d7 Mon Sep 17 00:00:00 2001
From: Junjie <fallin.jie@qq.com>
Date: 星期三, 29 四月 2026 20:35:19 +0800
Subject: [PATCH] #堆垛机任务执行优先级修改
---
src/main/java/com/zy/asrs/entity/DeviceDataLog.java | 72 ++++++++++++++++++++++-------------
1 files changed, 45 insertions(+), 27 deletions(-)
diff --git a/src/main/java/com/zy/asrs/entity/DeviceDataLog.java b/src/main/java/com/zy/asrs/entity/DeviceDataLog.java
index e49268d..c000b85 100644
--- a/src/main/java/com/zy/asrs/entity/DeviceDataLog.java
+++ b/src/main/java/com/zy/asrs/entity/DeviceDataLog.java
@@ -1,16 +1,15 @@
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 java.text.SimpleDateFormat;
-import java.util.Date;
-import org.springframework.format.annotation.DateTimeFormat;
-
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
-import com.baomidou.mybatisplus.annotations.TableName;
+import org.springframework.format.annotation.DateTimeFormat;
+
import java.io.Serializable;
+import java.util.Date;
@Data
@TableName("wcs_device_data_log")
@@ -18,62 +17,81 @@
private static final long serialVersionUID = 1L;
- @ApiModelProperty(value= "")
+ @ApiModelProperty(value = "")
@TableId(value = "id", type = IdType.AUTO)
private Long id;
/**
* 璁惧绫诲瀷
*/
- @ApiModelProperty(value= "璁惧绫诲瀷")
+ @ApiModelProperty(value = "璁惧绫诲瀷")
private String type;
/**
* 璁惧鍙�
*/
- @ApiModelProperty(value= "璁惧鍙�")
+ @ApiModelProperty(value = "璁惧鍙�")
@TableField("device_no")
private Integer deviceNo;
/**
+ * 绔欑偣鍙�
+ */
+ @ApiModelProperty(value = "绔欑偣鍙�")
+ @TableField("station_id")
+ private Integer stationId;
+
+ /**
* 婧愭暟鎹�
*/
- @ApiModelProperty(value= "婧愭暟鎹�")
+ @ApiModelProperty(value = "婧愭暟鎹�")
@TableField("origin_data")
private String originData;
/**
* 婧愭暟鎹В鏋愬悗寰楀埌鐨剋cs鏁版嵁
*/
- @ApiModelProperty(value= "婧愭暟鎹В鏋愬悗寰楀埌鐨剋cs鏁版嵁")
+ @ApiModelProperty(value = "婧愭暟鎹В鏋愬悗寰楀埌鐨剋cs鏁版嵁")
@TableField("wcs_data")
private String wcsData;
/**
* 閲囬泦鏃堕棿
*/
- @ApiModelProperty(value= "閲囬泦鏃堕棿")
+ @ApiModelProperty(value = "閲囬泦鏃堕棿")
@TableField("create_time")
- @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date createTime;
- public DeviceDataLog() {}
+ /**
+ * 鍥炴斁搴忓彿锛屼粎鐢ㄤ簬鏂囦欢鏃ュ織椤哄簭绋冲畾鍖栵紝V1 涓嶈惤搴撱��
+ */
+ @ApiModelProperty(value = "鍥炴斁搴忓彿")
+ @TableField(exist = false)
+ private Long sampleSeq;
- public DeviceDataLog(String type,Integer deviceNo,String originData,String wcsData,Date createTime) {
+ /**
+ * 鍥炴斁鏃堕棿鎴筹紙姣锛夛紝浼樺厛浣跨敤閲囬泦鏃跺埢锛屽吋瀹规棫鏃ュ織鍙负绌恒��
+ */
+ @ApiModelProperty(value = "鍥炴斁鏃堕棿鎴筹紙姣锛�")
+ @TableField(exist = false)
+ private Long sampleTimeMs;
+
+ /**
+ * 鏃ュ織鍗忚鐗堟湰锛屼究浜庡洖鏀句晶鍏煎鏃х粨鏋勩��
+ */
+ @ApiModelProperty(value = "鏃ュ織鍗忚鐗堟湰")
+ @TableField(exist = false)
+ private Integer schemaVersion;
+
+ public DeviceDataLog() {
+ }
+
+ public DeviceDataLog(String type, Integer deviceNo, String originData, String wcsData, Date createTime) {
this.type = type;
this.deviceNo = deviceNo;
this.originData = originData;
this.wcsData = wcsData;
this.createTime = createTime;
}
-
-// DeviceDataLog deviceDataLog = new DeviceDataLog(
-// null, // 璁惧绫诲瀷
-// null, // 璁惧鍙�
-// null, // 婧愭暟鎹�
-// null, // 婧愭暟鎹В鏋愬悗寰楀埌鐨剋cs鏁版嵁
-// null // 閲囬泦鏃堕棿
-// );
-
-
}
--
Gitblit v1.9.1