新增列表统计接口

amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/java/com/yeejoin/amos/boot/module/hygf/api/dto/JpStationDto.java

@@ -145,6 +145,8 @@ public class JpStationDto extends BaseDto {
     private Double ratedPower;
 
     private String regionalCompaniesCode;
+    private String regionalCompaniesName;
+
 
     private String amosCompanyCode;
 

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

@@ -205,7 +205,9 @@
       SELECT  hygf_unit_info.`name`,  hygf_unit_info.amos_company_code  orgCode   FROM hygf_regional_companies LEFT JOIN hygf_unit_info
       ON hygf_unit_info.sequence_nbr=hygf_regional_companies.unit_info_id  WHERE hygf_unit_info.audit_status='2'
       AND hygf_unit_info.blacklist='0' AND hygf_unit_info.is_delete='0'
+        <if test="regionalCompaniesCode!=null">
       and hygf_regional_companies.regional_companies_code =#{regionalCompaniesCode}
+        </if>
       and hygf_unit_info.amos_company_code is not null
       GROUP BY hygf_unit_info.amos_company_code,hygf_unit_info.`name`
     </select>
@@ -501,9 +503,9 @@
         `area` ,
         `cumulative_income` cumulativeIncome,
         `email`,
-        rated_power ratedPower
-
-
+        rated_power ratedPower,
+        ROUND(`real_time_power`/ratedPower,3) fullhour,
+        (select privilege_company.COMPANY_NAME  from   privilege_company where privilege_company.ORG_CODE=hygf_jp_station.regional_companies_code)           regionalCompaniesName
         from hygf_jp_station
         <where>
             <if test="dto.name!=null">
@@ -527,6 +529,9 @@
             <if test="dto.thirdStationId!=null">
                 and hygf_jp_station.third_station_id =#{dto.thirdStationId}
             </if>
+            <if test="dto.type!=null">
+                and hygf_jp_station.type =#{dto.type}
+            </if>
             <if test="dto.regionalCompaniesCode!=null">
                 and hygf_jp_station.regional_companies_code =#{dto.regionalCompaniesCode}
             </if>

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

@@ -432,6 +432,56 @@ public class JpStationController extends BaseController {
     }
 
 
+
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+    @ApiOperation(httpMethod = "GET",value = "电站列表统计",   notes = "电站列表统计")
+    @GetMapping(value = "/getjpStationConservation")
+    @UserLimits
+    public ResponseModel< List<Map<String,Object>>> getjpStationConservation(JpStationDto reviewDto) {
+        JpStationDto jpStation= jpStationMapper.getCountJpStationdata(reviewDto);
+
+
+        List<Map<String,Object>> date=new ArrayList<>();
+
+
+        Map<String,Object> map=new HashMap<>();
+        DecimalFormat format2 = new DecimalFormat("#.00");
+        //炭
+        map.put("value1",format2.format(jpStation.getRealTimePower()));
+        //硫
+        map.put("value2",format2.format(jpStation.getCapacity()));
+
+
+        Map<String,Object> map2=new HashMap<>();
+        //炭
+        map2.put("value1",format2.format(jpStation.getDayGenerate()));
+        //硫
+        map2.put("value2",format2.format(jpStation.getDayIncome()));
+        Map<String,Object> map3=new HashMap<>();
+        //炭
+        map3.put("value1",format2.format(jpStation.getMonthGenerate()));
+        //硫
+        map3.put("value2",format2.format(jpStation.getMonthIncome()));
+        Map<String,Object> map4=new HashMap<>();
+        //炭
+        map4.put("value1",format2.format(jpStation.getYearGenerate()));
+        //硫
+        map4.put("value2",format2.format(jpStation.getYearIncome()));
+
+        date.add(map);
+        date.add(map4);
+        date.add(map2);
+        date.add(map3);
+
+        return ResponseHelper.buildResponse(date);
+    }
+
+
+
+
+
+
+
     @TycloudOperation(ApiLevel = UserType.AGENCY)
     @ApiOperation(httpMethod = "GET",value = "电站统计",   notes = "电站统计")
     @GetMapping(value = "/getcountJpStation")
@@ -527,7 +577,7 @@ public class JpStationController extends BaseController {
     @ApiOperation(httpMethod = "GET",value = "场站列表",  notes = "场站列表")
     public ResponseModel<Page<JpStationDto>> queryPagenew(@RequestParam(value = "current") int current, @RequestParam
             (value = "size") int size, JpStationDto reviewDto) {
-        Page<JpStationDto> page=jpStationServiceImpl.queryForJpStationPage(current,size,reviewDto);
+        Page<JpStationDto> page=jpStationServiceImpl.queryForJpStationPagenew(current,size,reviewDto);
         return ResponseHelper.buildResponse(page);
     }
     @TycloudOperation(ApiLevel = UserType.AGENCY)