From 595b66ae8800511fab34e503f94d173613088c08 Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期六, 01 三月 2025 09:57:38 +0800
Subject: [PATCH] 1、表阀一体机新协议开阀报关阀报数据处理逻辑修改； 2、农户月用水统计查询中，缺少农户姓名，进行SQL修改。
---
pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voPr/VoController.java | 66 ++++++++++++++++++++++----------
1 files changed, 45 insertions(+), 21 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 d5d4934..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,9 +1,13 @@
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 lombok.Data;
import org.springframework.format.annotation.DateTimeFormat;
@@ -14,43 +18,63 @@
* @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 = 1L;
+ private static final long serialVersionUID = 202401241704003L;
@Schema(title = "ID")
- @ExcelProperty("ID")
- @ColumnWidth(10)
- private Long id;
+ @ExcelIgnore
+ private String id;
- @Schema(title = "鎺у埗鍣ㄧ紪鍙�")
- @ExcelProperty("鎺у埗鍣ㄧ紪鍙�")
+ @Schema(title = "鎺у埗鍣ㄥ湴鍧�")
+ @ExcelProperty(value = {"${title}", "闃�鎺у櫒鍦板潃"})
@ColumnWidth(15)
- private String controllerCode;
-
- @Schema(title = "鍦ㄧ嚎鐘舵��")
- @ExcelProperty("鍦ㄧ嚎鐘舵��")
- @ColumnWidth(15)
- private String onlineState;
+ 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)
- private Date reportTime;
+ @Schema(title = "鍙戠幇鏃ユ湡鏃堕棿")
+ @ExcelProperty(value = {"${title}", "鍙戠幇鏃堕棿"})
+ @ColumnWidth(20)
+ private Date findDt;
+
+// @Schema(title = "鍦ㄧ嚎鐘舵��")
+// @ExcelProperty("鍦ㄧ嚎鐘舵��")
+// @ColumnWidth(6)
+// private String onlineState;
+
+ /**
+ * 鏄惁鍦ㄧ嚎
+ */
+ @ExcelIgnore
+ private Boolean isOnLine;
+
+
+ @Schema(title = "閫氳鍗忚")
+ @ExcelIgnore
+ private String protocol;
+
+ @Schema(title = "鍗忚鐗堟湰鍙�")
+ @ExcelIgnore
+ private String protocolVersion;
+
+ @Schema(title = "澶囨敞")
+ @ExcelIgnore
+ private String remarks;
}
--
Gitblit v1.8.0