From e9e0e12c5d855b587784c4b1c3c86975d3b7df6f Mon Sep 17 00:00:00 2001
From: whyclxw <810412026@qq.com>
Date: 星期三, 04 六月 2025 13:14:23 +0800
Subject: [PATCH] 实施页面系统概论半小时数据
---
src/main/java/com/whyc/dto/Statistic/StationStic.java | 2
src/main/java/com/whyc/dto/Real/PwrHisRealDcoutInDto.java | 32 +++++
src/main/java/com/whyc/service/SubTablePageInfoService.java | 85 +++++++++++++
src/main/java/com/whyc/controller/StatisticController.java | 14 +-
src/main/java/com/whyc/dto/Real/BattHisRealDto.java | 26 ++++
src/main/java/com/whyc/dto/Real/PwrHisRealAcInDto.java | 52 ++++++++
src/main/java/com/whyc/service/BattRealdataIdService.java | 16 ++
src/main/java/com/whyc/pojo/db_data_history/PwrdevHistorydataId.java | 2
src/main/java/com/whyc/service/PwrdevHistorydataIdService.java | 47 +++++++
src/main/resources/mapper/BattInfMapper.xml | 9 +
src/main/java/com/whyc/controller/RealContoller.java | 46 +++++++
src/main/java/com/whyc/pojo/db_data_history/BattRealdataId.java | 4
12 files changed, 324 insertions(+), 11 deletions(-)
diff --git a/src/main/java/com/whyc/controller/RealContoller.java b/src/main/java/com/whyc/controller/RealContoller.java
new file mode 100644
index 0000000..4586bfe
--- /dev/null
+++ b/src/main/java/com/whyc/controller/RealContoller.java
@@ -0,0 +1,46 @@
+package com.whyc.controller;
+
+import com.whyc.dto.Response;
+import com.whyc.pojo.db_data_history.PwrdevHistorydataId;
+import com.whyc.pojo.db_user.User;
+import com.whyc.service.BattRealdataIdService;
+import com.whyc.service.PowerInfService;
+import com.whyc.service.PwrdevHistorydataIdService;
+import com.whyc.service.StationInfService;
+import com.whyc.util.ActionUtil;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+
+@RestController
+@Api(tags = "瀹炴椂椤甸潰")
+@RequestMapping("real")
+public class RealContoller {
+ @Autowired
+ private PwrdevHistorydataIdService pwrdevHistorydataIdService;
+
+ @Autowired
+ private BattRealdataIdService battRealdataIdService;
+
+ @ApiOperation(value = "绯荤粺姒傝鑾峰彇鍗婂皬鏃朵氦娴佽緭鍏ョ粺璁�")
+ @GetMapping("getHalfHourPwrHisAcinData")
+ public Response getHalfHourPwrHisAcinData(@RequestParam Integer powerId){
+ return pwrdevHistorydataIdService.getHalfHourPwrHisAcinData(powerId);
+ }
+
+ @ApiOperation(value = "绯荤粺姒傝鑾峰彇鍗婂皬鏃剁洿娴佽緭鍑虹粺璁�")
+ @GetMapping("getHalfHourPwrHisDcoutData")
+ public Response getHalfHourPwrHisDcoutData(@RequestParam Integer powerId){
+ return pwrdevHistorydataIdService.getHalfHourPwrHisDcoutData(powerId);
+ }
+
+ @ApiOperation(value = "绯荤粺姒傝鑾峰彇鍗婂皬鏃舵牳瀹硅澶囦俊鎭�")
+ @GetMapping("getHalfHourBattDevData")
+ public Response getHalfHourBattDevData(@RequestParam Integer battgroupId){
+ return battRealdataIdService.getHalfHourBattDevData(battgroupId);
+ }
+}
\ No newline at end of file
diff --git a/src/main/java/com/whyc/controller/StatisticController.java b/src/main/java/com/whyc/controller/StatisticController.java
index a0e4991..c45d3b4 100644
--- a/src/main/java/com/whyc/controller/StatisticController.java
+++ b/src/main/java/com/whyc/controller/StatisticController.java
@@ -34,7 +34,7 @@
@Autowired
private DeviceStateService deviceStateService;
- @ApiOperation(value = "鐢垫簮淇℃伅缁熻")
+ @ApiOperation(value = "鐢垫簮淇℃伅缁熻(1.2.1/1.2.13)")
@PostMapping("getPowerStatistic")
public Response getPowerStatistic(@RequestBody StationStic stic){
User uinf= ActionUtil.getUser();
@@ -42,7 +42,7 @@
return powerInfService.getPowerStatistic(stic);
}
- @ApiOperation(value = "璁惧淇℃伅缁熻")
+ @ApiOperation(value = "璁惧淇℃伅缁熻(1.2.2)")
@PostMapping("getDevStatistic")
public Response getDevStatistic(@RequestBody StationStic stic){
User uinf= ActionUtil.getUser();
@@ -50,7 +50,7 @@
return battService.getDevStatistic(stic);
}
- @ApiOperation(value = "钃勭數姹犵粍淇℃伅缁熻")
+ @ApiOperation(value = "钃勭數姹犵粍淇℃伅缁熻(1.2.3/1.2.12)")
@PostMapping("getBattStatistic")
public Response getBattStatistic(@RequestBody StationStic stic){
User uinf= ActionUtil.getUser();
@@ -58,7 +58,7 @@
return battService.getBattStatistic(stic);
}
- @ApiOperation(value = "鍗曡妭鏁伴噺缁熻")
+ @ApiOperation(value = "鍗曡妭鏁伴噺缁熻(1.2.4)")
@PostMapping("getMonStatistic")
public Response getMonStatistic(@RequestBody MonStic stic){
User uinf= ActionUtil.getUser();
@@ -67,7 +67,7 @@
}
- @ApiOperation(value = "绔欑偣淇℃伅缁熻")
+ @ApiOperation(value = "绔欑偣淇℃伅缁熻(1.2.11)")
@PostMapping("getStationStatistic")
public Response getStationStatistic(@RequestBody StationStic stic){
User uinf= ActionUtil.getUser();
@@ -75,7 +75,7 @@
return stationInfService.getStationStatistic(stic);
}
- @ApiOperation(value = "钃勭數姹犳牳瀹逛俊鎭粺璁�")
+ @ApiOperation(value = "钃勭數姹犳牳瀹逛俊鎭粺璁�(1.2.14)")
@PostMapping("getBattTinfStatistic")
public Response getBattTinfStatistic(@RequestBody BattTinfStic stic){
User uinf= ActionUtil.getUser();
@@ -83,7 +83,7 @@
return battTinfService.getBattTinfStatistic(stic);
}
- @ApiOperation(value = "璁惧宸ヤ綔鐘舵�佺粺璁�")
+ @ApiOperation(value = "璁惧宸ヤ綔鐘舵�佺粺璁�(1.2.21)")
@PostMapping("getDeviceStateStatistic")
public Response getDeviceStateStatistic(@RequestBody DeviceStateStic stic){
User uinf= ActionUtil.getUser();
diff --git a/src/main/java/com/whyc/dto/Real/BattHisRealDto.java b/src/main/java/com/whyc/dto/Real/BattHisRealDto.java
new file mode 100644
index 0000000..61dd1e5
--- /dev/null
+++ b/src/main/java/com/whyc/dto/Real/BattHisRealDto.java
@@ -0,0 +1,26 @@
+package com.whyc.dto.Real;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.Date;
+
+@Data
+public class BattHisRealDto {
+ @ApiModelProperty(value = "璁板綍鏃堕棿")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "Asia/Shanghai")
+ private Date recordTime;
+
+ @ApiModelProperty(value = "缁勭鐢靛帇")
+ private Float groupVol;
+
+ @ApiModelProperty(value = "鍦ㄧ嚎鐢靛帇")
+ private Float onlineVol;
+
+ @ApiModelProperty(value = "鐢垫睜鐢垫祦")
+ private Float groupCurr;
+
+ @ApiModelProperty(value = "璁惧娓╁害")
+ private Float groupTmp;
+}
\ No newline at end of file
diff --git a/src/main/java/com/whyc/dto/Real/PwrHisRealAcInDto.java b/src/main/java/com/whyc/dto/Real/PwrHisRealAcInDto.java
new file mode 100644
index 0000000..9dd0802
--- /dev/null
+++ b/src/main/java/com/whyc/dto/Real/PwrHisRealAcInDto.java
@@ -0,0 +1,52 @@
+package com.whyc.dto.Real;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.Date;
+
+@Data
+public class PwrHisRealAcInDto {
+ @ApiModelProperty(value = "鏇存柊鏃堕棿")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "Asia/Shanghai")
+ private Date recordDatetime;
+
+ @ApiModelProperty(value = "1璺氦娴佽緭鍏鐩哥數鍘�")
+ private Float acin1Vola;
+
+ @ApiModelProperty(value = "1璺氦娴佽緭鍏鐩哥數鍘�")
+ private Float acin1Volb;
+
+ @ApiModelProperty(value = "浜ゆ祦1璺緭鍏鐩哥數鍘�")
+ private Float acin1Volc;
+
+ @ApiModelProperty(value = "2璺氦娴佽緭鍏鐩哥數鍘�")
+ private Float acin2Vola;
+
+ @ApiModelProperty(value = "2璺氦娴佽緭鍏鐩哥數鍘�")
+ private Float acin2Volb;
+
+ @ApiModelProperty(value = "2璺氦娴佽緭鍏鐩哥數鍘�")
+ private Float acin2Volc;
+
+ @ApiModelProperty(value = "浜ゆ祦1璺緭鍏鐩哥數娴�")
+ private Float acin1Curra;
+
+ @ApiModelProperty(value = "浜ゆ祦1璺緭鍏鐩哥數娴�")
+ private Float acin1Currb;
+
+ @ApiModelProperty(value = "浜ゆ祦1璺緭鍏鐩哥數娴�")
+ private Float acin1Currc;
+
+ @ApiModelProperty(value = "浜ゆ祦2璺緭鍏鐩哥數娴�")
+ private Float acin2Curra;
+
+ @ApiModelProperty(value = "浜ゆ祦2璺緭鍏鐩哥數娴�")
+ private Float acin2Currb;
+
+ @ApiModelProperty(value = "浜ゆ祦2璺緭鍏鐩哥數娴�")
+ private Float acin2Currc;
+
+
+}
\ No newline at end of file
diff --git a/src/main/java/com/whyc/dto/Real/PwrHisRealDcoutInDto.java b/src/main/java/com/whyc/dto/Real/PwrHisRealDcoutInDto.java
new file mode 100644
index 0000000..2660553
--- /dev/null
+++ b/src/main/java/com/whyc/dto/Real/PwrHisRealDcoutInDto.java
@@ -0,0 +1,32 @@
+package com.whyc.dto.Real;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.Date;
+
+@Data
+public class PwrHisRealDcoutInDto {
+ @ApiModelProperty(value = "鏇存柊鏃堕棿")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "Asia/Shanghai")
+ private Date recordDatetime;
+
+ @ApiModelProperty(value = "鐩存祦杈撳嚭鐢靛帇")
+ private Float dcoutVol;
+
+ @ApiModelProperty(value = "鐩存祦杈撳嚭鐢垫祦")
+ private Float dcoutCurr;
+
+ @ApiModelProperty(value = "鐢垫睜缁�1缁勭鐢靛帇")
+ private Float battgroup1Vol;
+
+ @ApiModelProperty(value = "鐢垫睜缁�1鐢垫祦")
+ private Float battgroup1Curr;
+
+ @ApiModelProperty(value = "鐢垫睜缁�2缁勭鐢靛帇")
+ private Float battgroup2Vol;
+
+ @ApiModelProperty(value = "鐢垫睜缁�2鐢垫祦")
+ private Float battgroup2Curr;
+}
\ No newline at end of file
diff --git a/src/main/java/com/whyc/dto/Statistic/StationStic.java b/src/main/java/com/whyc/dto/Statistic/StationStic.java
index 4b8c660..e9998de 100644
--- a/src/main/java/com/whyc/dto/Statistic/StationStic.java
+++ b/src/main/java/com/whyc/dto/Statistic/StationStic.java
@@ -8,6 +8,8 @@
private String city;
private String country;
private String stationName;
+ private String product;
+ private Float monvolstd;
private Integer uid;
private String stationType;
private Integer pageNum;
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 bc65d74..c91f050 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
@@ -3,6 +3,7 @@
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@@ -35,7 +36,8 @@
private Integer battgroupId;
@ApiModelProperty(value = "璁板綍鏃堕棿")
- private Date recrodTime;
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "Asia/Shanghai")
+ private Date recordTime;
@ApiModelProperty(value = "缁勭鐢靛帇")
private Float groupVol;
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 81d11fc..c08a20c 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
@@ -4,6 +4,7 @@
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@@ -36,6 +37,7 @@
private Long powerId;
@ApiModelProperty(value = "鏇存柊鏃堕棿")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "Asia/Shanghai")
private Date recordDatetime;
@ApiModelProperty(value = "1璺氦娴佽緭鍏鐩哥數鍘�")
diff --git a/src/main/java/com/whyc/service/BattRealdataIdService.java b/src/main/java/com/whyc/service/BattRealdataIdService.java
index d85892d..0c8d961 100644
--- a/src/main/java/com/whyc/service/BattRealdataIdService.java
+++ b/src/main/java/com/whyc/service/BattRealdataIdService.java
@@ -1,17 +1,20 @@
package com.whyc.service;
+import com.whyc.dto.Real.BattHisRealDto;
import com.whyc.dto.Real.CompareDto;
import com.whyc.dto.Real.QuarterDto;
import com.whyc.dto.Response;
import com.whyc.mapper.CommonMapper;
import com.whyc.pojo.db_batt_testdata.BattresdataId;
import com.whyc.pojo.db_batt_testdata.BattresdataInf;
+import com.whyc.pojo.db_data_history.BattRealdataId;
import com.whyc.pojo.db_station.BattInf;
import com.whyc.util.ActionUtil;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import javax.annotation.Resource;
+import java.util.Date;
import java.util.HashMap;
import java.util.List;
@@ -123,10 +126,10 @@
String date=datelist.get(i);
String tableName ="db_data_history.tb_batt_realdata_"+battgroupId+"_"+date;
String existTableName = commonMapper.existTable("db_data_history", "tb_batt_realdata_"+battgroupId+"_"+date);
+ //鍒ゆ柇琛ㄦ槸鍚﹀瓨鍦�
if(existTableName == null){
continue;
}
- //鍒ゆ柇琛ㄦ槸鍚﹀瓨鍦�
List<QuarterDto> datalist=subTablePageInfoService.getBattRealHis(tableName,"mon_tmp");
map.put(date,datalist);
//鑾峰彇琛ㄤ腑鏈�澶э紝鏈�灏忥紝骞冲潎鏁版嵁鍊�
@@ -149,4 +152,15 @@
}
return new Response().setII(1,map.size()>0,map,"鑾峰彇鐢垫睜缁勬渶杩戜竴瀛ｅ害鐨勬俯搴︽暟鎹�");
}
+ //绯荤粺姒傝鑾峰彇鍗婂皬鏃舵牳瀹硅澶囦俊鎭�
+ public Response getHalfHourBattDevData(Integer battgroupId) {
+ String dateTime = ActionUtil.sdfwithOutday.format(new Date());
+ String tableName ="db_data_history.tb_batt_realdata_"+battgroupId+"_"+dateTime;
+ String existTableName = commonMapper.existTable("db_data_history", "tb_batt_realdata_"+battgroupId+"_"+dateTime);
+ if(existTableName == null){
+ return new Response().set(1,false,"褰撳墠鐢垫睜缁勪笉瀛樺湪鍓嶉潰灏忔椂鏁版嵁");
+ }
+ List<BattHisRealDto> datalist=subTablePageInfoService.getHalfHourBattDevData(tableName);
+ return new Response().setII(1,datalist.size()>0,datalist,"鑾峰彇鍗婂皬鏃跺唴鏍稿璁惧淇℃伅");
+ }
}
\ No newline at end of file
diff --git a/src/main/java/com/whyc/service/PwrdevHistorydataIdService.java b/src/main/java/com/whyc/service/PwrdevHistorydataIdService.java
new file mode 100644
index 0000000..a773e28
--- /dev/null
+++ b/src/main/java/com/whyc/service/PwrdevHistorydataIdService.java
@@ -0,0 +1,47 @@
+package com.whyc.service;
+
+import com.whyc.dto.Real.PwrHisRealAcInDto;
+import com.whyc.dto.Real.PwrHisRealDcoutInDto;
+import com.whyc.dto.Response;
+import com.whyc.mapper.CommonMapper;
+import com.whyc.pojo.db_data_history.BattRealdataId;
+import com.whyc.pojo.db_data_history.PwrdevHistorydataId;
+import com.whyc.util.ActionUtil;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+import java.util.Date;
+import java.util.List;
+
+@Service
+public class PwrdevHistorydataIdService {
+ @Autowired
+ private SubTablePageInfoService subTablePageInfoService;
+ @Resource
+ private CommonMapper commonMapper;
+
+ //绯荤粺姒傝鑾峰彇鍗婂皬鏃朵氦娴佽緭鍏ョ粺璁�
+ public Response getHalfHourPwrHisAcinData(Integer powerId) {
+ String dateTime = ActionUtil.sdfwithOutday.format(new Date());
+ String tableName ="db_data_history.tb_pwrdev_historydata_"+powerId+"_"+dateTime;
+ String existTableName = commonMapper.existTable("db_data_history", "tb_pwrdev_historydata_"+powerId+"_"+dateTime);
+ if(existTableName == null){
+ return new Response().set(1,false,"褰撳墠鐢垫睜缁勪笉瀛樺湪鍓嶉潰灏忔椂鏁版嵁");
+ }
+ List<PwrHisRealAcInDto> datalist=subTablePageInfoService.getHalfHourPwrHisAcinData(tableName);
+ return new Response().setII(1,datalist.size()>0,datalist,"鑾峰彇鍗婂皬鏃跺唴浜ゆ祦杈撳叆缁熻");
+
+ }
+ //绯荤粺姒傝鑾峰彇鍗婂皬鏃剁洿娴佽緭鍑虹粺璁�
+ public Response getHalfHourPwrHisDcoutData(Integer powerId) {
+ String dateTime = ActionUtil.sdfwithOutday.format(new Date());
+ String tableName ="db_data_history.tb_pwrdev_historydata_"+powerId+"_"+dateTime;
+ String existTableName = commonMapper.existTable("db_data_history", "tb_pwrdev_historydata_"+powerId+"_"+dateTime);
+ if(existTableName == null){
+ return new Response().set(1,false,"褰撳墠鐢垫簮涓嶅瓨鍦ㄥ墠闈㈠皬鏃舵暟鎹�");
+ }
+ List<PwrHisRealDcoutInDto> datalist=subTablePageInfoService.getHalfHourPwrHisDcoutData(tableName);
+ return new Response().setII(1,datalist.size()>0,datalist,"鑾峰彇鍗婂皬鏃跺唴鐩存祦杈撳嚭缁熻");
+ }
+}
\ 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 f0391a7..6370eb3 100644
--- a/src/main/java/com/whyc/service/SubTablePageInfoService.java
+++ b/src/main/java/com/whyc/service/SubTablePageInfoService.java
@@ -3,12 +3,13 @@
import com.whyc.dto.AlmHis.BattAlmPar;
import com.whyc.dto.AlmHis.DevAlmPar;
import com.whyc.dto.AlmHis.PwrAlmPar;
-import com.whyc.dto.Real.CompareDto;
-import com.whyc.dto.Real.QuarterDto;
+import com.whyc.dto.Real.*;
import com.whyc.mapper.CallBack;
import com.whyc.pojo.db_alarm.BattalarmDataHistory;
import com.whyc.pojo.db_alarm.DevalarmDataHistory;
import com.whyc.pojo.db_batt_testdata.BatttestdataId;
+import com.whyc.pojo.db_data_history.BattRealdataId;
+import com.whyc.pojo.db_data_history.PwrdevHistorydataId;
import com.whyc.pojo.db_pwrdev_alarm.PwrdevAlarmHistory;
import com.whyc.util.ThreadLocalUtil;
import org.springframework.beans.factory.annotation.Autowired;
@@ -557,4 +558,84 @@
});
return list;
}
+ //绯荤粺姒傝鑾峰彇鍗婂皬鏃舵牳瀹硅澶囦俊鎭�
+ public List<BattHisRealDto> getHalfHourBattDevData(String tableName) {
+ String sql="select distinct mon_num,record_time,group_vol,online_vol,group_curr,group_tmp from "+tableName+" ";
+ sql+="where record_time>date_sub(now(),interval 0.5 hour)";
+ sql+="order by record_time asc";
+ List<BattHisRealDto> list = sqlExecuteService.executeQuery_call(sql, new CallBack() {
+ @Override
+ public List getResults(ResultSet rs) throws SQLException {
+ List<BattHisRealDto> list=new ArrayList<>();
+ while (rs.next()){
+ BattHisRealDto data=new BattHisRealDto();
+ data.setRecordTime(rs.getTimestamp("record_time"));
+ data.setGroupVol(rs.getFloat("group_vol"));
+ data.setOnlineVol(rs.getFloat("online_vol"));
+ data.setGroupCurr(rs.getFloat("group_curr"));
+ data.setGroupTmp(rs.getFloat("group_tmp"));
+ list.add(data);
+ }
+ return list;
+ }
+ });
+ return list;
+ }
+ //绯荤粺姒傝鑾峰彇鍗婂皬鏃朵氦娴佽緭鍏ョ粺璁�
+ public List<PwrHisRealAcInDto> getHalfHourPwrHisAcinData(String tableName) {
+ String sql="select distinct record_datetime,acin1_vola,acin1_volb,acin1_volc,acin2_vola,acin2_volb,acin2_volc " +
+ ",acin1_curra,acin1_currb,acin1_currc,acin2_curra,acin2_currb,acin2_currc from "+tableName+" ";
+ sql+="where record_datetime>date_sub(now(),interval 0.5 hour)";
+ sql+="order by record_datetime asc";
+ List<PwrHisRealAcInDto> list = sqlExecuteService.executeQuery_call(sql, new CallBack() {
+ @Override
+ public List getResults(ResultSet rs) throws SQLException {
+ List<PwrHisRealAcInDto> list=new ArrayList<>();
+ while (rs.next()){
+ PwrHisRealAcInDto data=new PwrHisRealAcInDto();
+ data.setRecordDatetime(rs.getTimestamp("record_datetime"));
+ data.setAcin1Vola(rs.getFloat("acin1_vola"));
+ data.setAcin1Volb(rs.getFloat("acin1_volb"));
+ data.setAcin1Volc(rs.getFloat("acin1_volc"));
+ data.setAcin2Vola(rs.getFloat("acin2_vola"));
+ data.setAcin2Volb(rs.getFloat("acin2_volb"));
+ data.setAcin2Volc(rs.getFloat("acin2_volc"));
+ data.setAcin1Curra(rs.getFloat("acin1_curra"));
+ data.setAcin1Currb(rs.getFloat("acin1_currb"));
+ data.setAcin1Currc(rs.getFloat("acin1_currc"));
+ data.setAcin2Curra(rs.getFloat("acin2_curra"));
+ data.setAcin2Currb(rs.getFloat("acin2_currb"));
+ data.setAcin2Currc(rs.getFloat("acin2_currc"));
+ list.add(data);
+ }
+ return list;
+ }
+ });
+ return list;
+ }
+
+ public List<PwrHisRealDcoutInDto> getHalfHourPwrHisDcoutData(String tableName) {
+ String sql="select distinct record_datetime,dcout_vol,dcout_curr,battgroup1_vol,battgroup1_curr,battgroup2_vol,battgroup2_curr from "+tableName+" ";
+ sql+="where record_datetime>date_sub(now(),interval 0.5 hour)";
+ sql+="order by record_datetime asc";
+ List<PwrHisRealDcoutInDto> list = sqlExecuteService.executeQuery_call(sql, new CallBack() {
+ @Override
+ public List getResults(ResultSet rs) throws SQLException {
+ List<PwrHisRealDcoutInDto> list=new ArrayList<>();
+ while (rs.next()){
+ PwrHisRealDcoutInDto data=new PwrHisRealDcoutInDto();
+ data.setRecordDatetime(rs.getTimestamp("record_datetime"));
+ data.setDcoutVol(rs.getFloat("dcout_vol"));
+ data.setDcoutCurr(rs.getFloat("dcout_curr"));
+ data.setBattgroup1Vol(rs.getFloat("battgroup1_vol"));
+ data.setBattgroup1Curr(rs.getFloat("battgroup1_curr"));
+ data.setBattgroup2Vol(rs.getFloat("battgroup2_vol"));
+ data.setBattgroup2Curr(rs.getFloat("battgroup2_curr"));
+ list.add(data);
+ }
+ return list;
+ }
+ });
+ return list;
+ }
}
diff --git a/src/main/resources/mapper/BattInfMapper.xml b/src/main/resources/mapper/BattInfMapper.xml
index 4ef0f3f..be47602 100644
--- a/src/main/resources/mapper/BattInfMapper.xml
+++ b/src/main/resources/mapper/BattInfMapper.xml
@@ -163,6 +163,15 @@
<if test="stic.stationName!=null">
and tb_station_inf.station_name=#{stic.stationName}
</if>
+ <if test="stic.stationType!=null">
+ and tb_station_inf.station_type=#{stic.stationType}
+ </if>
+ <if test="stic.product!=null">
+ and tb_batt_inf.product=#{stic.product}
+ </if>
+ <if test="stic.monvolstd!=null">
+ and tb_batt_inf.monvolstd=#{stic.monvolstd}
+ </if>
<if test="stic.uid>100">
and tb_batt_inf.station_id in(
select distinct station_id from db_user.tb_baojigroup_power,db_user.tb_baojigroup_usr
--
Gitblit v1.9.1