From 3131b7135dcf5b0f1ed6a5f6228d1aef98961296 Mon Sep 17 00:00:00 2001 From: XMnhwj_BackTechnologyDevelopment <3512363680@qq.com> Date: Thu, 11 May 2023 14:53:02 +0800 Subject: [PATCH] =?UTF-8?q?2023-05-11=2010:28:06=20=E5=AE=8C=E6=88=90?= =?UTF-8?q?=E8=83=BD=E6=BA=90=E7=9B=91=E6=B5=8B=E6=80=BB=E7=94=B5=E8=A1=A8?= =?UTF-8?q?=E3=80=81=E7=94=B5=E7=A3=81=E9=94=85=E7=82=89=E3=80=81=E8=93=84?= =?UTF-8?q?=E7=83=AD=E9=94=85=E7=82=89=E3=80=81=E7=A9=BA=E6=B0=94=E6=BA=90?= =?UTF-8?q?=E7=83=AD=E6=B3=B5=E3=80=81=E5=8F=91=E7=83=AD=E7=94=B5=E7=BC=86?= =?UTF-8?q?=E3=80=81=E6=B2=99=E7=9B=98=E3=80=81=E6=B8=A9=E5=BA=A6=E4=BC=A0?= =?UTF-8?q?=E6=84=9F=E5=99=A8=E7=9A=84=E6=9F=A5=E8=AF=A2=E6=8E=A5=E5=8F=A3?= =?UTF-8?q?!?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mapper/PsdcThermometerRtdataMapper.java | 3 +- .../IPsdcThermometerHtdataService.java | 7 ++- .../PsdcThermometerHtdataServiceImpl.java | 58 +++++++++++++++++-- .../business/PsdcThermometerRtdataMapper.xml | 9 ++- .../controller/monitor/WenDuController.java | 35 +++++++++++ 5 files changed, 104 insertions(+), 8 deletions(-) create mode 100644 psdc-web/src/main/java/com/psdc/controller/monitor/WenDuController.java diff --git a/psdc-business/src/main/java/com/psdc/mapper/PsdcThermometerRtdataMapper.java b/psdc-business/src/main/java/com/psdc/mapper/PsdcThermometerRtdataMapper.java index aae7553..582518f 100644 --- a/psdc-business/src/main/java/com/psdc/mapper/PsdcThermometerRtdataMapper.java +++ b/psdc-business/src/main/java/com/psdc/mapper/PsdcThermometerRtdataMapper.java @@ -23,7 +23,8 @@ public interface PsdcThermometerRtdataMapper{ * @param thermometerRtdataId 主键 * @return 实例对象 */ - PsdcThermometerDataRes queryById(@Param("thermometerRtdataId") Integer thermometerRtdataId); + PsdcThermometerDataRes queryById(@Param("thermometerRtdataId") Integer thermometerRtdataId, + @Param("today") String today); List selWenDu(@Param("devType") Integer devType); diff --git a/psdc-business/src/main/java/com/psdc/service/IPsdcThermometerHtdataService.java b/psdc-business/src/main/java/com/psdc/service/IPsdcThermometerHtdataService.java index 5abcd91..5450247 100644 --- a/psdc-business/src/main/java/com/psdc/service/IPsdcThermometerHtdataService.java +++ b/psdc-business/src/main/java/com/psdc/service/IPsdcThermometerHtdataService.java @@ -1,9 +1,12 @@ package com.psdc.service; import com.psdc.core.domain.AjaxResult; -import com.psdc.entity.PsdcDevicePowerHdata96; +import com.psdc.entity.PsdcThermometerHtdata; import com.psdc.entity.res.PsdcDevicePowerRes; +import java.util.List; +import java.util.Map; + /** * @Author：戴仕崑 @@ -21,6 +24,8 @@ public interface IPsdcThermometerHtdataService { PsdcDevicePowerRes selTotalElectricityInfo(Integer deviceId); + Map selTodayThermometerById(Integer deviceId); + AjaxResult selDzglWenDu(Integer deviceId); } diff --git a/psdc-business/src/main/java/com/psdc/service/impl/PsdcThermometerHtdataServiceImpl.java b/psdc-business/src/main/java/com/psdc/service/impl/PsdcThermometerHtdataServiceImpl.java index a5c87ec..453ace8 100644 --- a/psdc-business/src/main/java/com/psdc/service/impl/PsdcThermometerHtdataServiceImpl.java +++ b/psdc-business/src/main/java/com/psdc/service/impl/PsdcThermometerHtdataServiceImpl.java @@ -48,12 +48,12 @@ public class PsdcThermometerHtdataServiceImpl implements IPsdcThermometerHtdataS Date date = new Date(); List ary = new ArrayList(); + String tb = sdf.format(date) + " 00:00:00"; // 今天开始检索时间 + String te = sdf.format(date) + " 23:59:59"; // 今天结束检索时间 + for (Integer d : devList) { // 查询今日实时温度数据 - PsdcThermometerDataRes dataRes = psdcThermometerRtdataMapper.queryById(d); - - String tb = sdf.format(date) + " 00:00:00"; // 今天开始检索时间 - String te = sdf.format(date) + " 23:59:59"; // 今天结束检索时间 + PsdcThermometerDataRes dataRes = psdcThermometerRtdataMapper.queryById(d, sdf.format(date)); List listIn = new ArrayList(); // 今天历史进水温度集合 List listOut = new ArrayList(); // 今天历史出水温度集合 @@ -63,7 +63,9 @@ public class PsdcThermometerHtdataServiceImpl implements IPsdcThermometerHtdataS // 循环遍历今天历史数据对象集合 List htdata = psdcThermometerHtdataMapper.selTodayThermometer(d, tb, te); for (PsdcThermometerHtdata h : htdata){ - listTemp.add(h.getThermometerValue()); + if (null != h.getThermometerValue()){ + listTemp.add(h.getThermometerValue()); + } if (null != h.getThermometerValueIn()){ listIn.add(h.getThermometerValueIn()); } @@ -108,6 +110,52 @@ public class PsdcThermometerHtdataServiceImpl implements IPsdcThermometerHtdataS } } + @Override + public Map selTodayThermometerById(Integer deviceId) { + Date date = new Date(); + String tb = sdf.format(date) + " 00:00:00"; // 今天开始检索时间 + String te = sdf.format(date) + " 23:59:59"; // 今天结束检索时间 + Map map = new HashMap(); + // 查询该设备实时温度数据 + PsdcThermometerDataRes dataRes = psdcThermometerRtdataMapper.queryById(deviceId, sdf.format(date)); + List htdata = psdcThermometerHtdataMapper.selTodayThermometer(deviceId, tb, te); + + if (null == dataRes || null == htdata){ + return null; + } + + List listIn = new ArrayList(); // 今天历史进水温度集合 + List listOut = new ArrayList(); // 今天历史出水温度集合 + List listTemp = new ArrayList(); // 今天历史温度集合 + List times = new ArrayList(); // 时间轴 + + // 循环遍历今天历史数据对象集合 + + for (PsdcThermometerHtdata h : htdata){ + if (null != h.getThermometerValue()){ + listTemp.add(h.getThermometerValue()); + } + if (null != h.getThermometerValueIn()){ + listIn.add(h.getThermometerValueIn()); + } + if (null != h.getThermometerValueOut()){ + listOut.add(h.getThermometerValueOut()); + } + + String t = h.getUpdateTime().split(" ")[1].substring(0,5); + times.add(t); + } + map.put("deviceId", dataRes.getDeviceId()); + map.put("deviceName", dataRes.getDeviceName()); + map.put("deviceTemp", dataRes.getThermometerValue()); + map.put("tempIn", listIn); + map.put("tempOut", listOut); + map.put("temps", listTemp); + map.put("times", times); + + return map; + } + /** * 查询电磁锅炉进水、出水温度 * @return diff --git a/psdc-business/src/main/resources/mapper/business/PsdcThermometerRtdataMapper.xml b/psdc-business/src/main/resources/mapper/business/PsdcThermometerRtdataMapper.xml index e2e6f51..e32493c 100644 --- a/psdc-business/src/main/resources/mapper/business/PsdcThermometerRtdataMapper.xml +++ b/psdc-business/src/main/resources/mapper/business/PsdcThermometerRtdataMapper.xml @@ -24,7 +24,14 @@ Select pd.device_id, pd.device_name, pd.device_runstatus, ptr.thermometer_value, ptr.thermometer_value_in, ptr.thermometer_value_out From psdc_device pd Left Join psdc_thermometer_rtdata ptr On ptr.device_id = pd.device_id - Where ptr.device_id = #{thermometerRtdataId} + + + ptr.device_id = #{thermometerRtdataId} + + + And DATE_FORMAT(ptr.update_time,'%Y-%m-%d') = #{today} + +