From 977753d3679f5d9211f4c635e9c5a48bbe7805b5 Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: 星期三, 21 六月 2023 17:52:04 +0800
Subject: [PATCH] 优化二维码
---
service-common/src/main/java/com/java110/common/api/MachineApi.java | 31 ++++++++++++++++++-------------
1 files changed, 18 insertions(+), 13 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 1a8e554..219a369 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
@@ -9,13 +9,10 @@
import com.java110.dto.machine.MachineDto;
import com.java110.dto.machine.MachineRecordDto;
import com.java110.dto.machine.MachineTranslateDto;
-import com.java110.dto.machineTranslateError.MachineTranslateErrorDto;
-import com.java110.utils.constant.KafkaConstant;
-import com.java110.utils.kafka.KafkaFactory;
+import com.java110.dto.machine.MachineTranslateErrorDto;
import com.java110.utils.util.Assert;
import com.java110.utils.util.BeanConvertUtil;
import com.java110.utils.util.DateUtil;
-import com.java110.vo.ResultVo;
import org.slf4j.Logger;
import com.java110.core.log.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
@@ -30,9 +27,11 @@
@RestController
@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;
@@ -69,24 +68,30 @@
return machineOpenDoorBMOImpl.openDoor(reqJson);
}
-
/**
- * 璁惧浜岀淮鐮�
+ * 璁惧寮�闂ㄥ姛鑳�
*
* @param reqJson
* @return
- * @serviceCode /machine/getQRcode
- * @path /app/machine/getQRcode
+ * @serviceCode /machine/closeDoor
+ * @path /app/machine/closeDoor
*/
- @RequestMapping(value = "/getQRcode", method = RequestMethod.POST)
- public ResponseEntity<String> getQRcode(@RequestBody JSONObject reqJson) {
+ @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, "userId", "璇锋眰鎶ユ枃涓湭鍖呭惈鐢ㄦ埛淇℃伅");
Assert.hasKeyAndValue(reqJson, "machineCode", "璇锋眰鎶ユ枃涓湭鍖呭惈璁惧淇℃伅");
-
- return machineOpenDoorBMOImpl.getQRcode(reqJson);
+ Assert.hasKeyAndValue(reqJson, "userRole", "璇锋眰鎶ユ枃涓湭鍖呭惈鐢ㄦ埛瑙掕壊");
+ if (!USER_ROLE_OWNER.equals(reqJson.getString("userRole"))) { //杩欑涓� 鍛樺伐鐨勬儏鍐靛憿
+ reqJson.put("userId", userId);
+ }
+ Assert.hasKeyAndValue(reqJson, "userId", "璇锋眰鎶ユ枃涓湭鍖呭惈鐢ㄦ埛淇℃伅");
+ return machineOpenDoorBMOImpl.closeDoor(reqJson);
}
+
+
+
/**
* 璁惧寮�闂ㄥ姛鑳�
*
--
Gitblit v1.8.0