From 4fed835684fa0e06edcfc61283ad047d0fe6364e Mon Sep 17 00:00:00 2001
From: wuxw <928255095@qq.com>
Date: 星期二, 25 二月 2020 00:14:22 +0800
Subject: [PATCH] 优化设备问题
---
Api/src/main/java/com/java110/api/listener/machineTranslate/BaseMachineListener.java | 12 +++++++++++-
1 files changed, 11 insertions(+), 1 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 97753d7..ff6db38 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
@@ -78,18 +78,28 @@
}
//妫�鏌ヨ澶囨槸鍚﹀悎娉�
+ //妫�鏌ヨ澶囨槸鍚﹀悎娉�
MachineDto machineDto = new MachineDto();
machineDto.setMachineCode(reqHeader.get("machinecode"));
machineDto.setCommunityId(communityId);
List<MachineDto> machineDtos = machineInnerServiceSMOImpl.queryMachines(machineDto);
if (machineDtos == null || machineDtos.size() < 1) {
outParam.put("code", -1);
- outParam.put("message", "璇ヨ澶囥��" + reqJson.getString("machineCode") + "銆戞湭鍦ㄨ灏忓尯銆�" + communityId + "銆戞敞鍐�");
+ outParam.put("message", "璇ヨ澶囥��" + reqHeader.get("machinecode") + "銆戞湭鍦ㄨ灏忓尯銆�" + communityId + "銆戞敞鍐�");
responseEntity = new ResponseEntity<>(outParam.toJSONString(), headers, HttpStatus.OK);
context.setResponseEntity(responseEntity);
return false;
}
+ if("1600".equals(machineDtos.get(0).getState())){ //璁惧绂佺敤鐘舵��
+ outParam.put("code", -1);
+ outParam.put("message", "璇ヨ澶囥��" + reqHeader.get("machinecode") + "銆戠鐢ㄧ姸鎬�");
+ responseEntity = new ResponseEntity<>(outParam.toJSONString(), headers, HttpStatus.OK);
+ context.setResponseEntity(responseEntity);
+ return false;
+ }
+
+
reqJson.put("machineCode", machineDtos.get(0).getMachineCode());
reqJson.put("machineId", machineDtos.get(0).getMachineId());
reqJson.put("communityId", communityId);
--
Gitblit v1.8.0