From e3a585f2e592a96d2f5251db43af55abe6699970 Mon Sep 17 00:00:00 2001
From: wuzeyu <1223318623@qq.com>
Date: 星期二, 15 十月 2024 17:58:29 +0800
Subject: [PATCH] 优化代码 控制器查询 最近未报数的取水口分页优化 取水口管理与测控一体阀合并
---
pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voPr/VoIntake.java | 77 +++++++++++++++++++++++++++-----------
1 files changed, 55 insertions(+), 22 deletions(-)
diff --git a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voPr/VoIntake.java b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voPr/VoIntake.java
index d6d1963..6b902c9 100644
--- a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voPr/VoIntake.java
+++ b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voPr/VoIntake.java
@@ -3,8 +3,11 @@
import com.alibaba.excel.annotation.ExcelIgnore;
import com.alibaba.excel.annotation.ExcelProperty;
import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.alibaba.excel.annotation.write.style.ContentRowHeight;
+import com.alibaba.excel.annotation.write.style.HeadRowHeight;
import com.dy.common.po.BaseEntity;
import com.fasterxml.jackson.annotation.JsonFormat;
+import com.fasterxml.jackson.annotation.JsonPropertyOrder;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
import org.springframework.format.annotation.DateTimeFormat;
@@ -19,62 +22,61 @@
*/
@Data
-@Schema(title = "鍙栨按鍙ｈ鍥惧璞�")
+@JsonPropertyOrder({ "intakeId", "intakeName", "divideId", "divideName", "blockId", "blockName", "isBind", "address", "lng", "lat", "operator", "operateDt", "remarks", "controllerId", "rtuAddr", "protocol", "findDt", "isOnLine", "bindNumber"})
+@HeadRowHeight(30)
+@ContentRowHeight(20)
public class VoIntake implements BaseEntity {
private static final long serialVersionUID = 202312261049001L;
@Schema(title = "鍙栨按鍙D")
- @ExcelProperty("鍙栨按鍙D")
- @ColumnWidth(10)
+ @ExcelIgnore
private String intakeId;
@Schema(title = "鍙栨按鍙ｅ悕绉�")
- @ExcelProperty("鍙栨按鍙ｅ悕绉�")
+ @ExcelProperty(value = {"${title}", "鍙栨按鍙ｇ紪鍙�"})
@ColumnWidth(15)
private String intakeName;
@Schema(title = "鍒嗘按鎴縄D")
- @ExcelProperty("鍒嗘按鎴縄D")
- @ColumnWidth(10)
+ @ExcelIgnore
private String divideId;
@Schema(title = "鎵�灞炲垎姘存埧")
- @ExcelProperty("鎵�灞炲垎姘存埧")
+ @ExcelProperty(value = {"${title}", "鎵�灞炲垎姘存埧"})
@ColumnWidth(15)
private String divideName;
@Schema(title = "鐗囧尯ID")
- @ExcelProperty("鐗囧尯ID")
- @ColumnWidth(15)
+ @ExcelIgnore
private String blockId;
@Schema(title = "鎵�灞炵墖鍖�")
- @ExcelProperty("鎵�灞炵墖鍖�")
+ @ExcelProperty(value = {"${title}", "鎵�灞炵墖鍖�"})
@ColumnWidth(15)
private String blockName;
- @Schema(title = "缁戝畾璁惧")
- @ExcelProperty("缁戝畾璁惧")
- @ColumnWidth(6)
+ @Schema(title = "鏄惁缁戝畾璁惧")
+ @ExcelProperty(value = {"${title}", "鏄惁缁戝畾璁惧"})
+ @ColumnWidth(10)
private String isBind;
@Schema(title = "鍦板潃")
- @ExcelProperty("鍦板潃")
- @ColumnWidth(25)
+ @ExcelProperty(value = {"${title}", "鍦板潃"})
+ @ColumnWidth(30)
private String address;
@Schema(title = "缁忓害")
- @ExcelProperty("缁忓害")
- @ColumnWidth(25)
+ @ExcelProperty(value = {"${title}", "缁忓害"})
+ @ColumnWidth(20)
private String lng;
@Schema(title = "绾害")
- @ExcelProperty("绾害")
- @ColumnWidth(25)
+ @ExcelProperty(value = {"${title}", "绾害"})
+ @ColumnWidth(20)
private String lat;
@Schema(title = "鎿嶄綔浜�")
- @ExcelProperty("鎿嶄綔浜�")
+ @ExcelIgnore
@ColumnWidth(25)
private String operator;
@@ -85,7 +87,38 @@
private Date operateDt;
@Schema(title = "澶囨敞")
- @ExcelProperty("澶囨敞")
- @ColumnWidth(250)
+ @ExcelIgnore
private String remarks;
+
+ @Schema(title = "鎺у埗鍣↖D")
+ @ExcelIgnore
+ private String controllerId;
+
+ @Schema(title = "鎺у埗鍣ㄥ湴鍧�")
+ @ExcelProperty(value = {"${title}", "鎺у埗鍣ㄥ湴鍧�"})
+ @ColumnWidth(15)
+ private String rtuAddr;
+
+ @Schema(title = "閫氳鍗忚")
+ @ExcelIgnore
+ private String protocol;
+
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ @Schema(title = "鍙戠幇鏃ユ湡鏃堕棿")
+ @ExcelProperty(value = {"${title}", "鍙戠幇鏃堕棿"})
+ @ColumnWidth(20)
+ private Date findDt;
+
+ /**
+ * 鏄惁鍦ㄧ嚎
+ */
+ @ExcelIgnore
+ private Boolean isOnLine;
+
+ @Schema(title = "缁戝畾娆℃暟")
+ @ExcelProperty(value = {"${title}", "缁戝畾娆℃暟"})
+ @ColumnWidth(10)
+ private Integer bindNumber;
+
}
--
Gitblit v1.8.0