diff --git a/os-ems/src/main/java/com/os/ems/record/controller/EmsRecordSteamInstantController.java b/os-ems/src/main/java/com/os/ems/record/controller/EmsRecordSteamInstantController.java index 7810b4c..f194618 100644 --- a/os-ems/src/main/java/com/os/ems/record/controller/EmsRecordSteamInstantController.java +++ b/os-ems/src/main/java/com/os/ems/record/controller/EmsRecordSteamInstantController.java @@ -1,6 +1,10 @@ package com.os.ems.record.controller; +import java.math.BigDecimal; +import java.util.ArrayList; +import java.util.Date; import java.util.List; +import java.util.Map; import javax.servlet.http.HttpServletResponse; import org.springframework.security.access.prepost.PreAuthorize; @@ -125,4 +129,21 @@ public class EmsRecordSteamInstantController extends BaseController { return success(list); } +/* 计算指定时间内的耗量*/ + @GetMapping("/getExpendSum") + public BigDecimal getExpendSum(EmsRecordSteamInstant emsRecordSteamInstant) { + BigDecimal expendSum = BigDecimal.ZERO;//默认设为0 + List list = emsRecordSteamInstantService + .selectEmsRecordSteamInstantListByTime(emsRecordSteamInstant); + /*private Map params;emsRecordSteamInstant中的params.beginRecordTime和params.endRecordTime不为空, + 获取emsRecordSteamInstants第一条数据和最后一条数据, + 相减last-first并赋值给emsRecordSteamInstant中的expendSunm(BigDecimal类型)*/ + if (emsRecordSteamInstant.getParams().get("beginRecordTime") != null && emsRecordSteamInstant.getParams().get("endRecordTime") != null) { + EmsRecordSteamInstant last = list.get(0); + EmsRecordSteamInstant first = list.get(list.size() - 1); + expendSum = last.getSteamFlow().subtract(first.getSteamFlow()); + } + return expendSum; + } + } diff --git a/os-ems/src/main/java/com/os/ems/record/domain/EmsRecordSteamInstant.java b/os-ems/src/main/java/com/os/ems/record/domain/EmsRecordSteamInstant.java index 88c0103..0454b38 100644 --- a/os-ems/src/main/java/com/os/ems/record/domain/EmsRecordSteamInstant.java +++ b/os-ems/src/main/java/com/os/ems/record/domain/EmsRecordSteamInstant.java @@ -95,6 +95,11 @@ public class EmsRecordSteamInstant extends BaseEntity { @Excel(name = "记录时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss") private Date recordTime; +/* *//** + * 时间段内的消耗计算量 + *//* + private BigDecimal expendSunm;*/ + public String getMonitorName() { return monitorName; } @@ -199,6 +204,16 @@ public class EmsRecordSteamInstant extends BaseEntity { return recordTime; } +/* + public BigDecimal getExpendSunm() { + return expendSunm; + } + + public void setExpendSunm(BigDecimal expendSunm) { + this.expendSunm = expendSunm; + } +*/ + @Override public String toString() { return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE) @@ -214,6 +229,7 @@ public class EmsRecordSteamInstant extends BaseEntity { .append("density", getDensity()) .append("differencePress", getDifferencePress()) .append("recordTime", getRecordTime()) +/* .append("expendSunm", getExpendSunm())*/ .toString(); } } diff --git a/os-ems/src/main/java/com/os/ems/record/mapper/EmsRecordSteamInstantMapper.java b/os-ems/src/main/java/com/os/ems/record/mapper/EmsRecordSteamInstantMapper.java index 6da0dba..6d24066 100644 --- a/os-ems/src/main/java/com/os/ems/record/mapper/EmsRecordSteamInstantMapper.java +++ b/os-ems/src/main/java/com/os/ems/record/mapper/EmsRecordSteamInstantMapper.java @@ -67,4 +67,13 @@ public interface EmsRecordSteamInstantMapper { */ public List selectEmsRecordLatestSteamInstantList(EmsRecordSteamInstant emsRecordSteamInstant); + + /** + * 根据时间段查询蒸汽历史数据列表 + * + * @param emsRecordSteamInstant 蒸汽历史数据 + * @return 蒸汽历史数据集合 + */ + public List selectEmsRecordSteamInstantListByTime(EmsRecordSteamInstant emsRecordSteamInstant); + } diff --git a/os-ems/src/main/java/com/os/ems/record/service/IEmsRecordSteamInstantService.java b/os-ems/src/main/java/com/os/ems/record/service/IEmsRecordSteamInstantService.java index 0b4d662..acb42d3 100644 --- a/os-ems/src/main/java/com/os/ems/record/service/IEmsRecordSteamInstantService.java +++ b/os-ems/src/main/java/com/os/ems/record/service/IEmsRecordSteamInstantService.java @@ -66,4 +66,14 @@ public interface IEmsRecordSteamInstantService { * @return 蒸汽实时数据 */ public List selectEmsRecordLatestSteamInstantList(EmsRecordSteamInstant emsRecordSteamInstant); + + /** + * 根据时间段查询蒸汽历史数据列表 + * + * @param emsRecordSteamInstant 蒸汽历史数据 + * @return 蒸汽历史数据集合 + */ + public List selectEmsRecordSteamInstantListByTime(EmsRecordSteamInstant emsRecordSteamInstant); + + } diff --git a/os-ems/src/main/java/com/os/ems/record/service/impl/EmsRecordSteamInstantServiceImpl.java b/os-ems/src/main/java/com/os/ems/record/service/impl/EmsRecordSteamInstantServiceImpl.java index 68f04b9..2a4a4db 100644 --- a/os-ems/src/main/java/com/os/ems/record/service/impl/EmsRecordSteamInstantServiceImpl.java +++ b/os-ems/src/main/java/com/os/ems/record/service/impl/EmsRecordSteamInstantServiceImpl.java @@ -1,6 +1,9 @@ package com.os.ems.record.service.impl; +import java.math.BigDecimal; +import java.util.Date; import java.util.List; +import java.util.Map; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -99,4 +102,15 @@ public class EmsRecordSteamInstantServiceImpl implements IEmsRecordSteamInstantS return emsRecordSteamInstantMapper.selectEmsRecordLatestSteamInstantList(emsRecordSteamInstant).subList(0,1); } + + /** + * 根据时间段查询蒸汽历史数据列表 + * + * @param emsRecordSteamInstant 蒸汽历史数据 + * @return 蒸汽历史数据集合 + */ + public List selectEmsRecordSteamInstantListByTime(EmsRecordSteamInstant emsRecordSteamInstant){ + return emsRecordSteamInstantMapper.selectEmsRecordSteamInstantListByTime(emsRecordSteamInstant); + } + } diff --git a/os-ems/src/main/resources/mapper/ems/record/EmsRecordSteamInstantMapper.xml b/os-ems/src/main/resources/mapper/ems/record/EmsRecordSteamInstantMapper.xml index 3d2a7aa..be75127 100644 --- a/os-ems/src/main/resources/mapper/ems/record/EmsRecordSteamInstantMapper.xml +++ b/os-ems/src/main/resources/mapper/ems/record/EmsRecordSteamInstantMapper.xml @@ -152,4 +152,28 @@ #{objId} + + + \ No newline at end of file