优化心跳线程

Api/src/main/java/com/java110/api/listener/machineTranslate/BaseMachineListener.java

@@ -10,6 +10,7 @@ import com.java110.core.smo.hardwareAdapation.IMachineTranslateInnerServiceSMO;
 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 @@ public abstract class BaseMachineListener extends AbstractServiceApiListener {
         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 @@ public abstract class BaseMachineListener extends AbstractServiceApiListener {
         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 @@ public abstract class BaseMachineListener extends AbstractServiceApiListener {
             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);

Api/src/main/java/com/java110/api/listener/machineTranslate/MachineCmdResultListener.java

@@ -15,6 +15,7 @@ import com.java110.core.smo.owner.IOwnerInnerServiceSMO;
 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 @@ public class MachineCmdResultListener extends AbstractServiceApiListener {
         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 @@ public class MachineCmdResultListener extends AbstractServiceApiListener {
             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();

Api/src/main/java/com/java110/api/listener/machineTranslate/MachineGetTaskInfoListener.java

@@ -75,7 +75,7 @@ public class MachineGetTaskInfoListener extends BaseMachineListener {
         outParam.put("code", 0);
         outParam.put("message", "success");
         JSONArray data = null;
-        String communityId = reqHeader.get("communityId");
+        String communityId = reqJson.containsKey("communityId") ? reqJson.getString("communityId") : reqHeader.get("communityId");
         HttpHeaders httpHeaders = super.getHeader(context);
         //查询删除的业主信息
         MachineTranslateDto machineTranslateDto = new MachineTranslateDto();

Api/src/main/java/com/java110/api/listener/machineTranslate/MachineHeartbeatListener.java

@@ -145,7 +145,7 @@ public class MachineHeartbeatListener extends BaseMachineListener {
         outParam.put("code", 0);
         outParam.put("message", "success");
         JSONArray data = null;
-        String communityId = reqHeader.get("communityId");
+        String communityId = reqJson.containsKey("communityId") ? reqJson.getString("communityId") : reqHeader.get("communityId");
         outParam.put("data", data);
 
         responseEntity = new ResponseEntity<>(outParam.toJSONString(), headers, HttpStatus.OK);

Api/src/main/java/com/java110/api/listener/machineTranslate/MachineQueryUserInfoListener.java

@@ -98,7 +98,7 @@ public class MachineQueryUserInfoListener extends BaseMachineListener {
         outParam.put("code", 0);
         outParam.put("message", "success");
         JSONArray data = null;
-        String communityId = reqHeader.get("communityId");
+        String communityId = reqJson.containsKey("communityId") ? reqJson.getString("communityId") : reqHeader.get("communityId");
         HttpHeaders httpHeaders = super.getHeader(context);
         //检查是否存在该用户
         OwnerDto ownerDto = new OwnerDto();

Api/src/main/java/com/java110/api/listener/machineTranslate/MachineRoadGateOpenListener.java

@@ -106,7 +106,7 @@ public class MachineRoadGateOpenListener extends BaseMachineListener {
         //JSONObject outParam = null;
         ResponseEntity<String> responseEntity = null;
         Map<String, String> reqHeader = context.getRequestHeaders();
-        String communityId = reqHeader.get("communityId");
+        String communityId = reqJson.containsKey("communityId") ? reqJson.getString("communityId") : reqHeader.get("communityId");
         String machineCode = reqHeader.get("machinecode");
         HttpHeaders headers = new HttpHeaders();
         for (String key : reqHeader.keySet()) {

Api/src/main/java/com/java110/api/listener/machineTranslate/MachineUploadFaceLogListener.java

@@ -101,7 +101,7 @@ public class MachineUploadFaceLogListener extends BaseMachineListener {
             outParam.put("code", 0);
             outParam.put("message", "success");
             JSONArray data = null;
-            reqJson.put("communityId", reqHeader.get("communityId"));
+            reqJson.put("communityId", reqJson.containsKey("communityId") ? reqJson.getString("communityId") : reqHeader.get("communityId"));
             HttpHeaders httpHeaders = super.getHeader(context);
 
             HttpHeaders header = new HttpHeaders();