Merge branch 'dev0124-01' into dev0124

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

+package com.yeejoin.amos.api.householdapi.face.orm.houseapi.entity.tdeingine;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * @description:
+ * @author: tw
+ * @createDate: 2024/4/2
+ */
+
+@Data
+@TableName(value = "td_hygf_jp_station" ,autoResultMap = true)
+public class TdJpStation implements Serializable {
+    private Long createdTime;
+    private String thirdStationId; //采集电站id
+    private String regionalCompaniesCode; //区域公司code
+    private String amosCompanyCode; //经销商code
+    private String thirdCode ;//厂商标识
+
+}

amos-boot-data/amos-boot-data-housepvapi/src/main/java/com/yeejoin/amos/api/householdapi/face/orm/mapper/tdengine/TdJpStationMapper.java

+package com.yeejoin.amos.api.householdapi.face.orm.mapper.tdengine;
+
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.yeejoin.amos.api.householdapi.face.orm.houseapi.entity.tdeingine.TdJpStation;
+
+/**
+ * @description:
+ * @author: tw
+ * @createDate: 2024/4/2
+ */
+
+public interface TdJpStationMapper  extends BaseMapper<TdJpStation> {
+}
\ No newline at end of file

amos-boot-data/amos-boot-data-housepvapi/src/main/java/com/yeejoin/amos/api/householdapi/face/service/impl/GoLangDataAcquisitionServiceImpl.java

@@ -101,6 +101,10 @@ public class GoLangDataAcquisitionServiceImpl implements GoLangDataAcquisitionSe
 
     @Autowired
     private TdHYGFInverterTotalGenerateMapper tdHYGFInverterTotalGenerateMapper;
+    @Autowired
+    TdJpStationMapper tdJpStationMapper;
+
+
 
     @Scheduled(cron = "${dataRequstScheduled.jinlangyun}")
     @Async
@@ -204,6 +208,29 @@ public class GoLangDataAcquisitionServiceImpl implements GoLangDataAcquisitionSe
                 } else {
                     jpStationMapper.insert(jpStation);
                 }
+
+                //增加td 电站区域公司，经销商绑定表
+                TdJpStation tdJpStation = tdJpStationMapper.selectOne(new QueryWrapper<TdJpStation>().
+                eq("third_code", PVProducerInfoEnum.JLY.getCode()).
+                eq("third_station_id", stationIds.get(i)));
+                //判断是否存在
+                if (ObjectUtils.isEmpty(tdJpStation)) {
+                    tdJpStation = new TdJpStation();
+                }
+                tdJpStation.setAmosCompanyCode(jpStation.getAmosCompanyCode());
+                tdJpStation.setRegionalCompaniesCode(jpStation.getRegionalCompaniesCode());
+                tdJpStation.setThirdStationId(stationIds.get(i));
+                tdJpStation.setThirdCode(PVProducerInfoEnum.JLY.getCode());
+                tdJpStation.setCreatedTime(System.currentTimeMillis());
+                if (!ObjectUtils.isEmpty(tdJpStation.getCreatedTime())) {
+                    tdJpStationMapper.updateById(tdJpStation);
+                } else {
+                    tdJpStationMapper.insert(tdJpStation);
+                }
+
+
+
+
                 HYGFJPStationPowerHistory hygfjpStationPowerHistory = new HYGFJPStationPowerHistory();
                 hygfjpStationPowerHistory.setCreatedTime(System.currentTimeMillis());
                 hygfjpStationPowerHistory.setThirdStationId(jpStation.getThirdStationId());

amos-boot-data/amos-boot-data-housepvapi/src/main/java/com/yeejoin/amos/api/householdapi/face/service/impl/ImasterDataServiceImpl.java

