修改当月用电趋势

fiveep-service/src/main/java/com/bizmatics/service/impl/HtAnalogDataServiceImpl.java

@@ -52,11 +52,11 @@ public class HtAnalogDataServiceImpl extends AbstractCrudService<HtAnalogDataMap
         Date yeTime = DateUtils.addDays(eTime,-1);
         List<CommonIcoVO> list = new ArrayList<>();
         if (null != siteId){
-            list.add(getTreedBySite("today", siteId, sTime, eTime));
-            list.add(getTreedBySite("yesterday", siteId, ysTime, yeTime));
+            list.add(getTreedBySite("昨日", siteId, sTime, eTime));
+            list.add(getTreedBySite("今日", siteId, ysTime, yeTime));
         }else {
-            list.add(getTrendOne("today", userId, sTime));
-            list.add(getTrendOne("yesterday", userId, yeTime));
+            list.add(getTrendOne("昨天", userId, sTime));
+            list.add(getTrendOne("今日", userId, yeTime));
         }
         return list;
     }
@@ -209,7 +209,7 @@ public class HtAnalogDataServiceImpl extends AbstractCrudService<HtAnalogDataMap
         }
         List<CommonIcoVO> list = new ArrayList<>();
         list.add(CommonIcoVO.builder().name("MAX").list(maxList).listDate(dateList).build());
-        list.add(CommonIcoVO.builder().name("MIN").list(minList).list(dateList).build());
+        list.add(CommonIcoVO.builder().name("MIN").list(minList).listDate(dateList).build());
         list.add(CommonIcoVO.builder().name("AVG").list(avgList).listDate(dateList).build());
         return list;
     }
@@ -231,29 +231,25 @@ public class HtAnalogDataServiceImpl extends AbstractCrudService<HtAnalogDataMap
         List<Object> dateList = new ArrayList<>();
         dateList.add("00:00:00");
         HadSiteStatic hadSiteStatic = hadSiteStaticService.oneBySite(siteId, date, date);
-        if (null != hadSiteStatic){
-            List<HtAnalogData> htList = JsonUtils.fromJson(hadSiteStatic.getHisIco(), new TypeReference<List<HtAnalogData>>(){});
-            for (HtAnalogData htAnalogData:htList) {
-                iaList.add(htAnalogData.getIa());
-                ibList.add(htAnalogData.getIb());
-                icList.add(htAnalogData.getIc());
-                uaList.add(htAnalogData.getUc());
-                ubList.add(htAnalogData.getUb());
-                ucList.add(htAnalogData.getUc());
-                dateList.add(htAnalogData.getDataTime());
-            }
-        }else {
-            for (int i = 2; i < 24 ; i+=2) {
-                iaList.add(0.00);
-                ibList.add(0.00);
-                icList.add(0.00);
-                uaList.add(0.00);
-                ubList.add(0.00);
-                ucList.add(0.00);
-                Date hours = DateUtils.setHours(date, i);
-                date = hours;
-                dateList.add(DateUtils.getTime(hours));
-            }
+        List<HtAnalogData> htList = Optional.ofNullable(hadSiteStatic)
+                .map(HadSiteStatic::getHisIco)
+                .map(his -> JsonUtils.fromJson(hadSiteStatic.getHisIco(), new TypeReference<List<HtAnalogData>>(){}))
+                .orElse(null);
+        for (int i = 2; i < 24 ; i+=2) {
+            Date hours = DateUtils.setHours(date, i);
+            date = hours;
+            dateList.add(DateUtils.getTime(hours));
+            Date finalDate = date;
+            Optional<HtAnalogData> htAnalogData = Optional.ofNullable(htList).flatMap(hts -> hts.stream()
+                    .filter(hads -> isEffectiveDate(hads.getDataTime(), finalDate, hours))
+                    .findFirst());
+            iaList.add(htAnalogData.map(HtAnalogData::getIa).orElse(0.00));
+            ibList.add(htAnalogData.map(HtAnalogData::getIb).orElse(0.00));
+            icList.add(htAnalogData.map(HtAnalogData::getIc).orElse(0.00));
+            uaList.add(htAnalogData.map(HtAnalogData::getUa).orElse(0.00));
+            ubList.add(htAnalogData.map(HtAnalogData::getUb).orElse(0.00));
+            ucList.add(htAnalogData.map(HtAnalogData::getUc).orElse(0.00));
+            dateList.add(htAnalogData.map(HtAnalogData::getDataTime).map(Date::toString).orElse(DateUtils.getTime(hours)));
         }
         List<CommonIcoVO> list = new ArrayList<>();
         list.add(CommonIcoVO.builder().name("IA").list(iaList).listDate(dateList).build());

fiveep-service/src/main/java/com/bizmatics/service/job/RatAnalogTask.java

@@ -132,17 +132,10 @@ public class RatAnalogTask {
                 objects.add(loadIco.get("eppMax")-loadIco.get("eppMin"));
             }
             HtAnalogData htAnalogData = htAnalogDataMapper.selectByEndTime(dayStartTime, hours, siteId, null);
-            if (null == htAnalogData){
-                HtAnalogData htAnalogData1 = new HtAnalogData();
-                htAnalogData1.setIa(0.00);
-                htAnalogData1.setIb(0.00);
-                htAnalogData1.setIc(0.00);
-                htAnalogData1.setUa(0.00);
-                htAnalogData1.setUb(0.00);
-                htAnalogData1.setUc(0.00);
-                htAnalogData = htAnalogData1;
-            }
-            hisList.add(htAnalogData);
+            Optional.ofNullable(htAnalogData).ifPresent(hta -> {
+                hta.setDataTime(hours);
+                hisList.add(hta);
+            });
             dayStartTime = hours;
             dates.add(DateUtils.getTime(hours));
         }