Merge branch 'developer' of http://36.40.66.175:5000/moa/amos-boot-biz into developer

amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/resources/mapper/tdengine/MonthGenerateMapper.xml

@@ -13,7 +13,7 @@
                 </foreach>
             </if>
             <if test="dateTime!=null">
-             and   year = #{dateTime}
+             and   month_time = #{dateTime}
             </if>
         </where>
         LIMIT #{current} ,#{size}

amos-boot-system-jxiop/amos-boot-module-hygf-biz/src/main/java/com/yeejoin/amos/boot/module/hygf/biz/service/impl/JpInverterServiceImpl.java

@@ -142,6 +142,7 @@ public class JpInverterServiceImpl extends BaseService<JpInverterDto, JpInverter
         tdHYGFInverterDayGeneratePage.setTotal(tdHYGFInverterDayGenerates.size());
         tdHYGFInverterDayGeneratePage.setSize(size);
         tdHYGFInverterDayGeneratePage.setCurrent(current);
+        tdHYGFInverterDayGenerates = tdHYGFInverterDayGenerates.stream().filter(tdHYGFInverterDayGenerate -> StringUtils.isNotBlank(tdHYGFInverterDayGenerate.getSnCode().trim())).collect(Collectors.toList());
         tdHYGFInverterDayGenerates = tdHYGFInverterDayGenerates.subList((current - 1) * size, current * size > tdHYGFInverterDayGenerates.size() ? tdHYGFInverterDayGenerates.size() : current * size);
         tdHYGFInverterDayGenerates.forEach(tdHYGFInverterDayGenerate -> {
             Date date1 = new Date(tdHYGFInverterDayGenerate.getCreatedTime());
@@ -164,6 +165,7 @@ public class JpInverterServiceImpl extends BaseService<JpInverterDto, JpInverter
         }
         queryWrapper.orderByDesc("created_time");
         List<TdHYGFInverterDayGenerate> tdHYGFInverterDayGenerates = tdHYGFInverterDayGenerateMapper.selectList(queryWrapper);
+        tdHYGFInverterDayGenerates = tdHYGFInverterDayGenerates.stream().filter(tdHYGFInverterDayGenerate -> StringUtils.isNotBlank(tdHYGFInverterDayGenerate.getSnCode().trim())).collect(Collectors.toList());
         tdHYGFInverterDayGenerates.forEach(tdHYGFInverterDayGenerate -> {
             Date date1 = new Date(tdHYGFInverterDayGenerate.getCreatedTime());
             tdHYGFInverterDayGenerate.setCreatedTimeStr(DateUtil.format(date1, DatePattern.NORM_DATETIME_PATTERN));
@@ -184,6 +186,7 @@ public class JpInverterServiceImpl extends BaseService<JpInverterDto, JpInverter
         tdHYGFInverterMonthGeneratePage.setTotal(tdHYGFInverterMonthGenerates.size());
         tdHYGFInverterMonthGeneratePage.setSize(size);
         tdHYGFInverterMonthGeneratePage.setCurrent(current);
+        tdHYGFInverterMonthGenerates = tdHYGFInverterMonthGenerates.stream().filter(tdHYGFInverterMonthGenerate -> StringUtils.isNotBlank(tdHYGFInverterMonthGenerate.getSnCode().trim())).collect(Collectors.toList());
         tdHYGFInverterMonthGenerates = tdHYGFInverterMonthGenerates.subList((current - 1) * size, current * size > tdHYGFInverterMonthGenerates.size() ? tdHYGFInverterMonthGenerates.size() : current * size);
         tdHYGFInverterMonthGenerates.forEach(tdHYGFInverterMonthGenerate -> tdHYGFInverterMonthGenerate.setFullhour(Double.valueOf(String.format("%.2f",tdHYGFInverterMonthGenerate.getFullhour()))));
         tdHYGFInverterMonthGeneratePage.setRecords(tdHYGFInverterMonthGenerates);
@@ -199,6 +202,7 @@ public class JpInverterServiceImpl extends BaseService<JpInverterDto, JpInverter
         }
         queryWrapper.orderByDesc("day_time");
         List<TdHYGFInverterMonthGenerate> tdHYGFInverterMonthGenerates = tdHYGFInverterMonthGenerateMapper.selectList(queryWrapper);
+        tdHYGFInverterMonthGenerates = tdHYGFInverterMonthGenerates.stream().filter(tdHYGFInverterMonthGenerate -> StringUtils.isNotBlank(tdHYGFInverterMonthGenerate.getSnCode().trim())).collect(Collectors.toList());
         tdHYGFInverterMonthGenerates.forEach(tdHYGFInverterMonthGenerate -> tdHYGFInverterMonthGenerate.setFullhour(Double.valueOf(String.format("%.2f",tdHYGFInverterMonthGenerate.getFullhour()))));
         return tdHYGFInverterMonthGenerates;
     }
@@ -216,6 +220,7 @@ public class JpInverterServiceImpl extends BaseService<JpInverterDto, JpInverter
         tdHYGFInverterYearGeneratePage.setTotal(tdHYGFInverterYearGenerates.size());
         tdHYGFInverterYearGeneratePage.setSize(size);
         tdHYGFInverterYearGeneratePage.setCurrent(current);
+        tdHYGFInverterYearGenerates = tdHYGFInverterYearGenerates.stream().filter(tdHYGFInverterYearGenerate -> StringUtils.isNotBlank(tdHYGFInverterYearGenerate.getSnCode().trim())).collect(Collectors.toList());
         tdHYGFInverterYearGenerates = tdHYGFInverterYearGenerates.subList((current - 1) * size, current * size > tdHYGFInverterYearGenerates.size() ? tdHYGFInverterYearGenerates.size() : current * size);
         tdHYGFInverterYearGenerates.forEach(tdHYGFInverterYearGenerate -> tdHYGFInverterYearGenerate.setFullhour(Double.valueOf(String.format("%.2f",tdHYGFInverterYearGenerate.getFullhour()))));
         tdHYGFInverterYearGeneratePage.setRecords(tdHYGFInverterYearGenerates);
@@ -231,6 +236,7 @@ public class JpInverterServiceImpl extends BaseService<JpInverterDto, JpInverter
         }
         queryWrapper.orderByDesc("month_time");
         List<TdHYGFInverterYearGenerate> tdHYGFInverterYearGenerates = tdHYGFInverterYearGenerateMapper.selectList(queryWrapper);
