From 17ce02ec6fefa4e8b9ac870e2b52dea0942f5597 Mon Sep 17 00:00:00 2001
From: wente <329538422@qq.com>
Date: 星期四, 05 十二月 2024 09:40:30 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
modules/mainPart/src/main/java/com/zt/life/modules/mainPart/taskReliability/model/SimulatAssess.java | 33 +++++++++++++++++++++++++++------
1 files changed, 27 insertions(+), 6 deletions(-)
diff --git a/modules/mainPart/src/main/java/com/zt/life/modules/mainPart/taskReliability/model/SimulatAssess.java b/modules/mainPart/src/main/java/com/zt/life/modules/mainPart/taskReliability/model/SimulatAssess.java
index 780f12d..1f0d47f 100644
--- a/modules/mainPart/src/main/java/com/zt/life/modules/mainPart/taskReliability/model/SimulatAssess.java
+++ b/modules/mainPart/src/main/java/com/zt/life/modules/mainPart/taskReliability/model/SimulatAssess.java
@@ -3,7 +3,6 @@
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableName;
import com.zt.common.entity.BusiEntity;
-import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.EqualsAndHashCode;
@@ -22,11 +21,11 @@
public class SimulatAssess extends BusiEntity {
private static final long serialVersionUID = 1L;
- @ApiModelProperty(value = "涓婄骇ID")
- private Long pid;
-
@ApiModelProperty(value = "浜у搧鑺傜偣ID")
private Long productId;
+
+ @ApiModelProperty(value = "浠跨湡鍚嶇О")
+ private String name;
@ApiModelProperty(value = "鎬讳綋浠诲姟妯″瀷ID")
private Long taskModelId;
@@ -38,13 +37,35 @@
private Integer simulatFrequency;
@TableField(exist = false)
- private Long showProductId;
+ private String showProductId;
@TableField(exist = false)
private String dataType;
+ @TableField(exist = false)
+ private Double taskDuration;
+
+ @TableField(exist = false)
+ private Boolean repairDiracFlag;
+
@ApiModelProperty(value = "浼犵粰绠楁硶搴撶殑xml")
private String xml;
- private String name;
+ @ApiModelProperty(value = "绠楁硶搴撹繘绋婭D")
+ private Long pid;
+
+ @ApiModelProperty(value = "绠楁硶搴撹繘绋嬫槸鍚﹀瓨娲�")
+ private Boolean processIsAlive;
+
+ @ApiModelProperty(value = "鍚姩鍛戒护琛�")
+ private String commandLine;
+
+ @ApiModelProperty(value = "璁＄畻杩涘害")
+ private Integer progress;
+
+ @ApiModelProperty(value = "绠楁硶搴撹繘绋嬪惎鍔ㄦ椂闂�")
+ private Date processStartTime;
+
+ @ApiModelProperty(value = "绠楁硶搴撹繘绋嬬粓姝㈡椂闂�")
+ private Date processEndTime;
}
--
Gitblit v1.9.1