From 93e01fa050330ead95041ed11cc85e9765c19fc1 Mon Sep 17 00:00:00 2001
From: vince <757871790@qq.com>
Date: 星期四, 09 十一月 2023 12:06:52 +0800
Subject: [PATCH] 手动测试
---
src/main/java/com/fzzy/gateway/service/GatewayDeviceService.java | 127 ++++++++++++++++++++++++++++++++----------
1 files changed, 96 insertions(+), 31 deletions(-)
diff --git a/src/main/java/com/fzzy/gateway/service/GatewayDeviceService.java b/src/main/java/com/fzzy/gateway/service/GatewayDeviceService.java
index 2fc86ac..cd59c8f 100644
--- a/src/main/java/com/fzzy/gateway/service/GatewayDeviceService.java
+++ b/src/main/java/com/fzzy/gateway/service/GatewayDeviceService.java
@@ -13,11 +13,13 @@
import com.fzzy.gateway.GatewayUtils;
import com.fzzy.gateway.api.DeviceReportService;
import com.fzzy.gateway.api.GatewayRemoteManager;
+import com.fzzy.gateway.entity.GateWayTestParam;
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;
@@ -29,10 +31,7 @@
import javax.annotation.Resource;
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
import java.util.stream.Collectors;
@Slf4j
@@ -47,6 +46,9 @@
private GatewayRemoteManager gatewayRemoteManager;
@Resource
private MqttPublishService mqttPublishService;
+ @Resource
+ private MqttProviderConfig providerClient;
+
/**
* gatewayDeviceService#listAll
*
@@ -57,7 +59,20 @@
Sort sort = new Sort(Sort.Direction.ASC, "deviceId");
return gatewayDeviceRep.findAll(sort);
}
-
+ /**
+ * gatewayDeviceService#getQuery
+ * @return
+ */
+ @DataProvider
+ public GateWayTestParam getQuery() {
+ GateWayTestParam param = new GateWayTestParam();
+ param.setDayTime(new Date());
+ param.setCarNumber("宸滱12345");
+ param.setEnd(new Date());
+ param.setStart(new Date());
+ param.setWeight(25000.00);
+ return param;
+ }
/**
* gatewayDeviceService#updateSave
*
@@ -67,7 +82,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 +92,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,7 +127,6 @@
}
-
/**
* gatewayDeviceService#ajaxTestWeight
* 鍦扮鎺ㄩ�佹祴璇�
@@ -121,20 +135,20 @@
* @return
*/
@Expose
- public String ajaxTestWeight() {
- //double weigh = (double) parameter.get("weight");
- double weigh = Double.parseDouble("3500.0");
+ public String ajaxTestWeight(Map<String ,Object> parameter) {
+ double weigh = (double) parameter.get("weight");
+ //sdouble weigh = Math.random() * (35000 - 16000 + 1) + 16000;
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();
@@ -160,13 +174,61 @@
packet.setTimestamp(System.currentTimeMillis());
- topic = "/device/hx-weigh-big-01/"+device.getDeviceId()+"/message/property/report";
+ topic = "/device/" + header.getProductId() + "/" + device.getDeviceId() + "/message/property/report";
mqttPublishService.publishMsg(topic, JSON.toJSONString(packet));
}
return "SUCCESS";
}
+ /**
+ * gatewayDeviceService#ajaxTestLpr
+ * 鍦扮鎺ㄩ�佹祴璇�
+ *
+ * @return
+ */
+ @Expose
+ public String ajaxTestLpr(Map<String ,Object> parameter) {
+ String carNumber = (String) parameter.get("carNumber");
+ //String carNumber = "宸滱12345";
+ List<GatewayDevice> devices = listAll();
+ 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) {
+ return "娌℃湁鑾峰彇鍒拌澶�";
+ }
+ String topic = "/device/hx-weigh-big-01/91511424746940066Y001_91511424746940066Y0010000_002_004_002_001/message/property/report";
+ for (GatewayDevice device : weights) {
+
+ WebSocketPacket packet = new WebSocketPacket();
+
+ //productId鐨勫�煎湪webSocket鎵ц鍙戦�佹柟娉曚腑琛ュ厖
+ WebSocketPacketHeader header = new WebSocketPacketHeader();
+ header.setDeviceName(device.getDeviceName());
+ header.setProductId("hx-catch-01");
+ //header.set
+ packet.setHeaders(header);
+ packet.setMessageType(ScConstant.MESSAGE_TYPE_REPORT_PROPERTY);
+ packet.setDeviceId(device.getDeviceId());
+ packet.setMessageId(System.currentTimeMillis() + "");
+ //璁剧疆淇℃伅涓讳綋
+ LprData lpr = new LprData();
+ lpr.setDeviceId(device.getDeviceId());
+ lpr.setCarNumber(carNumber);
+ JSONObject jsonObject = new JSONObject();
+ jsonObject.put("carNumber", carNumber);
+ jsonObject.put("position", "big");
+ packet.setProperties(jsonObject);
+
+ packet.setTimestamp(System.currentTimeMillis());
+
+ topic = "/device/" + header.getProductId() + "/" + device.getDeviceId() + "/message/property/report";
+ mqttPublishService.publishMsg(topic, JSON.toJSONString(packet));
+ }
+ return "SUCCESS";
+ }
/**
* gatewayDeviceService#ajaxTestGrain
@@ -176,7 +238,7 @@
* @return
*/
@Expose
- public String ajaxTestGrain(Map<String, Object> parameter) {
+ public String ajaxTestGrain(Map<String ,Object> parameter) {
//鑾峰彇璁惧閰嶇疆锛屽彧閽堝绮儏璁惧杩涜鎵ц
@@ -197,6 +259,9 @@
return this.pushByV40(list, start, end);
}
+
+
+
private String pushByV40(List<GatewayDevice> list, Date start, Date end) {
@@ -302,27 +367,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);
//浠撴俯搴︿俊鎭�
@@ -335,7 +400,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