Merge remote-tracking branch 'origin/developer' into developer

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

@@ -79,8 +79,6 @@ public interface JpStationMapper extends BaseMapper<JpStation> {
     List<PowerStationStatistics> getDealerPage(String regionalCompaniesCode, String dealerName);
 
     @UserEmpower(field ={"hygf_jp_station.regional_companies_code"},dealerField ={"hygf_jp_station.amos_company_code","hygf_jp_station.regional_companies_code"} ,fieldConditions ={"eq","in"} ,relationship="and")
-    List<JpStationDto> queryAllPowerStation(String regionalCompaniesCode, String amosCompanyCode, String powerStationId);
-
-    @UserEmpower(field ={"hygf_jp_station.regional_companies_code"},dealerField ={"hygf_jp_station.amos_company_code","hygf_jp_station.regional_companies_code"} ,fieldConditions ={"eq","in"} ,relationship="and")
     List<Map<String,Object>> selectStateCount(String regionalCompaniesCode, String amosCompanyCode, String type);
+    List<JpStationDto> queryAllPowerStation(String regionalCompaniesCode, String amosCompanyCode, String thirdStationId, String type);
 }

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

@@ -329,6 +329,9 @@
             <if test="dto.thirdStationId!=null">
                 and hygf_jp_station.third_station_id =#{dto.thirdStationId}
             </if>
+            <if test="dto.type!=null and dto.type!=''">
+                and hygf_jp_station.type =#{dto.type}
+            </if>
             <if test="dto.regionalCompaniesCode!=null">
                 and hygf_jp_station.regional_companies_code =#{dto.regionalCompaniesCode}
             </if>
@@ -368,6 +371,9 @@
             <if test="dto.thirdStationId!=null">
                 and hygf_jp_station.third_station_id =#{dto.thirdStationId}
             </if>
+            <if test="dto.type!=null and dto.type!=''">
+                and hygf_jp_station.type =#{dto.type}
+            </if>
             <if test="dto.regionalCompaniesCode!=null">
                 and hygf_jp_station.regional_companies_code =#{dto.regionalCompaniesCode}
             </if>
@@ -408,6 +414,9 @@
             <if test="dto.thirdStationId!=null">
                 and hygf_jp_station.third_station_id =#{dto.thirdStationId}
             </if>
+            <if test="dto.type!=null and dto.type!=''">
+                and hygf_jp_station.type =#{dto.type}
+            </if>
             <if test="dto.regionalCompaniesCode!=null">
                 and hygf_jp_station.regional_companies_code =#{dto.regionalCompaniesCode}
             </if>
@@ -443,6 +452,10 @@
                     #{item.stationId}
                 </foreach>
             </if>
+            <if test="dto.type!=null and dto.type!=''">
+                and hygf_jp_station.type =#{dto.type}
+            </if>
+
             <if test="dto.thirdStationId!=null">
                 and hygf_jp_station.third_station_id =#{dto.thirdStationId}
             </if>
@@ -485,6 +498,9 @@
             <if test="dto.thirdStationId!=null">
                 and hygf_jp_station.third_station_id =#{dto.thirdStationId}
             </if>
+            <if test="dto.type!=null and dto.type!=''">
+                and hygf_jp_station.type =#{dto.type}
+            </if>
             <if test="dto.regionalCompaniesCode!=null">
                 and hygf_jp_station.regional_companies_code =#{dto.regionalCompaniesCode}
             </if>
@@ -524,6 +540,9 @@
             <if test="dto.thirdStationId!=null">
                 and hygf_jp_station.third_station_id =#{dto.thirdStationId}
             </if>
+            <if test="dto.type!=null and dto.type!=''">
+                and hygf_jp_station.type =#{dto.type}
+            </if>
             <if test="dto.regionalCompaniesCode!=null">
                 and hygf_jp_station.regional_companies_code =#{dto.regionalCompaniesCode}
             </if>
@@ -606,7 +625,7 @@
             <if test="dto.thirdStationId!=null">
                 and hygf_jp_station.third_station_id =#{dto.thirdStationId}
             </if>
-            <if test="dto.type!=null">
+            <if test="dto.type!=null and dto.type!=''">
                 and hygf_jp_station.type =#{dto.type}
             </if>
             <if test="dto.regionalCompaniesCode!=null">
@@ -681,9 +700,11 @@
         <where>
             hygf_jp_station.regional_companies_code is not null
             <if test="powerStationId!=null">
-                and hygf_jp_station.sequence_nbr =#{powerStationId}
+                and hygf_jp_station.thirdStationId =#{thirdStationId}
+            </if>
+            <if test="type!=null and type != ''">
+                and hygf_jp_station.type =#{type}
             </if>
