From 220f7b818bb9399391830fbbb9fb2028a21b938f Mon Sep 17 00:00:00 2001
From: yyt <306727702@qq.com>
Date: 星期三, 21 二月 2024 00:23:34 +0800
Subject: [PATCH] 批量数据采集方法更新
---
jcdm-main/src/main/java/com/jcdm/main/da/paramCollection/domain/DaParamCollection.java | 55 ++++++++++++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 52 insertions(+), 3 deletions(-)
diff --git a/jcdm-main/src/main/java/com/jcdm/main/da/paramCollection/domain/DaParamCollection.java b/jcdm-main/src/main/java/com/jcdm/main/da/paramCollection/domain/DaParamCollection.java
index 7077b10..839fa61 100644
--- a/jcdm-main/src/main/java/com/jcdm/main/da/paramCollection/domain/DaParamCollection.java
+++ b/jcdm-main/src/main/java/com/jcdm/main/da/paramCollection/domain/DaParamCollection.java
@@ -1,11 +1,19 @@
package com.jcdm.main.da.paramCollection.domain;
import java.util.Date;
+
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.HeadFontStyle;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Data;
import org.apache.commons.lang3.builder.ToStringBuilder;
import org.apache.commons.lang3.builder.ToStringStyle;
import com.jcdm.common.annotation.Excel;
import com.jcdm.common.core.domain.BaseEntity;
+import org.springframework.format.annotation.DateTimeFormat;
/**
* 璁惧浜у搧杩囩▼鍙傛暟閲囬泦瀵硅薄 da_param_collection
@@ -13,6 +21,11 @@
* @author yyt
* @date 2023-12-13
*/
+@Data
+@ExcelIgnoreUnannotated
+@ColumnWidth(16)
+@HeadRowHeight(14)
+@HeadFontStyle(fontHeightInPoints = 11)
public class DaParamCollection extends BaseEntity
{
private static final long serialVersionUID = 1L;
@@ -24,8 +37,11 @@
@Excel(name = "宸ュ崟缂栧彿")
private String workOrderNo;
+ private String repairFlag;
+
/** 鎬绘垚搴忓垪鍙� */
- @Excel(name = "鎬绘垚搴忓垪鍙�")
+ @Excel(name = "绠变綋缂栫爜")
+ @ExcelProperty(value = "绠变綋缂栫爜", index = 0)
private String sfcCode;
/** 浜у搧缂栧彿 */
@@ -38,6 +54,7 @@
/** 宸ヤ綅缂栧彿 */
@Excel(name = "宸ヤ綅缂栧彿")
+ @ExcelProperty(value = "宸ヤ綅", index = 1)
private String locationCode;
/** 璁惧缂栧彿 */
@@ -50,6 +67,7 @@
/** 鍙傛暟鍊� */
@Excel(name = "鍙傛暟鍊�")
+ @ExcelProperty(value = "鍙傛暟鍊�", index = 3)
private String paramValue;
/** 鍙傛暟涓婇檺 */
@@ -65,8 +83,10 @@
private String paramStandard;
/** 閲囬泦鏃堕棿 */
- @JsonFormat(pattern = "yyyy-MM-dd")
- @Excel(name = "閲囬泦鏃堕棿", width = 30, dateFormat = "yyyy-MM-dd")
+ @Excel(name = "閲囬泦鏃堕棿")
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @ExcelProperty(value = "閲囬泦鏃堕棿", index = 5)
private Date collectionTime;
/** 棰勭暀瀛楁1 */
@@ -87,16 +107,45 @@
/** 鍙傛暟鍚嶇О */
@Excel(name = "鍙傛暟鍚嶇О")
+ @ExcelProperty(value = "鍙傛暟鍚嶇О", index = 2)
private String paramName;
/** 鍗曚綅 */
@Excel(name = "鍗曚綅")
+ @ExcelProperty(value = "鍗曚綅", index = 4)
private String unit;
/** 绫诲瀷 */
@Excel(name = "绫诲瀷")
private String type;
+ private String[] dateConditions;
+
+ private String startTime;
+
+ private String endTime;
+
+ public String[] getDateConditions() {
+ return dateConditions;
+ }
+
+ public void setDateConditions(String[] dateConditions) {
+ this.dateConditions = dateConditions;
+ }
+
+ public String getStartTime() {return startTime;}
+
+ public void setStartTime(String startTime) {
+ this.startTime = startTime;
+ }
+
+ public String getEndTime() {
+ return endTime;
+ }
+
+ public void setEndTime(String endTime) {
+ this.endTime = endTime;
+ }
public void setId(Long id)
{
this.id = id;
--
Gitblit v1.9.3