From 05683f2b2bdbdbe21cf17ad523c21ab338bd1c54 Mon Sep 17 00:00:00 2001
From: wuxw <928255095@qq.com>
Date: 星期二, 19 七月 2022 21:49:55 +0800
Subject: [PATCH] 优化添加设备 功能
---
service-common/src/main/java/com/java110/common/api/MachineApi.java | 26 +++++++++++++++++++++++++-
1 files changed, 25 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 c392faa..086c08a 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
@@ -10,9 +10,14 @@
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.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;
import org.springframework.http.ResponseEntity;
import org.springframework.web.bind.annotation.*;
@@ -25,6 +30,7 @@
@RestController
@RequestMapping(value = "/machine")
public class MachineApi {
+ private static Logger logger = LoggerFactory.getLogger(MachineApi.class);
private static final String USER_ROLE_OWNER = "owner";
@Autowired
@@ -59,10 +65,28 @@
if (!USER_ROLE_OWNER.equals(reqJson.getString("userRole"))) { //杩欑涓� 鍛樺伐鐨勬儏鍐靛憿
reqJson.put("userId", userId);
}
- Assert.hasKeyAndValue(reqJson, "userId", "璇锋眰鎶ユ枃涓湭鍖呭惈璁惧淇℃伅");
+ Assert.hasKeyAndValue(reqJson, "userId", "璇锋眰鎶ユ枃涓湭鍖呭惈鐢ㄦ埛淇℃伅");
return machineOpenDoorBMOImpl.openDoor(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);
+ }
+
/**
* 璁惧寮�闂ㄥ姛鑳�
*
--
Gitblit v1.8.0