From e29ff6ff2de584854531e443ed4d8da0347e08bd Mon Sep 17 00:00:00 2001
From: wuzeyu <1223318623@qq.com>
Date: 星期一, 16 十二月 2024 10:40:59 +0800
Subject: [PATCH] 优化接口 小程序下的获得全部取水口接口与项目管理下的获得全部取水口接口同步
---
pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voPr/VoController.java | 38 ++++++++++++++++++++++----------------
1 files changed, 22 insertions(+), 16 deletions(-)
diff --git a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voPr/VoController.java b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voPr/VoController.java
index 1042061..03d969b 100644
--- a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voPr/VoController.java
+++ b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voPr/VoController.java
@@ -1,12 +1,14 @@
package com.dy.pipIrrGlobal.voPr;
+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 jakarta.validation.constraints.Max;
-import jakarta.validation.constraints.Min;
import lombok.Data;
import org.springframework.format.annotation.DateTimeFormat;
@@ -16,39 +18,40 @@
* @author ZhuBaoMin
* @date 2023-12-29 10:27
* @LastEditTime 2023-12-29 10:27
- * @Description
+ * @Description 鎺у埗鍣ㄨ鍥惧璞�
*/
@Data
-@Schema(title = "鎺у埗鍣ㄨ鍥惧璞�")
+@JsonPropertyOrder({ "id", "rtuAddr", "intakeName", "bindNumber", "findDt", "isOnLine", "protocol", "protocolVersion", "remarks"})
+@HeadRowHeight(30)
+@ContentRowHeight(20)
public class VoController implements BaseEntity {
private static final long serialVersionUID = 202401241704003L;
@Schema(title = "ID")
- @ExcelProperty("ID")
- @ColumnWidth(10)
+ @ExcelIgnore
private String id;
@Schema(title = "鎺у埗鍣ㄥ湴鍧�")
- @ExcelProperty("鎺у埗鍣ㄥ湴鍧�")
+ @ExcelProperty(value = {"${title}", "闃�鎺у櫒鍦板潃"})
@ColumnWidth(15)
private String rtuAddr;
@Schema(title = "缁戝畾鍙栨按鍙�")
- @ExcelProperty("缁戝畾鍙栨按鍙�")
- @ColumnWidth(10)
+ @ExcelProperty(value = {"${title}", "鍙栨按鍙ｇ紪鍙�"})
+ @ColumnWidth(15)
private String intakeName;
@Schema(title = "缁戝畾娆℃暟")
- @ExcelProperty("缁戝畾娆℃暟")
+ @ExcelProperty(value = {"${title}", "缁戝畾娆℃暟"})
@ColumnWidth(10)
private Integer bindNumber;
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
@Schema(title = "鍙戠幇鏃ユ湡鏃堕棿")
- @ExcelProperty("鍙戠幇鏃ユ湡鏃堕棿")
- @ColumnWidth(30)
+ @ExcelProperty(value = {"${title}", "鍙戠幇鏃堕棿"})
+ @ColumnWidth(20)
private Date findDt;
// @Schema(title = "鍦ㄧ嚎鐘舵��")
@@ -59,16 +62,19 @@
/**
* 鏄惁鍦ㄧ嚎
*/
+ @ExcelIgnore
private Boolean isOnLine;
@Schema(title = "閫氳鍗忚")
- @ExcelProperty("閫氳鍗忚")
- @ColumnWidth(10)
+ @ExcelIgnore
private String protocol;
+ @Schema(title = "鍗忚鐗堟湰鍙�")
+ @ExcelIgnore
+ private String protocolVersion;
+
@Schema(title = "澶囨敞")
- @ExcelProperty("澶囨敞")
- @ColumnWidth(10)
+ @ExcelIgnore
private String remarks;
}
--
Gitblit v1.8.0