From 7d55b601b8ec846e9d48ce31de1c5c6930d6dee0 Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期二, 19 八月 2025 17:24:35 +0800
Subject: [PATCH] 1、修改等待中间件返回结果超时时间为10秒； 2、修改向水肥机下发命令相关逻辑； 3、修改水肥机回复命令结果处理逻辑； 4、去除前端webSocket关闭产生异常日志记录。
---
pipIrr-platform/pipIrr-web/pipIrr-web-remote/src/main/java/com/dy/pipIrrRemote/msCenter/CenterMsReceiveCtrl.java | 36 +++++++++++++++++++++++++-----------
1 files changed, 25 insertions(+), 11 deletions(-)
diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-remote/src/main/java/com/dy/pipIrrRemote/msCenter/CenterMsReceiveCtrl.java b/pipIrr-platform/pipIrr-web/pipIrr-web-remote/src/main/java/com/dy/pipIrrRemote/msCenter/CenterMsReceiveCtrl.java
index 839d8f0..a40d3ff 100644
--- a/pipIrr-platform/pipIrr-web/pipIrr-web-remote/src/main/java/com/dy/pipIrrRemote/msCenter/CenterMsReceiveCtrl.java
+++ b/pipIrr-platform/pipIrr-web/pipIrr-web-remote/src/main/java/com/dy/pipIrrRemote/msCenter/CenterMsReceiveCtrl.java
@@ -1,10 +1,12 @@
package com.dy.pipIrrRemote.msCenter;
+import com.alibaba.fastjson2.JSON;
import com.alibaba.fastjson2.JSONObject;
import com.dy.common.contant.Constant;
import com.dy.common.multiDataSource.DataSourceContext;
import com.dy.common.util.NumUtil;
import com.dy.common.webUtil.BaseResponse;
+import com.dy.common.webUtil.WebSocketMessage;
import com.dy.pipIrrRemote.largeScreen.WebSocketServer;
import io.swagger.v3.oas.annotations.Hidden;
import io.swagger.v3.oas.annotations.tags.Tag;
@@ -26,7 +28,8 @@
*/
@Slf4j
-@Tag(name = "閫氫俊涓棿娑堟伅涓績鎺ㄩ�佹秷鎭帴鏀舵柟", description = "閫氫俊涓棿娑堟伅涓績鎺ㄩ�佹秷鎭帴鏀舵柟")
+@Hidden //涓嶅叕寮�鎺ュ彛锛屽叾鍙湁閫氫俊涓棿浠惰皟鐢�
+@Tag(name = "閫氫俊涓棿浠舵秷鎭腑蹇冩帹閫佹秷鎭帴鏀惰��", description = "閫氫俊涓棿浠舵秷鎭腑蹇冩帹閫佹秷鎭帴鏀惰��")
@RestController
@RequestMapping(path="msCenter")
public class CenterMsReceiveCtrl{
@@ -35,16 +38,16 @@
private CenterMsReceiveSv sv ;
/**
- * 閫氫俊涓棿娑堟伅涓績鎺ㄩ�佹秷鎭帴鏀�
- * @param list 娑堟伅闆嗗悎
- * @return 鎿嶄綔缁撴灉
+ * 閫氫俊涓棿浠舵秷鎭腑蹇冩帹閫佹秷鎭帴鏀�
+ * @param list 娑堟伅鏁版嵁闆嗗悎
+ * @return 鏃犺繑鍥炵粨鏋�
*/
@Hidden //涓嶅叕寮�鎺ュ彛锛屽叾鍙湁閫氫俊涓棿浠惰皟鐢�
@PostMapping(path = "receive", consumes = MediaType.APPLICATION_JSON_VALUE)
public BaseResponse<Boolean> receive(@RequestBody List<JSONObject> list, HttpServletRequest req, HttpServletResponse rep) {
//閫氫俊涓棿浠朵紶杩囨潵鐨勬満鏋則ag锛屼互鐢ㄤ簬鏌ユ壘鏁版嵁婧�
- String token = req.getHeader(Constant.UserTokenKeyInHeader);
- DataSourceContext.set(token);
+ String orgTag = req.getHeader(Constant.TokenKeyInHeader);
+ DataSourceContext.set(orgTag);
if(list != null && list.size() > 0){
for (JSONObject jo : list) {
@@ -64,14 +67,25 @@
jo.put("intakeNum", intakeNum) ;
}
}
- try {
- WebSocketServer.sendAllMessage(jo.toJSONString());
- }catch (Exception e){
- log.error("鎺ㄩ�佹秷鎭け璐�", e) ;
- }
}
}
+ sendByWebSocket(orgTag, list) ;
}
return null ;
}
+
+ /**
+ * 閫氳繃websocket鎶婃秷鎭帹閫佸嚭鍘伙紝褰撳墠鎺ユ敹鏂规槸鍓嶇鐨勫ぇ灞忓睍绀烘ā鍧�
+ * @param list
+ */
+ private void sendByWebSocket(String orgTag, List<JSONObject> list){
+ WebSocketMessage vo = new WebSocketMessage() ;
+ vo.type = WebSocketMessage.TYPE_JSON ;
+ vo.content = list ;
+ try {
+ WebSocketServer.sendMessage2AllClient(orgTag, JSON.toJSONString(vo));
+ }catch (Exception e){
+ log.error("鎺ㄩ�佹秷鎭け璐�", e) ;
+ }
+ }
}
--
Gitblit v1.8.0