Merge remote-tracking branch 'origin/dev0124_beta' into dev0124

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

@@ -34,9 +34,13 @@ public interface JpStationMapper extends BaseMapper<JpStation> {
     @UserEmpower(field ={"ORG_CODE"} ,dealerField ={"ORG_CODE"}, fieldConditions ={"eq","in","in"} ,relationship="and",specific=false)
     List<DropDown>  getRegion();
 
+    List<DropDown>  getRegionAll();
+
     @UserEmpower(field ={"hygf_regional_companies.regional_companies_code"} ,dealerField ={"hygf_unit_info.amos_company_code","hygf_regional_companies.regional_companies_code"} ,fieldConditions ={"eq","in"} ,relationship="and")
     List<DropDown>  getDealer(@Param("regionalCompaniesCode") String regionalCompaniesCode);
 
+    List<DropDown>  getDealerAll(@Param("regionalCompaniesCode") String regionalCompaniesCode);
+
     @UserEmpower(field ={"regional_companies_code"} ,dealerField ={"amos_company_code","regional_companies_code"} ,fieldConditions ={"eq","in"} ,relationship="and")
     JpStationDto getCountJpStationdata(@Param("dto") JpStationDto reviewDto);
 

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

@@ -36,7 +36,8 @@ public interface MaintenanceMapper extends BaseMapper<Maintenance> {
     List<MaintenanceDto> Maintenancepage(@Param("name")String name, @Param("maintenanceTypeCode")String maintenanceTypeCode,
                                          @Param("lockStatus")String lockStatus, @Param("reviewStatus")String reviewStatus,
                                          @Param("regionalCompaniesSeq")Long regionalCompaniesSeq, @Param("dealerId") Long dealerId,@Param("maintenanceType")String maintenanceType,
-                                         @Param("maintenanceAreaAddress")String maintenanceAreaAddress);
+                                         @Param("maintenanceAreaAddress")String maintenanceAreaAddress,
+                                         @Param("regionalCompaniesCode")String regionalCompaniesCode, @Param("dealerCode") String dealerCode);
 
 
     //详情

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

@@ -248,6 +248,12 @@
         FROM  privilege_company
         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 ,
+        privilege_company.COMPANY_NAME  name
+        FROM  privilege_company
+        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
@@ -260,6 +266,17 @@
       GROUP BY hygf_unit_info.amos_company_code,hygf_unit_info.`name`
     </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
+        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>
+
     <select id="getDealerNew"  resultType="com.yeejoin.amos.boot.module.hygf.api.dto.DropDown">
         SELECT  hygf_unit_info.`name`,  hygf_unit_info.sequence_nbr  orgCode
 

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

@@ -53,9 +53,8 @@
         std_user_biz.id_card_opposite    idCardOpposite,
         std_user_biz.amos_org_code   amosDealerCode,
         std_user_biz.amos_id    amosDealerId
-
         from  hygf_maintenance ph  LEFT JOIN std_user_biz on ph.foundation_id=std_user_biz.sequence_nbr
-
+        LEFT JOIN hygf_unit_info on hygf_unit_info.sequence_nbr = ph.dealer_id
         <where>
             ph.is_delete = 0
 
@@ -78,17 +77,21 @@
             <if test="reviewStatus != null and reviewStatus != ''">
                 AND ph.review_status = #{reviewStatus}
             </if>
-
             <if test="regionalCompaniesSeq != null and regionalCompaniesSeq != ''">
                 AND ph.regional_companies_seq = #{regionalCompaniesSeq}
             </if>
+            <if test="regionalCompaniesCode != null and regionalCompaniesCode != ''">
+                AND ph.regional_companies_code = #{regionalCompaniesCode}
+            </if>
             <if test="dealerId != null and dealerId != ''">
                 AND ph.dealer_id = #{dealerId}
             </if>
+            <if test="dealerCode != null and dealerCode != ''">
+                AND hygf_unit_info.amos_company_code = #{dealerCode}
+            </if>
 
         </where>
-
-
+        order by ph.rec_date desc
     </select>
 
 

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

@@ -414,6 +414,22 @@ public class JpStationController extends BaseController {
         return ResponseHelper.buildResponse(result);
     }
 
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+    @ApiOperation(httpMethod = "GET", value = "查询当前登录人权限区域公司", notes = "查询当前登录人权限区域公司")
+    @GetMapping(value = "/getRegionAll")
+    public ResponseModel<List<Map<String, String>>> getRegionAll() {
+
+        List<DropDown> list = jpStationMapper.getRegionAll();
+        List<Map<String, String>> result = new ArrayList<>();
+        list.forEach(dropDown -> {
+            Map<String, String> item = new HashMap<>();
+            item.put("text", dropDown.getName());
+            item.put("value", dropDown.getOrgCode());
+            result.add(item);
+        });
+
+        return ResponseHelper.buildResponse(result);
+    }
 
     //查询当前登录人权限经销商
     @TycloudOperation(ApiLevel = UserType.AGENCY)
@@ -432,6 +448,21 @@ public class JpStationController extends BaseController {
         return ResponseHelper.buildResponse(result);
     }
 
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+    @ApiOperation(httpMethod = "GET", value = "查询当前登录人权限经销商", notes = "查询当前登录人权限经销商")
+    @GetMapping(value = "/getDealerAll")
+    public ResponseModel<List<Map<String, String>>> getDealerAll(String regionalCompaniesCode) {
+        List<DropDown> list = jpStationMapper.getDealerAll(regionalCompaniesCode);
+        List<Map<String, String>> result = new ArrayList<>();
+        list.forEach(dropDown -> {
+            Map<String, String> item = new HashMap<>();
+            item.put("text", dropDown.getName());
+            item.put("value", dropDown.getOrgCode());
+            result.add(item);
+        });
+        return ResponseHelper.buildResponse(result);
+    }
+
     //电站发电量统计
 
     @TycloudOperation(ApiLevel = UserType.AGENCY)

amos-boot-system-jxiop/amos-boot-module-hygf-biz/src/main/java/com/yeejoin/amos/boot/module/hygf/biz/emqx/MaintenanceResultHandlerMessage.java

@@ -77,7 +77,7 @@ public class MaintenanceResultHandlerMessage extends EmqxListener {
             Long warningId = specialMap.containsKey("warningId") ? Long.valueOf(specialMap.get("warningId").toString()) : 0L;
             if(warningId>0){
                List<HYGFMaintenanceTickets> hygfMaintenanceTicketsList = hygfMaintenanceTicketsMapper.selectList(new QueryWrapper<HYGFMaintenanceTickets>().eq("warning_id", warningId).eq("handler_status","未处理"));
-                if (hygfMaintenanceTicketsList.size()>0) {
+                if (hygfMaintenanceTicketsList.size()==1) {
                     return;
                 }
             }
@@ -88,7 +88,7 @@ public class MaintenanceResultHandlerMessage extends EmqxListener {
                 jpStation = jpStationMapper.selectById(stationid);
             }
             TdHygfJpInverterWarn tdHygfJpInverterWarn = tdHygfJpInverterWarnMapper.getInverTerWarnByparams(warningId, sncode, stationid);
-//            hygfMaintenanceTickets.setHandlerStatus("未处理");
+            hygfMaintenanceTickets.setHandlerStatus("未处理");
             MaintenanceDto maintenance = maintenanceMapper.selectOneById(Long.valueOf(mantainancePersonId));
             hygfMaintenanceTickets.setStationId(stationid);
             hygfMaintenanceTickets.setWarningId(warningId);

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

@@ -88,10 +88,10 @@ public class MaintenanceServiceImpl extends BaseService<MaintenanceDto,Maintenan
      * 分页查询
      */
     public Page<MaintenanceDto> queryForMaintenancePage( int current,int size,String name, String maintenanceTypeCode,  String lockStatus, String reviewStatus,Long regionalCompaniesSeq, Long dealerId
-    ,String maintenanceType,String maintenanceAreaAddress)   {
+    ,String maintenanceType,String maintenanceAreaAddress,String regionalCompaniesCode, String dealerCode)   {
 
         PageHelper.startPage(current,  size);
-        List<MaintenanceDto> resultPage = maintenanceMapper.Maintenancepage( name,  maintenanceTypeCode,   lockStatus,  reviewStatus, regionalCompaniesSeq,  dealerId,maintenanceType,maintenanceAreaAddress);
+        List<MaintenanceDto> resultPage = maintenanceMapper.Maintenancepage( name,  maintenanceTypeCode,   lockStatus,  reviewStatus, regionalCompaniesSeq,  dealerId,maintenanceType,maintenanceAreaAddress,regionalCompaniesCode,dealerCode);
         PageInfo<MaintenanceDto> page = new PageInfo(resultPage);
         Page<MaintenanceDto> pagenew = new Page<MaintenanceDto>();
         pagenew.setCurrent(current);