mqtt依赖包引入
This commit is contained in:
@@ -20,6 +20,10 @@
|
||||
</properties>
|
||||
|
||||
<dependencies>
|
||||
<dependency>
|
||||
<groupId>com.github.tocrhz</groupId>
|
||||
<artifactId>mqtt-spring-boot-starter</artifactId>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>com.njcn</groupId>
|
||||
<artifactId>common-web</artifactId>
|
||||
|
||||
@@ -3,18 +3,11 @@ package com.njcn.csharmonic.handler;
|
||||
import cn.hutool.core.collection.CollectionUtil;
|
||||
import com.alibaba.fastjson.JSONObject;
|
||||
import com.alibaba.nacos.shaded.com.google.gson.Gson;
|
||||
import com.fasterxml.jackson.core.JsonProcessingException;
|
||||
import com.github.tocrhz.mqtt.annotation.MqttSubscribe;
|
||||
import com.github.tocrhz.mqtt.annotation.NamedValue;
|
||||
import com.github.tocrhz.mqtt.annotation.Payload;
|
||||
import com.github.tocrhz.mqtt.publisher.MqttPublisher;
|
||||
import com.njcn.access.api.CsTopicFeignClient;
|
||||
import com.njcn.access.utils.ChannelObjectUtil;
|
||||
import com.njcn.access.utils.FileCommonUtils;
|
||||
import com.njcn.csdevice.api.DevCapacityFeignClient;
|
||||
import com.njcn.csdevice.api.DeviceFtpFeignClient;
|
||||
import com.njcn.csdevice.api.EquipmentFeignClient;
|
||||
import com.njcn.csdevice.pojo.vo.CsEquipmentDeliveryVO;
|
||||
import com.njcn.csharmonic.param.CommonStatisticalQueryParam;
|
||||
import com.njcn.csharmonic.param.FrequencyStatisticalQueryParam;
|
||||
import com.njcn.csharmonic.pojo.dto.RealTimeDataDTO;
|
||||
@@ -26,8 +19,6 @@ import com.njcn.csharmonic.service.ILineTargetService;
|
||||
import com.njcn.csharmonic.service.StableDataService;
|
||||
import com.njcn.csharmonic.service.TemperatureService;
|
||||
import com.njcn.influx.pojo.dto.StatisticalDataDTO;
|
||||
import com.njcn.oss.constant.OssPath;
|
||||
import com.njcn.redis.pojo.enums.AppRedisKey;
|
||||
import com.njcn.redis.utils.RedisUtil;
|
||||
import com.njcn.system.api.CsStatisticalSetFeignClient;
|
||||
import com.njcn.system.pojo.po.EleEpdPqd;
|
||||
@@ -56,25 +47,15 @@ import java.util.stream.Stream;
|
||||
public class MqttMessageHandler {
|
||||
|
||||
private final MqttPublisher publisher;
|
||||
private final FileCommonUtils fileCommonUtils;
|
||||
private final ILineTargetService lineTargetService;
|
||||
private final CsStatisticalSetFeignClient csStatisticalSetFeignClient;
|
||||
private final StableDataService stableDataService;
|
||||
|
||||
private final RedisUtil redisUtil;
|
||||
|
||||
private final TemperatureService temperatureService;
|
||||
|
||||
private final DevCapacityFeignClient devCapacityFeignClient;
|
||||
private final DecimalFormat df = new DecimalFormat("#0.000");
|
||||
private final ChannelObjectUtil channelObjectUtil;
|
||||
private final EquipmentFeignClient equipmentFeignClient;
|
||||
private final CsTopicFeignClient csTopicFeignClient;
|
||||
private final DeviceFtpFeignClient deviceFtpFeignClient;
|
||||
private static Integer mid = 1;
|
||||
private final FileFeignClient fileFeignClient;
|
||||
|
||||
CsEventPOService csEventPOService;
|
||||
private final CsEventPOService csEventPOService;
|
||||
|
||||
/**
|
||||
* 实时数据应答
|
||||
|
||||
@@ -72,6 +72,7 @@ import lombok.RequiredArgsConstructor;
|
||||
import lombok.extern.slf4j.Slf4j;
|
||||
import org.apache.commons.io.FilenameUtils;
|
||||
import org.apache.commons.lang.StringUtils;
|
||||
import org.apache.commons.lang3.ObjectUtils;
|
||||
import org.influxdb.InfluxDB;
|
||||
import org.influxdb.dto.BatchPoints;
|
||||
import org.influxdb.dto.Point;
|
||||
@@ -706,11 +707,23 @@ public class CsEventPOServiceImpl extends ServiceImpl<CsEventPOMapper, CsEventPO
|
||||
WaveDataDTO waveDataDTO = this.analyseWave(eventId, iType);
|
||||
//数据筛选,如果是双路电压的话,会存在2个波形数据
|
||||
List<WaveDataDetail> waveDataDetails = WaveUtil.filterWaveData(waveDataDTO);
|
||||
String instantPath = wavePicComponent.generateInstantImageZl(waveDataDetails);
|
||||
eventDetail.setInstantPics(instantPath);
|
||||
if (StrUtil.isBlank(eventDetail.getRmsPics())) {
|
||||
String rmsPath = wavePicComponent.generateRmsImageZl(waveDataDetails);
|
||||
eventDetail.setRmsPics(rmsPath);
|
||||
//单通道处理
|
||||
if (ObjectUtils.isNotEmpty(waveDataDetails) && waveDataDetails.size() == 2) {
|
||||
String instantPath = wavePicComponent.generateImageShun(waveDataDTO,waveDataDetails);
|
||||
eventDetail.setInstantPics(instantPath);
|
||||
if (StrUtil.isBlank(eventDetail.getRmsPics())) {
|
||||
String rmsPath = wavePicComponent.generateImageRms(waveDataDTO,waveDataDetails);
|
||||
eventDetail.setRmsPics(rmsPath);
|
||||
}
|
||||
}
|
||||
//双通道处理
|
||||
else if (ObjectUtils.isNotEmpty(waveDataDetails) && waveDataDetails.size() == 4) {
|
||||
String instantPath = wavePicComponent.generateInstantImageZl(waveDataDetails);
|
||||
eventDetail.setInstantPics(instantPath);
|
||||
if (StrUtil.isBlank(eventDetail.getRmsPics())) {
|
||||
String rmsPath = wavePicComponent.generateRmsImageZl(waveDataDetails);
|
||||
eventDetail.setRmsPics(rmsPath);
|
||||
}
|
||||
}
|
||||
this.updateById(eventDetail);
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user