From 71c46b7bd98518935082a3388ee5039d034507a9 Mon Sep 17 00:00:00 2001
From: xuyang <748613696@qq.com>
Date: Wed, 30 Aug 2023 17:36:39 +0800
Subject: [PATCH] =?UTF-8?q?=E5=BE=AE=E8=B0=83?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/njcn/access/controller/CsDeviceController.java  | 2 +-
 .../java/com/njcn/access/handler/MqttMessageHandler.java     | 1 +
 pom.xml                                                      | 5 ++---
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/iot-access/access-boot/src/main/java/com/njcn/access/controller/CsDeviceController.java b/iot-access/access-boot/src/main/java/com/njcn/access/controller/CsDeviceController.java
index 7ed2bcf..9a239ab 100644
--- a/iot-access/access-boot/src/main/java/com/njcn/access/controller/CsDeviceController.java
+++ b/iot-access/access-boot/src/main/java/com/njcn/access/controller/CsDeviceController.java
@@ -60,7 +60,7 @@ public class CsDeviceController extends BaseController {
     @ApiOperation("直连设备注册")
     @ApiImplicitParam(name = "devAccessParam", value = "接入参数", required = true)
     public HttpResult<String> devAccess(@RequestBody @Validated DevAccessParam devAccessParam){
-        String methodDescribe = getMethodDescribe("getModel");
+        String methodDescribe = getMethodDescribe("devAccess");
         csDeviceService.devAccess(devAccessParam);
         return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, null, methodDescribe);
     }
diff --git a/iot-access/access-boot/src/main/java/com/njcn/access/handler/MqttMessageHandler.java b/iot-access/access-boot/src/main/java/com/njcn/access/handler/MqttMessageHandler.java
index 4977ded..a750508 100644
--- a/iot-access/access-boot/src/main/java/com/njcn/access/handler/MqttMessageHandler.java
+++ b/iot-access/access-boot/src/main/java/com/njcn/access/handler/MqttMessageHandler.java
@@ -298,6 +298,7 @@ public class MqttMessageHandler {
                 if (Objects.equals(res.getCode(),AccessEnum.SUCCESS.getCode())){
                     log.info("接入应答成功--->" + nDid);
                     //修改装置状态
+                    csEquipmentDeliveryService.updateStatusBynDid(nDid,AccessEnum.ACCESS.getCode());
                     csEquipmentDeliveryService.updateRunStatusBynDid(nDid,AccessEnum.ONLINE.getCode());
                 } else {
                     log.info(AccessResponseEnum.ACCESS_RESPONSE_ERROR.getMessage());
diff --git a/pom.xml b/pom.xml
index 6e5d8a4..9677e11 100644
--- a/pom.xml
+++ b/pom.xml
@@ -34,8 +34,7 @@
     <!--中间件目标地址-->
     <middle.server.url>192.168.1.13</middle.server.url>
     <!--微服务模块发布地址-->
-<!--    <service.server.url>192.168.1.13</service.server.url>-->
-    <service.server.url>127.0.0.1</service.server.url>
+    <service.server.url>192.168.1.139</service.server.url>
     <!--docker仓库地址-->
     <docker.server.url>192.168.1.13</docker.server.url>
     <!--nacos的ip:port-->
@@ -55,7 +54,7 @@
     <docker.registry.name>njcn</docker.registry.name>
     <!--切换阿里&华为的配置sdk-->
     <micro.sdk>common-microservice</micro.sdk>
-    <!--        <micro.sdk>common-huawei</micro.sdk>-->
+    <!--<micro.sdk>common-huawei</micro.sdk>-->
     <docker.operate>site</docker.operate>
     <java.version>1.8</java.version>
     <maven.compiler.source>8</maven.compiler.source>