@@ -114,7 +114,8 @@ public class ImasterDataServiceImpl implements ImasterDataService {
     private TdHYGFStationYearGenerateMapper tdHYGFStationYearGenerateMapper;
     @Autowired
     private TdHYGFInverterTotalGenerateMapper tdHYGFInverterTotalGenerateMapper;
-
+    @Autowired
+    TdJpStationMapper tdJpStationMapper;
 
     @Scheduled(cron = "${dataRequstScheduled.huawei}")
     @Override
@@ -299,6 +300,33 @@ public class ImasterDataServiceImpl implements ImasterDataService {
             } else {
                 jpStationMapper.insert(jpStation);
             }
+
+
+            //增加td 电站区域公司，经销商绑定表
+            TdJpStation tdJpStation = tdJpStationMapper.selectOne(new QueryWrapper<TdJpStation>().
+                    eq("third_code",PVProducerInfoEnum.HUAWEI.getCode()).
+                    eq("third_station_id",  imasterStationList.getPlantCode()));
+            //判断是否存在
+            if (ObjectUtils.isEmpty(tdJpStation)) {
+                tdJpStation = new TdJpStation();
+            }
+            tdJpStation.setAmosCompanyCode(jpStation.getAmosCompanyCode());
+            tdJpStation.setRegionalCompaniesCode(jpStation.getRegionalCompaniesCode());
+            tdJpStation.setThirdStationId( imasterStationList.getPlantCode());
+            tdJpStation.setThirdCode(PVProducerInfoEnum.JLY.getCode());
+            tdJpStation.setCreatedTime(System.currentTimeMillis());
+            if (!ObjectUtils.isEmpty(tdJpStation.getCreatedTime())) {
+                tdJpStationMapper.updateById(tdJpStation);
+            } else {
+                tdJpStationMapper.insert(tdJpStation);
+            }
+
+
+
+
+
+
+
             HYGFJPStationPowerHistory hygfjpStationPowerHistory = new HYGFJPStationPowerHistory();
             hygfjpStationPowerHistory.setCreatedTime(System.currentTimeMillis());
             hygfjpStationPowerHistory.setThirdStationId(jpStation.getThirdStationId());

amos-boot-data/amos-boot-data-housepvapi/src/main/java/com/yeejoin/amos/api/householdapi/face/service/impl/KsolarDataAcquisitionServiceImpl.java

@@ -108,7 +108,9 @@ public class KsolarDataAcquisitionServiceImpl implements KSolarDataAcquisitionSe
     private TdHYGFStationYearGenerateMapper tdHYGFStationYearGenerateMapper;
     @Autowired
     private TdHYGFInverterTotalGenerateMapper tdHYGFInverterTotalGenerateMapper;
-
+    @Autowired
+    TdJpStationMapper tdJpStationMapper;
+    
     @Scheduled(cron = "${dataRequstScheduled.keshida}")
     @Override
     public void stationList() {
@@ -237,6 +239,40 @@ public class KsolarDataAcquisitionServiceImpl implements KSolarDataAcquisitionSe
                         jpStationMapper.insert(jpStation);
                     }
 
+
+
+
+                    //增加td 电站区域公司，经销商绑定表
+                    TdJpStation tdJpStation = tdJpStationMapper.selectOne(new QueryWrapper<TdJpStation>().
+                            eq("third_code",PVProducerInfoEnum.KSOLAR.getCode()).
+                            eq("third_station_id",  ksolarStation.getStationId()));
+                    //判断是否存在
+                    if (ObjectUtils.isEmpty(tdJpStation)) {
+                        tdJpStation = new TdJpStation();
+                    }
+                    tdJpStation.setAmosCompanyCode(jpStation.getAmosCompanyCode());
+                    tdJpStation.setRegionalCompaniesCode(jpStation.getRegionalCompaniesCode());
+                    tdJpStation.setThirdStationId( ksolarStation.getStationId());
+                    tdJpStation.setThirdCode(PVProducerInfoEnum.JLY.getCode());
+                    tdJpStation.setCreatedTime(System.currentTimeMillis());
+                    if (!ObjectUtils.isEmpty(tdJpStation.getCreatedTime())) {
+                        tdJpStationMapper.updateById(tdJpStation);
+                    } else {
+                        tdJpStationMapper.insert(tdJpStation);
+                    }
+
+
+
+
+
+
+
+
+
+
+
+
+
                     HYGFJPStationPowerHistory hygfjpStationPowerHistory = new HYGFJPStationPowerHistory();
                     hygfjpStationPowerHistory.setCreatedTime(System.currentTimeMillis());
                     hygfjpStationPowerHistory.setThirdStationId(jpStation.getThirdStationId());

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/TdHygfJpInverterWarn.java

@@ -99,4 +99,13 @@ public class TdHygfJpInverterWarn {
 	@TableField("handler_status")
 	private String handlerStatus ;
 
+    @TableField("station_name")
+    private String stationName; //名称
+    @TableField("regional_companies_code")
+    private String regionalCompaniesCode; //区域公司code
+    @TableField("amos_company_code")
+    private String amosCompanyCode; //经销商code
+
+
+
 }

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/mapper/JpStationMapper.java

@@ -20,7 +20,11 @@ import java.util.Map;
  * @date 2023-09-19
  */
 public interface JpStationMapper extends BaseMapper<JpStation> {
+
+    @UserEmpower(field ={"hygf_jp_station.regional_companies_code"},dealerField ={"amos_company_code","regional_companies_code"} ,fieldConditions ={"eq","in"} ,relationship="and")
     List<JpStationDto> queryForDealerReviewPage(@Param("dto") JpStationDto reviewDto);
+
+
     JpStationDto queryCount(@Param("dto") JpStationDto reviewDto);
     List<Map<String,Object>>  countState(@Param("dto") JpStationDto reviewDto);
     List<Map<String,Double>> getPowerqx(String dateType);

amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/java/com/yeejoin/amos/boot/module/hygf/api/service/IDayGenerateService.java

@@ -12,6 +12,7 @@ import java.util.List;
  */
 public interface IDayGenerateService {
 
-    List<DayGenerate> getDayGenerateph( List<JpStation> dto, String sort,String dateTime);
+    List<DayGenerate> getDayGenerateph( List<JpStation> dto, String regionalCompaniesCode,
+                                        String amosCompanyCode,  String sort,String dateTime);
 
 }

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.annotation.TableField;
+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.dto.PowerCurveDto;
 import com.yeejoin.amos.boot.module.hygf.api.entity.DayGenerate;
 import com.yeejoin.amos.boot.module.hygf.api.entity.JpStation;
@@ -18,17 +22,32 @@ public interface DayGenerateMapper extends BaseMapper<DayGenerate> {
     //日发电量排行
     // desc 前十名
     // asc  后十名
-
-    List<DayGenerate>  getDayGenerateph(@Param("dto") List<JpStation> dto, @Param("sort")String sort,@Param("dateTime")String dateTime);
-
-
-
-    List<PowerCurveDto>  getDayGeneratqx(@Param("date") String month, @Param("dto")List<String> statioId);
-
-    List<PowerCurveDto>  getMonthGenerateqx(@Param("date") String month, @Param("dto")List<String> statioId);
-
-    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 );
+    @UserEmpower(field ={"regional_companies_code"},dealerField ={"amos_company_code","regional_companies_code"} ,fieldConditions ={"eq","in"} ,relationship="and")
+    List<DayGenerate>  getDayGenerateph(@Param("dto") List<JpStation> dto,
+                                        @Param("regionalCompaniesCode") String regionalCompaniesCode,
+                                        @Param("amosCompanyCode") String amosCompanyCode,
+                                        @Param("sort")String sort,
+                                        @Param("dateTime")String dateTime);
+
+
+    @UserEmpower(field ={"regional_companies_code"},dealerField ={"amos_company_code","regional_companies_code"} ,fieldConditions ={"eq","in"} ,relationship="and")
+    List<PowerCurveDto>  getDayGeneratqx(@Param("date") String month, @Param("thirdStationId") String thirdStationId,@Param("dto")List<String> statioId);
+    @UserEmpower(field ={"regional_companies_code"},dealerField ={"amos_company_code","regional_companies_code"} ,fieldConditions ={"eq","in"} ,relationship="and")
+    List<PowerCurveDto>  getMonthGenerateqx(@Param("date") String month, @Param("thirdStationId") String thirdStationId, @Param("dto")List<String> statioId);
+    @UserEmpower(field ={"regional_companies_code"},dealerField ={"amos_company_code","regional_companies_code"} ,fieldConditions ={"eq","in"} ,relationship="and")
+    List<PowerCurveDto>  getYearGenerateqx(@Param("date") String month, @Param("thirdStationId") String thirdStationId, @Param("dto")List<String> statioId);
+
+
+    @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,
+                                               @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/MonthPowerMapper.java

@@ -31,6 +31,6 @@ public interface MonthPowerMapper extends BaseMapper<MonthPower> {
 
     List<PowerCurveDto> getAllPower(@Param("date") String month,@Param("dto")List<String> statioId);
 
-    List<PowerCurveDto>  getDayPowercount(@Param("date") String month,@Param("dto")List<String> statioId);
+    List<PowerCurveDto>  getDayPowercount(@Param("date") String month,@Param("dto")List<String> statioId,@Param("thirdStationId") String thirdStationId);
 
 }

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/TdHygfJpInverterWarnMapper.java

 package com.yeejoin.amos.boot.module.hygf.api.tdenginemapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.yeejoin.amos.boot.module.hygf.api.config.UserEmpower;
 import com.yeejoin.amos.boot.module.hygf.api.dto.TdHygfJpInverterWarnDto;
 import com.yeejoin.amos.boot.module.hygf.api.entity.JpStation;
 import com.yeejoin.amos.boot.module.hygf.api.entity.TdHygfJpInverterWarn;
@@ -29,9 +30,11 @@ public interface TdHygfJpInverterWarnMapper extends BaseMapper<TdHygfJpInverterW
 
     TdHygfJpInverterWarnDto getByTime(@Param("createdTime") long createdTime);
 
-    List<TdHygfJpInverterWarnDto> selectWarnList(String state, String level, String minvalue, String maxValue, String snCode, List<String> stationId, String startTime, String endTime, String content, Integer current, Integer size,String handlerStatus);
 
-    int selectWarnListTotal(String state, String level, String minvalue, String maxValue, String snCode, List<String> stationId, String startTime, String endTime, String content,String handlerStatus);
+    @UserEmpower(field ={"regional_companies_code"},dealerField ={"amos_company_code","regional_companies_code"} ,fieldConditions ={"eq","in"} ,relationship="and")
+    List<TdHygfJpInverterWarnDto> selectWarnList(String state, String level, String minvalue, String maxValue, String snCode, List<String> stationId, String startTime, String endTime, String content, Integer current, Integer size,String handlerStatus,String stationName);
+    @UserEmpower(field ={"regional_companies_code"},dealerField ={"amos_company_code","regional_companies_code"} ,fieldConditions ={"eq","in"} ,relationship="and")
+    int selectWarnListTotal(String state, String level, String minvalue, String maxValue, String snCode, List<String> stationId, String startTime, String endTime, String content,String handlerStatus,String stationName);
 
     @Select("SELECT  *  from td_hygf_jp_inverter_warn  WHERE (third_station_id = #{thirdStationId} AND sn_code = #{sncode} AND created_time = #{createdTime})")
     TdHygfJpInverterWarn getInverTerWarnByparams(@Param("createdTime") long createdTime, @Param("sncode") String snCode, @Param("thirdStationId") String thirdStationId);

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

@@ -16,6 +16,14 @@
             <if test="dateTime!=null">
               and  day_time = #{dateTime}
             </if>
+            <if test="regionalCompaniesCode!=null and regionalCompaniesCode != ''">
+                and regional_companies_code = #{regionalCompaniesCode}
+            </if>
+
+            <if test="amosCompanyCode!=null and amosCompanyCode != ''">
+                and amos_company_code = #{amosCompanyCode}
+            </if>
+
         </where>
         <if test="sort=='desc'">
             ORDER by fullhour desc
@@ -31,32 +39,67 @@
         SELECT
         sum(generate)num,
         `day_time` date
-        FROM house_pv_data.td_hygf_station_day_generate where third_station_id in
-        <foreach collection="dto" item="item" index="index" open="(" separator="," close=")">
-            #{item}
-        </foreach>
-        and year_month = #{date}
+        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="thirdStationId!=null and thirdStationId != ''">
+            and third_station_id = #{thirdStationId}
+        </if>
+            and year_month = #{date}
+        </where>
+
+
+
         GROUP BY `day_time`
     </select>
     <select id="getMonthGenerateqx"  resultType="com.yeejoin.amos.boot.module.hygf.api.dto.PowerCurveDto">
         SELECT
         sum(generate)num,
         `month_time` date
-        FROM house_pv_data.td_hygf_station_month_generate where third_station_id in
-        <foreach collection="dto" item="item" index="index" open="(" separator="," close=")">
-            #{item}
-        </foreach>
-        and year = #{date}
+        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="thirdStationId!=null and thirdStationId != ''">
+                and third_station_id = #{thirdStationId}
+            </if>
+            and year = #{date}
+        </where>
+
+
+
+
         GROUP BY `month_time`
     </select>
     <select id="getYearGenerateqx"  resultType="com.yeejoin.amos.boot.module.hygf.api.dto.PowerCurveDto">
         SELECT
         sum(generate)num,
         `year_time` date
-        FROM house_pv_data.td_hygf_station_year_generate where third_station_id in
-        <foreach collection="dto" item="item" index="index" open="(" separator="," close=")">
-            #{item}
-        </foreach>
+        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="thirdStationId!=null and thirdStationId != ''">
+                and third_station_id = #{thirdStationId}
+            </if>
+        </where>
 
         GROUP BY `year_time`
     </select>
@@ -76,6 +119,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/MonthPowerMapper.xml

@@ -77,10 +77,24 @@
         SELECT
         sum(power)num,
         `hour` date
-        FROM house_pv_data.td_hygf_day_power where tation_id in
-        <foreach collection="dto" item="item" index="index" open="(" separator="," close=")">
-            #{item}
-        </foreach>
+        FROM house_pv_data.td_hygf_day_power
+
+        <where>
+            <if test="dto!=null">
+                tation_id in
+                <foreach collection="dto" item="item" index="index" open="(" separator="," close=")">
+                    #{item}
+                </foreach>
+            </if>
+
+            <if test="thirdStationId!=null and thirdStationId != ''">
+                and tation_id = #{thirdStationId}
+            </if>
+        </where>
+
+
+
+
         and year_month_day = #{date}
         GROUP BY `hour`
     </select>

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

@@ -89,7 +89,7 @@
 			<if test="snCode != null and snCode != ''">
 				AND sn_code like #{snCode}
 			</if>
-			<if test="stationId.size >0 ">
+			<if test="stationId != null and   stationId.size >0 ">
 				AND third_station_id in
 			<foreach collection="stationId" item="item" open='(' close=')' separator=",">
 				#{item}
@@ -104,6 +104,9 @@
 			<if test="content != null and content != ''">
 				AND content like #{content}
 			</if>
+            <if test="stationName != null and stationName != ''">
+                AND station_name like #{stationName}
+            </if>
 		</where>
 		ORDER BY start_time desc
 		limit #{current},#{size}
@@ -133,7 +136,7 @@
 			<if test="snCode != null and snCode != ''">
 				AND sn_code like #{snCode}
 			</if>
-			<if test="stationId.size >0 ">
+			<if test="stationId != null and stationId.size >0 ">
 				AND third_station_id in
 				<foreach collection="stationId" item="item" open='(' close=')' separator=",">
 					#{item}
@@ -148,6 +151,11 @@
 			<if test="content != null and content != ''">
 				AND content like #{content}
 			</if>
+            <if test="stationName != null and stationName != ''">
+                AND station_name like #{stationName}
+            </if>
+
+
 		</where>
 	</select>
 </mapper>

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/config/TDengineServerConfig.java

@@ -3,6 +3,7 @@ package com.yeejoin.amos.boot.module.hygf.biz.config;
 import com.baomidou.mybatisplus.extension.plugins.PaginationInterceptor;
 import com.baomidou.mybatisplus.extension.spring.MybatisSqlSessionFactoryBean;
 import com.github.pagehelper.PageInterceptor;
+import com.yeejoin.amos.boot.module.hygf.api.config.UserEmpowerInterceptor;
 import org.apache.ibatis.plugin.Interceptor;
 import org.apache.ibatis.session.SqlSessionFactory;
 import org.mybatis.spring.SqlSessionTemplate;
@@ -56,7 +57,13 @@ public class TDengineServerConfig {
                 "" +
                 ";");
         interceptor.setProperties(properties);
-        bean.setPlugins(new Interceptor[] {interceptor,paginationInterceptor()});
+
+
+
+        bean.setPlugins(new Interceptor[] {interceptor,
+                userEmpowerInterceptor(),
+                paginationInterceptor()
+        });
         return bean.getObject();
 
     }
@@ -66,6 +73,12 @@ public class TDengineServerConfig {
         return new DataSourceTransactionManager(dataSource);
     }
 
+    @Bean
+    public UserEmpowerInterceptor userEmpowerInterceptor() {
+        UserEmpowerInterceptor userEmpowerInterceptor = new UserEmpowerInterceptor();
+
+        return userEmpowerInterceptor;
+    }
 
     @Bean(name = "tdengineSqlSessionTemplate")
     public SqlSessionTemplate tdengineSqlSessionTemplate(@Qualifier("tdengineSqlSessionFactory") SqlSessionFactory sqlSessionFactory) throws Exception {

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/controller/JpStationController.java

@@ -673,11 +673,16 @@ public class JpStationController extends BaseController {
     @TycloudOperation(ApiLevel = UserType.AGENCY)
     @ApiOperation(httpMethod = "GET", value = "日满发小时排行", notes = "日满发小时排行")
     @GetMapping(value = "/getDayGenerateph")
+    @UserLimits
     public ResponseModel<Page<Map<String, Object>>> getDayGenerateph(JpStationDto reviewDto, String type, String dateTime) {
 
+
+        //获取权限电站
         List<JpStation> list = jpStationServiceImpl.getJpStation(reviewDto);
+
+
         List<Map<String, Object>> li = new ArrayList<>();
-        List<DayGenerate> date = dayGenerateServiceImpl.getDayGenerateph(list, type, dateTime);
+        List<DayGenerate> date = dayGenerateServiceImpl.getDayGenerateph(null,reviewDto.getRegionalCompaniesCode(),reviewDto.getAmosCompanyCode(), type, dateTime);
         DecimalFormat format2 = new DecimalFormat("0.00");
         if (date != null && !list.isEmpty()) {
             for (DayGenerate dayGenerate : date) {
@@ -700,6 +705,34 @@ public class JpStationController extends BaseController {
         result.setTotal(10);
         result.setRecords(li);
         return ResponseHelper.buildResponse(result);
+
+
+
+//        List<JpStation> list = jpStationServiceImpl.getJpStation(reviewDto);
+//        List<Map<String, Object>> li = new ArrayList<>();
+//        List<DayGenerate> date = dayGenerateServiceImpl.getDayGenerateph(list, type, dateTime);
+//        DecimalFormat format2 = new DecimalFormat("0.00");
+//        if (date != null && !list.isEmpty()) {
+//            for (DayGenerate dayGenerate : date) {
+//                Map<String, Object> map = new HashMap<>();
+//                for (JpStation jpStation : list) {
+//                    if (dayGenerate.getThirdStationId().equals(jpStation.getThirdStationId())) {
+//                        map.put("id", jpStation.getSequenceNbr());
+//                        map.put("name", jpStation.getName());
+//                        map.put("address", jpStation.getAddress());
+//                        map.put("fullhour", dayGenerate.getFullhour()!=null?format2.format(dayGenerate.getFullhour()):0);
+//                        li.add(map);
+//                        break;
+//                    }
+//                }
+//
+//            }
+//        }
+//        Page<Map<String, Object>> result = new Page<>();
+//        result.setCurrent(1);
+//        result.setTotal(10);
+//        result.setRecords(li);
+//        return ResponseHelper.buildResponse(result);
     }
 
 

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

@@ -245,24 +245,24 @@ public class TdHygfJpInverterWarnController extends BaseController {
         Page<TdHygfJpInverterWarnDto> result = new Page<>();
         result.setCurrent(current);
         result.setSize(size);
-        JpStationDto reviewDto = new JpStationDto();
-        Map<String, String> nameMaps = new HashMap<>();
-        if (null != stationName && stationName != "") {
-            reviewDto.setName(stationName);
-        }
-        List<JpStation> jpStation = jpStationMapper.getJpStation(reviewDto);
-        if (CollectionUtil.isEmpty(jpStation)) {
-            result.setTotal(0);
-            List<TdHygfJpInverterWarnDto> list = new ArrayList<>();
-            result.setRecords(list);
-            return ResponseHelper.buildResponse(result);
-
-        }
-        nameMaps = jpStation.stream().collect(Collectors.toMap(JpStation::getThirdStationId, JpStation::getName, (existing, replacement) -> existing));
-
-        if (null == stationId) {
-            stationId = jpStation.stream().map(JpStation::getThirdStationId).collect(Collectors.toList());
-        }
+//        JpStationDto reviewDto = new JpStationDto();
+//        Map<String, String> nameMaps = new HashMap<>();
+//        if (null != stationName && stationName != "") {
+//            reviewDto.setName(stationName);
+//        }
+//        List<JpStation> jpStation = jpStationMapper.getJpStation(reviewDto);
+//        if (CollectionUtil.isEmpty(jpStation)) {
+//            result.setTotal(0);
+//            List<TdHygfJpInverterWarnDto> list = new ArrayList<>();
+//            result.setRecords(list);
+//            return ResponseHelper.buildResponse(result);
+//
+//        }
+//        nameMaps = jpStation.stream().collect(Collectors.toMap(JpStation::getThirdStationId, JpStation::getName, (existing, replacement) -> existing));
+//
+//        if (null == stationId) {
+//            stationId = jpStation.stream().map(JpStation::getThirdStationId).collect(Collectors.toList());
+//        }
         String startTime = "";
         String endTime = "";
         if (null != time) {
@@ -281,16 +281,22 @@ public class TdHygfJpInverterWarnController extends BaseController {
         if (StringUtils.isNotEmpty(content)) {
             content = '%' + content + '%';
         }
-        List<TdHygfJpInverterWarnDto> maps = tdHygfJpInverterWarnServiceImpl.selectWarnList(state, level, minvalue, maxValue, snCode, stationId, startTime, endTime, content, current, size, handlerStatus);
+        if (StringUtils.isNotEmpty(stationName)) {
+            stationName = '%' + stationName + '%';
+        }
+
+
+
+        List<TdHygfJpInverterWarnDto> maps = tdHygfJpInverterWarnServiceImpl.selectWarnList(state, level, minvalue, maxValue, snCode, stationId, startTime, endTime, content, current, size, handlerStatus,stationName);
         for (TdHygfJpInverterWarnDto map : maps) {
-            if (nameMaps.containsKey(map.getThirdStationId())) {
-                map.setStationName(nameMaps.get(map.getThirdStationId()));
-            }
+//            if (nameMaps.containsKey(map.getThirdStationId())) {
+//                map.setStationName(nameMaps.get(map.getThirdStationId()));
+//            }
             String te = map.getTimeLong() != null ? TimeUtil.longFormat(map.getTimeLong()) : "";
             map.setTimeLongFormat(te);
         }
 
-        result.setTotal(tdHygfJpInverterWarnServiceImpl.selectWarnListTotal(state, level, minvalue, maxValue, snCode, stationId, startTime, endTime, content, handlerStatus));
+        result.setTotal(tdHygfJpInverterWarnServiceImpl.selectWarnListTotal(state, level, minvalue, maxValue, snCode, stationId, startTime, endTime, content, handlerStatus,stationName));
         List<Long> waringIds = maps.stream().map(tdHygfJpInverterWarnDto -> tdHygfJpInverterWarnDto.getCreatedTime()).collect(Collectors.toList());
         if (waringIds.size() == 0) {
             waringIds = Arrays.asList(0L);

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

@@ -22,7 +22,11 @@ public class DayGenerateServiceImpl extends BaseService<DayGenerateDto, DayGener
     @Autowired
     DayGenerateMapper dayGenerateMapper;
     @Override
-    public List<DayGenerate> getDayGenerateph(List<JpStation> dto, String sort,String dateTime) {
-        return dayGenerateMapper.getDayGenerateph(dto,sort,dateTime);
+    public List<DayGenerate> getDayGenerateph(List<JpStation> dto,
+                                              String regionalCompaniesCode,
+                                              String amosCompanyCode,
+                                              String sort,
+                                              String dateTime) {
+        return dayGenerateMapper.getDayGenerateph(dto,regionalCompaniesCode,amosCompanyCode, sort,dateTime);
     }
 }

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);
         }
@@ -177,83 +202,120 @@ public class JpInverterServiceImpl extends BaseService<JpInverterDto, JpInverter
         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)));
+
         });
         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(tdHYGFInverterMonthGenerate.getFullhour()!=null?Double.valueOf(String.format("%.2f",tdHYGFInverterMonthGenerate.getFullhour())):null));
+
+        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);
         }
         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()))));
