diff --git a/casic-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java b/casic-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java index 98d07b2..c5ead63 100644 --- a/casic-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java +++ b/casic-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java @@ -11,10 +11,13 @@ HANDLE_FAILED(500, "操作失败"), DEVICE_BOUND_FAILED(500, "设备绑定,场站删除失败"), + + MONITOR_VAILD_FAILED(2099, "云台登录地址重复"), DEVICE_REGISTER_FAILED(2500, "设备注册失败"), RUN_TASK_FAILED(2501, "此段时间有任务正在执行"), CRUISE_NAME_DUPLICATE(2502, "巡航路径名称重复"); + private Integer code; private String message; diff --git a/casic-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java b/casic-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java index 98d07b2..c5ead63 100644 --- a/casic-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java +++ b/casic-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java @@ -11,10 +11,13 @@ HANDLE_FAILED(500, "操作失败"), DEVICE_BOUND_FAILED(500, "设备绑定,场站删除失败"), + + MONITOR_VAILD_FAILED(2099, "云台登录地址重复"), DEVICE_REGISTER_FAILED(2500, "设备注册失败"), RUN_TASK_FAILED(2501, "此段时间有任务正在执行"), CRUISE_NAME_DUPLICATE(2502, "巡航路径名称重复"); + private Integer code; private String message; diff --git a/casic-station/src/main/java/com/casic/missiles/modular/system/controller/BusMonipoiInfoController.java b/casic-station/src/main/java/com/casic/missiles/modular/system/controller/BusMonipoiInfoController.java index b6d5ee4..5249831 100644 --- a/casic-station/src/main/java/com/casic/missiles/modular/system/controller/BusMonipoiInfoController.java +++ b/casic-station/src/main/java/com/casic/missiles/modular/system/controller/BusMonipoiInfoController.java @@ -6,6 +6,7 @@ import com.casic.missiles.core.base.controller.ExportController; import com.casic.missiles.core.page.PageFactory; import com.casic.missiles.dto.IdDTO; +import com.casic.missiles.dto.KeywordDTO; import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.exception.enums.CoreExceptionEnum; @@ -104,8 +105,8 @@ * 设备列表(地图) */ @RequestMapping(value = "/overview") - public Object mapOverview() throws Exception { - return ResponseData.success(busMonipoiInfoService.overviewMap()); + public Object mapOverview(@RequestBody @Valid KeywordDTO keywordDTO) throws Exception { + return ResponseData.success(busMonipoiInfoService.overviewMap(keywordDTO.getKeyword())); } } diff --git a/casic-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java b/casic-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java index 98d07b2..c5ead63 100644 --- a/casic-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java +++ b/casic-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java @@ -11,10 +11,13 @@ HANDLE_FAILED(500, "操作失败"), DEVICE_BOUND_FAILED(500, "设备绑定,场站删除失败"), + + MONITOR_VAILD_FAILED(2099, "云台登录地址重复"), DEVICE_REGISTER_FAILED(2500, "设备注册失败"), RUN_TASK_FAILED(2501, "此段时间有任务正在执行"), CRUISE_NAME_DUPLICATE(2502, "巡航路径名称重复"); + private Integer code; private String message; diff --git a/casic-station/src/main/java/com/casic/missiles/modular/system/controller/BusMonipoiInfoController.java b/casic-station/src/main/java/com/casic/missiles/modular/system/controller/BusMonipoiInfoController.java index b6d5ee4..5249831 100644 --- a/casic-station/src/main/java/com/casic/missiles/modular/system/controller/BusMonipoiInfoController.java +++ b/casic-station/src/main/java/com/casic/missiles/modular/system/controller/BusMonipoiInfoController.java @@ -6,6 +6,7 @@ import com.casic.missiles.core.base.controller.ExportController; import com.casic.missiles.core.page.PageFactory; import com.casic.missiles.dto.IdDTO; +import com.casic.missiles.dto.KeywordDTO; import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.exception.enums.CoreExceptionEnum; @@ -104,8 +105,8 @@ * 设备列表(地图) */ @RequestMapping(value = "/overview") - public Object mapOverview() throws Exception { - return ResponseData.success(busMonipoiInfoService.overviewMap()); + public Object mapOverview(@RequestBody @Valid KeywordDTO keywordDTO) throws Exception { + return ResponseData.success(busMonipoiInfoService.overviewMap(keywordDTO.getKeyword())); } } diff --git a/casic-station/src/main/java/com/casic/missiles/modular/system/dao/BusMonipoiInfoMapper.java b/casic-station/src/main/java/com/casic/missiles/modular/system/dao/BusMonipoiInfoMapper.java index 1ecbee5..1395ea2 100644 --- a/casic-station/src/main/java/com/casic/missiles/modular/system/dao/BusMonipoiInfoMapper.java +++ b/casic-station/src/main/java/com/casic/missiles/modular/system/dao/BusMonipoiInfoMapper.java @@ -27,5 +27,5 @@ MonitorBaseInfo selectInfoByDeviceIp(@Param("deviceIp") String deviceIp); - List overviewMap(@Param("scope") DataScope dataScope); + List overviewMap(@Param("scope") DataScope dataScope,@Param("keyword") String keyword); } diff --git a/casic-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java b/casic-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java index 98d07b2..c5ead63 100644 --- a/casic-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java +++ b/casic-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java @@ -11,10 +11,13 @@ HANDLE_FAILED(500, "操作失败"), DEVICE_BOUND_FAILED(500, "设备绑定,场站删除失败"), + + MONITOR_VAILD_FAILED(2099, "云台登录地址重复"), DEVICE_REGISTER_FAILED(2500, "设备注册失败"), RUN_TASK_FAILED(2501, "此段时间有任务正在执行"), CRUISE_NAME_DUPLICATE(2502, "巡航路径名称重复"); + private Integer code; private String message; diff --git a/casic-station/src/main/java/com/casic/missiles/modular/system/controller/BusMonipoiInfoController.java b/casic-station/src/main/java/com/casic/missiles/modular/system/controller/BusMonipoiInfoController.java index b6d5ee4..5249831 100644 --- a/casic-station/src/main/java/com/casic/missiles/modular/system/controller/BusMonipoiInfoController.java +++ b/casic-station/src/main/java/com/casic/missiles/modular/system/controller/BusMonipoiInfoController.java @@ -6,6 +6,7 @@ import com.casic.missiles.core.base.controller.ExportController; import com.casic.missiles.core.page.PageFactory; import com.casic.missiles.dto.IdDTO; +import com.casic.missiles.dto.KeywordDTO; import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.exception.enums.CoreExceptionEnum; @@ -104,8 +105,8 @@ * 设备列表(地图) */ @RequestMapping(value = "/overview") - public Object mapOverview() throws Exception { - return ResponseData.success(busMonipoiInfoService.overviewMap()); + public Object mapOverview(@RequestBody @Valid KeywordDTO keywordDTO) throws Exception { + return ResponseData.success(busMonipoiInfoService.overviewMap(keywordDTO.getKeyword())); } } diff --git a/casic-station/src/main/java/com/casic/missiles/modular/system/dao/BusMonipoiInfoMapper.java b/casic-station/src/main/java/com/casic/missiles/modular/system/dao/BusMonipoiInfoMapper.java index 1ecbee5..1395ea2 100644 --- a/casic-station/src/main/java/com/casic/missiles/modular/system/dao/BusMonipoiInfoMapper.java +++ b/casic-station/src/main/java/com/casic/missiles/modular/system/dao/BusMonipoiInfoMapper.java @@ -27,5 +27,5 @@ MonitorBaseInfo selectInfoByDeviceIp(@Param("deviceIp") String deviceIp); - List overviewMap(@Param("scope") DataScope dataScope); + List overviewMap(@Param("scope") DataScope dataScope,@Param("keyword") String keyword); } diff --git a/casic-station/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusMonipoiInfoMapper.xml b/casic-station/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusMonipoiInfoMapper.xml index 94076bc..745f1ab 100644 --- a/casic-station/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusMonipoiInfoMapper.xml +++ b/casic-station/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusMonipoiInfoMapper.xml @@ -93,12 +93,19 @@ device_status AS deviceStatus FROM ( - SELECT * FROM bus_monipoi_info WHERE valid = 0 + SELECT * FROM bus_monipoi_info + WHERE valid = 0 + + and monitor_name like concat('%',#{keyword},'%') + ) bmi JOIN ( SELECT id AS idd, DEPT_ID, station_name FROM bus_station_info WHERE valid = 0 - ) bsi ON bsi.idd = bmi.station_id + + and STATION_NAME like concat('%',#{keyword},'%') + + ) bsi ON bsi.idd = bmi.station_id diff --git a/casic-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java b/casic-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java index 98d07b2..c5ead63 100644 --- a/casic-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java +++ b/casic-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java @@ -11,10 +11,13 @@ HANDLE_FAILED(500, "操作失败"), DEVICE_BOUND_FAILED(500, "设备绑定,场站删除失败"), + + MONITOR_VAILD_FAILED(2099, "云台登录地址重复"), DEVICE_REGISTER_FAILED(2500, "设备注册失败"), RUN_TASK_FAILED(2501, "此段时间有任务正在执行"), CRUISE_NAME_DUPLICATE(2502, "巡航路径名称重复"); + private Integer code; private String message; diff --git a/casic-station/src/main/java/com/casic/missiles/modular/system/controller/BusMonipoiInfoController.java b/casic-station/src/main/java/com/casic/missiles/modular/system/controller/BusMonipoiInfoController.java index b6d5ee4..5249831 100644 --- a/casic-station/src/main/java/com/casic/missiles/modular/system/controller/BusMonipoiInfoController.java +++ b/casic-station/src/main/java/com/casic/missiles/modular/system/controller/BusMonipoiInfoController.java @@ -6,6 +6,7 @@ import com.casic.missiles.core.base.controller.ExportController; import com.casic.missiles.core.page.PageFactory; import com.casic.missiles.dto.IdDTO; +import com.casic.missiles.dto.KeywordDTO; import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.exception.enums.CoreExceptionEnum; @@ -104,8 +105,8 @@ * 设备列表(地图) */ @RequestMapping(value = "/overview") - public Object mapOverview() throws Exception { - return ResponseData.success(busMonipoiInfoService.overviewMap()); + public Object mapOverview(@RequestBody @Valid KeywordDTO keywordDTO) throws Exception { + return ResponseData.success(busMonipoiInfoService.overviewMap(keywordDTO.getKeyword())); } } diff --git a/casic-station/src/main/java/com/casic/missiles/modular/system/dao/BusMonipoiInfoMapper.java b/casic-station/src/main/java/com/casic/missiles/modular/system/dao/BusMonipoiInfoMapper.java index 1ecbee5..1395ea2 100644 --- a/casic-station/src/main/java/com/casic/missiles/modular/system/dao/BusMonipoiInfoMapper.java +++ b/casic-station/src/main/java/com/casic/missiles/modular/system/dao/BusMonipoiInfoMapper.java @@ -27,5 +27,5 @@ MonitorBaseInfo selectInfoByDeviceIp(@Param("deviceIp") String deviceIp); - List overviewMap(@Param("scope") DataScope dataScope); + List overviewMap(@Param("scope") DataScope dataScope,@Param("keyword") String keyword); } diff --git a/casic-station/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusMonipoiInfoMapper.xml b/casic-station/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusMonipoiInfoMapper.xml index 94076bc..745f1ab 100644 --- a/casic-station/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusMonipoiInfoMapper.xml +++ b/casic-station/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusMonipoiInfoMapper.xml @@ -93,12 +93,19 @@ device_status AS deviceStatus FROM ( - SELECT * FROM bus_monipoi_info WHERE valid = 0 + SELECT * FROM bus_monipoi_info + WHERE valid = 0 + + and monitor_name like concat('%',#{keyword},'%') + ) bmi JOIN ( SELECT id AS idd, DEPT_ID, station_name FROM bus_station_info WHERE valid = 0 - ) bsi ON bsi.idd = bmi.station_id + + and STATION_NAME like concat('%',#{keyword},'%') + + ) bsi ON bsi.idd = bmi.station_id diff --git a/casic-station/src/main/java/com/casic/missiles/modular/system/service/IBusMonipoiInfoService.java b/casic-station/src/main/java/com/casic/missiles/modular/system/service/IBusMonipoiInfoService.java index da4bf5e..50a83fd 100644 --- a/casic-station/src/main/java/com/casic/missiles/modular/system/service/IBusMonipoiInfoService.java +++ b/casic-station/src/main/java/com/casic/missiles/modular/system/service/IBusMonipoiInfoService.java @@ -32,7 +32,7 @@ ResponseData monitorDetail(Long id); - List overviewMap() throws Exception; + List overviewMap(String keyword) throws Exception; MonitorBaseInfo selectInfoByDeviceIp(String deviceIp); diff --git a/casic-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java b/casic-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java index 98d07b2..c5ead63 100644 --- a/casic-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java +++ b/casic-common/src/main/java/com/casic/missiles/enums/BusinessExceptionEnum.java @@ -11,10 +11,13 @@ HANDLE_FAILED(500, "操作失败"), DEVICE_BOUND_FAILED(500, "设备绑定,场站删除失败"), + + MONITOR_VAILD_FAILED(2099, "云台登录地址重复"), DEVICE_REGISTER_FAILED(2500, "设备注册失败"), RUN_TASK_FAILED(2501, "此段时间有任务正在执行"), CRUISE_NAME_DUPLICATE(2502, "巡航路径名称重复"); + private Integer code; private String message; diff --git a/casic-station/src/main/java/com/casic/missiles/modular/system/controller/BusMonipoiInfoController.java b/casic-station/src/main/java/com/casic/missiles/modular/system/controller/BusMonipoiInfoController.java index b6d5ee4..5249831 100644 --- a/casic-station/src/main/java/com/casic/missiles/modular/system/controller/BusMonipoiInfoController.java +++ b/casic-station/src/main/java/com/casic/missiles/modular/system/controller/BusMonipoiInfoController.java @@ -6,6 +6,7 @@ import com.casic.missiles.core.base.controller.ExportController; import com.casic.missiles.core.page.PageFactory; import com.casic.missiles.dto.IdDTO; +import com.casic.missiles.dto.KeywordDTO; import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.exception.enums.CoreExceptionEnum; @@ -104,8 +105,8 @@ * 设备列表(地图) */ @RequestMapping(value = "/overview") - public Object mapOverview() throws Exception { - return ResponseData.success(busMonipoiInfoService.overviewMap()); + public Object mapOverview(@RequestBody @Valid KeywordDTO keywordDTO) throws Exception { + return ResponseData.success(busMonipoiInfoService.overviewMap(keywordDTO.getKeyword())); } } diff --git a/casic-station/src/main/java/com/casic/missiles/modular/system/dao/BusMonipoiInfoMapper.java b/casic-station/src/main/java/com/casic/missiles/modular/system/dao/BusMonipoiInfoMapper.java index 1ecbee5..1395ea2 100644 --- a/casic-station/src/main/java/com/casic/missiles/modular/system/dao/BusMonipoiInfoMapper.java +++ b/casic-station/src/main/java/com/casic/missiles/modular/system/dao/BusMonipoiInfoMapper.java @@ -27,5 +27,5 @@ MonitorBaseInfo selectInfoByDeviceIp(@Param("deviceIp") String deviceIp); - List overviewMap(@Param("scope") DataScope dataScope); + List overviewMap(@Param("scope") DataScope dataScope,@Param("keyword") String keyword); } diff --git a/casic-station/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusMonipoiInfoMapper.xml b/casic-station/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusMonipoiInfoMapper.xml index 94076bc..745f1ab 100644 --- a/casic-station/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusMonipoiInfoMapper.xml +++ b/casic-station/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusMonipoiInfoMapper.xml @@ -93,12 +93,19 @@ device_status AS deviceStatus FROM ( - SELECT * FROM bus_monipoi_info WHERE valid = 0 + SELECT * FROM bus_monipoi_info + WHERE valid = 0 + + and monitor_name like concat('%',#{keyword},'%') + ) bmi JOIN ( SELECT id AS idd, DEPT_ID, station_name FROM bus_station_info WHERE valid = 0 - ) bsi ON bsi.idd = bmi.station_id + + and STATION_NAME like concat('%',#{keyword},'%') + + ) bsi ON bsi.idd = bmi.station_id diff --git a/casic-station/src/main/java/com/casic/missiles/modular/system/service/IBusMonipoiInfoService.java b/casic-station/src/main/java/com/casic/missiles/modular/system/service/IBusMonipoiInfoService.java index da4bf5e..50a83fd 100644 --- a/casic-station/src/main/java/com/casic/missiles/modular/system/service/IBusMonipoiInfoService.java +++ b/casic-station/src/main/java/com/casic/missiles/modular/system/service/IBusMonipoiInfoService.java @@ -32,7 +32,7 @@ ResponseData monitorDetail(Long id); - List overviewMap() throws Exception; + List overviewMap(String keyword) throws Exception; MonitorBaseInfo selectInfoByDeviceIp(String deviceIp); diff --git a/casic-station/src/main/java/com/casic/missiles/modular/system/service/impl/BusMonipoiInfoServiceImpl.java b/casic-station/src/main/java/com/casic/missiles/modular/system/service/impl/BusMonipoiInfoServiceImpl.java index 05a4ac0..9ea0972 100644 --- a/casic-station/src/main/java/com/casic/missiles/modular/system/service/impl/BusMonipoiInfoServiceImpl.java +++ b/casic-station/src/main/java/com/casic/missiles/modular/system/service/impl/BusMonipoiInfoServiceImpl.java @@ -50,7 +50,7 @@ public Page monitorListPage(Page page, Long stationId, String keyword) throws Exception { DataScope dataScope = permissionContext.getAuthService().getLoginUserDataScope(); dataScope.setScopeName("DEPT_ID"); - List monitorPointLists = this.baseMapper.monitorListPage(page,dataScope, stationId, keyword); + List monitorPointLists = this.baseMapper.monitorListPage(page, dataScope, stationId, keyword); for (BusMonipoiInfo busMonipoiInfo : monitorPointLists) { DictCodeUtils.convertDictCodeToName(busMonipoiInfo); } @@ -60,6 +60,7 @@ @Override public ResponseData addMonitor(BusMonipoiInfo busMonipoiInfo) { + checkIsExist(busMonipoiInfo); int addFlag = this.baseMapper.insert(busMonipoiInfo); if (addFlag > 0) { return ResponseData.success(); @@ -69,6 +70,7 @@ @Override public ResponseData updateMonitor(BusMonipoiInfo busMonipoiInfo) { + checkIsExist(busMonipoiInfo); int updateFlag = this.baseMapper.updateById(busMonipoiInfo); if (updateFlag > 0) { return ResponseData.success(); @@ -120,12 +122,11 @@ } } - @Override - public List overviewMap() throws Exception { + public List overviewMap(String keyword) throws Exception { DataScope dataScope = permissionContext.getAuthService().getLoginUserDataScope(); dataScope.setScopeName("DEPT_ID"); - List monitorOverviewMaps = this.baseMapper.overviewMap(dataScope); + List monitorOverviewMaps = this.baseMapper.overviewMap(dataScope,keyword); for (MonitorOverviewMap monitorOverviewMap : monitorOverviewMaps) { DictCodeUtils.convertDictCodeToName(monitorOverviewMap); } @@ -137,10 +138,35 @@ BusMonipoiInfo busMonipoiInfo = selectByDeviceIp(deviceIp); if (null != busMonipoiInfo) { busMonipoiInfo.setDeviceStatus(status); - if(this.baseMapper.updateById(busMonipoiInfo)>0){ + if (this.baseMapper.updateById(busMonipoiInfo) > 0) { return true; } } return false; } + + private void checkIsExist(BusMonipoiInfo newBusMonitor) { + List busMonipoiInfoList = this.baseMapper.selectList(null); + for (BusMonipoiInfo oldBusMonitor : busMonipoiInfoList) { + //不为空,是更新跳过 + if (ObjectUtil.isNotEmpty(newBusMonitor.getId()) && newBusMonitor.getId().equals(oldBusMonitor.getId())) { + continue; + } + compareToOld(oldBusMonitor.getDeviceIp(), newBusMonitor.getDeviceIp(), "云台登陆地址重复注册,保存失败"); + compareToOld(oldBusMonitor.getNvrIp(), newBusMonitor.getNvrIp(), "NVR登录地址重复注册,保存失败"); + compareToOld(oldBusMonitor.getDoorIp(), newBusMonitor.getDoorIp(), "控制开关重复注册,保存失败"); + } + } + + /** + * 新旧比较 + */ + private void compareToOld(String oldValue, String newValue, String msg) { + if (oldValue.equals(newValue)) { + BusinessExceptionEnum.MONITOR_VAILD_FAILED.setMessage(msg); + throw new BusinessException(BusinessExceptionEnum.MONITOR_VAILD_FAILED); + } + } + + }