1.完善模板解析功能

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

@@ -20,6 +20,7 @@ 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 springfox.documentation.annotations.ApiIgnore;
 
 import java.util.List;
 
@@ -36,6 +37,7 @@ import java.util.List;
 @RequestMapping("/csDataArray")
 @Api(tags = "终端详细数据集")
 @AllArgsConstructor
+@ApiIgnore
 public class CsDataArrayController extends BaseController {
 
     private final ICsDataArrayService csDataArrayService;

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

@@ -20,6 +20,7 @@ import org.springframework.web.bind.annotation.*;
 
 import com.njcn.web.controller.BaseController;
 import org.springframework.web.multipart.MultipartFile;
+import springfox.documentation.annotations.ApiIgnore;
 
 import java.util.List;
 
@@ -36,6 +37,7 @@ import java.util.List;
 @RequestMapping("/csDataSet")
 @Api(tags = "终端数据集")
 @AllArgsConstructor
+@ApiIgnore
 public class CsDataSetController extends BaseController {
 
     private final ICsDataSetService csDataSetService;

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

@@ -1,5 +1,6 @@
 package com.njcn.access.controller;
 
+import cn.hutool.core.collection.CollectionUtil;
 import com.njcn.access.pojo.param.DevModelParam;
 import com.njcn.access.service.ICsDevModelService;
 import com.njcn.common.pojo.annotation.OperateInfo;
@@ -7,6 +8,7 @@ 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.csdevice.api.CsGroupFeignClient;
 import com.njcn.web.controller.BaseController;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;
@@ -18,6 +20,8 @@ import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
 
+import java.util.List;
+
 /**
  * 类的介绍：
  *

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

@@ -0,0 +1,67 @@
+package com.njcn.access.controller;
+
+
+import com.njcn.access.service.ICsGroArrService;
+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.common.utils.LogUtil;
+import com.njcn.csdevice.pojo.po.CsGroArr;
+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 springfox.documentation.annotations.ApiIgnore;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 组和指标关系表 前端控制器
+ * </p>
+ *
+ * @author xuyang
+ * @since 2023-06-19
+ */
+@Slf4j
+@RestController
+@RequestMapping("/csGroArr")
+@Api(tags = "组和指标关系")
+@AllArgsConstructor
+@ApiIgnore
+public class CsGroArrController extends BaseController {
+
+    private final ICsGroArrService csGroArrService;
+
+    @PostMapping("/add")
+    @OperateInfo(info = LogEnum.SYSTEM_COMMON)
+    @ApiOperation("新增组和指标关系")
+    @ApiImplicitParam(name = "csGroArr", value = "分组信息", required = true)
+    public HttpResult<String> add(@RequestBody CsGroArr csGroArr) {
+        String methodDescribe = getMethodDescribe("add");
+        LogUtil.njcnDebug(log, "{}，分组信息为：{}", methodDescribe, csGroArr);
+        csGroArrService.addGroArr(csGroArr);
+        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, null, methodDescribe);
+    }
+
+    @PostMapping("/addList")
+    @OperateInfo(info = LogEnum.SYSTEM_COMMON)
+    @ApiOperation("批量新增组和指标关系")
+    @ApiImplicitParam(name = "list", value = "分组信息集合", required = true)
+    public HttpResult<String> addList(@RequestBody List<CsGroArr> list) {
+        String methodDescribe = getMethodDescribe("updateGroArr");
+        LogUtil.njcnDebug(log, "{}，分组信息为：{}", methodDescribe, list);
+        csGroArrService.addGroArrList(list);
+        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, null, methodDescribe);
+    }
+
+}
+

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

@@ -0,0 +1,64 @@
+package com.njcn.access.controller;
+
+
+import com.njcn.access.service.ICsGroupService;
+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.csdevice.pojo.po.CsGroup;
+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 springfox.documentation.annotations.ApiIgnore;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 数据分组表 前端控制器
+ * </p>
+ *
+ * @author xuyang
+ * @since 2023-06-16
+ */
+@Slf4j
+@RestController
+@RequestMapping("/csGroup")
+@Api(tags = "指标分组")
+@AllArgsConstructor
+@ApiIgnore
+public class CsGroupController extends BaseController {
+
+    private final ICsGroupService csGroupService;
+
+    @OperateInfo(info = LogEnum.BUSINESS_COMMON)
+    @PostMapping("/add")
+    @ApiOperation("新增分组")
+    @ApiImplicitParam(name = "csGroup", value = "组数据", required = true)
+    public HttpResult<String> add(@RequestBody CsGroup csGroup){
+        String methodDescribe = getMethodDescribe("add");
+        csGroupService.add(csGroup);
+        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<CsGroup> list){
+        String methodDescribe = getMethodDescribe("addList");
+        csGroupService.addList(list);
+        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, null, methodDescribe);
+    }
+
+}
+

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

@@ -18,6 +18,7 @@ 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 springfox.documentation.annotations.ApiIgnore;
 
 import java.util.List;
 
@@ -34,6 +35,7 @@ import java.util.List;
 @RequestMapping("/csLineModel")
 @Api(tags = "监测点模板")
 @AllArgsConstructor
+@ApiIgnore
 public class CsLineModelController extends BaseController {
 
     private final ICsLineModelService csLineModelService;