From 9b62b1b23cf7b547b231c91f5dec9fd6e9a719d7 Mon Sep 17 00:00:00 2001
From: whyclxw <810412026@qq.com>
Date: 星期六, 07 六月 2025 15:12:21 +0800
Subject: [PATCH] 电源近半小时历史实时数据
---
src/main/java/com/whyc/service/BattInfService.java | 3 +
src/main/java/com/whyc/dto/InfoDto.java | 3 +
src/main/java/com/whyc/dto/Real/PwrHisRealDcoutInDto.java | 1
src/main/java/com/whyc/service/SubTablePageInfoService.java | 32 ++++++++--------
src/main/java/com/whyc/pojo/db_station/PowerInf.java | 3 +
src/main/java/com/whyc/pojo/db_pwrdev_alarm/PwrdevAlarmParamStand.java | 3 +
src/main/java/com/whyc/factory/InfoFactory.java | 1
src/main/java/com/whyc/pojo/db_data_history/PwrdevHistorydataId.java | 3 +
src/main/java/com/whyc/service/PwrdevHistorydataIdService.java | 11 +++++
src/main/java/com/whyc/pojo/db_data_history/BattRealdataId.java | 9 ++++
10 files changed, 52 insertions(+), 17 deletions(-)
diff --git a/src/main/java/com/whyc/dto/InfoDto.java b/src/main/java/com/whyc/dto/InfoDto.java
index bc02931..d436502 100644
--- a/src/main/java/com/whyc/dto/InfoDto.java
+++ b/src/main/java/com/whyc/dto/InfoDto.java
@@ -66,6 +66,9 @@
@JsonFormat(pattern = "yyyy-MM-dd",timezone = "Asia/Shanghai")
private Date powerInuseTime;
+ @ApiModelProperty(value = "鏁存祦鍣ㄤ娇鑳絒bit0-妯″潡1 bit15-妯″潡16]銆�1-鍙敤 0-涓嶅彲浠ャ��")
+ private Long modelCfg;
+
@ApiModelProperty(value = "璁惧id")
diff --git a/src/main/java/com/whyc/dto/Real/PwrHisRealDcoutInDto.java b/src/main/java/com/whyc/dto/Real/PwrHisRealDcoutInDto.java
index e14a317..d126033 100644
--- a/src/main/java/com/whyc/dto/Real/PwrHisRealDcoutInDto.java
+++ b/src/main/java/com/whyc/dto/Real/PwrHisRealDcoutInDto.java
@@ -110,4 +110,5 @@
@ApiModelProperty(value = "妯″潡16杈撳嚭鐢靛帇")
private Float m16OutVol;
+
}
\ No newline at end of file
diff --git a/src/main/java/com/whyc/factory/InfoFactory.java b/src/main/java/com/whyc/factory/InfoFactory.java
index 41713bf..8ba5086 100644
--- a/src/main/java/com/whyc/factory/InfoFactory.java
+++ b/src/main/java/com/whyc/factory/InfoFactory.java
@@ -14,6 +14,7 @@
.setPowerModel(info.getPowerModel())
.setProtocol(info.getProtocol())
.setPowerIp(info.getPowerIp())
+ .setModelCfg(info.getModelCfg())
.setPowerInuseTime(info.getPowerInuseTime());
if(info.getPowerId()!=null){
pinf.setPowerId(info.getPowerId());
diff --git a/src/main/java/com/whyc/pojo/db_data_history/BattRealdataId.java b/src/main/java/com/whyc/pojo/db_data_history/BattRealdataId.java
index adbcde9..dee842b 100644
--- a/src/main/java/com/whyc/pojo/db_data_history/BattRealdataId.java
+++ b/src/main/java/com/whyc/pojo/db_data_history/BattRealdataId.java
@@ -36,6 +36,9 @@
@ApiModelProperty(value = "鐢垫睜缁処D")
private Integer battgroupId;
+ @ApiModelProperty(value = "缂栧彿")
+ private Integer recordNum;
+
@ApiModelProperty(value = "璁板綍鏃堕棿")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "Asia/Shanghai")
private Date recordTime;
@@ -96,6 +99,12 @@
@ApiModelProperty(value = "澶囨敞")
private String note;
+ @ApiModelProperty(value = "鎺ヨЕ鍣ㄩ樆鎶�")
+ private Float dev_conresist;
+
+ @ApiModelProperty(value = "瀵奸�氬帇闄�")
+ private Float dev_condvoldp;
+
@TableField(exist = false)
private String tableName;
diff --git a/src/main/java/com/whyc/pojo/db_data_history/PwrdevHistorydataId.java b/src/main/java/com/whyc/pojo/db_data_history/PwrdevHistorydataId.java
index c08a20c..e7bce5d 100644
--- a/src/main/java/com/whyc/pojo/db_data_history/PwrdevHistorydataId.java
+++ b/src/main/java/com/whyc/pojo/db_data_history/PwrdevHistorydataId.java
@@ -40,6 +40,9 @@
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "Asia/Shanghai")
private Date recordDatetime;
+ @ApiModelProperty(value = "缂栧彿")
+ private Integer recordNum;
+
@ApiModelProperty(value = "1璺氦娴佽緭鍏鐩哥數鍘�")
private Float acin1Vola;
diff --git a/src/main/java/com/whyc/pojo/db_pwrdev_alarm/PwrdevAlarmParamStand.java b/src/main/java/com/whyc/pojo/db_pwrdev_alarm/PwrdevAlarmParamStand.java
index 2057444..c91f6f1 100644
--- a/src/main/java/com/whyc/pojo/db_pwrdev_alarm/PwrdevAlarmParamStand.java
+++ b/src/main/java/com/whyc/pojo/db_pwrdev_alarm/PwrdevAlarmParamStand.java
@@ -41,6 +41,9 @@
@ApiModelProperty(value = "鍙傛暟绫诲瀷")
private Integer paramType;
+ @ApiModelProperty(value = "鏍囧噯鍙傛暟瀵瑰簲鏁版嵁鍚嶇О")
+ private Integer paramName;
+
@ApiModelProperty(value = "鍩哄噯鍊�")
private Float basisVal;
diff --git a/src/main/java/com/whyc/pojo/db_station/PowerInf.java b/src/main/java/com/whyc/pojo/db_station/PowerInf.java
index be714f6..b4c3749 100644
--- a/src/main/java/com/whyc/pojo/db_station/PowerInf.java
+++ b/src/main/java/com/whyc/pojo/db_station/PowerInf.java
@@ -62,6 +62,9 @@
@ApiModelProperty(value = "鐢垫簮绫诲瀷:1:鐩存祦锛�2锛氶�氳锛�3閰嶇綉")
private Integer powerType;
+ @ApiModelProperty(value = "鏁存祦鍣ㄤ娇鑳絒bit0-妯″潡1 bit15-妯″潡16]銆�1-鍙敤 0-涓嶅彲浠ャ��")
+ private Long modelCfg;
+
@JsonFormat(pattern = "yyyy-MM-dd",timezone = "Asia/Shanghai")
private Date powerInuseTime;
diff --git a/src/main/java/com/whyc/service/BattInfService.java b/src/main/java/com/whyc/service/BattInfService.java
index 0c9f317..7a44a74 100644
--- a/src/main/java/com/whyc/service/BattInfService.java
+++ b/src/main/java/com/whyc/service/BattInfService.java
@@ -227,6 +227,9 @@
if(pinf.getPowerInuseTime()!=null){
wrapper2.set("power_inuse_time",pinf.getPowerInuseTime());
}
+ if(pinf.getModelCfg()!=null){
+ wrapper2.set("model_cfg",pinf.getModelCfg());
+ }
/*if(pinf.getPowerName()!=null){
//妫�娴嬭鏈烘埧涓嬭淇敼鐨勭數婧愬悕鏄惁瀛樺湪
QueryWrapper queryWrapper1=new QueryWrapper();
diff --git a/src/main/java/com/whyc/service/PwrdevHistorydataIdService.java b/src/main/java/com/whyc/service/PwrdevHistorydataIdService.java
index 5f78d5f..26f1e48 100644
--- a/src/main/java/com/whyc/service/PwrdevHistorydataIdService.java
+++ b/src/main/java/com/whyc/service/PwrdevHistorydataIdService.java
@@ -6,6 +6,7 @@
import com.whyc.mapper.CommonMapper;
import com.whyc.pojo.db_data_history.BattRealdataId;
import com.whyc.pojo.db_data_history.PwrdevHistorydataId;
+import com.whyc.pojo.db_station.PowerInf;
import com.whyc.util.ActionUtil;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@@ -20,6 +21,9 @@
private SubTablePageInfoService subTablePageInfoService;
@Resource
private CommonMapper commonMapper;
+
+ @Autowired
+ private PowerInfService powerInfService;
//绯荤粺姒傝鑾峰彇鍗婂皬鏃朵氦娴佽緭鍏ョ粺璁�
public Response getHalfHourPwrHisAcinData(Integer powerId,Integer granularity) {
@@ -42,6 +46,11 @@
return new Response().set(1,false,"褰撳墠鐢垫簮涓嶅瓨鍦ㄥ墠闈㈠皬鏃舵暟鎹�");
}
List<PwrHisRealDcoutInDto> datalist=subTablePageInfoService.getHalfHourPwrHisDcoutData(tableName,granularity);
- return new Response().setII(1,datalist.size()>0,datalist,"鑾峰彇鍗婂皬鏃跺唴鐩存祦杈撳嚭缁熻");
+ Long modelCfg=0l;
+ PowerInf pinf=powerInfService.getPowerInfById(powerId);
+ if(pinf!=null){
+ modelCfg=pinf.getModelCfg();
+ }
+ return new Response().setIII(1,datalist.size()>0,datalist,modelCfg,"鑾峰彇鍗婂皬鏃跺唴鐩存祦杈撳嚭缁熻");
}
}
\ No newline at end of file
diff --git a/src/main/java/com/whyc/service/SubTablePageInfoService.java b/src/main/java/com/whyc/service/SubTablePageInfoService.java
index 21d38c5..1eff6d6 100644
--- a/src/main/java/com/whyc/service/SubTablePageInfoService.java
+++ b/src/main/java/com/whyc/service/SubTablePageInfoService.java
@@ -655,22 +655,22 @@
data.setM14Outcurr(rs.getFloat("m14_outcurr"));
data.setM15Outcurr(rs.getFloat("m15_outcurr"));
data.setM16Outcurr(rs.getFloat("m16_outcurr"));
- data.setM1OutVol(rs.getFloat("m1_outvol"));
- data.setM2OutVol(rs.getFloat("m2_outvol"));
- data.setM3OutVol(rs.getFloat("m3_outvol"));
- data.setM4OutVol(rs.getFloat("m4_outvol"));
- data.setM5OutVol(rs.getFloat("m5_outvol"));
- data.setM6OutVol(rs.getFloat("m6_outvol"));
- data.setM7OutVol(rs.getFloat("m7_outvol"));
- data.setM8OutVol(rs.getFloat("m8_outvol"));
- data.setM9OutVol(rs.getFloat("m9_outvol"));
- data.setM10OutVol(rs.getFloat("m10_outvol"));
- data.setM11OutVol(rs.getFloat("m11_outvol"));
- data.setM12OutVol(rs.getFloat("m12_outvol"));
- data.setM13OutVol(rs.getFloat("m13_outvol"));
- data.setM14OutVol(rs.getFloat("m14_outvol"));
- data.setM15OutVol(rs.getFloat("m15_outvol"));
- data.setM16OutVol(rs.getFloat("m16_outvol"));
+ data.setM1OutVol(rs.getFloat("m1_out_vol"));
+ data.setM2OutVol(rs.getFloat("m2_out_vol"));
+ data.setM3OutVol(rs.getFloat("m3_out_vol"));
+ data.setM4OutVol(rs.getFloat("m4_out_vol"));
+ data.setM5OutVol(rs.getFloat("m5_out_vol"));
+ data.setM6OutVol(rs.getFloat("m6_out_vol"));
+ data.setM7OutVol(rs.getFloat("m7_out_vol"));
+ data.setM8OutVol(rs.getFloat("m8_out_vol"));
+ data.setM9OutVol(rs.getFloat("m9_out_vol"));
+ data.setM10OutVol(rs.getFloat("m10_out_vol"));
+ data.setM11OutVol(rs.getFloat("m11_out_vol"));
+ data.setM12OutVol(rs.getFloat("m12_out_vol"));
+ data.setM13OutVol(rs.getFloat("m13_out_vol"));
+ data.setM14OutVol(rs.getFloat("m14_out_vol"));
+ data.setM15OutVol(rs.getFloat("m15_out_vol"));
+ data.setM16OutVol(rs.getFloat("m16_out_vol"));
list.add(data);
}
return list;
--
Gitblit v1.9.1