修改逆变器报表

amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/java/com/yeejoin/amos/boot/module/hygf/api/entity/DayGenerate.java

@@ -51,4 +51,26 @@ public class DayGenerate {
     // 日收益
     private Double income;
 
+
+
+
+    @TableField("regional_companies_code")
+    private String regionalCompaniesCode;
+    @TableField("amos_company_code")
+    private String amosCompanyCode;
+    @TableField("station_name")
+    private String stationName;
+    @TableField("station_state")
+    private String stationState;
+
+
+
+
+
+
+
+
+
+
+
 }

amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/java/com/yeejoin/amos/boot/module/hygf/api/entity/MonthGenerate.java

@@ -53,4 +53,16 @@ public class MonthGenerate {
     // 月收益
     @TableField("income")
     private Double income;
+
+
+
+    @TableField("regional_companies_code")
+    private String regionalCompaniesCode;
+    @TableField("amos_company_code")
+    private String amosCompanyCode;
+    @TableField("station_name")
+    private String stationName;
+    @TableField("station_state")
+    private String stationState;
+
 }

amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/java/com/yeejoin/amos/boot/module/hygf/api/entity/YearGenerate.java

@@ -51,4 +51,15 @@ public class YearGenerate {
     // 年收益
     @TableField("income")
     private Double income;
+
+
+    @TableField("regional_companies_code")
+    private String regionalCompaniesCode;
+    @TableField("amos_company_code")
+    private String amosCompanyCode;
+    @TableField("station_name")
+    private String stationName;
+    @TableField("station_state")
+    private String stationState;
+
 }

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

@@ -34,10 +34,15 @@ public interface DayGenerateMapper extends BaseMapper<DayGenerate> {
 
 
     @UserEmpower(field ={"regional_companies_code"},dealerField ={"amos_company_code","regional_companies_code"} ,fieldConditions ={"eq","in"} ,relationship="and")
-    List<DayGenerate> selectPagenewDayGenerate(@Param("current") int current,@Param("size") int size,@Param("dto")   List<String> statioId, @Param("dateTime")String dateTime );
+    List<DayGenerate> selectPagenewDayGenerate(@Param("current") int current,
+                                               @Param("size") int size,@Param("dto")
+                                                List<String> statioId,
+                                               @Param("dateTime")String dateTime,
+                                               @Param("stationState")String stationState);
 
     @UserEmpower(field ={"regional_companies_code"},dealerField ={"amos_company_code","regional_companies_code"} ,fieldConditions ={"eq","in"} ,relationship="and")
     Integer selectCount(@Param(Constants.WRAPPER) Wrapper<DayGenerate> queryWrapper);
 
-
+    @UserEmpower(field ={"regional_companies_code"},dealerField ={"amos_company_code","regional_companies_code"} ,fieldConditions ={"eq","in"} ,relationship="and")
+    List<DayGenerate> selectList(@Param(Constants.WRAPPER) Wrapper<DayGenerate> queryWrapper);
 }

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.conditions.Wrapper;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.toolkit.Constants;
+import com.yeejoin.amos.boot.module.hygf.api.config.UserEmpower;
+import com.yeejoin.amos.boot.module.hygf.api.entity.DayGenerate;
 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;
 
 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 );
+    @UserEmpower(field ={"regional_companies_code"},dealerField ={"amos_company_code","regional_companies_code"} ,fieldConditions ={"eq","in"} ,relationship="and")
+    List<MonthGenerate> selectPagenewMonthGenerate(@Param("current") int current,@Param("size") int size,@Param("dto")   List<String> statioId,
+                                                   @Param("dateTime")String dateTime,
+                                                   @Param("stationState")String stationState );
+    @UserEmpower(field ={"regional_companies_code"},dealerField ={"amos_company_code","regional_companies_code"} ,fieldConditions ={"eq","in"} ,relationship="and")
+    List<MonthGenerate> selectList(@Param(Constants.WRAPPER) Wrapper<MonthGenerate> queryWrapper);
+
+    @UserEmpower(field ={"regional_companies_code"},dealerField ={"amos_company_code","regional_companies_code"} ,fieldConditions ={"eq","in"} ,relationship="and")
+    Integer selectCount(@Param(Constants.WRAPPER) Wrapper<MonthGenerate> queryWrapper);
+
 
 }

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

 package com.yeejoin.amos.boot.module.hygf.api.tdenginemapper;
 
+import com.baomidou.mybatisplus.core.conditions.Wrapper;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.toolkit.Constants;
+import com.yeejoin.amos.boot.module.hygf.api.config.UserEmpower;
 import com.yeejoin.amos.boot.module.hygf.api.entity.TdHYGFInverterDayGenerate;
+import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
 import java.util.Map;
@@ -9,6 +13,6 @@ import java.util.Map;
 public interface TdHYGFInverterDayGenerateMapper extends BaseMapper<TdHYGFInverterDayGenerate> {
     List<Map<String,Object>> selectDayTrend(List<String> treeParams, String time, String snCode, String thirdStationId);
 
-
-
+    @UserEmpower(field ={"regional_companies_code"},dealerField ={"amos_company_code","regional_companies_code"} ,fieldConditions ={"eq","in"} ,relationship="and")
+    List<TdHYGFInverterDayGenerate> selectList(@Param(Constants.WRAPPER) Wrapper<TdHYGFInverterDayGenerate> queryWrapper);
 }

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

 package com.yeejoin.amos.boot.module.hygf.api.tdenginemapper;
 
+import com.baomidou.mybatisplus.core.conditions.Wrapper;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.toolkit.Constants;
+import com.yeejoin.amos.boot.module.hygf.api.config.UserEmpower;
+import com.yeejoin.amos.boot.module.hygf.api.entity.TdHYGFInverterDayGenerate;
 import com.yeejoin.amos.boot.module.hygf.api.entity.TdHYGFInverterMonthGenerate;
+import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
 import java.util.Map;
