From 6dacac48ebb596797dfd8e5bf3a803ed0b583643 Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期三, 05 二月 2025 17:11:31 +0800
Subject: [PATCH] 取水口综合信息-统计数据逻辑处理模块完善
---
pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/VoAllRound/VoArIntakeAmountDay.java | 4 ++--
pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/VoAllRound/VoArIntakeRemote.java | 6 ------
pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/VoAllRound/VoArIntakeLossDay.java | 2 +-
pipIrr-platform/pipIrr-web/pipIrr-web-remote/src/main/java/com/dy/pipIrrRemote/allRound/Ar4RemoteSv.java | 3 +++
pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/VoAllRound/VoArIntakeAmountMonth.java | 7 +++----
5 files changed, 9 insertions(+), 13 deletions(-)
diff --git a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/VoAllRound/VoArIntakeAmountDay.java b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/VoAllRound/VoArIntakeAmountDay.java
index 526125d..008441b 100644
--- a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/VoAllRound/VoArIntakeAmountDay.java
+++ b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/VoAllRound/VoArIntakeAmountDay.java
@@ -14,7 +14,7 @@
* @Description
*/
@Data
-@JsonPropertyOrder({ "intakeId", "amount", "amount", "money", "times" })
+@JsonPropertyOrder({ "intakeId", "dt", "amount", "money", "times" })
public class VoArIntakeAmountDay {
public static final long serialVersionUID = 202502051005003L;
@@ -27,7 +27,7 @@
/**
* 鏃ユ湡
*/
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @JsonFormat(pattern = "yyyy-MM-dd")
public Date dt ;
/**
diff --git a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/VoAllRound/VoArIntakeAmountMonth.java b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/VoAllRound/VoArIntakeAmountMonth.java
index f840a7b..1f69eda 100644
--- a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/VoAllRound/VoArIntakeAmountMonth.java
+++ b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/VoAllRound/VoArIntakeAmountMonth.java
@@ -14,7 +14,7 @@
* @Description
*/
@Data
-@JsonPropertyOrder({ "intakeId", "amount", "amount"})
+@JsonPropertyOrder({ "intakeId", "pipIrr", "amount"})
public class VoArIntakeAmountMonth {
public static final long serialVersionUID = 202502051005004L;
@@ -25,10 +25,9 @@
public Long intakeId;
/**
- * 鏃ユ湡
+ * 鏈堜唤锛堟牸寮忥細 yyyy-mm锛�
*/
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
- public Date dt ;
+ public String dt ;
/**
* 鐢ㄦ按閲�
diff --git a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/VoAllRound/VoArIntakeLossDay.java b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/VoAllRound/VoArIntakeLossDay.java
index 121af5d..6500e9b 100644
--- a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/VoAllRound/VoArIntakeLossDay.java
+++ b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/VoAllRound/VoArIntakeLossDay.java
@@ -27,7 +27,7 @@
/**
* 鏃ユ湡鏃堕棿
*/
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @JsonFormat(pattern = "yyyy-MM-dd")
public Date dt ;
/**
diff --git a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/VoAllRound/VoArIntakeRemote.java b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/VoAllRound/VoArIntakeRemote.java
index 3189a23..749b49c 100644
--- a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/VoAllRound/VoArIntakeRemote.java
+++ b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/VoAllRound/VoArIntakeRemote.java
@@ -2,17 +2,11 @@
import com.alibaba.fastjson2.annotation.JSONField;
import com.alibaba.fastjson2.writer.ObjectWriterImplToString;
-import com.dy.pipIrrGlobal.voRm.VoLossDay;
-import com.dy.pipIrrGlobal.voRm.VoOpenCloseValve;
-import com.dy.pipIrrGlobal.voSt.VoDayIntakeAmount;
-import com.dy.pipIrrGlobal.voSt.VoDayLoss;
-import com.dy.pipIrrGlobal.voSt.VoMonthAmount;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.fasterxml.jackson.annotation.JsonPropertyOrder;
import lombok.Data;
import java.util.Date;
-import java.util.List;
/**
* @Author: liurunyu
diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-remote/src/main/java/com/dy/pipIrrRemote/allRound/Ar4RemoteSv.java b/pipIrr-platform/pipIrr-web/pipIrr-web-remote/src/main/java/com/dy/pipIrrRemote/allRound/Ar4RemoteSv.java
index 51cb12d..1666df7 100644
--- a/pipIrr-platform/pipIrr-web/pipIrr-web-remote/src/main/java/com/dy/pipIrrRemote/allRound/Ar4RemoteSv.java
+++ b/pipIrr-platform/pipIrr-web/pipIrr-web-remote/src/main/java/com/dy/pipIrrRemote/allRound/Ar4RemoteSv.java
@@ -114,6 +114,9 @@
if(list != null && list.size() > 0){
VoArIntakeRemote vo = list.get(0) ;
rVo.alarm = vo.alarm ;
+ if(rVo.alarm == null || rVo.alarm.trim().equals("")){
+ rVo.alarm = "鏃犳姤璀�" ;
+ }
rVo.alarmDt = vo.alarmDt ;
}
}
--
Gitblit v1.8.0