相机树增加权限控制

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

@@ -1,9 +1,12 @@
 package com.ozs.service.entity.vo;
 
+import com.ozs.common.vo.PageVo;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
+import java.io.Serializable;
+
 /**
  * @Author : sunhh
  * @create 2023/3/31 16:06
@@ -11,7 +14,9 @@ import lombok.NoArgsConstructor;
 @Data
 @NoArgsConstructor
 @AllArgsConstructor
-public class CameraTreeVo {
+public class CameraTreeVo extends PageVo implements Serializable {
+
+    private static final long serialVersionUID = 1L;
     /**
      * 线路
      */
@@ -25,5 +30,5 @@ public class CameraTreeVo {
     /**
      * 里程位置
      */
-    private String mils;
+    private Integer mils;
 }

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

@@ -24,6 +24,23 @@
 			<if test="arg2 != null and arg2 != ''">
 				concat(a.install_mile, a.begin_mile, a.end_mile) = #{arg2}
 			</if>
+			<if test="!dsFlay">
+				and
+				<trim prefix="(" prefixOverrides="or" suffix=")">
+					<if test="dsUserId != null and dsUserId != ''">
+						or a.create_by=#{dsUserId}
+					</if>
+					<if test="dsDeptId != null and dsDeptId != 0">
+						or  a.dept_id=#{dsDeptId}
+					</if>
+					<if test="dsDeptIds != null">
+						or a.dept_id in
+						<foreach item="item" collection="dsDeptIds" separator="," open="(" close=")" index="">
+							#{item}
+						</foreach>
+					</if>
+				</trim>
+			</if>
 		</where>
     </select>
 </mapper>

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

@@ -619,24 +619,21 @@ public class BaseCameraManagementController extends BaseController {
     @ApiOperation("视频服务树形结构")
     @PostMapping("/cameraTree")
     @Log(title = "相机台账管理", businessType = BusinessType.OTHER)
-    public AjaxResult cameraTree(@RequestBody CameraTreeVo baseCameraResVo) {
+    public AjaxResult cameraTree(@RequestBody CameraTreeVo cameraTreeVo) {
+        cameraTreeVo = (CameraTreeVo) dataScoreUtil.setDataScore(getUserId(), cameraTreeVo);
         String railwayCode = null;
         int count = 0;
-        if (!StringUtils.isEmpty(baseCameraResVo.getRailwayCode())) {
-            railwayCode = baseCameraResVo.getRailwayCode();
+        if (!StringUtils.isEmpty(cameraTreeVo.getRailwayCode())) {
+            railwayCode = cameraTreeVo.getRailwayCode();
         }
         Integer lineDir = null;
-        if (!StringUtils.isEmpty(baseCameraResVo.getRailwayCode())) {
-            lineDir = baseCameraResVo.getLineDir();
+        if (!StringUtils.isEmpty(cameraTreeVo.getRailwayCode())) {
+            lineDir = cameraTreeVo.getLineDir();
         }
-        Integer milsInt = null;
-        if (StringUtils.isNotEmpty(baseCameraResVo.getMils())) {
-            if (!baseCameraResVo.getMils().matches(PATTERN)) {
-                return error("里程位置填写格式不正确!");
-            }
-            milsInt = AppendUtils.stringSplit(baseCameraResVo.getMils());
+        if (!ObjectUtils.isEmpty(cameraTreeVo.getMils())) {
+            cameraTreeVo.setMils(cameraTreeVo.getMils()*1000);
         }
-        CameraTree cameraTree = baseDeviceDynamicManagementService.cameraTree(railwayCode, lineDir, milsInt);
+        CameraTree cameraTree = baseDeviceDynamicManagementService.cameraTree(railwayCode, lineDir,cameraTreeVo.getMils());
         List<CameraTree> children = cameraTree.getChildren();
         children.sort(new Comparator<CameraTree>() {
             @Override