From 7c0d8207a073888aed1654b26cd6d974953c14ea Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: 星期三, 31 八月 2022 01:01:36 +0800
Subject: [PATCH] 优化收费统计功能
---
service-common/src/main/java/com/java110/common/api/MachineApi.java | 24 +++++++++++++++++++++++-
1 files changed, 23 insertions(+), 1 deletions(-)
diff --git a/service-common/src/main/java/com/java110/common/api/MachineApi.java b/service-common/src/main/java/com/java110/common/api/MachineApi.java
index 086c08a..4c2c36f 100755
--- a/service-common/src/main/java/com/java110/common/api/MachineApi.java
+++ b/service-common/src/main/java/com/java110/common/api/MachineApi.java
@@ -69,6 +69,28 @@
return machineOpenDoorBMOImpl.openDoor(reqJson);
}
+ /**
+ * 璁惧寮�闂ㄥ姛鑳�
+ *
+ * @param reqJson
+ * @return
+ * @serviceCode /machine/closeDoor
+ * @path /app/machine/closeDoor
+ */
+ @RequestMapping(value = "/closeDoor", method = RequestMethod.POST)
+ public ResponseEntity<String> closeDoor(@RequestBody JSONObject reqJson,
+ @RequestHeader(value = "user-id", required = false) String userId) {
+ Assert.hasKeyAndValue(reqJson, "communityId", "璇锋眰鎶ユ枃涓湭鍖呭惈灏忓尯淇℃伅");
+ Assert.hasKeyAndValue(reqJson, "machineCode", "璇锋眰鎶ユ枃涓湭鍖呭惈璁惧淇℃伅");
+ Assert.hasKeyAndValue(reqJson, "userRole", "璇锋眰鎶ユ枃涓湭鍖呭惈鐢ㄦ埛瑙掕壊");
+ if (!USER_ROLE_OWNER.equals(reqJson.getString("userRole"))) { //杩欑涓� 鍛樺伐鐨勬儏鍐靛憿
+ reqJson.put("userId", userId);
+ }
+ Assert.hasKeyAndValue(reqJson, "userId", "璇锋眰鎶ユ枃涓湭鍖呭惈鐢ㄦ埛淇℃伅");
+ return machineOpenDoorBMOImpl.closeDoor(reqJson);
+ }
+
+
/**
* 璁惧浜岀淮鐮�
@@ -152,7 +174,7 @@
Assert.hasKeyAndValue(reqJson, "machineCode", "鏈寘鍚澶囩紪鐮�");
Assert.hasKeyAndValue(reqJson, "openTypeCd", "鏈寘鍚紑闂ㄦ柟寮�");
Assert.hasKeyAndValue(reqJson, "similar", "鏈寘鍚紑闂ㄧ浉浼煎害");
- Assert.hasKeyAndValue(reqJson, "photo", "鏈寘鍚姄鎷嶇収鐗�");
+ //Assert.hasKeyAndValue(reqJson, "photo", "鏈寘鍚姄鎷嶇収鐗�");
Assert.hasKeyAndValue(reqJson, "dateTime", "鏈寘鍚紑闂ㄦ椂闂�");
Assert.hasKeyAndValue(reqJson, "extCommunityId", "鏈寘鍚皬鍖轰俊鎭�");
Assert.hasKeyAndValue(reqJson, "recordTypeCd", "鏈寘鍚褰曠被鍨�");
--
Gitblit v1.8.0