+        tdHYGFInverterMonthGenerates.forEach(tdHYGFInverterMonthGenerate -> tdHYGFInverterMonthGenerate.setFullhour(tdHYGFInverterMonthGenerate.getFullhour()!=null?Double.valueOf(String.format("%.2f",tdHYGFInverterMonthGenerate.getFullhour())):null));
         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;
-    }
+       tdHYGFInverterYearGenerates.forEach(tdHYGFInverterYearGenerate -> tdHYGFInverterYearGenerate.setFullhour(tdHYGFInverterYearGenerate.getFullhour()!=null?Double.valueOf(String.format("%.2f",tdHYGFInverterYearGenerate.getFullhour())):null));
+
+        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);
         }
         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()))));
+        tdHYGFInverterYearGenerates.forEach(tdHYGFInverterYearGenerate -> tdHYGFInverterYearGenerate.setFullhour(tdHYGFInverterYearGenerate.getFullhour()!=null?Double.valueOf(String.format("%.2f",tdHYGFInverterYearGenerate.getFullhour())):null));
         return tdHYGFInverterYearGenerates;
     }
     public List<Map<String, String>> getInverterSncodes(List<String> stationIds) {

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

@@ -109,7 +109,7 @@ public class JpStationServiceImpl extends BaseService<JpStationDto,JpStation,JpS
 
             if(type.equals("day")){
                 map= gethourList();
-                data =monthPowerMapper.getDayPowercount(date, statioId);
+                data =monthPowerMapper.getDayPowercount(date, statioId,null);
             }else if(type.equals("month")){
                 map= getDayListOfMonth(date);
                 data=monthPowerMapper.getMonthPower(date, statioId);
@@ -216,11 +216,11 @@ public class JpStationServiceImpl extends BaseService<JpStationDto,JpStation,JpS
     @UserLimits
     public Map<String, List<Object>> getGenerateqx(String date, String type, JpStationDto reviewDto) {
 
-        List<String> statioId=new ArrayList();
-        List<JpStation> dataJpStation=jpStationMapper.getJpStation(reviewDto);
-        for (JpStation jpStation : dataJpStation) {
-            statioId.add(jpStation.getThirdStationId());
-        }
+//        List<String> statioId=new ArrayList();
+//        List<JpStation> dataJpStation=jpStationMapper.getJpStation(reviewDto);
+//        for (JpStation jpStation : dataJpStation) {
+//            statioId.add(jpStation.getThirdStationId());
+//        }
 
         List<PowerCurveDto>  data=null;
         List<Object> listx =new  ArrayList<>();
@@ -231,20 +231,20 @@ public class JpStationServiceImpl extends BaseService<JpStationDto,JpStation,JpS
 
             if(type.equals("month")){
                 map= getDayListOfMonth(reviewDto.getTimeDateMonth());
-                if(statioId!=null&&!statioId.isEmpty()) {
+//                if(statioId!=null&&!statioId.isEmpty()) {
 
-                    data = dayGenerateMapper.getDayGeneratqx(reviewDto.getTimeDateMonth(), statioId);
-                }
+                    data = dayGenerateMapper.getDayGeneratqx(reviewDto.getTimeDateMonth(),reviewDto.getThirdStationId(), null);
+//                }
             }else if(type.equals("year")){
                 map= getyearListOfMonth(reviewDto.getTimeDateYear());
-                if(statioId!=null&&!statioId.isEmpty()) {
-                    data = dayGenerateMapper.getMonthGenerateqx(reviewDto.getTimeDateYear(), statioId);
-                }
+//                if(statioId!=null&&!statioId.isEmpty()) {
+                    data = dayGenerateMapper.getMonthGenerateqx(reviewDto.getTimeDateYear(),reviewDto.getThirdStationId(), null);
+//                }
             }else{
                 map= getyearList();
-                if(statioId!=null&&!statioId.isEmpty()) {
-                    data = dayGenerateMapper.getYearGenerateqx(null, statioId);
-                }
+//                if(statioId!=null&&!statioId.isEmpty()) {
+                    data = dayGenerateMapper.getYearGenerateqx(null,reviewDto.getThirdStationId(), null);
+//                }
             }
             listx =map.get("x");
             listy =map.get("y");
@@ -278,17 +278,17 @@ public class JpStationServiceImpl extends BaseService<JpStationDto,JpStation,JpS
     @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) {
-            statioId.add(jpStation.getThirdStationId());
-        }
+     //   List<String> statioId=new ArrayList();
+//        List<JpStation> dataJpStation= jpStationMapper.getJpStation(reviewDto);
+//        for (JpStation jpStation : dataJpStation) {
+//            statioId.add(jpStation.getThirdStationId());
+//        }
         List<PowerCurveDto>  data=null;
         List<Object> listx =new  ArrayList<>();
         List<Object> listy =new ArrayList<>();
         Map<String, List<Object>> map =new HashMap<>();
         map= gethourList();
-        data =monthPowerMapper.getDayPowercount(date, statioId);
+        data =monthPowerMapper.getDayPowercount(date, null,reviewDto.getThirdStationId());
         listx =map.get("x");
         listy =map.get("y");
         if(data!=null&&!data.isEmpty()){
@@ -395,23 +395,17 @@ public class JpStationServiceImpl extends BaseService<JpStationDto,JpStation,JpS
         map.put("y",listy);
         return map;
     }
-    @UserLimits
+
+
+        @UserLimits
     public Page<JpStationDto> queryReport(int pageNum, int pageSize, JpStationDto reviewDto,String type)   {
         //权限
         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;
             int count=0;
@@ -422,10 +416,12 @@ public class JpStationServiceImpl extends BaseService<JpStationDto,JpStation,JpS
                     reviewDto.setTimeDate(DateUtil.format(new Date(),"yyyy-MM-dd"));
                 }
                 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());
+               //拦截拼接权限
                 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":
@@ -433,10 +429,12 @@ public class JpStationServiceImpl extends BaseService<JpStationDto,JpStation,JpS
                     reviewDto.setTimeDate(DateUtil.format(new Date(),"yyyy-MM"));
                 }
                 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());
