20250808优化-单站首页-策略显示

This commit is contained in:
2025-08-13 18:31:14 +08:00
parent eb72542b67
commit 76d0634ae8
5 changed files with 73 additions and 0 deletions

View File

@ -60,6 +60,11 @@ public class SiteMonitorHomeVo {
*/ */
private List<SiteMonitorDataVo> siteMonitorDataVo; private List<SiteMonitorDataVo> siteMonitorDataVo;
/**
* 策略显示
*/
private StrategyTempInfo strategyTempInfo;
public BigDecimal getDayChargedCap() { public BigDecimal getDayChargedCap() {
return dayChargedCap; return dayChargedCap;
} }
@ -139,4 +144,12 @@ public class SiteMonitorHomeVo {
public void setSiteMonitorDataVo(List<SiteMonitorDataVo> siteMonitorDataVo) { public void setSiteMonitorDataVo(List<SiteMonitorDataVo> siteMonitorDataVo) {
this.siteMonitorDataVo = siteMonitorDataVo; this.siteMonitorDataVo = siteMonitorDataVo;
} }
public StrategyTempInfo getStrategyTempInfo() {
return strategyTempInfo;
}
public void setStrategyTempInfo(StrategyTempInfo strategyTempInfo) {
this.strategyTempInfo = strategyTempInfo;
}
} }

View File

@ -0,0 +1,37 @@
package com.xzzn.ems.domain.vo;
import com.xzzn.ems.domain.EmsStrategyTemp;
import java.util.List;
/**
* 单站首页-策略显示
*
*/
public class StrategyTempInfo {
/*
* 主策略名称
*/
private String mainStrategyName;
/**
* 模板时间
*/
private List<EmsStrategyTemp> siteMonitorDataVo;
public String getMainStrategyName() {
return mainStrategyName;
}
public void setMainStrategyName(String mainStrategyName) {
this.mainStrategyName = mainStrategyName;
}
public List<EmsStrategyTemp> getSiteMonitorDataVo() {
return siteMonitorDataVo;
}
public void setSiteMonitorDataVo(List<EmsStrategyTemp> siteMonitorDataVo) {
this.siteMonitorDataVo = siteMonitorDataVo;
}
}

View File

@ -70,4 +70,7 @@ public interface EmsStrategyTempMapper
// 根据模板id全部删除 // 根据模板id全部删除
public int deleteTempByTempId(String templateId); public int deleteTempByTempId(String templateId);
// 获取站点和策略下的模板信息
public List<EmsStrategyTemp> getTempListBySiteIdAndStrategyId(@Param("siteId") String siteId, @Param("strategyId")Long strategyId);
} }

View File

@ -57,6 +57,10 @@ public class SingleSiteServiceImpl implements ISingleSiteService {
@Autowired @Autowired
private RedisCache redisCache; private RedisCache redisCache;
@Autowired
private EmsStrategyRunningMapper emsStrategyRunningMapper;
@Autowired
private EmsStrategyTempMapper emsStrategyTempMapper;
@Override @Override
public SiteMonitorHomeVo getSiteMonitorDataVo(String siteId) { public SiteMonitorHomeVo getSiteMonitorDataVo(String siteId) {
@ -73,6 +77,16 @@ public class SingleSiteServiceImpl implements ISingleSiteService {
// 实时告警数据 名称+状态+告警内容 // 实时告警数据 名称+状态+告警内容
List<SiteMonitorHomeAlarmVo> siteMonitorHomeAlarmVo = emsAlarmRecordsMapper.getAlarmRecordsBySiteId(siteId); List<SiteMonitorHomeAlarmVo> siteMonitorHomeAlarmVo = emsAlarmRecordsMapper.getAlarmRecordsBySiteId(siteId);
siteMonitorHomeVo.setSiteMonitorHomeAlarmVo(siteMonitorHomeAlarmVo); siteMonitorHomeVo.setSiteMonitorHomeAlarmVo(siteMonitorHomeAlarmVo);
// 策略运行-主策略模板数据
List<StrategyRunningVo> runningVo = emsStrategyRunningMapper.getRunningList(siteId);
if (runningVo != null && runningVo.size() > 0) {
StrategyTempInfo siteTempInfo = new StrategyTempInfo();
siteTempInfo.setMainStrategyName(runningVo.get(0).getMainStrategyName());
Long mainStrategyId = runningVo.get(0).getMainStrategyId();
List<EmsStrategyTemp> tempList = emsStrategyTempMapper.getTempListBySiteIdAndStrategyId(siteId, mainStrategyId);
siteTempInfo.setSiteMonitorDataVo(tempList);
siteMonitorHomeVo.setStrategyTempInfo(siteTempInfo);
}
// 能量数据 // 能量数据
LocalDate sevenDaysAgo = LocalDate.now().minusDays(6); LocalDate sevenDaysAgo = LocalDate.now().minusDays(6);
Date startDate = DateUtils.toDate(sevenDaysAgo); Date startDate = DateUtils.toDate(sevenDaysAgo);

View File

@ -143,4 +143,10 @@
<delete id="deleteTempByTempId" parameterType="String"> <delete id="deleteTempByTempId" parameterType="String">
delete from ems_strategy_temp where template_id = #{templateId} delete from ems_strategy_temp where template_id = #{templateId}
</delete> </delete>
<select id="getTempListBySiteIdAndStrategyId" resultMap="EmsStrategyTempResult">
<include refid="selectEmsStrategyTempVo"/>
where site_id = #{siteId} and strategy_id = #{strategyId}
</select>
</mapper> </mapper>