Merge branch 'developer' of http://39.98.45.134:8090/moa/amos-boot-biz into developer

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

@@ -13,6 +13,7 @@ import java.util.List;
  */
 @Data
 public class CommerceDto {
+    protected Long sequenceNbr;
     @ApiModelProperty(value = "统一信用代码")
     private String creditCode;
 
@@ -46,7 +47,7 @@ public class CommerceDto {
     }
 
     public void setBusinessLicensePhoto(String businessLicensePhoto) {
-        if(this.businessLicensePhoto!=null){
+        if(this.businessLicensePhoto!=null&&this.businessLicensePhotoUrl==null){
             List<FileDto> businessLicensePhotoUrl =new ArrayList<>();
             FileDto d=new FileDto(this.businessLicensePhoto);
             businessLicensePhotoUrl.add(d);
@@ -65,7 +66,7 @@ public class CommerceDto {
     }
 
     public void setLegalPersonCardPhotoFront(String legalPersonCardPhotoFront) {
-        if(this.legalPersonCardPhotoFront!=null){
+        if(this.legalPersonCardPhotoFront!=null&&this.legalPersonCardPhotoFrontUrl==null){
             List<FileDto> legalPersonCardPhotoFrontUrl =new ArrayList<>();
             FileDto d=new FileDto(this.legalPersonCardPhotoFront);
             legalPersonCardPhotoFrontUrl.add(d);
@@ -84,7 +85,7 @@ public class CommerceDto {
     }
 
     public void setLegalPersonCardPhotoBack(String legalPersonCardPhotoBack) {
-        if(this.legalPersonCardPhotoBack!=null){
+        if(this.legalPersonCardPhotoBack!=null&& this.legalPersonCardPhotoBackUrl==null){
             List<FileDto> legalPersonCardPhotoBackUrl =new ArrayList<>();
             FileDto d=new FileDto(this.legalPersonCardPhotoBack);
             legalPersonCardPhotoBackUrl.add(d);

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

+package com.yeejoin.amos.boot.module.hygf.api.dto;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import lombok.Data;
+
+import java.util.Collection;
+
+/**
+ * @description:
+ * @author: tw
+ * @createDate: 2023/9/4
+ */
+@Data
+public class CompanyDto extends Page<CompanyDto> {
+    private String companyName;
+    private String companyCode;
+    private String description;
+    private String levelName;
+    private String level;
+    private String address;
+    private String orgCode;
+    private String companyTypeName;
+    private String companyType;
+    private Long sequenceNbr;
+    private Long comid;
+}

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

@@ -18,4 +18,7 @@ public class FileDto {
 
         this.url = url;
     }
+
+    public FileDto() {
+    }
 }

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

@@ -69,8 +69,40 @@ public class UnitInformation {
     private List<Long> regionalCompaniesSeq;
 
 
+    public void setRegisterPcdCodeList(List<Integer> registerPcdCodeList) {
+        StringBuilder code=new StringBuilder();
+        if(registerPcdCodeList!=null&&!registerPcdCodeList.isEmpty()){
+            for (int i = 0, len = registerPcdCodeList.size(); i < len; i++) {
+                code.append(registerPcdCodeList.get(i).toString());
+                if(i != len-1) {
+                    code.append("-");
+                }
+            }
+
+        }
+
+        this.registerPcdCode =code!=null? code.toString():null;
+        this.registerPcdCodeList = registerPcdCodeList;
+    }
+
+    public void setWorkPcdCodeList(List<Integer> workPcdCodeList) {
+        StringBuilder code=new StringBuilder();
+        if(workPcdCodeList!=null&&!workPcdCodeList.isEmpty()){
+            for (int i = 0, len = workPcdCodeList.size(); i < len; i++) {
+                code.append(workPcdCodeList.get(i).toString());
+                if(i != len-1) {
+                    code.append("-");
+                }
+            }
+
+        }
+
+        this.workPcdCode = code!=null? code.toString():null;
+        this.workPcdCodeList = workPcdCodeList;
+    }
+
     public void setRegisterPcdCode(String registerPcdCode) {
-        if(this.registerPcdCode!=null){
+        if(this.registerPcdCode!=null&&this.registerPcdCodeList ==null){
         List<Integer> registerPcdCodeList =new ArrayList<>();
         String[] da=  registerPcdCode.split("-");
             for (String s : da) {
@@ -83,7 +115,7 @@ public class UnitInformation {
     }
 
     public void setWorkPcdCode(String workPcdCode) {
-        if(this.workPcdCode!=null){
+        if(this.workPcdCode!=null&&this.workPcdCodeList==null ){
             List<Integer> workPcdCodeList =new ArrayList<>();
             String[] da=  workPcdCode.split("-");
             for (String s : da) {
@@ -95,7 +127,7 @@ public class UnitInformation {
     }
 
     public void setHeadCardPhotoFront(String headCardPhotoFront) {
-        if(this.headCardPhotoFront!=null){
+        if(this.headCardPhotoFront!=null&&this.headCardPhotoFrontUrl==null){
             List<FileDto> headCardPhotoFrontUrl =new ArrayList<>();
             FileDto d=new FileDto(this.headCardPhotoFront);
             headCardPhotoFrontUrl.add(d);
@@ -105,7 +137,7 @@ public class UnitInformation {
     }
 
     public void setHeadCardPhotoBack(String headCardPhotoBack) {
-        if(this.headCardPhotoBack!=null){
+        if(this.headCardPhotoBack!=null&&this.headCardPhotoBackUrl==null){
             List<FileDto> headCardPhotoBackUrl =new ArrayList<>();
             FileDto d=new FileDto(this.headCardPhotoBack);
             headCardPhotoBackUrl.add(d);

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

 package com.yeejoin.amos.boot.module.hygf.api.mapper;
 
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.yeejoin.amos.boot.module.hygf.api.dto.CompanyDto;
 import com.yeejoin.amos.boot.module.hygf.api.entity.UnitInfo;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+import java.util.Map;
 
 /**
  * 经销商人员信息 Mapper 接口
@@ -11,4 +18,8 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
  */
 public interface UnitInfoMapper extends BaseMapper<UnitInfo> {
 
+  //获取单位分页列表 @Param("offset") long offset,  @Param("pageSize") long  pageSize,
+
+    IPage<CompanyDto> getCompanyDto(@Param("dto") CompanyDto dto);
+    Map<String,Integer> getCompanyDtoCount(@Param("dto")CompanyDto dto);
 }

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

 package com.yeejoin.amos.boot.module.hygf.api.service;
 
 
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.yeejoin.amos.boot.module.hygf.api.dto.CompanyDto;
 import com.yeejoin.amos.boot.module.hygf.api.dto.UnitRegisterDto;
 
 import java.util.Collection;
+import java.util.List;
 import java.util.Map;
 
 /**
@@ -34,6 +38,6 @@ public interface IUnitInfoService {
 
 
 
-
+    public IPage<CompanyDto> getCompanyDto( CompanyDto dto);
 
 }

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

@@ -2,4 +2,64 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.yeejoin.amos.boot.module.hygf.api.mapper.UnitInfoMapper">
 
+
+    <select id="getCompanyDto"  resultType="com.yeejoin.amos.boot.module.hygf.api.dto.CompanyDto">
+
+select
+  `SEQUENCE_NBR` sequenceNbr,
+  `COMPANY_NAME` companyName,
+  `COMPANY_CODE` companyCode,
+  `DESCRIPTION` description,
+  `ADDRESS` address,
+(select DICT_DATA_VALUE from systemctl_dictionarie_value where IS_DELETED=0 and AGENCY_CODE='JXIOP' and DICT_CODE='COMPANY_LEVEL' and privilege_company.`LEVEL`=systemctl_dictionarie_value.DICT_DATA_KEY )levelName,
+(select DICT_DATA_VALUE from systemctl_dictionarie_value where IS_DELETED=0 and AGENCY_CODE='JXIOP' and DICT_CODE='COMPANY_TYPE' and privilege_company.COMPANY_TYPE=systemctl_dictionarie_value.DICT_DATA_KEY) companyTypeName
+from  privilege_company  where IS_DELETED=0 and AGENCY_CODE='JXIOP'
+
+
+            <if test="dto.companyName!=null">
+             and privilege_company.COMPANY_NAME like concat(concat("%",#{dto.companyName}),"%")
+            </if>
+            <if test="dto.level!=null">
+                and privilege_company.LEVEL=#{dto.level}
+            </if>
+            <if test="dto.companyType!=null">
+                and privilege_company.COMPANY_TYPE=#{dto.companyType}
+            </if>
+            <if test="dto.orgCode!=null">
+                and privilege_company.ORG_CODE like concat(concat(#{dto.orgCode}),"%")
+            </if>
+            <if test="dto.comid!=null">
+                and privilege_company.SEQUENCE_NBR !=#{dto.comid}
+            </if>
+
+
+
+
+    </select>
+
+<!--    <select id="getCompanyDtoCount" resultType="Map">-->
+
+<!--select-->
+<!--count (*) num-->
+<!--  from  privilege_company  where IS_DELETED=0 and AGENCY_CODE='JXIOP'-->
+
+
+<!--            <if test="dto.companyName!=null">-->
+<!--                and privilege_company.COMPANY_NAME like concat(concat("%",#{dto.companyName}),"%")-->
+<!--            </if>-->
+<!--            <if test="dto.level!=null">-->
+<!--                and privilege_company.LEVEL=#{dto.level}-->
+<!--            </if>-->
+<!--            <if test="dto.companyType!=null">-->
+<!--                and privilege_company.COMPANY_TYPE=#{dto.companyType}-->
+<!--            </if>-->
+<!--            <if test="dto.orgCode!=null">-->
+<!--                and privilege_company.ORG_CODE like concat(concat(#{dto.orgCode}),"%")-->
+<!--            </if>-->
+
+
+
+
+<!--    </select>-->
+
 </mapper>

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

@@ -2,12 +2,14 @@ package com.yeejoin.amos.boot.module.hygf.biz.controller;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.github.pagehelper.PageInfo;
 import com.yeejoin.amos.boot.biz.common.utils.RedisUtils;
 import com.yeejoin.amos.boot.module.common.biz.utils.CommonResponseUtil;
 import com.yeejoin.amos.boot.module.hygf.api.dto.*;
 import com.yeejoin.amos.boot.module.hygf.api.entity.CommerceInfo;
 import com.yeejoin.amos.boot.module.hygf.api.entity.DealerReview;
+import com.yeejoin.amos.boot.module.hygf.api.entity.HouseholdContract;
 import com.yeejoin.amos.boot.module.hygf.api.entity.UnitInfo;
 import com.yeejoin.amos.boot.module.hygf.api.hwsms.SendSmsCode;
 import com.yeejoin.amos.boot.module.hygf.api.mapper.CommerceInfoMapper;
@@ -436,4 +438,45 @@ public class UnitInfoController extends BaseController {
         UnitDataDto unitDataDto = unitInfoServiceImpl.getUnitDataDto(companyM.getSequenceNbr());
         return  ResponseHelper.buildResponse(unitDataDto);
     }
+
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+    @PostMapping (value = "/updateUnitDataDto")
+    @ApiOperation(httpMethod = "POST", value = "修改单位信息", notes = "修改单位信息")
+    public ResponseModel<Boolean> updateUnitDataDto(@RequestBody UnitDataDto unitDataDto) {
+        return  ResponseHelper.buildResponse(unitInfoServiceImpl.updateUnitDataDto(unitDataDto));
+    }
+
+    //获取经销商组织机构
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+    @GetMapping(value = "/getUnit/tree")
+    @ApiOperation(httpMethod = "GET", value = "管辖机构树", notes = "管辖机构树")
+    public ResponseModel<List<CompanyModel>> unitTree() {
+        CompanyModel companyM = getUserInfo().getCompanys().get(0);
+
+        FeignClientResult<Collection<CompanyModel>> feignClientResult;
+        Collection<CompanyModel>  children=null;
+        try {
+            feignClientResult = Privilege.companyClient.querySubAgencyTree(companyM.getSequenceNbr());
+            children =  feignClientResult.getResult();
+
+        } catch (InnerInvokException e) {
+            e.printStackTrace();
+        }
+        companyM.setChildren(children);
+        List<CompanyModel> data=new ArrayList<>();
+        data.add(companyM);
+        return ResponseHelper.buildResponse(data);
+    }
+
+
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+    @GetMapping(value = "/getCompanyModelList")
+    @ApiOperation(httpMethod = "GET",value = "分页查询",  notes = "分页查询")
+    public ResponseModel<IPage<CompanyDto>> getCompanyModelList(CompanyDto dto) {
+
+        CompanyModel companyM = getUserInfo().getCompanys().get(0);
+        dto.setComid(companyM.getSequenceNbr());
+
+        return ResponseHelper.buildResponse(unitInfoServiceImpl.getCompanyDto(dto));
+    }
 }

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

 package com.yeejoin.amos.boot.module.hygf.biz.service.impl;
 
 import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.yeejoin.amos.boot.biz.common.constants.CommonConstant;
 import com.yeejoin.amos.boot.biz.common.entity.DataDictionary;
 import com.yeejoin.amos.boot.biz.common.utils.RedisKey;
@@ -33,6 +35,7 @@ import com.yeejoin.amos.feign.privilege.model.AgencyUserModel;
 import com.yeejoin.amos.feign.privilege.model.CompanyModel;
 import com.yeejoin.amos.feign.privilege.model.RoleModel;
 import com.yeejoin.amos.feign.systemctl.Systemctl;
+import com.yeejoin.amos.feign.systemctl.model.RegionModel;
 import com.yeejoin.amos.feign.systemctl.model.SmsRecordModel;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.BeanUtils;
@@ -87,6 +90,8 @@ public class UnitInfoServiceImpl extends BaseService<UnitInfoDto,UnitInfo,UnitIn
     UnitInfoMapper unitInfoMapper;
     @Autowired
     CommerceInfoMapper commerceInfoMapper;
+    @Autowired
+    RegionalCompaniesMapper regionalCompaniesMapper;
 
     @Autowired
     IDealerReviewService dealerReviewService;
@@ -447,6 +452,17 @@ public class UnitInfoServiceImpl extends BaseService<UnitInfoDto,UnitInfo,UnitIn
         return code;
     }
 
+    @Override
+    public IPage<CompanyDto> getCompanyDto(CompanyDto dto) {
+        //列表数据组装
+        IPage<CompanyDto> pag = unitInfoMapper.getCompanyDto( dto);
+//        List<CompanyDto> pag = unitInfoMapper.getCompanyDto( (page.getCurrent()-1)*page.getSize(),page.getSize(),dto);
+////        Map<String,Integer> count = unitInfoMapper.getCompanyDtoCount(dto);
+////        page.setTotal(count.get("num"));
+////        page.setRecords(pag);
+        return pag;
+    }
+
     //单位详情
     public UnitDataDto getUnitDataDto(Long id){
 
@@ -481,13 +497,107 @@ public class UnitInfoServiceImpl extends BaseService<UnitInfoDto,UnitInfo,UnitIn
 
 
 
+   @Transactional
+    public Boolean updateUnitDataDto(UnitDataDto unitDataDto){
+        //验证二维码
+        UnitInfo unitInfo=new UnitInfo();
+        unitInfo= unitInfoMapper.selectById(unitDataDto.getUnitInformation().getSequenceNbr());
+       UnitInformation unitInformation= unitDataDto.getUnitInformation();
+       JSONArray regionName = getRegionName();
+       List<RegionModel> list = JSONArray.parseArray(regionName.toJSONString(), RegionModel.class);
+           List<Integer> regist= unitInformation.getRegisterPcdCodeList();
+           List<Integer> workP= unitInformation.getWorkPcdCodeList();
+           //注册地址
+           if(regist!=null&&!regist.isEmpty()){
+               StringBuilder codenameRegi=new StringBuilder();
+               for (int i = 0, len = regist.size(); i < len; i++) {
+                   for (RegionModel regionModel : list) {
+                       if (regionModel.getRegionCode().intValue() == regist.get(i).intValue()) {
+                           codenameRegi.append(regionModel.getRegionName());
+                           if (i != len - 1) {
+                               codenameRegi.append("-");
+                           }
+//                           continue;
+                       }
+                   }
+               }
+               unitInformation.setRegisterPcd(codenameRegi!=null?codenameRegi.toString():null);
+           }
+
+           //办公地址
+           if(workP!=null&&!workP.isEmpty()){
+               StringBuilder codenamework= new StringBuilder();;
+                   for (int i = 0, len = workP.size(); i < len; i++) {
+                       for (RegionModel regionModel : list) {
+
+                       if (regionModel.getRegionCode().intValue() == workP.get(i).intValue()) {
+
+                           codenamework.append(regionModel.getRegionName());
+                           if (i != len - 1) {
+                               codenamework.append("-");
+                           }
+//                           continue;
+                       }
+
+                   }
+               }
+               unitInformation.setWorkPcd(codenamework!=null?codenamework.toString():null);
+           }
+
+
+       unitInformation.setHeadCardPhotoBackUrl(unitInformation.getHeadCardPhotoBackUrl());
+       unitInformation.setHeadCardPhotoFrontUrl(unitInformation.getHeadCardPhotoFrontUrl());
+       unitInformation.setRegisterPcdCodeList(unitInformation.getRegisterPcdCodeList());
+       unitInformation.setWorkPcdCodeList(unitInformation.getWorkPcdCodeList());
+       BeanUtils.copyProperties(unitInformation,unitInfo);
+        CommerceInfo commerceInfo=new  CommerceInfo();
+        commerceInfo= commerceInfoMapper.selectById(unitDataDto.getCommerceDto().getSequenceNbr());
+       CommerceDto commerceDto= unitDataDto.getCommerceDto();
+       commerceDto.setBusinessLicensePhotoUrl(commerceDto.getBusinessLicensePhotoUrl());
+       commerceDto.setLegalPersonCardPhotoBackUrl(commerceDto.getLegalPersonCardPhotoBackUrl());
+       commerceDto.setLegalPersonCardPhotoFrontUrl(commerceDto.getLegalPersonCardPhotoFrontUrl());
+        BeanUtils.copyProperties(commerceDto,commerceInfo);
 
+        unitInfoMapper.updateById(unitInfo);
 
+        commerceInfoMapper.updateById(commerceInfo);
 
+        return true;
+    }
 
 
 
 
+    public JSONArray getRegionName(){
+        JSONArray jsonArray = new JSONArray();
+        if (redisUtil.hasKey(regionRedis)) {
+            jsonArray= JSONArray.parseArray(redisUtil.get(regionRedis).toString());
+        }else {
+            Collection<RegionModel> regionChild = new ArrayList<>();
+            RegionModel regionModel1 = new RegionModel();
+            regionChild.add(regionModel1);
+            FeignClientResult<Collection<RegionModel>> collectionFeignClientResult = Systemctl.regionClient.queryForTreeParent(610000L);
+            Collection<RegionModel> result = collectionFeignClientResult.getResult();
+            for (RegionModel regionModel : result) {
+                if(null != regionModel && null != regionModel.getChildren()) {
+                    for (RegionModel child : regionModel.getChildren()) {
+                        if(null != child && null != child.getChildren()) {
+                            for (RegionModel childChild : child.getChildren()) {
+                                jsonArray.add(childChild);
+                            }
+                            child.setChildren(regionChild);
+                            jsonArray.add(child);
+                        }
+                    }
+                    regionModel.setChildren(regionChild);
+                    jsonArray.add(regionModel);
+                }
+            }
+
+            redisUtil.set(regionRedis,jsonArray);
+        }
+        return jsonArray;
+    }
 
 
 

amos-boot-system-jxiop/amos-boot-module-jxiop-monitor-biz/src/main/java/com/yeejoin/amos/boot/module/jxiop/biz/controller/MonitorFanIdxController.java

@@ -884,10 +884,11 @@ public class MonitorFanIdxController extends BaseController {
     public ResponseModel<ResultsData> getEventByEquipIndex(@RequestParam(value = "current") int current,
                                                            @RequestParam(value = "size") int size,
                                                            @RequestParam(value = "stationId") String stationId,
-                                                           @RequestParam(value = "equipIndex") String equipIndex) {
+                                                           @RequestParam(value = "equipIndex") String equipIndex,
+                                                           @RequestParam(value = "frontModule") String frontModule) {
         StationBasic stationBasic = stationBasicMapper.selectById(stationId);
         String gatewayId = stationBasic.getFanGatewayId();
-        ResultsData resultsData = equipAlarmEventService.getEventByEquipIndex(gatewayId, current, size, equipIndex);
+        ResultsData resultsData = equipAlarmEventService.getEventByEquipIndex(gatewayId, current, size, equipIndex, frontModule);
         return ResponseHelper.buildResponse(resultsData);
     }
 

amos-boot-system-jxiop/amos-boot-module-jxiop-monitor-biz/src/main/java/com/yeejoin/amos/boot/module/jxiop/biz/entity/EquipAlarmEvent.java

@@ -25,4 +25,9 @@ public class EquipAlarmEvent {
     private String equipName;
     @TableField("sort")
     private long sort;
+    /**
+     * 分类   逆变器、箱变、汇流箱
+     */
+    @TableField("frontModule")
+    private String frontModule;
 }

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

@@ -20,11 +20,12 @@ public class EquipAlarmEventServiceImpl extends BaseService<EquipAlarmEventDto,
     @Autowired
     EquipAlarmEventMapper equipAlarmEventMapper;
 
-   public ResultsData getEventByEquipIndex(String gatewayId, int current, int size, String equipIndex) {
+   public ResultsData getEventByEquipIndex(String gatewayId, int current, int size, String equipIndex, String frontModule) {
 
         LambdaQueryWrapper<EquipAlarmEvent> queryWrapper = new LambdaQueryWrapper<>();
         queryWrapper.eq(EquipAlarmEvent::getEquipIndex, equipIndex);
         queryWrapper.eq(EquipAlarmEvent::getGatewayId, gatewayId);
+        queryWrapper.eq(EquipAlarmEvent::getFrontModule, frontModule);
         queryWrapper.orderByDesc(EquipAlarmEvent::getCreatedTime);
         List<EquipAlarmEvent> equipAlarmEvents = equipAlarmEventMapper.selectList(queryWrapper);
 

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

@@ -885,7 +885,11 @@ public class MonitorFanIndicatorImpl implements IMonitorFanIndicator {
         List<Map<String, Object>> statusMaps = new ArrayList<>();
         for (IndicatorsDto listDatum : listData) {
             Map<String, Object> statusMap = new HashMap<>();
-            statusMap.put("title", listDatum.getValue().equals("") ? 0.00 : keepTwoDecimalPlaces(listDatum.getValue()) + " " + listDatum.getUnit() == null ? "" : keepTwoDecimalPlaces(listDatum.getValue()) + " " + listDatum.getUnit());
+            if (StringUtils.isEmpty(listDatum.getValue())) {
+                statusMap.put("title", 0.00 + (StringUtils.isNotEmpty(listDatum.getUnit()) ? listDatum.getUnit() : ""));
+            } else {
+                statusMap.put("title", keepTwoDecimalPlaces(listDatum.getValue()) + " " + (StringUtils.isNotEmpty(listDatum.getUnit()) ? listDatum.getUnit() : ""));
+            }
             statusMap.put("title1", listDatum.getDisplayName());
             statusMaps.add(statusMap);
         }
@@ -911,7 +915,7 @@ public class MonitorFanIndicatorImpl implements IMonitorFanIndicator {
             }
             List<IndicatorsDto> indicatorsDtos = collect.get(s);
             for (IndicatorsDto indicatorsDto : indicatorsDtos) {
-                if (indicatorsDto.getDisplayName().contains("合位")) {
+                if (indicatorsDto.getDisplayName().contains("断路器_合位")) {
                     statusMap.put("type", indicatorsDto.getValue());
                     statusMap.put("status", indicatorsDto.getValue().equals("false") ? "0" : "1");
                     statusMap.put("position", indicatorsDto.getDisplayName().split("_")[0] + "开关位置");
@@ -1730,6 +1734,7 @@ public class MonitorFanIndicatorImpl implements IMonitorFanIndicator {
 
 
     public void getListByNbq(String gatewayId, String werks, String stationId) {
+        HashMap<String,String> equipStatesMap = getPvNBQStationBy(gatewayId);
         String sql = " SELECT * FROM indicators_" + gatewayId + " WHERE equipmentIndexName ='总直流功率' and frontModule = '逆变器'";
         String sql1 = " SELECT * FROM indicators_" + gatewayId + " WHERE equipmentIndexName ='有功功率' and  frontModule = '逆变器'";
         List<IndicatorsDto> listData = influxDButils.getListData(sql, IndicatorsDto.class);
@@ -1755,6 +1760,7 @@ public class MonitorFanIndicatorImpl implements IMonitorFanIndicator {
             map.put("titie" + number, equipNum);
             map.put("value" + number,String.format("%.2f",Double.parseDouble(indicatorsDto.getValue())) );
             map.put("valueLabel" + number, String.format("%.2f",Double.parseDouble(indicatorsDto.getValueLabel())) );
+            map.put("state" + number,equipStatesMap.get(indicatorsDto.getEquipmentNumber()));
             maps.add(map);
         }
         List<Map<String, Object>> dataMaps = sjglZsjZsbtzServiceImpl.sjglZsjZsbtzMapper.getStationInfoMapByStationGFWerks(werks,"集电线");
@@ -1897,9 +1903,17 @@ public class MonitorFanIndicatorImpl implements IMonitorFanIndicator {
 //
 //        return numMap;
 
-        String sql = " SELECT * FROM indicators_" + gatewayId + " WHERE (equipmentIndexName ='待机' or equipmentIndexName ='故障停机' or equipmentIndexName ='告警运行' or equipmentIndexName ='限额运行' or equipmentIndexName ='停机') and value = 'true'";
-        List<IndicatorsDto> indicatorsDtoList = influxDButils.getListData(sql, IndicatorsDto.class);
+        String totalSql = "SELECT *  FROM indicators_" + gatewayId + " WHERE  frontModule = '逆变器' and equipmentIndexName = '运行'";
+        List<IndicatorsDto> totalEquipmentList = influxDButils.getListData(totalSql, IndicatorsDto.class);
+        // 逆变器总数量
+        Integer totalNumber = totalEquipmentList.size();
 
+        List<String> zcEquipmentNumberList = totalEquipmentList.stream().filter(t -> "true".equals(t.getValue())).map(IndicatorsDto::getEquipmentNumber).collect(Collectors.toList());
+//        List<String> equipmentNumberList = totalEquipmentList.stream().map(IndicatorsDto::getEquipmentNumber).collect(Collectors.toList());
+
+        String sql = " SELECT * FROM indicators_" + gatewayId + " WHERE (equipmentIndexName ='待机' or equipmentIndexName ='故障停机' or equipmentIndexName ='告警运行' or equipmentIndexName ='限额运行' or equipmentIndexName ='停机' or equipmentIndexName = '通讯故障' or equipmentIndexName = '降额运行') and value = 'true'";
+        List<IndicatorsDto> indicatorsDtoList = influxDButils.getListData(sql, IndicatorsDto.class);
+        List<String> equipmentNumberList = indicatorsDtoList.stream().map(IndicatorsDto::getEquipmentNumber).distinct().collect(Collectors.toList());
         int djNum = 0;
         int gzNum = 0;
         int gjNum = 0;
@@ -1908,55 +1922,45 @@ public class MonitorFanIndicatorImpl implements IMonitorFanIndicator {
         int txNum = 0;
         int tjNum = 0;
         int zcNum = 0;
-        Map<String, Object> numMap = new HashMap<>();
 
         Set<String> equipNum = new HashSet<>();
 
         for (IndicatorsDto indicatorsDto : indicatorsDtoList) {
+            if (equipmentNumberList.contains(indicatorsDto.getEquipmentNumber()) && !zcEquipmentNumberList.contains(indicatorsDto.getEquipmentNumber())) {
                 switch (indicatorsDto.getEquipmentIndexName()) {
                     case "待机":
                         djNum += 1;
+                        equipmentNumberList.remove(indicatorsDto.getEquipmentNumber());
                         break;
                     case "故障停机":
                         gzNum += 1;
+                        equipmentNumberList.remove(indicatorsDto.getEquipmentNumber());
                         break;
                     case "告警运行":
                         gjNum += 1;
+                        equipmentNumberList.remove(indicatorsDto.getEquipmentNumber());
                         break;
                     case "限额运行":
                         xeNum += 1;
+                        equipmentNumberList.remove(indicatorsDto.getEquipmentNumber());
                         equipNum.add(indicatorsDto.getEquipmentNumber());
                         break;
                     case "停机":
                         tjNum += 1;
+                        equipmentNumberList.remove(indicatorsDto.getEquipmentNumber());
                         break;
-            }
-        }
-
-        String xesql = " SELECT * FROM indicators_" + gatewayId + " WHERE equipmentIndexName ='限电运行' and frontModule = '逆变器' and value = 'true'";
-        List<IndicatorsDto> xeList = influxDButils.getListData(xesql, IndicatorsDto.class);
-        for (IndicatorsDto dto : xeList) {
-            if (!ValidationUtil.isEmpty(equipNum) && equipNum.contains(dto.getEquipmentNumber())) {
+                    case "通讯故障":
                         xdNum += 1;
+                        equipmentNumberList.remove(indicatorsDto.getEquipmentNumber());
+                        break;
+                    case "降额运行":
+                        txNum += 1;
+                        equipmentNumberList.remove(indicatorsDto.getEquipmentNumber());
+                        break;
                 }
             }
-
-        String querySql = " SELECT * FROM indicators_" + gatewayId + " where  equipmentIndexName ='运行'  and value = 'true'";
-        List<IndicatorsDto> queryList = influxDButils.getListData(querySql, IndicatorsDto.class);
-        if (!ValidationUtil.isEmpty(queryList)) {
-            List<String> collect = queryList.stream().map(IndicatorsDto::getEquipmentNumber).collect(Collectors.toList());
-            Set<String> strings = new HashSet<>(collect);
-            zcNum = collect.size() - strings.size();
-        }
-
-        String querySql1 = " SELECT * FROM indicators_" + gatewayId + " where   equipmentIndexName ='通讯异常'  and value = 'true'";
-        List<IndicatorsDto> queryList1 = influxDButils.getListData(querySql1, IndicatorsDto.class);
-        if (!ValidationUtil.isEmpty(queryList1)) {
-            List<String> collect1 = queryList.stream().map(IndicatorsDto::getEquipmentNumber).collect(Collectors.toList());
-            Set<String> strings1 = new HashSet<>(collect1);
-            txNum = collect1.size() - strings1.size();
         }
-
+        zcNum = totalNumber - djNum - gzNum - gjNum - xeNum - xdNum - txNum - tjNum;
         Page<Map<String, Object>> mapPage = new Page<>();
         ArrayList<Map<String, Object>> resultList = new ArrayList<>();
         HashMap<String, Object> map = new HashMap<>();
@@ -2068,9 +2072,34 @@ public class MonitorFanIndicatorImpl implements IMonitorFanIndicator {
         return deaviationRateDtoPage;
     }
 
-    public void addNbqAlarmEvent(String gatewayId) {
-        String sql = " SELECT * FROM indicators_" + gatewayId + " WHERE (equipmentIndexName ='待机' or equipmentIndexName ='停机' or equipmentIndexName ='告警运行' or equipmentIndexName ='限额运行' or equipmentIndexName ='降额运行' or equipmentIndexName ='故障停机'or equipmentIndexName ='通讯故障'or equipmentIndexName ='运行') and value = 'true'";
+
+    public void addNbqAlarmEvent() {
+
+        LambdaQueryWrapper<StationBasic> wrapper = new LambdaQueryWrapper<>();
+        wrapper.eq(BaseEntity::getIsDelete, false);
+        List<StationBasic> stationBasics = stationBasicMapper.selectList(wrapper);
+        for (StationBasic stationBasic : stationBasics) {
+            /**
+             * 逆变器
+             */
+            String sql = " SELECT * FROM indicators_" + stationBasic.getFanGatewayId() + " WHERE (equipmentIndexName ='待机' or equipmentIndexName ='停机' or equipmentIndexName ='告警运行' or equipmentIndexName ='限额运行' or equipmentIndexName ='降额运行' or equipmentIndexName ='故障停机'or equipmentIndexName ='通讯故障'or equipmentIndexName ='运行') and value = 'true'";
             List<IndicatorsDto> indicatorsDtoList = influxDButils.getListData(sql, IndicatorsDto.class);
+
+            /**
+             * 汇流箱
+             */
+            String sql2 = " SELECT * FROM indicators_" + stationBasic.getFanGatewayId() + " WHERE frontModule =~/.*汇流箱.*/ and dataType = 'state' ";
+            List<IndicatorsDto> indicatorsDtoListHLX = influxDButils.getListData(sql2, IndicatorsDto.class);
+
+            /**
+             * 箱变
+             */
+            String sql3 = " SELECT * FROM indicators_" + stationBasic.getFanGatewayId() + " WHERE frontModule =~/.*箱变.*/ and dataType = 'state' ";
+            List<IndicatorsDto> indicatorsDtoListXB = influxDButils.getListData(sql3, IndicatorsDto.class);
+
+            indicatorsDtoList.addAll(indicatorsDtoListHLX);
+            indicatorsDtoList.addAll(indicatorsDtoListXB);
+
             List<EquipAlarmEvent> newEquipAlarmEvents = new ArrayList<>();
             List<EquipAlarmEvent> newEquipAlarmEvent = new ArrayList<>();
             long time = new Date().getTime();
@@ -2079,25 +2108,41 @@ public class MonitorFanIndicatorImpl implements IMonitorFanIndicator {
                 equipAlarmEvent.setEquipIndex(indicatorsDto.getEquipmentNumber());
                 equipAlarmEvent.setAlarmDesc(AlarmDesc.getCode(indicatorsDto.getEquipmentIndexName()));
                 equipAlarmEvent.setCreatedTime(DateUtils.longStr2Date(indicatorsDto.getCreatedTime()));
-            equipAlarmEvent.setGatewayId(gatewayId);
+                equipAlarmEvent.setGatewayId(stationBasic.getFanGatewayId());
                 equipAlarmEvent.setSort(time);
+                equipAlarmEvent.setFrontModule(indicatorsDto.getFrontModule());
                 newEquipAlarmEvents.add(equipAlarmEvent);
                 newEquipAlarmEvent.add(equipAlarmEvent);
             }
 
-        String lastSort = equipAlarmEventMapper.getLastDataBySort(gatewayId);
-        if (null != lastSort ) {
-            List<EquipAlarmEvent> oldEquipAlarmEvents = equipAlarmEventMapper.getOldDataBySort(lastSort,gatewayId);
+            String lastSort = equipAlarmEventMapper.getLastDataBySort(stationBasic.getFanGatewayId());
+            if (null != lastSort) {
+                List<EquipAlarmEvent> oldEquipAlarmEvents = equipAlarmEventMapper.getOldDataBySort(lastSort, stationBasic.getFanGatewayId());
                 for (EquipAlarmEvent oldEquipAlarmEvent : oldEquipAlarmEvents) {
                     for (EquipAlarmEvent equipAlarmEvent : newEquipAlarmEvents) {
-                    if (oldEquipAlarmEvent.getEquipIndex().equals(equipAlarmEvent.getEquipIndex()) && oldEquipAlarmEvent.getAlarmDesc().equals(equipAlarmEvent.getAlarmDesc())){
+                        if (oldEquipAlarmEvent.getEquipIndex().equals(equipAlarmEvent.getEquipIndex()) && oldEquipAlarmEvent.getAlarmDesc().equals(equipAlarmEvent.getAlarmDesc())) {
                             newEquipAlarmEvent.remove(equipAlarmEvent);
                         }
                     }
                 }
             }
             equipAlarmEventService.saveBatch(newEquipAlarmEvent);
-    }
 
+        }
+    }
+    public HashMap<String,String> getPvNBQStationBy(String gatewayId){
+        HashMap<String,String> result =new HashMap<>();
+        String totalSql = "SELECT *  FROM indicators_" + gatewayId + " WHERE  frontModule = '逆变器' and equipmentIndexName = '运行'";
+        List<IndicatorsDto> totalEquipmentList = influxDButils.getListData(totalSql, IndicatorsDto.class);
+        totalEquipmentList.forEach(indicatorsDto -> result.put(indicatorsDto.getEquipmentNumber(),"正常运行"));
+        String sql = "SELECT * FROM indicators_" + gatewayId + " WHERE  frontModule='逆变器' and  value = 'true' and (equipmentIndexName ='运行' or equipmentIndexName ='待机' or equipmentIndexName ='故障停机' or equipmentIndexName ='告警运行' or equipmentIndexName ='限额运行' or equipmentIndexName ='停机' or equipmentIndexName = '通讯故障' or equipmentIndexName = '降额运行') ;";
+        List<IndicatorsDto> indicatorsDtoList = influxDButils.getListData(sql, IndicatorsDto.class);
+        indicatorsDtoList.forEach(indicatorsDto -> {
+            if(!"运行".equals(indicatorsDto.getEquipmentIndexName())){
+                result.put(indicatorsDto.getEquipmentNumber(),CommonConstans.pvStatus.get(indicatorsDto.getEquipmentIndexName()));
+            }
+        });
+        return result;
+    }
 }
 

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

@@ -271,27 +271,27 @@ public class MonitoringServiceIMQTTmpl {
     /**
      * 实时同送-获取各场站的风机列表
      */
-    @Scheduled(cron = fanStatusListCron)
-    public void getFanStatusList() {
-        List<StationBasic> stationBasicList = stationBasicMapper.selectList(new QueryWrapper<StationBasic>().isNotNull("sequence_nbr").eq("station_type", "FDZ"));
-        stationBasicList.forEach(stationBasic -> {
-            List<IndexDto> fanStatusList = monitorFanIndicator.getFanStatusList(String.valueOf(stationBasic.getSequenceNbr()));
-            Page<IndexDto> page = new Page<>(1, 999);
-            List<IndexDto> collect = fanStatusList.stream()
-                    .limit(999)
-                    .collect(Collectors.toList());
-            page.setTotal(fanStatusList.size());
-            page.setRecords(collect);
-            IPage<HashMap<String, String>> fanStatusListImages = getFanStatusListImages(collect);
-            try {
-                emqKeeper.getMqttClient().publish(stationBasic.getSequenceNbr() + "_fanStationFanStatusList_topic", JSON.toJSON(page).toString().getBytes("UTF-8"), 1, true);
-                emqKeeper.getMqttClient().publish(stationBasic.getSequenceNbr() + "_fanStationFanStatusListImages_topic", JSON.toJSON(fanStatusListImages).toString().getBytes("UTF-8"), 1, true);
-                logger.info("-----------------发送风电站风机列表数据消息=================== 成功！" + JSON.toJSONString(page));
-            } catch (Exception exception) {
-                logger.error("-----------------发送风电站风机列表数据消息=================== 失败！");
-            }
-        });
-    }
+//    @Scheduled(cron = fanStatusListCron)
+//    public void getFanStatusList() {
+//        List<StationBasic> stationBasicList = stationBasicMapper.selectList(new QueryWrapper<StationBasic>().isNotNull("sequence_nbr").eq("station_type", "FDZ"));
+//        stationBasicList.forEach(stationBasic -> {
+//            List<IndexDto> fanStatusList = monitorFanIndicator.getFanStatusList(String.valueOf(stationBasic.getSequenceNbr()));
+//            Page<IndexDto> page = new Page<>(1, 999);
+//            List<IndexDto> collect = fanStatusList.stream()
+//                    .limit(999)
+//                    .collect(Collectors.toList());
+//            page.setTotal(fanStatusList.size());
+//            page.setRecords(collect);
+//            IPage<HashMap<String, String>> fanStatusListImages = getFanStatusListImages(collect);
+//            try {
+//                emqKeeper.getMqttClient().publish(stationBasic.getSequenceNbr() + "_fanStationFanStatusList_topic", JSON.toJSON(page).toString().getBytes("UTF-8"), 1, true);
+//                emqKeeper.getMqttClient().publish(stationBasic.getSequenceNbr() + "_fanStationFanStatusListImages_topic", JSON.toJSON(fanStatusListImages).toString().getBytes("UTF-8"), 1, true);
+//                logger.info("-----------------发送风电站风机列表数据消息=================== 成功！" + JSON.toJSONString(page));
+//            } catch (Exception exception) {
+//                logger.error("-----------------发送风电站风机列表数据消息=================== 失败！");
+//            }
+//        });
+//    }
 
     @Scheduled(cron = fanCurrentDataCron)
     public void getFanCurrentData() {