修改报表参数

amos-boot-data/amos-boot-data-housepvapi/src/main/java/com/yeejoin/amos/api/householdapi/face/orm/houseapi/entity/tdeingine/GolangInverterDetail.java

@@ -402,7 +402,7 @@ public class GolangInverterDetail {
 //    private String pow29Str;
 //    private String pacStr;
 //    private String gridPurchasedMonthEnergy;
-//    private String iLeakLimt;
+//    private String iLeak;
 //    private String bypassAcVoltage;
 //    private String parallelBattery;
 //    private String version;

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

 package com.yeejoin.amos.boot.module.hygf.api.tdenginemapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.yeejoin.amos.boot.module.hygf.api.dto.JpStationDto;
 import com.yeejoin.amos.boot.module.hygf.api.dto.PowerCurveDto;
 import com.yeejoin.amos.boot.module.hygf.api.entity.DayGenerate;
 import com.yeejoin.amos.boot.module.hygf.api.entity.JpStation;
@@ -32,4 +34,5 @@ public interface DayGenerateMapper extends BaseMapper<DayGenerate> {
     List<PowerCurveDto>  getYearGenerateqx(@Param("date") String month, @Param("dto")List<String> statioId);
 
 
+    List<DayGenerate> selectPagenewDayGenerate(@Param("current") int current,@Param("size") int size,@Param("dto")   List<String> statioId, @Param("dateTime")String dateTime );
 }

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

 package com.yeejoin.amos.boot.module.hygf.api.tdenginemapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.yeejoin.amos.boot.module.hygf.api.entity.DayGenerate;
 import com.yeejoin.amos.boot.module.hygf.api.entity.MonthGenerate;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
 
 public interface MonthGenerateMapper extends BaseMapper<MonthGenerate> {
+    List<MonthGenerate> selectPagenewMonthGenerate(@Param("current") int current,@Param("size") int size,@Param("dto")   List<String> statioId, @Param("dateTime")String dateTime );
 
 }

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

 package com.yeejoin.amos.boot.module.hygf.api.tdenginemapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.yeejoin.amos.boot.module.hygf.api.entity.MonthGenerate;
 import com.yeejoin.amos.boot.module.hygf.api.entity.YearGenerate;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
 
 /**
  * @description:
@@ -9,4 +14,6 @@ import com.yeejoin.amos.boot.module.hygf.api.entity.YearGenerate;
  * @createDate: 2023/11/8
  */
 public interface YearGenerateMapper extends BaseMapper<YearGenerate>  {
+    List<YearGenerate> selectPagenewYearGenerate(@Param("current") int current,@Param("size") int size,@Param("dto")   List<String> statioId, @Param("dateTime")String dateTime );
+
 }

amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/resources/mapper/mysql/JpStationMapper.xml

@@ -71,6 +71,12 @@
                 #{item.stationId}
             </foreach>
         </if>
+             <if test="dto.thirdStationIds!=null">
+                 and hygf_jp_station.third_station_id in
+                 <foreach collection="dto.thirdStationIds" item="item" index="index" open="(" separator="," close=")">
+                     #{item}
+                 </foreach>
+             </if>
         <if test="dto.thirdStationId!=null">
             and hygf_jp_station.third_station_id =#{dto.thirdStationId}
         </if>

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

 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.yeejoin.amos.boot.module.hygf.api.tdenginemapper.DayPowerMapper">
+<mapper namespace="com.yeejoin.amos.boot.module.hygf.api.tdenginemapper.DayGenerateMapper">
 
     <select id="getDayGenerateph" resultType="com.yeejoin.amos.boot.module.hygf.api.dto.DayPowerDto">
         SELECT
@@ -57,7 +57,23 @@
     </select>
 
 
-
+    <select id="selectPagenewDayGenerate"  resultType="com.yeejoin.amos.boot.module.hygf.api.entity.DayGenerate">
+        SELECT
+      *
+        FROM house_pv_data.td_hygf_station_day_generate
+        <where>
+            <if test="dto!=null">
+                third_station_id in
+                <foreach collection="dto" item="item" index="index" open="(" separator="," close=")">
+                    #{item}
+                </foreach>
+            </if>
+            <if test="dateTime!=null">
+                day_time = #{dateTime}
+            </if>
+        </where>
+        LIMIT #{current} ,#{size}
+    </select>
 
 
 </mapper>

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

 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.yeejoin.amos.boot.module.hygf.api.tdenginemapper.MonthGenerateMapper">
+    <select id="selectPagenewMonthGenerate"  resultType="com.yeejoin.amos.boot.module.hygf.api.entity.MonthGenerate">
+        SELECT
+        *
+        FROM house_pv_data.td_hygf_station_month_generate
+        <where>
+            <if test="dto!=null">
+                third_station_id in
+                <foreach collection="dto" item="item" index="index" open="(" separator="," close=")">
+                    #{item}
+                </foreach>
+            </if>
+            <if test="dateTime!=null">
+                year = #{dateTime}
+            </if>
+        </where>
+        LIMIT #{current} ,#{size}
+    </select>
 
 </mapper>
\ No newline at end of file

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

 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.yeejoin.amos.boot.module.hygf.api.tdenginemapper.YearGenerateMapper">
+    <select id="selectPagenewYearGenerate"  resultType="com.yeejoin.amos.boot.module.hygf.api.entity.YearGenerate">
+        SELECT
+        *
+        FROM house_pv_data.td_hygf_station_year_generate
+        <where>
+            <if test="dto!=null">
+                third_station_id in
+                <foreach collection="dto" item="item" index="index" open="(" separator="," close=")">
+                    #{item}
+                </foreach>
+            </if>
+            <if test="dateTime!=null">
+                year = #{dateTime}
+            </if>
 
+        </where>
+        LIMIT #{current} ,#{size}
+    </select>
 </mapper>
\ No newline at end of file

amos-boot-system-jxiop/amos-boot-module-hygf-biz/src/main/java/com/yeejoin/amos/boot/module/hygf/biz/config/TDengineServerConfig.java

@@ -74,6 +74,7 @@ public class TDengineServerConfig {
     @Bean
     public PaginationInterceptor paginationInterceptor() {
         PaginationInterceptor paginationInterceptor = new PaginationInterceptor();
+        paginationInterceptor.setDialectType("TAOS-RS");
         return paginationInterceptor;
     }
 

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

@@ -3,6 +3,7 @@ package com.yeejoin.amos.boot.module.hygf.biz.service.impl;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
 import com.yeejoin.amos.boot.module.hygf.api.config.UserLimits;
@@ -375,47 +376,59 @@ public class JpStationServiceImpl extends BaseService<JpStationDto,JpStation,JpS
             }
 
 
-        PageHelper.startPage(pageNum, pageSize);
         List<JpStationDto> list = null;
+            int count=0;
         switch (type){
             case"day":
                 LambdaQueryWrapper<DayGenerate> wapper = new LambdaQueryWrapper<DayGenerate>();
                 wapper.in(DayGenerate::getThirdStationId,reviewDto.getThirdStationIds());
                 wapper.eq(reviewDto.getTimeDate()!=null,DayGenerate::getDayTime,reviewDto.getTimeDate());
-                List<DayGenerate> listday=   dayGenerateMapper.selectList(wapper);
+                count= dayGenerateMapper.selectCount(wapper);
+                List<DayGenerate> listday=   dayGenerateMapper.selectPagenewDayGenerate((pageNum-1)*pageSize,pageSize,reviewDto.getThirdStationIds(),reviewDto.getTimeDate());
                 list = getJpStationDtoday(  dataJpStation,   listday);
                 break;
             case"month":
                 LambdaQueryWrapper<MonthGenerate> wapper1 = new LambdaQueryWrapper<MonthGenerate>();
                 wapper1.in(MonthGenerate::getThirdStationId,reviewDto.getThirdStationIds());
                 wapper1.eq(reviewDto.getTimeDate()!=null,MonthGenerate::getMonthTime,reviewDto.getTimeDate());
-                List<MonthGenerate> listmonth=  monthGenerateMapper.selectList(wapper1);
+                count= monthGenerateMapper.selectCount(wapper1);
+                List<MonthGenerate> listmonth=   monthGenerateMapper.selectPagenewMonthGenerate((pageNum-1)*pageSize,pageSize,reviewDto.getThirdStationIds(),reviewDto.getTimeDate());
+
                 list = getJpStationDtomonth(  dataJpStation,   listmonth);
                 break;
             case"year":
                 LambdaQueryWrapper<YearGenerate> wapper2 = new LambdaQueryWrapper<YearGenerate>();
                 wapper2.in(YearGenerate::getThirdStationId,reviewDto.getThirdStationIds());
                 wapper2.eq(reviewDto.getTimeDate()!=null,YearGenerate::getYear,reviewDto.getTimeDate());
-                List<YearGenerate> listyear=  yearGenerateMapper.selectList(wapper2);
+                count= yearGenerateMapper.selectCount(wapper2);
+                List<YearGenerate> listyear=   yearGenerateMapper.selectPagenewYearGenerate((pageNum-1)*pageSize,pageSize,reviewDto.getThirdStationIds(),reviewDto.getTimeDate());
+
+
                 list = getJpStationDtoyear(  dataJpStation,   listyear);
                 break;
             default:
-                list = getJpStationDtoAll(dataJpStation);
+
+                PageHelper.startPage(pageNum, pageSize);
+                List<JpStationDto> listJ=  jpStationMapper.queryForDealerReviewPage(reviewDto);
+
+                list = getJpStationDtoAlldto(listJ);
         }
-        PageInfo<JpStationDto> page = new PageInfo(list);
         com.baomidou.mybatisplus.extension.plugins.pagination.Page<JpStationDto> pagenew = new com.baomidou.mybatisplus.extension.plugins.pagination.Page<JpStationDto>();
         pagenew.setCurrent(pageNum);
-        pagenew.setTotal(page.getTotal());
+        pagenew.setTotal(count);
         pagenew.setSize(pageSize);
-        pagenew.setRecords(page.getList());
+        pagenew.setRecords(list);
         return pagenew;
     }
 
