Merge remote-tracking branch 'origin/developer' into developer

amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/java/com/yeejoin/amos/boot/module/hygf/api/tdenginemapper/TdHYGFInverterDayGenerateMapper.java

@@ -20,5 +20,5 @@ public interface TdHYGFInverterDayGenerateMapper extends BaseMapper<TdHYGFInvert
     List<Map<String,Object>> selectSnCodeList(String startTime, String endTime, List<String> sncodes);
 
     @UserEmpower(field ={"regional_companies_code"},dealerField ={"amos_company_code","regional_companies_code"} ,fieldConditions ={"eq","in"} ,relationship="and")
-    List<TdHYGFInverterDayGenerate> selectListPage(List<String> snCodeList, List<String> maxCreatedTimeList);
+    List<TdHYGFInverterDayGenerate> selectListPage(List<String> snCodeList, List<String> maxCreatedTimeList, String startTime, String endTime);
 }

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

@@ -15,14 +15,14 @@
         SELECT
         sum(power)  power,
         tation_id thirdStationId
-        FROM house_pv_data.td_hygf_month_power where   year_month=#{date}  GROUP BY tation_id
+        FROM house_pv_data.td_hygf_station_power_month where   year_month=#{date}  GROUP BY tation_id
     </select>
 
     <select id="getSumYearPower"  resultType="com.yeejoin.amos.boot.module.hygf.api.entity.AllPower">
         SELECT
         sum(power)  power,
         tation_id thirdStationId
-        FROM house_pv_data.td_hygf_year_power where   year=#{date}  GROUP BY tation_id
+        FROM house_pv_data.td_hygf_station_power_year where   year=#{date}  GROUP BY tation_id
     </select>
 
 
@@ -44,7 +44,7 @@
         SELECT
         sum(power)num,
         `day` date
-        FROM house_pv_data.td_hygf_month_power where tation_id in
+        FROM house_pv_data.td_hygf_station_power_month where tation_id in
         <foreach collection="dto" item="item" index="index" open="(" separator="," close=")">
             #{item}
         </foreach>
@@ -55,7 +55,7 @@
         SELECT
         sum(power)num,
         `month` date
-        FROM house_pv_data.td_hygf_year_power where tation_id in
+        FROM house_pv_data.td_hygf_station_power_year where tation_id in
         <foreach collection="dto" item="item" index="index" open="(" separator="," close=")">
             #{item}
         </foreach>
@@ -66,7 +66,7 @@
         SELECT
         sum(power)num,
         `year` date
-        FROM house_pv_data.td_hygf_all_power where tation_id in
+        FROM house_pv_data.td_hygf_station_power_all where tation_id in
         <foreach collection="dto" item="item" index="index" open="(" separator="," close=")">
             #{item}
         </foreach>
@@ -77,7 +77,7 @@
         SELECT
         sum(power)num,
         `hour` date
-        FROM house_pv_data.td_hygf_day_power
+        FROM house_pv_data.td_hygf_station_power_day
 
         <where>
             <if test="dto!=null">

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

@@ -74,6 +74,12 @@
                     #{maxCreatedTime}
                 </foreach>
             </if>
+            <if test="startTime != null">
+                and  created_time >= #{startTime}
+            </if>
+            <if test="endTime != null">
+                and  created_time &lt;= #{endTime}
+            </if>
         </where>
         order by created_time desc
     </select>

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

@@ -179,7 +179,7 @@ public class JpInverterServiceImpl extends BaseService<JpInverterDto, JpInverter
         });
 
         PageHelper.startPage(current, size);
-        List<TdHYGFInverterDayGenerate> tdHYGFInverterDayGenerates = tdHYGFInverterDayGenerateMapper.selectListPage(snCodeList, maxCreatedTimeList);
+        List<TdHYGFInverterDayGenerate> tdHYGFInverterDayGenerates = tdHYGFInverterDayGenerateMapper.selectListPage(snCodeList, null, startTime, endTime);
 
         tdHYGFInverterDayGenerates.forEach(tdHYGFInverterDayGenerate -> {
             Date date1 = new Date(tdHYGFInverterDayGenerate.getCreatedTime());