From 04a01be7461dc8ba86f4295599e13c74827cff6b Mon Sep 17 00:00:00 2001
From: jiazx0107@163.com <jiazx0107@163.com>
Date: 星期五, 10 十一月 2023 12:08:35 +0800
Subject: [PATCH] 修复路径BUG
---
src/main/java/com/fzzy/gateway/api/GatewayDeviceReportService.java | 13 --
src/main/java/com/fzzy/protocol/sdkhk/common/Alarm.java | 163 ++++++++++++++++++++--------------------
src/main/java/com/fzzy/mqtt/MqttProviderConfig.java | 1
src/main/java/com/fzzy/protocol/weightyh/MessageConsumer.java | 16 +++-
src/main/java/com/fzzy/gateway/hx2023/service/DeviceReportServiceImpl.java | 16 ---
5 files changed, 97 insertions(+), 112 deletions(-)
diff --git a/src/main/java/com/fzzy/gateway/api/GatewayDeviceReportService.java b/src/main/java/com/fzzy/gateway/api/GatewayDeviceReportService.java
index fd4ded3..477db5f 100644
--- a/src/main/java/com/fzzy/gateway/api/GatewayDeviceReportService.java
+++ b/src/main/java/com/fzzy/gateway/api/GatewayDeviceReportService.java
@@ -7,7 +7,7 @@
/**
- * 涓婃姤鎺ュ彛
+ * 璁惧鏁版嵁涓婃姤
*/
public interface GatewayDeviceReportService {
@@ -18,18 +18,9 @@
*/
String getProtocol();
-
- /**
- * 閫氳繃璁惧搴忓垪鍙疯繑鍥炵粨鏋滀俊鎭�
- *
- * @param weigh
- * @param device 璁惧搴忓垪鍙�
- */
- String report2GatewayBySn(double weigh, GatewayDevice device);
-
-
/**
* 鎺ㄩ�佺伯鎯呬俊鎭�
+ *
* @param reqData
*/
BaseResp reportGrainData(BaseReqData reqData);
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 f91b0b8..6521ac0 100644
--- a/src/main/java/com/fzzy/gateway/hx2023/service/DeviceReportServiceImpl.java
+++ b/src/main/java/com/fzzy/gateway/hx2023/service/DeviceReportServiceImpl.java
@@ -28,18 +28,6 @@
}
@Override
- public String report2GatewayBySn(double weigh, GatewayDevice device) {
-
- if (null == device) {
- log.error("-----------娌℃湁鑾峰彇鍒拌澶囬厤缃俊鎭�-----");
- return "ERROR:娌℃湁鑾峰彇鍒拌澶囬厤缃俊鎭�";
- }
-
-
- return null;
- }
-
- @Override
public BaseResp reportGrainData(BaseReqData reqData) {
String topic = ScConstant.TOPIC_REPORT;
@@ -59,7 +47,7 @@
String topic = ScConstant.TOPIC_MESSAGE_REPORT;
- topic = topic.replace("${productId}", reqData.getProductId()).replace("{deviceId}", reqData.getDeviceId());
+ topic = topic.replace("${productId}", reqData.getProductId()).replace("${deviceId}", reqData.getDeviceId());
publishService.publishMqttWithTopic(reqData.getData(), topic);
@@ -72,7 +60,7 @@
@Override
public BaseResp reportLprData(BaseReqData reqData) {
String topic = ScConstant.TOPIC_MESSAGE_REPORT;
- topic = topic.replace("${productId}", reqData.getProductId()).replace("{deviceId}", reqData.getDeviceId());
+ topic = topic.replace("${productId}", reqData.getProductId()).replace("${deviceId}", reqData.getDeviceId());
publishService.publishMqttWithTopic(reqData.getData(), topic);
diff --git a/src/main/java/com/fzzy/mqtt/MqttProviderConfig.java b/src/main/java/com/fzzy/mqtt/MqttProviderConfig.java
index 7369600..15291cb 100644
--- a/src/main/java/com/fzzy/mqtt/MqttProviderConfig.java
+++ b/src/main/java/com/fzzy/mqtt/MqttProviderConfig.java
@@ -37,6 +37,7 @@
hostList.toArray(serverURIs);
mqttConnectOptions.setServerURIs(serverURIs);
mqttConnectOptions.setKeepAliveInterval(mqttProperties.getKeepAliveInterval());
+
return mqttConnectOptions;
}
diff --git a/src/main/java/com/fzzy/protocol/sdkhk/common/Alarm.java b/src/main/java/com/fzzy/protocol/sdkhk/common/Alarm.java
index 54501c1..802ed2d 100644
--- a/src/main/java/com/fzzy/protocol/sdkhk/common/Alarm.java
+++ b/src/main/java/com/fzzy/protocol/sdkhk/common/Alarm.java
@@ -18,89 +18,86 @@
static FMSGCallBack_V31 fMSFCallBack_V31 = null;
- /**
- * @param args
- */
- @SuppressWarnings("resource")
- public static void main(String[] args) throws InterruptedException {
-
- if (hCNetSDK == null) {
- if (!CreateSDKInstance()) {
- System.out.println("Load SDK fail");
- return;
- }
- }
- //linux绯荤粺寤鸿璋冪敤浠ヤ笅鎺ュ彛鍔犺浇缁勪欢搴�
- if (OsSelect.isLinux()) {
- HCNetSDK.BYTE_ARRAY ptrByteArray1 = new HCNetSDK.BYTE_ARRAY(256);
- HCNetSDK.BYTE_ARRAY ptrByteArray2 = new HCNetSDK.BYTE_ARRAY(256);
- //杩欓噷鏄簱鐨勭粷瀵硅矾寰勶紝璇锋牴鎹疄闄呮儏鍐典慨鏀癸紝娉ㄦ剰鏀硅矾寰勫繀椤绘湁璁块棶鏉冮檺
- // String strPath1 = System.getProperty("user.dir") + "/lib/libcrypto.so.1.1";
- // String strPath2 = System.getProperty("user.dir") + "/lib/libssl.so.1.1";
-
- String strPath1 = HKUtils.SDK_DIR_LINUX + "/libcrypto.so.1.1";
- String strPath2 = HKUtils.SDK_DIR_LINUX + "/libssl.so.1.1";
-
- System.arraycopy(strPath1.getBytes(), 0, ptrByteArray1.byValue, 0, strPath1.length());
- ptrByteArray1.write();
- hCNetSDK.NET_DVR_SetSDKInitCfg(3, ptrByteArray1.getPointer());
-
- System.arraycopy(strPath2.getBytes(), 0, ptrByteArray2.byValue, 0, strPath2.length());
- ptrByteArray2.write();
- hCNetSDK.NET_DVR_SetSDKInitCfg(4, ptrByteArray2.getPointer());
-
- //String strPathCom = System.getProperty("user.dir") + "/lib";
- String strPathCom = HKUtils.SDK_DIR_LINUX;
- HCNetSDK.NET_DVR_LOCAL_SDK_PATH struComPath = new HCNetSDK.NET_DVR_LOCAL_SDK_PATH();
- System.arraycopy(strPathCom.getBytes(), 0, struComPath.sPath, 0, strPathCom.length());
- struComPath.write();
- hCNetSDK.NET_DVR_SetSDKInitCfg(2, struComPath.getPointer());
- }
-
- /**鍒濆鍖�*/
- hCNetSDK.NET_DVR_Init();
- /**鍔犺浇鏃ュ織*/
- hCNetSDK.NET_DVR_SetLogToFile(3, "../sdklog", false);
- //璁剧疆鎶ヨ鍥炶皟鍑芥暟
- if (fMSFCallBack_V31 == null) {
- fMSFCallBack_V31 = new FMSGCallBack_V31();
- Pointer pUser = null;
- if (!hCNetSDK.NET_DVR_SetDVRMessageCallBack_V31(fMSFCallBack_V31, pUser)) {
- System.out.println("璁剧疆鍥炶皟鍑芥暟澶辫触!");
- return;
- } else {
- System.out.println("璁剧疆鍥炶皟鍑芥暟鎴愬姛!");
- }
- }
-
-
- /** 璁惧涓婁紶鐨勬姤璀︿俊鎭槸COMM_VCA_ALARM(0x4993)绫诲瀷锛�
- 鍦⊿DK鍒濆鍖栦箣鍚庡鍔犺皟鐢∟ET_DVR_SetSDKLocalCfg(enumType涓篘ET_DVR_LOCAL_CFG_TYPE_GENERAL)璁剧疆閫氱敤鍙傛暟NET_DVR_LOCAL_GENERAL_CFG鐨刡yAlarmJsonPictureSeparate涓�1锛�
- 灏咼son鏁版嵁鍜屽浘鐗囨暟鎹垎绂讳笂浼狅紝杩欐牱璁剧疆涔嬪悗锛屾姤璀﹀竷闃插洖璋冨嚱鏁伴噷闈㈡帴鏀跺埌鐨勬姤璀︿俊鎭被鍨嬩负COMM_ISAPI_ALARM(0x6009)锛�
- 鎶ヨ淇℃伅缁撴瀯浣撲负NET_DVR_ALARM_ISAPI_INFO锛堜笌璁惧鏃犲叧锛孲DK灏佽鐨勬暟鎹粨鏋勶級锛屾洿渚夸簬瑙ｆ瀽銆�*/
- HCNetSDK.NET_DVR_LOCAL_GENERAL_CFG struNET_DVR_LOCAL_GENERAL_CFG = new HCNetSDK.NET_DVR_LOCAL_GENERAL_CFG();
- struNET_DVR_LOCAL_GENERAL_CFG.byAlarmJsonPictureSeparate = 1; //璁剧疆JSON閫忎紶鎶ヨ鏁版嵁鍜屽浘鐗囧垎绂�
- struNET_DVR_LOCAL_GENERAL_CFG.write();
- Pointer pStrNET_DVR_LOCAL_GENERAL_CFG = struNET_DVR_LOCAL_GENERAL_CFG.getPointer();
- hCNetSDK.NET_DVR_SetSDKLocalCfg(17, pStrNET_DVR_LOCAL_GENERAL_CFG);
-
- //Alarm.Login_V40(0, "218.21.29.30", (short) 8001, "admin", "km2039766");
-
- Alarm.Login_V40(2, "218.21.29.30", (short) 8002, "admin", "km2039766");
-
- Alarm.SetAlarm(0);
-
- while (true) {
- //杩欓噷鍔犲叆鎺у埗鍙拌緭鍏ユ帶鍒讹紝鏄负浜嗕繚鎸佽繛鎺ョ姸鎬侊紝褰撹緭鍏琛ㄧず甯冮槻缁撴潫
- System.out.print("璇烽�夋嫨鏄惁鎾ゅ嚭甯冮槻(Y/N)锛�");
- Scanner input = new Scanner(System.in);
- String str = input.next();
- if (str.equals("Y")) {
- break;
- }
- }
- Alarm.Logout(0);
- }
+// @SuppressWarnings("resource")
+// public static void main(String[] args) throws InterruptedException {
+//
+// if (hCNetSDK == null) {
+// if (!CreateSDKInstance()) {
+// System.out.println("Load SDK fail");
+// return;
+// }
+// }
+// //linux绯荤粺寤鸿璋冪敤浠ヤ笅鎺ュ彛鍔犺浇缁勪欢搴�
+// if (OsSelect.isLinux()) {
+// HCNetSDK.BYTE_ARRAY ptrByteArray1 = new HCNetSDK.BYTE_ARRAY(256);
+// HCNetSDK.BYTE_ARRAY ptrByteArray2 = new HCNetSDK.BYTE_ARRAY(256);
+// //杩欓噷鏄簱鐨勭粷瀵硅矾寰勶紝璇锋牴鎹疄闄呮儏鍐典慨鏀癸紝娉ㄦ剰鏀硅矾寰勫繀椤绘湁璁块棶鏉冮檺
+// // String strPath1 = System.getProperty("user.dir") + "/lib/libcrypto.so.1.1";
+// // String strPath2 = System.getProperty("user.dir") + "/lib/libssl.so.1.1";
+//
+// String strPath1 = HKUtils.SDK_DIR_LINUX + "/libcrypto.so.1.1";
+// String strPath2 = HKUtils.SDK_DIR_LINUX + "/libssl.so.1.1";
+//
+// System.arraycopy(strPath1.getBytes(), 0, ptrByteArray1.byValue, 0, strPath1.length());
+// ptrByteArray1.write();
+// hCNetSDK.NET_DVR_SetSDKInitCfg(3, ptrByteArray1.getPointer());
+//
+// System.arraycopy(strPath2.getBytes(), 0, ptrByteArray2.byValue, 0, strPath2.length());
+// ptrByteArray2.write();
+// hCNetSDK.NET_DVR_SetSDKInitCfg(4, ptrByteArray2.getPointer());
+//
+// //String strPathCom = System.getProperty("user.dir") + "/lib";
+// String strPathCom = HKUtils.SDK_DIR_LINUX;
+// HCNetSDK.NET_DVR_LOCAL_SDK_PATH struComPath = new HCNetSDK.NET_DVR_LOCAL_SDK_PATH();
+// System.arraycopy(strPathCom.getBytes(), 0, struComPath.sPath, 0, strPathCom.length());
+// struComPath.write();
+// hCNetSDK.NET_DVR_SetSDKInitCfg(2, struComPath.getPointer());
+// }
+//
+// /**鍒濆鍖�*/
+// hCNetSDK.NET_DVR_Init();
+// /**鍔犺浇鏃ュ織*/
+// hCNetSDK.NET_DVR_SetLogToFile(3, "../sdklog", false);
+// //璁剧疆鎶ヨ鍥炶皟鍑芥暟
+// if (fMSFCallBack_V31 == null) {
+// fMSFCallBack_V31 = new FMSGCallBack_V31();
+// Pointer pUser = null;
+// if (!hCNetSDK.NET_DVR_SetDVRMessageCallBack_V31(fMSFCallBack_V31, pUser)) {
+// System.out.println("璁剧疆鍥炶皟鍑芥暟澶辫触!");
+// return;
+// } else {
+// System.out.println("璁剧疆鍥炶皟鍑芥暟鎴愬姛!");
+// }
+// }
+//
+//
+// /** 璁惧涓婁紶鐨勬姤璀︿俊鎭槸COMM_VCA_ALARM(0x4993)绫诲瀷锛�
+// 鍦⊿DK鍒濆鍖栦箣鍚庡鍔犺皟鐢∟ET_DVR_SetSDKLocalCfg(enumType涓篘ET_DVR_LOCAL_CFG_TYPE_GENERAL)璁剧疆閫氱敤鍙傛暟NET_DVR_LOCAL_GENERAL_CFG鐨刡yAlarmJsonPictureSeparate涓�1锛�
+// 灏咼son鏁版嵁鍜屽浘鐗囨暟鎹垎绂讳笂浼狅紝杩欐牱璁剧疆涔嬪悗锛屾姤璀﹀竷闃插洖璋冨嚱鏁伴噷闈㈡帴鏀跺埌鐨勬姤璀︿俊鎭被鍨嬩负COMM_ISAPI_ALARM(0x6009)锛�
+// 鎶ヨ淇℃伅缁撴瀯浣撲负NET_DVR_ALARM_ISAPI_INFO锛堜笌璁惧鏃犲叧锛孲DK灏佽鐨勬暟鎹粨鏋勶級锛屾洿渚夸簬瑙ｆ瀽銆�*/
+// HCNetSDK.NET_DVR_LOCAL_GENERAL_CFG struNET_DVR_LOCAL_GENERAL_CFG = new HCNetSDK.NET_DVR_LOCAL_GENERAL_CFG();
+// struNET_DVR_LOCAL_GENERAL_CFG.byAlarmJsonPictureSeparate = 1; //璁剧疆JSON閫忎紶鎶ヨ鏁版嵁鍜屽浘鐗囧垎绂�
+// struNET_DVR_LOCAL_GENERAL_CFG.write();
+// Pointer pStrNET_DVR_LOCAL_GENERAL_CFG = struNET_DVR_LOCAL_GENERAL_CFG.getPointer();
+// hCNetSDK.NET_DVR_SetSDKLocalCfg(17, pStrNET_DVR_LOCAL_GENERAL_CFG);
+//
+// //Alarm.Login_V40(0, "218.21.29.30", (short) 8001, "admin", "km2039766");
+//
+// Alarm.Login_V40(2, "218.21.29.30", (short) 8002, "admin", "km2039766");
+//
+// Alarm.SetAlarm(0);
+//
+// while (true) {
+// //杩欓噷鍔犲叆鎺у埗鍙拌緭鍏ユ帶鍒讹紝鏄负浜嗕繚鎸佽繛鎺ョ姸鎬侊紝褰撹緭鍏琛ㄧず甯冮槻缁撴潫
+// System.out.print("璇烽�夋嫨鏄惁鎾ゅ嚭甯冮槻(Y/N)锛�");
+// Scanner input = new Scanner(System.in);
+// String str = input.next();
+// if (str.equals("Y")) {
+// break;
+// }
+// }
+// Alarm.Logout(0);
+// }
/**
diff --git a/src/main/java/com/fzzy/protocol/weightyh/MessageConsumer.java b/src/main/java/com/fzzy/protocol/weightyh/MessageConsumer.java
index 580b4d7..3e4fd02 100644
--- a/src/main/java/com/fzzy/protocol/weightyh/MessageConsumer.java
+++ b/src/main/java/com/fzzy/protocol/weightyh/MessageConsumer.java
@@ -4,6 +4,7 @@
import com.fzzy.api.utils.SpringUtil;
import com.fzzy.gateway.GatewayUtils;
import com.fzzy.gateway.api.GatewayRemoteManager;
+import com.fzzy.gateway.data.BaseReqData;
import com.fzzy.gateway.entity.GatewayDevice;
import com.ld.io.api.IoMsgConsumer;
import com.ld.io.api.IoSession;
@@ -22,7 +23,7 @@
private long timeTag = 0;
- private GatewayRemoteManager reportService;
+ private GatewayRemoteManager gatewayRemoteManager;
@Override
public void consume(IoSession session, byte[] bytes) {
@@ -71,11 +72,18 @@
}
//鐩存帴璋冪敤瀹炵幇绫伙紝鏇村瀹炵幇绫诲崟鐙皟鐢�
- if (null == reportService) {
- reportService = SpringUtil.getBean(GatewayRemoteManager.class);
+ if (null == gatewayRemoteManager) {
+ gatewayRemoteManager = SpringUtil.getBean(GatewayRemoteManager.class);
}
- reportService.getDeviceReportService(device.getPushProtocol()).report2GatewayBySn(weigh, device);
+ //鏁版嵁灏佽鎺ㄩ��
+ BaseReqData reqData = new BaseReqData();
+ reqData.setDevice(device);
+ reqData.setDeviceId(device.getDeviceId());
+ reqData.setProductId(device.getProductId());
+ reqData.setDeviceName(device.getDeviceName());
+ reqData.setWeight(weigh);
+ gatewayRemoteManager.getDeviceReportService(device.getPushProtocol()).reportWeightData(reqData);
}
/**
--
Gitblit v1.9.3