From e414c2eb234515e07e4f041e1dc80c7589fbf41a Mon Sep 17 00:00:00 2001 From: cjl <276999030@qq.com> Date: Fri, 21 Jul 2023 15:51:51 +0800 Subject: [PATCH] fix: 导出数据均值多算0 --- screen-api/src/main/java/com/moral/api/service/impl/HistoryDailyServiceImpl.java | 9 +++++++++ 1 files changed, 9 insertions(+), 0 deletions(-) diff --git a/screen-api/src/main/java/com/moral/api/service/impl/HistoryDailyServiceImpl.java b/screen-api/src/main/java/com/moral/api/service/impl/HistoryDailyServiceImpl.java index b16ccb0..060cb1c 100644 --- a/screen-api/src/main/java/com/moral/api/service/impl/HistoryDailyServiceImpl.java +++ b/screen-api/src/main/java/com/moral/api/service/impl/HistoryDailyServiceImpl.java @@ -109,6 +109,15 @@ } @Override + public List<HistoryDaily> getHistoryDailyByMacAndTimeSlot( List<String> macs, Date startDate, Date endDate) { + QueryWrapper<HistoryDaily> wrapper = new QueryWrapper<>(); + wrapper.in("mac", macs); + wrapper.between("time", startDate, endDate); + List<HistoryDaily> historyDailies = historyDailyMapper.selectList(wrapper); + return historyDailies; + } + + @Override public Map<String, Object> getThermodynamicDiagramDataByOrgIdSensorCodeTime(Map<String, Object> parameters) { Map<String, Object> resultMap = new HashMap<>(); int orgId = Integer.parseInt(parameters.get("organization_id").toString()); -- Gitblit v1.8.0