1.完善模板解析功能

2.调整直连设备接入流程

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

@@ -0,0 +1,64 @@
+package com.njcn.access.controller;
+
+
+import com.njcn.access.pojo.po.CsDataArrayPO;
+import com.njcn.access.pojo.po.CsDataSetPO;
+import com.njcn.access.service.ICsDataArrayService;
+import com.njcn.access.service.ICsDataSetService;
+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.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 数据集表 前端控制器
+ * </p>
+ *
+ * @author xuyang
+ * @since 2023-08-01
+ */
+@Slf4j
+@RestController
+@RequestMapping("/csDataArray")
+@Api(tags = "终端详细数据集")
+@AllArgsConstructor
+public class CsDataArrayController extends BaseController {
+
+    private final ICsDataArrayService csDataArrayService;
+
+    @OperateInfo(info = LogEnum.BUSINESS_COMMON)
+    @PostMapping("/add")
+    @ApiOperation("新增详细数据集")
+    @ApiImplicitParam(name = "csDataArrayPo", value = "数据集", required = true)
+    public HttpResult<String> add(@RequestBody CsDataArrayPO csDataArrayPo){
+        String methodDescribe = getMethodDescribe("add");
+        csDataArrayService.add(csDataArrayPo);
+        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, null, methodDescribe);
+    }
+
+    @OperateInfo(info = LogEnum.BUSINESS_COMMON)
+    @PostMapping("/addList")
+    @ApiOperation("批量新增详细数据集")
+    @ApiImplicitParam(name = "list", value = "数据集集合", required = true)
+    public HttpResult<String> addList(@RequestBody List<CsDataArrayPO> list){
+        String methodDescribe = getMethodDescribe("addList");
+        csDataArrayService.addList(list);
+        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, null, methodDescribe);
+    }
+
+}
+

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

@@ -0,0 +1,64 @@
+package com.njcn.access.controller;
+
+
+import com.njcn.access.pojo.po.CsDataSetPO;
+import com.njcn.access.service.ICsDataSetService;
+import com.njcn.access.service.ICsDevModelService;
+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 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.transaction.annotation.Transactional;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
+import com.njcn.web.controller.BaseController;
+import org.springframework.web.multipart.MultipartFile;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 数据集表 前端控制器
+ * </p>
+ *
+ * @author xuyang
+ * @since 2023-08-01
+ */
+@Slf4j
+@RestController
+@RequestMapping("/csDataSet")
+@Api(tags = "终端数据集")
+@AllArgsConstructor
+public class CsDataSetController extends BaseController {
+
+    private final ICsDataSetService csDataSetService;
+
+    @OperateInfo(info = LogEnum.BUSINESS_COMMON)
+    @PostMapping("/add")
+    @ApiOperation("新增数据集")
+    @ApiImplicitParam(name = "csDataSetPo", value = "数据集", required = true)
+    public HttpResult<String> add(@RequestBody CsDataSetPO csDataSetPo){
+        String methodDescribe = getMethodDescribe("add");
+        csDataSetService.add(csDataSetPo);
+        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, null, methodDescribe);
+    }
+
+    @OperateInfo(info = LogEnum.BUSINESS_COMMON)
+    @PostMapping("/addList")
+    @ApiOperation("批量新增数据集")
+    @ApiImplicitParam(name = "list", value = "数据集集合", required = true)
+    public HttpResult<String> addList(@RequestBody List<CsDataSetPO> list){
+        String methodDescribe = getMethodDescribe("addList");
+        csDataSetService.addList(list);
+        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, null, methodDescribe);
+    }
+
+}
+

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

@@ -40,7 +40,9 @@ public class CsDevModelController extends BaseController {
     @Transactional(rollbackFor = {Exception.class})
     public HttpResult<String> addModel(@RequestPart("file") @Validated MultipartFile file){
         String methodDescribe = getMethodDescribe("addModel");
+        //1.录入通用字典
         csDevModelService.addDict(file);
+        //2.解析模板数据
         csDevModelService.addModel(file);
         return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, null, methodDescribe);
     }

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

@@ -1,13 +1,25 @@
 package com.njcn.access.controller;
 
 
+import com.njcn.access.pojo.po.CsLineModel;
+import com.njcn.access.service.ICsLineModelService;
+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.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
-
 import org.springframework.web.bind.annotation.RestController;
-import com.njcn.web.controller.BaseController;
+
+import java.util.List;
 
 /**
  * <p>
@@ -24,7 +36,27 @@ import com.njcn.web.controller.BaseController;
 @AllArgsConstructor
 public class CsLineModelController extends BaseController {
 
+    private final ICsLineModelService csLineModelService;
 
+    @OperateInfo(info = LogEnum.BUSINESS_COMMON)
+    @PostMapping("/add")
+    @ApiOperation("新增模板监测点")
+    @ApiImplicitParam(name = "csLineModel", value = "监测点信息", required = true)
+    public HttpResult<String> add(@RequestBody CsLineModel csLineModel){
+        String methodDescribe = getMethodDescribe("add");
+        csLineModelService.add(csLineModel);
+        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, null, methodDescribe);
+    }
+
+    @OperateInfo(info = LogEnum.BUSINESS_COMMON)
+    @PostMapping("/addList")
+    @ApiOperation("批量新增模板监测点")
+    @ApiImplicitParam(name = "list", value = "监测点集合", required = true)
+    public HttpResult<String> addList(@RequestBody List<CsLineModel> list){
+        String methodDescribe = getMethodDescribe("addList");
+        csLineModelService.addList(list);
+        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, null, methodDescribe);
+    }
 
 }