From e06d315f20570f765ae361c135f940940bdaa39c Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: 星期四, 06 四月 2023 18:55:20 +0800
Subject: [PATCH] add community publicity
---
service-common/src/main/java/com/java110/common/api/MachineApi.java | 47 ++++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 46 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 a2e5c2a..2a42916 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
@@ -13,6 +13,8 @@
import com.java110.utils.util.Assert;
import com.java110.utils.util.BeanConvertUtil;
import com.java110.utils.util.DateUtil;
+import org.slf4j.Logger;
+import com.java110.core.log.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.ResponseEntity;
import org.springframework.web.bind.annotation.*;
@@ -26,7 +28,10 @@
@RequestMapping(value = "/machine")
public class MachineApi {
+ private static Logger logger = LoggerFactory.getLogger(MachineApi.class);
+
private static final String USER_ROLE_OWNER = "owner";
+
@Autowired
private IMachineOpenDoorBMO machineOpenDoorBMOImpl;
@@ -61,6 +66,46 @@
}
Assert.hasKeyAndValue(reqJson, "userId", "璇锋眰鎶ユ枃涓湭鍖呭惈鐢ㄦ埛淇℃伅");
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);
+ }
+
+
+
+ /**
+ * 璁惧浜岀淮鐮�
+ *
+ * @param reqJson
+ * @return
+ * @serviceCode /machine/getQRcode
+ * @path /app/machine/getQRcode
+ */
+ @RequestMapping(value = "/getQRcode", method = RequestMethod.POST)
+ public ResponseEntity<String> getQRcode(@RequestBody JSONObject reqJson) {
+ Assert.hasKeyAndValue(reqJson, "communityId", "璇锋眰鎶ユ枃涓湭鍖呭惈灏忓尯淇℃伅");
+ Assert.hasKeyAndValue(reqJson, "userId", "璇锋眰鎶ユ枃涓湭鍖呭惈鐢ㄦ埛淇℃伅");
+ Assert.hasKeyAndValue(reqJson, "machineCode", "璇锋眰鎶ユ枃涓湭鍖呭惈璁惧淇℃伅");
+
+ return machineOpenDoorBMOImpl.getQRcode(reqJson);
}
/**
@@ -128,7 +173,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