From 8ddb4e5684d0270e206fff6e063552abec835d59 Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: 星期二, 19 五月 2020 17:25:20 +0800
Subject: [PATCH] 优化心跳线程
---
Api/src/main/java/com/java110/api/listener/machineTranslate/MachineCmdResultListener.java | 6 ++++--
1 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/Api/src/main/java/com/java110/api/listener/machineTranslate/MachineCmdResultListener.java b/Api/src/main/java/com/java110/api/listener/machineTranslate/MachineCmdResultListener.java
index 0773a93..29e60c5 100644
--- a/Api/src/main/java/com/java110/api/listener/machineTranslate/MachineCmdResultListener.java
+++ b/Api/src/main/java/com/java110/api/listener/machineTranslate/MachineCmdResultListener.java
@@ -15,6 +15,7 @@
import com.java110.dto.hardwareAdapation.MachineDto;
import com.java110.event.service.api.ServiceDataFlowEvent;
import com.java110.utils.constant.ServiceCodeMachineTranslateConstant;
+import com.java110.utils.util.StringUtil;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.HttpHeaders;
import org.springframework.http.HttpMethod;
@@ -71,7 +72,8 @@
Map<String, String> reqHeader = context.getRequestHeaders();
HttpHeaders headers = new HttpHeaders();
- if (reqHeader == null || !reqHeader.containsKey("communityId") || StringUtils.isEmpty(reqHeader.get("communityId"))) {
+ String communityId = reqJson.containsKey("communityId") ? reqJson.getString("communityId") : reqHeader.get("communityId");
+ if (StringUtil.isEmpty(communityId)) {
outParam.put("code", -1);
outParam.put("message", "璇锋眰鍦板潃涓湭鍖呭惈灏忓尯淇℃伅");
responseEntity = new ResponseEntity<>(outParam.toJSONString(), headers, HttpStatus.OK);
@@ -92,7 +94,7 @@
headers.add(key, reqHeader.get(key));
}
- String communityId = reqHeader.get("communityId");
+ //String communityId = reqJson.containsKey("communityId") ? reqJson.getString("communityId") : reqHeader.get("communityId");
//妫�鏌ヨ澶囨槸鍚﹀悎娉�
MachineDto machineDto = new MachineDto();
--
Gitblit v1.8.0