+                //拦截拼接权限
                 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;
@@ -445,11 +443,12 @@ public class JpStationServiceImpl extends BaseService<JpStationDto,JpStation,JpS
                     reviewDto.setTimeDate(DateUtil.format(new Date(),"yyyy"));
                 }
                 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());
+                //拦截拼接权限
                 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;
@@ -457,6 +456,7 @@ public class JpStationServiceImpl extends BaseService<JpStationDto,JpStation,JpS
 
                 count= reviewDto.getThirdStationIds()!=null?reviewDto.getThirdStationIds().size():0;
                 PageHelper.startPage(pageNum, pageSize);
+
                 List<JpStationDto> listJ=  jpStationMapper.queryForDealerReviewPage(reviewDto);
 
                 list = getJpStationDtoAlldto(listJ);
@@ -475,6 +475,100 @@ public class JpStationServiceImpl extends BaseService<JpStationDto,JpStation,JpS
 
 
 
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+//    @UserLimits
+//    public Page<JpStationDto> queryReport(int pageNum, int pageSize, JpStationDto reviewDto,String type)   {
+//        //权限
+//        List<String> statioId=new ArrayList();
+//
+//        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;
+//            int count=0;
+//            if(dataJpStation!=null&&dataJpStation.size()>0){
+//        switch (type){
+//            case"day":
+//                if (StringUtils.isEmpty(reviewDto.getTimeDate())){
+//                    reviewDto.setTimeDate(DateUtil.format(new Date(),"yyyy-MM-dd"));
+//                }
+//                LambdaQueryWrapper<DayGenerate> wapper = new LambdaQueryWrapper<DayGenerate>();
+//                wapper.in(DayGenerate::getThirdStationId,reviewDto.getThirdStationIds());
+//                wapper.eq(reviewDto.getTimeDate()!=null&&!reviewDto.getTimeDate().equals(""),DayGenerate::getDayTime,reviewDto.getTimeDate());
+//                count= dayGenerateMapper.selectCount(wapper);
+//                List<DayGenerate> listday=   dayGenerateMapper.selectPagenewDayGenerate((pageNum-1)*pageSize,pageSize,reviewDto.getThirdStationIds(),reviewDto.getTimeDate());
+//                list = getJpStationDtoday(  dataJpStation,   listday);
+//                break;
+//            case"month":
+//                if (StringUtils.isEmpty(reviewDto.getTimeDate())){
+//                    reviewDto.setTimeDate(DateUtil.format(new Date(),"yyyy-MM"));
+//                }
+//                LambdaQueryWrapper<MonthGenerate> wapper1 = new LambdaQueryWrapper<MonthGenerate>();
+//                wapper1.in(MonthGenerate::getThirdStationId,reviewDto.getThirdStationIds());
+//                wapper1.eq(reviewDto.getTimeDate()!=null&&!reviewDto.getTimeDate().equals(""),MonthGenerate::getMonthTime,reviewDto.getTimeDate());
+//                count= monthGenerateMapper.selectCount(wapper1);
+//                List<MonthGenerate> listmonth=   monthGenerateMapper.selectPagenewMonthGenerate((pageNum-1)*pageSize,pageSize,reviewDto.getThirdStationIds(),reviewDto.getTimeDate());
+//
+//                list = getJpStationDtomonth(  dataJpStation,   listmonth);
+//                break;
+//            case"year":
+//                if (StringUtils.isEmpty(reviewDto.getTimeDate())){
+//                    reviewDto.setTimeDate(DateUtil.format(new Date(),"yyyy"));
+//                }
+//                LambdaQueryWrapper<YearGenerate> wapper2 = new LambdaQueryWrapper<YearGenerate>();
+//                wapper2.in(YearGenerate::getThirdStationId,reviewDto.getThirdStationIds());
+//                wapper2.eq(reviewDto.getTimeDate()!=null&&!reviewDto.getTimeDate().equals(""),YearGenerate::getYear,reviewDto.getTimeDate());
+//                count= yearGenerateMapper.selectCount(wapper2);
+//                List<YearGenerate> listyear=   yearGenerateMapper.selectPagenewYearGenerate((pageNum-1)*pageSize,pageSize,reviewDto.getThirdStationIds(),reviewDto.getTimeDate());
+//
+//
+//                list = getJpStationDtoyear(  dataJpStation,   listyear);
+//                break;
+//            default:
+//
+//                count= reviewDto.getThirdStationIds()!=null?reviewDto.getThirdStationIds().size():0;
+//                PageHelper.startPage(pageNum, pageSize);
+//                List<JpStationDto> listJ=  jpStationMapper.queryForDealerReviewPage(reviewDto);
+//
+//                list = getJpStationDtoAlldto(listJ);
+//        }
+//            }
+//        com.baomidou.mybatisplus.extension.plugins.pagination.Page<JpStationDto> pagenew = new com.baomidou.mybatisplus.extension.plugins.pagination.Page<JpStationDto>();
+//        pagenew.setCurrent(pageNum);
+//        pagenew.setTotal(count);
+//        pagenew.setSize(pageSize);
+//        pagenew.setRecords(list);
+//        return pagenew;
+//    }
+
+
+
+
+
+
     public List<JpStationDto> getJpStationDtoAlldto( List<JpStationDto>  da){
         List<JpStationDto> ld=new ArrayList<>();
             for (JpStationDto jpStation : da) {
@@ -592,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;
@@ -616,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);
@@ -628,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);
@@ -640,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");
@@ -663,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) {

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

@@ -40,7 +40,8 @@ public class TdHygfJpInverterWarnServiceImpl
 
     @Autowired
     HYGFMaintenanceTicketsMapper hygfMaintenanceTicketsMapper;
-
+    @Autowired
+    TdHygfJpInverterWarnMapper tdHygfJpInverterWarnMapper;
     /**
      * 分页查询
      */
@@ -165,20 +166,21 @@ public class TdHygfJpInverterWarnServiceImpl
         return tdHygfJpInverterWarnDto;
     }
 
