代码调整

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

@@ -35,7 +35,7 @@ public class CsDeviceController extends BaseController {
 
     @OperateInfo(info = LogEnum.BUSINESS_COMMON)
     @PostMapping("/register")
-    @ApiOperation("设备注册")
+    @ApiOperation("直连设备注册")
     @ApiImplicitParam(name = "nDid", value = "设备识别码", required = true)
     public HttpResult<String> devRegister(@RequestParam String nDid){
         csDeviceService.devRegister(nDid);
@@ -44,7 +44,7 @@ public class CsDeviceController extends BaseController {
 
     @OperateInfo(info = LogEnum.BUSINESS_COMMON)
     @PostMapping("/model")
-    @ApiOperation("获取装置模板信息")
+    @ApiOperation("获取直连设备模板信息")
     @ApiImplicitParam(name = "nDid", value = "设备识别码", required = true)
     public HttpResult<Object> getModel(@RequestParam String nDid){
         String methodDescribe = getMethodDescribe("getModel");
@@ -54,12 +54,11 @@ public class CsDeviceController extends BaseController {
 
     @OperateInfo(info = LogEnum.BUSINESS_COMMON)
     @PostMapping("/access")
-    @ApiOperation("设备接入")
+    @ApiOperation("直连设备接入")
     @ApiImplicitParam(name = "devAccessParam", value = "接入参数", required = true)
     public HttpResult<String> devAccess(@RequestBody @Validated DevAccessParam devAccessParam){
         String methodDescribe = getMethodDescribe("getModel");
         csDeviceService.devAccess(devAccessParam);
         return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, null, methodDescribe);
     }
-
 }

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

@@ -0,0 +1,92 @@
+package com.njcn.access.controller;
+
+
+import com.njcn.access.param.WgDeviceRegisterParam;
+import com.njcn.access.param.WgRegisterParam;
+import com.njcn.access.pojo.vo.CsGatewayVo;
+import com.njcn.access.service.ICsGatewayService;
+import com.njcn.common.pojo.annotation.OperateInfo;
+import com.njcn.common.pojo.enums.common.LogEnum;
+import com.njcn.common.pojo.enums.response.CommonResponseEnum;
+import com.njcn.common.pojo.response.HttpResult;
+import com.njcn.common.utils.HttpResultUtil;
+import com.njcn.web.controller.BaseController;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiOperation;
+import lombok.AllArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 网关表 前端控制器
+ * </p>
+ *
+ * @author xuyang
+ * @since 2023-07-06
+ */
+@Slf4j
+@RestController
+@RequestMapping("/csGateway")
+@Api(tags = "治理网关信息")
+@AllArgsConstructor
+@Validated
+public class CsGatewayController extends BaseController {
+
+    private final ICsGatewayService csGatewayService;
+
+    @OperateInfo(info = LogEnum.BUSINESS_COMMON)
+    @PostMapping("/wgRegister")
+    @ApiOperation("网关注册1")
+    @ApiImplicitParam(name = "nDid", value = "设备识别码", required = true)
+    public HttpResult<String> wgRegister(@RequestParam String nDid){
+        String methodDescribe = getMethodDescribe("wgRegister");
+        csGatewayService.wgRegister(nDid);
+        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, null, methodDescribe);
+    }
+
+    @OperateInfo(info = LogEnum.BUSINESS_COMMON)
+    @PostMapping("/wgRegister2")
+    @ApiOperation("网关注册2")
+    @ApiImplicitParam(name = "wgRegisterParam", value = "网关注册参数", required = true)
+    public HttpResult<String> wgRegister2(@RequestBody @Validated WgRegisterParam wgRegisterParam){
+        String methodDescribe = getMethodDescribe("wgRegister2");
+        csGatewayService.wgRegister2(wgRegisterParam);
+        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, null, methodDescribe);
+    }
+
+    @OperateInfo(info = LogEnum.BUSINESS_COMMON)
+    @PostMapping("/findList")
+    @ApiOperation("网关列表")
+    public HttpResult<List<CsGatewayVo>> findList(){
+        String methodDescribe = getMethodDescribe("findList");
+        List<CsGatewayVo> list = csGatewayService.getWgList();
+        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, list, methodDescribe);
+    }
+
+    @OperateInfo(info = LogEnum.BUSINESS_COMMON)
+    @PostMapping("/findById")
+    @ApiOperation("网关详情")
+    @ApiImplicitParam(name = "wgId", value = "网关注册参数", required = true)
+    public HttpResult<CsGatewayVo> findById(@RequestParam String wgId){
+        String methodDescribe = getMethodDescribe("findById");
+        CsGatewayVo vo = csGatewayService.findById(wgId);
+        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, vo, methodDescribe);
+    }
+
+    @OperateInfo(info = LogEnum.BUSINESS_COMMON)
+    @PostMapping("/registerByWg")
+    @ApiOperation("网关下设备注册")
+    @ApiImplicitParam(name = "list", value = "网关下设备注册参数集合", required = true)
+    public HttpResult<String> registerByWg(@RequestBody @Validated List<WgDeviceRegisterParam> list){
+        String methodDescribe = getMethodDescribe("registerByWg");
+        csGatewayService.registerByWg(list);
+        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, null, methodDescribe);
+    }
+
+}
+