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/BaseMachineListener.java | 8 +++++---
1 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/Api/src/main/java/com/java110/api/listener/machineTranslate/BaseMachineListener.java b/Api/src/main/java/com/java110/api/listener/machineTranslate/BaseMachineListener.java
index ff6db38..83f93bf 100644
--- a/Api/src/main/java/com/java110/api/listener/machineTranslate/BaseMachineListener.java
+++ b/Api/src/main/java/com/java110/api/listener/machineTranslate/BaseMachineListener.java
@@ -10,6 +10,7 @@
import com.java110.dto.hardwareAdapation.MachineDto;
import com.java110.event.service.api.ServiceDataFlowEvent;
import com.java110.utils.util.Assert;
+import com.java110.utils.util.StringUtil;
import org.springframework.http.HttpHeaders;
import org.springframework.http.HttpStatus;
import org.springframework.http.ResponseEntity;
@@ -32,7 +33,7 @@
DataFlowContext context = event.getDataFlowContext();
Map<String, String> reqHeader = context.getRequestHeaders();
Assert.hasKeyAndValue(reqHeader, "machinecode", "璇锋眰鎶ユ枃涓湭鍖呭惈璁惧缂栫爜");
- Assert.hasKeyAndValue(reqHeader, "communityId", "璇锋眰鎶ユ枃涓湭鍖呭惈灏忓尯淇℃伅");
+// Assert.hasKeyAndValue(reqHeader, "communityId", "璇锋眰鎶ユ枃涓湭鍖呭惈灏忓尯淇℃伅");
}
/**
@@ -53,7 +54,8 @@
JSONArray data = null;
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);
@@ -67,7 +69,7 @@
headers.add(key, reqHeader.get(key));
}
- String communityId = reqHeader.get("communityId");
+ // String communityId = reqJson.containsKey("communityId") ? reqJson.getString("communityId") : reqHeader.get("communityId");
if (!reqHeader.containsKey("machinecode") || StringUtils.isEmpty(reqHeader.get("machinecode"))) {
outParam.put("code", -1);
--
Gitblit v1.8.0