实时运行逻辑
This commit is contained in:
@ -46,10 +46,28 @@ public class EmsSiteMonitorController extends BaseController{
|
||||
/**
|
||||
* 单站监控-设备监控-实时运行曲线图数据
|
||||
*/
|
||||
@GetMapping("/runningGraph")
|
||||
public AjaxResult getRunningGraph(@RequestParam String siteId)
|
||||
@GetMapping("/runningGraph/storagePower")
|
||||
public AjaxResult getRunningGraphStorage(@RequestParam String siteId)
|
||||
{
|
||||
return success(iSingleSiteService.getRunningGraph(siteId));
|
||||
return success(iSingleSiteService.getRunningGraphStorage(siteId));
|
||||
}
|
||||
|
||||
@GetMapping("/runningGraph/pcsAveTemp")
|
||||
public AjaxResult getRunningGraphPcsTemp(@RequestParam String siteId)
|
||||
{
|
||||
return success(iSingleSiteService.getRunningGraphPcsTemp(siteId));
|
||||
}
|
||||
|
||||
@GetMapping("/runningGraph/batteryAveSoc")
|
||||
public AjaxResult getRunningGraphBatterySoc(@RequestParam String siteId)
|
||||
{
|
||||
return success(iSingleSiteService.getRunningGraphBatterySoc(siteId));
|
||||
}
|
||||
|
||||
@GetMapping("/runningGraph/batteryAveTemp")
|
||||
public AjaxResult getRunningGraphBatteryTemp(@RequestParam String siteId)
|
||||
{
|
||||
return success(iSingleSiteService.getRunningGraphBatteryTemp(siteId));
|
||||
}
|
||||
|
||||
/**
|
||||
|
@ -17,7 +17,7 @@ public interface ISingleSiteService
|
||||
|
||||
public SiteMonitorRunningHeadInfoVo getSiteRunningHeadInfo(String siteId);
|
||||
|
||||
public SiteMonitorRuningInfoVo getRunningGraph(String siteId);
|
||||
public SiteMonitorRuningInfoVo getRunningGraphStorage(String siteId);
|
||||
|
||||
public List<PcsDetailInfoVo> getPcsDetailInfo(String siteId);
|
||||
|
||||
@ -30,4 +30,10 @@ public interface ISingleSiteService
|
||||
public List<BatteryDataStatsListVo> getClusterDataInfoList(String clusterDeviceId,String siteId);
|
||||
|
||||
public AmmeterDataResponse getAmmeterDataList(String siteId);
|
||||
|
||||
public SiteMonitorRuningInfoVo getRunningGraphPcsTemp(String siteId);
|
||||
|
||||
public SiteMonitorRuningInfoVo getRunningGraphBatterySoc(String siteId);
|
||||
|
||||
public SiteMonitorRuningInfoVo getRunningGraphBatteryTemp(String siteId);
|
||||
}
|
||||
|
@ -128,9 +128,9 @@ public class SingleSiteServiceImpl implements ISingleSiteService {
|
||||
return siteMonitorRunningHeadInfoVo;
|
||||
}
|
||||
|
||||
// 获取单站监控实时运行曲线图数据
|
||||
// 获取单站监控实时运行-储能功率数据
|
||||
@Override
|
||||
public SiteMonitorRuningInfoVo getRunningGraph(String siteId) {
|
||||
public SiteMonitorRuningInfoVo getRunningGraphStorage(String siteId) {
|
||||
SiteMonitorRuningInfoVo siteMonitorRuningInfoVo = new SiteMonitorRuningInfoVo();
|
||||
if (!StringUtils.isEmpty(siteId)) {
|
||||
// 时间暂定今日+昨日
|
||||
@ -139,12 +139,45 @@ public class SingleSiteServiceImpl implements ISingleSiteService {
|
||||
//储能功率list
|
||||
List<EnergyStoragePowVo> energyStoragePowList = emsPcsDataMapper.getStoragePowerList(siteId, yesterday, today);
|
||||
siteMonitorRuningInfoVo.setEnergyStoragePowList(energyStoragePowList);
|
||||
}
|
||||
return siteMonitorRuningInfoVo;
|
||||
}
|
||||
// 获取单站监控实时运行-poc平均温度
|
||||
@Override
|
||||
public SiteMonitorRuningInfoVo getRunningGraphPcsTemp(String siteId) {
|
||||
SiteMonitorRuningInfoVo siteMonitorRuningInfoVo = new SiteMonitorRuningInfoVo();
|
||||
if (!StringUtils.isEmpty(siteId)) {
|
||||
// 时间暂定今日+昨日
|
||||
Date today = new Date();
|
||||
Date yesterday = DateUtils.addDays(today, -1);
|
||||
//pcs平均温度list
|
||||
List<PCSAveTempVo> pcsAveTempVos = emsPcsDataMapper.getPcsAveTempList(siteId, yesterday, today);
|
||||
siteMonitorRuningInfoVo.setPcsAveTempList(pcsAveTempVos);
|
||||
}
|
||||
return siteMonitorRuningInfoVo;
|
||||
}
|
||||
// 获取单站监控实时运行-电池平均soc
|
||||
@Override
|
||||
public SiteMonitorRuningInfoVo getRunningGraphBatterySoc(String siteId) {
|
||||
SiteMonitorRuningInfoVo siteMonitorRuningInfoVo = new SiteMonitorRuningInfoVo();
|
||||
if (!StringUtils.isEmpty(siteId)) {
|
||||
// 时间暂定今日+昨日
|
||||
Date today = new Date();
|
||||
Date yesterday = DateUtils.addDays(today, -1);
|
||||
//电池平均soclist
|
||||
List<BatteryAveSOCVo> batteryAveSOCList = emsPcsDataMapper.getAveSocList(siteId, yesterday, today);
|
||||
siteMonitorRuningInfoVo.setBatteryAveSOCList(batteryAveSOCList);
|
||||
}
|
||||
return siteMonitorRuningInfoVo;
|
||||
}
|
||||
// 获取单站监控实时运行-电池平均温度
|
||||
@Override
|
||||
public SiteMonitorRuningInfoVo getRunningGraphBatteryTemp(String siteId) {
|
||||
SiteMonitorRuningInfoVo siteMonitorRuningInfoVo = new SiteMonitorRuningInfoVo();
|
||||
if (!StringUtils.isEmpty(siteId)) {
|
||||
// 时间暂定今日+昨日
|
||||
Date today = new Date();
|
||||
Date yesterday = DateUtils.addDays(today, -1);
|
||||
//电池平均温度list
|
||||
List<BatteryAveTempVo> batteryAveTempList = emsPcsDataMapper.getBatteryAveTempList(siteId, yesterday, today);
|
||||
siteMonitorRuningInfoVo.setBatteryAveTempList(batteryAveTempList);
|
||||
|
@ -373,7 +373,7 @@
|
||||
</select>
|
||||
|
||||
<select id="getPcsDataByDay" resultType="com.xzzn.ems.domain.vo.SiteMonitorDataVo">
|
||||
select CONCAT(t.date_month,'/',t.date_day) as ammeterDate,
|
||||
select DATE(latest.max_update_time) as ammeterDate,
|
||||
sum(t.total_ac_charge_energy) as chargedCap,
|
||||
sum(t.total_ac_discharge_energy) as disChargedCap
|
||||
from ( SELECT p.site_id, p.device_id,p.date_month,p.date_day, MAX(p.data_update_time) AS max_update_time
|
||||
@ -453,7 +453,7 @@
|
||||
</select>
|
||||
|
||||
<select id="getPcsDataByMonth" resultType="com.xzzn.ems.domain.vo.SiteMonitorDataVo">
|
||||
select t.date_month as ammeterDate,
|
||||
select DATE_FORMAT(latest.max_update_time, '%Y-%m') as ammeterDate,
|
||||
sum(t.total_ac_charge_energy) as chargedCap,
|
||||
sum(t.total_ac_discharge_energy) as disChargedCap
|
||||
from ( SELECT p.site_id, p.device_id,p.date_month,MAX(p.data_update_time) AS max_update_time
|
||||
@ -478,7 +478,7 @@
|
||||
select latest.dateHour as ammeterDate,
|
||||
sum(t.total_ac_charge_energy) as chargedCap,
|
||||
sum(t.total_ac_discharge_energy) as disChargedCap
|
||||
from ( SELECT p.site_id, p.device_id,DATE_FORMAT(p.data_update_time, '%H') AS dateHour,MAX(p.data_update_time) as max_update_time
|
||||
from ( SELECT p.site_id, p.device_id,DATE_FORMAT(p.data_update_time, '%H')+1 AS dateHour,MAX(p.data_update_time) as max_update_time
|
||||
FROM ems_pcs_data p
|
||||
where p.site_id = #{siteId}
|
||||
<if test="startDate != null">
|
||||
|
Reference in New Issue
Block a user