From 814b453961763bf1b60af85f9f3bdc4682659ae8 Mon Sep 17 00:00:00 2001
From: jiazx0107@163.com <jiazx0107@163.com>
Date: 星期一, 15 一月 2024 20:28:54 +0800
Subject: [PATCH] 添加手动推送粮情接口，以便第三方接口调用
---
src/main/java/com/fzzy/gateway/controller/GatewayDataApi.java | 70 +++++++++++++++++++---------------
1 files changed, 39 insertions(+), 31 deletions(-)
diff --git a/src/main/java/com/fzzy/gateway/controller/GatewayDataApi.java b/src/main/java/com/fzzy/gateway/controller/GatewayDataApi.java
index c4f54fc..beec7a3 100644
--- a/src/main/java/com/fzzy/gateway/controller/GatewayDataApi.java
+++ b/src/main/java/com/fzzy/gateway/controller/GatewayDataApi.java
@@ -37,43 +37,51 @@
* @throws Exception
*/
@PostMapping("/push-grain")
- public @ResponseBody BaseResp pushGrain(@RequestBody Fz40Grain grainData) throws Exception {
+ public @ResponseBody
+ BaseResp pushGrain(@RequestBody Fz40Grain grainData) {
BaseResp resp = new BaseResp();
+ try {
- //鏍规嵁绯荤粺浠撳簱缂栫爜鑾峰彇閰嶇疆璁惧淇℃伅
- GatewayDevice device = GatewayUtils.getCacheByDepotSysId(grainData.getDepotId());
+ log.info("----------涓诲姩鎺ㄩ�佺伯鎯呮帴鍙ｆ墽琛�----{}",grainData);
- if (null == device) {
- resp.setMsg("缃戝叧涓病鏈夎幏鍙栧埌閰嶇疆鐨勭粓绔澶囦俊鎭�,鏃犳硶鎵ц銆備粨搴撶紪鐮�=" + grainData.getDepotId());
+ //鏍规嵁绯荤粺浠撳簱缂栫爜鑾峰彇閰嶇疆璁惧淇℃伅
+ GatewayDevice device = GatewayUtils.getCacheByDepotSysId(grainData.getDepotId());
+
+ if (null == device) {
+ resp.setMsg("缃戝叧涓病鏈夎幏鍙栧埌閰嶇疆鐨勭粓绔澶囦俊鎭�,鏃犳硶鎵ц銆備粨搴撶紪鐮�=" + grainData.getDepotId());
+ resp.setCode(BaseResp.CODE_500);
+ return resp;
+ }
+
+ //鏁版嵁灏佽杞崲
+ GatewayDeviceReportService reportService = gatewayRemoteManager.getDeviceReportService(device.getPushProtocol());
+ if (null == reportService) {
+ log.error("------------绮儏鎺ㄩ�佸け璐ワ紝绯荤粺涓嶅瓨鍦ㄥ綋鍓嶅崗璁墽琛岀被----{}", device.getDeviceName());
+ resp.setMsg("绮儏鎺ㄩ�佸け璐ワ紝绯荤粺涓嶅瓨鍦ㄥ綋鍓嶅崗璁墽琛岀被锛岀綉鍏宠澶�=" + device.getDeviceName());
+ resp.setCode(BaseResp.CODE_500);
+ return resp;
+ }
+
+ //鏁版嵁灏佽
+ resp = reportService.grainData2GatewayApiInfo(grainData, device);
+
+ BaseReqData reqData = new BaseReqData();
+ reqData.setProductId(device.getProductId());
+ reqData.setDeviceName(device.getDeviceName());
+ reqData.setDeviceId(device.getDeviceId());
+
+ reqData.setDevice(device);
+ reqData.setData(resp.getData());
+
+ //鎵嬪姩鎺ㄩ�佸埌骞冲彴
+ resp = reportService.reportGrainDataByHand(reqData);
+
+ } catch (Exception e) {
+ log.error("-----------鎵嬪姩鎺ㄩ�佺伯鎯呮暟鎹墽琛屽紓甯�---{}", e);
resp.setCode(BaseResp.CODE_500);
- return resp;
+ resp.setMsg("鎵ц寮傚父:" + e.getMessage());
}
-
- //鏁版嵁灏佽杞崲
- GatewayDeviceReportService reportService = gatewayRemoteManager.getDeviceReportService(device.getPushProtocol());
- if (null == reportService) {
- log.error("------------绮儏鎺ㄩ�佸け璐ワ紝绯荤粺涓嶅瓨鍦ㄥ綋鍓嶅崗璁墽琛岀被----{}", device.getDeviceName());
- resp.setMsg("绮儏鎺ㄩ�佸け璐ワ紝绯荤粺涓嶅瓨鍦ㄥ綋鍓嶅崗璁墽琛岀被锛岀綉鍏宠澶�=" + device.getDeviceName());
- resp.setCode(BaseResp.CODE_500);
- return resp;
- }
-
- //鏁版嵁灏佽
- resp = reportService.grainData2GatewayApiInfo(grainData, device);
-
- BaseReqData reqData = new BaseReqData();
- reqData.setProductId(device.getProductId());
- reqData.setDeviceName(device.getDeviceName());
- reqData.setDeviceId(device.getDeviceId());
-
- reqData.setDevice(device);
-
- //鎵嬪姩鎺ㄩ�佸埌骞冲彴
- resp = reportService.reportGrainDataByHand(reqData);
-
-
return resp;
}
-
}
--
Gitblit v1.9.3