Skip to content

A
amos-boot-biz
Commit d9577110 authored by chenzhao's avatar chenzhao
Browse files
Options

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

parents 419157fc 82674df3
Hide whitespace changes
Inline Side-by-side
Showing with 200 additions and 62 deletions
amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/java/com/yeejoin/amos/boot/module/hygf/api/dto/PersonnelBusinessDto.java
View file @ d9577110
package com.yeejoin.amos.boot.module.hygf.api.dto;
import com.baomidou.mybatisplus.annotation.TableField;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import com.yeejoin.amos.boot.biz.common.dto.BaseDto;
......@@ -33,20 +34,25 @@ public class PersonnelBusinessDto extends BaseDto {
@ApiModelProperty(value = "证书")
private String certificate;
@ApiModelProperty(value = "业务单位名称")
private String businessUnitName;
@ApiModelProperty(value = "业务单位id")
private Long businessUnitId;
/**
* 所属单位名称
*/
private String amosUnitName;
/**
* 所属单位id
*/
private Long amosUnitId;
/**
* 所属单位orgcode
*/
private String amosUnitOrgCode;
@ApiModelProperty(value = "业务经销商id")
private Long dealerId;
@ApiModelProperty(value = "平台经销商单位id")
private Long amosDealerId;
@ApiModelProperty(value = "平台经销商code")
private String amosDealerCode;
@ApiModelProperty(value = "用户基础表id")
private Long foundationId;
......
amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/java/com/yeejoin/amos/boot/module/hygf/api/dto/UnitInfoDto.java
View file @ d9577110
......@@ -97,6 +97,9 @@ public class UnitInfoDto extends BaseDto {
private String managementUnitId;
@ApiModelProperty(value = "单位code")
private String amosCompanyCode;
//所属区域公司id
private List<Long> regionalCompaniesSeq;
......
amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/java/com/yeejoin/amos/boot/module/hygf/api/entity/PersonnelBusiness.java
View file @ d9577110
......@@ -47,16 +47,21 @@ public class PersonnelBusiness extends BaseEntity {
private String certificate;
/**
* 业务单位名称
* 所属单位名称
*/
@TableField("business_unit_name")
private String businessUnitName;
@TableField("amos_unit_name")
private String amosUnitName;
/**
* 业务单位id
* 所属单位id
*/
@TableField("business_unit_id")
private Long businessUnitId;
@TableField("amos_unit_id")
private Long amosUnitId;
/**
* 所属单位orgcode
*/
@TableField("amos_unit_org_code")
private String amosUnitOrgCode;
/**
* 业务经销商id
......@@ -70,11 +75,6 @@ public class PersonnelBusiness extends BaseEntity {
@TableField("amos_dealer_id")
private Long amosDealerId;
/**
* 平台经销商code
*/
@TableField("amos_dealer_code")
private String amosDealerCode;
/**
* 用户基础表id
......
amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/java/com/yeejoin/amos/boot/module/hygf/api/entity/RegionalCompanies.java
View file @ d9577110
......@@ -46,4 +46,14 @@ public class RegionalCompanies extends BaseEntity {
@TableField("unit_id")
private Long unitId;
public RegionalCompanies(Long regionalCompaniesSeq, String regionalCompaniesName, String regionalCompaniesCode, Long unitId) {
this.regionalCompaniesSeq = regionalCompaniesSeq;
this.regionalCompaniesName = regionalCompaniesName;
this.regionalCompaniesCode = regionalCompaniesCode;
this.unitId = unitId;
}
public RegionalCompanies() {
}
}
amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/java/com/yeejoin/amos/boot/module/hygf/api/entity/UnitInfo.java
View file @ d9577110
......@@ -169,6 +169,10 @@ public class UnitInfo extends BaseEntity {
*/
@TableField("management_unit_id")
private String managementUnitId;
@TableField("amos_company_code")
private String amosCompanyCode;
/**
*是否加入黑名单
* */
......
amos-boot-system-jxiop/amos-boot-module-hygf-biz/src/main/java/com/yeejoin/amos/boot/module/hygf/biz/controller/UnitInfoController.java
View file @ d9577110
......@@ -7,12 +7,10 @@ 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.entity.*;
import com.yeejoin.amos.boot.module.hygf.api.hwsms.SendSmsCode;
import com.yeejoin.amos.boot.module.hygf.api.mapper.CommerceInfoMapper;
import com.yeejoin.amos.boot.module.hygf.api.mapper.RegionalCompaniesMapper;
import com.yeejoin.amos.boot.module.hygf.api.mapper.UnitInfoMapper;
import com.yeejoin.amos.boot.module.hygf.biz.service.impl.DealerReviewServiceImpl;
import com.yeejoin.amos.boot.module.standard.api.entity.PublicAgencyUser;
......@@ -79,7 +77,8 @@ public class UnitInfoController extends BaseController {
@Value("${regionalCompanies.company.seq}")
private Long regionalCompanies;
@Autowired
RegionalCompaniesMapper regionalCompaniesMapper;
@Autowired
SendSmsCode sendSmsCode;
......@@ -479,4 +478,40 @@ public class UnitInfoController extends BaseController {
return ResponseHelper.buildResponse(unitInfoServiceImpl.getCompanyDto(dto));
}
//获取经销商组织机构
@TycloudOperation(ApiLevel = UserType.AGENCY)
@GetMapping(value = "/getUnitTree")
@ApiOperation(httpMethod = "GET", value = "管辖机构树", notes = "管辖机构树")
public ResponseModel<Collection<CompanyModel>> getUnitTree() {
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();
}
return ResponseHelper.buildResponse(children);
}
@TycloudOperation(ApiLevel = UserType.AGENCY)
@GetMapping(value = "/getRegionalCompaniesTree")
@ApiOperation(httpMethod = "GET", value = "区域公司", notes = "区域公司")
public ResponseModel<List<RegionalCompanies>> getRegionalCompaniesTree() {
Long id=null;
LambdaQueryWrapper<RegionalCompanies> qu=new LambdaQueryWrapper<>();
qu.eq(RegionalCompanies::getUnitId,id);
List<RegionalCompanies> data= regionalCompaniesMapper.selectList(qu);
return ResponseHelper.buildResponse(data);
}
}
amos-boot-system-jxiop/amos-boot-module-hygf-biz/src/main/java/com/yeejoin/amos/boot/module/hygf/biz/service/impl/UnitInfoServiceImpl.java
View file @ d9577110
......@@ -20,13 +20,12 @@ import com.yeejoin.amos.boot.module.hygf.api.dto.*;
import com.yeejoin.amos.boot.module.hygf.api.entity.*;
import com.yeejoin.amos.boot.module.hygf.api.fegin.IdxFeginService;
import com.yeejoin.amos.boot.module.hygf.api.fegin.PrivilegeFeginService;
import com.yeejoin.amos.boot.module.hygf.api.mapper.CommerceInfoMapper;
import com.yeejoin.amos.boot.module.hygf.api.mapper.DealerReviewMapper;
import com.yeejoin.amos.boot.module.hygf.api.mapper.RegionalCompaniesMapper;
import com.yeejoin.amos.boot.module.hygf.api.mapper.UnitInfoMapper;
import com.yeejoin.amos.boot.module.hygf.api.mapper.*;
import com.yeejoin.amos.boot.module.hygf.api.service.IDealerReviewService;
import com.yeejoin.amos.boot.module.hygf.api.service.IRegionalCompaniesService;
import com.yeejoin.amos.boot.module.hygf.api.service.IUnitInfoService;
import com.yeejoin.amos.boot.module.standard.api.entity.PublicAgencyUser;
import com.yeejoin.amos.boot.module.standard.api.mapper.PublicAgencyUserMapper;
import com.yeejoin.amos.component.feign.config.TokenOperation;
import com.yeejoin.amos.component.feign.model.FeignClientResult;
import com.yeejoin.amos.component.robot.AmosRequestContext;
......@@ -92,12 +91,14 @@ public class UnitInfoServiceImpl extends BaseService<UnitInfoDto,UnitInfo,UnitIn
CommerceInfoMapper commerceInfoMapper;
@Autowired
RegionalCompaniesMapper regionalCompaniesMapper;
@Autowired
PublicAgencyUserMapper publicAgencyUserMapper;
@Autowired
IDealerReviewService dealerReviewService;
@Value("${hygf.user.group.id}")
private long userGroupId;
@Value("${regionalCompanies.company.seq}")
private Long regionalCompanies;
@Autowired
IdxFeginService idxFeginService;
private static final String regionRedis="app_region_redis";
......@@ -131,6 +132,8 @@ public class UnitInfoServiceImpl extends BaseService<UnitInfoDto,UnitInfo,UnitIn
@Value("${dealer.roleId}")
private String roleId;
@Autowired
PersonnelBusinessMapper personnelBusinessMapper;
/**
* 分页查询
*/
......@@ -181,6 +184,25 @@ public class UnitInfoServiceImpl extends BaseService<UnitInfoDto,UnitInfo,UnitIn
regionalCompany.setUnitId(commerceInfo.getSequenceNbr());
}
regionalCompaniesService.saveBatch(regionalCompanies);
//新增人员基础信息表
PersonnelBusiness re=new PersonnelBusiness();
PublicAgencyUser publicAgencyUser=new PublicAgencyUser();
publicAgencyUser.setAmosUserId(regUnitInfo.getAdminUserId());
publicAgencyUser.setAmosUserName(regUnitInfo.getAdminUserName());
publicAgencyUser.setRealName(regUnitInfo.getAdminLoginName());
publicAgencyUser.setRole("["+regUnitInfo.getRoleId()+"]");
publicAgencyUser.setEmergencyTelephone(regUnitInfo.getAdminPhone());
publicAgencyUserMapper.insert(publicAgencyUser);
re.setAmosDealerId(regUnitInfo.getAmosCompanySeq());
re.setAmosUnitId(regUnitInfo.getAmosCompanySeq());
re.setAmosUnitName(regUnitInfo.getName());
re.setAmosUnitOrgCode(regUnitInfo.getAmosCompanyCode());
re.setFoundationId(publicAgencyUser.getSequenceNbr());
personnelBusinessMapper.insert(re);
model.setCommerceInfoDto(commerceInfo);
model.setUnitInfoDto(regUnitInfo);
} catch (Exception e) {
......@@ -333,6 +355,7 @@ public class UnitInfoServiceImpl extends BaseService<UnitInfoDto,UnitInfo,UnitIn
// String[] userIds = { userResult.getResult().getUserId() };
regUnitInfo.setAdminUserId(userResult.getResult().getUserId());
regUnitInfo.setAmosCompanySeq(companyInfo.getSequenceNbr());
regUnitInfo.setAmosCompanyCode(companyInfo.getOrgCode());
List<String> userId = new ArrayList<>();
userId.add(userResult.getResult().getUserId());
// 将创建用户加入用户组
......@@ -517,7 +540,6 @@ public class UnitInfoServiceImpl extends BaseService<UnitInfoDto,UnitInfo,UnitIn
if (i != len - 1) {
codenameRegi.append("-");
}
// continue;
}
}
}
......@@ -529,22 +551,16 @@ public class UnitInfoServiceImpl extends BaseService<UnitInfoDto,UnitInfo,UnitIn
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());
......@@ -557,11 +573,30 @@ public class UnitInfoServiceImpl extends BaseService<UnitInfoDto,UnitInfo,UnitIn
commerceDto.setLegalPersonCardPhotoBackUrl(commerceDto.getLegalPersonCardPhotoBackUrl());
commerceDto.setLegalPersonCardPhotoFrontUrl(commerceDto.getLegalPersonCardPhotoFrontUrl());
BeanUtils.copyProperties(commerceDto,commerceInfo);
unitInfoMapper.updateById(unitInfo);
commerceInfoMapper.updateById(commerceInfo);
//区域公司
LambdaQueryWrapper<RegionalCompanies> qu=new LambdaQueryWrapper<>();
qu.eq(RegionalCompanies::getUnitId,unitInfo.getSequenceNbr());
regionalCompaniesMapper.delete(qu);
List<RegionalCompanies> regionalComp= new ArrayList<>();
FeignClientResult<Collection<CompanyModel>> feignClientResult= Privilege.companyClient.querySubAgencyTree(regionalCompanies);
List<CompanyModel> companyModel = (List<CompanyModel>)feignClientResult.getResult();
List<Long> lisd=unitInfo.getRegionalCompaniesSeq();
if(companyModel!=null&&!companyModel.isEmpty()&&lisd!=null&&!lisd.isEmpty()){
for (Long aLong : lisd) {
for (CompanyModel compan : companyModel) {
if(compan.getSequenceNbr().longValue()==aLong.longValue()){
RegionalCompanies re= new RegionalCompanies(aLong, compan.getCompanyName(), compan.getOrgCode(), unitInfo.getSequenceNbr());
regionalComp.add(re);
continue;
}
}
}
}
regionalCompaniesService.saveBatch(regionalComp);
return true;
}
......
amos-boot-system-jxiop/amos-boot-module-jxiop-bigscreen-biz/src/main/java/com/yeejoin/amos/boot/module/jxiop/biz/controller/MonitorFanIdxController.java
View file @ d9577110
......@@ -89,8 +89,6 @@ public class MonitorFanIdxController extends BaseController {
@Value("classpath:/json/overviewGF.json")
private Resource overviewGF;
@Autowired
CommonServiceImpl commonService;
@Value("${fan.statuts.stattuspath}")
private String fanStatusImagePathPrefix;
......@@ -234,18 +232,18 @@ public class MonitorFanIdxController extends BaseController {
Map<String, Object> columnMap = new HashMap<>();
for (String column : columnList) {
Double result = commonService.getTotalByIndicatior(gatewayId, column);
Double result = commonServiceImpl.getTotalByIndicatior(gatewayId, column);
columnMap.put(column, String.format("%.2f",result));
}
for (String column : columnLists) {
Double result = commonService.getAvgvalueByIndicatior(gatewayId, column);
Double result = commonServiceImpl.getAvgvalueByIndicatior(gatewayId, column);
columnMap.put(column, String.format("%.2f",result));
}
String num = monitorFanIndicator.getFJCount(gatewayId);
columnMap.put("风机台数",num);
Double capacityl = commonService.getStationCapactityByStationWerks(stationBasic.getStationNumber());
Double capacityl = commonServiceImpl.getStationCapactityByStationWerks(stationBasic.getStationNumber());
columnMap.put("装机容量",String.format("%.2f",capacityl));
String json = null;
......@@ -288,7 +286,7 @@ public class MonitorFanIdxController extends BaseController {
,@RequestParam(value = "areaCode", required = false)String areaCode) {
String gatewayId = "";
if (null != areaCode){
List<StationCacheInfoDto> listStationCacheInfoDto = commonService.getListStationCacheInfoDto();
List<StationCacheInfoDto> listStationCacheInfoDto = commonServiceImpl.getListStationCacheInfoDto();
List<String> collect = listStationCacheInfoDto.stream().filter(e -> e.getAreaCode().equals(areaCode)).map(StationCacheInfoDto::getFanGatewayId).collect(Collectors.toList());
gatewayId = String.join(",", collect);
}
......@@ -622,23 +620,23 @@ public class MonitorFanIdxController extends BaseController {
for (String column : columnList) {
Double result = commonService.getTotalByIndicatior(gatewayId, column);
Double result = commonServiceImpl.getTotalByIndicatior(gatewayId, column);
columnMap.put(column, String.format("%.2f",result));
}
for (String column : syLists) {
Double result = commonService.getNumByIndicatior(boosterGatewayId, column);
Double result = commonServiceImpl.getNumByIndicatior(boosterGatewayId, column);
columnMap.put(column, String.format("%.2f",result));
}
for (String column : columnLists) {
Double result = commonService.getAvgvalueByIndicatior(gatewayId, column);
Double result = commonServiceImpl.getAvgvalueByIndicatior(gatewayId, column);
columnMap.put(column, String.format("%.2f",result));
}
String num = monitorFanIndicator.getFJCount(gatewayId);
columnMap.put("逆变器台数",num);
Double capacityl = commonService.getStationCapactityByStationWerks(stationBasic.getStationNumber());
Double capacityl = commonServiceImpl.getStationCapactityByStationWerks(stationBasic.getStationNumber());
columnMap.put("装机容量",String.format("%.2f",capacityl));
String json = null;
......@@ -753,7 +751,7 @@ public class MonitorFanIdxController extends BaseController {
gatewayId = stationBasic.getBoosterGatewayId();
}
}
List<StationCacheInfoDto> list = commonService.getListStationCacheInfoDto();
List<StationCacheInfoDto> list = commonServiceImpl.getListStationCacheInfoDto();
double sum = 0.0;
sum =list.stream().filter(obj -> !ObjectUtils.isEmpty(obj.getInstalledCapacity())).mapToDouble(l->Double.parseDouble(l.getInstalledCapacity())).sum();
......@@ -935,9 +933,9 @@ public class MonitorFanIdxController extends BaseController {
public ResponseModel<IPage<Map<String,Object>>> operationData(@RequestParam(value = "areaCode", required = false)String areaCode) {
List<StationCacheInfoDto> list = commonService.getListStationCacheInfoDto();
List<StationCacheInfoDto> list = commonServiceImpl.getListStationCacheInfoDto();
if (null != areaCode){
list = list.stream().filter(e->e.getAreaCode().equals(areaCode)).collect(Collectors.toList());
list = list.stream().filter(e->e.getAreaCode().toUpperCase(Locale.ROOT).equals(areaCode.toUpperCase(Locale.ROOT))).collect(Collectors.toList());
}
List<Map<String,Object>> mapList = new ArrayList<>();
Map<String, List<StationCacheInfoDto>> listMap = list.stream().collect(Collectors.groupingBy(StationCacheInfoDto::getStationType, Collectors.toList()));
......@@ -974,7 +972,7 @@ public class MonitorFanIdxController extends BaseController {
map.put("gatewayId.keyword",collect);
}
List<? extends Terms.Bucket> lidate= commonService.getgroupsum(map,"valueDouble" ,"equipmentIndexName.keyword", ESEquipments.class);
List<? extends Terms.Bucket> lidate= commonServiceImpl.getgroupsum(map,"valueDouble" ,"equipmentIndexName.keyword", ESEquipments.class);
DecimalFormat format2 = new DecimalFormat("#.0000");
Double num = 0.00;
......@@ -988,7 +986,7 @@ public class MonitorFanIdxController extends BaseController {
}
}
}
return ResponseHelper.buildResponse(commonService.getSocialContributionDtoList(num));
return ResponseHelper.buildResponse(commonServiceImpl.getSocialContributionDtoList(num));
}
@TycloudOperation(needAuth = false, ApiLevel = UserType.AGENCY)
......@@ -1125,7 +1123,7 @@ public class MonitorFanIdxController extends BaseController {
@GetMapping("/accessSituation")
public ResponseModel<Map<String,Object>> accessSituation(){
Map<String, Object> map = new LinkedHashMap<>();
List<StationCacheInfoDto> list = commonService.getListStationCacheInfoDto();
List<StationCacheInfoDto> list = commonServiceImpl.getListStationCacheInfoDto();
double sum = list.stream().mapToDouble(l -> Double.parseDouble(l.getInstalledCapacity())).sum();
Map<String, List<StationCacheInfoDto>> listMap = list.stream().collect(Collectors.groupingBy(StationCacheInfoDto::getStationType, Collectors.toList()));
for (StationType value : StationType.values()) {
......@@ -1149,7 +1147,7 @@ public class MonitorFanIdxController extends BaseController {
@GetMapping("/qyAccessSituation")
public ResponseModel<Map<String,Object>> qyAccessSituation(){
Map<String, Object> map = new LinkedHashMap<>();
List<StationCacheInfoDto> list = commonService.getListStationCacheInfoDto();
List<StationCacheInfoDto> list = commonServiceImpl.getListStationCacheInfoDto();
Map<String, List<StationCacheInfoDto>> belongAreaList = list.stream().collect(Collectors.groupingBy(StationCacheInfoDto::getAreaCode));
for (String s : belongAreaList.keySet()) {
double sum = belongAreaList.get(s).stream().mapToDouble(l -> Double.parseDouble(l.getInstalledCapacity())).sum();
......
amos-boot-system-jxiop/amos-boot-module-jxiop-bigscreen-biz/src/main/java/com/yeejoin/amos/boot/module/jxiop/biz/service/impl/CommonServiceImpl.java
View file @ d9577110
......@@ -2,7 +2,12 @@ package com.yeejoin.amos.boot.module.jxiop.biz.service.impl;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.yeejoin.amos.boot.module.jxiop.api.entity.MapRegion;
import com.yeejoin.amos.boot.module.jxiop.api.entity.Region;
import com.yeejoin.amos.boot.module.jxiop.api.entity.StationBasic;
import com.yeejoin.amos.boot.module.jxiop.api.mapper.MapRegionMapper;
import com.yeejoin.amos.boot.module.jxiop.api.mapper.RegionMapper;
import com.yeejoin.amos.boot.module.jxiop.api.mapper.StationBasicMapper;
import com.yeejoin.amos.boot.module.jxiop.biz.ESDto.ESEquipments;
import com.yeejoin.amos.boot.module.jxiop.biz.dto.IndicatorsDto;
import com.yeejoin.amos.boot.module.jxiop.biz.dto.QueryDto;
......@@ -32,10 +37,12 @@ import org.springframework.data.redis.core.RedisTemplate;
import org.springframework.stereotype.Service;
import org.springframework.util.ObjectUtils;
import javax.annotation.Resource;
import java.util.ArrayList;
import java.util.List;
import java.util.Map;
import java.util.Objects;
import java.util.stream.Collectors;
@Service
public class CommonServiceImpl {
......@@ -55,6 +62,12 @@ public class CommonServiceImpl {
@Autowired
private ElasticsearchRestTemplate elasticsearchTemplate;
@Resource
private StationBasicMapper stationBasicMapper;
@Resource
private RegionMapper regionMapper;
@Resource
private MapRegionMapper mapRegionMapper;
/**
* @deprecated 获取指标值总和
......@@ -154,13 +167,36 @@ public class CommonServiceImpl {
List<StationCacheInfoDto> stationCacheInfoDtoList =redisTemplate.opsForList().range("station_info_cache",0,-1);
if(ObjectUtils.isEmpty(stationCacheInfoDtoList)){
try {
stationCacheDataInit.run();
stationCacheInfoDtoList =redisTemplate.opsForList().range("station_info_cache",0,-1);
List<StationCacheInfoDto> stationCacheInfoDtos = new ArrayList<>();
List<Region> regionList = regionMapper.selectList(new QueryWrapper<Region>().eq("LEVEL", 1));
List<MapRegion> mapRegionList = mapRegionMapper.selectList(new QueryWrapper<MapRegion>().isNotNull("name"));
List<StationBasic> stationBasicList = stationBasicMapper.selectList(new QueryWrapper<StationBasic>().isNotNull("belong_area").isNotNull("fan_gateway_id"));
stationBasicList.forEach(stationBasic -> {
StationCacheInfoDto stationCacheInfoDto = new StationCacheInfoDto();
stationCacheInfoDto.setStationId(stationBasic.getSequenceNbr().toString());
stationCacheInfoDto.setStationName(stationBasic.getStationName());
stationCacheInfoDto.setStationType(stationBasic.getStationType());
stationCacheInfoDto.setBelongProvince(regionList.stream().filter(region -> region.getRegionCode().toString().equals(stationBasic.getBelongArea().replace("[","").split(",")[0])).map(region -> region.getRegionName()).collect(Collectors.toList()).get(0));
stationCacheInfoDto.setBelongArea(mapRegionList.stream().filter(mapRegion -> mapRegion.getProvince().contains(stationCacheInfoDto.getBelongProvince().substring(0,2))||mapRegion.getProvince().contains(stationCacheInfoDto.getBelongProvince().substring(0,3))).map(mapRegion -> mapRegion.getName()).collect(Collectors.toList()).get(0));
stationCacheInfoDto.setAreaCode(mapRegionList.stream().filter(mapRegion -> mapRegion.getProvince().contains(stationCacheInfoDto.getBelongProvince().substring(0,2))||mapRegion.getProvince().contains(stationCacheInfoDto.getBelongProvince().substring(0,3))).map(mapRegion -> mapRegion.getAreaCode()).collect(Collectors.toList()).get(0));
stationCacheInfoDto.setInstalledCapacity(String.format("%.2f",sjglZsjZsbtzMapper.getStationCapactityByStationWerks(stationBasic.getStationNumber())));
List<QueryDto> queryDtoList = new ArrayList<>();
queryDtoList.add(new QueryDto("gatewayId",stationBasic.getFanGatewayId()));
queryDtoList.add(new QueryDto("equipmentIndexName.keyword","有功功率"));
if(!stationBasic.getStationType().equals("FDZ")){
queryDtoList.add(new QueryDto("frontModule","逆变器"));
}
stationCacheInfoDto.setEquipmentNumbers(this.getCount(queryDtoList,"equipmentNumber.Keyword", ESEquipments.class).toString());
stationCacheInfoDto.setFanGatewayId(stationBasic.getFanGatewayId());
stationCacheInfoDto.setBoosterGatewayId(stationBasic.getBoosterGatewayId());
stationCacheInfoDtos.add(stationCacheInfoDto);
});
redisTemplate.opsForList().leftPushAll("station_info_cache",stationCacheInfoDtos);
return stationCacheInfoDtos;
} catch (Exception e) {
throw new RuntimeException(e);
}
}
return stationCacheInfoDtoList;
}
......
amos-boot-system-jxiop/amos-boot-module-jxiop-monitor-biz/src/main/java/com/yeejoin/amos/boot/module/jxiop/biz/entity/EquipAlarmEvent.java
View file @ d9577110
package com.yeejoin.amos.boot.module.jxiop.biz.entity;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.yeejoin.amos.boot.biz.common.dto.BaseDto;
import com.yeejoin.amos.boot.biz.common.entity.BaseEntity;
import lombok.Data;
import lombok.experimental.Accessors;
......@@ -11,7 +15,7 @@ import java.util.Date;
@Accessors(chain = true)
@TableName("equip_alarm_event")
public class EquipAlarmEvent {
@TableField("sequence_nbr")
@TableId(value = "sequence_nbr", type = IdType.ID_WORKER)
private Long sequenceNumber;
@TableField("created_time")
private Date createdTime;
......@@ -30,4 +34,6 @@ public class EquipAlarmEvent {
*/
@TableField("frontModule")
private String frontModule;
@TableField("value")
private String value;
}
amos-boot-system-jxiop/amos-boot-module-jxiop-monitor-biz/src/main/java/com/yeejoin/amos/boot/module/jxiop/biz/service/impl/MonitorFanIndicatorImpl.java
View file @ d9577110
......@@ -2098,7 +2098,7 @@ public class MonitorFanIndicatorImpl implements IMonitorFanIndicator {
return deaviationRateDtoPage;
}
@Scheduled(cron = "0 */1 * * * ?")
public void addNbqAlarmEvent() {
LambdaQueryWrapper<StationBasic> wrapper = new LambdaQueryWrapper<>();
......@@ -2132,11 +2132,14 @@ public class MonitorFanIndicatorImpl implements IMonitorFanIndicator {
for (IndicatorsDto indicatorsDto : indicatorsDtoList) {
EquipAlarmEvent equipAlarmEvent = new EquipAlarmEvent();
equipAlarmEvent.setEquipIndex(indicatorsDto.getEquipmentNumber());
equipAlarmEvent.setEquipName(indicatorsDto.getEquipmentSpecificName());
equipAlarmEvent.setAlarmDesc(AlarmDesc.getCode(indicatorsDto.getEquipmentIndexName()));
equipAlarmEvent.setAlarmDesc(StringUtils.isEmpty(equipAlarmEvent.getAlarmDesc())? indicatorsDto.getEquipmentIndexName() : equipAlarmEvent.getAlarmDesc());
equipAlarmEvent.setCreatedTime(DateUtils.longStr2Date(indicatorsDto.getCreatedTime()));
equipAlarmEvent.setGatewayId(stationBasic.getFanGatewayId());
equipAlarmEvent.setSort(time);
equipAlarmEvent.setFrontModule(indicatorsDto.getFrontModule());
equipAlarmEvent.setValue(indicatorsDto.getValue());
newEquipAlarmEvents.add(equipAlarmEvent);
newEquipAlarmEvent.add(equipAlarmEvent);
}
......@@ -2146,7 +2149,9 @@ public class MonitorFanIndicatorImpl implements IMonitorFanIndicator {
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()) &&
oldEquipAlarmEvent.getValue().equals(equipAlarmEvent.getValue())) {
newEquipAlarmEvent.remove(equipAlarmEvent);
}
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment