From 7958f1dddb8a7f4e70d232b07a7703955ecedae0 Mon Sep 17 00:00:00 2001
From: Your Name <you@example.com>
Date: 星期六, 26 八月 2023 12:45:33 +0800
Subject: [PATCH] 优化diamante
---
service-common/src/main/java/com/java110/common/bmo/machine/impl/MachineOpenDoorBMOImpl.java | 52 +++++++++++++++++++++++++++++++++++++++-------------
1 files changed, 39 insertions(+), 13 deletions(-)
diff --git a/service-common/src/main/java/com/java110/common/bmo/machine/impl/MachineOpenDoorBMOImpl.java b/service-common/src/main/java/com/java110/common/bmo/machine/impl/MachineOpenDoorBMOImpl.java
index dd68855..5c90089 100755
--- a/service-common/src/main/java/com/java110/common/bmo/machine/impl/MachineOpenDoorBMOImpl.java
+++ b/service-common/src/main/java/com/java110/common/bmo/machine/impl/MachineOpenDoorBMOImpl.java
@@ -60,7 +60,7 @@
OwnerDto ownerDto = new OwnerDto();
ownerDto.setMemberId(reqJson.getString("userId"));
ownerDto.setCommunityId(reqJson.getString("communityId"));
- List<OwnerDto> ownerDtos = ownerInnerServiceSMOImpl.queryOwners(ownerDto);
+ List<OwnerDto> ownerDtos = ownerInnerServiceSMOImpl.queryOwnerMembers(ownerDto);
if (ownerDtos == null || ownerDtos.size() < 1) {
return ResultVo.error("娌℃湁鏉冮檺寮�闂�");
}
@@ -72,6 +72,34 @@
ResultVo resultVo = dataBusInnerServiceSMOImpl.openDoor(reqJson);
return ResultVo.createResponseEntity(resultVo);
}
+
+ /**
+ * 寮�闂ㄥ姛鑳�
+ *
+ * @param reqJson 璇锋眰鎶ユ枃淇℃伅
+ * @return
+ */
+ @Override
+ public ResponseEntity<String> closeDoor(JSONObject reqJson) {
+ //濡傛灉鏄笟涓� 闄愬埗寮�闂ㄦ鏁�
+ if ("owner".equals(reqJson.getString("userRole"))) {
+ OwnerDto ownerDto = new OwnerDto();
+ ownerDto.setMemberId(reqJson.getString("userId"));
+ ownerDto.setCommunityId(reqJson.getString("communityId"));
+ List<OwnerDto> ownerDtos = ownerInnerServiceSMOImpl.queryOwners(ownerDto);
+ if (ownerDtos == null || ownerDtos.size() < 1) {
+ return ResultVo.error("娌℃湁鏉冮檺寮�闂�");
+ }
+
+ if (!hasOpenDoorPri(ownerDtos.get(0), reqJson.getString("machineCode"))) {
+ return ResultVo.error("浠婃棩寮�闂ㄦ鏁板凡鐢ㄥ畬锛岃鑱旂郴鐗╀笟瀹㈡湇浜哄憳");
+ }
+ }
+ ResultVo resultVo = dataBusInnerServiceSMOImpl.closeDoor(reqJson);
+ return ResultVo.createResponseEntity(resultVo);
+ }
+
+
private boolean hasOpenDoorPri(OwnerDto ownerDto, String machineCode) {
@@ -124,19 +152,17 @@
return ResultVo.createResponseEntity(resultVo);
}
+
+
@Override
- public ResponseEntity<String> getQRcode(JSONObject reqJson) {
- //濡傛灉鏄笟涓� 闄愬埗寮�闂ㄦ鏁�
+ public ResponseEntity<String> customCarInOut(JSONObject reqJson) {
+ ResultVo resultVo = dataBusInnerServiceSMOImpl.customCarInOut(reqJson);
+ return ResultVo.createResponseEntity(resultVo);
+ }
- OwnerDto ownerDto = new OwnerDto();
- ownerDto.setMemberId(reqJson.getString("userId"));
- ownerDto.setCommunityId(reqJson.getString("communityId"));
- List<OwnerDto> ownerDtos = ownerInnerServiceSMOImpl.queryOwners(ownerDto);
- if (ownerDtos == null || ownerDtos.size() < 1) {
- return ResultVo.error("娌℃湁鏉冮檺寮�闂�");
- }
-
- ResultVo resultVo = dataBusInnerServiceSMOImpl.getQRcode(reqJson);
- return ResultVo.createResponseEntity(resultVo.getCode(), resultVo.getMsg(), resultVo.getData());
+ @Override
+ public ResponseEntity<String> getManualOpenDoorLogs(JSONObject reqJson) {
+ ResultVo resultVo = dataBusInnerServiceSMOImpl.getManualOpenDoorLogs(reqJson);
+ return ResultVo.createResponseEntity(resultVo);
}
}
--
Gitblit v1.8.0