From 02ccfc21d5d4f767bbd92ecda89cdfcc3283728c Mon Sep 17 00:00:00 2001
From: whycxzp <glperry@163.com>
Date: 星期三, 11 六月 2025 08:38:26 +0800
Subject: [PATCH] Merge branch 'master' of http://118.89.139.230:10101/r/powerIntelligenceSystem into master
---
src/main/java/com/whyc/dto/Real/TopDto.java | 67 ++++++++++++++++++++++++++++++++-
1 files changed, 64 insertions(+), 3 deletions(-)
diff --git a/src/main/java/com/whyc/dto/Real/TopDto.java b/src/main/java/com/whyc/dto/Real/TopDto.java
index e6a0b0d..5ac8f55 100644
--- a/src/main/java/com/whyc/dto/Real/TopDto.java
+++ b/src/main/java/com/whyc/dto/Real/TopDto.java
@@ -4,7 +4,68 @@
@Data
public class TopDto {
- private Integer systemState;
- private Integer devState;
- private Integer battState;
+ private Integer systemState; //绯荤粺鐘舵��
+ private String systemStateName;
+ private Integer devState; //璁惧鐘舵��
+ private String devStateName;
+ private Integer battState; //鐢垫睜鐘舵��
+ private String battStateName;
+ private Integer pwrState; //鐢垫簮鐘舵��
+ private String pwrStateName;
+ private Float vbusVol; //姣嶇嚎鐢靛帇
+ private Float onlineVol; //鍦ㄧ嚎鐢靛帇
+ private Integer battALmNum;//鐢垫睜缁勫疄鏃跺憡璀︽暟
+ private Integer devALmNum; //璁惧瀹炴椂鍛婅鏁�
+ private Integer pwrALmNum; //鐢垫簮瀹炴椂鍛婅鏁�
+ private Integer allALmNum; //鎬诲疄鏃跺憡璀︽暟
+ //浠呭湪璁惧鐘舵�佷负鏍稿娴嬭瘯鏈夋晥
+ private Float captestGroupvol; //缁勭鐢靛帇
+ private Float captestCurr; //鐢垫睜鐢垫祦
+ private Integer captestTimelong; //娴嬭瘯鏃堕暱
+ private Float captestCap; //娴嬭瘯瀹归噺
+ private Float restCap; //棰勪及鍓╀綑瀹归噺
+ private Float restTime; //棰勪及鍓╀綑缁埅鏃堕棿
+ private String recordtime; //鏇存柊鏃堕棿
+ private String stationName;
+ private String provice;
+ private String city;
+ private String county;
+ private String fullName;
+ private String powerName;
+ private String devName;
+ private String battGroupName;
+
+
+ public TopDto() {
+ this.systemState = 0;
+ this.systemStateName = "";
+ this.devState = 0;
+ this.devStateName = "";
+ this.battState = 0;
+ this.battStateName = "";
+ this.pwrState = 0;
+ this.pwrStateName="";
+ this.vbusVol = 0.0f;
+ this.onlineVol = 0.0f;
+ this.battALmNum = 0;
+ this.devALmNum = 0;
+ this.pwrALmNum = 0;
+ this.allALmNum = 0;
+ this.captestGroupvol = 0.0f;
+ this.captestCurr = 0.0f;
+ this.captestTimelong = 0;
+ this.captestCap = 0.0f;
+ this.restCap = 0.0f;
+ this.restTime = 0.0f;
+ this.allALmNum = 0;
+ this.recordtime = "1972-01-01 00:00:00";
+ this.stationName = "";
+ this.provice = "";
+ this.city = "";
+ this.county = "";
+ this.fullName = "";
+ this.powerName = "";
+ this.devName = "";
+ this.battGroupName = "";
+ }
}
\ No newline at end of file
--
Gitblit v1.9.1