首页相机列表 加参数 线路，行别，里程位置（里程位置匹配三个里程）

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

@@ -19,5 +19,5 @@ import java.util.List;
 @Mapper
 public interface BaseDeviceDynamicManagementMapper extends BaseMapper<BaseDeviceDynamicManagement> {
 
-    List<BaseCameraManagementDto> list(@Param("name") String name);
+    List<BaseCameraManagementDto> list(@Param("name") String name, @Param("lineDir") Integer lineDir, @Param("beginMile") Integer beginMile);
 }

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

@@ -14,5 +14,5 @@ import com.ozs.service.entity.CameraTree;
  */
 public interface BaseDeviceDynamicManagementService extends IService<BaseDeviceDynamicManagement> {
 
-    CameraTree cameraTree(String name);
+    CameraTree cameraTree(String name, Integer lineDir, Integer mils);
 }

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

@@ -31,7 +31,9 @@ public class BaseDeviceDynamicManagementServiceImpl extends ServiceImpl<BaseDevi
     BaseDeviceDynamicManagementMapper baseDeviceDynamicManagementMapper;
 
     @Override
-    public CameraTree cameraTree(String name) {
+    public CameraTree cameraTree(String name, Integer lineDir, Integer beginMile) {
+
+
         //1 父
         CameraTree cameraTree = CameraTree.builder()
                 .name("相机树")
@@ -40,7 +42,7 @@ public class BaseDeviceDynamicManagementServiceImpl extends ServiceImpl<BaseDevi
                 .children(new ArrayList<>())
                 .build();
         Map<String, CameraTree> map = new HashMap<>();
-        List<BaseCameraManagementDto> list = baseDeviceDynamicManagementMapper.list(name);
+        List<BaseCameraManagementDto> list = baseDeviceDynamicManagementMapper.list(name, lineDir, beginMile);
         if (list.size() > 0) {
             for (BaseCameraManagementDto o : list) {
                 // 线路

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

@@ -14,13 +14,16 @@
 		    base_camera_management AS a inner join
 		    base_railway_management AS l  on  a.railway_code=l.railway_code
 		<where>
-
 			<if test="name != null and name !=''">
 				concat(l.railway_name,a.camera_code)
 				like concat("%",#{name},"%")
 			</if>
-			
+			<if test="lineDir != null and lineDir != ''">
+				line_dir = #{lineDir}
+			</if>
+			<if test="beginMile != null and beginMile != ''">
+				concat(a.install_mile, a.begin_mile, a.end_mile) = #{beginMile}
+			</if>
 		</where>
-			
     </select>
 </mapper>

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

@@ -252,19 +252,19 @@ public class BaseCameraManagementController extends BaseController {
             queryWrapper.eq(BaseDeviceDynamicManagement::getCameraCode, baseCameraManagement.getCameraCode());
         }
         BaseDeviceDynamicManagement one = baseDeviceDynamicManagementService.getOne(queryWrapper);
-        if (!ObjectUtils.isEmpty(one)){
+        if (!ObjectUtils.isEmpty(one)) {
             idempotenceUtils.deleteIdempotence(baseCameraManagement.getCameraCode());
             return error("设备动态管理表该相机编码已存在,不能重复添加");
         }
-        if (!baseCameraManagement.getBeginMiles().matches(PATTERN)){
+        if (!baseCameraManagement.getBeginMiles().matches(PATTERN)) {
             idempotenceUtils.deleteIdempotence(baseCameraManagement.getCameraCode());
-           return error("监控范围开始里程位置填写格式不正确");
+            return error("监控范围开始里程位置填写格式不正确");
         }
-        if (!baseCameraManagement.getInstallMiles().matches(PATTERN)){
+        if (!baseCameraManagement.getInstallMiles().matches(PATTERN)) {
             idempotenceUtils.deleteIdempotence(baseCameraManagement.getCameraCode());
             return error("监控相机安装里程位置填写格式不正确");
         }
-        if (!baseCameraManagement.getEndMiles().matches(PATTERN)){
+        if (!baseCameraManagement.getEndMiles().matches(PATTERN)) {
             idempotenceUtils.deleteIdempotence(baseCameraManagement.getCameraCode());
             return error("监控范围结束里程位置填写格式不正确");
         }
@@ -312,13 +312,13 @@ public class BaseCameraManagementController extends BaseController {
         if (!ObjectUtils.isEmpty(cameraManagement) && !cameraManagement.getId().equals(baseCameraManagement.getId())) {
             return error("相机编码已存在,不能进行修改操作");
         }
-        if (!baseCameraManagement.getBeginMiles().matches(PATTERN)){
+        if (!baseCameraManagement.getBeginMiles().matches(PATTERN)) {
             return error("监控范围开始里程位置填写格式不正确");
         }
-        if (!baseCameraManagement.getInstallMiles().matches(PATTERN)){
+        if (!baseCameraManagement.getInstallMiles().matches(PATTERN)) {
             return error("监控相机安装里程位置填写格式不正确");
         }
-        if (!baseCameraManagement.getEndMiles().matches(PATTERN)){
+        if (!baseCameraManagement.getEndMiles().matches(PATTERN)) {
             return error("监控范围结束里程位置填写格式不正确");
         }
         int miles = AppendUtils.stringSplit(baseCameraManagement.getBeginMiles());
@@ -333,7 +333,7 @@ public class BaseCameraManagementController extends BaseController {
             queryWrapper.eq(BaseDeviceDynamicManagement::getCameraCode, baseCameraManagement.getCameraCode());
         }
         BaseDeviceDynamicManagement one = baseDeviceDynamicManagementService.getOne(queryWrapper);
-        if (ObjectUtils.isEmpty(one)){
+        if (ObjectUtils.isEmpty(one)) {
             return error("设备动态管理表没有该相机编码");
         }
         one.setCameraCode(baseCameraManagement.getCameraCode());
@@ -573,10 +573,24 @@ public class BaseCameraManagementController extends BaseController {
         return success(count);
     }
 
+    /**
+     * 视频服务树形结构
+     *
+     * @param name      线路
+     * @param lineDir   行别
+     * @param mils 里程位置
+     * @return
+     */
     @ApiOperation("视频服务树形结构")
     @GetMapping("/cameraTree")
-    public AjaxResult cameraTree(@RequestParam(value = "name", required = false) String name) {
-        CameraTree cameraTree = baseDeviceDynamicManagementService.cameraTree(name);
+    public AjaxResult cameraTree(@RequestParam(value = "name", required = false) String name,
+                                 @RequestParam(value = "lineDir", required = false) Integer lineDir,
+                                 @RequestParam(value = "beginMile", required = false) String mils) {
+        if (!mils.matches(PATTERN)) {
+            return error("里程位置填写格式不正确!");
+        }
+        Integer milsInt = AppendUtils.stringSplit(mils);
+        CameraTree cameraTree = baseDeviceDynamicManagementService.cameraTree(name, lineDir, milsInt);
         List<CameraTree> children = cameraTree.getChildren();
         children.sort(new Comparator<CameraTree>() {
             @Override