相机树

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

@@ -44,7 +44,6 @@ 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()
@@ -84,7 +83,7 @@ public class BaseDeviceDynamicManagementServiceImpl extends ServiceImpl<BaseDevi
                 // 摄像头
                 CameraTree build2 = CameraTree.builder()
                         .code(o.getCameraCode())
-                        .name("相机" + cameraName++)
+                        .name(o.getCameraCode())
                         .flay(true)
                         .children(new ArrayList<>())
                         .build();

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

@@ -608,9 +608,9 @@ public class BaseCameraManagementController extends BaseController {
     /**
      * 视频服务树形结构
      *
-     * @param railwayCode 线路
-     * @param lineDir     行别
-     * @param mils        里程位置
+     * @param 
+     * @param  
+     * @param 
      * @return
      */
     @ApiOperation("视频服务树形结构")
@@ -618,15 +618,16 @@ public class BaseCameraManagementController extends BaseController {
     @Log(title = "相机台账管理", businessType = BusinessType.OTHER)
     public AjaxResult cameraTree(@RequestBody CameraTreeVo baseCameraResVo) {
         String railwayCode = null;
-        if (!StringUtils.isEmpty(baseCameraResVo) || !StringUtils.isEmpty(baseCameraResVo.getRailwayCode())) {
+        int count=0;
+        if (!StringUtils.isEmpty(baseCameraResVo.getRailwayCode())) {
             railwayCode = baseCameraResVo.getRailwayCode();
         }
         Integer lineDir = null;
-        if (!StringUtils.isEmpty(baseCameraResVo) || !StringUtils.isEmpty(baseCameraResVo.getRailwayCode())) {
+        if ( !StringUtils.isEmpty(baseCameraResVo.getRailwayCode())) {
             lineDir = baseCameraResVo.getLineDir();
         }
         Integer milsInt = null;
-        if (!StringUtils.isEmpty(baseCameraResVo) || !ObjectUtils.isEmpty(baseCameraResVo.getMils())) {
+        if ( StringUtils.isNotEmpty(baseCameraResVo.getMils())) {
             if (!baseCameraResVo.getMils().matches(PATTERN)) {
                 return error("里程位置填写格式不正确!");
             }
@@ -663,9 +664,15 @@ public class BaseCameraManagementController extends BaseController {
             for (CameraTree tree : children1) {
                 List<CameraTree> children2 = tree.getChildren();
                 if (children2.size() < 2) {
-                    String code = children2.get(0).getName();
+                    String code = children2.get(0).getCode();
                     tree.setCode(code);
                     children2.remove(0);
+                }else {
+                    for (CameraTree cameraTree1 : children2) {
+                         count=count+1;
+                         cameraTree1.setName("相机"+count);
+                    }
+                    count=0;
                 }
             }
         }