From a8ce806c8a81f685fa9fafaa453820197ced9961 Mon Sep 17 00:00:00 2001
From: jinlin <jinlin>
Date: 星期二, 10 十二月 2024 10:39:39 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
modules/mainPart/src/main/java/com/zt/life/modules/mainPart/basicInfo/model/XhProductModel.java | 57 +++++++++++++++++++++++++++++++++++++++++++++++----------
1 files changed, 47 insertions(+), 10 deletions(-)
diff --git a/modules/mainPart/src/main/java/com/zt/life/modules/mainPart/basicInfo/model/XhProductModel.java b/modules/mainPart/src/main/java/com/zt/life/modules/mainPart/basicInfo/model/XhProductModel.java
index 0faecf3..c97b23e 100644
--- a/modules/mainPart/src/main/java/com/zt/life/modules/mainPart/basicInfo/model/XhProductModel.java
+++ b/modules/mainPart/src/main/java/com/zt/life/modules/mainPart/basicInfo/model/XhProductModel.java
@@ -4,6 +4,8 @@
import com.baomidou.mybatisplus.annotation.TableName;
import com.zt.common.entity.BusiEntity;
import com.zt.common.entity.TreeNode;
+import com.zt.common.utils.UUIDUtil;
+import com.zt.life.core.model.ZtProduct;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@@ -14,39 +16,74 @@
import java.util.List;
/**
- * xh_product_model
+ * product_model
*
* @author zt generator
* @since 1.0.0 2024-02-29
*/
@Data
@EqualsAndHashCode(callSuper=false)
-@TableName("xh_product_model")
-public class XhProductModel extends BusiEntity implements TreeNode<XhProductModel> {
+@TableName("product_model")
+public class XhProductModel extends BusiEntity implements TreeNode<XhProductModel>,Cloneable {
private static final long serialVersionUID = 1L;
@ApiModelProperty(value = "涓婄骇ID")
private Long pid;
-
+ @ApiModelProperty(value = "鎬讳綋ID")
+ private Long shipId;
+ @ApiModelProperty(value = "婧怚D")
+ private Long srcId;
@ApiModelProperty(value = "鍚嶇О")
private String name;
@ApiModelProperty(value = "鑺傜偣绫诲瀷")
+ private String productType;
+
+ @TableField(exist = false)
private String nodeType;
- @ApiModelProperty(value = "杩愯鐘舵�佸浘鐗�")
- private String operationalStatus;
+ @ApiModelProperty(value = "杩愯鍥剧墖")
+ private Long operatImg;
- @ApiModelProperty(value = "寰呮満鐘舵�佸浘鐗�")
- private String standbyState;
+ @ApiModelProperty(value = "鍚岀被璁惧鍚�")
+ private String sameSbName;
- @ApiModelProperty(value = "鏁呴殰鐘舵�佸浘鐗�")
- private String faultState;
+ @TableField(exist = false)
+ @ApiModelProperty(value = "鍥剧墖鍚嶇О")
+ private String operatImgName;
+
+ private String equipType;
+
+ private String namePath;
@ApiModelProperty(value = "鎺掑簭")
private Integer sort;
+ @ApiModelProperty(value = "鍚岀被璁惧鏁伴噺")
+ @TableField(exist = false)
+ private Integer sameSbNum;
+
+
+ @ApiModelProperty(value = "鍚岀被璁惧搴忓彿")
+ @TableField(exist = false)
+ private Integer deviceNo;
+
+ @ApiModelProperty(value = "鍚岀被璁惧搴忓彿")
+ @TableField(exist = false)
+ private String dataId;
+
@ApiModelProperty(value = "瀛愯妭鐐�")
@TableField(exist = false)
private List<XhProductModel> children = new ArrayList<>();
+
+ @TableField(exist = false)
+ private Long paramId;
+
+ @Override
+ public XhProductModel clone() throws CloneNotSupportedException {
+ XhProductModel product = (XhProductModel) super.clone();
+ product.children = new ArrayList<>();
+ product.setId(UUIDUtil.generateId());
+ return product;
+ }
}
--
Gitblit v1.9.1