From 97c75a868e9fca03598dfa862bdd7ad94fd5fdcb Mon Sep 17 00:00:00 2001
From: jiazx0107@163.com <jiazx0107@163.com>
Date: 星期四, 09 十一月 2023 00:54:08 +0800
Subject: [PATCH] 调整MQTT
---
src/main/java/com/fzzy/gateway/service/GatewayDeviceService.java | 66 ++++++++++++++++++---------------
1 files changed, 36 insertions(+), 30 deletions(-)
diff --git a/src/main/java/com/fzzy/gateway/service/GatewayDeviceService.java b/src/main/java/com/fzzy/gateway/service/GatewayDeviceService.java
index 312a426..d571fc3 100644
--- a/src/main/java/com/fzzy/gateway/service/GatewayDeviceService.java
+++ b/src/main/java/com/fzzy/gateway/service/GatewayDeviceService.java
@@ -13,17 +13,20 @@
import com.fzzy.gateway.GatewayUtils;
import com.fzzy.gateway.api.DeviceReportService;
import com.fzzy.gateway.api.GatewayRemoteManager;
+import com.fzzy.gateway.data.BaseResp;
import com.fzzy.gateway.entity.GatewayDevice;
import com.fzzy.gateway.hx2023.ScConstant;
import com.fzzy.gateway.hx2023.data.*;
import com.fzzy.gateway.service.repository.GatewayDeviceRep;
+import com.fzzy.mqtt.MqttProviderConfig;
import com.fzzy.mqtt.MqttPublishService;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang.StringUtils;
import org.apache.commons.lang.time.DateFormatUtils;
import org.springframework.beans.BeanUtils;
+import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.data.domain.Sort;
import org.springframework.stereotype.Component;
@@ -47,6 +50,9 @@
private GatewayRemoteManager gatewayRemoteManager;
@Resource
private MqttPublishService mqttPublishService;
+ @Resource
+ private MqttProviderConfig providerClient;
+
/**
* gatewayDeviceService#listAll
*
@@ -67,7 +73,7 @@
public void updateSave(GatewayDevice data) {
GatewayDevice data2 = new GatewayDevice();
BeanUtils.copyProperties(data, data2);
-
+
if (null == data2.getDeviceSn()) {
if (null != data2.getIp()) {
data.setDeviceSn(data2.getIp());
@@ -77,10 +83,10 @@
}
if (null == data2.getId()) {
- data2.setId(ContextUtil.getUUID());
+ data2.setId(ContextUtil.getUUID());
gatewayDeviceRep.save(data2);
- }else{
- gatewayDeviceRep.save(data2);
+ } else {
+ gatewayDeviceRep.save(data2);
}
flushCache();
}
@@ -112,10 +118,6 @@
}
-
-
-
-
/**
* gatewayDeviceService#ajaxTestWeight
* 鍦扮鎺ㄩ�佹祴璇�
@@ -128,16 +130,16 @@
double weigh = (double) parameter.getWeight();
//double weigh = Double.parseDouble("3500.0");
List<GatewayDevice> devices = listAll();
- if(devices == null || devices.size()<= 0){
+ if (devices == null || devices.size() <= 0) {
return "娌℃湁璁惧";
}
- List<GatewayDevice> weights = devices.stream().filter(s ->(GatewayDeviceType.TYPE_01.getCode().equals(s.getType()))).collect(Collectors.toList());
- if(weights == null || weights.size()<= 0){
- return "娌℃湁鑾峰彇鍒板湴纾呰澶�";
- }
+ List<GatewayDevice> weights = devices.stream().filter(s -> (GatewayDeviceType.TYPE_01.getCode().equals(s.getType()))).collect(Collectors.toList());
+ if (weights == null || weights.size() <= 0) {
+ return "娌℃湁鑾峰彇鍒板湴纾呰澶�";
+ }
String topic = "/device/hx-weigh-big-01/91511424746940066Y001_91511424746940066Y0010000_002_004_002_001/message/property/report";
- for (GatewayDevice device: weights) {
+ for (GatewayDevice device : weights) {
WebSocketPacket packet = new WebSocketPacket();
@@ -163,7 +165,7 @@
packet.setTimestamp(System.currentTimeMillis());
- topic = "/device/"+header.getProductId()+"/"+device.getDeviceId()+"/message/property/report";
+ topic = "/device/" + header.getProductId() + "/" + device.getDeviceId() + "/message/property/report";
mqttPublishService.publishMsg(topic, JSON.toJSONString(packet));
}
return "SUCCESS";
@@ -172,6 +174,7 @@
/**
* gatewayDeviceService#ajaxTestLpr
* 鍦扮鎺ㄩ�佹祴璇�
+ *
* @return
*/
@Expose
@@ -179,16 +182,16 @@
//String carNumber = parameter.getCarNumber();
String carNumber = "宸滱12345";
List<GatewayDevice> devices = listAll();
- if(devices == null || devices.size()<= 0){
+ if (devices == null || devices.size() <= 0) {
return "娌℃湁璁惧";
}
- List<GatewayDevice> weights = devices.stream().filter(s ->(GatewayDeviceType.TYPE_02.getCode().equals(s.getType()))).collect(Collectors.toList());
- if(weights == null || weights.size()<= 0){
+ List<GatewayDevice> weights = devices.stream().filter(s -> (GatewayDeviceType.TYPE_02.getCode().equals(s.getType()))).collect(Collectors.toList());
+ if (weights == null || weights.size() <= 0) {
return "娌℃湁鑾峰彇鍒拌澶�";
}
String topic = "/device/hx-weigh-big-01/91511424746940066Y001_91511424746940066Y0010000_002_004_002_001/message/property/report";
- for (GatewayDevice device: weights) {
+ for (GatewayDevice device : weights) {
WebSocketPacket packet = new WebSocketPacket();
@@ -212,7 +215,7 @@
packet.setTimestamp(System.currentTimeMillis());
- topic = "/device/"+header.getProductId()+"/"+device.getDeviceId()+"/message/property/report";
+ topic = "/device/" + header.getProductId() + "/" + device.getDeviceId() + "/message/property/report";
mqttPublishService.publishMsg(topic, JSON.toJSONString(packet));
}
return "SUCCESS";
@@ -247,6 +250,9 @@
return this.pushByV40(list, start, end);
}
+
+
+
private String pushByV40(List<GatewayDevice> list, Date start, Date end) {
@@ -352,27 +358,27 @@
//鍒ゆ柇鏈�澶�
if (curTemp.equals(result.getMaxTemperature())) {
- result.setMaxX(x+"");
- result.setMaxY(y+"");
- result.setMaxZ(position+"");
+ result.setMaxX(x + "");
+ result.setMaxY(y + "");
+ result.setMaxZ(position + "");
}
//鍒ゆ柇鏈�灏�
if (curTemp.equals(result.getMinTemperature())) {
- result.setMinX(x+"");
- result.setMinY(y+"");
- result.setMinZ(position+"");
+ result.setMinX(x + "");
+ result.setMinY(y + "");
+ result.setMinZ(position + "");
}
- temperature.add(new KafkaGrainDataDetail1(cableNum + "", z + "", curTemp, position + "", x+"", y+""));
+ temperature.add(new KafkaGrainDataDetail1(cableNum + "", z + "", curTemp, position + "", x + "", y + ""));
}
//绮俯淇℃伅
JSONObject trhInfo = new JSONObject();
- // TRHInfo trhInfo = new TRHInfo();
- trhInfo.put("temperature",temperature);
+ // TRHInfo trhInfo = new TRHInfo();
+ trhInfo.put("temperature", temperature);
//浠撴俯搴︿俊鎭�
@@ -385,7 +391,7 @@
List<KafkaGrainTH> temperatureAndhumidity = new ArrayList<>();
temperatureAndhumidity.add(grainTH);
- trhInfo.put("temperatureAndhumidity",temperatureAndhumidity);
+ trhInfo.put("temperatureAndhumidity", temperatureAndhumidity);
//trhInfo.put("temperatureAndhumidity",grainTH);
JSONObject params = new JSONObject();
--
Gitblit v1.9.3