From 57ce50108ffe8d85f9508529dbffea0c064c44a2 Mon Sep 17 00:00:00 2001
From: jiazx0107@163.com <jiazx0107@163.com>
Date: 星期四, 26 十月 2023 14:50:14 +0800
Subject: [PATCH] 四川省网关接口相关8
---
src/main/java/com/fzzy/protocol/sdkhk/package-info.java | 4 +
src/main/java/com/fzzy/gateway/GatewayUtils.java | 3 -
src/main/java/com/fzzy/gateway/hx2023/ScConstant.java | 2
src/main/java/com/fzzy/gateway/view/GatewayDevice.view.xml | 6 +
src/main/java/com/fzzy/protocol/weightyh/MessageConsumer.java | 4 -
src/main/java/com/fzzy/gateway/service/DeviceWeightServiceTest.java | 31 ++++++++++
src/main/java/com/fzzy/order/OrderServer.java | 1
src/main/java/com/fzzy/gateway/hx2023/data/WeightInfo.java | 5 -
src/main/java/com/fzzy/gateway/hx2023/service/HxGatewaySyncLprImpl1.java | 1
/dev/null | 44 --------------
src/main/java/com/fzzy/protocol/weightyh/package-info.java | 4 +
src/main/java/com/fzzy/gateway/hx2023/websocket/WebSocketDeviceReport.java | 10 +-
src/main/java/com/fzzy/gateway/hx2023/websocket/WebSocketDeviceLed.java | 5 -
src/main/java/com/fzzy/gateway/GatewayRunner.java | 4 -
src/main/java/com/fzzy/gateway/hx2023/service/DeviceReportServiceImpl.java | 22 ++++++
15 files changed, 75 insertions(+), 71 deletions(-)
diff --git a/src/main/java/com/fzzy/gateway/GatewayRunner.java b/src/main/java/com/fzzy/gateway/GatewayRunner.java
index 9597fee..c8da840 100644
--- a/src/main/java/com/fzzy/gateway/GatewayRunner.java
+++ b/src/main/java/com/fzzy/gateway/GatewayRunner.java
@@ -23,10 +23,6 @@
@Override
public void run(String... args) throws Exception {
log.info("缃戝叧鎺ュ彛闅忕郴缁熷惎鍔�------------");
-
-
- //鍥涘窛缃戝叧鎺ュ彛锛屽惎鍔ㄩ粯璁よ幏鍙栭壌鏉冧俊鎭紝闀挎湡鏈夋晥
- apiInitService.init();
}
}
diff --git a/src/main/java/com/fzzy/gateway/GatewayUtils.java b/src/main/java/com/fzzy/gateway/GatewayUtils.java
index 655af00..dbecd80 100644
--- a/src/main/java/com/fzzy/gateway/GatewayUtils.java
+++ b/src/main/java/com/fzzy/gateway/GatewayUtils.java
@@ -11,7 +11,6 @@
public class GatewayUtils {
-
/**
* 璁惧鍦ㄧ嚎鏍囪锛岄拡瀵筗EBSocket璇锋眰锛屾帶鍒惰澶囨槸鍚﹀湪绾匡紝key = deviceId锛孷alue=Y/N
*/
@@ -47,8 +46,6 @@
cacheMapDeviceId.remove(data.getDeviceId());
cacheMapDeviceSn.remove(data.getDeviceSn());
}
-
-
public static void updateOnline(String deviceId) {
contextOnlineMap.put(deviceId, "Y");
diff --git a/src/main/java/com/fzzy/gateway/hx2023/ScConstant.java b/src/main/java/com/fzzy/gateway/hx2023/ScConstant.java
index 7ca1516..7582ed4 100644
--- a/src/main/java/com/fzzy/gateway/hx2023/ScConstant.java
+++ b/src/main/java/com/fzzy/gateway/hx2023/ScConstant.java
@@ -8,5 +8,7 @@
public static String API_URL_AUTH = "${auth}/authorize/login";
+ public static String MESSAGE_TYPE_REPORT_PROPERTY = "REPORT_PROPERTY";
+
}
diff --git a/src/main/java/com/fzzy/gateway/hx2023/data/WeightInfo.java b/src/main/java/com/fzzy/gateway/hx2023/data/WeightInfo.java
index 331fd2e..c7db87b 100644
--- a/src/main/java/com/fzzy/gateway/hx2023/data/WeightInfo.java
+++ b/src/main/java/com/fzzy/gateway/hx2023/data/WeightInfo.java
@@ -8,10 +8,7 @@
@Data
public class WeightInfo {
-
- private String deviceId;
-
- private boolean exceed;
+ private boolean exceed = false;
private Double grossWeight;
diff --git a/src/main/java/com/fzzy/gateway/hx2023/service/DeviceReportServiceImpl.java b/src/main/java/com/fzzy/gateway/hx2023/service/DeviceReportServiceImpl.java
index 7f76daa..4cca0c6 100644
--- a/src/main/java/com/fzzy/gateway/hx2023/service/DeviceReportServiceImpl.java
+++ b/src/main/java/com/fzzy/gateway/hx2023/service/DeviceReportServiceImpl.java
@@ -1,11 +1,14 @@
package com.fzzy.gateway.hx2023.service;
+import com.alibaba.fastjson2.JSONObject;
import com.fzzy.api.data.GatewayProtocol;
import com.fzzy.api.data.PushProtocol;
import com.fzzy.gateway.api.DeviceReportService;
import com.fzzy.gateway.entity.GatewayDevice;
+import com.fzzy.gateway.hx2023.ScConstant;
import com.fzzy.gateway.hx2023.data.WebSocketPacket;
import com.fzzy.gateway.hx2023.data.WebSocketPacketHeader;
+import com.fzzy.gateway.hx2023.data.WeightInfo;
import com.fzzy.gateway.hx2023.websocket.WebSocketDeviceReport;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Component;
@@ -38,17 +41,32 @@
WebSocketPacket packet = new WebSocketPacket();
+ //productId鐨勫�煎湪webSocket鎵ц鍙戦�佹柟娉曚腑琛ュ厖
WebSocketPacketHeader header = new WebSocketPacketHeader();
header.setDeviceName(device.getDeviceName());
packet.setHeaders(header);
- packet.setMessageType("");
+ packet.setMessageType(ScConstant.MESSAGE_TYPE_REPORT_PROPERTY);
packet.setDeviceId(device.getDeviceId());
- packet.setProperties(null);
+
+ //璁剧疆淇℃伅涓讳綋
+ WeightInfo weightInfo = new WeightInfo();
+ weightInfo.setGrossWeight(weigh);
+ weightInfo.setNetWeight(weigh);
+ weightInfo.setNetWeight(weigh);
+
+ JSONObject jsonObject = new JSONObject();
+ jsonObject.put("weightInfo", JSONObject.toJSONString(weightInfo));
+
+ packet.setProperties(jsonObject);
+
packet.setTimestamp(System.currentTimeMillis());
webSocketDeviceReport.sendByPacket(packet);
+ }
+ if (GatewayProtocol.GATE_MQTT.equals(device.getPushProtocol())) {
+ //TODO ---->>>鍚庢湡娣诲姞鏀寔
}
return null;
diff --git a/src/main/java/com/fzzy/gateway/hx2023/service/HxGatewaySyncLprImpl1.java b/src/main/java/com/fzzy/gateway/hx2023/service/HxGatewaySyncLprImpl1.java
index 9b1e910..1cde1fb 100644
--- a/src/main/java/com/fzzy/gateway/hx2023/service/HxGatewaySyncLprImpl1.java
+++ b/src/main/java/com/fzzy/gateway/hx2023/service/HxGatewaySyncLprImpl1.java
@@ -1,6 +1,5 @@
package com.fzzy.gateway.hx2023.service;
-import com.fzzy.gateway.api.GatewaySyncLedService;
import com.fzzy.gateway.api.GatewaySyncLprService;
import com.fzzy.gateway.hx2023.data.LprData;
import com.fzzy.gateway.hx2023.data.SyncReqData;
diff --git a/src/main/java/com/fzzy/gateway/hx2023/service/HxGatewaySyncWeightImpl1.java b/src/main/java/com/fzzy/gateway/hx2023/service/HxGatewaySyncWeightImpl1.java
deleted file mode 100644
index c615730..0000000
--- a/src/main/java/com/fzzy/gateway/hx2023/service/HxGatewaySyncWeightImpl1.java
+++ /dev/null
@@ -1,44 +0,0 @@
-package com.fzzy.gateway.hx2023.service;
-
-import com.fzzy.api.data.GatewayDeviceProtocol;
-import com.fzzy.api.data.GatewayProtocol;
-import com.fzzy.api.utils.ContextUtil;
-import com.fzzy.gateway.api.GatewaySyncWeightService;
-import com.fzzy.gateway.entity.GatewayDevice;
-import com.fzzy.gateway.hx2023.data.*;
-import com.fzzy.gateway.hx2023.websocket.WebSocketDeviceReport;
-import com.fzzy.gateway.service.GatewayDeviceService;
-import lombok.Data;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.stereotype.Component;
-
-import javax.annotation.Resource;
-
-/**
- * 缃戝叧涓庤澶囦箣闂寸殑閫氳
- */
-@Slf4j
-@Data
-@Component
-public class HxGatewaySyncWeightImpl1 implements GatewaySyncWeightService {
-
-
- @Resource
- private GatewayDeviceService deviceService;
- @Resource
- private WebSocketDeviceReport webSocketDeviceReport;
-
-
- @Override
- public String getWeightProtocol() {
- return GatewayDeviceProtocol.DEVICE_WEIGHT_TCP_YH.getCode();
- }
-
- @Override
- public WeightInfo syncWeightInfo(SyncReqData reqData) {
-
- //doNothing
- return null;
- }
-
-}
diff --git a/src/main/java/com/fzzy/gateway/hx2023/websocket/WebSocketDeviceLed.java b/src/main/java/com/fzzy/gateway/hx2023/websocket/WebSocketDeviceLed.java
index a8d27d6..70bed3b 100644
--- a/src/main/java/com/fzzy/gateway/hx2023/websocket/WebSocketDeviceLed.java
+++ b/src/main/java/com/fzzy/gateway/hx2023/websocket/WebSocketDeviceLed.java
@@ -13,8 +13,9 @@
import java.util.Map;
import java.util.concurrent.ConcurrentHashMap;
+
/**
- *
+ * 缃戝叧鎺ュ彈绯荤粺鍙戦�佺殑鎶ユ枃淇℃伅
*/
@Slf4j
@Component
@@ -113,6 +114,4 @@
}
}
}
-
-
}
diff --git a/src/main/java/com/fzzy/gateway/hx2023/websocket/WebSocketDeviceReport.java b/src/main/java/com/fzzy/gateway/hx2023/websocket/WebSocketDeviceReport.java
index b886a61..8d7622a 100644
--- a/src/main/java/com/fzzy/gateway/hx2023/websocket/WebSocketDeviceReport.java
+++ b/src/main/java/com/fzzy/gateway/hx2023/websocket/WebSocketDeviceReport.java
@@ -2,7 +2,6 @@
import com.alibaba.fastjson.JSONObject;
import com.fzzy.gateway.GatewayUtils;
-import com.fzzy.gateway.hx2023.ScConstant;
import com.fzzy.gateway.hx2023.data.WebSocketPacket;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang.StringUtils;
@@ -15,7 +14,7 @@
import java.util.concurrent.ConcurrentHashMap;
/**
- *
+ * 璁惧鎭㈠淇℃伅鐨刉EBSOCKET
*/
@Slf4j
@Component
@@ -103,7 +102,6 @@
return;
}
-
String tag = packet.getDeviceId();
// 閬嶅巻鎺ㄩ��
@@ -115,10 +113,12 @@
packet.getHeaders().setProductId(productId);
+
+ log.debug("----------杩斿洖淇℃伅-----{}", packet);
+
if (key.indexOf(tag) != -1) {
session = sessionPool.get(key);
- session.getAsyncRemote().sendText(
- JSONObject.toJSONString(packet));
+ session.getAsyncRemote().sendText(JSONObject.toJSONString(packet));
}
}
}
diff --git a/src/main/java/com/fzzy/gateway/service/DeviceWeightServiceTest.java b/src/main/java/com/fzzy/gateway/service/DeviceWeightServiceTest.java
new file mode 100644
index 0000000..bff7ee5
--- /dev/null
+++ b/src/main/java/com/fzzy/gateway/service/DeviceWeightServiceTest.java
@@ -0,0 +1,31 @@
+package com.fzzy.gateway.service;
+
+
+import com.fzzy.api.data.GatewayDeviceProtocol;
+import com.fzzy.gateway.api.GatewaySyncWeightService;
+import com.fzzy.gateway.hx2023.data.SyncReqData;
+import com.fzzy.gateway.hx2023.data.WeightInfo;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Component;
+
+
+/**
+ * 璁惧榛樿鍗忚锛屼粈涔堥兘涓嶅仛
+ */
+@Slf4j
+@Component
+public class DeviceWeightServiceTest implements GatewaySyncWeightService {
+
+
+ @Override
+ public String getWeightProtocol() {
+ return GatewayDeviceProtocol.DEVICE_TEST.getCode();
+ }
+
+ @Override
+ public WeightInfo syncWeightInfo(SyncReqData reqData) {
+
+ log.info("----------DO NOTHING---------");
+ return null;
+ }
+}
diff --git a/src/main/java/com/fzzy/gateway/view/GatewayDevice.view.xml b/src/main/java/com/fzzy/gateway/view/GatewayDevice.view.xml
index 1d47410..5be2641 100644
--- a/src/main/java/com/fzzy/gateway/view/GatewayDevice.view.xml
+++ b/src/main/java/com/fzzy/gateway/view/GatewayDevice.view.xml
@@ -270,7 +270,11 @@
<Property name="property">password</Property>
<Editor/>
</AutoFormElement>
- <Control/>
+ <AutoFormElement>
+ <Property name="name">provinceProtocol</Property>
+ <Property name="property">provinceProtocol</Property>
+ <Editor/>
+ </AutoFormElement>
<AutoFormElement>
<Property name="name">pushProtocol</Property>
<Property name="property">pushProtocol</Property>
diff --git a/src/main/java/com/fzzy/order/OrderServer.java b/src/main/java/com/fzzy/order/OrderServer.java
index 8cf015d..3c45182 100644
--- a/src/main/java/com/fzzy/order/OrderServer.java
+++ b/src/main/java/com/fzzy/order/OrderServer.java
@@ -27,7 +27,6 @@
* @param req
* @return
*/
- @SuppressWarnings("unchecked")
@ResponseBody
@RequestMapping("/order")
public OrderResp order(@RequestBody OrderReq<JSONObject> req){
diff --git a/src/main/java/com/fzzy/protocol/sdkhk/package-info.java b/src/main/java/com/fzzy/protocol/sdkhk/package-info.java
new file mode 100644
index 0000000..e5aa280
--- /dev/null
+++ b/src/main/java/com/fzzy/protocol/sdkhk/package-info.java
@@ -0,0 +1,4 @@
+/**
+ * 閫氳繃SDK鑾峰彇娴峰悍鎽勫儚澶翠俊鎭�
+ */
+package com.fzzy.protocol.sdkhk;
\ No newline at end of file
diff --git a/src/main/java/com/fzzy/protocol/weightyh/MessageConsumer.java b/src/main/java/com/fzzy/protocol/weightyh/MessageConsumer.java
index 354596c..84020a0 100644
--- a/src/main/java/com/fzzy/protocol/weightyh/MessageConsumer.java
+++ b/src/main/java/com/fzzy/protocol/weightyh/MessageConsumer.java
@@ -3,10 +3,8 @@
import com.fzzy.api.utils.BytesUtil;
import com.fzzy.api.utils.SpringUtil;
import com.fzzy.gateway.GatewayUtils;
-import com.fzzy.gateway.api.DeviceReportService;
import com.fzzy.gateway.api.GatewayRemoteManager;
import com.fzzy.gateway.entity.GatewayDevice;
-import com.fzzy.gateway.hx2023.service.HxGatewaySyncWeightImpl1;
import com.ld.io.api.IoMsgConsumer;
import com.ld.io.api.IoSession;
import lombok.extern.slf4j.Slf4j;
@@ -48,7 +46,7 @@
timeTag = System.currentTimeMillis();
String temp = strMsg.substring(2, 4);
- String symbol = HexASCIIToConvert(temp);
+ //String symbol = HexASCIIToConvert(temp);
temp = strMsg.substring(4, 16);
String w = HexASCIIToConvert(temp);
temp = strMsg.substring(16, 18);
diff --git a/src/main/java/com/fzzy/protocol/weightyh/package-info.java b/src/main/java/com/fzzy/protocol/weightyh/package-info.java
new file mode 100644
index 0000000..4bdc8f4
--- /dev/null
+++ b/src/main/java/com/fzzy/protocol/weightyh/package-info.java
@@ -0,0 +1,4 @@
+/**
+ * 褰撳墠鍖呬负鑰�鍗庡崗璁浉鍏崇殑鍦扮閫氳繃TCP-IP鐨勯�氳鏂瑰紡鑾峰彇鍦扮閲嶉噺淇＄殑Server鏈嶅姟
+ */
+package com.fzzy.protocol.weightyh;
\ No newline at end of file
--
Gitblit v1.9.3