相机树

business-service/src/main/java/com/ozs/service/entity/vo/CameraTreeVo.java

@@ -0,0 +1,29 @@
+package com.ozs.service.entity.vo;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+/**
+ * @Author : sunhh
+ * @create 2023/3/31 16:06
+ */
+@Data
+@NoArgsConstructor
+@AllArgsConstructor
+public class CameraTreeVo {
+    /**
+     * 线路
+     */
+    private String railwayCode;
+
+    /**
+     * 行别
+     */
+    private Integer lineDir;
+
+    /**
+     * 里程位置
+     */
+    private String mils;
+}

business-service/src/main/java/com/ozs/service/service/impl/BaseDeviceDynamicManagementServiceImpl.java

@@ -44,6 +44,7 @@ public class BaseDeviceDynamicManagementServiceImpl extends ServiceImpl<BaseDevi
         Map<String, CameraTree> map = new HashMap<>();
         List<BaseCameraManagementDto> list = baseDeviceDynamicManagementMapper.list(name, lineDir, beginMile);
         if (list.size() > 0) {
+            Integer cameraName = 0;
             for (BaseCameraManagementDto o : list) {
                 // 线路
                 CameraTree build = CameraTree.builder()
@@ -83,7 +84,7 @@ public class BaseDeviceDynamicManagementServiceImpl extends ServiceImpl<BaseDevi
                 // 摄像头
                 CameraTree build2 = CameraTree.builder()
                         .code(o.getCameraCode())
-                        .name(o.getCameraCode())
+                        .name("相机" + cameraName++)
                         .flay(true)
                         .children(new ArrayList<>())
                         .build();

hazard-admin/src/main/java/com/ozs/web/controller/accountmanagment/BaseCameraManagementController.java

@@ -28,11 +28,7 @@ import com.ozs.service.entity.BaseRailwayManagement;
 import com.ozs.service.entity.BaseUser;
 import com.ozs.service.entity.CameraTree;
 import com.ozs.service.entity.MsgAlarm;
-import com.ozs.service.entity.vo.BaseCameraManagementHomeVo;
-import com.ozs.service.entity.vo.BaseCameraManagementVo;
-import com.ozs.service.entity.vo.BaseCameraManagementVos;
-import com.ozs.service.entity.vo.BaseCameraResVo;
-import com.ozs.service.entity.vo.MsgAlarmResp;
+import com.ozs.service.entity.vo.*;
 import com.ozs.service.service.BaseCameraManagementService;
 import com.ozs.service.service.BaseDeviceDynamicManagementService;
 import com.ozs.service.service.BaseRailwayManagementService;
@@ -618,17 +614,23 @@ public class BaseCameraManagementController extends BaseController {
      * @return
      */
     @ApiOperation("视频服务树形结构")
-    @GetMapping("/cameraTree")
+    @PostMapping("/cameraTree")
     @Log(title = "相机台账管理", businessType = BusinessType.OTHER)
-    public AjaxResult cameraTree(@RequestParam(value = "railwayCode", required = false) String railwayCode,
-                                 @RequestParam(value = "lineDir", required = false) Integer lineDir,
-                                 @RequestParam(value = "mils", required = false) String mils) {
+    public AjaxResult cameraTree(@RequestBody CameraTreeVo baseCameraResVo) {
+        String railwayCode = null;
+        if (!StringUtils.isEmpty(baseCameraResVo) || !StringUtils.isEmpty(baseCameraResVo.getRailwayCode())) {
+            railwayCode = baseCameraResVo.getRailwayCode();
+        }
+        Integer lineDir = null;
+        if (!StringUtils.isEmpty(baseCameraResVo) || !StringUtils.isEmpty(baseCameraResVo.getRailwayCode())) {
+            lineDir = baseCameraResVo.getLineDir();
+        }
         Integer milsInt = null;
-        if (!StringUtils.isEmpty(mils)) {
-            if (!mils.matches(PATTERN)) {
+        if (!StringUtils.isEmpty(baseCameraResVo) || !ObjectUtils.isEmpty(baseCameraResVo.getMils())) {
+            if (!baseCameraResVo.getMils().matches(PATTERN)) {
                 return error("里程位置填写格式不正确!");
             }
-            milsInt = AppendUtils.stringSplit(mils);
+            milsInt = AppendUtils.stringSplit(baseCameraResVo.getMils());
         }
         CameraTree cameraTree = baseDeviceDynamicManagementService.cameraTree(railwayCode, lineDir, milsInt);
         List<CameraTree> children = cameraTree.getChildren();