修改逆变器报表

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

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

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

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

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

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

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

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

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

 package com.yeejoin.amos.boot.module.hygf.api.tdenginemapper;
 
+import com.baomidou.mybatisplus.core.conditions.Wrapper;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.toolkit.Constants;
+import com.yeejoin.amos.boot.module.hygf.api.config.UserEmpower;
+import com.yeejoin.amos.boot.module.hygf.api.entity.DayGenerate;
 import com.yeejoin.amos.boot.module.hygf.api.entity.MonthGenerate;
+import com.yeejoin.amos.boot.module.hygf.api.entity.YearGenerate;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
 
 public interface MonthGenerateMapper extends BaseMapper<MonthGenerate> {
-    List<MonthGenerate> selectPagenewMonthGenerate(@Param("current") int current,@Param("size") int size,@Param("dto")   List<String> statioId, @Param("dateTime")String dateTime );
+    @UserEmpower(field ={"regional_companies_code"},dealerField ={"amos_company_code","regional_companies_code"} ,fieldConditions ={"eq","in"} ,relationship="and")
+    List<MonthGenerate> selectPagenewMonthGenerate(@Param("current") int current,@Param("size") int size,@Param("dto")   List<String> statioId,
+                                                   @Param("dateTime")String dateTime,
+                                                   @Param("stationState")String stationState );
+    @UserEmpower(field ={"regional_companies_code"},dealerField ={"amos_company_code","regional_companies_code"} ,fieldConditions ={"eq","in"} ,relationship="and")
+    List<MonthGenerate> selectList(@Param(Constants.WRAPPER) Wrapper<MonthGenerate> queryWrapper);
+
+    @UserEmpower(field ={"regional_companies_code"},dealerField ={"amos_company_code","regional_companies_code"} ,fieldConditions ={"eq","in"} ,relationship="and")
+    Integer selectCount(@Param(Constants.WRAPPER) Wrapper<MonthGenerate> queryWrapper);
+
 
 }

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

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

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

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

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

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

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

 package com.yeejoin.amos.boot.module.hygf.api.tdenginemapper;
 
+import com.baomidou.mybatisplus.core.conditions.Wrapper;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.toolkit.Constants;
+import com.yeejoin.amos.boot.module.hygf.api.config.UserEmpower;
+import com.yeejoin.amos.boot.module.hygf.api.entity.DayGenerate;
+import com.yeejoin.amos.boot.module.hygf.api.entity.MonthGenerate;
 import com.yeejoin.amos.boot.module.hygf.api.entity.YearGenerate;
 import org.apache.ibatis.annotations.Param;
 
@@ -12,6 +17,15 @@ import java.util.List;
  * @createDate: 2023/11/8
  */
 public interface YearGenerateMapper extends BaseMapper<YearGenerate>  {
-    List<YearGenerate> selectPagenewYearGenerate(@Param("current") int current,@Param("size") int size,@Param("dto")   List<String> statioId, @Param("dateTime")String dateTime );
+    @UserEmpower(field ={"regional_companies_code"},dealerField ={"amos_company_code","regional_companies_code"} ,fieldConditions ={"eq","in"} ,relationship="and")
+    List<YearGenerate> selectPagenewYearGenerate(@Param("current") int current,@Param("size") int size,@Param("dto")   List<String> statioId,
+                                                 @Param("dateTime")String dateTime,
+                                                 @Param("stationState")String stationState  );
+    @UserEmpower(field ={"regional_companies_code"},dealerField ={"amos_company_code","regional_companies_code"} ,fieldConditions ={"eq","in"} ,relationship="and")
+    List<YearGenerate> selectList(@Param(Constants.WRAPPER) Wrapper<YearGenerate> queryWrapper);
+
+    @UserEmpower(field ={"regional_companies_code"},dealerField ={"amos_company_code","regional_companies_code"} ,fieldConditions ={"eq","in"} ,relationship="and")
+    Integer selectCount(@Param(Constants.WRAPPER) Wrapper<YearGenerate> queryWrapper);
+
 
 }

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

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

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

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

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

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

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

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