组态功能

cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/controller/equipment/CsDataArrayController.java

@@ -1,4 +1,4 @@
-package com.njcn.csdevice.controller.Equipment;
+package com.njcn.csdevice.controller.equipment;
 
 
 import com.njcn.common.pojo.annotation.OperateInfo;
@@ -8,6 +8,7 @@ import com.njcn.common.pojo.response.HttpResult;
 import com.njcn.common.utils.HttpResultUtil;
 import com.njcn.csdevice.pojo.po.CsDataArray;
 import com.njcn.csdevice.pojo.po.CsDataSet;
+import com.njcn.csdevice.pojo.vo.DataArrayTreeVO;
 import com.njcn.csdevice.pojo.vo.LineTargetVO;
 import com.njcn.csdevice.service.ICsDataArrayService;
 import com.njcn.web.controller.BaseController;
@@ -52,9 +53,9 @@ public class CsDataArrayController extends BaseController {
     @PostMapping("/getDataArray")
     @ApiOperation("获取详细数据")
     @ApiImplicitParam(name = "dataSetList", value = "数据集集合", required = true)
-    public HttpResult<List<LineTargetVO>> getDataArray(@RequestBody List<String> dataSetList){
+    public HttpResult<List<DataArrayTreeVO>> getDataArray(@RequestBody List<String> dataSetList){
         String methodDescribe = getMethodDescribe("getDataArray");
-        List<LineTargetVO> list = csDataArrayService.getDataArray(dataSetList);
+        List<DataArrayTreeVO> list = csDataArrayService.getDataArray(dataSetList);
         return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, list, methodDescribe);
     }
 

cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/controller/equipment/CsDataSetController.java

@@ -1,4 +1,4 @@
-package com.njcn.csdevice.controller.Equipment;
+package com.njcn.csdevice.controller.equipment;
 
 
 import com.njcn.common.pojo.annotation.OperateInfo;

cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/controller/equipment/CsEquipmentTransferPOController.java

@@ -1,4 +1,4 @@
-package com.njcn.csdevice.controller.Equipment;
+package com.njcn.csdevice.controller.equipment;
 
 import com.njcn.csdevice.pojo.param.CsEquipmentTransferAddParm;
 import com.njcn.common.pojo.annotation.OperateInfo;

cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/controller/equipment/DevModelController.java

@@ -1,4 +1,4 @@
-package com.njcn.csdevice.controller.Equipment;
+package com.njcn.csdevice.controller.equipment;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.njcn.csdevice.pojo.param.CsDevModelAddParm;
@@ -105,7 +105,7 @@ public class DevModelController extends BaseController {
     @ApiOperation("根据模板Id获取模板数据")
     @ApiImplicitParam(name = "id", value = "模板id", required = true)
     public HttpResult<CsDevModelPO> getModelById(@RequestParam("id") String id){
-        String methodDescribe = getMethodDescribe("getDataById");
+        String methodDescribe = getMethodDescribe("getModelById");
         CsDevModelPO po  = csDevModelService.getModelById(id);
         return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, po, methodDescribe);
     }

cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/controller/equipment/DevModelRelationController.java

@@ -1,4 +1,4 @@
-package com.njcn.csdevice.controller.Equipment;
+package com.njcn.csdevice.controller.equipment;
 
 
 import com.njcn.csdevice.pojo.param.CsDevModelRelationAddParm;

cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/controller/equipment/DeviceManagerController.java

@@ -0,0 +1,45 @@
+package com.njcn.csdevice.controller.equipment;
+
+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.param.CsEquipmentDeliveryAddParm;
+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.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * 类的介绍：
+ *
+ * @author xuyang
+ * @version 1.0.0
+ * @createTime 2023/6/13 15:44
+ */
+@Slf4j
+@RestController
+@RequestMapping("/deviceManager")
+@Api(tags = " 设备管理")
+@AllArgsConstructor
+public class DeviceManagerController extends BaseController {
+
+    @OperateInfo(info = LogEnum.BUSINESS_COMMON)
+    @PostMapping("/deviceTree")
+    @ApiOperation("设备树")
+    public HttpResult<Boolean> getDeviceTree(){
+        String methodDescribe = getMethodDescribe("getDeviceTree");
+        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, null, methodDescribe);
+    }
+
+
+
+}

cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/controller/equipment/DeviceMonitorController.java

@@ -0,0 +1,23 @@
+package com.njcn.csdevice.controller.equipment;
+
+import com.njcn.web.controller.BaseController;
+import io.swagger.annotations.Api;
+import lombok.AllArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * 类的介绍：
+ *
+ * @author xuyang
+ * @version 1.0.0
+ * @createTime 2023/6/13 15:45
+ */
+@Slf4j
+@RestController
+@RequestMapping("/deviceMonitor")
+@Api(tags = " 设备监控")
+@AllArgsConstructor
+public class DeviceMonitorController extends BaseController {
+}

cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/controller/equipment/EquipmentDeliveryController.java

@@ -1,4 +1,4 @@
-package com.njcn.csdevice.controller.Equipment;
+package com.njcn.csdevice.controller.equipment;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;