From 9b51b10d6eb2f93f240fcb214ec3cd804b3b12fb Mon Sep 17 00:00:00 2001
From: stone <827672943@qq.com>
Date: Wed, 10 May 2023 09:16:15 +0800
Subject: [PATCH] 111

---
 .../PsdcThermometerHtdataServiceImpl.java     | 32 +++++++++----------
 1 file changed, 16 insertions(+), 16 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 7cfdf9e..ecd78c9 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
@@ -25,17 +25,17 @@ import java.util.*;
 public class PsdcThermometerHtdataServiceImpl implements IPsdcThermometerHtdataService {
 
     @Resource
-    PsdcThermometerRtdataMapper mapper1;
+    PsdcThermometerRtdataMapper psdcThermometerRtdataMapper;
     @Resource
-    PsdcThermometerHtdataMapper mapper2;
+    PsdcThermometerHtdataMapper psdcThermometerHtdataMapper;
     @Resource
-    PsdcElectricHtdataMapper mapper3;
+    PsdcElectricHtdataMapper psdcElectricHtdataMapper;
     @Resource
-    PsdcDeviceMapper mapper4;
+    PsdcDeviceMapper psdcDeviceMapper;
     @Resource
-    PsdcDevicePowerHdata96Mapper mapper5;
+    PsdcDevicePowerHdata96Mapper psdcDevicePowerHdata96Mapper;
     @Resource
-    PsdcElectricRtdataMapper mapper6;
+    PsdcElectricRtdataMapper psdcElectricRtdataMapper;
 
     SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
     SimpleDateFormat sdf2 = new SimpleDateFormat("yyyyMMdd");
@@ -44,18 +44,18 @@ public class PsdcThermometerHtdataServiceImpl implements IPsdcThermometerHtdataS
     public AjaxResult selTodayThermometer() {
 
         long userId = SecurityUtils.getUserId();
-        List<Integer> devList = mapper4.selMyWorkDevices(2, userId);
+        List<Integer> devList = psdcDeviceMapper.selMyWorkDevices(2, userId);
         Date date = new Date();
         List<PsdcThermometerDataRes> ary = new ArrayList();
 
         for (Integer d : devList) {
 
-            PsdcThermometerDataRes dataRes = mapper1.queryById(d);
-            List<Double> listIn = mapper2.selTodayThermometer("thermometer_value_in", d, sdf.format(date));
-            List<Double> listOut = mapper2.selTodayThermometer("thermometer_value_out", d, sdf.format(date));
-            List<Double> listTemp = mapper2.selTodayThermometer("thermometer_value", d, sdf.format(date));
-            List<String> times = mapper2.selTodayThermometer2(d, sdf.format(date));
-            Double useEnergy = mapper3.selTodayUseEnergy(d, sdf.format(date));
+            PsdcThermometerDataRes dataRes = psdcThermometerRtdataMapper.queryById(d);
+            List<Double> listIn = psdcThermometerHtdataMapper.selTodayThermometer("thermometer_value_in", d, sdf.format(date));
+            List<Double> listOut = psdcThermometerHtdataMapper.selTodayThermometer("thermometer_value_out", d, sdf.format(date));
+            List<Double> listTemp = psdcThermometerHtdataMapper.selTodayThermometer("thermometer_value", d, sdf.format(date));
+            List<String> times = psdcThermometerHtdataMapper.selTodayThermometer2(d, sdf.format(date));
+            Double useEnergy = psdcElectricHtdataMapper.selTodayUseEnergy(d, sdf.format(date));
             dataRes.setTimeList(times);
             dataRes.setTempTodayList(listTemp);
             dataRes.setTempInTodayList(listIn);
@@ -70,15 +70,15 @@ public class PsdcThermometerHtdataServiceImpl implements IPsdcThermometerHtdataS
 
     @Override
     public AjaxResult sel8WnDu() {
-        List<PsdcThermometerDataRes> dataResList = mapper1.selWenDu(1);
+        List<PsdcThermometerDataRes> dataResList = psdcThermometerRtdataMapper.selWenDu(1);
         return AjaxResult.success(dataResList);
     }
 
     @Override
     public AjaxResult selTotalElectricityInfo() {
         long userId = SecurityUtils.getUserId();
-        PsdcDevicePowerHdata96 hdata96 = mapper5.queryById(userId, 13, sdf2.format(new Date()));
-        PsdcDevicePowerRes rtdata = mapper6.queryById(13);
+        PsdcDevicePowerHdata96 hdata96 = psdcDevicePowerHdata96Mapper.queryById(userId, 13, sdf2.format(new Date()));
+        PsdcDevicePowerRes rtdata = psdcElectricRtdataMapper.queryById(13);
         rtdata.setTodayUsePowers(hdata96);
         return AjaxResult.success(rtdata);
     }