-    public List<TdHygfJpInverterWarnDto> selectWarnList(String state, String level, String minvalue, String maxValue, String snCode, List<String> stationId, String startTime, String endTime, String content, Integer current, Integer size, String handlerStatus) {
-        List<TdHygfJpInverterWarnDto> list = this.getBaseMapper().selectWarnList(state, level, minvalue, maxValue, snCode, stationId, startTime, endTime, content, (current - 1) * size, size, handlerStatus);
+    public List<TdHygfJpInverterWarnDto> selectWarnList(String state, String level, String minvalue, String maxValue, String snCode, List<String> stationId, String startTime, String endTime, String content, Integer current, Integer size, String handlerStatus,String stationName) {
+        List<TdHygfJpInverterWarnDto> list = tdHygfJpInverterWarnMapper.selectWarnList(state, level, minvalue, maxValue, snCode, stationId, startTime, endTime, content, (current - 1) * size, size, handlerStatus, stationName);
         list.forEach(i -> {
             JpStation jpStation = jpStationServiceImpl.getOne(new LambdaQueryWrapper<JpStation>()
                     .eq(JpStation::getThirdStationId, i.getThirdStationId()));
             if (ObjectUtil.isNotNull(jpStation)) {
                 i.setAddress(jpStation.getAddress());
                 i.setArea(jpStation.getArea());
+                i.setStationName(jpStation.getName());
             }
         });
         return list;
     }
 
-    public int selectWarnListTotal(String state, String level, String minvalue, String maxValue, String snCode, List<String> stationId, String startTime, String endTime, String content, String handlerStatus) {
-        return this.getBaseMapper().selectWarnListTotal(state, level, minvalue, maxValue, snCode, stationId, startTime, endTime, content, handlerStatus);
+    public int selectWarnListTotal(String state, String level, String minvalue, String maxValue, String snCode, List<String> stationId, String startTime, String endTime, String content, String handlerStatus,String stationName) {
+        return tdHygfJpInverterWarnMapper.selectWarnListTotal(state, level, minvalue, maxValue, snCode, stationId, startTime, endTime, content, handlerStatus, stationName);
     }
 }
\ No newline at end of file