-
             <if test="regionalCompaniesCode!=null">
                 and hygf_jp_station.regional_companies_code =#{regionalCompaniesCode}
             </if>

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

@@ -323,9 +323,10 @@ public class TdHygfJpInverterWarnController extends BaseController {
     @UserLimits
     public ResponseModel<Map<String, Object>> queryAlarmNumber(@RequestParam(required = false) String regionalCompaniesCode,
                                                                @RequestParam(required = false) String amosCompanyCode,
-                                                               @RequestParam(required = false) String thirdStationId
+                                                               @RequestParam(required = false) String thirdStationId,
+                                                               @RequestParam(required = false) String type
     ) {
-        Map<String, Object> result = tdHygfJpInverterWarnServiceImpl.queryAlarmNumber(regionalCompaniesCode, amosCompanyCode, thirdStationId);
+        Map<String, Object> result = tdHygfJpInverterWarnServiceImpl.queryAlarmNumber(regionalCompaniesCode, amosCompanyCode, thirdStationId, type);
 
         return ResponseHelper.buildResponse(result);
     }
@@ -336,9 +337,10 @@ public class TdHygfJpInverterWarnController extends BaseController {
     @UserLimits
     public ResponseModel<Map<String, Object>> queryStateNumber(@RequestParam(required = false) String regionalCompaniesCode,
                                                                @RequestParam(required = false) String amosCompanyCode,
-                                                               @RequestParam(required = false) String thirdStationId
+                                                               @RequestParam(required = false) String thirdStationId,
+                                                               @RequestParam(required = false) String type
     ) {
-        Map<String, Object> result = tdHygfJpInverterWarnServiceImpl.queryStateNumber(regionalCompaniesCode, amosCompanyCode, thirdStationId);
+        Map<String, Object> result = tdHygfJpInverterWarnServiceImpl.queryStateNumber(regionalCompaniesCode, amosCompanyCode, thirdStationId, type);
 
         return ResponseHelper.buildResponse(result);
     }

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

@@ -978,8 +978,8 @@ public class JpStationServiceImpl extends BaseService<JpStationDto, JpStation, J
 
     }
 
-    public List<JpStationDto> queryAllPowerStation(String regionalCompaniesCode, String amosCompanyCode, String powerStationId) {
-        List<JpStationDto> powerStationList =  jpStationMapper.queryAllPowerStation(regionalCompaniesCode, amosCompanyCode, powerStationId);
+    public List<JpStationDto> queryAllPowerStation(String regionalCompaniesCode, String amosCompanyCode, String thirdStationId, String type) {
+        List<JpStationDto> powerStationList =  jpStationMapper.queryAllPowerStation(regionalCompaniesCode, amosCompanyCode, thirdStationId, type);
         return powerStationList;
     }
 

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

@@ -190,9 +190,9 @@ public class TdHygfJpInverterWarnServiceImpl
         return tdHygfJpInverterWarnMapper.selectWarnListTotal(state, level, minvalue, maxValue, snCode, stationId, startTime, endTime, content, handlerStatus, stationName);
     }
 
-    public Map<String, Object> queryAlarmNumber(String regionalCompaniesCode, String amosCompanyCode, String powerStationId) {
+    public Map<String, Object> queryAlarmNumber(String regionalCompaniesCode, String amosCompanyCode, String thirdStationId, String type) {
 //        查询所有场站
-        List<JpStationDto> jpStationDtos = jpStationServiceImpl.queryAllPowerStation(regionalCompaniesCode, amosCompanyCode, powerStationId);
+        List<JpStationDto> jpStationDtos = jpStationServiceImpl.queryAllPowerStation(regionalCompaniesCode, amosCompanyCode, thirdStationId, type);
 
         Map<String, Object> result = new HashMap<>();
 
@@ -230,9 +230,9 @@ public class TdHygfJpInverterWarnServiceImpl
     }
 
 
-    public Map<String, Object> queryStateNumber(String regionalCompaniesCode, String amosCompanyCode, String powerStationId) {
+    public Map<String, Object> queryStateNumber(String regionalCompaniesCode, String amosCompanyCode, String thirdStationId, String type) {
 //        查询所有场站
-        List<JpStationDto> jpStationDtos = jpStationServiceImpl.queryAllPowerStation(regionalCompaniesCode, amosCompanyCode, powerStationId);
+        List<JpStationDto> jpStationDtos = jpStationServiceImpl.queryAllPowerStation(regionalCompaniesCode, amosCompanyCode, thirdStationId, type);
 
         Map<String, Object> result = new HashMap<>();