From bd8e3dd33cba4ef588ade2bb882888f1b202b195 Mon Sep 17 00:00:00 2001
From: XMnhwj_BackTechnologyDevelopment <3512363680@qq.com>
Date: Mon, 22 May 2023 16:20:52 +0800
Subject: [PATCH] =?UTF-8?q?2023-05-22=2016:20:46=20=E4=BC=98=E5=8C=96?=
=?UTF-8?q?=E5=AE=8C=E5=96=84=E6=B8=A9=E5=BA=A6=E4=BC=A0=E6=84=9F=E5=99=A8?=
=?UTF-8?q?=E6=9F=A5=E8=AF=A2=E6=8E=A5=E5=8F=A3=EF=BC=8C=E8=A1=A5=E5=85=85?=
=?UTF-8?q?=E7=A9=BA=E5=88=A4=E6=96=AD=E5=A4=84=E7=90=86!?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../PsdcThermometerHtdataServiceImpl.java | 38 ++++++++++---------
1 file changed, 20 insertions(+), 18 deletions(-)
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 7ab52f5..d3a804f 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
@@ -122,28 +122,30 @@ public class PsdcThermometerHtdataServiceImpl implements IPsdcThermometerHtdataS
List<PsdcThermometerDataRes> dataResList = psdcThermometerRtdataMapper.selWenDu(SecurityUtils.getUserId(), 16);
for (PsdcThermometerDataRes dec : dataResList ){
PsdcThermometerDataRes dataRes = psdcThermometerRtdataMapper.queryById(dec.getDeviceId(), sdf.format(date));
- List<PsdcThermometerHtdata> htdata = psdcThermometerHtdataMapper.selTodayThermometer(dec.getDeviceId(), tb, te);
+ if (null != dataRes){
+ List<PsdcThermometerHtdata> htdata = psdcThermometerHtdataMapper.selTodayThermometer(dec.getDeviceId(), tb, te);
- List<Double> listTemp = new ArrayList(); // 今天历史温度集合
- List<String> times = new ArrayList(); // 时间轴
+ List<Double> listTemp = new ArrayList(); // 今天历史温度集合
+ List<String> times = new ArrayList(); // 时间轴
- // 循环遍历今天历史数据对象集合
- for (PsdcThermometerHtdata h : htdata) {
- if (null != h.getThermometerValue()) {
- listTemp.add(h.getThermometerValue());
- }
+ // 循环遍历今天历史数据对象集合
+ for (PsdcThermometerHtdata h : htdata) {
+ if (null != h.getThermometerValue()) {
+ listTemp.add(h.getThermometerValue());
+ }
- String t = h.getUpdateTime().split(" ")[1].substring(0, 5);
- times.add(t);
+ String t = h.getUpdateTime().split(" ")[1].substring(0, 5);
+ times.add(t);
+ }
+ Map<String, Object> map3 = new HashMap();
+
+ map3.put("deviceId", dataRes.getDeviceId());
+ map3.put("deviceName", dataRes.getDeviceName());
+ map3.put("deviceTemp", dec.getThermometerValue());
+ map3.put("temps", listTemp);
+ map3.put("times", times);
+ ary.add(map3);
}
- Map<String, Object> map3 = new HashMap();
-
- map3.put("deviceId", dataRes.getDeviceId());
- map3.put("deviceName", dataRes.getDeviceName());
- map3.put("deviceTemp", dec.getThermometerValue());
- map3.put("temps", listTemp);
- map3.put("times", times);
- ary.add(map3);
}