TRX 1 жил өмнө
parent
commit
f6fa824547

+ 6 - 0
FullCardServer/pom.xml

@@ -48,6 +48,12 @@
             <version>${project.version}</version>
         </dependency>
 
+        <dependency>
+            <groupId>com.zswl</groupId>
+            <artifactId>ConfigModel</artifactId>
+            <version>1.0.0-SNAPSHOT</version>
+        </dependency>
+
         <!--		<dependency>-->
         <!--			<groupId>com.github.microservice.auth</groupId>-->
         <!--			<artifactId>AuthClient</artifactId>-->

+ 35 - 0
FullCardServer/src/main/java/com/zhongshu/card/server/core/controller/iotCenter/DeviceSyncController.java

@@ -0,0 +1,35 @@
+package com.zhongshu.card.server.core.controller.iotCenter;
+
+import com.zhongshu.card.client.model.mqtt.SendMessageModel;
+import com.zhongshu.card.client.ret.ResultContent;
+import com.zhongshu.card.server.core.service.mqtt.MqttServiceImpl;
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import org.apiguardian.api.API;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ *
+ */
+@RequestMapping("/deviceSync")
+@RestController
+@Validated
+@Tag(name = "mqtt测试接口111")
+public class DeviceSyncController {
+
+    @Autowired
+    MqttServiceImpl mqttService;
+
+    @Operation(summary = "发送指令")
+    @RequestMapping(value = "sendMessage", method = {RequestMethod.POST})
+    public ResultContent sendMessage(@RequestBody SendMessageModel param) {
+        return mqttService.sendMessage(param);
+    }
+
+}
+

+ 6 - 1
FullCardServer/src/main/java/com/zhongshu/card/server/core/controller/org/IndexController.java

@@ -136,9 +136,14 @@ public class IndexController {
     }
 
     @Operation(summary = "微信小程序得到电话号码", description = "微信小程序得到电话号码")
-    @RequestMapping(value = "/free/getPhoneNumber", method = {RequestMethod.POST})
+    @RequestMapping(value = "/getPhoneNumber", method = {RequestMethod.POST})
     public ResultContent getPhoneNumber(@RequestBody GetPhoneModel param) {
         return indexService.getPhoneNum(param);
     }
 
+    @Operation(summary = "验证令牌是否有效", description = "验证令牌是否有效")
+    @RequestMapping(value = "verificationToken", method = RequestMethod.GET)
+    public ResultContent verificationToken() {
+        return indexService.verificationToken();
+    }
 }

+ 16 - 0
FullCardServer/src/main/java/com/zhongshu/card/server/core/service/org/IndexService.java

@@ -6,6 +6,7 @@ import com.github.microservice.auth.client.model.UserAuthLoginModel;
 import com.github.microservice.auth.client.model.UserTokenModel;
 import com.github.microservice.auth.client.service.UserService;
 import com.github.microservice.auth.security.helper.AuthHelper;
+import com.github.microservice.auth.security.model.AuthDetails;
 import com.github.microservice.auth.security.type.AuthType;
 import com.github.microservice.components.data.mongo.mongo.helper.DBHelper;
 import com.github.microservice.core.util.net.IPUtil;
@@ -184,6 +185,21 @@ public class IndexService {
         return ResultContent.buildSuccess(tokenModel);
     }
 
+    /**
+     * 验证令牌是否有效
+     *
+     * @param
+     * @return
+     */
+    public ResultContent<Boolean> verificationToken() {
+        boolean b = false;
+        AuthDetails authDetails = authHelper.getCurrentUser();
+        if (ObjectUtils.isNotEmpty(authDetails)) {
+            b = true;
+        }
+        return ResultContent.buildSuccess(b);
+    }
+
     public ResultContent<LoginTokenModel> commonLogin(UserAuthLoginModel userAuthLoginModel) {
         String phone = userAuthLoginModel.getLoginValue();
         userAuthLoginModel.setDeviceIp(IPUtil.getRemoteIp(request));