From 356331d8401267aa7aeb409d1314537aa25ac5ad Mon Sep 17 00:00:00 2001
From: zhubaomin <zhubaomin>
Date: 星期二, 25 二月 2025 14:33:03 +0800
Subject: [PATCH] 解决控制器报警与状态SQL语句的错误
---
pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voPr/VoOnLineIntake.java | 21 +++++++++++++++++++--
1 files changed, 19 insertions(+), 2 deletions(-)
diff --git a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voPr/VoOnLineIntake.java b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voPr/VoOnLineIntake.java
index daf3aa0..dd4a4c0 100644
--- a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voPr/VoOnLineIntake.java
+++ b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/voPr/VoOnLineIntake.java
@@ -1,8 +1,12 @@
package com.dy.pipIrrGlobal.voPr;
+import com.alibaba.fastjson2.annotation.JSONField;
import com.dy.common.po.BaseEntity;
+import com.fasterxml.jackson.annotation.JsonFormat;
import com.fasterxml.jackson.annotation.JsonPropertyOrder;
import lombok.Data;
+
+import java.util.Date;
/**
* @author ZhuBaoMin
@@ -12,7 +16,7 @@
*/
@Data
-@JsonPropertyOrder({ "intakeId", "rtuAddr", "intakeNum", "isOnLine"})
+@JsonPropertyOrder({ "intakeId", "rtuAddr", "intakeNum", "isOnLine", "isBinded", "alarm" ,"instantAmount", "totalAmount"})
public class VoOnLineIntake implements BaseEntity {
private static final long serialVersionUID = 202405271703001L;
@@ -42,8 +46,15 @@
private Double lat;
/**
+ * 鐬椂娴侀噺
+ */
+ @JsonFormat(shape = JsonFormat.Shape.NUMBER_FLOAT, pattern="0.00" )
+ private Double instantAmount;
+
+ /**
* 绱娴侀噺
*/
+ @JsonFormat(shape = JsonFormat.Shape.NUMBER_FLOAT, pattern="0.00" )
private Double totalAmount;
/**
@@ -58,7 +69,13 @@
/**
- * 鎶ヨ淇℃伅Json鏁扮粍
+ * 鎶ヨ淇℃伅Json鏁扮粍鍜屾帴鏀跺埌鎶ヨ鏃堕棿
*/
private String alarm;
+
+ /**
+ * 鎺ユ敹鍒版姤璀︽椂闂�
+ */
+ @JSONField(serialize = false)
+ private Date alarmDt;
}
--
Gitblit v1.8.0