视频树修改

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

@@ -1,5 +1,6 @@
 package com.ozs.service.service.impl;
 
+import com.ozs.common.utils.AppendUtils;
 import com.ozs.service.entity.BaseDeviceDynamicManagement;
 import com.ozs.service.entity.CameraTree;
 import com.ozs.service.entity.vo.BaseCameraManagementDto;
@@ -59,9 +60,10 @@ public class BaseDeviceDynamicManagementServiceImpl extends ServiceImpl<BaseDevi
                 }
 
                 // 里程
+                String mils = AppendUtils.stringAppend(o.getInstallMile());
                 CameraTree build1 = CameraTree.builder()
-                        .code(o.getInstallMile() + "-" + (o.getLineDir().equals("1") ? "上行" : "下行"))
-                        .name(o.getInstallMile() + "-" + (o.getLineDir().equals("1") ? "上行" : "下行"))
+                        .code(mils + "-" + (o.getLineDir().equals("1") ? "上行" : "下行"))
+                        .name(mils + "-" + (o.getLineDir().equals("1") ? "上行" : "下行"))
                         .flay(true)
                         .children(new ArrayList<>())
                         .build();

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

@@ -20,6 +20,7 @@ import com.ozs.framework.config.ServerConfig;
 import com.ozs.service.entity.BaseCameraManagement;
 import com.ozs.service.entity.BaseDeviceDynamicManagement;
 import com.ozs.service.entity.BaseRailwayManagement;
+import com.ozs.service.entity.CameraTree;
 import com.ozs.service.entity.MsgAlarm;
 import com.ozs.service.entity.vo.BaseCameraManagementVo;
 import com.ozs.service.entity.vo.BaseCameraResVo;
@@ -417,7 +418,20 @@ public class BaseCameraManagementController extends BaseController {
     @ApiOperation("视频服务树形结构")
     @GetMapping("/cameraTree")
     public AjaxResult cameraTree(@RequestParam(value = "name", required = false) String name) {
-        return success(baseDeviceDynamicManagementService.cameraTree(name));
+        CameraTree cameraTree = baseDeviceDynamicManagementService.cameraTree(name);
+        List<CameraTree> children = cameraTree.getChildren();
+        for (CameraTree child : children) {
+            List<CameraTree> children1 = child.getChildren();
+            for (CameraTree tree : children1) {
+                List<CameraTree> children2 = tree.getChildren();
+                  if (children2.size()<2) {
+                      String code = children2.get(0).getName();
+                      tree.setCode(code);
+                      children2.remove(0);
+                  }
+            }
+        }
+        return success(cameraTree);
     }
 
     @ApiOperation("关闭视频录制")

hazard-admin/src/main/java/com/ozs/web/controller/common/CaptchaController.java

@@ -46,12 +46,12 @@ public class CaptchaController
     public AjaxResult getCode(HttpServletResponse response) throws IOException
     {
         AjaxResult ajax = AjaxResult.success();
-        boolean captchaEnabled = configService.selectCaptchaEnabled();
-        ajax.put("captchaEnabled", captchaEnabled);
-        if (!captchaEnabled)
-        {
-            return ajax;
-        }
+//        boolean captchaEnabled = configService.selectCaptchaEnabled();
+//        ajax.put("captchaEnabled", captchaEnabled);
+//        if (!captchaEnabled)
+//        {
+//            return ajax;
+//        }
 
         // 保存验证码信息
         String uuid = IdUtils.simpleUUID();