-    public List<JpStationDto> getJpStationDtoAll( List<JpStation>  da){
-        List<JpStationDto> ld=new ArrayList<>();
 
 
-            for (JpStation jpStation : da) {
+
+
+
+    public List<JpStationDto> getJpStationDtoAlldto( List<JpStationDto>  da){
+        List<JpStationDto> ld=new ArrayList<>();
+            for (JpStationDto jpStation : da) {
                     JpStationDto hd=new JpStationDto();
                     hd.setSequenceNbr(jpStation.getSequenceNbr());
                     hd.setCode(jpStation.getCode());
@@ -432,7 +445,27 @@ public class JpStationServiceImpl extends BaseService<JpStationDto,JpStation,JpS
 
         return ld;
     }
+    public List<JpStationDto> getJpStationDtoAll( List<JpStation>  da){
+        List<JpStationDto> ld=new ArrayList<>();
 
+
+        for (JpStation jpStation : da) {
+            JpStationDto hd=new JpStationDto();
+            hd.setSequenceNbr(jpStation.getSequenceNbr());
+            hd.setCode(jpStation.getCode());
+            hd.setName(jpStation.getName());
+            hd.setUserName(jpStation.getUserName());
+            hd.setStationContact(jpStation.getStationContact());
+            hd.setState(jpStation.getState());
+            hd.setAccumulatedPower(jpStation.getAccumulatedPower());
+            hd.setFullhour(Double.valueOf(String.format("%.2f", jpStation.getAccumulatedPower()/jpStation.getCapacity())));
+            hd.setAccumulatedPower(jpStation.getAccumulatedPower());
+            hd.setDayIncome(null);
+            ld.add(hd);
+        }
+
+        return ld;
+    }
     public List<JpStationDto> getJpStationDtoday( List<JpStation>  da,  List<DayGenerate> listday){
         List<JpStationDto> ld=new ArrayList<>();
         for (DayGenerate dayGenerate : listday) {