@@ -10,4 +15,8 @@ public interface TdHYGFInverterMonthGenerateMapper extends BaseMapper<TdHYGFInve
     List<Map<String,Object>> selectMonthTrend(String time, String snCode, String thirdStationId);
 
     Map<String,Object> selectMonthTotal(String time, String snCode, String thirdStationId);
+
+
+    @UserEmpower(field ={"regional_companies_code"},dealerField ={"amos_company_code","regional_companies_code"} ,fieldConditions ={"eq","in"} ,relationship="and")
+    List<TdHYGFInverterMonthGenerate> selectList(@Param(Constants.WRAPPER) Wrapper<TdHYGFInverterMonthGenerate> queryWrapper);
 }

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

 package com.yeejoin.amos.boot.module.hygf.api.tdenginemapper;
 
+import com.baomidou.mybatisplus.core.conditions.Wrapper;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.toolkit.Constants;
+import com.yeejoin.amos.boot.module.hygf.api.config.UserEmpower;
+import com.yeejoin.amos.boot.module.hygf.api.entity.TdHYGFInverterMonthGenerate;
 import com.yeejoin.amos.boot.module.hygf.api.entity.TdHYGFInverterTotalGenerate;
 import com.yeejoin.amos.boot.module.hygf.api.entity.TdHYGFInverterYearGenerate;
+import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
 import java.util.Map;
@@ -14,4 +19,7 @@ public interface TdHYGFInverterYearGenerateMapper extends BaseMapper<TdHYGFInver
 
     Map<String, Object> selectYearTotal(String time, String snCode, String thirdStationId);
     List<TdHYGFInverterTotalGenerate> selectTotalSum(String time, String snCode, String thirdStationId);
+
+    @UserEmpower(field ={"regional_companies_code"},dealerField ={"amos_company_code","regional_companies_code"} ,fieldConditions ={"eq","in"} ,relationship="and")
+    List<TdHYGFInverterYearGenerate> selectList(@Param(Constants.WRAPPER) Wrapper<TdHYGFInverterYearGenerate> queryWrapper);
 }

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.conditions.Wrapper;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.toolkit.Constants;
+import com.yeejoin.amos.boot.module.hygf.api.config.UserEmpower;
+import com.yeejoin.amos.boot.module.hygf.api.entity.DayGenerate;
+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;
 
@@ -12,6 +17,15 @@ import java.util.List;
  * @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 );
+    @UserEmpower(field ={"regional_companies_code"},dealerField ={"amos_company_code","regional_companies_code"} ,fieldConditions ={"eq","in"} ,relationship="and")
+    List<YearGenerate> selectPagenewYearGenerate(@Param("current") int current,@Param("size") int size,@Param("dto")   List<String> statioId,
+                                                 @Param("dateTime")String dateTime,
+                                                 @Param("stationState")String stationState  );
+    @UserEmpower(field ={"regional_companies_code"},dealerField ={"amos_company_code","regional_companies_code"} ,fieldConditions ={"eq","in"} ,relationship="and")
+    List<YearGenerate> selectList(@Param(Constants.WRAPPER) Wrapper<YearGenerate> queryWrapper);
+
+    @UserEmpower(field ={"regional_companies_code"},dealerField ={"amos_company_code","regional_companies_code"} ,fieldConditions ={"eq","in"} ,relationship="and")
+    Integer selectCount(@Param(Constants.WRAPPER) Wrapper<YearGenerate> queryWrapper);
+
 
 }

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

@@ -76,6 +76,9 @@
             <if test="dateTime!=null and dateTime != ''">
                and day_time = #{dateTime}
             </if>
+            <if test="stationState!=null and stationState != ''">
+                and station_state = #{stationState}
+            </if>
         </where>
         LIMIT #{current} ,#{size}
     </select>

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

@@ -15,6 +15,9 @@
             <if test="dateTime!=null and dateTime != ''">
              and   month_time = #{dateTime}
             </if>
+            <if test="stationState!=null and stationState != ''">
+                and station_state = #{stationState}
+            </if>
         </where>
         LIMIT #{current} ,#{size}
     </select>

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

@@ -15,7 +15,9 @@
             <if test="dateTime!=null and dateTime != ''">
               and  year = #{dateTime}
             </if>
-
+            <if test="stationState!=null and stationState != ''">
+                and station_state = #{stationState}
+            </if>
         </where>
         LIMIT #{current} ,#{size}
     </select>

amos-boot-system-jxiop/amos-boot-module-hygf-biz/src/main/java/com/yeejoin/amos/boot/module/hygf/biz/controller/JpInverterController.java

