手动发起接入

iot-access/access-boot/src/main/java/com/njcn/access/controller/CsDeviceController.java

@@ -80,6 +80,16 @@ public class CsDeviceController extends BaseController {
         return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, null, methodDescribe);
     }
 
+    @OperateInfo(info = LogEnum.BUSINESS_COMMON)
+    @PostMapping("/manualAccess")
+    @ApiOperation("手动发起接入")
+    @ApiImplicitParam(name = "nDid", value = "设备id", required = true)
+    public HttpResult<String> manualAccess(@RequestParam String nDid){
+        String methodDescribe = getMethodDescribe("manualAccess");
+        csDeviceService.manualAccess(nDid);
+        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, null, methodDescribe);
+    }
+
     @OperateInfo(info = LogEnum.BUSINESS_COMMON)
     @PostMapping("/wlRegister")
     @ApiOperation("便携式设备注册")

iot-access/access-boot/src/main/java/com/njcn/access/runner/AccessApplicationRunner.java

@@ -1,47 +1,47 @@
-//package com.njcn.access.runner;
-//
-//import com.njcn.access.service.ICsEquipmentDeliveryService;
-//import com.njcn.access.service.ICsTopicService;
-//import com.njcn.access.service.impl.CsDeviceServiceImpl;
-//import com.njcn.csdevice.pojo.po.CsEquipmentDeliveryPO;
-//import lombok.extern.slf4j.Slf4j;
-//import org.springframework.boot.ApplicationArguments;
-//import org.springframework.boot.ApplicationRunner;
-//import org.springframework.stereotype.Component;
-//
-//import javax.annotation.Resource;
-//import java.util.List;
-//import java.util.Objects;
-//
-///**
-// * 类的介绍：用来重新发起设备的接入，存在程序意外停止了，缓存失效导致无法更新装置的状态，所以需要在程序启动时发起设备的接入
-// *
-// * @author xuyang
-// * @version 1.0.0
-// * @createTime 2023/8/28 13:57
-// */
-//@Component
-//@Slf4j
-//public class AccessApplicationRunner implements ApplicationRunner {
-//
-//    @Resource
-//    private CsDeviceServiceImpl csDeviceService;
-//
-//    @Resource
-//    private ICsTopicService csTopicService;
-//
-//    @Resource
-//    private ICsEquipmentDeliveryService csEquipmentDeliveryService;
-//
-//    @Override
-//    public void run(ApplicationArguments args){
-//        List<CsEquipmentDeliveryPO> list = csEquipmentDeliveryService.getAll();
-//        list.forEach(item->{
-//            String version = csTopicService.getVersion(item.getNdid());
-//            if (!Objects.isNull(version)){
-//                csDeviceService.devAccess(item.getNdid(),version);
-//            }
-//        });
-//    }
-//
-//}
+package com.njcn.access.runner;
+
+import com.njcn.access.service.ICsEquipmentDeliveryService;
+import com.njcn.access.service.ICsTopicService;
+import com.njcn.access.service.impl.CsDeviceServiceImpl;
+import com.njcn.csdevice.pojo.po.CsEquipmentDeliveryPO;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.boot.ApplicationArguments;
+import org.springframework.boot.ApplicationRunner;
+import org.springframework.stereotype.Component;
+
+import javax.annotation.Resource;
+import java.util.List;
+import java.util.Objects;
+
+/**
+ * 类的介绍：用来重新发起设备的接入，存在程序意外停止了，缓存失效导致无法更新装置的状态，所以需要在程序启动时发起设备的接入
+ *
+ * @author xuyang
+ * @version 1.0.0
+ * @createTime 2023/8/28 13:57
+ */
+@Component
+@Slf4j
+public class AccessApplicationRunner implements ApplicationRunner {
+
+    @Resource
+    private CsDeviceServiceImpl csDeviceService;
+
+    @Resource
+    private ICsTopicService csTopicService;
+
+    @Resource
+    private ICsEquipmentDeliveryService csEquipmentDeliveryService;
+
+    @Override
+    public void run(ApplicationArguments args){
+        List<CsEquipmentDeliveryPO> list = csEquipmentDeliveryService.getAll();
+        list.forEach(item->{
+            String version = csTopicService.getVersion(item.getNdid());
+            if (!Objects.isNull(version)){
+                csDeviceService.devAccess(item.getNdid(),version);
+            }
+        });
+    }
+
+}

iot-access/access-boot/src/main/java/com/njcn/access/service/ICsDeviceService.java

@@ -37,6 +37,12 @@ public interface ICsDeviceService {
      */
     void resetFactory(String nDid);
 
+    /**
+     * 手动发起接入
+     * @param nDid
+     */
+    void manualAccess(String nDid);
+
     /**
      * 直连设备注册
      * @param nDid 设备识别码

iot-access/access-boot/src/main/java/com/njcn/access/service/impl/CsDeviceServiceImpl.java

@@ -359,6 +359,12 @@ public class CsDeviceServiceImpl implements ICsDeviceService {
         }
     }
 
+    @Override
+    public void manualAccess(String nDid) {
+        String version = csTopicService.getVersion(nDid);
+        devAccess(nDid,version);
+    }
+
 
     @Override
     @Transactional(rollbackFor = {Exception.class})