From 7d557129ca9d7ba762859ec80256b73f96225784 Mon Sep 17 00:00:00 2001
From: Lius <Lius2225@163.com>
Date: 星期一, 21 十月 2024 10:27:23 +0800
Subject: [PATCH] 设备列表导出调整
---
lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/entity/MdcEquipment.java | 178 +++++++++++++++++++++++++++++-----------------------------
1 files changed, 89 insertions(+), 89 deletions(-)
diff --git a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/entity/MdcEquipment.java b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/entity/MdcEquipment.java
index 3b57b05..3aa8037 100644
--- a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/entity/MdcEquipment.java
+++ b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/entity/MdcEquipment.java
@@ -27,10 +27,10 @@
private static final long serialVersionUID = -131777068258113223L;
/**
- * 璁惧缂栫爜
+ * 璁惧缂栧彿
*/
- @Excel(name = "璁惧缂栫爜", width = 15)
- @ApiModelProperty(value = "璁惧缂栫爜")
+ @Excel(name = "璁惧缂栧彿", width = 15)
+ @ApiModelProperty(value = "璁惧缂栧彿")
private String equipmentId;
/**
* 璁惧鍚嶇О
@@ -39,11 +39,72 @@
@ApiModelProperty(value = "璁惧鍚嶇О")
private String equipmentName;
/**
+ * 璁惧绫诲瀷
+ */
+ @Excel(name = "璁惧绫诲瀷", width = 15)
+ @ApiModelProperty(value = "璁惧绫诲瀷")
+ private String equipmentType;
+ /**浜х嚎鍚嶇О*/
+ @Excel(name = "杞﹂棿", width = 15)
+ private transient String productionName;
+ /**閮ㄩ棬鍚嶇О*/
+// @Excel(name = "閮ㄩ棬", width = 15)
+ private transient String orgCodeTxt;
+ /**
+ * 绯荤粺鐗堟湰
+ */
+ @Excel(name = "绯荤粺鐗堟湰鍙�", width = 15)
+ @ApiModelProperty(value = "绯荤粺鐗堟湰鍙�")
+ private String systemVersion;
+ /**
+ * 璁惧鍔熺巼
+ */
+ @Excel(name = "璁惧鍔熺巼", width = 15)
+ @ApiModelProperty(value = "璁惧鍔熺巼")
+ private String devicePower;
+ /**
+ * 鏈哄簥IP
+ */
+ @Excel(name = "鏈哄簥IP", width = 15)
+ @ApiModelProperty(value = "鏈哄簥IP")
+ private String equipmentIp;
+ /**
+ * 绔彛
+ */
+ @Excel(name = "绔彛", width = 15)
+ @ApiModelProperty(value = "绔彛")
+ private String dataPort;
+ /**
+ * 椹卞姩绫诲瀷
+ */
+ @Excel(name = "椹卞姩绫诲瀷", width = 15)
+ @ApiModelProperty(value = "椹卞姩绫诲瀷")
+ private String driveType;
+ /**
* 璁惧鍨嬪彿
*/
@Excel(name = "璁惧鍨嬪彿", width = 15)
@ApiModelProperty(value = "璁惧鍨嬪彿")
private String equipmentModel;
+ /**
+ * 鏁版帶绯荤粺
+ */
+ //@Excel(name = "鏁版帶绯荤粺", width = 15)
+ @ApiModelProperty(value = "鏁版帶绯荤粺")
+ private String controlSystem;
+ /**
+ * 绯荤粺绫诲瀷
+ */
+ @Excel(name = "绯荤粺绫诲瀷", width = 15)
+ @ApiModelProperty(value = "绯荤粺绫诲瀷")
+ private String systemType;
+
+ /**
+ * 璁惧绉嶇被
+ */
+ //@Excel(name = "璁惧绉嶇被", width = 15)
+ @ApiModelProperty(value = "璁惧绉嶇被")
+ private String deviceCategory;
/**
* 鎶ヨ鍙�
*/
@@ -57,86 +118,33 @@
@ApiModelProperty(value = "閲囬泦鏃堕棿")
private String collectTime;
/**
- * 璁惧绫诲瀷
- */
- @Excel(name = "璁惧绫诲瀷", width = 15)
- @ApiModelProperty(value = "璁惧绫诲瀷")
- private String equipmentType;
- /**
* 璁惧瀹炴椂鐘舵��
*/
//@Excel(name = "璁惧瀹炴椂鐘舵��", width = 15)
@ApiModelProperty(value = "璁惧瀹炴椂鐘舵��")
private Integer oporation;
- /**
- * 鏈哄簥IP
- */
- @Excel(name = "鏈哄簥IP", width = 15)
- @ApiModelProperty(value = "鏈哄簥IP")
- private String equipmentIp;
- /**
- * 澶囨敞
- */
- @Excel(name = "澶囨敞", width = 15)
- @ApiModelProperty(value = "澶囨敞")
- private String remark;
- /**
- * 椹卞姩绫诲瀷
- */
- @Excel(name = "椹卞姩绫诲瀷", width = 15)
- @ApiModelProperty(value = "椹卞姩绫诲瀷")
- private String driveType;
- /**
- * 绔彛
- */
- @Excel(name = "绔彛", width = 15)
- @ApiModelProperty(value = "绔彛")
- private String dataPort;
- /**
- * 鏁版帶绯荤粺
- */
- @Excel(name = "鏁版帶绯荤粺", width = 15)
- @ApiModelProperty(value = "鏁版帶绯荤粺")
- private String controlSystem;
+
/**
* 閲囬泦鍙傛暟琛�
*/
- @Excel(name = "閲囬泦鍙傛暟琛�", width = 30)
+ //@Excel(name = "閲囬泦鍙傛暟琛�", width = 30)
@ApiModelProperty(value = "閲囬泦鍙傛暟琛�")
private String saveTableName;
/**
- * 鎺掑簭
+ * 璁惧寮傚父鐘舵��
*/
- @Excel(name = "鎺掑簭", width = 15)
- @ApiModelProperty(value = "鎺掑簭")
- private Integer sortNo;
- /**
- * 绯荤粺鐗堟湰
- */
- @Excel(name = "绯荤粺鐗堟湰", width = 15)
- @ApiModelProperty(value = "绯荤粺鐗堟湰")
- private String systemVersion;
- /**
- * 璁惧鍔熺巼
- */
- @Excel(name = "璁惧鍔熺巼", width = 15)
- @ApiModelProperty(value = "璁惧鍔熺巼")
- private String devicePower;
+ @Dict(dicCode = "device_abnormal_status")
+ @Excel(name = "璁惧寮傚父鐘舵��", width = 15, dicCode = "device_abnormal_status")
+ @ApiModelProperty(value = "璁惧寮傚父鐘舵��")
+ private Integer deviceAbnormalStatus;
/**
* 璁惧鐘舵��
*/
- @Excel(name = "璁惧鐘舵��", width = 15, dicCode = "mdc_equipment_status")
+ //@Excel(name = "璁惧鐘舵��", width = 15, dicCode = "mdc_equipment_status")
@Dict(dicCode = "mdc_equipment_status")
@ApiModelProperty(value = "璁惧鐘舵��")
private Integer equipmentStatus;
-
- /**
- * 绯荤粺绫诲瀷
- */
- @Excel(name = "绯荤粺绫诲瀷", width = 15)
- @ApiModelProperty(value = "绯荤粺绫诲瀷")
- private String systemType;
/**
* 璁惧绾у埆
@@ -144,21 +152,25 @@
@Excel(name = "璁惧绾у埆", width = 15)
@ApiModelProperty(value = "璁惧绾у埆")
private String deviceLevel;
-
/**
- * 璁惧绉嶇被
+ * 閲嶈绋嬪害
*/
- @Excel(name = "璁惧绉嶇被", width = 15)
- @ApiModelProperty(value = "璁惧绉嶇被")
- private String deviceCategory;
-
- /**閮ㄩ棬鍚嶇О*/
- @Excel(name = "閮ㄩ棬鍚嶇О", width = 15)
- private transient String orgCodeTxt;
-
- /**浜х嚎鍚嶇О*/
- @Excel(name = "杞﹂棿鍚嶇О", width = 15)
- private transient String productionName;
+ @Dict(dicCode = "device_importance_level")
+ @Excel(name = "閲嶈绋嬪害", width = 15, dicCode = "device_importance_level")
+ @ApiModelProperty(value = "閲嶈绋嬪害")
+ private Integer deviceImportanceLevel;
+ /**
+ * 鎺掑簭
+ */
+ @Excel(name = "鎺掑簭", width = 15)
+ @ApiModelProperty(value = "鎺掑簭")
+ private Integer sortNo;
+ /**
+ * 澶囨敞
+ */
+ @Excel(name = "澶囨敞", width = 15)
+ @ApiModelProperty(value = "澶囨敞")
+ private String remark;
@TableField(exist = false)
@ApiModelProperty(value = "閫夋嫨鐨勯儴闂╥d闆嗗悎")
@@ -168,16 +180,4 @@
@ApiModelProperty(value = "閫夋嫨鐨勪骇绾縤d闆嗗悎")
private String selectedProduction;
- /**
- * 閲嶈绋嬪害
- */
- @Dict(dicCode = "device_importance_level")
- @ApiModelProperty(value = "閲嶈绋嬪害")
- private Integer deviceImportanceLevel;
- /**
- * 璁惧寮傚父鐘舵��
- */
- @Dict(dicCode = "device_abnormal_status")
- @ApiModelProperty(value = "璁惧寮傚父鐘舵��")
- private Integer deviceAbnormalStatus;
}
--
Gitblit v1.9.3