From c5662194161db75b5bcfe2c9e6bc7046c2f3b7e7 Mon Sep 17 00:00:00 2001
From: wuxw <928255095@qq.com>
Date: 星期日, 10 十一月 2019 23:55:12 +0800
Subject: [PATCH] 小区ID 设置错误问题处理
---
Api/src/main/java/com/java110/api/listener/machineTranslate/MachineHeartbeatListener.java | 25 +++++++++++++++++--------
1 files changed, 17 insertions(+), 8 deletions(-)
diff --git a/Api/src/main/java/com/java110/api/listener/machineTranslate/MachineHeartbeatListener.java b/Api/src/main/java/com/java110/api/listener/machineTranslate/MachineHeartbeatListener.java
index afa7997..c132ba7 100644
--- a/Api/src/main/java/com/java110/api/listener/machineTranslate/MachineHeartbeatListener.java
+++ b/Api/src/main/java/com/java110/api/listener/machineTranslate/MachineHeartbeatListener.java
@@ -2,6 +2,7 @@
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
+import com.aliyuncs.utils.StringUtils;
import com.java110.api.listener.AbstractServiceApiListener;
import com.java110.core.annotation.Java110Listener;
import com.java110.core.context.DataFlowContext;
@@ -56,7 +57,7 @@
@Override
protected void validate(ServiceDataFlowEvent event, JSONObject reqJson) {
Assert.hasKeyAndValue(reqJson, "machineCode", "璇锋眰鎶ユ枃涓湭鍖呭惈璁惧缂栫爜");
- Assert.hasKeyAndValue(reqJson, "communityId", "璇锋眰鎶ユ枃涓湭鍖呭惈灏忓尯淇℃伅");
+ //Assert.hasKeyAndValue(reqJson, "communityId", "璇锋眰鎶ユ枃涓湭鍖呭惈灏忓尯淇℃伅");
Assert.hasKeyAndValue(reqJson, "authCode", "璇锋眰鎶ユ枃涓湭鍖呭惈璁惧閴存潈鐮�");
}
@@ -71,31 +72,39 @@
outParam.put("message", "success");
JSONArray data = null;
Map<String, String> reqHeader = context.getRequestHeaders();
+
HttpHeaders headers = new HttpHeaders();
- if (reqHeader != null && !reqHeader.isEmpty()) {
- for (String key : reqHeader.keySet()) {
- headers.add(key, reqHeader.get(key));
- }
+ if (reqHeader == null || !reqHeader.containsKey("communityId") || StringUtils.isEmpty(reqHeader.get("communityId"))) {
+ outParam.put("code", -1);
+ outParam.put("message", "璇锋眰鍦板潃涓湭鍖呭惈灏忓尯淇℃伅");
+ responseEntity = new ResponseEntity<>(outParam.toJSONString(), headers, HttpStatus.OK);
+ context.setResponseEntity(responseEntity);
+ return;
}
+ for (String key : reqHeader.keySet()) {
+ headers.add(key, reqHeader.get(key));
+ }
+
+ String communityId = reqHeader.get("communityId");
//妫�鏌ヨ澶囨槸鍚﹀悎娉�
MachineDto machineDto = new MachineDto();
machineDto.setMachineCode(reqJson.getString("machineCode"));
- machineDto.setCommunityId(reqJson.getString("communityId"));
+ machineDto.setCommunityId(communityId);
int machineCount = machineInnerServiceSMOImpl.queryMachinesCount(machineDto);
if (machineCount < 1) {
outParam.put("code", -1);
outParam.put("message", "璇ヨ澶囥��" + reqJson.getString("machineCode") + "銆戞湭鍦ㄨ灏忓尯銆�" + reqJson.getString("communityId") + "銆戞敞鍐�");
responseEntity = new ResponseEntity<>(outParam.toJSONString(), headers, HttpStatus.OK);
context.setResponseEntity(responseEntity);
- return ;
+ return;
}
//鏌ヨ鍒犻櫎鐨勪笟涓讳俊鎭�
MachineTranslateDto machineTranslateDto = new MachineTranslateDto();
machineTranslateDto.setMachineCode(reqJson.getString("machineCode"));
- machineTranslateDto.setMachineCode(reqJson.getString("communityId"));
+ machineTranslateDto.setCommunityId(communityId);
machineTranslateDto.setStatusCd(StatusConstant.STATUS_CD_INVALID);
List<MachineTranslateDto> machineTranslateDtos = machineTranslateInnerServiceSMOImpl.queryMachineTranslates(machineTranslateDto);
//濡傛灉鏈夊け鏁堟暟鎹紝鍒欏憡璇夎澶囧垹闄�
--
Gitblit v1.8.0