添加经销商电站数据统计接口

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

@@ -13,8 +13,8 @@ import lombok.Data;
  */
 @Data
 public class PowerStationStatistics {
-    private String regionCompanyName; // 区域公司
-    private String regionCompanyOrgCode; // 区域公司orgCode
+    private String name; // 区域公司/经销商名称
+    private String code; // 区域公司/经销商code
     private Integer powerStationNumber; // 电站总数
     private Double totalCapacity;  //  装机容量
     private Double totalDayGenerate; // 日发电量

amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/java/com/yeejoin/amos/boot/module/hygf/api/mapper/JpStationMapper.java

@@ -69,5 +69,9 @@ public interface JpStationMapper extends BaseMapper<JpStation> {
     List<PowerStationStatistics>  getRegionPage(String regionName);
 
 
-    PowerStationStatistics  getRegionStatistics(String orgCode);
+    PowerStationStatistics  getRegionStatistics(String code);
+
+
+
+    List<PowerStationStatistics> getDealerPage(String regionCompanyOrgCode, String dealerName);
 }

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

@@ -37,4 +37,6 @@ public interface IJpStationService {
     Map<String, List<Object>> getPowerqxnew(String date, JpStationDto reviewDto);
 
     Page<PowerStationStatistics> getRegionStatistics(Integer current, Integer size, String regionName);
+
+    Page<PowerStationStatistics> getDealerStatistics(Integer current, Integer size, String regionCompanyOrgCode, String dealerName);
 }

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

@@ -241,20 +241,23 @@
     </select>
 
     <select id="getRegion" resultType="com.yeejoin.amos.boot.module.hygf.api.dto.DropDown">
-        SELECT  privilege_company.ORG_CODE orgCode ,
+        SELECT privilege_company.ORG_CODE     orgCode,
                privilege_company.COMPANY_NAME name
         FROM privilege_company
-        WHERE  IS_DELETED=0 and privilege_company.COMPANY_TYPE = 'region'
+        WHERE IS_DELETED = 0
+          and privilege_company.COMPANY_TYPE = 'region'
     </select>
     <select id="getRegionAll" resultType="com.yeejoin.amos.boot.module.hygf.api.dto.DropDown">
-        SELECT  privilege_company.ORG_CODE orgCode ,
+        SELECT privilege_company.ORG_CODE     orgCode,
                privilege_company.COMPANY_NAME name
         FROM privilege_company
-        WHERE  IS_DELETED=0 and privilege_company.COMPANY_TYPE = 'region'
+        WHERE IS_DELETED = 0
+          and privilege_company.COMPANY_TYPE = 'region'
     </select>
 
     <select id="getDealer" resultType="com.yeejoin.amos.boot.module.hygf.api.dto.DropDown">
-      SELECT  hygf_unit_info.`name`,  hygf_unit_info.amos_company_code  orgCode   FROM hygf_regional_companies LEFT JOIN hygf_unit_info
+        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">
@@ -265,7 +268,8 @@
     </select>
 
     <select id="getDealerAll" resultType="com.yeejoin.amos.boot.module.hygf.api.dto.DropDown">
-        SELECT  hygf_unit_info.`name`,  hygf_unit_info.amos_company_code  orgCode   FROM hygf_regional_companies LEFT JOIN hygf_unit_info
+        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">
@@ -289,8 +293,6 @@
     </select>
 
 
-
-
     <select id="getCountJpStationdata" resultType="com.yeejoin.amos.boot.module.hygf.api.dto.JpStationDto">
 
 
@@ -579,7 +581,8 @@
         `email`,
         rated_power ratedPower,
         ROUND(`day_generate`/capacity,3) fullhour,
-        (select privilege_company.COMPANY_NAME  from   privilege_company where privilege_company.ORG_CODE=hygf_jp_station.regional_companies_code)           regionalCompaniesName
+        (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">
@@ -617,9 +620,12 @@
     </select>
 
 
+
+<!--    ========电站监控区域=======-->
+
     <select id="getRegionPage" resultType="com.yeejoin.amos.boot.module.hygf.api.dto.PowerStationStatistics">
-        SELECT privilege_company.ORG_CODE regionCompanyOrgCode ,
-        privilege_company.COMPANY_NAME regionCompanyName
+        SELECT privilege_company.ORG_CODE code ,
+        privilege_company.COMPANY_NAME name
         FROM privilege_company
         <where>
             IS_DELETED=0 and privilege_company.COMPANY_TYPE = 'region'
@@ -629,6 +635,7 @@
         </where>
     </select>
 
+<!--    code参数为区域公司orgCode或经销商orgCode-->
     <select id="getRegionStatistics" resultType="com.yeejoin.amos.boot.module.hygf.api.dto.PowerStationStatistics">
         SELECT COUNT(*)                    AS powerStationNumber,
                ROUND(SUM(capacity), 2)     AS totalCapacity,
@@ -636,6 +643,24 @@
                ROUND(SUM(rated_power), 2)  AS totalRatedPower,
                ROUND(SUM(day_income), 2)   AS totalDayIncome
         FROM hygf_jp_station hjs
-        WHERE hjs.regional_companies_code = #{orgCode}
+        WHERE hjs.regional_companies_code = #{code} or hjs.amos_company_code = #{code}
+    </select>
+
+
+<!--    根据区域orgCode查询经销商-->
+    <select id="getDealerPage" resultType="com.yeejoin.amos.boot.module.hygf.api.dto.PowerStationStatistics">
+        select hui.name as name, hui.amos_company_code as code
+        from hygf_regional_companies hrc
+        RIGHT JOIN hygf_unit_info hui
+        ON hrc.unit_info_id = hui.sequence_nbr
+        <where>
+            hui.blacklist=0 and hui.is_delete=0
+            <if test="regionCompanyOrgCode != null and regionCompanyOrgCode!=''">
+              and  hrc.regional_companies_code = #{regionCompanyOrgCode}
+            </if>
+            <if test="dealerName != null and dealerName!=''">
+                and hui.name like concat("%",#{dealerName},"%")
+            </if>
+        </where>
     </select>
 </mapper>

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

@@ -181,8 +181,7 @@ public class JpStationController extends BaseController {
     @TycloudOperation(ApiLevel = UserType.AGENCY)
     @GetMapping(value = "/queryPage")
     @ApiOperation(httpMethod = "GET", value = "场站列表", notes = "场站列表")
-    public ResponseModel<Page<JpStationDto>> queryForDealerReviewPage(@RequestParam(value = "current") int current, @RequestParam
-            (value = "size") int size, JpStationDto reviewDto) {
+    public ResponseModel<Page<JpStationDto>> queryForDealerReviewPage(@RequestParam(value = "current") int current, @RequestParam(value = "size") int size, JpStationDto reviewDto) {
 
         List<JpPersonStation> pPersonStation = null;
         if (reviewDto.getName() != null && !"".equals(reviewDto.getName())) {
@@ -731,8 +730,7 @@ public class JpStationController extends BaseController {
     @GetMapping(value = "/queryPagenew")
     @ApiOperation(httpMethod = "GET", value = "场站列表", notes = "场站列表")
     @UserLimits
-    public ResponseModel<Page<JpStationDto>> queryPagenew(@RequestParam(value = "current") int current, @RequestParam
-            (value = "size") int size, JpStationDto reviewDto) {
+    public ResponseModel<Page<JpStationDto>> queryPagenew(@RequestParam(value = "current") int current, @RequestParam(value = "size") int size, JpStationDto reviewDto) {
         Page<JpStationDto> page = jpStationServiceImpl.queryForJpStationPagenew(current, size, reviewDto);
         return ResponseHelper.buildResponse(page);
     }
@@ -740,8 +738,7 @@ public class JpStationController extends BaseController {
     @TycloudOperation(ApiLevel = UserType.AGENCY)
     @PostMapping(value = "/queryReport")
     @ApiOperation(httpMethod = "POST", value = "场站报表", notes = "场站报表")
-    public ResponseModel<Page<JpStationDto>> queryReport(@RequestParam(value = "current") int current, @RequestParam
-            (value = "size") int size, @RequestBody JpStationDto reviewDto, @RequestParam(value = "type") String type) {
+    public ResponseModel<Page<JpStationDto>> queryReport(@RequestParam(value = "current") int current, @RequestParam(value = "size") int size, @RequestBody JpStationDto reviewDto, @RequestParam(value = "type") String type) {
 
         Page<JpStationDto> page = jpStationServiceImpl.queryReport(current, size, reviewDto, type);
 
@@ -792,10 +789,22 @@ public class JpStationController extends BaseController {
     @ApiOperation(httpMethod = "GET", value = "查询当前登录人权限区域公司统计数据", notes = "查询当前登录人权限区域公司统计数据")
     @GetMapping(value = "/getRegionStatistics")
 //    @UserLimits
-    public ResponseModel<Page<PowerStationStatistics>> getRegionStatistics(@RequestParam(defaultValue = "1") Integer current, @RequestParam(defaultValue = "10") Integer size, String regionName) {
+    public ResponseModel<Page<PowerStationStatistics>> getRegionStatistics(@RequestParam(defaultValue = "1") Integer current, @RequestParam(defaultValue = "10") Integer size, @RequestParam(required = false) String regionName) {
 
-        Page<PowerStationStatistics> regionStatisticsData = jpStationServiceImpl.getRegionStatistics(current, size, regionName);
+        Page<PowerStationStatistics> poserStatisticsData = jpStationServiceImpl.getRegionStatistics(current, size, regionName);
 
-        return ResponseHelper.buildResponse(regionStatisticsData);
+        return ResponseHelper.buildResponse(poserStatisticsData);
+    }
+
+    //查询经销商统计数据(根据区域公司orgCode)
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+    @ApiOperation(httpMethod = "GET", value = "查询经销商统计数据", notes = "查询经销商统计数据")
+    @GetMapping(value = "/getDealerStatistics")
+//    @UserLimits
+    public ResponseModel<Page<PowerStationStatistics>> getDealerStatistics(@RequestParam(defaultValue = "1") Integer current, @RequestParam(defaultValue = "10") Integer size, String regionCompanyOrgCode, @RequestParam(required = false) String dealerName) {
+
+        Page<PowerStationStatistics> poserStatisticsData = jpStationServiceImpl.getDealerStatistics(current, size, regionCompanyOrgCode, dealerName);
+
+        return ResponseHelper.buildResponse(poserStatisticsData);
     }
 }

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

@@ -757,9 +757,9 @@ public class JpStationServiceImpl extends BaseService<JpStationDto, JpStation, J
 
         List<PowerStationStatistics> resultPage = new ArrayList<>();
         page.getList().stream().forEach(powerStationStatistics -> {
-            PowerStationStatistics regionStatistics = jpStationMapper.getRegionStatistics(powerStationStatistics.getRegionCompanyOrgCode());
-            regionStatistics.setRegionCompanyName(powerStationStatistics.getRegionCompanyName());
-            regionStatistics.setRegionCompanyOrgCode(powerStationStatistics.getRegionCompanyOrgCode());
+            PowerStationStatistics regionStatistics = jpStationMapper.getRegionStatistics(powerStationStatistics.getCode());
+            regionStatistics.setName(powerStationStatistics.getName());
+            regionStatistics.setCode(powerStationStatistics.getCode());
             resultPage.add(regionStatistics);
         });
 
@@ -772,4 +772,30 @@ public class JpStationServiceImpl extends BaseService<JpStationDto, JpStation, J
         return pagenew;
     }
 
+    @Override
+    public Page<PowerStationStatistics> getDealerStatistics(Integer current, Integer size, String regionCompanyOrgCode, String dealerName) {
+        PageHelper.startPage(current, size);
+//        根据区域公司orgCode查询区域公司下所有的经销商
+        List<PowerStationStatistics> dealerPage = jpStationMapper.getDealerPage(regionCompanyOrgCode, dealerName);
+        PageInfo<PowerStationStatistics> page = new PageInfo(dealerPage);
+        Page<PowerStationStatistics> pagenew = new Page<PowerStationStatistics>();
+
+        List<PowerStationStatistics> resultPage = new ArrayList<>();
+        page.getList().stream().forEach(powerStationStatistics -> {
+            PowerStationStatistics regionStatistics = jpStationMapper.getRegionStatistics(powerStationStatistics.getCode());
+            regionStatistics.setName(powerStationStatistics.getName());
+            regionStatistics.setCode(powerStationStatistics.getCode());
+            resultPage.add(regionStatistics);
+        });
+
+        pagenew.setCurrent(current);
+        pagenew.setTotal(page.getTotal());
+        pagenew.setSize(size);
+        pagenew.setRecords(resultPage);
+
+        return pagenew;
+
+
+    }
+
 }
\ No newline at end of file