diff --git a/ems-system/src/main/java/com/xzzn/ems/domain/vo/SiteMonitorHomeVo.java b/ems-system/src/main/java/com/xzzn/ems/domain/vo/SiteMonitorHomeVo.java index 0c8b748..d0991df 100644 --- a/ems-system/src/main/java/com/xzzn/ems/domain/vo/SiteMonitorHomeVo.java +++ b/ems-system/src/main/java/com/xzzn/ems/domain/vo/SiteMonitorHomeVo.java @@ -60,6 +60,11 @@ public class SiteMonitorHomeVo { */ private List siteMonitorDataVo; + /** + * 策略显示 + */ + private StrategyTempInfo strategyTempInfo; + public BigDecimal getDayChargedCap() { return dayChargedCap; } @@ -139,4 +144,12 @@ public class SiteMonitorHomeVo { public void setSiteMonitorDataVo(List siteMonitorDataVo) { this.siteMonitorDataVo = siteMonitorDataVo; } + + public StrategyTempInfo getStrategyTempInfo() { + return strategyTempInfo; + } + + public void setStrategyTempInfo(StrategyTempInfo strategyTempInfo) { + this.strategyTempInfo = strategyTempInfo; + } } diff --git a/ems-system/src/main/java/com/xzzn/ems/domain/vo/StrategyTempInfo.java b/ems-system/src/main/java/com/xzzn/ems/domain/vo/StrategyTempInfo.java new file mode 100644 index 0000000..13f7a4f --- /dev/null +++ b/ems-system/src/main/java/com/xzzn/ems/domain/vo/StrategyTempInfo.java @@ -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 siteMonitorDataVo; + + public String getMainStrategyName() { + return mainStrategyName; + } + + public void setMainStrategyName(String mainStrategyName) { + this.mainStrategyName = mainStrategyName; + } + + public List getSiteMonitorDataVo() { + return siteMonitorDataVo; + } + + public void setSiteMonitorDataVo(List siteMonitorDataVo) { + this.siteMonitorDataVo = siteMonitorDataVo; + } +} diff --git a/ems-system/src/main/java/com/xzzn/ems/mapper/EmsStrategyTempMapper.java b/ems-system/src/main/java/com/xzzn/ems/mapper/EmsStrategyTempMapper.java index 24db8da..a15653a 100644 --- a/ems-system/src/main/java/com/xzzn/ems/mapper/EmsStrategyTempMapper.java +++ b/ems-system/src/main/java/com/xzzn/ems/mapper/EmsStrategyTempMapper.java @@ -70,4 +70,7 @@ public interface EmsStrategyTempMapper // 根据模板id全部删除 public int deleteTempByTempId(String templateId); + + // 获取站点和策略下的模板信息 + public List getTempListBySiteIdAndStrategyId(@Param("siteId") String siteId, @Param("strategyId")Long strategyId); } diff --git a/ems-system/src/main/java/com/xzzn/ems/service/impl/SingleSiteServiceImpl.java b/ems-system/src/main/java/com/xzzn/ems/service/impl/SingleSiteServiceImpl.java index c0ecf36..43d4d80 100644 --- a/ems-system/src/main/java/com/xzzn/ems/service/impl/SingleSiteServiceImpl.java +++ b/ems-system/src/main/java/com/xzzn/ems/service/impl/SingleSiteServiceImpl.java @@ -57,6 +57,10 @@ public class SingleSiteServiceImpl implements ISingleSiteService { @Autowired private RedisCache redisCache; + @Autowired + private EmsStrategyRunningMapper emsStrategyRunningMapper; + @Autowired + private EmsStrategyTempMapper emsStrategyTempMapper; @Override public SiteMonitorHomeVo getSiteMonitorDataVo(String siteId) { @@ -73,6 +77,16 @@ public class SingleSiteServiceImpl implements ISingleSiteService { // 实时告警数据 名称+状态+告警内容 List siteMonitorHomeAlarmVo = emsAlarmRecordsMapper.getAlarmRecordsBySiteId(siteId); siteMonitorHomeVo.setSiteMonitorHomeAlarmVo(siteMonitorHomeAlarmVo); + // 策略运行-主策略模板数据 + List 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 tempList = emsStrategyTempMapper.getTempListBySiteIdAndStrategyId(siteId, mainStrategyId); + siteTempInfo.setSiteMonitorDataVo(tempList); + siteMonitorHomeVo.setStrategyTempInfo(siteTempInfo); + } // 能量数据 LocalDate sevenDaysAgo = LocalDate.now().minusDays(6); Date startDate = DateUtils.toDate(sevenDaysAgo); diff --git a/ems-system/src/main/resources/mapper/ems/EmsStrategyTempMapper.xml b/ems-system/src/main/resources/mapper/ems/EmsStrategyTempMapper.xml index b297a52..0b892fa 100644 --- a/ems-system/src/main/resources/mapper/ems/EmsStrategyTempMapper.xml +++ b/ems-system/src/main/resources/mapper/ems/EmsStrategyTempMapper.xml @@ -143,4 +143,10 @@ delete from ems_strategy_temp where template_id = #{templateId} + + + \ No newline at end of file