From 96f7af2f3bf9a36dd48e0e6bf4f8a8ca1e31ed7d Mon Sep 17 00:00:00 2001
From: vince <757871790@qq.com>
Date: 星期三, 08 十一月 2023 17:49:56 +0800
Subject: [PATCH] Merge remote-tracking branch 'orgin/igds-api-gateway' into igds-api-gateway
---
src/main/java/com/fzzy/gateway/service/GatewayDeviceService.java | 105 ++++++++++++++++++++++++++++++++++++++--------------
1 files changed, 77 insertions(+), 28 deletions(-)
diff --git a/src/main/java/com/fzzy/gateway/service/GatewayDeviceService.java b/src/main/java/com/fzzy/gateway/service/GatewayDeviceService.java
index 438b8d3..312a426 100644
--- a/src/main/java/com/fzzy/gateway/service/GatewayDeviceService.java
+++ b/src/main/java/com/fzzy/gateway/service/GatewayDeviceService.java
@@ -1,5 +1,6 @@
package com.fzzy.gateway.service;
+import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson2.JSONObject;
import com.bstek.dorado.annotation.DataProvider;
import com.bstek.dorado.annotation.DataResolver;
@@ -15,9 +16,9 @@
import com.fzzy.gateway.entity.GatewayDevice;
import com.fzzy.gateway.hx2023.ScConstant;
import com.fzzy.gateway.hx2023.data.*;
-import com.fzzy.gateway.hx2023.websocket.WebSocketDeviceReport;
import com.fzzy.gateway.service.repository.GatewayDeviceRep;
+import com.fzzy.mqtt.MqttPublishService;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang.StringUtils;
@@ -45,7 +46,7 @@
@Resource
private GatewayRemoteManager gatewayRemoteManager;
@Resource
- private WebSocketDeviceReport webSocketDeviceReport;
+ private MqttPublishService mqttPublishService;
/**
* gatewayDeviceService#listAll
*
@@ -60,28 +61,27 @@
/**
* gatewayDeviceService#updateSave
*
- * @param entity
+ * @param data
*/
@DataResolver
- public void updateSave(GatewayDevice entity) {
- GatewayDevice data = new GatewayDevice();
- BeanUtils.copyProperties(entity, data);
-
- if (null == data.getId()) {
- data.setId(ContextUtil.getUUID());
- }
-
-
- if (null == data.getDeviceSn()) {
- if (null != entity.getIp()) {
- data.setDeviceSn(entity.getIp());
+ 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());
} else {
- data.setDeviceSn(data.getDeviceId());
+ data.setDeviceSn(data2.getDeviceId());
}
}
- gatewayDeviceRep.save(data);
-
+ if (null == data2.getId()) {
+ data2.setId(ContextUtil.getUUID());
+ gatewayDeviceRep.save(data2);
+ }else{
+ gatewayDeviceRep.save(data2);
+ }
flushCache();
}
@@ -103,10 +103,6 @@
}
- /**
- * gatewayDeviceService#flushCache
- */
- @Expose
public void flushCache() {
List<GatewayDevice> list = listAll();
if (null == list || list.isEmpty()) return;
@@ -114,6 +110,9 @@
GatewayUtils.add2Cache(device);
}
}
+
+
+
@@ -125,8 +124,9 @@
* @return
*/
@Expose
- public String ajaxTestWeight(Map<String, Object> parameter) {
- double weigh = (double) parameter.get("weight");
+ public String ajaxTestWeight(GateWayTestParam parameter) {
+ double weigh = (double) parameter.getWeight();
+ //double weigh = Double.parseDouble("3500.0");
List<GatewayDevice> devices = listAll();
if(devices == null || devices.size()<= 0){
return "娌℃湁璁惧";
@@ -135,6 +135,8 @@
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();
@@ -161,13 +163,60 @@
packet.setTimestamp(System.currentTimeMillis());
-
- webSocketDeviceReport.sendByPacket(packet);
+ topic = "/device/"+header.getProductId()+"/"+device.getDeviceId()+"/message/property/report";
+ mqttPublishService.publishMsg(topic, JSON.toJSONString(packet));
}
return "SUCCESS";
}
+ /**
+ * gatewayDeviceService#ajaxTestLpr
+ * 鍦扮鎺ㄩ�佹祴璇�
+ * @return
+ */
+ @Expose
+ public String ajaxTestLpr() {
+ //String carNumber = parameter.getCarNumber();
+ 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());
+
+ //璁剧疆淇℃伅涓讳綋
+ 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
@@ -177,7 +226,7 @@
* @return
*/
@Expose
- public String ajaxTestGrain(Map<String, Object> parameter) {
+ public String ajaxTestGrain(GateWayTestParam parameter) {
//鑾峰彇璁惧閰嶇疆锛屽彧閽堝绮儏璁惧杩涜鎵ц
@@ -187,7 +236,7 @@
return "ERROR锛氫负鑾峰彇鍒扮郴缁熶腑璁惧閰嶇疆锛屽彇娑堟墽琛�";
}
- Date dayTime = (Date) parameter.get("dayTime");
+ Date dayTime = (Date) parameter.getDayTime();
if (null == dayTime) dayTime = new Date();
Date start = DateUtil.getCurZero(dayTime);
--
Gitblit v1.9.3