+        tdHYGFInverterYearGenerates = tdHYGFInverterYearGenerates.stream().filter(tdHYGFInverterYearGenerate -> StringUtils.isNotBlank(tdHYGFInverterYearGenerate.getSnCode().trim())).collect(Collectors.toList());
         tdHYGFInverterYearGenerates.forEach(tdHYGFInverterYearGenerate -> tdHYGFInverterYearGenerate.setFullhour(Double.valueOf(String.format("%.2f",tdHYGFInverterYearGenerate.getFullhour()))));
         return tdHYGFInverterYearGenerates;
     }

amos-boot-system-jxiop/amos-boot-module-hygf-biz/src/main/java/com/yeejoin/amos/boot/module/hygf/biz/service/impl/JpStationServiceImpl.java

 package com.yeejoin.amos.boot.module.hygf.biz.service.impl;
 
+import cn.hutool.core.date.DateUtil;
 import com.alibaba.excel.EasyExcel;
 import com.alibaba.excel.support.ExcelTypeEnum;
 import com.baomidou.mybatisplus.annotation.TableField;
@@ -252,7 +253,7 @@ public class JpStationServiceImpl extends BaseService<JpStationDto,JpStation,JpS
     @Override
     @UserLimits
     public Map<String, List<Object>> getPowerqxnew(String date,JpStationDto reviewDto) {
-
+         date = DateUtil.format(new Date(), "yyyy-MM-dd");
         List<String> statioId=new ArrayList();
         List<JpStation> dataJpStation= jpStationMapper.getJpStation(reviewDto);
         for (JpStation jpStation : dataJpStation) {
@@ -444,6 +445,7 @@ public class JpStationServiceImpl extends BaseService<JpStationDto,JpStation,JpS
                     hd.setUserName(jpStation.getUserName());
                     hd.setStationContact(jpStation.getStationContact());
                     hd.setState(jpStation.getState());
+                    hd.setThirdStationId(jpStation.getThirdStationId());
                     hd.setAccumulatedPower(jpStation.getAccumulatedPower());
                     hd.setFullhour(Double.valueOf(String.format("%.2f", jpStation.getAccumulatedPower()/jpStation.getCapacity())));
                     hd.setAccumulatedPower(jpStation.getAccumulatedPower());
@@ -486,7 +488,7 @@ public class JpStationServiceImpl extends BaseService<JpStationDto,JpStation,JpS
                     hd.setStationContact(jpStation.getStationContact());
                     hd.setState(jpStation.getState());
                     hd.setAccumulatedPower(jpStation.getAccumulatedPower());
-
+                    hd.setThirdStationId(jpStation.getThirdStationId());
                     hd.setFullhour(dayGenerate.getFullhour()!=null?Double.valueOf(String.format("%.2f",dayGenerate.getFullhour())):null);
                     hd.setDayGenerate(dayGenerate.getGenerate());
                     hd.setTimeDate(dayGenerate.getDayTime());
@@ -510,6 +512,7 @@ public class JpStationServiceImpl extends BaseService<JpStationDto,JpStation,JpS
                     hd.setUserName(jpStation.getUserName());
                     hd.setStationContact(jpStation.getStationContact());
                     hd.setState(jpStation.getState());
+                    hd.setThirdStationId(jpStation.getThirdStationId());
                     hd.setAccumulatedPower(jpStation.getAccumulatedPower());
                     hd.setMonthGenerate(dayGenerate.getGenerate());
                     hd.setMonthIncome(dayGenerate.getMonthIncome());
@@ -535,7 +538,7 @@ public class JpStationServiceImpl extends BaseService<JpStationDto,JpStation,JpS
                     hd.setStationContact(jpStation.getStationContact());
                     hd.setState(jpStation.getState());
                     hd.setAccumulatedPower(jpStation.getAccumulatedPower());
-
+                    hd.setThirdStationId(jpStation.getThirdStationId());
                     hd.setFullhour(dayGenerate.getFullhour()!=null?Double.valueOf(String.format("%.2f",dayGenerate.getFullhour())):null);
                     hd.setYearGenerate(dayGenerate.getGenerate());
                     hd.setYearIncome(dayGenerate.getYearIncome());