From c80aedf517205fd50e608efc17ead73a3667d506 Mon Sep 17 00:00:00 2001
From: xyc <jc_xiong@hotmail.com>
Date: 星期五, 02 八月 2024 15:39:36 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 modules/mainPart/src/main/java/com/zt/life/modules/mainPart/basicInfo/model/ParamData.java |   67 ++++++++++++++++++++++-----------
 1 files changed, 44 insertions(+), 23 deletions(-)

diff --git a/modules/mainPart/src/main/java/com/zt/life/modules/mainPart/basicInfo/model/ParamData.java b/modules/mainPart/src/main/java/com/zt/life/modules/mainPart/basicInfo/model/ParamData.java
index 50221c1..31cfd74 100644
--- a/modules/mainPart/src/main/java/com/zt/life/modules/mainPart/basicInfo/model/ParamData.java
+++ b/modules/mainPart/src/main/java/com/zt/life/modules/mainPart/basicInfo/model/ParamData.java
@@ -3,10 +3,13 @@
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.zt.common.entity.BusiEntity;
+import com.zt.common.entity.TreeNode;
+import com.zt.common.entity.TreeNode2;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
+import java.util.ArrayList;
 import java.util.List;
 
 /**
@@ -18,65 +21,72 @@
 @Data
 @EqualsAndHashCode(callSuper = false)
 @TableName("param_data")
-public class ParamData extends BusiEntity {
+public class ParamData extends BusiEntity implements TreeNode<ParamData> {
     private static final long serialVersionUID = 1L;
 
     @ApiModelProperty(value = "婧怚D")
     private Long productId;
 
+    @ApiModelProperty(value = "鑸笽D")
+    private Long shipId;
+
+    @TableField(exist = false)
     @ApiModelProperty(value = "鍚嶇О")
     private String name;
 
     @ApiModelProperty(value = "鍩烘湰鍙潬鎬ц繍琛屾瘮")
-    private String baseOperatRatio;
+    private Double baseOperatRatio;
 
     @ApiModelProperty(value = "瀹為檯杩愯鏃堕棿")
-    private String actualRunTime;
+    private Double actualRunTime;
 
     @ApiModelProperty(value = "鍙傚姞璁＄畻")
-    private Integer joinCompute;
+    private Integer basicJoinCompute;
 
     @ApiModelProperty(value = "瑙勫畾MTBF")
-    private String regulateMtbf;
+    private Double basicMtbfRegulate;
 
     @ApiModelProperty(value = "鍙帴鍙楃殑MTBF")
-    private String acceptMtbf;
+    private Double basicMtbfAccept;
 
     @ApiModelProperty(value = "MTBF瑙勫畾鎴愬姛鐜�")
-    private String regulSuccRateMtbf;
+    private Double basicMtbfRegulSuccRate;
 
     @ApiModelProperty(value = "MTBF鍙帴鍙楁垚鍔熺巼")
-    private String acceptSuccRateMtbf;
+    private Double basicMtbfAcceptSuccRate;
 
     @ApiModelProperty(value = "鍗曞厓鏁伴噺")
-    private Integer unitNum;
+    private Integer basicUnitNum;
 
     @ApiModelProperty(value = "杩愯娆℃暟")
-    private Integer runsNum;
+    private Integer basicRunsNum;
 
     @ApiModelProperty(value = "MTBF杩愯姣�")
-    private String operatingRatioMtbf;
+    private Double basicMtbfOperatingRatio;
 
     @ApiModelProperty(value = "鍗曟杩愯鏃堕棿")
-    private String singleRunTime;
+    private Double basicSingleRunTime;
 
     @ApiModelProperty(value = "瑙勫畾MTBCF")
-    private String regulateMtbcf;
+    private Double taskMtbcfRegulate;
 
     @ApiModelProperty(value = "鍙帴鍙楃殑MTBCF")
-    private String acceptMtbcf;
+    private Double taskMtbcfAccept;
 
     @ApiModelProperty(value = "MTBCF瑙勫畾鎴愬姛鐜�")
-    private String regulSuccRateMtbcf;
+    private Double taskMtbcfRegulSuccRate;
 
     @ApiModelProperty(value = "MTBCF鍙帴鍙楁垚鍔熺巼")
-    private String acceptSuccRateMtbcf;
+    private Double taskMtbcfAcceptSuccRate;
 
     @ApiModelProperty(value = "MTBCF杩愯姣�")
-    private String operatingRatioMtbcf;
+    private Double taskMtbcfOperatingRatio;
 
-    @ApiModelProperty(value = "MTBCF鍏朵粬鍙傛暟")
-    private String otherParamsMtbcf;
+    @ApiModelProperty(value = "MTBCF鍏朵粬鍙傛暟2")
+    private Double taskMtbcfOtherParams2;
+
+    @ApiModelProperty(value = "MTBCF鍏朵粬鍙傛暟3")
+    private Double taskMtbcfOtherParams3;
 
     @ApiModelProperty(value = "鍙淮淇�")
     private Integer repairable;
@@ -85,16 +95,21 @@
     private Integer repairDistribType;
 
     @ApiModelProperty(value = "MTTCR")
-    private String mttcr;
+    private Double repairMttcr;
 
-    @ApiModelProperty(value = "MTTCR鍏朵粬鍙傛暟")
-    private String otherParamsMttcr;
+    @ApiModelProperty(value = "MTTCR鍏朵粬鍙傛暟2")
+    private Double repairMttcrOtherParams2;
+
+    @ApiModelProperty(value = "MTTCR鍏朵粬鍙傛暟3")
+    private Double repairMttcrOtherParams3;
 
     @ApiModelProperty(value = "鍙潬鎬у垎甯冪被鍨�")
     private Integer reliabDistribType;
 
     @ApiModelProperty(value = "杩愯鏃堕棿")
-    private String runTime;
+    private Double runTime;
+
+    private Double ai;
 
     @TableField(exist = false)
     private Long productIdInit;
@@ -104,4 +119,10 @@
     @TableField(exist = false)
     private List<ParamData> dataThreeList;
 
+    @TableField(exist = false)
+    private Long pid;
+
+    @ApiModelProperty(value = "瀛愯妭鐐�")
+    @TableField(exist = false)
+    private List<ParamData> children = new ArrayList<>();
 }

--
Gitblit v1.9.1