Skip to content

A
amos-boot-biz
Commit 15f91b7b 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 f7b694c2 d5a75145
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 331 additions and 34 deletions
amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/java/com/yeejoin/amos/boot/module/hygf/api/dto/CommerceDto.java
View file @ 15f91b7b
......@@ -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 0 → 100644
View file @ 15f91b7b
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/UnitInformation.java
View file @ 15f91b7b
......@@ -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
View file @ 15f91b7b
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
View file @ 15f91b7b
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
View file @ 15f91b7b
......@@ -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
View file @ 15f91b7b
......@@ -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
View file @ 15f91b7b
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
View file @ 15f91b7b
......@@ -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
View file @ 15f91b7b
......@@ -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
View file @ 15f91b7b
......@@ -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/MonitoringServiceIMQTTmpl.java
View file @ 15f91b7b
......@@ -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() {
......
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