From 1a2258c4eca2e7514b6096004fa1c3e0036b402b Mon Sep 17 00:00:00 2001
From: qushaowei <qushaowei@163.com>
Date: 星期四, 28 三月 2024 14:04:24 +0800
Subject: [PATCH] Merge branch 'master' of http://117.34.109.166:18448/r/mdc_430 into develop
---
lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/entity/MdcTorqueConfig.java | 64 +++++++++++++++++++++++++------
1 files changed, 51 insertions(+), 13 deletions(-)
diff --git a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/entity/MdcTorqueConfig.java b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/entity/MdcTorqueConfig.java
index 4e1dcd0..873c326 100644
--- a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/entity/MdcTorqueConfig.java
+++ b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/entity/MdcTorqueConfig.java
@@ -1,6 +1,7 @@
package org.jeecg.modules.mdc.entity;
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 com.fasterxml.jackson.annotation.JsonFormat;
@@ -14,6 +15,7 @@
import java.io.Serializable;
import java.util.Date;
+import java.util.List;
/**
* @Description: 鎵煩閰嶇疆绠＄悊
@@ -26,7 +28,8 @@
@TableName("mdc_torque_config")
@ApiModel(value = "mdc_torque_config瀵硅薄", description = "鎵煩閰嶇疆绠＄悊")
public class MdcTorqueConfig implements Serializable {
- private static final long serialVersionUID = 1L;
+
+ private static final long serialVersionUID = -8646261637017242975L;
/**
* 涓婚敭
@@ -38,43 +41,51 @@
/**
* 璁惧缂栧彿
*/
- @Excel(name = "璁惧缂栧彿",width = 15)
+ @Excel(name = "璁惧缂栧彿", width = 15)
@ApiModelProperty("璁惧缂栧彿")
private String equipmentId;
/**
* 璁惧鍚嶇О
*/
- @Excel(name = "璁惧鍚嶇О",width = 15)
+ @Excel(name = "璁惧鍚嶇О", width = 25)
@ApiModelProperty("璁惧鍚嶇О")
private String equipmentName;
/**
- * 鏃ユ湡
+ * 鏃堕棿
*/
- @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss")
+ @Excel(name = "鏃堕棿", width = 30, format = "yyyy-MM-dd HH:mm:ss")
+ @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
- @ApiModelProperty(value = "鏃ユ湡")
- private Date date;
+ @ApiModelProperty(value = "鏃堕棿")
+ private Date torqueDate;
/**
* 鎵煩鍊�
*/
- @Excel(name = "鎵煩鍊�",width = 15)
+ @Excel(name = "鎵煩鍊�", width = 15)
@ApiModelProperty("鎵煩鍊�")
private float torqueValue;
/**
+ * 杩涚粰鍙傛暟
+ */
+ @Excel(name = "杩涚粰鍙傛暟", width = 15)
+ @ApiModelProperty("杩涚粰鍙傛暟")
+ private String feedParameter;
+
+ /**
* 澶囨敞
*/
- @Excel(name = "澶囨敞",width = 15)
+ @Excel(name = "澶囨敞", width = 30)
@ApiModelProperty("澶囨敞")
private String notes;
/**
* 鍒涘缓鏃堕棿
*/
- @JsonFormat(timezone = "GMY+8",pattern = "yyyy-MM-dd HH:mm:ss")
+ @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@ApiModelProperty(value = "鍒涘缓鏃堕棿")
private Date createTime;
@@ -82,14 +93,14 @@
/**
* 鍒涘缓浜�
*/
- @Excel(name = "鍒涘缓浜�",width = 15)
+ @Excel(name = "鍒涘缓浜�", width = 15)
@ApiModelProperty("鍒涘缓浜�")
private String createBy;
/**
* 鏇存柊鏃堕棿
*/
- @JsonFormat(timezone = "GMY+8",pattern = "yyyy-MM-dd HH:mm:ss")
+ @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@ApiModelProperty("鏇存柊鏃堕棿")
private Date updateTime;
@@ -97,7 +108,34 @@
/**
* 鏇存柊浜�
*/
- @Excel(name = "鏇存柊浜�",width = 15)
+ @Excel(name = "鏇存柊浜�", width = 15)
@ApiModelProperty("鏇存柊浜�")
private String updateBy;
+
+ @TableField(exist = false)
+ private String equipmentIds;
+
+ @TableField(exist = false)
+ private String startTime;
+
+ @TableField(exist = false)
+ private String endTime;
+
+ /**
+ * 鍓嶅彴浼犲叆锛屽垽鏂瘡涓猧d
+ */
+ @TableField(exist = false)
+ private String parentId;
+
+ /**
+ * 鍓嶅彴浼犲叆 杞﹂棿灞傜骇锛�1锛岄儴闂ㄥ眰绾э細2
+ */
+ @TableField(exist = false)
+ private String typeTree;
+
+ /**
+ * 閮ㄩ棬parentId 鍏宠仈瀛愰泦id
+ */
+ @TableField(exist = false)
+ private List<String> mdcSectionIds;
}
--
Gitblit v1.9.3