相机树增加权限控制

business-service/src/main/java/com/ozs/service/mapper/BaseDeviceDynamicManagementMapper.java

@@ -3,6 +3,7 @@ package com.ozs.service.mapper;
 import com.ozs.service.entity.BaseDeviceDynamicManagement;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.ozs.service.entity.vo.BaseCameraManagementDto;
+import com.ozs.service.entity.vo.CameraTreeVo;
 import io.lettuce.core.dynamic.annotation.Param;
 import org.apache.ibatis.annotations.Mapper;
 
@@ -19,5 +20,5 @@ import java.util.List;
 @Mapper
 public interface BaseDeviceDynamicManagementMapper extends BaseMapper<BaseDeviceDynamicManagement> {
 
-    List<BaseCameraManagementDto> list(@Param("name") String name, @Param("lineDir") Integer lineDir, @Param("beginMile") Integer beginMile);
+    List<BaseCameraManagementDto> list(CameraTreeVo cameraTreeVo);
 }

business-service/src/main/java/com/ozs/service/service/BaseDeviceDynamicManagementService.java

@@ -3,6 +3,7 @@ package com.ozs.service.service;
 import com.ozs.service.entity.BaseDeviceDynamicManagement;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.ozs.service.entity.CameraTree;
+import com.ozs.service.entity.vo.CameraTreeVo;
 
 /**
  * <p>
@@ -14,5 +15,5 @@ import com.ozs.service.entity.CameraTree;
  */
 public interface BaseDeviceDynamicManagementService extends IService<BaseDeviceDynamicManagement> {
 
-    CameraTree cameraTree(String name, Integer lineDir, Integer mils);
+    CameraTree cameraTree(CameraTreeVo cameraTreeVo);
 }

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

@@ -4,6 +4,7 @@ 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;
+import com.ozs.service.entity.vo.CameraTreeVo;
 import com.ozs.service.mapper.BaseDeviceDynamicManagementMapper;
 import com.ozs.service.service.BaseDeviceDynamicManagementService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@@ -31,7 +32,7 @@ public class BaseDeviceDynamicManagementServiceImpl extends ServiceImpl<BaseDevi
     BaseDeviceDynamicManagementMapper baseDeviceDynamicManagementMapper;
 
     @Override
-    public CameraTree cameraTree(String name, Integer lineDir, Integer beginMile) {
+    public CameraTree cameraTree(CameraTreeVo cameraTreeVo) {
 
 
         //1 父
@@ -42,7 +43,7 @@ public class BaseDeviceDynamicManagementServiceImpl extends ServiceImpl<BaseDevi
                 .children(new ArrayList<>())
                 .build();
         Map<String, CameraTree> map = new HashMap<>();
-        List<BaseCameraManagementDto> list = baseDeviceDynamicManagementMapper.list(name, lineDir, beginMile);
+        List<BaseCameraManagementDto> list = baseDeviceDynamicManagementMapper.list(cameraTreeVo);
         if (list.size() > 0) {
             for (BaseCameraManagementDto o : list) {
                 // 线路

business-service/src/main/resources/mapper/service/BaseDeviceDynamicManagementMapper.xml

@@ -2,7 +2,7 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.ozs.service.mapper.BaseDeviceDynamicManagementMapper">
 
-    <select id="list" resultType="com.ozs.service.entity.vo.BaseCameraManagementDto">
+    <select id="list" resultType="com.ozs.service.entity.vo.BaseCameraManagementDto" parameterType="com.ozs.service.entity.vo.CameraTreeVo">
 		SELECT
 			l.railway_code AS railwayCode, 
 			l.railway_name AS railwayName, 
@@ -14,15 +14,15 @@
 		    base_camera_management AS a inner join
 		    base_railway_management AS l  on  a.railway_code=l.railway_code
 		<where>
-			<if test="arg0 != null and arg0 !=''">
+			<if test="railwayCode != null and railwayCode !=''">
 				concat(l.railway_name,a.camera_code)
-				like concat("%",#{arg0},"%")
+				like concat("%",#{railwayCode},"%")
 			</if>
-			<if test="arg1 != null and arg1 != ''">
-				line_dir = #{arg1}
+			<if test="lineDir != null and lineDir != ''">
+				line_dir = #{lineDir}
 			</if>
-			<if test="arg2 != null and arg2 != ''">
-				concat(a.install_mile, a.begin_mile, a.end_mile) = #{arg2}
+			<if test="mils != null and mils != ''">
+				concat(a.install_mile, a.begin_mile, a.end_mile) = #{mils}
 			</if>
 			<if test="!dsFlay">
 				and

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

@@ -621,19 +621,11 @@ public class BaseCameraManagementController extends BaseController {
     @Log(title = "相机台账管理", businessType = BusinessType.OTHER)
     public AjaxResult cameraTree(@RequestBody CameraTreeVo cameraTreeVo) {
         cameraTreeVo = (CameraTreeVo) dataScoreUtil.setDataScore(getUserId(), cameraTreeVo);
-        String railwayCode = null;
         int count = 0;
-        if (!StringUtils.isEmpty(cameraTreeVo.getRailwayCode())) {
-            railwayCode = cameraTreeVo.getRailwayCode();
-        }
-        Integer lineDir = null;
-        if (!StringUtils.isEmpty(cameraTreeVo.getRailwayCode())) {
-            lineDir = cameraTreeVo.getLineDir();
-        }
         if (!ObjectUtils.isEmpty(cameraTreeVo.getMils())) {
             cameraTreeVo.setMils(cameraTreeVo.getMils()*1000);
         }
-        CameraTree cameraTree = baseDeviceDynamicManagementService.cameraTree(railwayCode, lineDir,cameraTreeVo.getMils());
+        CameraTree cameraTree = baseDeviceDynamicManagementService.cameraTree(cameraTreeVo);
         List<CameraTree> children = cameraTree.getChildren();
         children.sort(new Comparator<CameraTree>() {
             @Override