diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/HCNetController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/HCNetController.java index d2a6cf9..36d34b4 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/HCNetController.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/HCNetController.java @@ -234,7 +234,7 @@ if (res) { return ResponseData.success(); } else { - return ResponseData.error("设置失败"); + return ResponseData.error("巡航操作失败"); } } diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/HCNetController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/HCNetController.java index d2a6cf9..36d34b4 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/HCNetController.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/HCNetController.java @@ -234,7 +234,7 @@ if (res) { return ResponseData.success(); } else { - return ResponseData.error("设置失败"); + return ResponseData.error("巡航操作失败"); } } diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/HCNetServiceImpl.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/HCNetServiceImpl.java index 625dea2..ccae07e 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/HCNetServiceImpl.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/HCNetServiceImpl.java @@ -707,14 +707,27 @@ return res; } + //宇视通 默认5条巡航线 + private static Integer[] lineArr = {1, 2, 3, 4, 5}; + private boolean cruiseAdd(String cruiseName, String deviceIp, Integer cruiseValue) { MonitorBaseInfo baseInfo = monipoiInfoService.selectInfoByDeviceIp(deviceIp); Integer lineNum = obserpoiInfoService.selectByMonitorByCruiseName(baseInfo.getMonitorId(), cruiseName); if (ObjectUtil.isNotEmpty(lineNum)) { throw new BusinessException(BusinessExceptionEnum.CRUISE_NAME_DUPLICATE); } else { - lineNum = obserpoiInfoService.selectByMonitorByCruiseName(baseInfo.getMonitorId(), ""); - lineNum = ObjectUtil.isNotEmpty(lineNum) ? lineNum + 1 : 1; + if (DeviceTypeEnum.XST_TYPE.equals(baseInfo.getType())) { + List lines = obserpoiInfoService.selectByMonitorLinesByCruiseName(baseInfo.getMonitorId(), ""); + for (int i = 0; i < lineArr.length; i++) { + if (!lines.contains(lineArr[i])) { + lineNum = lineArr[i]; + break; + } + } + } else { + lineNum = obserpoiInfoService.selectByMonitorByCruiseName(baseInfo.getMonitorId(), ""); + lineNum = ObjectUtil.isNotEmpty(lineNum) ? lineNum + 1 : 1; + } } return obserpoiInfoService.addLine(baseInfo.getMonitorId(), lineNum, cruiseName); } diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/HCNetController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/HCNetController.java index d2a6cf9..36d34b4 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/HCNetController.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/HCNetController.java @@ -234,7 +234,7 @@ if (res) { return ResponseData.success(); } else { - return ResponseData.error("设置失败"); + return ResponseData.error("巡航操作失败"); } } diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/HCNetServiceImpl.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/HCNetServiceImpl.java index 625dea2..ccae07e 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/HCNetServiceImpl.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/HCNetServiceImpl.java @@ -707,14 +707,27 @@ return res; } + //宇视通 默认5条巡航线 + private static Integer[] lineArr = {1, 2, 3, 4, 5}; + private boolean cruiseAdd(String cruiseName, String deviceIp, Integer cruiseValue) { MonitorBaseInfo baseInfo = monipoiInfoService.selectInfoByDeviceIp(deviceIp); Integer lineNum = obserpoiInfoService.selectByMonitorByCruiseName(baseInfo.getMonitorId(), cruiseName); if (ObjectUtil.isNotEmpty(lineNum)) { throw new BusinessException(BusinessExceptionEnum.CRUISE_NAME_DUPLICATE); } else { - lineNum = obserpoiInfoService.selectByMonitorByCruiseName(baseInfo.getMonitorId(), ""); - lineNum = ObjectUtil.isNotEmpty(lineNum) ? lineNum + 1 : 1; + if (DeviceTypeEnum.XST_TYPE.equals(baseInfo.getType())) { + List lines = obserpoiInfoService.selectByMonitorLinesByCruiseName(baseInfo.getMonitorId(), ""); + for (int i = 0; i < lineArr.length; i++) { + if (!lines.contains(lineArr[i])) { + lineNum = lineArr[i]; + break; + } + } + } else { + lineNum = obserpoiInfoService.selectByMonitorByCruiseName(baseInfo.getMonitorId(), ""); + lineNum = ObjectUtil.isNotEmpty(lineNum) ? lineNum + 1 : 1; + } } return obserpoiInfoService.addLine(baseInfo.getMonitorId(), lineNum, cruiseName); } diff --git a/casic-station/src/main/java/com/casic/missiles/modular/system/dao/BusObserpoiInfoMapper.java b/casic-station/src/main/java/com/casic/missiles/modular/system/dao/BusObserpoiInfoMapper.java index f106b73..7851ce6 100644 --- a/casic-station/src/main/java/com/casic/missiles/modular/system/dao/BusObserpoiInfoMapper.java +++ b/casic-station/src/main/java/com/casic/missiles/modular/system/dao/BusObserpoiInfoMapper.java @@ -29,6 +29,9 @@ Integer selectByMonitorByCruiseName(@Param("monitorId") Long monitorId, @Param("cruiseName") String cruiseName); + List selectByMonitorLinesByCruiseName(@Param("monitorId") Long monitorId, + @Param("cruiseName") String cruiseName); + List selectNoPage(@Param("obserpoiRequest") BusObserpoiRequest obserpoiRequest); List pageList(@Param("page") Page page, diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/HCNetController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/HCNetController.java index d2a6cf9..36d34b4 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/HCNetController.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/HCNetController.java @@ -234,7 +234,7 @@ if (res) { return ResponseData.success(); } else { - return ResponseData.error("设置失败"); + return ResponseData.error("巡航操作失败"); } } diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/HCNetServiceImpl.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/HCNetServiceImpl.java index 625dea2..ccae07e 100644 --- a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/HCNetServiceImpl.java +++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/HCNetServiceImpl.java @@ -707,14 +707,27 @@ return res; } + //宇视通 默认5条巡航线 + private static Integer[] lineArr = {1, 2, 3, 4, 5}; + private boolean cruiseAdd(String cruiseName, String deviceIp, Integer cruiseValue) { MonitorBaseInfo baseInfo = monipoiInfoService.selectInfoByDeviceIp(deviceIp); Integer lineNum = obserpoiInfoService.selectByMonitorByCruiseName(baseInfo.getMonitorId(), cruiseName); if (ObjectUtil.isNotEmpty(lineNum)) { throw new BusinessException(BusinessExceptionEnum.CRUISE_NAME_DUPLICATE); } else { - lineNum = obserpoiInfoService.selectByMonitorByCruiseName(baseInfo.getMonitorId(), ""); - lineNum = ObjectUtil.isNotEmpty(lineNum) ? lineNum + 1 : 1; + if (DeviceTypeEnum.XST_TYPE.equals(baseInfo.getType())) { + List lines = obserpoiInfoService.selectByMonitorLinesByCruiseName(baseInfo.getMonitorId(), ""); + for (int i = 0; i < lineArr.length; i++) { + if (!lines.contains(lineArr[i])) { + lineNum = lineArr[i]; + break; + } + } + } else { + lineNum = obserpoiInfoService.selectByMonitorByCruiseName(baseInfo.getMonitorId(), ""); + lineNum = ObjectUtil.isNotEmpty(lineNum) ? lineNum + 1 : 1; + } } return obserpoiInfoService.addLine(baseInfo.getMonitorId(), lineNum, cruiseName); } diff --git a/casic-station/src/main/java/com/casic/missiles/modular/system/dao/BusObserpoiInfoMapper.java b/casic-station/src/main/java/com/casic/missiles/modular/system/dao/BusObserpoiInfoMapper.java index f106b73..7851ce6 100644 --- a/casic-station/src/main/java/com/casic/missiles/modular/system/dao/BusObserpoiInfoMapper.java +++ b/casic-station/src/main/java/com/casic/missiles/modular/system/dao/BusObserpoiInfoMapper.java @@ -29,6 +29,9 @@ Integer selectByMonitorByCruiseName(@Param("monitorId") Long monitorId, @Param("cruiseName") String cruiseName); + List selectByMonitorLinesByCruiseName(@Param("monitorId") Long monitorId, + @Param("cruiseName") String cruiseName); + List selectNoPage(@Param("obserpoiRequest") BusObserpoiRequest obserpoiRequest); List pageList(@Param("page") Page page, diff --git a/casic-station/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusObserpoiInfoMapper.xml b/casic-station/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusObserpoiInfoMapper.xml index 85bba52..3027559 100644 --- a/casic-station/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusObserpoiInfoMapper.xml +++ b/casic-station/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusObserpoiInfoMapper.xml @@ -45,6 +45,16 @@ + + + + + + + + +