@@ -260,32 +260,32 @@ public class JpInverterController extends BaseController {
 
     @TycloudOperation(ApiLevel = UserType.AGENCY)
     @PostMapping (value = "/jpInverterDayReport")
-    @ApiOperation(httpMethod = "GET", value = "逆变器日报表", notes = "逆变器日报表")
+    @ApiOperation(httpMethod = "POST", value = "逆变器日报表", notes = "逆变器日报表")
     public ResponseModel<Page<TdHYGFInverterDayGenerate>> jpInverterDayReport(@RequestParam(value = "current") int current,
                                                                               @RequestParam(value = "size") int size,
                                                                               @RequestBody(required = false) DataDto dataDto) {
-		List<JpStation> jpStation=jpStationServiceImpl.getJpStation(new JpStationDto());
-        List<String> stationIds = jpStation.stream().map(jpStation1 -> jpStation1.getThirdStationId()).collect(Collectors.toList());
-        if(StringUtils.isEmpty(dataDto.getTime())){
+//		List<JpStation> jpStation=jpStationServiceImpl.getJpStation(new JpStationDto());
+//        List<String> stationIds = jpStation.stream().map(jpStation1 -> jpStation1.getThirdStationId()).collect(Collectors.toList());
+       if(StringUtils.isEmpty(dataDto.getTime())){
             dataDto.setTime(DateUtil.format(new Date(),"yyyy-MM-dd"));
         }
 
 //        List<String>   dd= snCodes!=null? JSON.parseArray(snCodes,String.class):null;
 
-        return ResponseHelper.buildResponse(jpInverterServiceImpl.jpInverterDayReport(current,size,dataDto.getTime(),dataDto.getSnCodes(),stationIds));
+        return ResponseHelper.buildResponse(jpInverterServiceImpl.jpInverterDayReport(current,size,dataDto.getTime(),dataDto.getSnCodes(),null));
     }
 
     @TycloudOperation(ApiLevel = UserType.AGENCY)
     @RequestMapping(value = "/jpInverterDayReportExport", method = RequestMethod.POST)
     @ApiOperation(httpMethod = "GET", value = "逆变器日报表导出", notes = "逆变器日报表导出")
     public void jpInverterDayReportExport( @RequestBody(required = false) DataDto dataDto, HttpServletResponse response) {
-        List<JpStation> jpStation=jpStationServiceImpl.getJpStation(new JpStationDto());
-        List<String> stationIds = jpStation.stream().map(jpStation1 -> jpStation1.getThirdStationId()).collect(Collectors.toList());
+//        List<JpStation> jpStation=jpStationServiceImpl.getJpStation(new JpStationDto());
+//        List<String> stationIds = jpStation.stream().map(jpStation1 -> jpStation1.getThirdStationId()).collect(Collectors.toList());
         if(StringUtils.isEmpty(dataDto.getTime())){
             dataDto.setTime(DateUtil.format(new Date(),"yyyy-MM-dd"));
         }
         //List<String>   dd= snCodes!=null? JSON.parseArray(snCodes,String.class):null;
-        List<TdHYGFInverterDayGenerate> tdHYGFInverterDayGenerates =jpInverterServiceImpl.jpInverterDayReportExport(dataDto.getTime(),dataDto.getSnCodes(),stationIds);
+        List<TdHYGFInverterDayGenerate> tdHYGFInverterDayGenerates =jpInverterServiceImpl.jpInverterDayReportExport(dataDto.getTime(),dataDto.getSnCodes(),null);
         try {
             setResponseHeadForDowload(response,"逆变器日报表.xls");
             EasyExcel.write(response.getOutputStream()).head(TdHYGFInverterDayGenerate.class).excelType(ExcelTypeEnum.XLS).sheet("逆变器日报表").doWrite(tdHYGFInverterDayGenerates);
@@ -299,27 +299,27 @@ public class JpInverterController extends BaseController {
     public ResponseModel<Page<TdHYGFInverterMonthGenerate>> jpInverterMonthReport(@RequestParam(value = "current") int current,
                                                                                   @RequestParam(value = "size") int size,
                                                                                   @RequestBody(required = false) DataDto dataDto) {
-        List<JpStation> jpStation=jpStationServiceImpl.getJpStation(new JpStationDto());
-        List<String> stationIds = jpStation.stream().map(jpStation1 -> jpStation1.getThirdStationId()).collect(Collectors.toList());
+//        List<JpStation> jpStation=jpStationServiceImpl.getJpStation(new JpStationDto());
+//        List<String> stationIds = jpStation.stream().map(jpStation1 -> jpStation1.getThirdStationId()).collect(Collectors.toList());
         if(StringUtils.isEmpty(dataDto.getTime())){
             dataDto.setTime(DateUtil.format(new Date(),"yyyy-MM"));
         }
 //        List<String>   dd= snCodes!=null? JSON.parseArray(snCodes,String.class):null;
 
-        return ResponseHelper.buildResponse(jpInverterServiceImpl.jpInverterMonthReport(current,size,dataDto.getTime(),dataDto.getSnCodes(),stationIds));
+        return ResponseHelper.buildResponse(jpInverterServiceImpl.jpInverterMonthReport(current,size,dataDto.getTime(),dataDto.getSnCodes(),null));
     }
 
     @TycloudOperation(ApiLevel = UserType.AGENCY)
     @RequestMapping(value = "/jpInverterMonthReportExport", method = RequestMethod.POST)
     @ApiOperation(httpMethod = "GET", value = "逆变器月报表导出", notes = "逆变器月报表导出")
     public void jpInverterMonthReportExport( @RequestBody(required = false) DataDto dataDto, HttpServletResponse response) {
-        List<JpStation> jpStation=jpStationServiceImpl.getJpStation(new JpStationDto());
-        List<String> stationIds = jpStation.stream().map(jpStation1 -> jpStation1.getThirdStationId()).collect(Collectors.toList());
+//        List<JpStation> jpStation=jpStationServiceImpl.getJpStation(new JpStationDto());
+//        List<String> stationIds = jpStation.stream().map(jpStation1 -> jpStation1.getThirdStationId()).collect(Collectors.toList());
         if(StringUtils.isEmpty(dataDto.getTime())){
             dataDto.setTime(DateUtil.format(new Date(),"yyyy-MM"));
         }
       //  List<String>   dd= snCodes!=null? JSON.parseArray(snCodes,String.class):null;
-        List<TdHYGFInverterMonthGenerate> tdHYGFInverterMonthGenerates =jpInverterServiceImpl.jpInverterMonthReportExport(dataDto.getTime(),dataDto.getSnCodes(),stationIds);
+        List<TdHYGFInverterMonthGenerate> tdHYGFInverterMonthGenerates =jpInverterServiceImpl.jpInverterMonthReportExport(dataDto.getTime(),dataDto.getSnCodes(),null);
         try {
             setResponseHeadForDowload(response,"逆变器月报表.xls");
             EasyExcel.write(response.getOutputStream()).head(TdHYGFInverterMonthGenerate.class).excelType(ExcelTypeEnum.XLS).sheet("逆变器月报表").doWrite(tdHYGFInverterMonthGenerates);
@@ -334,27 +334,27 @@ public class JpInverterController extends BaseController {
     public ResponseModel<Page<TdHYGFInverterYearGenerate>> jpInverterYearReport(@RequestParam(value = "current") int current,
                                                                                 @RequestParam(value = "size") int size,
                                                                                 @RequestBody(required = false) DataDto dataDto) {
-        List<JpStation> jpStation=jpStationServiceImpl.getJpStation(new JpStationDto());
-        List<String> stationIds = jpStation.stream().map(jpStation1 -> jpStation1.getThirdStationId()).collect(Collectors.toList());
+//        List<JpStation> jpStation=jpStationServiceImpl.getJpStation(new JpStationDto());
+//        List<String> stationIds = jpStation.stream().map(jpStation1 -> jpStation1.getThirdStationId()).collect(Collectors.toList());
         if(StringUtils.isEmpty(dataDto.getTime())){
             dataDto.setTime(DateUtil.format(new Date(),"yyyy"));
         }
        // List<String>   dd= snCodes!=null? JSON.parseArray(snCodes,String.class):null;
 
-        return ResponseHelper.buildResponse(jpInverterServiceImpl.jpInverterYearReport(current,size,dataDto.getTime(),dataDto.getSnCodes(),stationIds));
+        return ResponseHelper.buildResponse(jpInverterServiceImpl.jpInverterYearReport(current,size,dataDto.getTime(),dataDto.getSnCodes(),null));
     }
 
     @TycloudOperation(ApiLevel = UserType.AGENCY)
     @RequestMapping(value = "/jpInverterYearReportExport", method = RequestMethod.POST)
     @ApiOperation(httpMethod = "GET", value = "逆变器年报表导出", notes = "逆变器年报表导出")
     public void jpInverterYearReportExport(@RequestBody(required = false) DataDto dataDto, HttpServletResponse response) {
-        List<JpStation> jpStation=jpStationServiceImpl.getJpStation(new JpStationDto());
-        List<String> stationIds = jpStation.stream().map(jpStation1 -> jpStation1.getThirdStationId()).collect(Collectors.toList());
+//        List<JpStation> jpStation=jpStationServiceImpl.getJpStation(new JpStationDto());
+//        List<String> stationIds = jpStation.stream().map(jpStation1 -> jpStation1.getThirdStationId()).collect(Collectors.toList());
         if(StringUtils.isEmpty(dataDto.getTime())){
             dataDto.setTime(DateUtil.format(new Date(),"yyyy"));
         }
        // List<String>   dd= snCodes!=null? JSON.parseArray(snCodes,String.class):null;
-        List<TdHYGFInverterYearGenerate> tdHYGFInverterYearGenerates =jpInverterServiceImpl.jpInverterYearReportExport(dataDto.getTime(),dataDto.getSnCodes(),stationIds);
+        List<TdHYGFInverterYearGenerate> tdHYGFInverterYearGenerates =jpInverterServiceImpl.jpInverterYearReportExport(dataDto.getTime(),dataDto.getSnCodes(),null);
         try {
             setResponseHeadForDowload(response,"逆变器年报表.xls");
             EasyExcel.write(response.getOutputStream()).head(TdHYGFInverterYearGenerate.class).excelType(ExcelTypeEnum.XLS).sheet("逆变器年报表").doWrite(tdHYGFInverterYearGenerates);

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

@@ -7,6 +7,8 @@ import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.github.pagehelper.PageHelper;
+import com.github.pagehelper.PageInfo;
 import com.yeejoin.amos.boot.biz.common.utils.DateUtils;
 import com.yeejoin.amos.boot.module.hygf.api.config.UserLimits;
 import com.yeejoin.amos.boot.module.hygf.api.dto.JpInverterDto;
@@ -123,6 +125,7 @@ public class JpInverterServiceImpl extends BaseService<JpInverterDto, JpInverter
 		return map;
 	}
 
+	@UserLimits
     public Page<TdHYGFInverterDayGenerate> jpInverterDayReport(int current, int size, String time, List<String> sncodes, List<String> stationIds) {
         Page<TdHYGFInverterDayGenerate> tdHYGFInverterDayGeneratePage = new Page<>();
         Date date = DateUtil.parse(time, "yyyy-MM-dd");
@@ -130,44 +133,66 @@ public class JpInverterServiceImpl extends BaseService<JpInverterDto, JpInverter
         Date tiemEnd = DateUtils.dateAddHours(date, 16);
         String startTime = DateUtil.format(timeStart, "yyyy-MM-dd HH:mm:ss");
         String endTime = DateUtil.format(tiemEnd, "yyyy-MM-dd HH:mm:ss");
-        //String startTime = DateUtil.format(date, "yyyy-MM-dd") + "00:00:00";
-        //String endTime = DateUtil.format(date, "yyyy-MM-dd") + "23:59:59";
         QueryWrapper queryWrapper = new QueryWrapper<TdHYGFInverterDayGenerate>()
                 .ge("created_time", startTime)
-                .le("created_time", endTime)
-                .in("third_station_id", stationIds);
+                .le("created_time", endTime);
+//                .in("third_station_id", stationIds);
         ;
         if (CollectionUtil.isNotEmpty(sncodes)) {
             queryWrapper.in("sn_code", sncodes);
         }
         queryWrapper.orderByDesc("created_time");
+
+        PageHelper.startPage(current, size);
         List<TdHYGFInverterDayGenerate> tdHYGFInverterDayGenerates = tdHYGFInverterDayGenerateMapper.selectList(queryWrapper);
-        tdHYGFInverterDayGeneratePage.setTotal(tdHYGFInverterDayGenerates.size());
-        tdHYGFInverterDayGeneratePage.setSize(size);
-        tdHYGFInverterDayGeneratePage.setCurrent(current);
-        tdHYGFInverterDayGenerates = tdHYGFInverterDayGenerates.stream().filter(tdHYGFInverterDayGenerate -> StringUtils.isNotBlank(tdHYGFInverterDayGenerate.getSnCode().trim())).collect(Collectors.toList());
-        int total = tdHYGFInverterDayGenerates.size();
-        if (total  < (current * size)){
-            current = 1;
-        }
-        tdHYGFInverterDayGenerates = tdHYGFInverterDayGenerates.subList((current - 1) * size, current * size > tdHYGFInverterDayGenerates.size() ? tdHYGFInverterDayGenerates.size() : current * size);
         tdHYGFInverterDayGenerates.forEach(tdHYGFInverterDayGenerate -> {
             Date date1 = new Date(tdHYGFInverterDayGenerate.getCreatedTime());
             tdHYGFInverterDayGenerate.setCreatedTimeStr(DateUtil.format(date1, DatePattern.NORM_DATETIME_PATTERN));
             tdHYGFInverterDayGenerate.setTotalGen(tdHYGFInverterDayGenerate.getTotalGen() == null ? 0:Double.valueOf(String.format("%.3f",tdHYGFInverterDayGenerate.getTotalGen()/1000)));
         });
-        tdHYGFInverterDayGeneratePage.setRecords(tdHYGFInverterDayGenerates);
-        return tdHYGFInverterDayGeneratePage;
-    }
 
+        PageInfo<TdHYGFInverterDayGenerate> page = new PageInfo(tdHYGFInverterDayGenerates);
+        Page<TdHYGFInverterDayGenerate> pagenew = new Page<TdHYGFInverterDayGenerate>();
+        pagenew.setCurrent(current);
+        pagenew.setTotal(page.getTotal());
+        pagenew.setSize(size);
+        pagenew.setRecords(page.getList());
+
+
+        return pagenew;
+
+
+
+
+
+
+
+//        tdHYGFInverterDayGeneratePage.setTotal(tdHYGFInverterDayGenerates.size());
+//        tdHYGFInverterDayGeneratePage.setSize(size);
+//        tdHYGFInverterDayGeneratePage.setCurrent(current);
+//        tdHYGFInverterDayGenerates = tdHYGFInverterDayGenerates.stream().filter(tdHYGFInverterDayGenerate -> StringUtils.isNotBlank(tdHYGFInverterDayGenerate.getSnCode().trim())).collect(Collectors.toList());
+//        int total = tdHYGFInverterDayGenerates.size();
+//        if (total  < (current * size)){
+//            current = 1;
+//        }
+//        tdHYGFInverterDayGenerates = tdHYGFInverterDayGenerates.subList((current - 1) * size, current * size > tdHYGFInverterDayGenerates.size() ? tdHYGFInverterDayGenerates.size() : current * size);
+//        tdHYGFInverterDayGenerates.forEach(tdHYGFInverterDayGenerate -> {
+//            Date date1 = new Date(tdHYGFInverterDayGenerate.getCreatedTime());
+//            tdHYGFInverterDayGenerate.setCreatedTimeStr(DateUtil.format(date1, DatePattern.NORM_DATETIME_PATTERN));
+//            tdHYGFInverterDayGenerate.setTotalGen(tdHYGFInverterDayGenerate.getTotalGen() == null ? 0:Double.valueOf(String.format("%.3f",tdHYGFInverterDayGenerate.getTotalGen()/1000)));
+//        });
+//        tdHYGFInverterDayGeneratePage.setRecords(tdHYGFInverterDayGenerates);
+//        return tdHYGFInverterDayGeneratePage;
+    }
+    @UserLimits
     public List<TdHYGFInverterDayGenerate> jpInverterDayReportExport(String time, List<String> sncodes, List<String> stationIds) {
         Date date = DateUtil.parse(time, "yyyy-MM-dd");
         String startTime = DateUtil.format(date, "yyyy-MM-dd") + "00:00:00";
         String endTime = DateUtil.format(date, "yyyy-MM-dd") + "23:59:59";
         QueryWrapper queryWrapper = new QueryWrapper<TdHYGFInverterDayGenerate>()
                 .ge("created_time", startTime)
-                .le("created_time", endTime)
-                .in("third_station_id", stationIds);
+                .le("created_time", endTime);
+//                .in("third_station_id", stationIds);
         if (CollectionUtil.isNotEmpty(sncodes)) {
             queryWrapper.in("sn_code", sncodes);
         }
@@ -180,35 +205,54 @@ public class JpInverterServiceImpl extends BaseService<JpInverterDto, JpInverter
         });
         return tdHYGFInverterDayGenerates;
     }
-
+    @UserLimits
     public Page<TdHYGFInverterMonthGenerate> jpInverterMonthReport(int current, int size, String time, List<String> sncodes, List<String> stationIds) {
         Page<TdHYGFInverterMonthGenerate> tdHYGFInverterMonthGeneratePage = new Page<>();
         QueryWrapper queryWrapper = new QueryWrapper<TdHYGFInverterMonthGenerate>()
-                .eq("year_month", time)
-                .in("third_station_id", stationIds);
+                .eq("year_month", time);
+//                .in("third_station_id", stationIds);
         if (CollectionUtil.isNotEmpty(sncodes)) {
             queryWrapper.in("sn_code", sncodes);
         }
         queryWrapper.orderByDesc("day_time");
+
+
+
+        PageHelper.startPage(current, size);
         List<TdHYGFInverterMonthGenerate> tdHYGFInverterMonthGenerates = tdHYGFInverterMonthGenerateMapper.selectList(queryWrapper);
-        tdHYGFInverterMonthGeneratePage.setTotal(tdHYGFInverterMonthGenerates.size());
-        tdHYGFInverterMonthGeneratePage.setSize(size);
-        tdHYGFInverterMonthGeneratePage.setCurrent(current);
-        tdHYGFInverterMonthGenerates = tdHYGFInverterMonthGenerates.stream().filter(tdHYGFInverterMonthGenerate -> StringUtils.isNotBlank(tdHYGFInverterMonthGenerate.getSnCode().trim())).collect(Collectors.toList());
-        int total = tdHYGFInverterMonthGenerates.size();
-        if (total  < (current * size)){
-            current = 1;
-        }
-        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);
-        return tdHYGFInverterMonthGeneratePage;
-    }
+       tdHYGFInverterMonthGenerates.forEach(tdHYGFInverterMonthGenerate -> tdHYGFInverterMonthGenerate.setFullhour(Double.valueOf(String.format("%.2f",tdHYGFInverterMonthGenerate.getFullhour()))));
+
+        PageInfo<TdHYGFInverterMonthGenerate> page = new PageInfo(tdHYGFInverterMonthGenerates);
+        Page<TdHYGFInverterMonthGenerate> pagenew = new Page<TdHYGFInverterMonthGenerate>();
+        pagenew.setCurrent(current);
+        pagenew.setTotal(page.getTotal());
+        pagenew.setSize(size);
+        pagenew.setRecords(page.getList());
+
+        return pagenew;
+
+
 
+
+//        List<TdHYGFInverterMonthGenerate> tdHYGFInverterMonthGenerates = tdHYGFInverterMonthGenerateMapper.selectList(queryWrapper);
+////        tdHYGFInverterMonthGeneratePage.setTotal(tdHYGFInverterMonthGenerates.size());
+////        tdHYGFInverterMonthGeneratePage.setSize(size);
+////        tdHYGFInverterMonthGeneratePage.setCurrent(current);
+////        tdHYGFInverterMonthGenerates = tdHYGFInverterMonthGenerates.stream().filter(tdHYGFInverterMonthGenerate -> StringUtils.isNotBlank(tdHYGFInverterMonthGenerate.getSnCode().trim())).collect(Collectors.toList());
+////        int total = tdHYGFInverterMonthGenerates.size();
+////        if (total  < (current * size)){
+////            current = 1;
+////        }
+////        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);
+////        return tdHYGFInverterMonthGeneratePage;
+    }
+    @UserLimits
     public List<TdHYGFInverterMonthGenerate> jpInverterMonthReportExport( String time, List<String> sncodes, List<String> stationIds) {
         QueryWrapper queryWrapper = new QueryWrapper<TdHYGFInverterMonthGenerate>()
-                .eq("year_month", time)
-                .in("third_station_id", stationIds);
+                .eq("year_month", time);
+//                .in("third_station_id", stationIds);
         if (CollectionUtil.isNotEmpty(sncodes)) {
             queryWrapper.in("sn_code", sncodes);
         }
@@ -218,35 +262,51 @@ public class JpInverterServiceImpl extends BaseService<JpInverterDto, JpInverter
         tdHYGFInverterMonthGenerates.forEach(tdHYGFInverterMonthGenerate -> tdHYGFInverterMonthGenerate.setFullhour(Double.valueOf(String.format("%.2f",tdHYGFInverterMonthGenerate.getFullhour()))));
         return tdHYGFInverterMonthGenerates;
     }
-
+    @UserLimits
     public Page<TdHYGFInverterYearGenerate> jpInverterYearReport(int current, int size, String time, List<String> sncodes, List<String> stationIds) {
         Page<TdHYGFInverterYearGenerate> tdHYGFInverterYearGeneratePage = new Page<>();
         QueryWrapper queryWrapper = new QueryWrapper<TdHYGFInverterYearGenerate>()
-                .eq("year", time)
-                .in("third_station_id", stationIds);
+                .eq("year", time);
+//                .in("third_station_id", stationIds);
         if (CollectionUtil.isNotEmpty(sncodes)) {
             queryWrapper.in("sn_code", sncodes);
         }
         queryWrapper.orderByDesc("month_time");
+
+
+
+        PageHelper.startPage(current, size);
         List<TdHYGFInverterYearGenerate> tdHYGFInverterYearGenerates = tdHYGFInverterYearGenerateMapper.selectList(queryWrapper);
-        tdHYGFInverterYearGeneratePage.setTotal(tdHYGFInverterYearGenerates.size());
-        tdHYGFInverterYearGeneratePage.setSize(size);
-        tdHYGFInverterYearGeneratePage.setCurrent(current);
-        tdHYGFInverterYearGenerates = tdHYGFInverterYearGenerates.stream().filter(tdHYGFInverterYearGenerate -> StringUtils.isNotBlank(tdHYGFInverterYearGenerate.getSnCode().trim())).collect(Collectors.toList());
-        int total = tdHYGFInverterYearGenerates.size();
-        if (total  < (current * size)){
-            current = 1;
-        }
-        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);
-        return tdHYGFInverterYearGeneratePage;
-    }
 
+        PageInfo<TdHYGFInverterYearGenerate> page = new PageInfo(tdHYGFInverterYearGenerates);
+        Page<TdHYGFInverterYearGenerate> pagenew = new Page<TdHYGFInverterYearGenerate>();
+        pagenew.setCurrent(current);
+        pagenew.setTotal(page.getTotal());
+        pagenew.setSize(size);
+        pagenew.setRecords(page.getList());
+
+        return pagenew;
+
+//        List<TdHYGFInverterYearGenerate> tdHYGFInverterYearGenerates = tdHYGFInverterYearGenerateMapper.selectList(queryWrapper);
+//        tdHYGFInverterYearGeneratePage.setTotal(tdHYGFInverterYearGenerates.size());
+//        tdHYGFInverterYearGeneratePage.setSize(size);
+//        tdHYGFInverterYearGeneratePage.setCurrent(current);
+//        tdHYGFInverterYearGenerates = tdHYGFInverterYearGenerates.stream().filter(tdHYGFInverterYearGenerate -> StringUtils.isNotBlank(tdHYGFInverterYearGenerate.getSnCode().trim())).collect(Collectors.toList());
+//        int total = tdHYGFInverterYearGenerates.size();
+//        if (total  < (current * size)){
+//            current = 1;
+//        }
+//        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);
+//        return tdHYGFInverterYearGeneratePage;
+    }
+    @UserLimits
     public List<TdHYGFInverterYearGenerate> jpInverterYearReportExport(String time, List<String> sncodes, List<String> stationIds) {
         QueryWrapper queryWrapper = new QueryWrapper<TdHYGFInverterYearGenerate>()
-                .eq("year", time)
-                .in("third_station_id", stationIds);
+                .eq("year", time);
+//                .in("third_station_id", stationIds);
         if (CollectionUtil.isNotEmpty(sncodes)) {
             queryWrapper.in("sn_code", sncodes);
         }

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

@@ -421,7 +421,7 @@ public class JpStationServiceImpl extends BaseService<JpStationDto,JpStation,JpS
                //拦截拼接权限
                 count= dayGenerateMapper.selectCount(wapper);
                 //拦截拼接权限
-                List<DayGenerate> listday=   dayGenerateMapper.selectPagenewDayGenerate((pageNum-1)*pageSize,pageSize,reviewDto.getThirdStationIds(),reviewDto.getTimeDate());
+                List<DayGenerate> listday=   dayGenerateMapper.selectPagenewDayGenerate((pageNum-1)*pageSize,pageSize,reviewDto.getThirdStationIds(),reviewDto.getTimeDate(),reviewDto.getState());
                 list = getJpStationDtoday(  dataJpStation,   listday);
                 break;
             case"month":
@@ -434,7 +434,7 @@ public class JpStationServiceImpl extends BaseService<JpStationDto,JpStation,JpS
                 //拦截拼接权限
                 count= monthGenerateMapper.selectCount(wapper1);
                 //拦截拼接权限
-               List<MonthGenerate> listmonth=   monthGenerateMapper.selectPagenewMonthGenerate((pageNum-1)*pageSize,pageSize,reviewDto.getThirdStationIds(),reviewDto.getTimeDate());
+               List<MonthGenerate> listmonth=   monthGenerateMapper.selectPagenewMonthGenerate((pageNum-1)*pageSize,pageSize,reviewDto.getThirdStationIds(),reviewDto.getTimeDate(),reviewDto.getState());
 
                 list = getJpStationDtomonth(  dataJpStation,   listmonth);
                 break;
@@ -448,8 +448,7 @@ public class JpStationServiceImpl extends BaseService<JpStationDto,JpStation,JpS
                 //拦截拼接权限
                 count= yearGenerateMapper.selectCount(wapper2);
                 //拦截拼接权限
-                List<YearGenerate> listyear=   yearGenerateMapper.selectPagenewYearGenerate((pageNum-1)*pageSize,pageSize,reviewDto.getThirdStationIds(),reviewDto.getTimeDate());
-
+                List<YearGenerate> listyear=   yearGenerateMapper.selectPagenewYearGenerate((pageNum-1)*pageSize,pageSize,reviewDto.getThirdStationIds(),reviewDto.getTimeDate(),reviewDto.getState());
 
                 list = getJpStationDtoyear(  dataJpStation,   listyear);
                 break;
@@ -687,22 +686,16 @@ public class JpStationServiceImpl extends BaseService<JpStationDto,JpStation,JpS
         return ld;
     }
 
+
+
     @UserLimits
     public List<JpStationDto> selectReportDate(JpStationDto reviewDto,String type,HttpServletResponse response) {
         //权限
         //权限
         List<String> statioId=new ArrayList();
-//        if(reviewDto.getThirdStationIds()!=null){
-//            List<String>   dd= reviewDto.getThirdStationIds()!=null? JSON.parseArray(reviewDto.getThirdStationIds().get(0),String.class):null;
-//            reviewDto.setThirdStationIds(dd);
-//        }
+
         List<JpStation> dataJpStation= jpStationMapper.getJpStation(reviewDto);
-        if(reviewDto.getThirdStationIds()==null||reviewDto.getThirdStationIds().isEmpty()){
-            for (JpStation jpStation : dataJpStation) {
-                statioId.add(jpStation.getThirdStationId());
-            }
-            reviewDto.setThirdStationIds(statioId);
-        }
+
 
 
         List<JpStationDto> list = null;
@@ -711,8 +704,9 @@ public class JpStationServiceImpl extends BaseService<JpStationDto,JpStation,JpS
                 switch (type) {
                     case "day":
                         LambdaQueryWrapper<DayGenerate> wapper = new LambdaQueryWrapper<DayGenerate>();
-                        wapper.in(DayGenerate::getThirdStationId, reviewDto.getThirdStationIds());
+                        wapper.in(reviewDto.getThirdStationId()!=null&&!reviewDto.getThirdStationId().isEmpty(),DayGenerate::getThirdStationId, reviewDto.getThirdStationIds());
                         wapper.eq(reviewDto.getTimeDate() != null&&!reviewDto.getTimeDate().equals(""), DayGenerate::getDayTime, reviewDto.getTimeDate());
+                        wapper.eq(reviewDto.getState() != null&&!reviewDto.getState().equals(""), DayGenerate::getStationState, reviewDto.getState());
 
                         List<DayGenerate> listday = dayGenerateMapper.selectList(wapper);
                         List<DayGenerateEX> listne = getJpStationDtodaynew(dataJpStation, listday);
@@ -723,8 +717,9 @@ public class JpStationServiceImpl extends BaseService<JpStationDto,JpStation,JpS
                         break;
                     case "month":
                         LambdaQueryWrapper<MonthGenerate> wapper1 = new LambdaQueryWrapper<MonthGenerate>();
-                        wapper1.in(MonthGenerate::getThirdStationId, reviewDto.getThirdStationIds());
+                        wapper1.in(reviewDto.getThirdStationId()!=null&&!reviewDto.getThirdStationId().isEmpty(),MonthGenerate::getThirdStationId, reviewDto.getThirdStationIds());
                         wapper1.eq(reviewDto.getTimeDate() != null&&!reviewDto.getTimeDate().equals(""), MonthGenerate::getMonthTime, reviewDto.getTimeDate());
+                        wapper1.eq(reviewDto.getState() != null&&!reviewDto.getState().equals(""), MonthGenerate::getStationState, reviewDto.getState());
 
                         List<MonthGenerate> listmonth = monthGenerateMapper.selectList(wapper1);
                         List<MonthGenerateEX> lo = getJpStationDtomonthnew(dataJpStation, listmonth);
@@ -735,8 +730,10 @@ public class JpStationServiceImpl extends BaseService<JpStationDto,JpStation,JpS
                         break;
                     case "year":
                         LambdaQueryWrapper<YearGenerate> wapper2 = new LambdaQueryWrapper<YearGenerate>();
-                        wapper2.in(YearGenerate::getThirdStationId, reviewDto.getThirdStationIds());
+                        wapper2.in(reviewDto.getThirdStationId()!=null&&!reviewDto.getThirdStationId().isEmpty(),YearGenerate::getThirdStationId, reviewDto.getThirdStationIds());
                         wapper2.eq(reviewDto.getTimeDate() != null&&!reviewDto.getTimeDate().equals(""), YearGenerate::getYear, reviewDto.getTimeDate());
+                        wapper2.eq(reviewDto.getState() != null&&!reviewDto.getState().equals(""), YearGenerate::getStationState, reviewDto.getState());
+
                         List<YearGenerate> listyear = yearGenerateMapper.selectList(wapper2);
                         List<YearGenerateEX> listy = getJpStationDtoyearnew(dataJpStation, listyear);
                         setResponseHeadForDowload(response, "电站年报表.xls");
@@ -758,6 +755,78 @@ public class JpStationServiceImpl extends BaseService<JpStationDto,JpStation,JpS
         return list;
     }
 
+
+//    @UserLimits
+//    public List<JpStationDto> selectReportDate(JpStationDto reviewDto,String type,HttpServletResponse response) {
+//        //权限
+//        //权限
+//        List<String> statioId=new ArrayList();
+////        if(reviewDto.getThirdStationIds()!=null){
+////            List<String>   dd= reviewDto.getThirdStationIds()!=null? JSON.parseArray(reviewDto.getThirdStationIds().get(0),String.class):null;
+////            reviewDto.setThirdStationIds(dd);
+////        }
+//        List<JpStation> dataJpStation= jpStationMapper.getJpStation(reviewDto);
+//        if(reviewDto.getThirdStationIds()==null||reviewDto.getThirdStationIds().isEmpty()){
+//            for (JpStation jpStation : dataJpStation) {
+//                statioId.add(jpStation.getThirdStationId());
+//            }
+//            reviewDto.setThirdStationIds(statioId);
+//        }
+//
+//
+//        List<JpStationDto> list = null;
+//        try {
+//            if(dataJpStation!=null&&dataJpStation.size()>0) {
+//                switch (type) {
+//                    case "day":
+//                        LambdaQueryWrapper<DayGenerate> wapper = new LambdaQueryWrapper<DayGenerate>();
+//                        wapper.in(DayGenerate::getThirdStationId, reviewDto.getThirdStationIds());
+//                        wapper.eq(reviewDto.getTimeDate() != null&&!reviewDto.getTimeDate().equals(""), DayGenerate::getDayTime, reviewDto.getTimeDate());
+//
+//                        List<DayGenerate> listday = dayGenerateMapper.selectList(wapper);
+//                        List<DayGenerateEX> listne = getJpStationDtodaynew(dataJpStation, listday);
+//                        setResponseHeadForDowload(response, "电站日报表.xls");
+//                        EasyExcel.write(response.getOutputStream()).head(DayGenerateEX.class).excelType(ExcelTypeEnum.XLS).sheet("电站报表")
+//
+//                                .doWrite(listne);
+//                        break;
+//                    case "month":
+//                        LambdaQueryWrapper<MonthGenerate> wapper1 = new LambdaQueryWrapper<MonthGenerate>();
+//                        wapper1.in(MonthGenerate::getThirdStationId, reviewDto.getThirdStationIds());
+//                        wapper1.eq(reviewDto.getTimeDate() != null&&!reviewDto.getTimeDate().equals(""), MonthGenerate::getMonthTime, reviewDto.getTimeDate());
+//
+//                        List<MonthGenerate> listmonth = monthGenerateMapper.selectList(wapper1);
+//                        List<MonthGenerateEX> lo = getJpStationDtomonthnew(dataJpStation, listmonth);
+//                        setResponseHeadForDowload(response, "电站月报表.xls");
+//                        EasyExcel.write(response.getOutputStream()).head(MonthGenerateEX.class).excelType(ExcelTypeEnum.XLS).sheet("电站报表")
+//
+//                                .doWrite(lo);
+//                        break;
+//                    case "year":
+//                        LambdaQueryWrapper<YearGenerate> wapper2 = new LambdaQueryWrapper<YearGenerate>();
+//                        wapper2.in(YearGenerate::getThirdStationId, reviewDto.getThirdStationIds());
+//                        wapper2.eq(reviewDto.getTimeDate() != null&&!reviewDto.getTimeDate().equals(""), YearGenerate::getYear, reviewDto.getTimeDate());
+//                        List<YearGenerate> listyear = yearGenerateMapper.selectList(wapper2);
+//                        List<YearGenerateEX> listy = getJpStationDtoyearnew(dataJpStation, listyear);
+//                        setResponseHeadForDowload(response, "电站年报表.xls");
+//                        EasyExcel.write(response.getOutputStream()).head(YearGenerateEX.class).excelType(ExcelTypeEnum.XLS).sheet("电站报表")
+//
+//                                .doWrite(listy);
+//                        break;
+//                    default:
+//                        list = getJpStationDtoAll(dataJpStation);
+//                        setResponseHeadForDowload(response, "电站累计报表.xls");
+//                        EasyExcel.write(response.getOutputStream()).head(JpStationDto.class).excelType(ExcelTypeEnum.XLS).sheet("电站报表")
+//
+//                                .doWrite(list);
+//                }
+//            }
+//        } catch (IOException e) {
+//            throw new RuntimeException(e);
+//        }
+//        return list;
+//    }
+
     public List<DayGenerateEX> getJpStationDtodaynew( List<JpStation>  da,  List<DayGenerate> listday){
         List<DayGenerateEX> ld=new ArrayList<>();
         for (DayGenerate dayGenerate : listday) {