diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/BusConfigController.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/BusConfigController.java index 122ebba..e50680b 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/BusConfigController.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/BusConfigController.java @@ -81,7 +81,7 @@ Page page = new PageFactory().defaultPage();//page使用 DataScope dataScope = service.getCurrUserDataScope(); List busConfigDTOList = busConfigService.getConfigList(page, keywords, - deptid, Long.valueOf(DeviceTypeEnum.Liquid.getIndex()), dataScope); + deptid, "", Long.valueOf(DeviceTypeEnum.Liquid.getIndex()), dataScope); page.setRecords(busConfigDTOList); successResult.setData(super.packForBT(page)); successResult.setMessage("success"); @@ -105,7 +105,7 @@ Page page = new PageFactory().defaultPage();//page使用 DataScope dataScope = service.getCurrUserDataScope(); List busConfigDTOList = busWasteGasConfigService.getConfigList(page, keywords, - deptid, Long.valueOf(DeviceTypeEnum.WasteGas.getIndex()), dataScope); + deptid, "", Long.valueOf(DeviceTypeEnum.WasteGas.getIndex()), dataScope); page.setRecords(busConfigDTOList); successResult.setData(super.packForBT(page)); successResult.setMessage("success"); @@ -129,7 +129,7 @@ Page page = new PageFactory().defaultPage();//page使用 DataScope dataScope = service.getCurrUserDataScope(); List busConfigDTOList = busMethaneConfigService.getConfigList(page, keywords, - deptid, Long.valueOf(DeviceTypeEnum.Methane.getIndex()), dataScope); + deptid, "", Long.valueOf(DeviceTypeEnum.Methane.getIndex()), dataScope); page.setRecords(busConfigDTOList); successResult.setData(super.packForBT(page)); successResult.setMessage("success"); @@ -154,7 +154,7 @@ Page page = new PageFactory().defaultPage();//page使用 DataScope dataScope = service.getCurrUserDataScope(); List busConfigDTOList = busTubeConfigService.getConfigList(page, keywords, - deptid, Long.valueOf(DeviceTypeEnum.Tube.getIndex()), dataScope); + deptid, "", Long.valueOf(DeviceTypeEnum.Tube.getIndex()), dataScope); page.setRecords(busConfigDTOList); successResult.setData(super.packForBT(page)); successResult.setMessage("success"); @@ -178,7 +178,7 @@ Page page = new PageFactory().defaultPage();//page使用 DataScope dataScope = service.getCurrUserDataScope(); List busConfigDTOList = busTempHumiConfigService.getConfigList(page, keywords, - deptid, Long.valueOf(DeviceTypeEnum.TempHumi.getIndex()), dataScope); + deptid, "", Long.valueOf(DeviceTypeEnum.TempHumi.getIndex()), dataScope); page.setRecords(busConfigDTOList); successResult.setData(super.packForBT(page)); successResult.setMessage("success"); @@ -202,7 +202,7 @@ Page page = new PageFactory().defaultPage();//page使用 DataScope dataScope = service.getCurrUserDataScope(); List busConfigDTOList = busDigConfigService.getConfigList(page, keywords, - deptid, Long.valueOf(DeviceTypeEnum.Dig.getIndex()), dataScope); + deptid, "", Long.valueOf(DeviceTypeEnum.Dig.getIndex()), dataScope); page.setRecords(busConfigDTOList); successResult.setData(super.packForBT(page)); successResult.setMessage("success"); @@ -220,13 +220,41 @@ @RequestMapping(value = "/noiseConfig/list") @ResponseBody public Object noiseConfigList(@RequestParam(required = false) String keywords, - @RequestParam(required = false) String deptid) { + @RequestParam(required = false) String deptid, + @RequestParam(required = false) String areaId) { SuccessResponseData successResult = new SuccessResponseData(); try { + areaId += "%"; Page page = new PageFactory().defaultPage();//page使用 DataScope dataScope = service.getCurrUserDataScope(); List busConfigDTOList = busNoiseConfigService.getConfigList(page, keywords, - deptid, Long.valueOf(DeviceTypeEnum.Noise.getIndex()), dataScope); + deptid, areaId, Long.valueOf(DeviceTypeEnum.Noise.getIndex()), dataScope); + page.setRecords(busConfigDTOList); + successResult.setData(super.packForBT(page)); + successResult.setMessage("success"); + } catch (Exception e) { + e.printStackTrace(); + successResult.setCode(500); + successResult.setMessage("false"); + } + return successResult; + } + + /** + * 水表获取配置列表 + */ + @RequestMapping(value = "/watchConfig/list") + @ResponseBody + public Object watchConfigList(@RequestParam(required = false) String keywords, + @RequestParam(required = false) String deptid, + @RequestParam(required = false) String areaId) { + SuccessResponseData successResult = new SuccessResponseData(); + try { + areaId += "%"; + Page page = new PageFactory().defaultPage();//page使用 + DataScope dataScope = service.getCurrUserDataScope(); + List busConfigDTOList = busNoiseConfigService.getConfigList(page, keywords, + deptid, areaId, Long.valueOf(DeviceTypeEnum.WaterMeter.getIndex()), dataScope); page.setRecords(busConfigDTOList); successResult.setData(super.packForBT(page)); successResult.setMessage("success"); @@ -521,7 +549,7 @@ page.setSize(Integer.MAX_VALUE); DataScope dataScope = service.getCurrUserDataScope(); List busConfigDTOList = busConfigService.getConfigList(page, keywords, - deptid, Long.valueOf(DeviceTypeEnum.Liquid.getIndex()), dataScope); + deptid, "", Long.valueOf(DeviceTypeEnum.Liquid.getIndex()), dataScope); busConfigService.exp(busConfigDTOList, response); } catch (Exception e) { e.printStackTrace(); @@ -547,7 +575,7 @@ page.setSize(Integer.MAX_VALUE); DataScope dataScope = service.getCurrUserDataScope(); List busConfigDTOList = busWasteGasConfigService.getConfigList(page, keywords, - deptid, Long.valueOf(DeviceTypeEnum.WasteGas.getIndex()), dataScope); + deptid, "", Long.valueOf(DeviceTypeEnum.WasteGas.getIndex()), dataScope); busWasteGasConfigService.exp(busConfigDTOList, response); } catch (Exception e) { e.printStackTrace(); @@ -573,7 +601,7 @@ page.setSize(Integer.MAX_VALUE); DataScope dataScope = service.getCurrUserDataScope(); List busConfigDTOList = busMethaneConfigService.getConfigList(page, keywords, - deptid, Long.valueOf(DeviceTypeEnum.Methane.getIndex()), dataScope); + deptid, "", Long.valueOf(DeviceTypeEnum.Methane.getIndex()), dataScope); busMethaneConfigService.exp(busConfigDTOList, response); } catch (Exception e) { e.printStackTrace(); @@ -599,7 +627,7 @@ page.setSize(Integer.MAX_VALUE); DataScope dataScope = service.getCurrUserDataScope(); List busConfigDTOList = busTempHumiConfigService.getConfigList(page, keywords, - deptid, Long.valueOf(DeviceTypeEnum.TempHumi.getIndex()), dataScope); + deptid, "", Long.valueOf(DeviceTypeEnum.TempHumi.getIndex()), dataScope); busTempHumiConfigService.exp(busConfigDTOList, response); } catch (Exception e) { e.printStackTrace(); @@ -625,7 +653,7 @@ page.setSize(Integer.MAX_VALUE); DataScope dataScope = service.getCurrUserDataScope(); List busConfigDTOList = busDigConfigService.getConfigList(page, keywords, - deptid, Long.valueOf(DeviceTypeEnum.Dig.getIndex()), dataScope); + deptid, "", Long.valueOf(DeviceTypeEnum.Dig.getIndex()), dataScope); busDigConfigService.exp(busConfigDTOList, response); } catch (Exception e) { e.printStackTrace(); @@ -643,6 +671,7 @@ @ResponseBody public void exportNoise(@RequestParam(required = false) String keywords, @RequestParam(required = false) String deptid, + @RequestParam(required = false) String areaId, HttpServletResponse response) { try { Page page = new PageFactory().defaultPage();//page使用 @@ -650,8 +679,9 @@ page.setSearchCount(false); page.setSize(Integer.MAX_VALUE); DataScope dataScope = service.getCurrUserDataScope(); + areaId += "%"; List busConfigDTOList = busNoiseConfigService.getConfigList(page, keywords, - deptid, Long.valueOf(DeviceTypeEnum.Noise.getIndex()), dataScope); + deptid, areaId, Long.valueOf(DeviceTypeEnum.Noise.getIndex()), dataScope); busNoiseConfigService.exp(busConfigDTOList, response); } catch (Exception e) { e.printStackTrace(); @@ -669,7 +699,7 @@ Page page = new PageFactory().defaultPage();//page使用 DataScope dataScope = service.getCurrUserDataScope(); List busConfigDTOList = busGasLiquidConfigService.getConfigList(page, keywords, - deptid, Long.valueOf(DeviceTypeEnum.LG.getIndex()), dataScope); + deptid, "", Long.valueOf(DeviceTypeEnum.LG.getIndex()), dataScope); page.setRecords(busConfigDTOList); successResult.setData(super.packForBT(page)); successResult.setMessage("success"); diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/BusConfigController.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/BusConfigController.java index 122ebba..e50680b 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/BusConfigController.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/BusConfigController.java @@ -81,7 +81,7 @@ Page page = new PageFactory().defaultPage();//page使用 DataScope dataScope = service.getCurrUserDataScope(); List busConfigDTOList = busConfigService.getConfigList(page, keywords, - deptid, Long.valueOf(DeviceTypeEnum.Liquid.getIndex()), dataScope); + deptid, "", Long.valueOf(DeviceTypeEnum.Liquid.getIndex()), dataScope); page.setRecords(busConfigDTOList); successResult.setData(super.packForBT(page)); successResult.setMessage("success"); @@ -105,7 +105,7 @@ Page page = new PageFactory().defaultPage();//page使用 DataScope dataScope = service.getCurrUserDataScope(); List busConfigDTOList = busWasteGasConfigService.getConfigList(page, keywords, - deptid, Long.valueOf(DeviceTypeEnum.WasteGas.getIndex()), dataScope); + deptid, "", Long.valueOf(DeviceTypeEnum.WasteGas.getIndex()), dataScope); page.setRecords(busConfigDTOList); successResult.setData(super.packForBT(page)); successResult.setMessage("success"); @@ -129,7 +129,7 @@ Page page = new PageFactory().defaultPage();//page使用 DataScope dataScope = service.getCurrUserDataScope(); List busConfigDTOList = busMethaneConfigService.getConfigList(page, keywords, - deptid, Long.valueOf(DeviceTypeEnum.Methane.getIndex()), dataScope); + deptid, "", Long.valueOf(DeviceTypeEnum.Methane.getIndex()), dataScope); page.setRecords(busConfigDTOList); successResult.setData(super.packForBT(page)); successResult.setMessage("success"); @@ -154,7 +154,7 @@ Page page = new PageFactory().defaultPage();//page使用 DataScope dataScope = service.getCurrUserDataScope(); List busConfigDTOList = busTubeConfigService.getConfigList(page, keywords, - deptid, Long.valueOf(DeviceTypeEnum.Tube.getIndex()), dataScope); + deptid, "", Long.valueOf(DeviceTypeEnum.Tube.getIndex()), dataScope); page.setRecords(busConfigDTOList); successResult.setData(super.packForBT(page)); successResult.setMessage("success"); @@ -178,7 +178,7 @@ Page page = new PageFactory().defaultPage();//page使用 DataScope dataScope = service.getCurrUserDataScope(); List busConfigDTOList = busTempHumiConfigService.getConfigList(page, keywords, - deptid, Long.valueOf(DeviceTypeEnum.TempHumi.getIndex()), dataScope); + deptid, "", Long.valueOf(DeviceTypeEnum.TempHumi.getIndex()), dataScope); page.setRecords(busConfigDTOList); successResult.setData(super.packForBT(page)); successResult.setMessage("success"); @@ -202,7 +202,7 @@ Page page = new PageFactory().defaultPage();//page使用 DataScope dataScope = service.getCurrUserDataScope(); List busConfigDTOList = busDigConfigService.getConfigList(page, keywords, - deptid, Long.valueOf(DeviceTypeEnum.Dig.getIndex()), dataScope); + deptid, "", Long.valueOf(DeviceTypeEnum.Dig.getIndex()), dataScope); page.setRecords(busConfigDTOList); successResult.setData(super.packForBT(page)); successResult.setMessage("success"); @@ -220,13 +220,41 @@ @RequestMapping(value = "/noiseConfig/list") @ResponseBody public Object noiseConfigList(@RequestParam(required = false) String keywords, - @RequestParam(required = false) String deptid) { + @RequestParam(required = false) String deptid, + @RequestParam(required = false) String areaId) { SuccessResponseData successResult = new SuccessResponseData(); try { + areaId += "%"; Page page = new PageFactory().defaultPage();//page使用 DataScope dataScope = service.getCurrUserDataScope(); List busConfigDTOList = busNoiseConfigService.getConfigList(page, keywords, - deptid, Long.valueOf(DeviceTypeEnum.Noise.getIndex()), dataScope); + deptid, areaId, Long.valueOf(DeviceTypeEnum.Noise.getIndex()), dataScope); + page.setRecords(busConfigDTOList); + successResult.setData(super.packForBT(page)); + successResult.setMessage("success"); + } catch (Exception e) { + e.printStackTrace(); + successResult.setCode(500); + successResult.setMessage("false"); + } + return successResult; + } + + /** + * 水表获取配置列表 + */ + @RequestMapping(value = "/watchConfig/list") + @ResponseBody + public Object watchConfigList(@RequestParam(required = false) String keywords, + @RequestParam(required = false) String deptid, + @RequestParam(required = false) String areaId) { + SuccessResponseData successResult = new SuccessResponseData(); + try { + areaId += "%"; + Page page = new PageFactory().defaultPage();//page使用 + DataScope dataScope = service.getCurrUserDataScope(); + List busConfigDTOList = busNoiseConfigService.getConfigList(page, keywords, + deptid, areaId, Long.valueOf(DeviceTypeEnum.WaterMeter.getIndex()), dataScope); page.setRecords(busConfigDTOList); successResult.setData(super.packForBT(page)); successResult.setMessage("success"); @@ -521,7 +549,7 @@ page.setSize(Integer.MAX_VALUE); DataScope dataScope = service.getCurrUserDataScope(); List busConfigDTOList = busConfigService.getConfigList(page, keywords, - deptid, Long.valueOf(DeviceTypeEnum.Liquid.getIndex()), dataScope); + deptid, "", Long.valueOf(DeviceTypeEnum.Liquid.getIndex()), dataScope); busConfigService.exp(busConfigDTOList, response); } catch (Exception e) { e.printStackTrace(); @@ -547,7 +575,7 @@ page.setSize(Integer.MAX_VALUE); DataScope dataScope = service.getCurrUserDataScope(); List busConfigDTOList = busWasteGasConfigService.getConfigList(page, keywords, - deptid, Long.valueOf(DeviceTypeEnum.WasteGas.getIndex()), dataScope); + deptid, "", Long.valueOf(DeviceTypeEnum.WasteGas.getIndex()), dataScope); busWasteGasConfigService.exp(busConfigDTOList, response); } catch (Exception e) { e.printStackTrace(); @@ -573,7 +601,7 @@ page.setSize(Integer.MAX_VALUE); DataScope dataScope = service.getCurrUserDataScope(); List busConfigDTOList = busMethaneConfigService.getConfigList(page, keywords, - deptid, Long.valueOf(DeviceTypeEnum.Methane.getIndex()), dataScope); + deptid, "", Long.valueOf(DeviceTypeEnum.Methane.getIndex()), dataScope); busMethaneConfigService.exp(busConfigDTOList, response); } catch (Exception e) { e.printStackTrace(); @@ -599,7 +627,7 @@ page.setSize(Integer.MAX_VALUE); DataScope dataScope = service.getCurrUserDataScope(); List busConfigDTOList = busTempHumiConfigService.getConfigList(page, keywords, - deptid, Long.valueOf(DeviceTypeEnum.TempHumi.getIndex()), dataScope); + deptid, "", Long.valueOf(DeviceTypeEnum.TempHumi.getIndex()), dataScope); busTempHumiConfigService.exp(busConfigDTOList, response); } catch (Exception e) { e.printStackTrace(); @@ -625,7 +653,7 @@ page.setSize(Integer.MAX_VALUE); DataScope dataScope = service.getCurrUserDataScope(); List busConfigDTOList = busDigConfigService.getConfigList(page, keywords, - deptid, Long.valueOf(DeviceTypeEnum.Dig.getIndex()), dataScope); + deptid, "", Long.valueOf(DeviceTypeEnum.Dig.getIndex()), dataScope); busDigConfigService.exp(busConfigDTOList, response); } catch (Exception e) { e.printStackTrace(); @@ -643,6 +671,7 @@ @ResponseBody public void exportNoise(@RequestParam(required = false) String keywords, @RequestParam(required = false) String deptid, + @RequestParam(required = false) String areaId, HttpServletResponse response) { try { Page page = new PageFactory().defaultPage();//page使用 @@ -650,8 +679,9 @@ page.setSearchCount(false); page.setSize(Integer.MAX_VALUE); DataScope dataScope = service.getCurrUserDataScope(); + areaId += "%"; List busConfigDTOList = busNoiseConfigService.getConfigList(page, keywords, - deptid, Long.valueOf(DeviceTypeEnum.Noise.getIndex()), dataScope); + deptid, areaId, Long.valueOf(DeviceTypeEnum.Noise.getIndex()), dataScope); busNoiseConfigService.exp(busConfigDTOList, response); } catch (Exception e) { e.printStackTrace(); @@ -669,7 +699,7 @@ Page page = new PageFactory().defaultPage();//page使用 DataScope dataScope = service.getCurrUserDataScope(); List busConfigDTOList = busGasLiquidConfigService.getConfigList(page, keywords, - deptid, Long.valueOf(DeviceTypeEnum.LG.getIndex()), dataScope); + deptid, "", Long.valueOf(DeviceTypeEnum.LG.getIndex()), dataScope); page.setRecords(busConfigDTOList); successResult.setData(super.packForBT(page)); successResult.setMessage("success"); diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/BusConfigControllerBak.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/BusConfigControllerBak.java index f386d80..d5d8f39 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/BusConfigControllerBak.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/BusConfigControllerBak.java @@ -88,7 +88,7 @@ busConfigServiceHashMap.get(deviceType.intValue()); Page page = new PageFactory().defaultPage();//page使用 DataScope dataScope = service.getCurrUserDataScope(); - List busConfigDTOList = iBusConfigService.getConfigList(page, keywords, deptid,deviceType, dataScope); + List busConfigDTOList = iBusConfigService.getConfigList(page, keywords, deptid, "", deviceType, dataScope); page.setRecords(busConfigDTOList); successResult.setData(super.packForBT(page)); successResult.setMessage("success"); @@ -262,7 +262,7 @@ page.setSearchCount(false); page.setSize(Integer.MAX_VALUE); DataScope dataScope = service.getCurrUserDataScope(); - List busConfigDTOList = iBusConfigService.getConfigList(page, keywords, deptid,deviceType, dataScope); + List busConfigDTOList = iBusConfigService.getConfigList(page, keywords, deptid, "", deviceType, dataScope); iBusConfigService.exp(busConfigDTOList,response); } catch (Exception e) { e.printStackTrace(); diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/BusConfigController.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/BusConfigController.java index 122ebba..e50680b 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/BusConfigController.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/BusConfigController.java @@ -81,7 +81,7 @@ Page page = new PageFactory().defaultPage();//page使用 DataScope dataScope = service.getCurrUserDataScope(); List busConfigDTOList = busConfigService.getConfigList(page, keywords, - deptid, Long.valueOf(DeviceTypeEnum.Liquid.getIndex()), dataScope); + deptid, "", Long.valueOf(DeviceTypeEnum.Liquid.getIndex()), dataScope); page.setRecords(busConfigDTOList); successResult.setData(super.packForBT(page)); successResult.setMessage("success"); @@ -105,7 +105,7 @@ Page page = new PageFactory().defaultPage();//page使用 DataScope dataScope = service.getCurrUserDataScope(); List busConfigDTOList = busWasteGasConfigService.getConfigList(page, keywords, - deptid, Long.valueOf(DeviceTypeEnum.WasteGas.getIndex()), dataScope); + deptid, "", Long.valueOf(DeviceTypeEnum.WasteGas.getIndex()), dataScope); page.setRecords(busConfigDTOList); successResult.setData(super.packForBT(page)); successResult.setMessage("success"); @@ -129,7 +129,7 @@ Page page = new PageFactory().defaultPage();//page使用 DataScope dataScope = service.getCurrUserDataScope(); List busConfigDTOList = busMethaneConfigService.getConfigList(page, keywords, - deptid, Long.valueOf(DeviceTypeEnum.Methane.getIndex()), dataScope); + deptid, "", Long.valueOf(DeviceTypeEnum.Methane.getIndex()), dataScope); page.setRecords(busConfigDTOList); successResult.setData(super.packForBT(page)); successResult.setMessage("success"); @@ -154,7 +154,7 @@ Page page = new PageFactory().defaultPage();//page使用 DataScope dataScope = service.getCurrUserDataScope(); List busConfigDTOList = busTubeConfigService.getConfigList(page, keywords, - deptid, Long.valueOf(DeviceTypeEnum.Tube.getIndex()), dataScope); + deptid, "", Long.valueOf(DeviceTypeEnum.Tube.getIndex()), dataScope); page.setRecords(busConfigDTOList); successResult.setData(super.packForBT(page)); successResult.setMessage("success"); @@ -178,7 +178,7 @@ Page page = new PageFactory().defaultPage();//page使用 DataScope dataScope = service.getCurrUserDataScope(); List busConfigDTOList = busTempHumiConfigService.getConfigList(page, keywords, - deptid, Long.valueOf(DeviceTypeEnum.TempHumi.getIndex()), dataScope); + deptid, "", Long.valueOf(DeviceTypeEnum.TempHumi.getIndex()), dataScope); page.setRecords(busConfigDTOList); successResult.setData(super.packForBT(page)); successResult.setMessage("success"); @@ -202,7 +202,7 @@ Page page = new PageFactory().defaultPage();//page使用 DataScope dataScope = service.getCurrUserDataScope(); List busConfigDTOList = busDigConfigService.getConfigList(page, keywords, - deptid, Long.valueOf(DeviceTypeEnum.Dig.getIndex()), dataScope); + deptid, "", Long.valueOf(DeviceTypeEnum.Dig.getIndex()), dataScope); page.setRecords(busConfigDTOList); successResult.setData(super.packForBT(page)); successResult.setMessage("success"); @@ -220,13 +220,41 @@ @RequestMapping(value = "/noiseConfig/list") @ResponseBody public Object noiseConfigList(@RequestParam(required = false) String keywords, - @RequestParam(required = false) String deptid) { + @RequestParam(required = false) String deptid, + @RequestParam(required = false) String areaId) { SuccessResponseData successResult = new SuccessResponseData(); try { + areaId += "%"; Page page = new PageFactory().defaultPage();//page使用 DataScope dataScope = service.getCurrUserDataScope(); List busConfigDTOList = busNoiseConfigService.getConfigList(page, keywords, - deptid, Long.valueOf(DeviceTypeEnum.Noise.getIndex()), dataScope); + deptid, areaId, Long.valueOf(DeviceTypeEnum.Noise.getIndex()), dataScope); + page.setRecords(busConfigDTOList); + successResult.setData(super.packForBT(page)); + successResult.setMessage("success"); + } catch (Exception e) { + e.printStackTrace(); + successResult.setCode(500); + successResult.setMessage("false"); + } + return successResult; + } + + /** + * 水表获取配置列表 + */ + @RequestMapping(value = "/watchConfig/list") + @ResponseBody + public Object watchConfigList(@RequestParam(required = false) String keywords, + @RequestParam(required = false) String deptid, + @RequestParam(required = false) String areaId) { + SuccessResponseData successResult = new SuccessResponseData(); + try { + areaId += "%"; + Page page = new PageFactory().defaultPage();//page使用 + DataScope dataScope = service.getCurrUserDataScope(); + List busConfigDTOList = busNoiseConfigService.getConfigList(page, keywords, + deptid, areaId, Long.valueOf(DeviceTypeEnum.WaterMeter.getIndex()), dataScope); page.setRecords(busConfigDTOList); successResult.setData(super.packForBT(page)); successResult.setMessage("success"); @@ -521,7 +549,7 @@ page.setSize(Integer.MAX_VALUE); DataScope dataScope = service.getCurrUserDataScope(); List busConfigDTOList = busConfigService.getConfigList(page, keywords, - deptid, Long.valueOf(DeviceTypeEnum.Liquid.getIndex()), dataScope); + deptid, "", Long.valueOf(DeviceTypeEnum.Liquid.getIndex()), dataScope); busConfigService.exp(busConfigDTOList, response); } catch (Exception e) { e.printStackTrace(); @@ -547,7 +575,7 @@ page.setSize(Integer.MAX_VALUE); DataScope dataScope = service.getCurrUserDataScope(); List busConfigDTOList = busWasteGasConfigService.getConfigList(page, keywords, - deptid, Long.valueOf(DeviceTypeEnum.WasteGas.getIndex()), dataScope); + deptid, "", Long.valueOf(DeviceTypeEnum.WasteGas.getIndex()), dataScope); busWasteGasConfigService.exp(busConfigDTOList, response); } catch (Exception e) { e.printStackTrace(); @@ -573,7 +601,7 @@ page.setSize(Integer.MAX_VALUE); DataScope dataScope = service.getCurrUserDataScope(); List busConfigDTOList = busMethaneConfigService.getConfigList(page, keywords, - deptid, Long.valueOf(DeviceTypeEnum.Methane.getIndex()), dataScope); + deptid, "", Long.valueOf(DeviceTypeEnum.Methane.getIndex()), dataScope); busMethaneConfigService.exp(busConfigDTOList, response); } catch (Exception e) { e.printStackTrace(); @@ -599,7 +627,7 @@ page.setSize(Integer.MAX_VALUE); DataScope dataScope = service.getCurrUserDataScope(); List busConfigDTOList = busTempHumiConfigService.getConfigList(page, keywords, - deptid, Long.valueOf(DeviceTypeEnum.TempHumi.getIndex()), dataScope); + deptid, "", Long.valueOf(DeviceTypeEnum.TempHumi.getIndex()), dataScope); busTempHumiConfigService.exp(busConfigDTOList, response); } catch (Exception e) { e.printStackTrace(); @@ -625,7 +653,7 @@ page.setSize(Integer.MAX_VALUE); DataScope dataScope = service.getCurrUserDataScope(); List busConfigDTOList = busDigConfigService.getConfigList(page, keywords, - deptid, Long.valueOf(DeviceTypeEnum.Dig.getIndex()), dataScope); + deptid, "", Long.valueOf(DeviceTypeEnum.Dig.getIndex()), dataScope); busDigConfigService.exp(busConfigDTOList, response); } catch (Exception e) { e.printStackTrace(); @@ -643,6 +671,7 @@ @ResponseBody public void exportNoise(@RequestParam(required = false) String keywords, @RequestParam(required = false) String deptid, + @RequestParam(required = false) String areaId, HttpServletResponse response) { try { Page page = new PageFactory().defaultPage();//page使用 @@ -650,8 +679,9 @@ page.setSearchCount(false); page.setSize(Integer.MAX_VALUE); DataScope dataScope = service.getCurrUserDataScope(); + areaId += "%"; List busConfigDTOList = busNoiseConfigService.getConfigList(page, keywords, - deptid, Long.valueOf(DeviceTypeEnum.Noise.getIndex()), dataScope); + deptid, areaId, Long.valueOf(DeviceTypeEnum.Noise.getIndex()), dataScope); busNoiseConfigService.exp(busConfigDTOList, response); } catch (Exception e) { e.printStackTrace(); @@ -669,7 +699,7 @@ Page page = new PageFactory().defaultPage();//page使用 DataScope dataScope = service.getCurrUserDataScope(); List busConfigDTOList = busGasLiquidConfigService.getConfigList(page, keywords, - deptid, Long.valueOf(DeviceTypeEnum.LG.getIndex()), dataScope); + deptid, "", Long.valueOf(DeviceTypeEnum.LG.getIndex()), dataScope); page.setRecords(busConfigDTOList); successResult.setData(super.packForBT(page)); successResult.setMessage("success"); diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/BusConfigControllerBak.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/BusConfigControllerBak.java index f386d80..d5d8f39 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/BusConfigControllerBak.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/BusConfigControllerBak.java @@ -88,7 +88,7 @@ busConfigServiceHashMap.get(deviceType.intValue()); Page page = new PageFactory().defaultPage();//page使用 DataScope dataScope = service.getCurrUserDataScope(); - List busConfigDTOList = iBusConfigService.getConfigList(page, keywords, deptid,deviceType, dataScope); + List busConfigDTOList = iBusConfigService.getConfigList(page, keywords, deptid, "", deviceType, dataScope); page.setRecords(busConfigDTOList); successResult.setData(super.packForBT(page)); successResult.setMessage("success"); @@ -262,7 +262,7 @@ page.setSearchCount(false); page.setSize(Integer.MAX_VALUE); DataScope dataScope = service.getCurrUserDataScope(); - List busConfigDTOList = iBusConfigService.getConfigList(page, keywords, deptid,deviceType, dataScope); + List busConfigDTOList = iBusConfigService.getConfigList(page, keywords, deptid, "", deviceType, dataScope); iBusConfigService.exp(busConfigDTOList,response); } catch (Exception e) { e.printStackTrace(); diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java index 988f6a3..21ffcec 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java @@ -80,14 +80,15 @@ @ApiOperation("获取设备列表") @RequestMapping(value = "/list") @ResponseBody - public Object list(String keywords, String deviceType, String deptid, String beginTime, String endTime, String isOnline) { + public Object list(String keywords, String deviceType, String deptid, String beginTime, String endTime, String isOnline, String areaId) { Page page = new PageFactory().defaultPage(); //查询数据权限 使用默认DEPTID 字段 DataScope dataScope = permissionService.getCurrUserDataScope(); - List list = deviceService.selectDataScopePage(dataScope, page, deviceType, deptid, beginTime, endTime, keywords, isOnline); + areaId += "%"; + List list = deviceService.selectDataScopePage(dataScope, page, deviceType, deptid, beginTime, endTime, keywords, isOnline, areaId); list.forEach(deviceDto -> { - deviceDto.setBfztName(permissionService.getDictNameByCode(ModularDictConst.BFZT, deviceDto.getBfzt())); deviceDto.setOnlineStateName(permissionService.getDictNameByCode(ModularDictConst.ONLINESTATUS, deviceDto.getOnlineState())); + deviceDto.setAreaFullName(deviceService.getAreaFullNameById(deviceDto.getArea())); }); page.setRecords(list); return new SuccessResponseData(super.packForBT(page)); @@ -199,14 +200,14 @@ @RequestMapping(value = "/batchExport") @Permission @ResponseBody - public void batchExport(HttpServletResponse response, String keywords, String deviceType, String deptid, String beginTime, String endTime, String isOnline) throws IOException { + public void batchExport(HttpServletResponse response, String keywords, String deviceType, String deptid, String beginTime, String endTime, String isOnline, String areaId) throws IOException { Page page = new PageFactory().defaultPage(); page.setCurrent(1); page.setSearchCount(false); page.setSize(Integer.MAX_VALUE); DataScope dataScope = permissionService.getCurrUserDataScope(); - List list = deviceService.selectDataScopePage(dataScope, page, deviceType, deptid, beginTime, endTime, keywords, isOnline); + List list = deviceService.selectDataScopePage(dataScope, page, deviceType, deptid, beginTime, endTime, keywords, isOnline, areaId); list.forEach(deviceDto -> { deviceDto.setBfztName(permissionService.getDictNameByCode(ModularDictConst.BFZT, deviceDto.getBfzt())); deviceDto.setOnlineStateName(permissionService.getDictNameByCode(ModularDictConst.ONLINESTATUS, deviceDto.getOnlineState())); diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/BusConfigController.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/BusConfigController.java index 122ebba..e50680b 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/BusConfigController.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/BusConfigController.java @@ -81,7 +81,7 @@ Page page = new PageFactory().defaultPage();//page使用 DataScope dataScope = service.getCurrUserDataScope(); List busConfigDTOList = busConfigService.getConfigList(page, keywords, - deptid, Long.valueOf(DeviceTypeEnum.Liquid.getIndex()), dataScope); + deptid, "", Long.valueOf(DeviceTypeEnum.Liquid.getIndex()), dataScope); page.setRecords(busConfigDTOList); successResult.setData(super.packForBT(page)); successResult.setMessage("success"); @@ -105,7 +105,7 @@ Page page = new PageFactory().defaultPage();//page使用 DataScope dataScope = service.getCurrUserDataScope(); List busConfigDTOList = busWasteGasConfigService.getConfigList(page, keywords, - deptid, Long.valueOf(DeviceTypeEnum.WasteGas.getIndex()), dataScope); + deptid, "", Long.valueOf(DeviceTypeEnum.WasteGas.getIndex()), dataScope); page.setRecords(busConfigDTOList); successResult.setData(super.packForBT(page)); successResult.setMessage("success"); @@ -129,7 +129,7 @@ Page page = new PageFactory().defaultPage();//page使用 DataScope dataScope = service.getCurrUserDataScope(); List busConfigDTOList = busMethaneConfigService.getConfigList(page, keywords, - deptid, Long.valueOf(DeviceTypeEnum.Methane.getIndex()), dataScope); + deptid, "", Long.valueOf(DeviceTypeEnum.Methane.getIndex()), dataScope); page.setRecords(busConfigDTOList); successResult.setData(super.packForBT(page)); successResult.setMessage("success"); @@ -154,7 +154,7 @@ Page page = new PageFactory().defaultPage();//page使用 DataScope dataScope = service.getCurrUserDataScope(); List busConfigDTOList = busTubeConfigService.getConfigList(page, keywords, - deptid, Long.valueOf(DeviceTypeEnum.Tube.getIndex()), dataScope); + deptid, "", Long.valueOf(DeviceTypeEnum.Tube.getIndex()), dataScope); page.setRecords(busConfigDTOList); successResult.setData(super.packForBT(page)); successResult.setMessage("success"); @@ -178,7 +178,7 @@ Page page = new PageFactory().defaultPage();//page使用 DataScope dataScope = service.getCurrUserDataScope(); List busConfigDTOList = busTempHumiConfigService.getConfigList(page, keywords, - deptid, Long.valueOf(DeviceTypeEnum.TempHumi.getIndex()), dataScope); + deptid, "", Long.valueOf(DeviceTypeEnum.TempHumi.getIndex()), dataScope); page.setRecords(busConfigDTOList); successResult.setData(super.packForBT(page)); successResult.setMessage("success"); @@ -202,7 +202,7 @@ Page page = new PageFactory().defaultPage();//page使用 DataScope dataScope = service.getCurrUserDataScope(); List busConfigDTOList = busDigConfigService.getConfigList(page, keywords, - deptid, Long.valueOf(DeviceTypeEnum.Dig.getIndex()), dataScope); + deptid, "", Long.valueOf(DeviceTypeEnum.Dig.getIndex()), dataScope); page.setRecords(busConfigDTOList); successResult.setData(super.packForBT(page)); successResult.setMessage("success"); @@ -220,13 +220,41 @@ @RequestMapping(value = "/noiseConfig/list") @ResponseBody public Object noiseConfigList(@RequestParam(required = false) String keywords, - @RequestParam(required = false) String deptid) { + @RequestParam(required = false) String deptid, + @RequestParam(required = false) String areaId) { SuccessResponseData successResult = new SuccessResponseData(); try { + areaId += "%"; Page page = new PageFactory().defaultPage();//page使用 DataScope dataScope = service.getCurrUserDataScope(); List busConfigDTOList = busNoiseConfigService.getConfigList(page, keywords, - deptid, Long.valueOf(DeviceTypeEnum.Noise.getIndex()), dataScope); + deptid, areaId, Long.valueOf(DeviceTypeEnum.Noise.getIndex()), dataScope); + page.setRecords(busConfigDTOList); + successResult.setData(super.packForBT(page)); + successResult.setMessage("success"); + } catch (Exception e) { + e.printStackTrace(); + successResult.setCode(500); + successResult.setMessage("false"); + } + return successResult; + } + + /** + * 水表获取配置列表 + */ + @RequestMapping(value = "/watchConfig/list") + @ResponseBody + public Object watchConfigList(@RequestParam(required = false) String keywords, + @RequestParam(required = false) String deptid, + @RequestParam(required = false) String areaId) { + SuccessResponseData successResult = new SuccessResponseData(); + try { + areaId += "%"; + Page page = new PageFactory().defaultPage();//page使用 + DataScope dataScope = service.getCurrUserDataScope(); + List busConfigDTOList = busNoiseConfigService.getConfigList(page, keywords, + deptid, areaId, Long.valueOf(DeviceTypeEnum.WaterMeter.getIndex()), dataScope); page.setRecords(busConfigDTOList); successResult.setData(super.packForBT(page)); successResult.setMessage("success"); @@ -521,7 +549,7 @@ page.setSize(Integer.MAX_VALUE); DataScope dataScope = service.getCurrUserDataScope(); List busConfigDTOList = busConfigService.getConfigList(page, keywords, - deptid, Long.valueOf(DeviceTypeEnum.Liquid.getIndex()), dataScope); + deptid, "", Long.valueOf(DeviceTypeEnum.Liquid.getIndex()), dataScope); busConfigService.exp(busConfigDTOList, response); } catch (Exception e) { e.printStackTrace(); @@ -547,7 +575,7 @@ page.setSize(Integer.MAX_VALUE); DataScope dataScope = service.getCurrUserDataScope(); List busConfigDTOList = busWasteGasConfigService.getConfigList(page, keywords, - deptid, Long.valueOf(DeviceTypeEnum.WasteGas.getIndex()), dataScope); + deptid, "", Long.valueOf(DeviceTypeEnum.WasteGas.getIndex()), dataScope); busWasteGasConfigService.exp(busConfigDTOList, response); } catch (Exception e) { e.printStackTrace(); @@ -573,7 +601,7 @@ page.setSize(Integer.MAX_VALUE); DataScope dataScope = service.getCurrUserDataScope(); List busConfigDTOList = busMethaneConfigService.getConfigList(page, keywords, - deptid, Long.valueOf(DeviceTypeEnum.Methane.getIndex()), dataScope); + deptid, "", Long.valueOf(DeviceTypeEnum.Methane.getIndex()), dataScope); busMethaneConfigService.exp(busConfigDTOList, response); } catch (Exception e) { e.printStackTrace(); @@ -599,7 +627,7 @@ page.setSize(Integer.MAX_VALUE); DataScope dataScope = service.getCurrUserDataScope(); List busConfigDTOList = busTempHumiConfigService.getConfigList(page, keywords, - deptid, Long.valueOf(DeviceTypeEnum.TempHumi.getIndex()), dataScope); + deptid, "", Long.valueOf(DeviceTypeEnum.TempHumi.getIndex()), dataScope); busTempHumiConfigService.exp(busConfigDTOList, response); } catch (Exception e) { e.printStackTrace(); @@ -625,7 +653,7 @@ page.setSize(Integer.MAX_VALUE); DataScope dataScope = service.getCurrUserDataScope(); List busConfigDTOList = busDigConfigService.getConfigList(page, keywords, - deptid, Long.valueOf(DeviceTypeEnum.Dig.getIndex()), dataScope); + deptid, "", Long.valueOf(DeviceTypeEnum.Dig.getIndex()), dataScope); busDigConfigService.exp(busConfigDTOList, response); } catch (Exception e) { e.printStackTrace(); @@ -643,6 +671,7 @@ @ResponseBody public void exportNoise(@RequestParam(required = false) String keywords, @RequestParam(required = false) String deptid, + @RequestParam(required = false) String areaId, HttpServletResponse response) { try { Page page = new PageFactory().defaultPage();//page使用 @@ -650,8 +679,9 @@ page.setSearchCount(false); page.setSize(Integer.MAX_VALUE); DataScope dataScope = service.getCurrUserDataScope(); + areaId += "%"; List busConfigDTOList = busNoiseConfigService.getConfigList(page, keywords, - deptid, Long.valueOf(DeviceTypeEnum.Noise.getIndex()), dataScope); + deptid, areaId, Long.valueOf(DeviceTypeEnum.Noise.getIndex()), dataScope); busNoiseConfigService.exp(busConfigDTOList, response); } catch (Exception e) { e.printStackTrace(); @@ -669,7 +699,7 @@ Page page = new PageFactory().defaultPage();//page使用 DataScope dataScope = service.getCurrUserDataScope(); List busConfigDTOList = busGasLiquidConfigService.getConfigList(page, keywords, - deptid, Long.valueOf(DeviceTypeEnum.LG.getIndex()), dataScope); + deptid, "", Long.valueOf(DeviceTypeEnum.LG.getIndex()), dataScope); page.setRecords(busConfigDTOList); successResult.setData(super.packForBT(page)); successResult.setMessage("success"); diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/BusConfigControllerBak.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/BusConfigControllerBak.java index f386d80..d5d8f39 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/BusConfigControllerBak.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/BusConfigControllerBak.java @@ -88,7 +88,7 @@ busConfigServiceHashMap.get(deviceType.intValue()); Page page = new PageFactory().defaultPage();//page使用 DataScope dataScope = service.getCurrUserDataScope(); - List busConfigDTOList = iBusConfigService.getConfigList(page, keywords, deptid,deviceType, dataScope); + List busConfigDTOList = iBusConfigService.getConfigList(page, keywords, deptid, "", deviceType, dataScope); page.setRecords(busConfigDTOList); successResult.setData(super.packForBT(page)); successResult.setMessage("success"); @@ -262,7 +262,7 @@ page.setSearchCount(false); page.setSize(Integer.MAX_VALUE); DataScope dataScope = service.getCurrUserDataScope(); - List busConfigDTOList = iBusConfigService.getConfigList(page, keywords, deptid,deviceType, dataScope); + List busConfigDTOList = iBusConfigService.getConfigList(page, keywords, deptid, "", deviceType, dataScope); iBusConfigService.exp(busConfigDTOList,response); } catch (Exception e) { e.printStackTrace(); diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java index 988f6a3..21ffcec 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java @@ -80,14 +80,15 @@ @ApiOperation("获取设备列表") @RequestMapping(value = "/list") @ResponseBody - public Object list(String keywords, String deviceType, String deptid, String beginTime, String endTime, String isOnline) { + public Object list(String keywords, String deviceType, String deptid, String beginTime, String endTime, String isOnline, String areaId) { Page page = new PageFactory().defaultPage(); //查询数据权限 使用默认DEPTID 字段 DataScope dataScope = permissionService.getCurrUserDataScope(); - List list = deviceService.selectDataScopePage(dataScope, page, deviceType, deptid, beginTime, endTime, keywords, isOnline); + areaId += "%"; + List list = deviceService.selectDataScopePage(dataScope, page, deviceType, deptid, beginTime, endTime, keywords, isOnline, areaId); list.forEach(deviceDto -> { - deviceDto.setBfztName(permissionService.getDictNameByCode(ModularDictConst.BFZT, deviceDto.getBfzt())); deviceDto.setOnlineStateName(permissionService.getDictNameByCode(ModularDictConst.ONLINESTATUS, deviceDto.getOnlineState())); + deviceDto.setAreaFullName(deviceService.getAreaFullNameById(deviceDto.getArea())); }); page.setRecords(list); return new SuccessResponseData(super.packForBT(page)); @@ -199,14 +200,14 @@ @RequestMapping(value = "/batchExport") @Permission @ResponseBody - public void batchExport(HttpServletResponse response, String keywords, String deviceType, String deptid, String beginTime, String endTime, String isOnline) throws IOException { + public void batchExport(HttpServletResponse response, String keywords, String deviceType, String deptid, String beginTime, String endTime, String isOnline, String areaId) throws IOException { Page page = new PageFactory().defaultPage(); page.setCurrent(1); page.setSearchCount(false); page.setSize(Integer.MAX_VALUE); DataScope dataScope = permissionService.getCurrUserDataScope(); - List list = deviceService.selectDataScopePage(dataScope, page, deviceType, deptid, beginTime, endTime, keywords, isOnline); + List list = deviceService.selectDataScopePage(dataScope, page, deviceType, deptid, beginTime, endTime, keywords, isOnline, areaId); list.forEach(deviceDto -> { deviceDto.setBfztName(permissionService.getDictNameByCode(ModularDictConst.BFZT, deviceDto.getBfzt())); deviceDto.setOnlineStateName(permissionService.getDictNameByCode(ModularDictConst.ONLINESTATUS, deviceDto.getOnlineState())); diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/BusConfigMapper.java b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/BusConfigMapper.java index 8e66b48..6dbf4e2 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/BusConfigMapper.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/BusConfigMapper.java @@ -26,9 +26,12 @@ List> getConfigList(@Param("page") Page page, @Param("keywords") String keywords, @Param("deptid") String deptid, + @Param("areaId") String areaId, @Param("sensorid") String sensorid, @Param("dataScope") DataScope dataScope); + String getArea(@Param("id") String id); + String getAreaPId(@Param("id") String id); String getConcenCodeByDevId(@Param("devID") Long devID); String getWellDeepByDevId(@Param("devID") Long devID); diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/BusConfigController.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/BusConfigController.java index 122ebba..e50680b 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/BusConfigController.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/BusConfigController.java @@ -81,7 +81,7 @@ Page page = new PageFactory().defaultPage();//page使用 DataScope dataScope = service.getCurrUserDataScope(); List busConfigDTOList = busConfigService.getConfigList(page, keywords, - deptid, Long.valueOf(DeviceTypeEnum.Liquid.getIndex()), dataScope); + deptid, "", Long.valueOf(DeviceTypeEnum.Liquid.getIndex()), dataScope); page.setRecords(busConfigDTOList); successResult.setData(super.packForBT(page)); successResult.setMessage("success"); @@ -105,7 +105,7 @@ Page page = new PageFactory().defaultPage();//page使用 DataScope dataScope = service.getCurrUserDataScope(); List busConfigDTOList = busWasteGasConfigService.getConfigList(page, keywords, - deptid, Long.valueOf(DeviceTypeEnum.WasteGas.getIndex()), dataScope); + deptid, "", Long.valueOf(DeviceTypeEnum.WasteGas.getIndex()), dataScope); page.setRecords(busConfigDTOList); successResult.setData(super.packForBT(page)); successResult.setMessage("success"); @@ -129,7 +129,7 @@ Page page = new PageFactory().defaultPage();//page使用 DataScope dataScope = service.getCurrUserDataScope(); List busConfigDTOList = busMethaneConfigService.getConfigList(page, keywords, - deptid, Long.valueOf(DeviceTypeEnum.Methane.getIndex()), dataScope); + deptid, "", Long.valueOf(DeviceTypeEnum.Methane.getIndex()), dataScope); page.setRecords(busConfigDTOList); successResult.setData(super.packForBT(page)); successResult.setMessage("success"); @@ -154,7 +154,7 @@ Page page = new PageFactory().defaultPage();//page使用 DataScope dataScope = service.getCurrUserDataScope(); List busConfigDTOList = busTubeConfigService.getConfigList(page, keywords, - deptid, Long.valueOf(DeviceTypeEnum.Tube.getIndex()), dataScope); + deptid, "", Long.valueOf(DeviceTypeEnum.Tube.getIndex()), dataScope); page.setRecords(busConfigDTOList); successResult.setData(super.packForBT(page)); successResult.setMessage("success"); @@ -178,7 +178,7 @@ Page page = new PageFactory().defaultPage();//page使用 DataScope dataScope = service.getCurrUserDataScope(); List busConfigDTOList = busTempHumiConfigService.getConfigList(page, keywords, - deptid, Long.valueOf(DeviceTypeEnum.TempHumi.getIndex()), dataScope); + deptid, "", Long.valueOf(DeviceTypeEnum.TempHumi.getIndex()), dataScope); page.setRecords(busConfigDTOList); successResult.setData(super.packForBT(page)); successResult.setMessage("success"); @@ -202,7 +202,7 @@ Page page = new PageFactory().defaultPage();//page使用 DataScope dataScope = service.getCurrUserDataScope(); List busConfigDTOList = busDigConfigService.getConfigList(page, keywords, - deptid, Long.valueOf(DeviceTypeEnum.Dig.getIndex()), dataScope); + deptid, "", Long.valueOf(DeviceTypeEnum.Dig.getIndex()), dataScope); page.setRecords(busConfigDTOList); successResult.setData(super.packForBT(page)); successResult.setMessage("success"); @@ -220,13 +220,41 @@ @RequestMapping(value = "/noiseConfig/list") @ResponseBody public Object noiseConfigList(@RequestParam(required = false) String keywords, - @RequestParam(required = false) String deptid) { + @RequestParam(required = false) String deptid, + @RequestParam(required = false) String areaId) { SuccessResponseData successResult = new SuccessResponseData(); try { + areaId += "%"; Page page = new PageFactory().defaultPage();//page使用 DataScope dataScope = service.getCurrUserDataScope(); List busConfigDTOList = busNoiseConfigService.getConfigList(page, keywords, - deptid, Long.valueOf(DeviceTypeEnum.Noise.getIndex()), dataScope); + deptid, areaId, Long.valueOf(DeviceTypeEnum.Noise.getIndex()), dataScope); + page.setRecords(busConfigDTOList); + successResult.setData(super.packForBT(page)); + successResult.setMessage("success"); + } catch (Exception e) { + e.printStackTrace(); + successResult.setCode(500); + successResult.setMessage("false"); + } + return successResult; + } + + /** + * 水表获取配置列表 + */ + @RequestMapping(value = "/watchConfig/list") + @ResponseBody + public Object watchConfigList(@RequestParam(required = false) String keywords, + @RequestParam(required = false) String deptid, + @RequestParam(required = false) String areaId) { + SuccessResponseData successResult = new SuccessResponseData(); + try { + areaId += "%"; + Page page = new PageFactory().defaultPage();//page使用 + DataScope dataScope = service.getCurrUserDataScope(); + List busConfigDTOList = busNoiseConfigService.getConfigList(page, keywords, + deptid, areaId, Long.valueOf(DeviceTypeEnum.WaterMeter.getIndex()), dataScope); page.setRecords(busConfigDTOList); successResult.setData(super.packForBT(page)); successResult.setMessage("success"); @@ -521,7 +549,7 @@ page.setSize(Integer.MAX_VALUE); DataScope dataScope = service.getCurrUserDataScope(); List busConfigDTOList = busConfigService.getConfigList(page, keywords, - deptid, Long.valueOf(DeviceTypeEnum.Liquid.getIndex()), dataScope); + deptid, "", Long.valueOf(DeviceTypeEnum.Liquid.getIndex()), dataScope); busConfigService.exp(busConfigDTOList, response); } catch (Exception e) { e.printStackTrace(); @@ -547,7 +575,7 @@ page.setSize(Integer.MAX_VALUE); DataScope dataScope = service.getCurrUserDataScope(); List busConfigDTOList = busWasteGasConfigService.getConfigList(page, keywords, - deptid, Long.valueOf(DeviceTypeEnum.WasteGas.getIndex()), dataScope); + deptid, "", Long.valueOf(DeviceTypeEnum.WasteGas.getIndex()), dataScope); busWasteGasConfigService.exp(busConfigDTOList, response); } catch (Exception e) { e.printStackTrace(); @@ -573,7 +601,7 @@ page.setSize(Integer.MAX_VALUE); DataScope dataScope = service.getCurrUserDataScope(); List busConfigDTOList = busMethaneConfigService.getConfigList(page, keywords, - deptid, Long.valueOf(DeviceTypeEnum.Methane.getIndex()), dataScope); + deptid, "", Long.valueOf(DeviceTypeEnum.Methane.getIndex()), dataScope); busMethaneConfigService.exp(busConfigDTOList, response); } catch (Exception e) { e.printStackTrace(); @@ -599,7 +627,7 @@ page.setSize(Integer.MAX_VALUE); DataScope dataScope = service.getCurrUserDataScope(); List busConfigDTOList = busTempHumiConfigService.getConfigList(page, keywords, - deptid, Long.valueOf(DeviceTypeEnum.TempHumi.getIndex()), dataScope); + deptid, "", Long.valueOf(DeviceTypeEnum.TempHumi.getIndex()), dataScope); busTempHumiConfigService.exp(busConfigDTOList, response); } catch (Exception e) { e.printStackTrace(); @@ -625,7 +653,7 @@ page.setSize(Integer.MAX_VALUE); DataScope dataScope = service.getCurrUserDataScope(); List busConfigDTOList = busDigConfigService.getConfigList(page, keywords, - deptid, Long.valueOf(DeviceTypeEnum.Dig.getIndex()), dataScope); + deptid, "", Long.valueOf(DeviceTypeEnum.Dig.getIndex()), dataScope); busDigConfigService.exp(busConfigDTOList, response); } catch (Exception e) { e.printStackTrace(); @@ -643,6 +671,7 @@ @ResponseBody public void exportNoise(@RequestParam(required = false) String keywords, @RequestParam(required = false) String deptid, + @RequestParam(required = false) String areaId, HttpServletResponse response) { try { Page page = new PageFactory().defaultPage();//page使用 @@ -650,8 +679,9 @@ page.setSearchCount(false); page.setSize(Integer.MAX_VALUE); DataScope dataScope = service.getCurrUserDataScope(); + areaId += "%"; List busConfigDTOList = busNoiseConfigService.getConfigList(page, keywords, - deptid, Long.valueOf(DeviceTypeEnum.Noise.getIndex()), dataScope); + deptid, areaId, Long.valueOf(DeviceTypeEnum.Noise.getIndex()), dataScope); busNoiseConfigService.exp(busConfigDTOList, response); } catch (Exception e) { e.printStackTrace(); @@ -669,7 +699,7 @@ Page page = new PageFactory().defaultPage();//page使用 DataScope dataScope = service.getCurrUserDataScope(); List busConfigDTOList = busGasLiquidConfigService.getConfigList(page, keywords, - deptid, Long.valueOf(DeviceTypeEnum.LG.getIndex()), dataScope); + deptid, "", Long.valueOf(DeviceTypeEnum.LG.getIndex()), dataScope); page.setRecords(busConfigDTOList); successResult.setData(super.packForBT(page)); successResult.setMessage("success"); diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/BusConfigControllerBak.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/BusConfigControllerBak.java index f386d80..d5d8f39 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/BusConfigControllerBak.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/BusConfigControllerBak.java @@ -88,7 +88,7 @@ busConfigServiceHashMap.get(deviceType.intValue()); Page page = new PageFactory().defaultPage();//page使用 DataScope dataScope = service.getCurrUserDataScope(); - List busConfigDTOList = iBusConfigService.getConfigList(page, keywords, deptid,deviceType, dataScope); + List busConfigDTOList = iBusConfigService.getConfigList(page, keywords, deptid, "", deviceType, dataScope); page.setRecords(busConfigDTOList); successResult.setData(super.packForBT(page)); successResult.setMessage("success"); @@ -262,7 +262,7 @@ page.setSearchCount(false); page.setSize(Integer.MAX_VALUE); DataScope dataScope = service.getCurrUserDataScope(); - List busConfigDTOList = iBusConfigService.getConfigList(page, keywords, deptid,deviceType, dataScope); + List busConfigDTOList = iBusConfigService.getConfigList(page, keywords, deptid, "", deviceType, dataScope); iBusConfigService.exp(busConfigDTOList,response); } catch (Exception e) { e.printStackTrace(); diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java index 988f6a3..21ffcec 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java @@ -80,14 +80,15 @@ @ApiOperation("获取设备列表") @RequestMapping(value = "/list") @ResponseBody - public Object list(String keywords, String deviceType, String deptid, String beginTime, String endTime, String isOnline) { + public Object list(String keywords, String deviceType, String deptid, String beginTime, String endTime, String isOnline, String areaId) { Page page = new PageFactory().defaultPage(); //查询数据权限 使用默认DEPTID 字段 DataScope dataScope = permissionService.getCurrUserDataScope(); - List list = deviceService.selectDataScopePage(dataScope, page, deviceType, deptid, beginTime, endTime, keywords, isOnline); + areaId += "%"; + List list = deviceService.selectDataScopePage(dataScope, page, deviceType, deptid, beginTime, endTime, keywords, isOnline, areaId); list.forEach(deviceDto -> { - deviceDto.setBfztName(permissionService.getDictNameByCode(ModularDictConst.BFZT, deviceDto.getBfzt())); deviceDto.setOnlineStateName(permissionService.getDictNameByCode(ModularDictConst.ONLINESTATUS, deviceDto.getOnlineState())); + deviceDto.setAreaFullName(deviceService.getAreaFullNameById(deviceDto.getArea())); }); page.setRecords(list); return new SuccessResponseData(super.packForBT(page)); @@ -199,14 +200,14 @@ @RequestMapping(value = "/batchExport") @Permission @ResponseBody - public void batchExport(HttpServletResponse response, String keywords, String deviceType, String deptid, String beginTime, String endTime, String isOnline) throws IOException { + public void batchExport(HttpServletResponse response, String keywords, String deviceType, String deptid, String beginTime, String endTime, String isOnline, String areaId) throws IOException { Page page = new PageFactory().defaultPage(); page.setCurrent(1); page.setSearchCount(false); page.setSize(Integer.MAX_VALUE); DataScope dataScope = permissionService.getCurrUserDataScope(); - List list = deviceService.selectDataScopePage(dataScope, page, deviceType, deptid, beginTime, endTime, keywords, isOnline); + List list = deviceService.selectDataScopePage(dataScope, page, deviceType, deptid, beginTime, endTime, keywords, isOnline, areaId); list.forEach(deviceDto -> { deviceDto.setBfztName(permissionService.getDictNameByCode(ModularDictConst.BFZT, deviceDto.getBfzt())); deviceDto.setOnlineStateName(permissionService.getDictNameByCode(ModularDictConst.ONLINESTATUS, deviceDto.getOnlineState())); diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/BusConfigMapper.java b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/BusConfigMapper.java index 8e66b48..6dbf4e2 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/BusConfigMapper.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/BusConfigMapper.java @@ -26,9 +26,12 @@ List> getConfigList(@Param("page") Page page, @Param("keywords") String keywords, @Param("deptid") String deptid, + @Param("areaId") String areaId, @Param("sensorid") String sensorid, @Param("dataScope") DataScope dataScope); + String getArea(@Param("id") String id); + String getAreaPId(@Param("id") String id); String getConcenCodeByDevId(@Param("devID") Long devID); String getWellDeepByDevId(@Param("devID") Long devID); diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceMapper.java b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceMapper.java index de7f150..37a59d8 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceMapper.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceMapper.java @@ -20,10 +20,13 @@ */ public interface DeviceMapper extends BaseMapper { - List selectDataScopePage(@Param("scope") DataScope dataScope, @Param("page") Page page, @Param("deviceType") String deviceType, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords,@Param("isOnline") String isOnline); + List selectDataScopePage(@Param("scope") DataScope dataScope, @Param("page") Page page, @Param("deviceType") String deviceType, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords,@Param("isOnline") String isOnline, @Param("areaId") String areaId); DeviceWellDto selectWellIdByCode(@Param("wellCode") String wellCode); + String getArea(@Param("id") String id); + String getAreaPId(@Param("id") String id); + DeviceConcentratorDto selectDeviceConcentorByCode(@Param("concenCode") String concenCode); List selectWellDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords); diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/BusConfigController.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/BusConfigController.java index 122ebba..e50680b 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/BusConfigController.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/BusConfigController.java @@ -81,7 +81,7 @@ Page page = new PageFactory().defaultPage();//page使用 DataScope dataScope = service.getCurrUserDataScope(); List busConfigDTOList = busConfigService.getConfigList(page, keywords, - deptid, Long.valueOf(DeviceTypeEnum.Liquid.getIndex()), dataScope); + deptid, "", Long.valueOf(DeviceTypeEnum.Liquid.getIndex()), dataScope); page.setRecords(busConfigDTOList); successResult.setData(super.packForBT(page)); successResult.setMessage("success"); @@ -105,7 +105,7 @@ Page page = new PageFactory().defaultPage();//page使用 DataScope dataScope = service.getCurrUserDataScope(); List busConfigDTOList = busWasteGasConfigService.getConfigList(page, keywords, - deptid, Long.valueOf(DeviceTypeEnum.WasteGas.getIndex()), dataScope); + deptid, "", Long.valueOf(DeviceTypeEnum.WasteGas.getIndex()), dataScope); page.setRecords(busConfigDTOList); successResult.setData(super.packForBT(page)); successResult.setMessage("success"); @@ -129,7 +129,7 @@ Page page = new PageFactory().defaultPage();//page使用 DataScope dataScope = service.getCurrUserDataScope(); List busConfigDTOList = busMethaneConfigService.getConfigList(page, keywords, - deptid, Long.valueOf(DeviceTypeEnum.Methane.getIndex()), dataScope); + deptid, "", Long.valueOf(DeviceTypeEnum.Methane.getIndex()), dataScope); page.setRecords(busConfigDTOList); successResult.setData(super.packForBT(page)); successResult.setMessage("success"); @@ -154,7 +154,7 @@ Page page = new PageFactory().defaultPage();//page使用 DataScope dataScope = service.getCurrUserDataScope(); List busConfigDTOList = busTubeConfigService.getConfigList(page, keywords, - deptid, Long.valueOf(DeviceTypeEnum.Tube.getIndex()), dataScope); + deptid, "", Long.valueOf(DeviceTypeEnum.Tube.getIndex()), dataScope); page.setRecords(busConfigDTOList); successResult.setData(super.packForBT(page)); successResult.setMessage("success"); @@ -178,7 +178,7 @@ Page page = new PageFactory().defaultPage();//page使用 DataScope dataScope = service.getCurrUserDataScope(); List busConfigDTOList = busTempHumiConfigService.getConfigList(page, keywords, - deptid, Long.valueOf(DeviceTypeEnum.TempHumi.getIndex()), dataScope); + deptid, "", Long.valueOf(DeviceTypeEnum.TempHumi.getIndex()), dataScope); page.setRecords(busConfigDTOList); successResult.setData(super.packForBT(page)); successResult.setMessage("success"); @@ -202,7 +202,7 @@ Page page = new PageFactory().defaultPage();//page使用 DataScope dataScope = service.getCurrUserDataScope(); List busConfigDTOList = busDigConfigService.getConfigList(page, keywords, - deptid, Long.valueOf(DeviceTypeEnum.Dig.getIndex()), dataScope); + deptid, "", Long.valueOf(DeviceTypeEnum.Dig.getIndex()), dataScope); page.setRecords(busConfigDTOList); successResult.setData(super.packForBT(page)); successResult.setMessage("success"); @@ -220,13 +220,41 @@ @RequestMapping(value = "/noiseConfig/list") @ResponseBody public Object noiseConfigList(@RequestParam(required = false) String keywords, - @RequestParam(required = false) String deptid) { + @RequestParam(required = false) String deptid, + @RequestParam(required = false) String areaId) { SuccessResponseData successResult = new SuccessResponseData(); try { + areaId += "%"; Page page = new PageFactory().defaultPage();//page使用 DataScope dataScope = service.getCurrUserDataScope(); List busConfigDTOList = busNoiseConfigService.getConfigList(page, keywords, - deptid, Long.valueOf(DeviceTypeEnum.Noise.getIndex()), dataScope); + deptid, areaId, Long.valueOf(DeviceTypeEnum.Noise.getIndex()), dataScope); + page.setRecords(busConfigDTOList); + successResult.setData(super.packForBT(page)); + successResult.setMessage("success"); + } catch (Exception e) { + e.printStackTrace(); + successResult.setCode(500); + successResult.setMessage("false"); + } + return successResult; + } + + /** + * 水表获取配置列表 + */ + @RequestMapping(value = "/watchConfig/list") + @ResponseBody + public Object watchConfigList(@RequestParam(required = false) String keywords, + @RequestParam(required = false) String deptid, + @RequestParam(required = false) String areaId) { + SuccessResponseData successResult = new SuccessResponseData(); + try { + areaId += "%"; + Page page = new PageFactory().defaultPage();//page使用 + DataScope dataScope = service.getCurrUserDataScope(); + List busConfigDTOList = busNoiseConfigService.getConfigList(page, keywords, + deptid, areaId, Long.valueOf(DeviceTypeEnum.WaterMeter.getIndex()), dataScope); page.setRecords(busConfigDTOList); successResult.setData(super.packForBT(page)); successResult.setMessage("success"); @@ -521,7 +549,7 @@ page.setSize(Integer.MAX_VALUE); DataScope dataScope = service.getCurrUserDataScope(); List busConfigDTOList = busConfigService.getConfigList(page, keywords, - deptid, Long.valueOf(DeviceTypeEnum.Liquid.getIndex()), dataScope); + deptid, "", Long.valueOf(DeviceTypeEnum.Liquid.getIndex()), dataScope); busConfigService.exp(busConfigDTOList, response); } catch (Exception e) { e.printStackTrace(); @@ -547,7 +575,7 @@ page.setSize(Integer.MAX_VALUE); DataScope dataScope = service.getCurrUserDataScope(); List busConfigDTOList = busWasteGasConfigService.getConfigList(page, keywords, - deptid, Long.valueOf(DeviceTypeEnum.WasteGas.getIndex()), dataScope); + deptid, "", Long.valueOf(DeviceTypeEnum.WasteGas.getIndex()), dataScope); busWasteGasConfigService.exp(busConfigDTOList, response); } catch (Exception e) { e.printStackTrace(); @@ -573,7 +601,7 @@ page.setSize(Integer.MAX_VALUE); DataScope dataScope = service.getCurrUserDataScope(); List busConfigDTOList = busMethaneConfigService.getConfigList(page, keywords, - deptid, Long.valueOf(DeviceTypeEnum.Methane.getIndex()), dataScope); + deptid, "", Long.valueOf(DeviceTypeEnum.Methane.getIndex()), dataScope); busMethaneConfigService.exp(busConfigDTOList, response); } catch (Exception e) { e.printStackTrace(); @@ -599,7 +627,7 @@ page.setSize(Integer.MAX_VALUE); DataScope dataScope = service.getCurrUserDataScope(); List busConfigDTOList = busTempHumiConfigService.getConfigList(page, keywords, - deptid, Long.valueOf(DeviceTypeEnum.TempHumi.getIndex()), dataScope); + deptid, "", Long.valueOf(DeviceTypeEnum.TempHumi.getIndex()), dataScope); busTempHumiConfigService.exp(busConfigDTOList, response); } catch (Exception e) { e.printStackTrace(); @@ -625,7 +653,7 @@ page.setSize(Integer.MAX_VALUE); DataScope dataScope = service.getCurrUserDataScope(); List busConfigDTOList = busDigConfigService.getConfigList(page, keywords, - deptid, Long.valueOf(DeviceTypeEnum.Dig.getIndex()), dataScope); + deptid, "", Long.valueOf(DeviceTypeEnum.Dig.getIndex()), dataScope); busDigConfigService.exp(busConfigDTOList, response); } catch (Exception e) { e.printStackTrace(); @@ -643,6 +671,7 @@ @ResponseBody public void exportNoise(@RequestParam(required = false) String keywords, @RequestParam(required = false) String deptid, + @RequestParam(required = false) String areaId, HttpServletResponse response) { try { Page page = new PageFactory().defaultPage();//page使用 @@ -650,8 +679,9 @@ page.setSearchCount(false); page.setSize(Integer.MAX_VALUE); DataScope dataScope = service.getCurrUserDataScope(); + areaId += "%"; List busConfigDTOList = busNoiseConfigService.getConfigList(page, keywords, - deptid, Long.valueOf(DeviceTypeEnum.Noise.getIndex()), dataScope); + deptid, areaId, Long.valueOf(DeviceTypeEnum.Noise.getIndex()), dataScope); busNoiseConfigService.exp(busConfigDTOList, response); } catch (Exception e) { e.printStackTrace(); @@ -669,7 +699,7 @@ Page page = new PageFactory().defaultPage();//page使用 DataScope dataScope = service.getCurrUserDataScope(); List busConfigDTOList = busGasLiquidConfigService.getConfigList(page, keywords, - deptid, Long.valueOf(DeviceTypeEnum.LG.getIndex()), dataScope); + deptid, "", Long.valueOf(DeviceTypeEnum.LG.getIndex()), dataScope); page.setRecords(busConfigDTOList); successResult.setData(super.packForBT(page)); successResult.setMessage("success"); diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/BusConfigControllerBak.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/BusConfigControllerBak.java index f386d80..d5d8f39 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/BusConfigControllerBak.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/BusConfigControllerBak.java @@ -88,7 +88,7 @@ busConfigServiceHashMap.get(deviceType.intValue()); Page page = new PageFactory().defaultPage();//page使用 DataScope dataScope = service.getCurrUserDataScope(); - List busConfigDTOList = iBusConfigService.getConfigList(page, keywords, deptid,deviceType, dataScope); + List busConfigDTOList = iBusConfigService.getConfigList(page, keywords, deptid, "", deviceType, dataScope); page.setRecords(busConfigDTOList); successResult.setData(super.packForBT(page)); successResult.setMessage("success"); @@ -262,7 +262,7 @@ page.setSearchCount(false); page.setSize(Integer.MAX_VALUE); DataScope dataScope = service.getCurrUserDataScope(); - List busConfigDTOList = iBusConfigService.getConfigList(page, keywords, deptid,deviceType, dataScope); + List busConfigDTOList = iBusConfigService.getConfigList(page, keywords, deptid, "", deviceType, dataScope); iBusConfigService.exp(busConfigDTOList,response); } catch (Exception e) { e.printStackTrace(); diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java index 988f6a3..21ffcec 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java @@ -80,14 +80,15 @@ @ApiOperation("获取设备列表") @RequestMapping(value = "/list") @ResponseBody - public Object list(String keywords, String deviceType, String deptid, String beginTime, String endTime, String isOnline) { + public Object list(String keywords, String deviceType, String deptid, String beginTime, String endTime, String isOnline, String areaId) { Page page = new PageFactory().defaultPage(); //查询数据权限 使用默认DEPTID 字段 DataScope dataScope = permissionService.getCurrUserDataScope(); - List list = deviceService.selectDataScopePage(dataScope, page, deviceType, deptid, beginTime, endTime, keywords, isOnline); + areaId += "%"; + List list = deviceService.selectDataScopePage(dataScope, page, deviceType, deptid, beginTime, endTime, keywords, isOnline, areaId); list.forEach(deviceDto -> { - deviceDto.setBfztName(permissionService.getDictNameByCode(ModularDictConst.BFZT, deviceDto.getBfzt())); deviceDto.setOnlineStateName(permissionService.getDictNameByCode(ModularDictConst.ONLINESTATUS, deviceDto.getOnlineState())); + deviceDto.setAreaFullName(deviceService.getAreaFullNameById(deviceDto.getArea())); }); page.setRecords(list); return new SuccessResponseData(super.packForBT(page)); @@ -199,14 +200,14 @@ @RequestMapping(value = "/batchExport") @Permission @ResponseBody - public void batchExport(HttpServletResponse response, String keywords, String deviceType, String deptid, String beginTime, String endTime, String isOnline) throws IOException { + public void batchExport(HttpServletResponse response, String keywords, String deviceType, String deptid, String beginTime, String endTime, String isOnline, String areaId) throws IOException { Page page = new PageFactory().defaultPage(); page.setCurrent(1); page.setSearchCount(false); page.setSize(Integer.MAX_VALUE); DataScope dataScope = permissionService.getCurrUserDataScope(); - List list = deviceService.selectDataScopePage(dataScope, page, deviceType, deptid, beginTime, endTime, keywords, isOnline); + List list = deviceService.selectDataScopePage(dataScope, page, deviceType, deptid, beginTime, endTime, keywords, isOnline, areaId); list.forEach(deviceDto -> { deviceDto.setBfztName(permissionService.getDictNameByCode(ModularDictConst.BFZT, deviceDto.getBfzt())); deviceDto.setOnlineStateName(permissionService.getDictNameByCode(ModularDictConst.ONLINESTATUS, deviceDto.getOnlineState())); diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/BusConfigMapper.java b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/BusConfigMapper.java index 8e66b48..6dbf4e2 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/BusConfigMapper.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/BusConfigMapper.java @@ -26,9 +26,12 @@ List> getConfigList(@Param("page") Page page, @Param("keywords") String keywords, @Param("deptid") String deptid, + @Param("areaId") String areaId, @Param("sensorid") String sensorid, @Param("dataScope") DataScope dataScope); + String getArea(@Param("id") String id); + String getAreaPId(@Param("id") String id); String getConcenCodeByDevId(@Param("devID") Long devID); String getWellDeepByDevId(@Param("devID") Long devID); diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceMapper.java b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceMapper.java index de7f150..37a59d8 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceMapper.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceMapper.java @@ -20,10 +20,13 @@ */ public interface DeviceMapper extends BaseMapper { - List selectDataScopePage(@Param("scope") DataScope dataScope, @Param("page") Page page, @Param("deviceType") String deviceType, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords,@Param("isOnline") String isOnline); + List selectDataScopePage(@Param("scope") DataScope dataScope, @Param("page") Page page, @Param("deviceType") String deviceType, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords,@Param("isOnline") String isOnline, @Param("areaId") String areaId); DeviceWellDto selectWellIdByCode(@Param("wellCode") String wellCode); + String getArea(@Param("id") String id); + String getAreaPId(@Param("id") String id); + DeviceConcentratorDto selectDeviceConcentorByCode(@Param("concenCode") String concenCode); List selectWellDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords); diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusConfigMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusConfigMapper.xml index 92d6c14..d85a9cd 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusConfigMapper.xml +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusConfigMapper.xml @@ -67,6 +67,9 @@ and s.ID = + + and a.AREA like #{areaId} + ORDER by writetime DESC @@ -104,5 +107,19 @@ limit 1 + + + + diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/BusConfigController.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/BusConfigController.java index 122ebba..e50680b 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/BusConfigController.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/BusConfigController.java @@ -81,7 +81,7 @@ Page page = new PageFactory().defaultPage();//page使用 DataScope dataScope = service.getCurrUserDataScope(); List busConfigDTOList = busConfigService.getConfigList(page, keywords, - deptid, Long.valueOf(DeviceTypeEnum.Liquid.getIndex()), dataScope); + deptid, "", Long.valueOf(DeviceTypeEnum.Liquid.getIndex()), dataScope); page.setRecords(busConfigDTOList); successResult.setData(super.packForBT(page)); successResult.setMessage("success"); @@ -105,7 +105,7 @@ Page page = new PageFactory().defaultPage();//page使用 DataScope dataScope = service.getCurrUserDataScope(); List busConfigDTOList = busWasteGasConfigService.getConfigList(page, keywords, - deptid, Long.valueOf(DeviceTypeEnum.WasteGas.getIndex()), dataScope); + deptid, "", Long.valueOf(DeviceTypeEnum.WasteGas.getIndex()), dataScope); page.setRecords(busConfigDTOList); successResult.setData(super.packForBT(page)); successResult.setMessage("success"); @@ -129,7 +129,7 @@ Page page = new PageFactory().defaultPage();//page使用 DataScope dataScope = service.getCurrUserDataScope(); List busConfigDTOList = busMethaneConfigService.getConfigList(page, keywords, - deptid, Long.valueOf(DeviceTypeEnum.Methane.getIndex()), dataScope); + deptid, "", Long.valueOf(DeviceTypeEnum.Methane.getIndex()), dataScope); page.setRecords(busConfigDTOList); successResult.setData(super.packForBT(page)); successResult.setMessage("success"); @@ -154,7 +154,7 @@ Page page = new PageFactory().defaultPage();//page使用 DataScope dataScope = service.getCurrUserDataScope(); List busConfigDTOList = busTubeConfigService.getConfigList(page, keywords, - deptid, Long.valueOf(DeviceTypeEnum.Tube.getIndex()), dataScope); + deptid, "", Long.valueOf(DeviceTypeEnum.Tube.getIndex()), dataScope); page.setRecords(busConfigDTOList); successResult.setData(super.packForBT(page)); successResult.setMessage("success"); @@ -178,7 +178,7 @@ Page page = new PageFactory().defaultPage();//page使用 DataScope dataScope = service.getCurrUserDataScope(); List busConfigDTOList = busTempHumiConfigService.getConfigList(page, keywords, - deptid, Long.valueOf(DeviceTypeEnum.TempHumi.getIndex()), dataScope); + deptid, "", Long.valueOf(DeviceTypeEnum.TempHumi.getIndex()), dataScope); page.setRecords(busConfigDTOList); successResult.setData(super.packForBT(page)); successResult.setMessage("success"); @@ -202,7 +202,7 @@ Page page = new PageFactory().defaultPage();//page使用 DataScope dataScope = service.getCurrUserDataScope(); List busConfigDTOList = busDigConfigService.getConfigList(page, keywords, - deptid, Long.valueOf(DeviceTypeEnum.Dig.getIndex()), dataScope); + deptid, "", Long.valueOf(DeviceTypeEnum.Dig.getIndex()), dataScope); page.setRecords(busConfigDTOList); successResult.setData(super.packForBT(page)); successResult.setMessage("success"); @@ -220,13 +220,41 @@ @RequestMapping(value = "/noiseConfig/list") @ResponseBody public Object noiseConfigList(@RequestParam(required = false) String keywords, - @RequestParam(required = false) String deptid) { + @RequestParam(required = false) String deptid, + @RequestParam(required = false) String areaId) { SuccessResponseData successResult = new SuccessResponseData(); try { + areaId += "%"; Page page = new PageFactory().defaultPage();//page使用 DataScope dataScope = service.getCurrUserDataScope(); List busConfigDTOList = busNoiseConfigService.getConfigList(page, keywords, - deptid, Long.valueOf(DeviceTypeEnum.Noise.getIndex()), dataScope); + deptid, areaId, Long.valueOf(DeviceTypeEnum.Noise.getIndex()), dataScope); + page.setRecords(busConfigDTOList); + successResult.setData(super.packForBT(page)); + successResult.setMessage("success"); + } catch (Exception e) { + e.printStackTrace(); + successResult.setCode(500); + successResult.setMessage("false"); + } + return successResult; + } + + /** + * 水表获取配置列表 + */ + @RequestMapping(value = "/watchConfig/list") + @ResponseBody + public Object watchConfigList(@RequestParam(required = false) String keywords, + @RequestParam(required = false) String deptid, + @RequestParam(required = false) String areaId) { + SuccessResponseData successResult = new SuccessResponseData(); + try { + areaId += "%"; + Page page = new PageFactory().defaultPage();//page使用 + DataScope dataScope = service.getCurrUserDataScope(); + List busConfigDTOList = busNoiseConfigService.getConfigList(page, keywords, + deptid, areaId, Long.valueOf(DeviceTypeEnum.WaterMeter.getIndex()), dataScope); page.setRecords(busConfigDTOList); successResult.setData(super.packForBT(page)); successResult.setMessage("success"); @@ -521,7 +549,7 @@ page.setSize(Integer.MAX_VALUE); DataScope dataScope = service.getCurrUserDataScope(); List busConfigDTOList = busConfigService.getConfigList(page, keywords, - deptid, Long.valueOf(DeviceTypeEnum.Liquid.getIndex()), dataScope); + deptid, "", Long.valueOf(DeviceTypeEnum.Liquid.getIndex()), dataScope); busConfigService.exp(busConfigDTOList, response); } catch (Exception e) { e.printStackTrace(); @@ -547,7 +575,7 @@ page.setSize(Integer.MAX_VALUE); DataScope dataScope = service.getCurrUserDataScope(); List busConfigDTOList = busWasteGasConfigService.getConfigList(page, keywords, - deptid, Long.valueOf(DeviceTypeEnum.WasteGas.getIndex()), dataScope); + deptid, "", Long.valueOf(DeviceTypeEnum.WasteGas.getIndex()), dataScope); busWasteGasConfigService.exp(busConfigDTOList, response); } catch (Exception e) { e.printStackTrace(); @@ -573,7 +601,7 @@ page.setSize(Integer.MAX_VALUE); DataScope dataScope = service.getCurrUserDataScope(); List busConfigDTOList = busMethaneConfigService.getConfigList(page, keywords, - deptid, Long.valueOf(DeviceTypeEnum.Methane.getIndex()), dataScope); + deptid, "", Long.valueOf(DeviceTypeEnum.Methane.getIndex()), dataScope); busMethaneConfigService.exp(busConfigDTOList, response); } catch (Exception e) { e.printStackTrace(); @@ -599,7 +627,7 @@ page.setSize(Integer.MAX_VALUE); DataScope dataScope = service.getCurrUserDataScope(); List busConfigDTOList = busTempHumiConfigService.getConfigList(page, keywords, - deptid, Long.valueOf(DeviceTypeEnum.TempHumi.getIndex()), dataScope); + deptid, "", Long.valueOf(DeviceTypeEnum.TempHumi.getIndex()), dataScope); busTempHumiConfigService.exp(busConfigDTOList, response); } catch (Exception e) { e.printStackTrace(); @@ -625,7 +653,7 @@ page.setSize(Integer.MAX_VALUE); DataScope dataScope = service.getCurrUserDataScope(); List busConfigDTOList = busDigConfigService.getConfigList(page, keywords, - deptid, Long.valueOf(DeviceTypeEnum.Dig.getIndex()), dataScope); + deptid, "", Long.valueOf(DeviceTypeEnum.Dig.getIndex()), dataScope); busDigConfigService.exp(busConfigDTOList, response); } catch (Exception e) { e.printStackTrace(); @@ -643,6 +671,7 @@ @ResponseBody public void exportNoise(@RequestParam(required = false) String keywords, @RequestParam(required = false) String deptid, + @RequestParam(required = false) String areaId, HttpServletResponse response) { try { Page page = new PageFactory().defaultPage();//page使用 @@ -650,8 +679,9 @@ page.setSearchCount(false); page.setSize(Integer.MAX_VALUE); DataScope dataScope = service.getCurrUserDataScope(); + areaId += "%"; List busConfigDTOList = busNoiseConfigService.getConfigList(page, keywords, - deptid, Long.valueOf(DeviceTypeEnum.Noise.getIndex()), dataScope); + deptid, areaId, Long.valueOf(DeviceTypeEnum.Noise.getIndex()), dataScope); busNoiseConfigService.exp(busConfigDTOList, response); } catch (Exception e) { e.printStackTrace(); @@ -669,7 +699,7 @@ Page page = new PageFactory().defaultPage();//page使用 DataScope dataScope = service.getCurrUserDataScope(); List busConfigDTOList = busGasLiquidConfigService.getConfigList(page, keywords, - deptid, Long.valueOf(DeviceTypeEnum.LG.getIndex()), dataScope); + deptid, "", Long.valueOf(DeviceTypeEnum.LG.getIndex()), dataScope); page.setRecords(busConfigDTOList); successResult.setData(super.packForBT(page)); successResult.setMessage("success"); diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/BusConfigControllerBak.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/BusConfigControllerBak.java index f386d80..d5d8f39 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/BusConfigControllerBak.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/BusConfigControllerBak.java @@ -88,7 +88,7 @@ busConfigServiceHashMap.get(deviceType.intValue()); Page page = new PageFactory().defaultPage();//page使用 DataScope dataScope = service.getCurrUserDataScope(); - List busConfigDTOList = iBusConfigService.getConfigList(page, keywords, deptid,deviceType, dataScope); + List busConfigDTOList = iBusConfigService.getConfigList(page, keywords, deptid, "", deviceType, dataScope); page.setRecords(busConfigDTOList); successResult.setData(super.packForBT(page)); successResult.setMessage("success"); @@ -262,7 +262,7 @@ page.setSearchCount(false); page.setSize(Integer.MAX_VALUE); DataScope dataScope = service.getCurrUserDataScope(); - List busConfigDTOList = iBusConfigService.getConfigList(page, keywords, deptid,deviceType, dataScope); + List busConfigDTOList = iBusConfigService.getConfigList(page, keywords, deptid, "", deviceType, dataScope); iBusConfigService.exp(busConfigDTOList,response); } catch (Exception e) { e.printStackTrace(); diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java index 988f6a3..21ffcec 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java @@ -80,14 +80,15 @@ @ApiOperation("获取设备列表") @RequestMapping(value = "/list") @ResponseBody - public Object list(String keywords, String deviceType, String deptid, String beginTime, String endTime, String isOnline) { + public Object list(String keywords, String deviceType, String deptid, String beginTime, String endTime, String isOnline, String areaId) { Page page = new PageFactory().defaultPage(); //查询数据权限 使用默认DEPTID 字段 DataScope dataScope = permissionService.getCurrUserDataScope(); - List list = deviceService.selectDataScopePage(dataScope, page, deviceType, deptid, beginTime, endTime, keywords, isOnline); + areaId += "%"; + List list = deviceService.selectDataScopePage(dataScope, page, deviceType, deptid, beginTime, endTime, keywords, isOnline, areaId); list.forEach(deviceDto -> { - deviceDto.setBfztName(permissionService.getDictNameByCode(ModularDictConst.BFZT, deviceDto.getBfzt())); deviceDto.setOnlineStateName(permissionService.getDictNameByCode(ModularDictConst.ONLINESTATUS, deviceDto.getOnlineState())); + deviceDto.setAreaFullName(deviceService.getAreaFullNameById(deviceDto.getArea())); }); page.setRecords(list); return new SuccessResponseData(super.packForBT(page)); @@ -199,14 +200,14 @@ @RequestMapping(value = "/batchExport") @Permission @ResponseBody - public void batchExport(HttpServletResponse response, String keywords, String deviceType, String deptid, String beginTime, String endTime, String isOnline) throws IOException { + public void batchExport(HttpServletResponse response, String keywords, String deviceType, String deptid, String beginTime, String endTime, String isOnline, String areaId) throws IOException { Page page = new PageFactory().defaultPage(); page.setCurrent(1); page.setSearchCount(false); page.setSize(Integer.MAX_VALUE); DataScope dataScope = permissionService.getCurrUserDataScope(); - List list = deviceService.selectDataScopePage(dataScope, page, deviceType, deptid, beginTime, endTime, keywords, isOnline); + List list = deviceService.selectDataScopePage(dataScope, page, deviceType, deptid, beginTime, endTime, keywords, isOnline, areaId); list.forEach(deviceDto -> { deviceDto.setBfztName(permissionService.getDictNameByCode(ModularDictConst.BFZT, deviceDto.getBfzt())); deviceDto.setOnlineStateName(permissionService.getDictNameByCode(ModularDictConst.ONLINESTATUS, deviceDto.getOnlineState())); diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/BusConfigMapper.java b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/BusConfigMapper.java index 8e66b48..6dbf4e2 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/BusConfigMapper.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/BusConfigMapper.java @@ -26,9 +26,12 @@ List> getConfigList(@Param("page") Page page, @Param("keywords") String keywords, @Param("deptid") String deptid, + @Param("areaId") String areaId, @Param("sensorid") String sensorid, @Param("dataScope") DataScope dataScope); + String getArea(@Param("id") String id); + String getAreaPId(@Param("id") String id); String getConcenCodeByDevId(@Param("devID") Long devID); String getWellDeepByDevId(@Param("devID") Long devID); diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceMapper.java b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceMapper.java index de7f150..37a59d8 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceMapper.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceMapper.java @@ -20,10 +20,13 @@ */ public interface DeviceMapper extends BaseMapper { - List selectDataScopePage(@Param("scope") DataScope dataScope, @Param("page") Page page, @Param("deviceType") String deviceType, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords,@Param("isOnline") String isOnline); + List selectDataScopePage(@Param("scope") DataScope dataScope, @Param("page") Page page, @Param("deviceType") String deviceType, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords,@Param("isOnline") String isOnline, @Param("areaId") String areaId); DeviceWellDto selectWellIdByCode(@Param("wellCode") String wellCode); + String getArea(@Param("id") String id); + String getAreaPId(@Param("id") String id); + DeviceConcentratorDto selectDeviceConcentorByCode(@Param("concenCode") String concenCode); List selectWellDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords); diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusConfigMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusConfigMapper.xml index 92d6c14..d85a9cd 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusConfigMapper.xml +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusConfigMapper.xml @@ -67,6 +67,9 @@ and s.ID = + + and a.AREA like #{areaId} + ORDER by writetime DESC @@ -104,5 +107,19 @@ limit 1 + + + + diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml index 3de0ee0..96c6a71 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml @@ -15,7 +15,7 @@ - ID,DEVCODE,DEVICENAME,DEVICETYPE,DEVICETYPENAME,WATCHTYPE,COMMUNICATION,MODELID,MODELNAME,DEPTID,DEPTNAME,WELLCODE,POSITION,CONCENID,CONCENCODE,ONLINESTATE,VALID,TS,BFZT,wellId, + ID,DEVCODE,DEVICENAME,DEVICETYPE,DEVICETYPENAME,WATCHTYPE,COMMUNICATION,MODELID,MODELNAME,DEPTID,DEPTNAME,WELLCODE,POSITION,CONCENID,CONCENCODE,ONLINESTATE,VALID,TS,BFZT,AREA,wellId, as INSTALLDATE @@ -37,6 +37,20 @@ SELECT id,CONCENCODE FROM bus_concentrator WHERE VALID = '1' AND CONCENCODE = #{concenCode} + + + + diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/BusConfigController.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/BusConfigController.java index 122ebba..e50680b 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/BusConfigController.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/BusConfigController.java @@ -81,7 +81,7 @@ Page page = new PageFactory().defaultPage();//page使用 DataScope dataScope = service.getCurrUserDataScope(); List busConfigDTOList = busConfigService.getConfigList(page, keywords, - deptid, Long.valueOf(DeviceTypeEnum.Liquid.getIndex()), dataScope); + deptid, "", Long.valueOf(DeviceTypeEnum.Liquid.getIndex()), dataScope); page.setRecords(busConfigDTOList); successResult.setData(super.packForBT(page)); successResult.setMessage("success"); @@ -105,7 +105,7 @@ Page page = new PageFactory().defaultPage();//page使用 DataScope dataScope = service.getCurrUserDataScope(); List busConfigDTOList = busWasteGasConfigService.getConfigList(page, keywords, - deptid, Long.valueOf(DeviceTypeEnum.WasteGas.getIndex()), dataScope); + deptid, "", Long.valueOf(DeviceTypeEnum.WasteGas.getIndex()), dataScope); page.setRecords(busConfigDTOList); successResult.setData(super.packForBT(page)); successResult.setMessage("success"); @@ -129,7 +129,7 @@ Page page = new PageFactory().defaultPage();//page使用 DataScope dataScope = service.getCurrUserDataScope(); List busConfigDTOList = busMethaneConfigService.getConfigList(page, keywords, - deptid, Long.valueOf(DeviceTypeEnum.Methane.getIndex()), dataScope); + deptid, "", Long.valueOf(DeviceTypeEnum.Methane.getIndex()), dataScope); page.setRecords(busConfigDTOList); successResult.setData(super.packForBT(page)); successResult.setMessage("success"); @@ -154,7 +154,7 @@ Page page = new PageFactory().defaultPage();//page使用 DataScope dataScope = service.getCurrUserDataScope(); List busConfigDTOList = busTubeConfigService.getConfigList(page, keywords, - deptid, Long.valueOf(DeviceTypeEnum.Tube.getIndex()), dataScope); + deptid, "", Long.valueOf(DeviceTypeEnum.Tube.getIndex()), dataScope); page.setRecords(busConfigDTOList); successResult.setData(super.packForBT(page)); successResult.setMessage("success"); @@ -178,7 +178,7 @@ Page page = new PageFactory().defaultPage();//page使用 DataScope dataScope = service.getCurrUserDataScope(); List busConfigDTOList = busTempHumiConfigService.getConfigList(page, keywords, - deptid, Long.valueOf(DeviceTypeEnum.TempHumi.getIndex()), dataScope); + deptid, "", Long.valueOf(DeviceTypeEnum.TempHumi.getIndex()), dataScope); page.setRecords(busConfigDTOList); successResult.setData(super.packForBT(page)); successResult.setMessage("success"); @@ -202,7 +202,7 @@ Page page = new PageFactory().defaultPage();//page使用 DataScope dataScope = service.getCurrUserDataScope(); List busConfigDTOList = busDigConfigService.getConfigList(page, keywords, - deptid, Long.valueOf(DeviceTypeEnum.Dig.getIndex()), dataScope); + deptid, "", Long.valueOf(DeviceTypeEnum.Dig.getIndex()), dataScope); page.setRecords(busConfigDTOList); successResult.setData(super.packForBT(page)); successResult.setMessage("success"); @@ -220,13 +220,41 @@ @RequestMapping(value = "/noiseConfig/list") @ResponseBody public Object noiseConfigList(@RequestParam(required = false) String keywords, - @RequestParam(required = false) String deptid) { + @RequestParam(required = false) String deptid, + @RequestParam(required = false) String areaId) { SuccessResponseData successResult = new SuccessResponseData(); try { + areaId += "%"; Page page = new PageFactory().defaultPage();//page使用 DataScope dataScope = service.getCurrUserDataScope(); List busConfigDTOList = busNoiseConfigService.getConfigList(page, keywords, - deptid, Long.valueOf(DeviceTypeEnum.Noise.getIndex()), dataScope); + deptid, areaId, Long.valueOf(DeviceTypeEnum.Noise.getIndex()), dataScope); + page.setRecords(busConfigDTOList); + successResult.setData(super.packForBT(page)); + successResult.setMessage("success"); + } catch (Exception e) { + e.printStackTrace(); + successResult.setCode(500); + successResult.setMessage("false"); + } + return successResult; + } + + /** + * 水表获取配置列表 + */ + @RequestMapping(value = "/watchConfig/list") + @ResponseBody + public Object watchConfigList(@RequestParam(required = false) String keywords, + @RequestParam(required = false) String deptid, + @RequestParam(required = false) String areaId) { + SuccessResponseData successResult = new SuccessResponseData(); + try { + areaId += "%"; + Page page = new PageFactory().defaultPage();//page使用 + DataScope dataScope = service.getCurrUserDataScope(); + List busConfigDTOList = busNoiseConfigService.getConfigList(page, keywords, + deptid, areaId, Long.valueOf(DeviceTypeEnum.WaterMeter.getIndex()), dataScope); page.setRecords(busConfigDTOList); successResult.setData(super.packForBT(page)); successResult.setMessage("success"); @@ -521,7 +549,7 @@ page.setSize(Integer.MAX_VALUE); DataScope dataScope = service.getCurrUserDataScope(); List busConfigDTOList = busConfigService.getConfigList(page, keywords, - deptid, Long.valueOf(DeviceTypeEnum.Liquid.getIndex()), dataScope); + deptid, "", Long.valueOf(DeviceTypeEnum.Liquid.getIndex()), dataScope); busConfigService.exp(busConfigDTOList, response); } catch (Exception e) { e.printStackTrace(); @@ -547,7 +575,7 @@ page.setSize(Integer.MAX_VALUE); DataScope dataScope = service.getCurrUserDataScope(); List busConfigDTOList = busWasteGasConfigService.getConfigList(page, keywords, - deptid, Long.valueOf(DeviceTypeEnum.WasteGas.getIndex()), dataScope); + deptid, "", Long.valueOf(DeviceTypeEnum.WasteGas.getIndex()), dataScope); busWasteGasConfigService.exp(busConfigDTOList, response); } catch (Exception e) { e.printStackTrace(); @@ -573,7 +601,7 @@ page.setSize(Integer.MAX_VALUE); DataScope dataScope = service.getCurrUserDataScope(); List busConfigDTOList = busMethaneConfigService.getConfigList(page, keywords, - deptid, Long.valueOf(DeviceTypeEnum.Methane.getIndex()), dataScope); + deptid, "", Long.valueOf(DeviceTypeEnum.Methane.getIndex()), dataScope); busMethaneConfigService.exp(busConfigDTOList, response); } catch (Exception e) { e.printStackTrace(); @@ -599,7 +627,7 @@ page.setSize(Integer.MAX_VALUE); DataScope dataScope = service.getCurrUserDataScope(); List busConfigDTOList = busTempHumiConfigService.getConfigList(page, keywords, - deptid, Long.valueOf(DeviceTypeEnum.TempHumi.getIndex()), dataScope); + deptid, "", Long.valueOf(DeviceTypeEnum.TempHumi.getIndex()), dataScope); busTempHumiConfigService.exp(busConfigDTOList, response); } catch (Exception e) { e.printStackTrace(); @@ -625,7 +653,7 @@ page.setSize(Integer.MAX_VALUE); DataScope dataScope = service.getCurrUserDataScope(); List busConfigDTOList = busDigConfigService.getConfigList(page, keywords, - deptid, Long.valueOf(DeviceTypeEnum.Dig.getIndex()), dataScope); + deptid, "", Long.valueOf(DeviceTypeEnum.Dig.getIndex()), dataScope); busDigConfigService.exp(busConfigDTOList, response); } catch (Exception e) { e.printStackTrace(); @@ -643,6 +671,7 @@ @ResponseBody public void exportNoise(@RequestParam(required = false) String keywords, @RequestParam(required = false) String deptid, + @RequestParam(required = false) String areaId, HttpServletResponse response) { try { Page page = new PageFactory().defaultPage();//page使用 @@ -650,8 +679,9 @@ page.setSearchCount(false); page.setSize(Integer.MAX_VALUE); DataScope dataScope = service.getCurrUserDataScope(); + areaId += "%"; List busConfigDTOList = busNoiseConfigService.getConfigList(page, keywords, - deptid, Long.valueOf(DeviceTypeEnum.Noise.getIndex()), dataScope); + deptid, areaId, Long.valueOf(DeviceTypeEnum.Noise.getIndex()), dataScope); busNoiseConfigService.exp(busConfigDTOList, response); } catch (Exception e) { e.printStackTrace(); @@ -669,7 +699,7 @@ Page page = new PageFactory().defaultPage();//page使用 DataScope dataScope = service.getCurrUserDataScope(); List busConfigDTOList = busGasLiquidConfigService.getConfigList(page, keywords, - deptid, Long.valueOf(DeviceTypeEnum.LG.getIndex()), dataScope); + deptid, "", Long.valueOf(DeviceTypeEnum.LG.getIndex()), dataScope); page.setRecords(busConfigDTOList); successResult.setData(super.packForBT(page)); successResult.setMessage("success"); diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/BusConfigControllerBak.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/BusConfigControllerBak.java index f386d80..d5d8f39 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/BusConfigControllerBak.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/BusConfigControllerBak.java @@ -88,7 +88,7 @@ busConfigServiceHashMap.get(deviceType.intValue()); Page page = new PageFactory().defaultPage();//page使用 DataScope dataScope = service.getCurrUserDataScope(); - List busConfigDTOList = iBusConfigService.getConfigList(page, keywords, deptid,deviceType, dataScope); + List busConfigDTOList = iBusConfigService.getConfigList(page, keywords, deptid, "", deviceType, dataScope); page.setRecords(busConfigDTOList); successResult.setData(super.packForBT(page)); successResult.setMessage("success"); @@ -262,7 +262,7 @@ page.setSearchCount(false); page.setSize(Integer.MAX_VALUE); DataScope dataScope = service.getCurrUserDataScope(); - List busConfigDTOList = iBusConfigService.getConfigList(page, keywords, deptid,deviceType, dataScope); + List busConfigDTOList = iBusConfigService.getConfigList(page, keywords, deptid, "", deviceType, dataScope); iBusConfigService.exp(busConfigDTOList,response); } catch (Exception e) { e.printStackTrace(); diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java index 988f6a3..21ffcec 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java @@ -80,14 +80,15 @@ @ApiOperation("获取设备列表") @RequestMapping(value = "/list") @ResponseBody - public Object list(String keywords, String deviceType, String deptid, String beginTime, String endTime, String isOnline) { + public Object list(String keywords, String deviceType, String deptid, String beginTime, String endTime, String isOnline, String areaId) { Page page = new PageFactory().defaultPage(); //查询数据权限 使用默认DEPTID 字段 DataScope dataScope = permissionService.getCurrUserDataScope(); - List list = deviceService.selectDataScopePage(dataScope, page, deviceType, deptid, beginTime, endTime, keywords, isOnline); + areaId += "%"; + List list = deviceService.selectDataScopePage(dataScope, page, deviceType, deptid, beginTime, endTime, keywords, isOnline, areaId); list.forEach(deviceDto -> { - deviceDto.setBfztName(permissionService.getDictNameByCode(ModularDictConst.BFZT, deviceDto.getBfzt())); deviceDto.setOnlineStateName(permissionService.getDictNameByCode(ModularDictConst.ONLINESTATUS, deviceDto.getOnlineState())); + deviceDto.setAreaFullName(deviceService.getAreaFullNameById(deviceDto.getArea())); }); page.setRecords(list); return new SuccessResponseData(super.packForBT(page)); @@ -199,14 +200,14 @@ @RequestMapping(value = "/batchExport") @Permission @ResponseBody - public void batchExport(HttpServletResponse response, String keywords, String deviceType, String deptid, String beginTime, String endTime, String isOnline) throws IOException { + public void batchExport(HttpServletResponse response, String keywords, String deviceType, String deptid, String beginTime, String endTime, String isOnline, String areaId) throws IOException { Page page = new PageFactory().defaultPage(); page.setCurrent(1); page.setSearchCount(false); page.setSize(Integer.MAX_VALUE); DataScope dataScope = permissionService.getCurrUserDataScope(); - List list = deviceService.selectDataScopePage(dataScope, page, deviceType, deptid, beginTime, endTime, keywords, isOnline); + List list = deviceService.selectDataScopePage(dataScope, page, deviceType, deptid, beginTime, endTime, keywords, isOnline, areaId); list.forEach(deviceDto -> { deviceDto.setBfztName(permissionService.getDictNameByCode(ModularDictConst.BFZT, deviceDto.getBfzt())); deviceDto.setOnlineStateName(permissionService.getDictNameByCode(ModularDictConst.ONLINESTATUS, deviceDto.getOnlineState())); diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/BusConfigMapper.java b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/BusConfigMapper.java index 8e66b48..6dbf4e2 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/BusConfigMapper.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/BusConfigMapper.java @@ -26,9 +26,12 @@ List> getConfigList(@Param("page") Page page, @Param("keywords") String keywords, @Param("deptid") String deptid, + @Param("areaId") String areaId, @Param("sensorid") String sensorid, @Param("dataScope") DataScope dataScope); + String getArea(@Param("id") String id); + String getAreaPId(@Param("id") String id); String getConcenCodeByDevId(@Param("devID") Long devID); String getWellDeepByDevId(@Param("devID") Long devID); diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceMapper.java b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceMapper.java index de7f150..37a59d8 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceMapper.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceMapper.java @@ -20,10 +20,13 @@ */ public interface DeviceMapper extends BaseMapper { - List selectDataScopePage(@Param("scope") DataScope dataScope, @Param("page") Page page, @Param("deviceType") String deviceType, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords,@Param("isOnline") String isOnline); + List selectDataScopePage(@Param("scope") DataScope dataScope, @Param("page") Page page, @Param("deviceType") String deviceType, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords,@Param("isOnline") String isOnline, @Param("areaId") String areaId); DeviceWellDto selectWellIdByCode(@Param("wellCode") String wellCode); + String getArea(@Param("id") String id); + String getAreaPId(@Param("id") String id); + DeviceConcentratorDto selectDeviceConcentorByCode(@Param("concenCode") String concenCode); List selectWellDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords); diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusConfigMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusConfigMapper.xml index 92d6c14..d85a9cd 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusConfigMapper.xml +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusConfigMapper.xml @@ -67,6 +67,9 @@ and s.ID = + + and a.AREA like #{areaId} + ORDER by writetime DESC @@ -104,5 +107,19 @@ limit 1 + + + + diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml index 3de0ee0..96c6a71 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml @@ -15,7 +15,7 @@ - ID,DEVCODE,DEVICENAME,DEVICETYPE,DEVICETYPENAME,WATCHTYPE,COMMUNICATION,MODELID,MODELNAME,DEPTID,DEPTNAME,WELLCODE,POSITION,CONCENID,CONCENCODE,ONLINESTATE,VALID,TS,BFZT,wellId, + ID,DEVCODE,DEVICENAME,DEVICETYPE,DEVICETYPENAME,WATCHTYPE,COMMUNICATION,MODELID,MODELNAME,DEPTID,DEPTNAME,WELLCODE,POSITION,CONCENID,CONCENCODE,ONLINESTATE,VALID,TS,BFZT,AREA,wellId, as INSTALLDATE @@ -37,6 +37,20 @@ SELECT id,CONCENCODE FROM bus_concentrator WHERE VALID = '1' AND CONCENCODE = #{concenCode} + + + + diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dto/DeviceDto.java b/casic-device/src/main/java/com/casic/missiles/modular/system/dto/DeviceDto.java index 64050e7..4ca24bc 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/dto/DeviceDto.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dto/DeviceDto.java @@ -59,6 +59,8 @@ private String bfzt; private String bfztName; private String wellId; + private String area; + private String areaFullName; @Override protected Serializable pkVal() { diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/BusConfigController.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/BusConfigController.java index 122ebba..e50680b 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/BusConfigController.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/BusConfigController.java @@ -81,7 +81,7 @@ Page page = new PageFactory().defaultPage();//page使用 DataScope dataScope = service.getCurrUserDataScope(); List busConfigDTOList = busConfigService.getConfigList(page, keywords, - deptid, Long.valueOf(DeviceTypeEnum.Liquid.getIndex()), dataScope); + deptid, "", Long.valueOf(DeviceTypeEnum.Liquid.getIndex()), dataScope); page.setRecords(busConfigDTOList); successResult.setData(super.packForBT(page)); successResult.setMessage("success"); @@ -105,7 +105,7 @@ Page page = new PageFactory().defaultPage();//page使用 DataScope dataScope = service.getCurrUserDataScope(); List busConfigDTOList = busWasteGasConfigService.getConfigList(page, keywords, - deptid, Long.valueOf(DeviceTypeEnum.WasteGas.getIndex()), dataScope); + deptid, "", Long.valueOf(DeviceTypeEnum.WasteGas.getIndex()), dataScope); page.setRecords(busConfigDTOList); successResult.setData(super.packForBT(page)); successResult.setMessage("success"); @@ -129,7 +129,7 @@ Page page = new PageFactory().defaultPage();//page使用 DataScope dataScope = service.getCurrUserDataScope(); List busConfigDTOList = busMethaneConfigService.getConfigList(page, keywords, - deptid, Long.valueOf(DeviceTypeEnum.Methane.getIndex()), dataScope); + deptid, "", Long.valueOf(DeviceTypeEnum.Methane.getIndex()), dataScope); page.setRecords(busConfigDTOList); successResult.setData(super.packForBT(page)); successResult.setMessage("success"); @@ -154,7 +154,7 @@ Page page = new PageFactory().defaultPage();//page使用 DataScope dataScope = service.getCurrUserDataScope(); List busConfigDTOList = busTubeConfigService.getConfigList(page, keywords, - deptid, Long.valueOf(DeviceTypeEnum.Tube.getIndex()), dataScope); + deptid, "", Long.valueOf(DeviceTypeEnum.Tube.getIndex()), dataScope); page.setRecords(busConfigDTOList); successResult.setData(super.packForBT(page)); successResult.setMessage("success"); @@ -178,7 +178,7 @@ Page page = new PageFactory().defaultPage();//page使用 DataScope dataScope = service.getCurrUserDataScope(); List busConfigDTOList = busTempHumiConfigService.getConfigList(page, keywords, - deptid, Long.valueOf(DeviceTypeEnum.TempHumi.getIndex()), dataScope); + deptid, "", Long.valueOf(DeviceTypeEnum.TempHumi.getIndex()), dataScope); page.setRecords(busConfigDTOList); successResult.setData(super.packForBT(page)); successResult.setMessage("success"); @@ -202,7 +202,7 @@ Page page = new PageFactory().defaultPage();//page使用 DataScope dataScope = service.getCurrUserDataScope(); List busConfigDTOList = busDigConfigService.getConfigList(page, keywords, - deptid, Long.valueOf(DeviceTypeEnum.Dig.getIndex()), dataScope); + deptid, "", Long.valueOf(DeviceTypeEnum.Dig.getIndex()), dataScope); page.setRecords(busConfigDTOList); successResult.setData(super.packForBT(page)); successResult.setMessage("success"); @@ -220,13 +220,41 @@ @RequestMapping(value = "/noiseConfig/list") @ResponseBody public Object noiseConfigList(@RequestParam(required = false) String keywords, - @RequestParam(required = false) String deptid) { + @RequestParam(required = false) String deptid, + @RequestParam(required = false) String areaId) { SuccessResponseData successResult = new SuccessResponseData(); try { + areaId += "%"; Page page = new PageFactory().defaultPage();//page使用 DataScope dataScope = service.getCurrUserDataScope(); List busConfigDTOList = busNoiseConfigService.getConfigList(page, keywords, - deptid, Long.valueOf(DeviceTypeEnum.Noise.getIndex()), dataScope); + deptid, areaId, Long.valueOf(DeviceTypeEnum.Noise.getIndex()), dataScope); + page.setRecords(busConfigDTOList); + successResult.setData(super.packForBT(page)); + successResult.setMessage("success"); + } catch (Exception e) { + e.printStackTrace(); + successResult.setCode(500); + successResult.setMessage("false"); + } + return successResult; + } + + /** + * 水表获取配置列表 + */ + @RequestMapping(value = "/watchConfig/list") + @ResponseBody + public Object watchConfigList(@RequestParam(required = false) String keywords, + @RequestParam(required = false) String deptid, + @RequestParam(required = false) String areaId) { + SuccessResponseData successResult = new SuccessResponseData(); + try { + areaId += "%"; + Page page = new PageFactory().defaultPage();//page使用 + DataScope dataScope = service.getCurrUserDataScope(); + List busConfigDTOList = busNoiseConfigService.getConfigList(page, keywords, + deptid, areaId, Long.valueOf(DeviceTypeEnum.WaterMeter.getIndex()), dataScope); page.setRecords(busConfigDTOList); successResult.setData(super.packForBT(page)); successResult.setMessage("success"); @@ -521,7 +549,7 @@ page.setSize(Integer.MAX_VALUE); DataScope dataScope = service.getCurrUserDataScope(); List busConfigDTOList = busConfigService.getConfigList(page, keywords, - deptid, Long.valueOf(DeviceTypeEnum.Liquid.getIndex()), dataScope); + deptid, "", Long.valueOf(DeviceTypeEnum.Liquid.getIndex()), dataScope); busConfigService.exp(busConfigDTOList, response); } catch (Exception e) { e.printStackTrace(); @@ -547,7 +575,7 @@ page.setSize(Integer.MAX_VALUE); DataScope dataScope = service.getCurrUserDataScope(); List busConfigDTOList = busWasteGasConfigService.getConfigList(page, keywords, - deptid, Long.valueOf(DeviceTypeEnum.WasteGas.getIndex()), dataScope); + deptid, "", Long.valueOf(DeviceTypeEnum.WasteGas.getIndex()), dataScope); busWasteGasConfigService.exp(busConfigDTOList, response); } catch (Exception e) { e.printStackTrace(); @@ -573,7 +601,7 @@ page.setSize(Integer.MAX_VALUE); DataScope dataScope = service.getCurrUserDataScope(); List busConfigDTOList = busMethaneConfigService.getConfigList(page, keywords, - deptid, Long.valueOf(DeviceTypeEnum.Methane.getIndex()), dataScope); + deptid, "", Long.valueOf(DeviceTypeEnum.Methane.getIndex()), dataScope); busMethaneConfigService.exp(busConfigDTOList, response); } catch (Exception e) { e.printStackTrace(); @@ -599,7 +627,7 @@ page.setSize(Integer.MAX_VALUE); DataScope dataScope = service.getCurrUserDataScope(); List busConfigDTOList = busTempHumiConfigService.getConfigList(page, keywords, - deptid, Long.valueOf(DeviceTypeEnum.TempHumi.getIndex()), dataScope); + deptid, "", Long.valueOf(DeviceTypeEnum.TempHumi.getIndex()), dataScope); busTempHumiConfigService.exp(busConfigDTOList, response); } catch (Exception e) { e.printStackTrace(); @@ -625,7 +653,7 @@ page.setSize(Integer.MAX_VALUE); DataScope dataScope = service.getCurrUserDataScope(); List busConfigDTOList = busDigConfigService.getConfigList(page, keywords, - deptid, Long.valueOf(DeviceTypeEnum.Dig.getIndex()), dataScope); + deptid, "", Long.valueOf(DeviceTypeEnum.Dig.getIndex()), dataScope); busDigConfigService.exp(busConfigDTOList, response); } catch (Exception e) { e.printStackTrace(); @@ -643,6 +671,7 @@ @ResponseBody public void exportNoise(@RequestParam(required = false) String keywords, @RequestParam(required = false) String deptid, + @RequestParam(required = false) String areaId, HttpServletResponse response) { try { Page page = new PageFactory().defaultPage();//page使用 @@ -650,8 +679,9 @@ page.setSearchCount(false); page.setSize(Integer.MAX_VALUE); DataScope dataScope = service.getCurrUserDataScope(); + areaId += "%"; List busConfigDTOList = busNoiseConfigService.getConfigList(page, keywords, - deptid, Long.valueOf(DeviceTypeEnum.Noise.getIndex()), dataScope); + deptid, areaId, Long.valueOf(DeviceTypeEnum.Noise.getIndex()), dataScope); busNoiseConfigService.exp(busConfigDTOList, response); } catch (Exception e) { e.printStackTrace(); @@ -669,7 +699,7 @@ Page page = new PageFactory().defaultPage();//page使用 DataScope dataScope = service.getCurrUserDataScope(); List busConfigDTOList = busGasLiquidConfigService.getConfigList(page, keywords, - deptid, Long.valueOf(DeviceTypeEnum.LG.getIndex()), dataScope); + deptid, "", Long.valueOf(DeviceTypeEnum.LG.getIndex()), dataScope); page.setRecords(busConfigDTOList); successResult.setData(super.packForBT(page)); successResult.setMessage("success"); diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/BusConfigControllerBak.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/BusConfigControllerBak.java index f386d80..d5d8f39 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/BusConfigControllerBak.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/BusConfigControllerBak.java @@ -88,7 +88,7 @@ busConfigServiceHashMap.get(deviceType.intValue()); Page page = new PageFactory().defaultPage();//page使用 DataScope dataScope = service.getCurrUserDataScope(); - List busConfigDTOList = iBusConfigService.getConfigList(page, keywords, deptid,deviceType, dataScope); + List busConfigDTOList = iBusConfigService.getConfigList(page, keywords, deptid, "", deviceType, dataScope); page.setRecords(busConfigDTOList); successResult.setData(super.packForBT(page)); successResult.setMessage("success"); @@ -262,7 +262,7 @@ page.setSearchCount(false); page.setSize(Integer.MAX_VALUE); DataScope dataScope = service.getCurrUserDataScope(); - List busConfigDTOList = iBusConfigService.getConfigList(page, keywords, deptid,deviceType, dataScope); + List busConfigDTOList = iBusConfigService.getConfigList(page, keywords, deptid, "", deviceType, dataScope); iBusConfigService.exp(busConfigDTOList,response); } catch (Exception e) { e.printStackTrace(); diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java index 988f6a3..21ffcec 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java @@ -80,14 +80,15 @@ @ApiOperation("获取设备列表") @RequestMapping(value = "/list") @ResponseBody - public Object list(String keywords, String deviceType, String deptid, String beginTime, String endTime, String isOnline) { + public Object list(String keywords, String deviceType, String deptid, String beginTime, String endTime, String isOnline, String areaId) { Page page = new PageFactory().defaultPage(); //查询数据权限 使用默认DEPTID 字段 DataScope dataScope = permissionService.getCurrUserDataScope(); - List list = deviceService.selectDataScopePage(dataScope, page, deviceType, deptid, beginTime, endTime, keywords, isOnline); + areaId += "%"; + List list = deviceService.selectDataScopePage(dataScope, page, deviceType, deptid, beginTime, endTime, keywords, isOnline, areaId); list.forEach(deviceDto -> { - deviceDto.setBfztName(permissionService.getDictNameByCode(ModularDictConst.BFZT, deviceDto.getBfzt())); deviceDto.setOnlineStateName(permissionService.getDictNameByCode(ModularDictConst.ONLINESTATUS, deviceDto.getOnlineState())); + deviceDto.setAreaFullName(deviceService.getAreaFullNameById(deviceDto.getArea())); }); page.setRecords(list); return new SuccessResponseData(super.packForBT(page)); @@ -199,14 +200,14 @@ @RequestMapping(value = "/batchExport") @Permission @ResponseBody - public void batchExport(HttpServletResponse response, String keywords, String deviceType, String deptid, String beginTime, String endTime, String isOnline) throws IOException { + public void batchExport(HttpServletResponse response, String keywords, String deviceType, String deptid, String beginTime, String endTime, String isOnline, String areaId) throws IOException { Page page = new PageFactory().defaultPage(); page.setCurrent(1); page.setSearchCount(false); page.setSize(Integer.MAX_VALUE); DataScope dataScope = permissionService.getCurrUserDataScope(); - List list = deviceService.selectDataScopePage(dataScope, page, deviceType, deptid, beginTime, endTime, keywords, isOnline); + List list = deviceService.selectDataScopePage(dataScope, page, deviceType, deptid, beginTime, endTime, keywords, isOnline, areaId); list.forEach(deviceDto -> { deviceDto.setBfztName(permissionService.getDictNameByCode(ModularDictConst.BFZT, deviceDto.getBfzt())); deviceDto.setOnlineStateName(permissionService.getDictNameByCode(ModularDictConst.ONLINESTATUS, deviceDto.getOnlineState())); diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/BusConfigMapper.java b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/BusConfigMapper.java index 8e66b48..6dbf4e2 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/BusConfigMapper.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/BusConfigMapper.java @@ -26,9 +26,12 @@ List> getConfigList(@Param("page") Page page, @Param("keywords") String keywords, @Param("deptid") String deptid, + @Param("areaId") String areaId, @Param("sensorid") String sensorid, @Param("dataScope") DataScope dataScope); + String getArea(@Param("id") String id); + String getAreaPId(@Param("id") String id); String getConcenCodeByDevId(@Param("devID") Long devID); String getWellDeepByDevId(@Param("devID") Long devID); diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceMapper.java b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceMapper.java index de7f150..37a59d8 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceMapper.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceMapper.java @@ -20,10 +20,13 @@ */ public interface DeviceMapper extends BaseMapper { - List selectDataScopePage(@Param("scope") DataScope dataScope, @Param("page") Page page, @Param("deviceType") String deviceType, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords,@Param("isOnline") String isOnline); + List selectDataScopePage(@Param("scope") DataScope dataScope, @Param("page") Page page, @Param("deviceType") String deviceType, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords,@Param("isOnline") String isOnline, @Param("areaId") String areaId); DeviceWellDto selectWellIdByCode(@Param("wellCode") String wellCode); + String getArea(@Param("id") String id); + String getAreaPId(@Param("id") String id); + DeviceConcentratorDto selectDeviceConcentorByCode(@Param("concenCode") String concenCode); List selectWellDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords); diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusConfigMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusConfigMapper.xml index 92d6c14..d85a9cd 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusConfigMapper.xml +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusConfigMapper.xml @@ -67,6 +67,9 @@ and s.ID = + + and a.AREA like #{areaId} + ORDER by writetime DESC @@ -104,5 +107,19 @@ limit 1 + + + + diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml index 3de0ee0..96c6a71 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml @@ -15,7 +15,7 @@ - ID,DEVCODE,DEVICENAME,DEVICETYPE,DEVICETYPENAME,WATCHTYPE,COMMUNICATION,MODELID,MODELNAME,DEPTID,DEPTNAME,WELLCODE,POSITION,CONCENID,CONCENCODE,ONLINESTATE,VALID,TS,BFZT,wellId, + ID,DEVCODE,DEVICENAME,DEVICETYPE,DEVICETYPENAME,WATCHTYPE,COMMUNICATION,MODELID,MODELNAME,DEPTID,DEPTNAME,WELLCODE,POSITION,CONCENID,CONCENCODE,ONLINESTATE,VALID,TS,BFZT,AREA,wellId, as INSTALLDATE @@ -37,6 +37,20 @@ SELECT id,CONCENCODE FROM bus_concentrator WHERE VALID = '1' AND CONCENCODE = #{concenCode} + + + + diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dto/DeviceDto.java b/casic-device/src/main/java/com/casic/missiles/modular/system/dto/DeviceDto.java index 64050e7..4ca24bc 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/dto/DeviceDto.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dto/DeviceDto.java @@ -59,6 +59,8 @@ private String bfzt; private String bfztName; private String wellId; + private String area; + private String areaFullName; @Override protected Serializable pkVal() { diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/IBusConfigService.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/IBusConfigService.java index 032af19..c6c2efa 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/IBusConfigService.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/IBusConfigService.java @@ -24,6 +24,7 @@ List getConfigList(Page page, String keywords, String deptid, + String areaId, Long deviceType, DataScope dataScope); String getConcenCodeByDevId(Long devID); diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/BusConfigController.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/BusConfigController.java index 122ebba..e50680b 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/BusConfigController.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/BusConfigController.java @@ -81,7 +81,7 @@ Page page = new PageFactory().defaultPage();//page使用 DataScope dataScope = service.getCurrUserDataScope(); List busConfigDTOList = busConfigService.getConfigList(page, keywords, - deptid, Long.valueOf(DeviceTypeEnum.Liquid.getIndex()), dataScope); + deptid, "", Long.valueOf(DeviceTypeEnum.Liquid.getIndex()), dataScope); page.setRecords(busConfigDTOList); successResult.setData(super.packForBT(page)); successResult.setMessage("success"); @@ -105,7 +105,7 @@ Page page = new PageFactory().defaultPage();//page使用 DataScope dataScope = service.getCurrUserDataScope(); List busConfigDTOList = busWasteGasConfigService.getConfigList(page, keywords, - deptid, Long.valueOf(DeviceTypeEnum.WasteGas.getIndex()), dataScope); + deptid, "", Long.valueOf(DeviceTypeEnum.WasteGas.getIndex()), dataScope); page.setRecords(busConfigDTOList); successResult.setData(super.packForBT(page)); successResult.setMessage("success"); @@ -129,7 +129,7 @@ Page page = new PageFactory().defaultPage();//page使用 DataScope dataScope = service.getCurrUserDataScope(); List busConfigDTOList = busMethaneConfigService.getConfigList(page, keywords, - deptid, Long.valueOf(DeviceTypeEnum.Methane.getIndex()), dataScope); + deptid, "", Long.valueOf(DeviceTypeEnum.Methane.getIndex()), dataScope); page.setRecords(busConfigDTOList); successResult.setData(super.packForBT(page)); successResult.setMessage("success"); @@ -154,7 +154,7 @@ Page page = new PageFactory().defaultPage();//page使用 DataScope dataScope = service.getCurrUserDataScope(); List busConfigDTOList = busTubeConfigService.getConfigList(page, keywords, - deptid, Long.valueOf(DeviceTypeEnum.Tube.getIndex()), dataScope); + deptid, "", Long.valueOf(DeviceTypeEnum.Tube.getIndex()), dataScope); page.setRecords(busConfigDTOList); successResult.setData(super.packForBT(page)); successResult.setMessage("success"); @@ -178,7 +178,7 @@ Page page = new PageFactory().defaultPage();//page使用 DataScope dataScope = service.getCurrUserDataScope(); List busConfigDTOList = busTempHumiConfigService.getConfigList(page, keywords, - deptid, Long.valueOf(DeviceTypeEnum.TempHumi.getIndex()), dataScope); + deptid, "", Long.valueOf(DeviceTypeEnum.TempHumi.getIndex()), dataScope); page.setRecords(busConfigDTOList); successResult.setData(super.packForBT(page)); successResult.setMessage("success"); @@ -202,7 +202,7 @@ Page page = new PageFactory().defaultPage();//page使用 DataScope dataScope = service.getCurrUserDataScope(); List busConfigDTOList = busDigConfigService.getConfigList(page, keywords, - deptid, Long.valueOf(DeviceTypeEnum.Dig.getIndex()), dataScope); + deptid, "", Long.valueOf(DeviceTypeEnum.Dig.getIndex()), dataScope); page.setRecords(busConfigDTOList); successResult.setData(super.packForBT(page)); successResult.setMessage("success"); @@ -220,13 +220,41 @@ @RequestMapping(value = "/noiseConfig/list") @ResponseBody public Object noiseConfigList(@RequestParam(required = false) String keywords, - @RequestParam(required = false) String deptid) { + @RequestParam(required = false) String deptid, + @RequestParam(required = false) String areaId) { SuccessResponseData successResult = new SuccessResponseData(); try { + areaId += "%"; Page page = new PageFactory().defaultPage();//page使用 DataScope dataScope = service.getCurrUserDataScope(); List busConfigDTOList = busNoiseConfigService.getConfigList(page, keywords, - deptid, Long.valueOf(DeviceTypeEnum.Noise.getIndex()), dataScope); + deptid, areaId, Long.valueOf(DeviceTypeEnum.Noise.getIndex()), dataScope); + page.setRecords(busConfigDTOList); + successResult.setData(super.packForBT(page)); + successResult.setMessage("success"); + } catch (Exception e) { + e.printStackTrace(); + successResult.setCode(500); + successResult.setMessage("false"); + } + return successResult; + } + + /** + * 水表获取配置列表 + */ + @RequestMapping(value = "/watchConfig/list") + @ResponseBody + public Object watchConfigList(@RequestParam(required = false) String keywords, + @RequestParam(required = false) String deptid, + @RequestParam(required = false) String areaId) { + SuccessResponseData successResult = new SuccessResponseData(); + try { + areaId += "%"; + Page page = new PageFactory().defaultPage();//page使用 + DataScope dataScope = service.getCurrUserDataScope(); + List busConfigDTOList = busNoiseConfigService.getConfigList(page, keywords, + deptid, areaId, Long.valueOf(DeviceTypeEnum.WaterMeter.getIndex()), dataScope); page.setRecords(busConfigDTOList); successResult.setData(super.packForBT(page)); successResult.setMessage("success"); @@ -521,7 +549,7 @@ page.setSize(Integer.MAX_VALUE); DataScope dataScope = service.getCurrUserDataScope(); List busConfigDTOList = busConfigService.getConfigList(page, keywords, - deptid, Long.valueOf(DeviceTypeEnum.Liquid.getIndex()), dataScope); + deptid, "", Long.valueOf(DeviceTypeEnum.Liquid.getIndex()), dataScope); busConfigService.exp(busConfigDTOList, response); } catch (Exception e) { e.printStackTrace(); @@ -547,7 +575,7 @@ page.setSize(Integer.MAX_VALUE); DataScope dataScope = service.getCurrUserDataScope(); List busConfigDTOList = busWasteGasConfigService.getConfigList(page, keywords, - deptid, Long.valueOf(DeviceTypeEnum.WasteGas.getIndex()), dataScope); + deptid, "", Long.valueOf(DeviceTypeEnum.WasteGas.getIndex()), dataScope); busWasteGasConfigService.exp(busConfigDTOList, response); } catch (Exception e) { e.printStackTrace(); @@ -573,7 +601,7 @@ page.setSize(Integer.MAX_VALUE); DataScope dataScope = service.getCurrUserDataScope(); List busConfigDTOList = busMethaneConfigService.getConfigList(page, keywords, - deptid, Long.valueOf(DeviceTypeEnum.Methane.getIndex()), dataScope); + deptid, "", Long.valueOf(DeviceTypeEnum.Methane.getIndex()), dataScope); busMethaneConfigService.exp(busConfigDTOList, response); } catch (Exception e) { e.printStackTrace(); @@ -599,7 +627,7 @@ page.setSize(Integer.MAX_VALUE); DataScope dataScope = service.getCurrUserDataScope(); List busConfigDTOList = busTempHumiConfigService.getConfigList(page, keywords, - deptid, Long.valueOf(DeviceTypeEnum.TempHumi.getIndex()), dataScope); + deptid, "", Long.valueOf(DeviceTypeEnum.TempHumi.getIndex()), dataScope); busTempHumiConfigService.exp(busConfigDTOList, response); } catch (Exception e) { e.printStackTrace(); @@ -625,7 +653,7 @@ page.setSize(Integer.MAX_VALUE); DataScope dataScope = service.getCurrUserDataScope(); List busConfigDTOList = busDigConfigService.getConfigList(page, keywords, - deptid, Long.valueOf(DeviceTypeEnum.Dig.getIndex()), dataScope); + deptid, "", Long.valueOf(DeviceTypeEnum.Dig.getIndex()), dataScope); busDigConfigService.exp(busConfigDTOList, response); } catch (Exception e) { e.printStackTrace(); @@ -643,6 +671,7 @@ @ResponseBody public void exportNoise(@RequestParam(required = false) String keywords, @RequestParam(required = false) String deptid, + @RequestParam(required = false) String areaId, HttpServletResponse response) { try { Page page = new PageFactory().defaultPage();//page使用 @@ -650,8 +679,9 @@ page.setSearchCount(false); page.setSize(Integer.MAX_VALUE); DataScope dataScope = service.getCurrUserDataScope(); + areaId += "%"; List busConfigDTOList = busNoiseConfigService.getConfigList(page, keywords, - deptid, Long.valueOf(DeviceTypeEnum.Noise.getIndex()), dataScope); + deptid, areaId, Long.valueOf(DeviceTypeEnum.Noise.getIndex()), dataScope); busNoiseConfigService.exp(busConfigDTOList, response); } catch (Exception e) { e.printStackTrace(); @@ -669,7 +699,7 @@ Page page = new PageFactory().defaultPage();//page使用 DataScope dataScope = service.getCurrUserDataScope(); List busConfigDTOList = busGasLiquidConfigService.getConfigList(page, keywords, - deptid, Long.valueOf(DeviceTypeEnum.LG.getIndex()), dataScope); + deptid, "", Long.valueOf(DeviceTypeEnum.LG.getIndex()), dataScope); page.setRecords(busConfigDTOList); successResult.setData(super.packForBT(page)); successResult.setMessage("success"); diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/BusConfigControllerBak.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/BusConfigControllerBak.java index f386d80..d5d8f39 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/BusConfigControllerBak.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/BusConfigControllerBak.java @@ -88,7 +88,7 @@ busConfigServiceHashMap.get(deviceType.intValue()); Page page = new PageFactory().defaultPage();//page使用 DataScope dataScope = service.getCurrUserDataScope(); - List busConfigDTOList = iBusConfigService.getConfigList(page, keywords, deptid,deviceType, dataScope); + List busConfigDTOList = iBusConfigService.getConfigList(page, keywords, deptid, "", deviceType, dataScope); page.setRecords(busConfigDTOList); successResult.setData(super.packForBT(page)); successResult.setMessage("success"); @@ -262,7 +262,7 @@ page.setSearchCount(false); page.setSize(Integer.MAX_VALUE); DataScope dataScope = service.getCurrUserDataScope(); - List busConfigDTOList = iBusConfigService.getConfigList(page, keywords, deptid,deviceType, dataScope); + List busConfigDTOList = iBusConfigService.getConfigList(page, keywords, deptid, "", deviceType, dataScope); iBusConfigService.exp(busConfigDTOList,response); } catch (Exception e) { e.printStackTrace(); diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java index 988f6a3..21ffcec 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java @@ -80,14 +80,15 @@ @ApiOperation("获取设备列表") @RequestMapping(value = "/list") @ResponseBody - public Object list(String keywords, String deviceType, String deptid, String beginTime, String endTime, String isOnline) { + public Object list(String keywords, String deviceType, String deptid, String beginTime, String endTime, String isOnline, String areaId) { Page page = new PageFactory().defaultPage(); //查询数据权限 使用默认DEPTID 字段 DataScope dataScope = permissionService.getCurrUserDataScope(); - List list = deviceService.selectDataScopePage(dataScope, page, deviceType, deptid, beginTime, endTime, keywords, isOnline); + areaId += "%"; + List list = deviceService.selectDataScopePage(dataScope, page, deviceType, deptid, beginTime, endTime, keywords, isOnline, areaId); list.forEach(deviceDto -> { - deviceDto.setBfztName(permissionService.getDictNameByCode(ModularDictConst.BFZT, deviceDto.getBfzt())); deviceDto.setOnlineStateName(permissionService.getDictNameByCode(ModularDictConst.ONLINESTATUS, deviceDto.getOnlineState())); + deviceDto.setAreaFullName(deviceService.getAreaFullNameById(deviceDto.getArea())); }); page.setRecords(list); return new SuccessResponseData(super.packForBT(page)); @@ -199,14 +200,14 @@ @RequestMapping(value = "/batchExport") @Permission @ResponseBody - public void batchExport(HttpServletResponse response, String keywords, String deviceType, String deptid, String beginTime, String endTime, String isOnline) throws IOException { + public void batchExport(HttpServletResponse response, String keywords, String deviceType, String deptid, String beginTime, String endTime, String isOnline, String areaId) throws IOException { Page page = new PageFactory().defaultPage(); page.setCurrent(1); page.setSearchCount(false); page.setSize(Integer.MAX_VALUE); DataScope dataScope = permissionService.getCurrUserDataScope(); - List list = deviceService.selectDataScopePage(dataScope, page, deviceType, deptid, beginTime, endTime, keywords, isOnline); + List list = deviceService.selectDataScopePage(dataScope, page, deviceType, deptid, beginTime, endTime, keywords, isOnline, areaId); list.forEach(deviceDto -> { deviceDto.setBfztName(permissionService.getDictNameByCode(ModularDictConst.BFZT, deviceDto.getBfzt())); deviceDto.setOnlineStateName(permissionService.getDictNameByCode(ModularDictConst.ONLINESTATUS, deviceDto.getOnlineState())); diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/BusConfigMapper.java b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/BusConfigMapper.java index 8e66b48..6dbf4e2 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/BusConfigMapper.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/BusConfigMapper.java @@ -26,9 +26,12 @@ List> getConfigList(@Param("page") Page page, @Param("keywords") String keywords, @Param("deptid") String deptid, + @Param("areaId") String areaId, @Param("sensorid") String sensorid, @Param("dataScope") DataScope dataScope); + String getArea(@Param("id") String id); + String getAreaPId(@Param("id") String id); String getConcenCodeByDevId(@Param("devID") Long devID); String getWellDeepByDevId(@Param("devID") Long devID); diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceMapper.java b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceMapper.java index de7f150..37a59d8 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceMapper.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceMapper.java @@ -20,10 +20,13 @@ */ public interface DeviceMapper extends BaseMapper { - List selectDataScopePage(@Param("scope") DataScope dataScope, @Param("page") Page page, @Param("deviceType") String deviceType, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords,@Param("isOnline") String isOnline); + List selectDataScopePage(@Param("scope") DataScope dataScope, @Param("page") Page page, @Param("deviceType") String deviceType, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords,@Param("isOnline") String isOnline, @Param("areaId") String areaId); DeviceWellDto selectWellIdByCode(@Param("wellCode") String wellCode); + String getArea(@Param("id") String id); + String getAreaPId(@Param("id") String id); + DeviceConcentratorDto selectDeviceConcentorByCode(@Param("concenCode") String concenCode); List selectWellDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords); diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusConfigMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusConfigMapper.xml index 92d6c14..d85a9cd 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusConfigMapper.xml +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusConfigMapper.xml @@ -67,6 +67,9 @@ and s.ID = + + and a.AREA like #{areaId} + ORDER by writetime DESC @@ -104,5 +107,19 @@ limit 1 + + + + diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml index 3de0ee0..96c6a71 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml @@ -15,7 +15,7 @@ - ID,DEVCODE,DEVICENAME,DEVICETYPE,DEVICETYPENAME,WATCHTYPE,COMMUNICATION,MODELID,MODELNAME,DEPTID,DEPTNAME,WELLCODE,POSITION,CONCENID,CONCENCODE,ONLINESTATE,VALID,TS,BFZT,wellId, + ID,DEVCODE,DEVICENAME,DEVICETYPE,DEVICETYPENAME,WATCHTYPE,COMMUNICATION,MODELID,MODELNAME,DEPTID,DEPTNAME,WELLCODE,POSITION,CONCENID,CONCENCODE,ONLINESTATE,VALID,TS,BFZT,AREA,wellId, as INSTALLDATE @@ -37,6 +37,20 @@ SELECT id,CONCENCODE FROM bus_concentrator WHERE VALID = '1' AND CONCENCODE = #{concenCode} + + + + diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dto/DeviceDto.java b/casic-device/src/main/java/com/casic/missiles/modular/system/dto/DeviceDto.java index 64050e7..4ca24bc 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/dto/DeviceDto.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dto/DeviceDto.java @@ -59,6 +59,8 @@ private String bfzt; private String bfztName; private String wellId; + private String area; + private String areaFullName; @Override protected Serializable pkVal() { diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/IBusConfigService.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/IBusConfigService.java index 032af19..c6c2efa 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/IBusConfigService.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/IBusConfigService.java @@ -24,6 +24,7 @@ List getConfigList(Page page, String keywords, String deptid, + String areaId, Long deviceType, DataScope dataScope); String getConcenCodeByDevId(Long devID); diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/IDeviceService.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/IDeviceService.java index 5374e8a..6b84904 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/IDeviceService.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/IDeviceService.java @@ -30,7 +30,7 @@ * @param endTime 设备安装结束时间 * @return 设备列表 */ - List selectDataScopePage(DataScope dataScope, Page page, String deviceType, String deptid, String beginTime, String endTime, String keywords,String isOnline); + List selectDataScopePage(DataScope dataScope, Page page, String deviceType, String deptid, String beginTime, String endTime, String keywords,String isOnline, String areaId); /** * 根据闸井编号查询闸井ID @@ -137,6 +137,8 @@ void registerGeTui(Long id, String clientid); + String getAreaFullNameById(String area); + List> selectDataList(DataScope dataScope, String wellCode, String watchType, String beginTime, String endTime); /** diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/BusConfigController.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/BusConfigController.java index 122ebba..e50680b 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/BusConfigController.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/BusConfigController.java @@ -81,7 +81,7 @@ Page page = new PageFactory().defaultPage();//page使用 DataScope dataScope = service.getCurrUserDataScope(); List busConfigDTOList = busConfigService.getConfigList(page, keywords, - deptid, Long.valueOf(DeviceTypeEnum.Liquid.getIndex()), dataScope); + deptid, "", Long.valueOf(DeviceTypeEnum.Liquid.getIndex()), dataScope); page.setRecords(busConfigDTOList); successResult.setData(super.packForBT(page)); successResult.setMessage("success"); @@ -105,7 +105,7 @@ Page page = new PageFactory().defaultPage();//page使用 DataScope dataScope = service.getCurrUserDataScope(); List busConfigDTOList = busWasteGasConfigService.getConfigList(page, keywords, - deptid, Long.valueOf(DeviceTypeEnum.WasteGas.getIndex()), dataScope); + deptid, "", Long.valueOf(DeviceTypeEnum.WasteGas.getIndex()), dataScope); page.setRecords(busConfigDTOList); successResult.setData(super.packForBT(page)); successResult.setMessage("success"); @@ -129,7 +129,7 @@ Page page = new PageFactory().defaultPage();//page使用 DataScope dataScope = service.getCurrUserDataScope(); List busConfigDTOList = busMethaneConfigService.getConfigList(page, keywords, - deptid, Long.valueOf(DeviceTypeEnum.Methane.getIndex()), dataScope); + deptid, "", Long.valueOf(DeviceTypeEnum.Methane.getIndex()), dataScope); page.setRecords(busConfigDTOList); successResult.setData(super.packForBT(page)); successResult.setMessage("success"); @@ -154,7 +154,7 @@ Page page = new PageFactory().defaultPage();//page使用 DataScope dataScope = service.getCurrUserDataScope(); List busConfigDTOList = busTubeConfigService.getConfigList(page, keywords, - deptid, Long.valueOf(DeviceTypeEnum.Tube.getIndex()), dataScope); + deptid, "", Long.valueOf(DeviceTypeEnum.Tube.getIndex()), dataScope); page.setRecords(busConfigDTOList); successResult.setData(super.packForBT(page)); successResult.setMessage("success"); @@ -178,7 +178,7 @@ Page page = new PageFactory().defaultPage();//page使用 DataScope dataScope = service.getCurrUserDataScope(); List busConfigDTOList = busTempHumiConfigService.getConfigList(page, keywords, - deptid, Long.valueOf(DeviceTypeEnum.TempHumi.getIndex()), dataScope); + deptid, "", Long.valueOf(DeviceTypeEnum.TempHumi.getIndex()), dataScope); page.setRecords(busConfigDTOList); successResult.setData(super.packForBT(page)); successResult.setMessage("success"); @@ -202,7 +202,7 @@ Page page = new PageFactory().defaultPage();//page使用 DataScope dataScope = service.getCurrUserDataScope(); List busConfigDTOList = busDigConfigService.getConfigList(page, keywords, - deptid, Long.valueOf(DeviceTypeEnum.Dig.getIndex()), dataScope); + deptid, "", Long.valueOf(DeviceTypeEnum.Dig.getIndex()), dataScope); page.setRecords(busConfigDTOList); successResult.setData(super.packForBT(page)); successResult.setMessage("success"); @@ -220,13 +220,41 @@ @RequestMapping(value = "/noiseConfig/list") @ResponseBody public Object noiseConfigList(@RequestParam(required = false) String keywords, - @RequestParam(required = false) String deptid) { + @RequestParam(required = false) String deptid, + @RequestParam(required = false) String areaId) { SuccessResponseData successResult = new SuccessResponseData(); try { + areaId += "%"; Page page = new PageFactory().defaultPage();//page使用 DataScope dataScope = service.getCurrUserDataScope(); List busConfigDTOList = busNoiseConfigService.getConfigList(page, keywords, - deptid, Long.valueOf(DeviceTypeEnum.Noise.getIndex()), dataScope); + deptid, areaId, Long.valueOf(DeviceTypeEnum.Noise.getIndex()), dataScope); + page.setRecords(busConfigDTOList); + successResult.setData(super.packForBT(page)); + successResult.setMessage("success"); + } catch (Exception e) { + e.printStackTrace(); + successResult.setCode(500); + successResult.setMessage("false"); + } + return successResult; + } + + /** + * 水表获取配置列表 + */ + @RequestMapping(value = "/watchConfig/list") + @ResponseBody + public Object watchConfigList(@RequestParam(required = false) String keywords, + @RequestParam(required = false) String deptid, + @RequestParam(required = false) String areaId) { + SuccessResponseData successResult = new SuccessResponseData(); + try { + areaId += "%"; + Page page = new PageFactory().defaultPage();//page使用 + DataScope dataScope = service.getCurrUserDataScope(); + List busConfigDTOList = busNoiseConfigService.getConfigList(page, keywords, + deptid, areaId, Long.valueOf(DeviceTypeEnum.WaterMeter.getIndex()), dataScope); page.setRecords(busConfigDTOList); successResult.setData(super.packForBT(page)); successResult.setMessage("success"); @@ -521,7 +549,7 @@ page.setSize(Integer.MAX_VALUE); DataScope dataScope = service.getCurrUserDataScope(); List busConfigDTOList = busConfigService.getConfigList(page, keywords, - deptid, Long.valueOf(DeviceTypeEnum.Liquid.getIndex()), dataScope); + deptid, "", Long.valueOf(DeviceTypeEnum.Liquid.getIndex()), dataScope); busConfigService.exp(busConfigDTOList, response); } catch (Exception e) { e.printStackTrace(); @@ -547,7 +575,7 @@ page.setSize(Integer.MAX_VALUE); DataScope dataScope = service.getCurrUserDataScope(); List busConfigDTOList = busWasteGasConfigService.getConfigList(page, keywords, - deptid, Long.valueOf(DeviceTypeEnum.WasteGas.getIndex()), dataScope); + deptid, "", Long.valueOf(DeviceTypeEnum.WasteGas.getIndex()), dataScope); busWasteGasConfigService.exp(busConfigDTOList, response); } catch (Exception e) { e.printStackTrace(); @@ -573,7 +601,7 @@ page.setSize(Integer.MAX_VALUE); DataScope dataScope = service.getCurrUserDataScope(); List busConfigDTOList = busMethaneConfigService.getConfigList(page, keywords, - deptid, Long.valueOf(DeviceTypeEnum.Methane.getIndex()), dataScope); + deptid, "", Long.valueOf(DeviceTypeEnum.Methane.getIndex()), dataScope); busMethaneConfigService.exp(busConfigDTOList, response); } catch (Exception e) { e.printStackTrace(); @@ -599,7 +627,7 @@ page.setSize(Integer.MAX_VALUE); DataScope dataScope = service.getCurrUserDataScope(); List busConfigDTOList = busTempHumiConfigService.getConfigList(page, keywords, - deptid, Long.valueOf(DeviceTypeEnum.TempHumi.getIndex()), dataScope); + deptid, "", Long.valueOf(DeviceTypeEnum.TempHumi.getIndex()), dataScope); busTempHumiConfigService.exp(busConfigDTOList, response); } catch (Exception e) { e.printStackTrace(); @@ -625,7 +653,7 @@ page.setSize(Integer.MAX_VALUE); DataScope dataScope = service.getCurrUserDataScope(); List busConfigDTOList = busDigConfigService.getConfigList(page, keywords, - deptid, Long.valueOf(DeviceTypeEnum.Dig.getIndex()), dataScope); + deptid, "", Long.valueOf(DeviceTypeEnum.Dig.getIndex()), dataScope); busDigConfigService.exp(busConfigDTOList, response); } catch (Exception e) { e.printStackTrace(); @@ -643,6 +671,7 @@ @ResponseBody public void exportNoise(@RequestParam(required = false) String keywords, @RequestParam(required = false) String deptid, + @RequestParam(required = false) String areaId, HttpServletResponse response) { try { Page page = new PageFactory().defaultPage();//page使用 @@ -650,8 +679,9 @@ page.setSearchCount(false); page.setSize(Integer.MAX_VALUE); DataScope dataScope = service.getCurrUserDataScope(); + areaId += "%"; List busConfigDTOList = busNoiseConfigService.getConfigList(page, keywords, - deptid, Long.valueOf(DeviceTypeEnum.Noise.getIndex()), dataScope); + deptid, areaId, Long.valueOf(DeviceTypeEnum.Noise.getIndex()), dataScope); busNoiseConfigService.exp(busConfigDTOList, response); } catch (Exception e) { e.printStackTrace(); @@ -669,7 +699,7 @@ Page page = new PageFactory().defaultPage();//page使用 DataScope dataScope = service.getCurrUserDataScope(); List busConfigDTOList = busGasLiquidConfigService.getConfigList(page, keywords, - deptid, Long.valueOf(DeviceTypeEnum.LG.getIndex()), dataScope); + deptid, "", Long.valueOf(DeviceTypeEnum.LG.getIndex()), dataScope); page.setRecords(busConfigDTOList); successResult.setData(super.packForBT(page)); successResult.setMessage("success"); diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/BusConfigControllerBak.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/BusConfigControllerBak.java index f386d80..d5d8f39 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/BusConfigControllerBak.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/BusConfigControllerBak.java @@ -88,7 +88,7 @@ busConfigServiceHashMap.get(deviceType.intValue()); Page page = new PageFactory().defaultPage();//page使用 DataScope dataScope = service.getCurrUserDataScope(); - List busConfigDTOList = iBusConfigService.getConfigList(page, keywords, deptid,deviceType, dataScope); + List busConfigDTOList = iBusConfigService.getConfigList(page, keywords, deptid, "", deviceType, dataScope); page.setRecords(busConfigDTOList); successResult.setData(super.packForBT(page)); successResult.setMessage("success"); @@ -262,7 +262,7 @@ page.setSearchCount(false); page.setSize(Integer.MAX_VALUE); DataScope dataScope = service.getCurrUserDataScope(); - List busConfigDTOList = iBusConfigService.getConfigList(page, keywords, deptid,deviceType, dataScope); + List busConfigDTOList = iBusConfigService.getConfigList(page, keywords, deptid, "", deviceType, dataScope); iBusConfigService.exp(busConfigDTOList,response); } catch (Exception e) { e.printStackTrace(); diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java index 988f6a3..21ffcec 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java @@ -80,14 +80,15 @@ @ApiOperation("获取设备列表") @RequestMapping(value = "/list") @ResponseBody - public Object list(String keywords, String deviceType, String deptid, String beginTime, String endTime, String isOnline) { + public Object list(String keywords, String deviceType, String deptid, String beginTime, String endTime, String isOnline, String areaId) { Page page = new PageFactory().defaultPage(); //查询数据权限 使用默认DEPTID 字段 DataScope dataScope = permissionService.getCurrUserDataScope(); - List list = deviceService.selectDataScopePage(dataScope, page, deviceType, deptid, beginTime, endTime, keywords, isOnline); + areaId += "%"; + List list = deviceService.selectDataScopePage(dataScope, page, deviceType, deptid, beginTime, endTime, keywords, isOnline, areaId); list.forEach(deviceDto -> { - deviceDto.setBfztName(permissionService.getDictNameByCode(ModularDictConst.BFZT, deviceDto.getBfzt())); deviceDto.setOnlineStateName(permissionService.getDictNameByCode(ModularDictConst.ONLINESTATUS, deviceDto.getOnlineState())); + deviceDto.setAreaFullName(deviceService.getAreaFullNameById(deviceDto.getArea())); }); page.setRecords(list); return new SuccessResponseData(super.packForBT(page)); @@ -199,14 +200,14 @@ @RequestMapping(value = "/batchExport") @Permission @ResponseBody - public void batchExport(HttpServletResponse response, String keywords, String deviceType, String deptid, String beginTime, String endTime, String isOnline) throws IOException { + public void batchExport(HttpServletResponse response, String keywords, String deviceType, String deptid, String beginTime, String endTime, String isOnline, String areaId) throws IOException { Page page = new PageFactory().defaultPage(); page.setCurrent(1); page.setSearchCount(false); page.setSize(Integer.MAX_VALUE); DataScope dataScope = permissionService.getCurrUserDataScope(); - List list = deviceService.selectDataScopePage(dataScope, page, deviceType, deptid, beginTime, endTime, keywords, isOnline); + List list = deviceService.selectDataScopePage(dataScope, page, deviceType, deptid, beginTime, endTime, keywords, isOnline, areaId); list.forEach(deviceDto -> { deviceDto.setBfztName(permissionService.getDictNameByCode(ModularDictConst.BFZT, deviceDto.getBfzt())); deviceDto.setOnlineStateName(permissionService.getDictNameByCode(ModularDictConst.ONLINESTATUS, deviceDto.getOnlineState())); diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/BusConfigMapper.java b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/BusConfigMapper.java index 8e66b48..6dbf4e2 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/BusConfigMapper.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/BusConfigMapper.java @@ -26,9 +26,12 @@ List> getConfigList(@Param("page") Page page, @Param("keywords") String keywords, @Param("deptid") String deptid, + @Param("areaId") String areaId, @Param("sensorid") String sensorid, @Param("dataScope") DataScope dataScope); + String getArea(@Param("id") String id); + String getAreaPId(@Param("id") String id); String getConcenCodeByDevId(@Param("devID") Long devID); String getWellDeepByDevId(@Param("devID") Long devID); diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceMapper.java b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceMapper.java index de7f150..37a59d8 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceMapper.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceMapper.java @@ -20,10 +20,13 @@ */ public interface DeviceMapper extends BaseMapper { - List selectDataScopePage(@Param("scope") DataScope dataScope, @Param("page") Page page, @Param("deviceType") String deviceType, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords,@Param("isOnline") String isOnline); + List selectDataScopePage(@Param("scope") DataScope dataScope, @Param("page") Page page, @Param("deviceType") String deviceType, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords,@Param("isOnline") String isOnline, @Param("areaId") String areaId); DeviceWellDto selectWellIdByCode(@Param("wellCode") String wellCode); + String getArea(@Param("id") String id); + String getAreaPId(@Param("id") String id); + DeviceConcentratorDto selectDeviceConcentorByCode(@Param("concenCode") String concenCode); List selectWellDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords); diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusConfigMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusConfigMapper.xml index 92d6c14..d85a9cd 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusConfigMapper.xml +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusConfigMapper.xml @@ -67,6 +67,9 @@ and s.ID = + + and a.AREA like #{areaId} + ORDER by writetime DESC @@ -104,5 +107,19 @@ limit 1 + + + + diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml index 3de0ee0..96c6a71 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml @@ -15,7 +15,7 @@ - ID,DEVCODE,DEVICENAME,DEVICETYPE,DEVICETYPENAME,WATCHTYPE,COMMUNICATION,MODELID,MODELNAME,DEPTID,DEPTNAME,WELLCODE,POSITION,CONCENID,CONCENCODE,ONLINESTATE,VALID,TS,BFZT,wellId, + ID,DEVCODE,DEVICENAME,DEVICETYPE,DEVICETYPENAME,WATCHTYPE,COMMUNICATION,MODELID,MODELNAME,DEPTID,DEPTNAME,WELLCODE,POSITION,CONCENID,CONCENCODE,ONLINESTATE,VALID,TS,BFZT,AREA,wellId, as INSTALLDATE @@ -37,6 +37,20 @@ SELECT id,CONCENCODE FROM bus_concentrator WHERE VALID = '1' AND CONCENCODE = #{concenCode} + + + + diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dto/DeviceDto.java b/casic-device/src/main/java/com/casic/missiles/modular/system/dto/DeviceDto.java index 64050e7..4ca24bc 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/dto/DeviceDto.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dto/DeviceDto.java @@ -59,6 +59,8 @@ private String bfzt; private String bfztName; private String wellId; + private String area; + private String areaFullName; @Override protected Serializable pkVal() { diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/IBusConfigService.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/IBusConfigService.java index 032af19..c6c2efa 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/IBusConfigService.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/IBusConfigService.java @@ -24,6 +24,7 @@ List getConfigList(Page page, String keywords, String deptid, + String areaId, Long deviceType, DataScope dataScope); String getConcenCodeByDevId(Long devID); diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/IDeviceService.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/IDeviceService.java index 5374e8a..6b84904 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/IDeviceService.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/IDeviceService.java @@ -30,7 +30,7 @@ * @param endTime 设备安装结束时间 * @return 设备列表 */ - List selectDataScopePage(DataScope dataScope, Page page, String deviceType, String deptid, String beginTime, String endTime, String keywords,String isOnline); + List selectDataScopePage(DataScope dataScope, Page page, String deviceType, String deptid, String beginTime, String endTime, String keywords,String isOnline, String areaId); /** * 根据闸井编号查询闸井ID @@ -137,6 +137,8 @@ void registerGeTui(Long id, String clientid); + String getAreaFullNameById(String area); + List> selectDataList(DataScope dataScope, String wellCode, String watchType, String beginTime, String endTime); /** diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusConfigServiceImpl.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusConfigServiceImpl.java index 364829c..d7e38aa 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusConfigServiceImpl.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusConfigServiceImpl.java @@ -75,9 +75,10 @@ public List getConfigList(Page page, String keywords, String deptid, + String areaId, Long deviceType, DataScope dataScope) { - List> result = this.baseMapper.getConfigList(page, keywords, deptid, + List> result = this.baseMapper.getConfigList(page, keywords, deptid, "", BusConfigDTO.sensorHashMap.get(deviceType.intValue()), dataScope); List busConfigDTOList = new ArrayList<>(); for (Map objectMap : result) { diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/BusConfigController.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/BusConfigController.java index 122ebba..e50680b 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/BusConfigController.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/BusConfigController.java @@ -81,7 +81,7 @@ Page page = new PageFactory().defaultPage();//page使用 DataScope dataScope = service.getCurrUserDataScope(); List busConfigDTOList = busConfigService.getConfigList(page, keywords, - deptid, Long.valueOf(DeviceTypeEnum.Liquid.getIndex()), dataScope); + deptid, "", Long.valueOf(DeviceTypeEnum.Liquid.getIndex()), dataScope); page.setRecords(busConfigDTOList); successResult.setData(super.packForBT(page)); successResult.setMessage("success"); @@ -105,7 +105,7 @@ Page page = new PageFactory().defaultPage();//page使用 DataScope dataScope = service.getCurrUserDataScope(); List busConfigDTOList = busWasteGasConfigService.getConfigList(page, keywords, - deptid, Long.valueOf(DeviceTypeEnum.WasteGas.getIndex()), dataScope); + deptid, "", Long.valueOf(DeviceTypeEnum.WasteGas.getIndex()), dataScope); page.setRecords(busConfigDTOList); successResult.setData(super.packForBT(page)); successResult.setMessage("success"); @@ -129,7 +129,7 @@ Page page = new PageFactory().defaultPage();//page使用 DataScope dataScope = service.getCurrUserDataScope(); List busConfigDTOList = busMethaneConfigService.getConfigList(page, keywords, - deptid, Long.valueOf(DeviceTypeEnum.Methane.getIndex()), dataScope); + deptid, "", Long.valueOf(DeviceTypeEnum.Methane.getIndex()), dataScope); page.setRecords(busConfigDTOList); successResult.setData(super.packForBT(page)); successResult.setMessage("success"); @@ -154,7 +154,7 @@ Page page = new PageFactory().defaultPage();//page使用 DataScope dataScope = service.getCurrUserDataScope(); List busConfigDTOList = busTubeConfigService.getConfigList(page, keywords, - deptid, Long.valueOf(DeviceTypeEnum.Tube.getIndex()), dataScope); + deptid, "", Long.valueOf(DeviceTypeEnum.Tube.getIndex()), dataScope); page.setRecords(busConfigDTOList); successResult.setData(super.packForBT(page)); successResult.setMessage("success"); @@ -178,7 +178,7 @@ Page page = new PageFactory().defaultPage();//page使用 DataScope dataScope = service.getCurrUserDataScope(); List busConfigDTOList = busTempHumiConfigService.getConfigList(page, keywords, - deptid, Long.valueOf(DeviceTypeEnum.TempHumi.getIndex()), dataScope); + deptid, "", Long.valueOf(DeviceTypeEnum.TempHumi.getIndex()), dataScope); page.setRecords(busConfigDTOList); successResult.setData(super.packForBT(page)); successResult.setMessage("success"); @@ -202,7 +202,7 @@ Page page = new PageFactory().defaultPage();//page使用 DataScope dataScope = service.getCurrUserDataScope(); List busConfigDTOList = busDigConfigService.getConfigList(page, keywords, - deptid, Long.valueOf(DeviceTypeEnum.Dig.getIndex()), dataScope); + deptid, "", Long.valueOf(DeviceTypeEnum.Dig.getIndex()), dataScope); page.setRecords(busConfigDTOList); successResult.setData(super.packForBT(page)); successResult.setMessage("success"); @@ -220,13 +220,41 @@ @RequestMapping(value = "/noiseConfig/list") @ResponseBody public Object noiseConfigList(@RequestParam(required = false) String keywords, - @RequestParam(required = false) String deptid) { + @RequestParam(required = false) String deptid, + @RequestParam(required = false) String areaId) { SuccessResponseData successResult = new SuccessResponseData(); try { + areaId += "%"; Page page = new PageFactory().defaultPage();//page使用 DataScope dataScope = service.getCurrUserDataScope(); List busConfigDTOList = busNoiseConfigService.getConfigList(page, keywords, - deptid, Long.valueOf(DeviceTypeEnum.Noise.getIndex()), dataScope); + deptid, areaId, Long.valueOf(DeviceTypeEnum.Noise.getIndex()), dataScope); + page.setRecords(busConfigDTOList); + successResult.setData(super.packForBT(page)); + successResult.setMessage("success"); + } catch (Exception e) { + e.printStackTrace(); + successResult.setCode(500); + successResult.setMessage("false"); + } + return successResult; + } + + /** + * 水表获取配置列表 + */ + @RequestMapping(value = "/watchConfig/list") + @ResponseBody + public Object watchConfigList(@RequestParam(required = false) String keywords, + @RequestParam(required = false) String deptid, + @RequestParam(required = false) String areaId) { + SuccessResponseData successResult = new SuccessResponseData(); + try { + areaId += "%"; + Page page = new PageFactory().defaultPage();//page使用 + DataScope dataScope = service.getCurrUserDataScope(); + List busConfigDTOList = busNoiseConfigService.getConfigList(page, keywords, + deptid, areaId, Long.valueOf(DeviceTypeEnum.WaterMeter.getIndex()), dataScope); page.setRecords(busConfigDTOList); successResult.setData(super.packForBT(page)); successResult.setMessage("success"); @@ -521,7 +549,7 @@ page.setSize(Integer.MAX_VALUE); DataScope dataScope = service.getCurrUserDataScope(); List busConfigDTOList = busConfigService.getConfigList(page, keywords, - deptid, Long.valueOf(DeviceTypeEnum.Liquid.getIndex()), dataScope); + deptid, "", Long.valueOf(DeviceTypeEnum.Liquid.getIndex()), dataScope); busConfigService.exp(busConfigDTOList, response); } catch (Exception e) { e.printStackTrace(); @@ -547,7 +575,7 @@ page.setSize(Integer.MAX_VALUE); DataScope dataScope = service.getCurrUserDataScope(); List busConfigDTOList = busWasteGasConfigService.getConfigList(page, keywords, - deptid, Long.valueOf(DeviceTypeEnum.WasteGas.getIndex()), dataScope); + deptid, "", Long.valueOf(DeviceTypeEnum.WasteGas.getIndex()), dataScope); busWasteGasConfigService.exp(busConfigDTOList, response); } catch (Exception e) { e.printStackTrace(); @@ -573,7 +601,7 @@ page.setSize(Integer.MAX_VALUE); DataScope dataScope = service.getCurrUserDataScope(); List busConfigDTOList = busMethaneConfigService.getConfigList(page, keywords, - deptid, Long.valueOf(DeviceTypeEnum.Methane.getIndex()), dataScope); + deptid, "", Long.valueOf(DeviceTypeEnum.Methane.getIndex()), dataScope); busMethaneConfigService.exp(busConfigDTOList, response); } catch (Exception e) { e.printStackTrace(); @@ -599,7 +627,7 @@ page.setSize(Integer.MAX_VALUE); DataScope dataScope = service.getCurrUserDataScope(); List busConfigDTOList = busTempHumiConfigService.getConfigList(page, keywords, - deptid, Long.valueOf(DeviceTypeEnum.TempHumi.getIndex()), dataScope); + deptid, "", Long.valueOf(DeviceTypeEnum.TempHumi.getIndex()), dataScope); busTempHumiConfigService.exp(busConfigDTOList, response); } catch (Exception e) { e.printStackTrace(); @@ -625,7 +653,7 @@ page.setSize(Integer.MAX_VALUE); DataScope dataScope = service.getCurrUserDataScope(); List busConfigDTOList = busDigConfigService.getConfigList(page, keywords, - deptid, Long.valueOf(DeviceTypeEnum.Dig.getIndex()), dataScope); + deptid, "", Long.valueOf(DeviceTypeEnum.Dig.getIndex()), dataScope); busDigConfigService.exp(busConfigDTOList, response); } catch (Exception e) { e.printStackTrace(); @@ -643,6 +671,7 @@ @ResponseBody public void exportNoise(@RequestParam(required = false) String keywords, @RequestParam(required = false) String deptid, + @RequestParam(required = false) String areaId, HttpServletResponse response) { try { Page page = new PageFactory().defaultPage();//page使用 @@ -650,8 +679,9 @@ page.setSearchCount(false); page.setSize(Integer.MAX_VALUE); DataScope dataScope = service.getCurrUserDataScope(); + areaId += "%"; List busConfigDTOList = busNoiseConfigService.getConfigList(page, keywords, - deptid, Long.valueOf(DeviceTypeEnum.Noise.getIndex()), dataScope); + deptid, areaId, Long.valueOf(DeviceTypeEnum.Noise.getIndex()), dataScope); busNoiseConfigService.exp(busConfigDTOList, response); } catch (Exception e) { e.printStackTrace(); @@ -669,7 +699,7 @@ Page page = new PageFactory().defaultPage();//page使用 DataScope dataScope = service.getCurrUserDataScope(); List busConfigDTOList = busGasLiquidConfigService.getConfigList(page, keywords, - deptid, Long.valueOf(DeviceTypeEnum.LG.getIndex()), dataScope); + deptid, "", Long.valueOf(DeviceTypeEnum.LG.getIndex()), dataScope); page.setRecords(busConfigDTOList); successResult.setData(super.packForBT(page)); successResult.setMessage("success"); diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/BusConfigControllerBak.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/BusConfigControllerBak.java index f386d80..d5d8f39 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/BusConfigControllerBak.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/BusConfigControllerBak.java @@ -88,7 +88,7 @@ busConfigServiceHashMap.get(deviceType.intValue()); Page page = new PageFactory().defaultPage();//page使用 DataScope dataScope = service.getCurrUserDataScope(); - List busConfigDTOList = iBusConfigService.getConfigList(page, keywords, deptid,deviceType, dataScope); + List busConfigDTOList = iBusConfigService.getConfigList(page, keywords, deptid, "", deviceType, dataScope); page.setRecords(busConfigDTOList); successResult.setData(super.packForBT(page)); successResult.setMessage("success"); @@ -262,7 +262,7 @@ page.setSearchCount(false); page.setSize(Integer.MAX_VALUE); DataScope dataScope = service.getCurrUserDataScope(); - List busConfigDTOList = iBusConfigService.getConfigList(page, keywords, deptid,deviceType, dataScope); + List busConfigDTOList = iBusConfigService.getConfigList(page, keywords, deptid, "", deviceType, dataScope); iBusConfigService.exp(busConfigDTOList,response); } catch (Exception e) { e.printStackTrace(); diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java index 988f6a3..21ffcec 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java @@ -80,14 +80,15 @@ @ApiOperation("获取设备列表") @RequestMapping(value = "/list") @ResponseBody - public Object list(String keywords, String deviceType, String deptid, String beginTime, String endTime, String isOnline) { + public Object list(String keywords, String deviceType, String deptid, String beginTime, String endTime, String isOnline, String areaId) { Page page = new PageFactory().defaultPage(); //查询数据权限 使用默认DEPTID 字段 DataScope dataScope = permissionService.getCurrUserDataScope(); - List list = deviceService.selectDataScopePage(dataScope, page, deviceType, deptid, beginTime, endTime, keywords, isOnline); + areaId += "%"; + List list = deviceService.selectDataScopePage(dataScope, page, deviceType, deptid, beginTime, endTime, keywords, isOnline, areaId); list.forEach(deviceDto -> { - deviceDto.setBfztName(permissionService.getDictNameByCode(ModularDictConst.BFZT, deviceDto.getBfzt())); deviceDto.setOnlineStateName(permissionService.getDictNameByCode(ModularDictConst.ONLINESTATUS, deviceDto.getOnlineState())); + deviceDto.setAreaFullName(deviceService.getAreaFullNameById(deviceDto.getArea())); }); page.setRecords(list); return new SuccessResponseData(super.packForBT(page)); @@ -199,14 +200,14 @@ @RequestMapping(value = "/batchExport") @Permission @ResponseBody - public void batchExport(HttpServletResponse response, String keywords, String deviceType, String deptid, String beginTime, String endTime, String isOnline) throws IOException { + public void batchExport(HttpServletResponse response, String keywords, String deviceType, String deptid, String beginTime, String endTime, String isOnline, String areaId) throws IOException { Page page = new PageFactory().defaultPage(); page.setCurrent(1); page.setSearchCount(false); page.setSize(Integer.MAX_VALUE); DataScope dataScope = permissionService.getCurrUserDataScope(); - List list = deviceService.selectDataScopePage(dataScope, page, deviceType, deptid, beginTime, endTime, keywords, isOnline); + List list = deviceService.selectDataScopePage(dataScope, page, deviceType, deptid, beginTime, endTime, keywords, isOnline, areaId); list.forEach(deviceDto -> { deviceDto.setBfztName(permissionService.getDictNameByCode(ModularDictConst.BFZT, deviceDto.getBfzt())); deviceDto.setOnlineStateName(permissionService.getDictNameByCode(ModularDictConst.ONLINESTATUS, deviceDto.getOnlineState())); diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/BusConfigMapper.java b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/BusConfigMapper.java index 8e66b48..6dbf4e2 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/BusConfigMapper.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/BusConfigMapper.java @@ -26,9 +26,12 @@ List> getConfigList(@Param("page") Page page, @Param("keywords") String keywords, @Param("deptid") String deptid, + @Param("areaId") String areaId, @Param("sensorid") String sensorid, @Param("dataScope") DataScope dataScope); + String getArea(@Param("id") String id); + String getAreaPId(@Param("id") String id); String getConcenCodeByDevId(@Param("devID") Long devID); String getWellDeepByDevId(@Param("devID") Long devID); diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceMapper.java b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceMapper.java index de7f150..37a59d8 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceMapper.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceMapper.java @@ -20,10 +20,13 @@ */ public interface DeviceMapper extends BaseMapper { - List selectDataScopePage(@Param("scope") DataScope dataScope, @Param("page") Page page, @Param("deviceType") String deviceType, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords,@Param("isOnline") String isOnline); + List selectDataScopePage(@Param("scope") DataScope dataScope, @Param("page") Page page, @Param("deviceType") String deviceType, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords,@Param("isOnline") String isOnline, @Param("areaId") String areaId); DeviceWellDto selectWellIdByCode(@Param("wellCode") String wellCode); + String getArea(@Param("id") String id); + String getAreaPId(@Param("id") String id); + DeviceConcentratorDto selectDeviceConcentorByCode(@Param("concenCode") String concenCode); List selectWellDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords); diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusConfigMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusConfigMapper.xml index 92d6c14..d85a9cd 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusConfigMapper.xml +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusConfigMapper.xml @@ -67,6 +67,9 @@ and s.ID = + + and a.AREA like #{areaId} + ORDER by writetime DESC @@ -104,5 +107,19 @@ limit 1 + + + + diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml index 3de0ee0..96c6a71 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml @@ -15,7 +15,7 @@ - ID,DEVCODE,DEVICENAME,DEVICETYPE,DEVICETYPENAME,WATCHTYPE,COMMUNICATION,MODELID,MODELNAME,DEPTID,DEPTNAME,WELLCODE,POSITION,CONCENID,CONCENCODE,ONLINESTATE,VALID,TS,BFZT,wellId, + ID,DEVCODE,DEVICENAME,DEVICETYPE,DEVICETYPENAME,WATCHTYPE,COMMUNICATION,MODELID,MODELNAME,DEPTID,DEPTNAME,WELLCODE,POSITION,CONCENID,CONCENCODE,ONLINESTATE,VALID,TS,BFZT,AREA,wellId, as INSTALLDATE @@ -37,6 +37,20 @@ SELECT id,CONCENCODE FROM bus_concentrator WHERE VALID = '1' AND CONCENCODE = #{concenCode} + + + + diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dto/DeviceDto.java b/casic-device/src/main/java/com/casic/missiles/modular/system/dto/DeviceDto.java index 64050e7..4ca24bc 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/dto/DeviceDto.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dto/DeviceDto.java @@ -59,6 +59,8 @@ private String bfzt; private String bfztName; private String wellId; + private String area; + private String areaFullName; @Override protected Serializable pkVal() { diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/IBusConfigService.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/IBusConfigService.java index 032af19..c6c2efa 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/IBusConfigService.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/IBusConfigService.java @@ -24,6 +24,7 @@ List getConfigList(Page page, String keywords, String deptid, + String areaId, Long deviceType, DataScope dataScope); String getConcenCodeByDevId(Long devID); diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/IDeviceService.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/IDeviceService.java index 5374e8a..6b84904 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/IDeviceService.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/IDeviceService.java @@ -30,7 +30,7 @@ * @param endTime 设备安装结束时间 * @return 设备列表 */ - List selectDataScopePage(DataScope dataScope, Page page, String deviceType, String deptid, String beginTime, String endTime, String keywords,String isOnline); + List selectDataScopePage(DataScope dataScope, Page page, String deviceType, String deptid, String beginTime, String endTime, String keywords,String isOnline, String areaId); /** * 根据闸井编号查询闸井ID @@ -137,6 +137,8 @@ void registerGeTui(Long id, String clientid); + String getAreaFullNameById(String area); + List> selectDataList(DataScope dataScope, String wellCode, String watchType, String beginTime, String endTime); /** diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusConfigServiceImpl.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusConfigServiceImpl.java index 364829c..d7e38aa 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusConfigServiceImpl.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusConfigServiceImpl.java @@ -75,9 +75,10 @@ public List getConfigList(Page page, String keywords, String deptid, + String areaId, Long deviceType, DataScope dataScope) { - List> result = this.baseMapper.getConfigList(page, keywords, deptid, + List> result = this.baseMapper.getConfigList(page, keywords, deptid, "", BusConfigDTO.sensorHashMap.get(deviceType.intValue()), dataScope); List busConfigDTOList = new ArrayList<>(); for (Map objectMap : result) { diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusDigConfigServiceImpl.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusDigConfigServiceImpl.java index acca7f9..8c8c592 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusDigConfigServiceImpl.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusDigConfigServiceImpl.java @@ -73,9 +73,10 @@ public List getConfigList(Page page, String keywords, String deptid, + String areaId, Long deviceType, DataScope dataScope) { - List> result = this.baseMapper.getConfigList(page, keywords, deptid, + List> result = this.baseMapper.getConfigList(page, keywords, deptid, "", BusConfigDTO.sensorHashMap.get(deviceType.intValue()), dataScope); List busConfigDTOList = new ArrayList<>(); for (Map objectMap : result) { diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/BusConfigController.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/BusConfigController.java index 122ebba..e50680b 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/BusConfigController.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/BusConfigController.java @@ -81,7 +81,7 @@ Page page = new PageFactory().defaultPage();//page使用 DataScope dataScope = service.getCurrUserDataScope(); List busConfigDTOList = busConfigService.getConfigList(page, keywords, - deptid, Long.valueOf(DeviceTypeEnum.Liquid.getIndex()), dataScope); + deptid, "", Long.valueOf(DeviceTypeEnum.Liquid.getIndex()), dataScope); page.setRecords(busConfigDTOList); successResult.setData(super.packForBT(page)); successResult.setMessage("success"); @@ -105,7 +105,7 @@ Page page = new PageFactory().defaultPage();//page使用 DataScope dataScope = service.getCurrUserDataScope(); List busConfigDTOList = busWasteGasConfigService.getConfigList(page, keywords, - deptid, Long.valueOf(DeviceTypeEnum.WasteGas.getIndex()), dataScope); + deptid, "", Long.valueOf(DeviceTypeEnum.WasteGas.getIndex()), dataScope); page.setRecords(busConfigDTOList); successResult.setData(super.packForBT(page)); successResult.setMessage("success"); @@ -129,7 +129,7 @@ Page page = new PageFactory().defaultPage();//page使用 DataScope dataScope = service.getCurrUserDataScope(); List busConfigDTOList = busMethaneConfigService.getConfigList(page, keywords, - deptid, Long.valueOf(DeviceTypeEnum.Methane.getIndex()), dataScope); + deptid, "", Long.valueOf(DeviceTypeEnum.Methane.getIndex()), dataScope); page.setRecords(busConfigDTOList); successResult.setData(super.packForBT(page)); successResult.setMessage("success"); @@ -154,7 +154,7 @@ Page page = new PageFactory().defaultPage();//page使用 DataScope dataScope = service.getCurrUserDataScope(); List busConfigDTOList = busTubeConfigService.getConfigList(page, keywords, - deptid, Long.valueOf(DeviceTypeEnum.Tube.getIndex()), dataScope); + deptid, "", Long.valueOf(DeviceTypeEnum.Tube.getIndex()), dataScope); page.setRecords(busConfigDTOList); successResult.setData(super.packForBT(page)); successResult.setMessage("success"); @@ -178,7 +178,7 @@ Page page = new PageFactory().defaultPage();//page使用 DataScope dataScope = service.getCurrUserDataScope(); List busConfigDTOList = busTempHumiConfigService.getConfigList(page, keywords, - deptid, Long.valueOf(DeviceTypeEnum.TempHumi.getIndex()), dataScope); + deptid, "", Long.valueOf(DeviceTypeEnum.TempHumi.getIndex()), dataScope); page.setRecords(busConfigDTOList); successResult.setData(super.packForBT(page)); successResult.setMessage("success"); @@ -202,7 +202,7 @@ Page page = new PageFactory().defaultPage();//page使用 DataScope dataScope = service.getCurrUserDataScope(); List busConfigDTOList = busDigConfigService.getConfigList(page, keywords, - deptid, Long.valueOf(DeviceTypeEnum.Dig.getIndex()), dataScope); + deptid, "", Long.valueOf(DeviceTypeEnum.Dig.getIndex()), dataScope); page.setRecords(busConfigDTOList); successResult.setData(super.packForBT(page)); successResult.setMessage("success"); @@ -220,13 +220,41 @@ @RequestMapping(value = "/noiseConfig/list") @ResponseBody public Object noiseConfigList(@RequestParam(required = false) String keywords, - @RequestParam(required = false) String deptid) { + @RequestParam(required = false) String deptid, + @RequestParam(required = false) String areaId) { SuccessResponseData successResult = new SuccessResponseData(); try { + areaId += "%"; Page page = new PageFactory().defaultPage();//page使用 DataScope dataScope = service.getCurrUserDataScope(); List busConfigDTOList = busNoiseConfigService.getConfigList(page, keywords, - deptid, Long.valueOf(DeviceTypeEnum.Noise.getIndex()), dataScope); + deptid, areaId, Long.valueOf(DeviceTypeEnum.Noise.getIndex()), dataScope); + page.setRecords(busConfigDTOList); + successResult.setData(super.packForBT(page)); + successResult.setMessage("success"); + } catch (Exception e) { + e.printStackTrace(); + successResult.setCode(500); + successResult.setMessage("false"); + } + return successResult; + } + + /** + * 水表获取配置列表 + */ + @RequestMapping(value = "/watchConfig/list") + @ResponseBody + public Object watchConfigList(@RequestParam(required = false) String keywords, + @RequestParam(required = false) String deptid, + @RequestParam(required = false) String areaId) { + SuccessResponseData successResult = new SuccessResponseData(); + try { + areaId += "%"; + Page page = new PageFactory().defaultPage();//page使用 + DataScope dataScope = service.getCurrUserDataScope(); + List busConfigDTOList = busNoiseConfigService.getConfigList(page, keywords, + deptid, areaId, Long.valueOf(DeviceTypeEnum.WaterMeter.getIndex()), dataScope); page.setRecords(busConfigDTOList); successResult.setData(super.packForBT(page)); successResult.setMessage("success"); @@ -521,7 +549,7 @@ page.setSize(Integer.MAX_VALUE); DataScope dataScope = service.getCurrUserDataScope(); List busConfigDTOList = busConfigService.getConfigList(page, keywords, - deptid, Long.valueOf(DeviceTypeEnum.Liquid.getIndex()), dataScope); + deptid, "", Long.valueOf(DeviceTypeEnum.Liquid.getIndex()), dataScope); busConfigService.exp(busConfigDTOList, response); } catch (Exception e) { e.printStackTrace(); @@ -547,7 +575,7 @@ page.setSize(Integer.MAX_VALUE); DataScope dataScope = service.getCurrUserDataScope(); List busConfigDTOList = busWasteGasConfigService.getConfigList(page, keywords, - deptid, Long.valueOf(DeviceTypeEnum.WasteGas.getIndex()), dataScope); + deptid, "", Long.valueOf(DeviceTypeEnum.WasteGas.getIndex()), dataScope); busWasteGasConfigService.exp(busConfigDTOList, response); } catch (Exception e) { e.printStackTrace(); @@ -573,7 +601,7 @@ page.setSize(Integer.MAX_VALUE); DataScope dataScope = service.getCurrUserDataScope(); List busConfigDTOList = busMethaneConfigService.getConfigList(page, keywords, - deptid, Long.valueOf(DeviceTypeEnum.Methane.getIndex()), dataScope); + deptid, "", Long.valueOf(DeviceTypeEnum.Methane.getIndex()), dataScope); busMethaneConfigService.exp(busConfigDTOList, response); } catch (Exception e) { e.printStackTrace(); @@ -599,7 +627,7 @@ page.setSize(Integer.MAX_VALUE); DataScope dataScope = service.getCurrUserDataScope(); List busConfigDTOList = busTempHumiConfigService.getConfigList(page, keywords, - deptid, Long.valueOf(DeviceTypeEnum.TempHumi.getIndex()), dataScope); + deptid, "", Long.valueOf(DeviceTypeEnum.TempHumi.getIndex()), dataScope); busTempHumiConfigService.exp(busConfigDTOList, response); } catch (Exception e) { e.printStackTrace(); @@ -625,7 +653,7 @@ page.setSize(Integer.MAX_VALUE); DataScope dataScope = service.getCurrUserDataScope(); List busConfigDTOList = busDigConfigService.getConfigList(page, keywords, - deptid, Long.valueOf(DeviceTypeEnum.Dig.getIndex()), dataScope); + deptid, "", Long.valueOf(DeviceTypeEnum.Dig.getIndex()), dataScope); busDigConfigService.exp(busConfigDTOList, response); } catch (Exception e) { e.printStackTrace(); @@ -643,6 +671,7 @@ @ResponseBody public void exportNoise(@RequestParam(required = false) String keywords, @RequestParam(required = false) String deptid, + @RequestParam(required = false) String areaId, HttpServletResponse response) { try { Page page = new PageFactory().defaultPage();//page使用 @@ -650,8 +679,9 @@ page.setSearchCount(false); page.setSize(Integer.MAX_VALUE); DataScope dataScope = service.getCurrUserDataScope(); + areaId += "%"; List busConfigDTOList = busNoiseConfigService.getConfigList(page, keywords, - deptid, Long.valueOf(DeviceTypeEnum.Noise.getIndex()), dataScope); + deptid, areaId, Long.valueOf(DeviceTypeEnum.Noise.getIndex()), dataScope); busNoiseConfigService.exp(busConfigDTOList, response); } catch (Exception e) { e.printStackTrace(); @@ -669,7 +699,7 @@ Page page = new PageFactory().defaultPage();//page使用 DataScope dataScope = service.getCurrUserDataScope(); List busConfigDTOList = busGasLiquidConfigService.getConfigList(page, keywords, - deptid, Long.valueOf(DeviceTypeEnum.LG.getIndex()), dataScope); + deptid, "", Long.valueOf(DeviceTypeEnum.LG.getIndex()), dataScope); page.setRecords(busConfigDTOList); successResult.setData(super.packForBT(page)); successResult.setMessage("success"); diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/BusConfigControllerBak.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/BusConfigControllerBak.java index f386d80..d5d8f39 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/BusConfigControllerBak.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/BusConfigControllerBak.java @@ -88,7 +88,7 @@ busConfigServiceHashMap.get(deviceType.intValue()); Page page = new PageFactory().defaultPage();//page使用 DataScope dataScope = service.getCurrUserDataScope(); - List busConfigDTOList = iBusConfigService.getConfigList(page, keywords, deptid,deviceType, dataScope); + List busConfigDTOList = iBusConfigService.getConfigList(page, keywords, deptid, "", deviceType, dataScope); page.setRecords(busConfigDTOList); successResult.setData(super.packForBT(page)); successResult.setMessage("success"); @@ -262,7 +262,7 @@ page.setSearchCount(false); page.setSize(Integer.MAX_VALUE); DataScope dataScope = service.getCurrUserDataScope(); - List busConfigDTOList = iBusConfigService.getConfigList(page, keywords, deptid,deviceType, dataScope); + List busConfigDTOList = iBusConfigService.getConfigList(page, keywords, deptid, "", deviceType, dataScope); iBusConfigService.exp(busConfigDTOList,response); } catch (Exception e) { e.printStackTrace(); diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java index 988f6a3..21ffcec 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java @@ -80,14 +80,15 @@ @ApiOperation("获取设备列表") @RequestMapping(value = "/list") @ResponseBody - public Object list(String keywords, String deviceType, String deptid, String beginTime, String endTime, String isOnline) { + public Object list(String keywords, String deviceType, String deptid, String beginTime, String endTime, String isOnline, String areaId) { Page page = new PageFactory().defaultPage(); //查询数据权限 使用默认DEPTID 字段 DataScope dataScope = permissionService.getCurrUserDataScope(); - List list = deviceService.selectDataScopePage(dataScope, page, deviceType, deptid, beginTime, endTime, keywords, isOnline); + areaId += "%"; + List list = deviceService.selectDataScopePage(dataScope, page, deviceType, deptid, beginTime, endTime, keywords, isOnline, areaId); list.forEach(deviceDto -> { - deviceDto.setBfztName(permissionService.getDictNameByCode(ModularDictConst.BFZT, deviceDto.getBfzt())); deviceDto.setOnlineStateName(permissionService.getDictNameByCode(ModularDictConst.ONLINESTATUS, deviceDto.getOnlineState())); + deviceDto.setAreaFullName(deviceService.getAreaFullNameById(deviceDto.getArea())); }); page.setRecords(list); return new SuccessResponseData(super.packForBT(page)); @@ -199,14 +200,14 @@ @RequestMapping(value = "/batchExport") @Permission @ResponseBody - public void batchExport(HttpServletResponse response, String keywords, String deviceType, String deptid, String beginTime, String endTime, String isOnline) throws IOException { + public void batchExport(HttpServletResponse response, String keywords, String deviceType, String deptid, String beginTime, String endTime, String isOnline, String areaId) throws IOException { Page page = new PageFactory().defaultPage(); page.setCurrent(1); page.setSearchCount(false); page.setSize(Integer.MAX_VALUE); DataScope dataScope = permissionService.getCurrUserDataScope(); - List list = deviceService.selectDataScopePage(dataScope, page, deviceType, deptid, beginTime, endTime, keywords, isOnline); + List list = deviceService.selectDataScopePage(dataScope, page, deviceType, deptid, beginTime, endTime, keywords, isOnline, areaId); list.forEach(deviceDto -> { deviceDto.setBfztName(permissionService.getDictNameByCode(ModularDictConst.BFZT, deviceDto.getBfzt())); deviceDto.setOnlineStateName(permissionService.getDictNameByCode(ModularDictConst.ONLINESTATUS, deviceDto.getOnlineState())); diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/BusConfigMapper.java b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/BusConfigMapper.java index 8e66b48..6dbf4e2 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/BusConfigMapper.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/BusConfigMapper.java @@ -26,9 +26,12 @@ List> getConfigList(@Param("page") Page page, @Param("keywords") String keywords, @Param("deptid") String deptid, + @Param("areaId") String areaId, @Param("sensorid") String sensorid, @Param("dataScope") DataScope dataScope); + String getArea(@Param("id") String id); + String getAreaPId(@Param("id") String id); String getConcenCodeByDevId(@Param("devID") Long devID); String getWellDeepByDevId(@Param("devID") Long devID); diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceMapper.java b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceMapper.java index de7f150..37a59d8 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceMapper.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceMapper.java @@ -20,10 +20,13 @@ */ public interface DeviceMapper extends BaseMapper { - List selectDataScopePage(@Param("scope") DataScope dataScope, @Param("page") Page page, @Param("deviceType") String deviceType, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords,@Param("isOnline") String isOnline); + List selectDataScopePage(@Param("scope") DataScope dataScope, @Param("page") Page page, @Param("deviceType") String deviceType, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords,@Param("isOnline") String isOnline, @Param("areaId") String areaId); DeviceWellDto selectWellIdByCode(@Param("wellCode") String wellCode); + String getArea(@Param("id") String id); + String getAreaPId(@Param("id") String id); + DeviceConcentratorDto selectDeviceConcentorByCode(@Param("concenCode") String concenCode); List selectWellDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords); diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusConfigMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusConfigMapper.xml index 92d6c14..d85a9cd 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusConfigMapper.xml +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusConfigMapper.xml @@ -67,6 +67,9 @@ and s.ID = + + and a.AREA like #{areaId} + ORDER by writetime DESC @@ -104,5 +107,19 @@ limit 1 + + + + diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml index 3de0ee0..96c6a71 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml @@ -15,7 +15,7 @@ - ID,DEVCODE,DEVICENAME,DEVICETYPE,DEVICETYPENAME,WATCHTYPE,COMMUNICATION,MODELID,MODELNAME,DEPTID,DEPTNAME,WELLCODE,POSITION,CONCENID,CONCENCODE,ONLINESTATE,VALID,TS,BFZT,wellId, + ID,DEVCODE,DEVICENAME,DEVICETYPE,DEVICETYPENAME,WATCHTYPE,COMMUNICATION,MODELID,MODELNAME,DEPTID,DEPTNAME,WELLCODE,POSITION,CONCENID,CONCENCODE,ONLINESTATE,VALID,TS,BFZT,AREA,wellId, as INSTALLDATE @@ -37,6 +37,20 @@ SELECT id,CONCENCODE FROM bus_concentrator WHERE VALID = '1' AND CONCENCODE = #{concenCode} + + + + diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dto/DeviceDto.java b/casic-device/src/main/java/com/casic/missiles/modular/system/dto/DeviceDto.java index 64050e7..4ca24bc 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/dto/DeviceDto.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dto/DeviceDto.java @@ -59,6 +59,8 @@ private String bfzt; private String bfztName; private String wellId; + private String area; + private String areaFullName; @Override protected Serializable pkVal() { diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/IBusConfigService.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/IBusConfigService.java index 032af19..c6c2efa 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/IBusConfigService.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/IBusConfigService.java @@ -24,6 +24,7 @@ List getConfigList(Page page, String keywords, String deptid, + String areaId, Long deviceType, DataScope dataScope); String getConcenCodeByDevId(Long devID); diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/IDeviceService.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/IDeviceService.java index 5374e8a..6b84904 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/IDeviceService.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/IDeviceService.java @@ -30,7 +30,7 @@ * @param endTime 设备安装结束时间 * @return 设备列表 */ - List selectDataScopePage(DataScope dataScope, Page page, String deviceType, String deptid, String beginTime, String endTime, String keywords,String isOnline); + List selectDataScopePage(DataScope dataScope, Page page, String deviceType, String deptid, String beginTime, String endTime, String keywords,String isOnline, String areaId); /** * 根据闸井编号查询闸井ID @@ -137,6 +137,8 @@ void registerGeTui(Long id, String clientid); + String getAreaFullNameById(String area); + List> selectDataList(DataScope dataScope, String wellCode, String watchType, String beginTime, String endTime); /** diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusConfigServiceImpl.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusConfigServiceImpl.java index 364829c..d7e38aa 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusConfigServiceImpl.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusConfigServiceImpl.java @@ -75,9 +75,10 @@ public List getConfigList(Page page, String keywords, String deptid, + String areaId, Long deviceType, DataScope dataScope) { - List> result = this.baseMapper.getConfigList(page, keywords, deptid, + List> result = this.baseMapper.getConfigList(page, keywords, deptid, "", BusConfigDTO.sensorHashMap.get(deviceType.intValue()), dataScope); List busConfigDTOList = new ArrayList<>(); for (Map objectMap : result) { diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusDigConfigServiceImpl.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusDigConfigServiceImpl.java index acca7f9..8c8c592 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusDigConfigServiceImpl.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusDigConfigServiceImpl.java @@ -73,9 +73,10 @@ public List getConfigList(Page page, String keywords, String deptid, + String areaId, Long deviceType, DataScope dataScope) { - List> result = this.baseMapper.getConfigList(page, keywords, deptid, + List> result = this.baseMapper.getConfigList(page, keywords, deptid, "", BusConfigDTO.sensorHashMap.get(deviceType.intValue()), dataScope); List busConfigDTOList = new ArrayList<>(); for (Map objectMap : result) { diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusGasLiquidConfigServiceImpl.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusGasLiquidConfigServiceImpl.java index 528e0cf..62cd290 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusGasLiquidConfigServiceImpl.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusGasLiquidConfigServiceImpl.java @@ -73,9 +73,10 @@ public List getConfigList(Page page, String keywords, String deptid, + String areaId, Long deviceType, DataScope dataScope) { - List> result = this.baseMapper.getConfigList(page, keywords, deptid, + List> result = this.baseMapper.getConfigList(page, keywords, deptid, "", BusConfigDTO.sensorHashMap.get(deviceType.intValue()), dataScope); List busConfigDTOList = new ArrayList<>(); for (Map objectMap : result) { diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/BusConfigController.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/BusConfigController.java index 122ebba..e50680b 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/BusConfigController.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/BusConfigController.java @@ -81,7 +81,7 @@ Page page = new PageFactory().defaultPage();//page使用 DataScope dataScope = service.getCurrUserDataScope(); List busConfigDTOList = busConfigService.getConfigList(page, keywords, - deptid, Long.valueOf(DeviceTypeEnum.Liquid.getIndex()), dataScope); + deptid, "", Long.valueOf(DeviceTypeEnum.Liquid.getIndex()), dataScope); page.setRecords(busConfigDTOList); successResult.setData(super.packForBT(page)); successResult.setMessage("success"); @@ -105,7 +105,7 @@ Page page = new PageFactory().defaultPage();//page使用 DataScope dataScope = service.getCurrUserDataScope(); List busConfigDTOList = busWasteGasConfigService.getConfigList(page, keywords, - deptid, Long.valueOf(DeviceTypeEnum.WasteGas.getIndex()), dataScope); + deptid, "", Long.valueOf(DeviceTypeEnum.WasteGas.getIndex()), dataScope); page.setRecords(busConfigDTOList); successResult.setData(super.packForBT(page)); successResult.setMessage("success"); @@ -129,7 +129,7 @@ Page page = new PageFactory().defaultPage();//page使用 DataScope dataScope = service.getCurrUserDataScope(); List busConfigDTOList = busMethaneConfigService.getConfigList(page, keywords, - deptid, Long.valueOf(DeviceTypeEnum.Methane.getIndex()), dataScope); + deptid, "", Long.valueOf(DeviceTypeEnum.Methane.getIndex()), dataScope); page.setRecords(busConfigDTOList); successResult.setData(super.packForBT(page)); successResult.setMessage("success"); @@ -154,7 +154,7 @@ Page page = new PageFactory().defaultPage();//page使用 DataScope dataScope = service.getCurrUserDataScope(); List busConfigDTOList = busTubeConfigService.getConfigList(page, keywords, - deptid, Long.valueOf(DeviceTypeEnum.Tube.getIndex()), dataScope); + deptid, "", Long.valueOf(DeviceTypeEnum.Tube.getIndex()), dataScope); page.setRecords(busConfigDTOList); successResult.setData(super.packForBT(page)); successResult.setMessage("success"); @@ -178,7 +178,7 @@ Page page = new PageFactory().defaultPage();//page使用 DataScope dataScope = service.getCurrUserDataScope(); List busConfigDTOList = busTempHumiConfigService.getConfigList(page, keywords, - deptid, Long.valueOf(DeviceTypeEnum.TempHumi.getIndex()), dataScope); + deptid, "", Long.valueOf(DeviceTypeEnum.TempHumi.getIndex()), dataScope); page.setRecords(busConfigDTOList); successResult.setData(super.packForBT(page)); successResult.setMessage("success"); @@ -202,7 +202,7 @@ Page page = new PageFactory().defaultPage();//page使用 DataScope dataScope = service.getCurrUserDataScope(); List busConfigDTOList = busDigConfigService.getConfigList(page, keywords, - deptid, Long.valueOf(DeviceTypeEnum.Dig.getIndex()), dataScope); + deptid, "", Long.valueOf(DeviceTypeEnum.Dig.getIndex()), dataScope); page.setRecords(busConfigDTOList); successResult.setData(super.packForBT(page)); successResult.setMessage("success"); @@ -220,13 +220,41 @@ @RequestMapping(value = "/noiseConfig/list") @ResponseBody public Object noiseConfigList(@RequestParam(required = false) String keywords, - @RequestParam(required = false) String deptid) { + @RequestParam(required = false) String deptid, + @RequestParam(required = false) String areaId) { SuccessResponseData successResult = new SuccessResponseData(); try { + areaId += "%"; Page page = new PageFactory().defaultPage();//page使用 DataScope dataScope = service.getCurrUserDataScope(); List busConfigDTOList = busNoiseConfigService.getConfigList(page, keywords, - deptid, Long.valueOf(DeviceTypeEnum.Noise.getIndex()), dataScope); + deptid, areaId, Long.valueOf(DeviceTypeEnum.Noise.getIndex()), dataScope); + page.setRecords(busConfigDTOList); + successResult.setData(super.packForBT(page)); + successResult.setMessage("success"); + } catch (Exception e) { + e.printStackTrace(); + successResult.setCode(500); + successResult.setMessage("false"); + } + return successResult; + } + + /** + * 水表获取配置列表 + */ + @RequestMapping(value = "/watchConfig/list") + @ResponseBody + public Object watchConfigList(@RequestParam(required = false) String keywords, + @RequestParam(required = false) String deptid, + @RequestParam(required = false) String areaId) { + SuccessResponseData successResult = new SuccessResponseData(); + try { + areaId += "%"; + Page page = new PageFactory().defaultPage();//page使用 + DataScope dataScope = service.getCurrUserDataScope(); + List busConfigDTOList = busNoiseConfigService.getConfigList(page, keywords, + deptid, areaId, Long.valueOf(DeviceTypeEnum.WaterMeter.getIndex()), dataScope); page.setRecords(busConfigDTOList); successResult.setData(super.packForBT(page)); successResult.setMessage("success"); @@ -521,7 +549,7 @@ page.setSize(Integer.MAX_VALUE); DataScope dataScope = service.getCurrUserDataScope(); List busConfigDTOList = busConfigService.getConfigList(page, keywords, - deptid, Long.valueOf(DeviceTypeEnum.Liquid.getIndex()), dataScope); + deptid, "", Long.valueOf(DeviceTypeEnum.Liquid.getIndex()), dataScope); busConfigService.exp(busConfigDTOList, response); } catch (Exception e) { e.printStackTrace(); @@ -547,7 +575,7 @@ page.setSize(Integer.MAX_VALUE); DataScope dataScope = service.getCurrUserDataScope(); List busConfigDTOList = busWasteGasConfigService.getConfigList(page, keywords, - deptid, Long.valueOf(DeviceTypeEnum.WasteGas.getIndex()), dataScope); + deptid, "", Long.valueOf(DeviceTypeEnum.WasteGas.getIndex()), dataScope); busWasteGasConfigService.exp(busConfigDTOList, response); } catch (Exception e) { e.printStackTrace(); @@ -573,7 +601,7 @@ page.setSize(Integer.MAX_VALUE); DataScope dataScope = service.getCurrUserDataScope(); List busConfigDTOList = busMethaneConfigService.getConfigList(page, keywords, - deptid, Long.valueOf(DeviceTypeEnum.Methane.getIndex()), dataScope); + deptid, "", Long.valueOf(DeviceTypeEnum.Methane.getIndex()), dataScope); busMethaneConfigService.exp(busConfigDTOList, response); } catch (Exception e) { e.printStackTrace(); @@ -599,7 +627,7 @@ page.setSize(Integer.MAX_VALUE); DataScope dataScope = service.getCurrUserDataScope(); List busConfigDTOList = busTempHumiConfigService.getConfigList(page, keywords, - deptid, Long.valueOf(DeviceTypeEnum.TempHumi.getIndex()), dataScope); + deptid, "", Long.valueOf(DeviceTypeEnum.TempHumi.getIndex()), dataScope); busTempHumiConfigService.exp(busConfigDTOList, response); } catch (Exception e) { e.printStackTrace(); @@ -625,7 +653,7 @@ page.setSize(Integer.MAX_VALUE); DataScope dataScope = service.getCurrUserDataScope(); List busConfigDTOList = busDigConfigService.getConfigList(page, keywords, - deptid, Long.valueOf(DeviceTypeEnum.Dig.getIndex()), dataScope); + deptid, "", Long.valueOf(DeviceTypeEnum.Dig.getIndex()), dataScope); busDigConfigService.exp(busConfigDTOList, response); } catch (Exception e) { e.printStackTrace(); @@ -643,6 +671,7 @@ @ResponseBody public void exportNoise(@RequestParam(required = false) String keywords, @RequestParam(required = false) String deptid, + @RequestParam(required = false) String areaId, HttpServletResponse response) { try { Page page = new PageFactory().defaultPage();//page使用 @@ -650,8 +679,9 @@ page.setSearchCount(false); page.setSize(Integer.MAX_VALUE); DataScope dataScope = service.getCurrUserDataScope(); + areaId += "%"; List busConfigDTOList = busNoiseConfigService.getConfigList(page, keywords, - deptid, Long.valueOf(DeviceTypeEnum.Noise.getIndex()), dataScope); + deptid, areaId, Long.valueOf(DeviceTypeEnum.Noise.getIndex()), dataScope); busNoiseConfigService.exp(busConfigDTOList, response); } catch (Exception e) { e.printStackTrace(); @@ -669,7 +699,7 @@ Page page = new PageFactory().defaultPage();//page使用 DataScope dataScope = service.getCurrUserDataScope(); List busConfigDTOList = busGasLiquidConfigService.getConfigList(page, keywords, - deptid, Long.valueOf(DeviceTypeEnum.LG.getIndex()), dataScope); + deptid, "", Long.valueOf(DeviceTypeEnum.LG.getIndex()), dataScope); page.setRecords(busConfigDTOList); successResult.setData(super.packForBT(page)); successResult.setMessage("success"); diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/BusConfigControllerBak.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/BusConfigControllerBak.java index f386d80..d5d8f39 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/BusConfigControllerBak.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/BusConfigControllerBak.java @@ -88,7 +88,7 @@ busConfigServiceHashMap.get(deviceType.intValue()); Page page = new PageFactory().defaultPage();//page使用 DataScope dataScope = service.getCurrUserDataScope(); - List busConfigDTOList = iBusConfigService.getConfigList(page, keywords, deptid,deviceType, dataScope); + List busConfigDTOList = iBusConfigService.getConfigList(page, keywords, deptid, "", deviceType, dataScope); page.setRecords(busConfigDTOList); successResult.setData(super.packForBT(page)); successResult.setMessage("success"); @@ -262,7 +262,7 @@ page.setSearchCount(false); page.setSize(Integer.MAX_VALUE); DataScope dataScope = service.getCurrUserDataScope(); - List busConfigDTOList = iBusConfigService.getConfigList(page, keywords, deptid,deviceType, dataScope); + List busConfigDTOList = iBusConfigService.getConfigList(page, keywords, deptid, "", deviceType, dataScope); iBusConfigService.exp(busConfigDTOList,response); } catch (Exception e) { e.printStackTrace(); diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java index 988f6a3..21ffcec 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java @@ -80,14 +80,15 @@ @ApiOperation("获取设备列表") @RequestMapping(value = "/list") @ResponseBody - public Object list(String keywords, String deviceType, String deptid, String beginTime, String endTime, String isOnline) { + public Object list(String keywords, String deviceType, String deptid, String beginTime, String endTime, String isOnline, String areaId) { Page page = new PageFactory().defaultPage(); //查询数据权限 使用默认DEPTID 字段 DataScope dataScope = permissionService.getCurrUserDataScope(); - List list = deviceService.selectDataScopePage(dataScope, page, deviceType, deptid, beginTime, endTime, keywords, isOnline); + areaId += "%"; + List list = deviceService.selectDataScopePage(dataScope, page, deviceType, deptid, beginTime, endTime, keywords, isOnline, areaId); list.forEach(deviceDto -> { - deviceDto.setBfztName(permissionService.getDictNameByCode(ModularDictConst.BFZT, deviceDto.getBfzt())); deviceDto.setOnlineStateName(permissionService.getDictNameByCode(ModularDictConst.ONLINESTATUS, deviceDto.getOnlineState())); + deviceDto.setAreaFullName(deviceService.getAreaFullNameById(deviceDto.getArea())); }); page.setRecords(list); return new SuccessResponseData(super.packForBT(page)); @@ -199,14 +200,14 @@ @RequestMapping(value = "/batchExport") @Permission @ResponseBody - public void batchExport(HttpServletResponse response, String keywords, String deviceType, String deptid, String beginTime, String endTime, String isOnline) throws IOException { + public void batchExport(HttpServletResponse response, String keywords, String deviceType, String deptid, String beginTime, String endTime, String isOnline, String areaId) throws IOException { Page page = new PageFactory().defaultPage(); page.setCurrent(1); page.setSearchCount(false); page.setSize(Integer.MAX_VALUE); DataScope dataScope = permissionService.getCurrUserDataScope(); - List list = deviceService.selectDataScopePage(dataScope, page, deviceType, deptid, beginTime, endTime, keywords, isOnline); + List list = deviceService.selectDataScopePage(dataScope, page, deviceType, deptid, beginTime, endTime, keywords, isOnline, areaId); list.forEach(deviceDto -> { deviceDto.setBfztName(permissionService.getDictNameByCode(ModularDictConst.BFZT, deviceDto.getBfzt())); deviceDto.setOnlineStateName(permissionService.getDictNameByCode(ModularDictConst.ONLINESTATUS, deviceDto.getOnlineState())); diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/BusConfigMapper.java b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/BusConfigMapper.java index 8e66b48..6dbf4e2 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/BusConfigMapper.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/BusConfigMapper.java @@ -26,9 +26,12 @@ List> getConfigList(@Param("page") Page page, @Param("keywords") String keywords, @Param("deptid") String deptid, + @Param("areaId") String areaId, @Param("sensorid") String sensorid, @Param("dataScope") DataScope dataScope); + String getArea(@Param("id") String id); + String getAreaPId(@Param("id") String id); String getConcenCodeByDevId(@Param("devID") Long devID); String getWellDeepByDevId(@Param("devID") Long devID); diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceMapper.java b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceMapper.java index de7f150..37a59d8 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceMapper.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceMapper.java @@ -20,10 +20,13 @@ */ public interface DeviceMapper extends BaseMapper { - List selectDataScopePage(@Param("scope") DataScope dataScope, @Param("page") Page page, @Param("deviceType") String deviceType, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords,@Param("isOnline") String isOnline); + List selectDataScopePage(@Param("scope") DataScope dataScope, @Param("page") Page page, @Param("deviceType") String deviceType, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords,@Param("isOnline") String isOnline, @Param("areaId") String areaId); DeviceWellDto selectWellIdByCode(@Param("wellCode") String wellCode); + String getArea(@Param("id") String id); + String getAreaPId(@Param("id") String id); + DeviceConcentratorDto selectDeviceConcentorByCode(@Param("concenCode") String concenCode); List selectWellDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords); diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusConfigMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusConfigMapper.xml index 92d6c14..d85a9cd 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusConfigMapper.xml +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusConfigMapper.xml @@ -67,6 +67,9 @@ and s.ID = + + and a.AREA like #{areaId} + ORDER by writetime DESC @@ -104,5 +107,19 @@ limit 1 + + + + diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml index 3de0ee0..96c6a71 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml @@ -15,7 +15,7 @@ - ID,DEVCODE,DEVICENAME,DEVICETYPE,DEVICETYPENAME,WATCHTYPE,COMMUNICATION,MODELID,MODELNAME,DEPTID,DEPTNAME,WELLCODE,POSITION,CONCENID,CONCENCODE,ONLINESTATE,VALID,TS,BFZT,wellId, + ID,DEVCODE,DEVICENAME,DEVICETYPE,DEVICETYPENAME,WATCHTYPE,COMMUNICATION,MODELID,MODELNAME,DEPTID,DEPTNAME,WELLCODE,POSITION,CONCENID,CONCENCODE,ONLINESTATE,VALID,TS,BFZT,AREA,wellId, as INSTALLDATE @@ -37,6 +37,20 @@ SELECT id,CONCENCODE FROM bus_concentrator WHERE VALID = '1' AND CONCENCODE = #{concenCode} + + + + diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dto/DeviceDto.java b/casic-device/src/main/java/com/casic/missiles/modular/system/dto/DeviceDto.java index 64050e7..4ca24bc 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/dto/DeviceDto.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dto/DeviceDto.java @@ -59,6 +59,8 @@ private String bfzt; private String bfztName; private String wellId; + private String area; + private String areaFullName; @Override protected Serializable pkVal() { diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/IBusConfigService.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/IBusConfigService.java index 032af19..c6c2efa 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/IBusConfigService.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/IBusConfigService.java @@ -24,6 +24,7 @@ List getConfigList(Page page, String keywords, String deptid, + String areaId, Long deviceType, DataScope dataScope); String getConcenCodeByDevId(Long devID); diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/IDeviceService.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/IDeviceService.java index 5374e8a..6b84904 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/IDeviceService.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/IDeviceService.java @@ -30,7 +30,7 @@ * @param endTime 设备安装结束时间 * @return 设备列表 */ - List selectDataScopePage(DataScope dataScope, Page page, String deviceType, String deptid, String beginTime, String endTime, String keywords,String isOnline); + List selectDataScopePage(DataScope dataScope, Page page, String deviceType, String deptid, String beginTime, String endTime, String keywords,String isOnline, String areaId); /** * 根据闸井编号查询闸井ID @@ -137,6 +137,8 @@ void registerGeTui(Long id, String clientid); + String getAreaFullNameById(String area); + List> selectDataList(DataScope dataScope, String wellCode, String watchType, String beginTime, String endTime); /** diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusConfigServiceImpl.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusConfigServiceImpl.java index 364829c..d7e38aa 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusConfigServiceImpl.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusConfigServiceImpl.java @@ -75,9 +75,10 @@ public List getConfigList(Page page, String keywords, String deptid, + String areaId, Long deviceType, DataScope dataScope) { - List> result = this.baseMapper.getConfigList(page, keywords, deptid, + List> result = this.baseMapper.getConfigList(page, keywords, deptid, "", BusConfigDTO.sensorHashMap.get(deviceType.intValue()), dataScope); List busConfigDTOList = new ArrayList<>(); for (Map objectMap : result) { diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusDigConfigServiceImpl.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusDigConfigServiceImpl.java index acca7f9..8c8c592 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusDigConfigServiceImpl.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusDigConfigServiceImpl.java @@ -73,9 +73,10 @@ public List getConfigList(Page page, String keywords, String deptid, + String areaId, Long deviceType, DataScope dataScope) { - List> result = this.baseMapper.getConfigList(page, keywords, deptid, + List> result = this.baseMapper.getConfigList(page, keywords, deptid, "", BusConfigDTO.sensorHashMap.get(deviceType.intValue()), dataScope); List busConfigDTOList = new ArrayList<>(); for (Map objectMap : result) { diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusGasLiquidConfigServiceImpl.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusGasLiquidConfigServiceImpl.java index 528e0cf..62cd290 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusGasLiquidConfigServiceImpl.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusGasLiquidConfigServiceImpl.java @@ -73,9 +73,10 @@ public List getConfigList(Page page, String keywords, String deptid, + String areaId, Long deviceType, DataScope dataScope) { - List> result = this.baseMapper.getConfigList(page, keywords, deptid, + List> result = this.baseMapper.getConfigList(page, keywords, deptid, "", BusConfigDTO.sensorHashMap.get(deviceType.intValue()), dataScope); List busConfigDTOList = new ArrayList<>(); for (Map objectMap : result) { diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusMethaneConfigServiceImpl.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusMethaneConfigServiceImpl.java index 194f897..527cc5b 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusMethaneConfigServiceImpl.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusMethaneConfigServiceImpl.java @@ -73,9 +73,10 @@ public List getConfigList(Page page, String keywords, String deptid, + String areaId, Long deviceType, DataScope dataScope) { - List> result = this.baseMapper.getConfigList(page, keywords, deptid, + List> result = this.baseMapper.getConfigList(page, keywords, deptid, "", BusConfigDTO.sensorHashMap.get(deviceType.intValue()), dataScope); List busConfigDTOList = new ArrayList<>(); for (Map objectMap : result) { diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/BusConfigController.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/BusConfigController.java index 122ebba..e50680b 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/BusConfigController.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/BusConfigController.java @@ -81,7 +81,7 @@ Page page = new PageFactory().defaultPage();//page使用 DataScope dataScope = service.getCurrUserDataScope(); List busConfigDTOList = busConfigService.getConfigList(page, keywords, - deptid, Long.valueOf(DeviceTypeEnum.Liquid.getIndex()), dataScope); + deptid, "", Long.valueOf(DeviceTypeEnum.Liquid.getIndex()), dataScope); page.setRecords(busConfigDTOList); successResult.setData(super.packForBT(page)); successResult.setMessage("success"); @@ -105,7 +105,7 @@ Page page = new PageFactory().defaultPage();//page使用 DataScope dataScope = service.getCurrUserDataScope(); List busConfigDTOList = busWasteGasConfigService.getConfigList(page, keywords, - deptid, Long.valueOf(DeviceTypeEnum.WasteGas.getIndex()), dataScope); + deptid, "", Long.valueOf(DeviceTypeEnum.WasteGas.getIndex()), dataScope); page.setRecords(busConfigDTOList); successResult.setData(super.packForBT(page)); successResult.setMessage("success"); @@ -129,7 +129,7 @@ Page page = new PageFactory().defaultPage();//page使用 DataScope dataScope = service.getCurrUserDataScope(); List busConfigDTOList = busMethaneConfigService.getConfigList(page, keywords, - deptid, Long.valueOf(DeviceTypeEnum.Methane.getIndex()), dataScope); + deptid, "", Long.valueOf(DeviceTypeEnum.Methane.getIndex()), dataScope); page.setRecords(busConfigDTOList); successResult.setData(super.packForBT(page)); successResult.setMessage("success"); @@ -154,7 +154,7 @@ Page page = new PageFactory().defaultPage();//page使用 DataScope dataScope = service.getCurrUserDataScope(); List busConfigDTOList = busTubeConfigService.getConfigList(page, keywords, - deptid, Long.valueOf(DeviceTypeEnum.Tube.getIndex()), dataScope); + deptid, "", Long.valueOf(DeviceTypeEnum.Tube.getIndex()), dataScope); page.setRecords(busConfigDTOList); successResult.setData(super.packForBT(page)); successResult.setMessage("success"); @@ -178,7 +178,7 @@ Page page = new PageFactory().defaultPage();//page使用 DataScope dataScope = service.getCurrUserDataScope(); List busConfigDTOList = busTempHumiConfigService.getConfigList(page, keywords, - deptid, Long.valueOf(DeviceTypeEnum.TempHumi.getIndex()), dataScope); + deptid, "", Long.valueOf(DeviceTypeEnum.TempHumi.getIndex()), dataScope); page.setRecords(busConfigDTOList); successResult.setData(super.packForBT(page)); successResult.setMessage("success"); @@ -202,7 +202,7 @@ Page page = new PageFactory().defaultPage();//page使用 DataScope dataScope = service.getCurrUserDataScope(); List busConfigDTOList = busDigConfigService.getConfigList(page, keywords, - deptid, Long.valueOf(DeviceTypeEnum.Dig.getIndex()), dataScope); + deptid, "", Long.valueOf(DeviceTypeEnum.Dig.getIndex()), dataScope); page.setRecords(busConfigDTOList); successResult.setData(super.packForBT(page)); successResult.setMessage("success"); @@ -220,13 +220,41 @@ @RequestMapping(value = "/noiseConfig/list") @ResponseBody public Object noiseConfigList(@RequestParam(required = false) String keywords, - @RequestParam(required = false) String deptid) { + @RequestParam(required = false) String deptid, + @RequestParam(required = false) String areaId) { SuccessResponseData successResult = new SuccessResponseData(); try { + areaId += "%"; Page page = new PageFactory().defaultPage();//page使用 DataScope dataScope = service.getCurrUserDataScope(); List busConfigDTOList = busNoiseConfigService.getConfigList(page, keywords, - deptid, Long.valueOf(DeviceTypeEnum.Noise.getIndex()), dataScope); + deptid, areaId, Long.valueOf(DeviceTypeEnum.Noise.getIndex()), dataScope); + page.setRecords(busConfigDTOList); + successResult.setData(super.packForBT(page)); + successResult.setMessage("success"); + } catch (Exception e) { + e.printStackTrace(); + successResult.setCode(500); + successResult.setMessage("false"); + } + return successResult; + } + + /** + * 水表获取配置列表 + */ + @RequestMapping(value = "/watchConfig/list") + @ResponseBody + public Object watchConfigList(@RequestParam(required = false) String keywords, + @RequestParam(required = false) String deptid, + @RequestParam(required = false) String areaId) { + SuccessResponseData successResult = new SuccessResponseData(); + try { + areaId += "%"; + Page page = new PageFactory().defaultPage();//page使用 + DataScope dataScope = service.getCurrUserDataScope(); + List busConfigDTOList = busNoiseConfigService.getConfigList(page, keywords, + deptid, areaId, Long.valueOf(DeviceTypeEnum.WaterMeter.getIndex()), dataScope); page.setRecords(busConfigDTOList); successResult.setData(super.packForBT(page)); successResult.setMessage("success"); @@ -521,7 +549,7 @@ page.setSize(Integer.MAX_VALUE); DataScope dataScope = service.getCurrUserDataScope(); List busConfigDTOList = busConfigService.getConfigList(page, keywords, - deptid, Long.valueOf(DeviceTypeEnum.Liquid.getIndex()), dataScope); + deptid, "", Long.valueOf(DeviceTypeEnum.Liquid.getIndex()), dataScope); busConfigService.exp(busConfigDTOList, response); } catch (Exception e) { e.printStackTrace(); @@ -547,7 +575,7 @@ page.setSize(Integer.MAX_VALUE); DataScope dataScope = service.getCurrUserDataScope(); List busConfigDTOList = busWasteGasConfigService.getConfigList(page, keywords, - deptid, Long.valueOf(DeviceTypeEnum.WasteGas.getIndex()), dataScope); + deptid, "", Long.valueOf(DeviceTypeEnum.WasteGas.getIndex()), dataScope); busWasteGasConfigService.exp(busConfigDTOList, response); } catch (Exception e) { e.printStackTrace(); @@ -573,7 +601,7 @@ page.setSize(Integer.MAX_VALUE); DataScope dataScope = service.getCurrUserDataScope(); List busConfigDTOList = busMethaneConfigService.getConfigList(page, keywords, - deptid, Long.valueOf(DeviceTypeEnum.Methane.getIndex()), dataScope); + deptid, "", Long.valueOf(DeviceTypeEnum.Methane.getIndex()), dataScope); busMethaneConfigService.exp(busConfigDTOList, response); } catch (Exception e) { e.printStackTrace(); @@ -599,7 +627,7 @@ page.setSize(Integer.MAX_VALUE); DataScope dataScope = service.getCurrUserDataScope(); List busConfigDTOList = busTempHumiConfigService.getConfigList(page, keywords, - deptid, Long.valueOf(DeviceTypeEnum.TempHumi.getIndex()), dataScope); + deptid, "", Long.valueOf(DeviceTypeEnum.TempHumi.getIndex()), dataScope); busTempHumiConfigService.exp(busConfigDTOList, response); } catch (Exception e) { e.printStackTrace(); @@ -625,7 +653,7 @@ page.setSize(Integer.MAX_VALUE); DataScope dataScope = service.getCurrUserDataScope(); List busConfigDTOList = busDigConfigService.getConfigList(page, keywords, - deptid, Long.valueOf(DeviceTypeEnum.Dig.getIndex()), dataScope); + deptid, "", Long.valueOf(DeviceTypeEnum.Dig.getIndex()), dataScope); busDigConfigService.exp(busConfigDTOList, response); } catch (Exception e) { e.printStackTrace(); @@ -643,6 +671,7 @@ @ResponseBody public void exportNoise(@RequestParam(required = false) String keywords, @RequestParam(required = false) String deptid, + @RequestParam(required = false) String areaId, HttpServletResponse response) { try { Page page = new PageFactory().defaultPage();//page使用 @@ -650,8 +679,9 @@ page.setSearchCount(false); page.setSize(Integer.MAX_VALUE); DataScope dataScope = service.getCurrUserDataScope(); + areaId += "%"; List busConfigDTOList = busNoiseConfigService.getConfigList(page, keywords, - deptid, Long.valueOf(DeviceTypeEnum.Noise.getIndex()), dataScope); + deptid, areaId, Long.valueOf(DeviceTypeEnum.Noise.getIndex()), dataScope); busNoiseConfigService.exp(busConfigDTOList, response); } catch (Exception e) { e.printStackTrace(); @@ -669,7 +699,7 @@ Page page = new PageFactory().defaultPage();//page使用 DataScope dataScope = service.getCurrUserDataScope(); List busConfigDTOList = busGasLiquidConfigService.getConfigList(page, keywords, - deptid, Long.valueOf(DeviceTypeEnum.LG.getIndex()), dataScope); + deptid, "", Long.valueOf(DeviceTypeEnum.LG.getIndex()), dataScope); page.setRecords(busConfigDTOList); successResult.setData(super.packForBT(page)); successResult.setMessage("success"); diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/BusConfigControllerBak.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/BusConfigControllerBak.java index f386d80..d5d8f39 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/BusConfigControllerBak.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/BusConfigControllerBak.java @@ -88,7 +88,7 @@ busConfigServiceHashMap.get(deviceType.intValue()); Page page = new PageFactory().defaultPage();//page使用 DataScope dataScope = service.getCurrUserDataScope(); - List busConfigDTOList = iBusConfigService.getConfigList(page, keywords, deptid,deviceType, dataScope); + List busConfigDTOList = iBusConfigService.getConfigList(page, keywords, deptid, "", deviceType, dataScope); page.setRecords(busConfigDTOList); successResult.setData(super.packForBT(page)); successResult.setMessage("success"); @@ -262,7 +262,7 @@ page.setSearchCount(false); page.setSize(Integer.MAX_VALUE); DataScope dataScope = service.getCurrUserDataScope(); - List busConfigDTOList = iBusConfigService.getConfigList(page, keywords, deptid,deviceType, dataScope); + List busConfigDTOList = iBusConfigService.getConfigList(page, keywords, deptid, "", deviceType, dataScope); iBusConfigService.exp(busConfigDTOList,response); } catch (Exception e) { e.printStackTrace(); diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java index 988f6a3..21ffcec 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java @@ -80,14 +80,15 @@ @ApiOperation("获取设备列表") @RequestMapping(value = "/list") @ResponseBody - public Object list(String keywords, String deviceType, String deptid, String beginTime, String endTime, String isOnline) { + public Object list(String keywords, String deviceType, String deptid, String beginTime, String endTime, String isOnline, String areaId) { Page page = new PageFactory().defaultPage(); //查询数据权限 使用默认DEPTID 字段 DataScope dataScope = permissionService.getCurrUserDataScope(); - List list = deviceService.selectDataScopePage(dataScope, page, deviceType, deptid, beginTime, endTime, keywords, isOnline); + areaId += "%"; + List list = deviceService.selectDataScopePage(dataScope, page, deviceType, deptid, beginTime, endTime, keywords, isOnline, areaId); list.forEach(deviceDto -> { - deviceDto.setBfztName(permissionService.getDictNameByCode(ModularDictConst.BFZT, deviceDto.getBfzt())); deviceDto.setOnlineStateName(permissionService.getDictNameByCode(ModularDictConst.ONLINESTATUS, deviceDto.getOnlineState())); + deviceDto.setAreaFullName(deviceService.getAreaFullNameById(deviceDto.getArea())); }); page.setRecords(list); return new SuccessResponseData(super.packForBT(page)); @@ -199,14 +200,14 @@ @RequestMapping(value = "/batchExport") @Permission @ResponseBody - public void batchExport(HttpServletResponse response, String keywords, String deviceType, String deptid, String beginTime, String endTime, String isOnline) throws IOException { + public void batchExport(HttpServletResponse response, String keywords, String deviceType, String deptid, String beginTime, String endTime, String isOnline, String areaId) throws IOException { Page page = new PageFactory().defaultPage(); page.setCurrent(1); page.setSearchCount(false); page.setSize(Integer.MAX_VALUE); DataScope dataScope = permissionService.getCurrUserDataScope(); - List list = deviceService.selectDataScopePage(dataScope, page, deviceType, deptid, beginTime, endTime, keywords, isOnline); + List list = deviceService.selectDataScopePage(dataScope, page, deviceType, deptid, beginTime, endTime, keywords, isOnline, areaId); list.forEach(deviceDto -> { deviceDto.setBfztName(permissionService.getDictNameByCode(ModularDictConst.BFZT, deviceDto.getBfzt())); deviceDto.setOnlineStateName(permissionService.getDictNameByCode(ModularDictConst.ONLINESTATUS, deviceDto.getOnlineState())); diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/BusConfigMapper.java b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/BusConfigMapper.java index 8e66b48..6dbf4e2 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/BusConfigMapper.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/BusConfigMapper.java @@ -26,9 +26,12 @@ List> getConfigList(@Param("page") Page page, @Param("keywords") String keywords, @Param("deptid") String deptid, + @Param("areaId") String areaId, @Param("sensorid") String sensorid, @Param("dataScope") DataScope dataScope); + String getArea(@Param("id") String id); + String getAreaPId(@Param("id") String id); String getConcenCodeByDevId(@Param("devID") Long devID); String getWellDeepByDevId(@Param("devID") Long devID); diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceMapper.java b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceMapper.java index de7f150..37a59d8 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceMapper.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceMapper.java @@ -20,10 +20,13 @@ */ public interface DeviceMapper extends BaseMapper { - List selectDataScopePage(@Param("scope") DataScope dataScope, @Param("page") Page page, @Param("deviceType") String deviceType, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords,@Param("isOnline") String isOnline); + List selectDataScopePage(@Param("scope") DataScope dataScope, @Param("page") Page page, @Param("deviceType") String deviceType, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords,@Param("isOnline") String isOnline, @Param("areaId") String areaId); DeviceWellDto selectWellIdByCode(@Param("wellCode") String wellCode); + String getArea(@Param("id") String id); + String getAreaPId(@Param("id") String id); + DeviceConcentratorDto selectDeviceConcentorByCode(@Param("concenCode") String concenCode); List selectWellDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords); diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusConfigMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusConfigMapper.xml index 92d6c14..d85a9cd 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusConfigMapper.xml +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusConfigMapper.xml @@ -67,6 +67,9 @@ and s.ID = + + and a.AREA like #{areaId} + ORDER by writetime DESC @@ -104,5 +107,19 @@ limit 1 + + + + diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml index 3de0ee0..96c6a71 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml @@ -15,7 +15,7 @@ - ID,DEVCODE,DEVICENAME,DEVICETYPE,DEVICETYPENAME,WATCHTYPE,COMMUNICATION,MODELID,MODELNAME,DEPTID,DEPTNAME,WELLCODE,POSITION,CONCENID,CONCENCODE,ONLINESTATE,VALID,TS,BFZT,wellId, + ID,DEVCODE,DEVICENAME,DEVICETYPE,DEVICETYPENAME,WATCHTYPE,COMMUNICATION,MODELID,MODELNAME,DEPTID,DEPTNAME,WELLCODE,POSITION,CONCENID,CONCENCODE,ONLINESTATE,VALID,TS,BFZT,AREA,wellId, as INSTALLDATE @@ -37,6 +37,20 @@ SELECT id,CONCENCODE FROM bus_concentrator WHERE VALID = '1' AND CONCENCODE = #{concenCode} + + + + diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dto/DeviceDto.java b/casic-device/src/main/java/com/casic/missiles/modular/system/dto/DeviceDto.java index 64050e7..4ca24bc 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/dto/DeviceDto.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dto/DeviceDto.java @@ -59,6 +59,8 @@ private String bfzt; private String bfztName; private String wellId; + private String area; + private String areaFullName; @Override protected Serializable pkVal() { diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/IBusConfigService.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/IBusConfigService.java index 032af19..c6c2efa 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/IBusConfigService.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/IBusConfigService.java @@ -24,6 +24,7 @@ List getConfigList(Page page, String keywords, String deptid, + String areaId, Long deviceType, DataScope dataScope); String getConcenCodeByDevId(Long devID); diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/IDeviceService.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/IDeviceService.java index 5374e8a..6b84904 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/IDeviceService.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/IDeviceService.java @@ -30,7 +30,7 @@ * @param endTime 设备安装结束时间 * @return 设备列表 */ - List selectDataScopePage(DataScope dataScope, Page page, String deviceType, String deptid, String beginTime, String endTime, String keywords,String isOnline); + List selectDataScopePage(DataScope dataScope, Page page, String deviceType, String deptid, String beginTime, String endTime, String keywords,String isOnline, String areaId); /** * 根据闸井编号查询闸井ID @@ -137,6 +137,8 @@ void registerGeTui(Long id, String clientid); + String getAreaFullNameById(String area); + List> selectDataList(DataScope dataScope, String wellCode, String watchType, String beginTime, String endTime); /** diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusConfigServiceImpl.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusConfigServiceImpl.java index 364829c..d7e38aa 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusConfigServiceImpl.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusConfigServiceImpl.java @@ -75,9 +75,10 @@ public List getConfigList(Page page, String keywords, String deptid, + String areaId, Long deviceType, DataScope dataScope) { - List> result = this.baseMapper.getConfigList(page, keywords, deptid, + List> result = this.baseMapper.getConfigList(page, keywords, deptid, "", BusConfigDTO.sensorHashMap.get(deviceType.intValue()), dataScope); List busConfigDTOList = new ArrayList<>(); for (Map objectMap : result) { diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusDigConfigServiceImpl.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusDigConfigServiceImpl.java index acca7f9..8c8c592 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusDigConfigServiceImpl.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusDigConfigServiceImpl.java @@ -73,9 +73,10 @@ public List getConfigList(Page page, String keywords, String deptid, + String areaId, Long deviceType, DataScope dataScope) { - List> result = this.baseMapper.getConfigList(page, keywords, deptid, + List> result = this.baseMapper.getConfigList(page, keywords, deptid, "", BusConfigDTO.sensorHashMap.get(deviceType.intValue()), dataScope); List busConfigDTOList = new ArrayList<>(); for (Map objectMap : result) { diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusGasLiquidConfigServiceImpl.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusGasLiquidConfigServiceImpl.java index 528e0cf..62cd290 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusGasLiquidConfigServiceImpl.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusGasLiquidConfigServiceImpl.java @@ -73,9 +73,10 @@ public List getConfigList(Page page, String keywords, String deptid, + String areaId, Long deviceType, DataScope dataScope) { - List> result = this.baseMapper.getConfigList(page, keywords, deptid, + List> result = this.baseMapper.getConfigList(page, keywords, deptid, "", BusConfigDTO.sensorHashMap.get(deviceType.intValue()), dataScope); List busConfigDTOList = new ArrayList<>(); for (Map objectMap : result) { diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusMethaneConfigServiceImpl.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusMethaneConfigServiceImpl.java index 194f897..527cc5b 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusMethaneConfigServiceImpl.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusMethaneConfigServiceImpl.java @@ -73,9 +73,10 @@ public List getConfigList(Page page, String keywords, String deptid, + String areaId, Long deviceType, DataScope dataScope) { - List> result = this.baseMapper.getConfigList(page, keywords, deptid, + List> result = this.baseMapper.getConfigList(page, keywords, deptid, "", BusConfigDTO.sensorHashMap.get(deviceType.intValue()), dataScope); List busConfigDTOList = new ArrayList<>(); for (Map objectMap : result) { diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusNoiseConfigServiceImpl.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusNoiseConfigServiceImpl.java index 303d665..dd7e94b 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusNoiseConfigServiceImpl.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusNoiseConfigServiceImpl.java @@ -73,9 +73,10 @@ public List getConfigList(Page page, String keywords, String deptid, + String areaId, Long deviceType, DataScope dataScope) { - List> result = this.baseMapper.getConfigList(page, keywords, deptid, + List> result = this.baseMapper.getConfigList(page, keywords, deptid, areaId, BusConfigDTO.sensorHashMap.get(deviceType.intValue()), dataScope); List busConfigDTOList = new ArrayList<>(); for (Map objectMap : result) { diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/BusConfigController.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/BusConfigController.java index 122ebba..e50680b 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/BusConfigController.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/BusConfigController.java @@ -81,7 +81,7 @@ Page page = new PageFactory().defaultPage();//page使用 DataScope dataScope = service.getCurrUserDataScope(); List busConfigDTOList = busConfigService.getConfigList(page, keywords, - deptid, Long.valueOf(DeviceTypeEnum.Liquid.getIndex()), dataScope); + deptid, "", Long.valueOf(DeviceTypeEnum.Liquid.getIndex()), dataScope); page.setRecords(busConfigDTOList); successResult.setData(super.packForBT(page)); successResult.setMessage("success"); @@ -105,7 +105,7 @@ Page page = new PageFactory().defaultPage();//page使用 DataScope dataScope = service.getCurrUserDataScope(); List busConfigDTOList = busWasteGasConfigService.getConfigList(page, keywords, - deptid, Long.valueOf(DeviceTypeEnum.WasteGas.getIndex()), dataScope); + deptid, "", Long.valueOf(DeviceTypeEnum.WasteGas.getIndex()), dataScope); page.setRecords(busConfigDTOList); successResult.setData(super.packForBT(page)); successResult.setMessage("success"); @@ -129,7 +129,7 @@ Page page = new PageFactory().defaultPage();//page使用 DataScope dataScope = service.getCurrUserDataScope(); List busConfigDTOList = busMethaneConfigService.getConfigList(page, keywords, - deptid, Long.valueOf(DeviceTypeEnum.Methane.getIndex()), dataScope); + deptid, "", Long.valueOf(DeviceTypeEnum.Methane.getIndex()), dataScope); page.setRecords(busConfigDTOList); successResult.setData(super.packForBT(page)); successResult.setMessage("success"); @@ -154,7 +154,7 @@ Page page = new PageFactory().defaultPage();//page使用 DataScope dataScope = service.getCurrUserDataScope(); List busConfigDTOList = busTubeConfigService.getConfigList(page, keywords, - deptid, Long.valueOf(DeviceTypeEnum.Tube.getIndex()), dataScope); + deptid, "", Long.valueOf(DeviceTypeEnum.Tube.getIndex()), dataScope); page.setRecords(busConfigDTOList); successResult.setData(super.packForBT(page)); successResult.setMessage("success"); @@ -178,7 +178,7 @@ Page page = new PageFactory().defaultPage();//page使用 DataScope dataScope = service.getCurrUserDataScope(); List busConfigDTOList = busTempHumiConfigService.getConfigList(page, keywords, - deptid, Long.valueOf(DeviceTypeEnum.TempHumi.getIndex()), dataScope); + deptid, "", Long.valueOf(DeviceTypeEnum.TempHumi.getIndex()), dataScope); page.setRecords(busConfigDTOList); successResult.setData(super.packForBT(page)); successResult.setMessage("success"); @@ -202,7 +202,7 @@ Page page = new PageFactory().defaultPage();//page使用 DataScope dataScope = service.getCurrUserDataScope(); List busConfigDTOList = busDigConfigService.getConfigList(page, keywords, - deptid, Long.valueOf(DeviceTypeEnum.Dig.getIndex()), dataScope); + deptid, "", Long.valueOf(DeviceTypeEnum.Dig.getIndex()), dataScope); page.setRecords(busConfigDTOList); successResult.setData(super.packForBT(page)); successResult.setMessage("success"); @@ -220,13 +220,41 @@ @RequestMapping(value = "/noiseConfig/list") @ResponseBody public Object noiseConfigList(@RequestParam(required = false) String keywords, - @RequestParam(required = false) String deptid) { + @RequestParam(required = false) String deptid, + @RequestParam(required = false) String areaId) { SuccessResponseData successResult = new SuccessResponseData(); try { + areaId += "%"; Page page = new PageFactory().defaultPage();//page使用 DataScope dataScope = service.getCurrUserDataScope(); List busConfigDTOList = busNoiseConfigService.getConfigList(page, keywords, - deptid, Long.valueOf(DeviceTypeEnum.Noise.getIndex()), dataScope); + deptid, areaId, Long.valueOf(DeviceTypeEnum.Noise.getIndex()), dataScope); + page.setRecords(busConfigDTOList); + successResult.setData(super.packForBT(page)); + successResult.setMessage("success"); + } catch (Exception e) { + e.printStackTrace(); + successResult.setCode(500); + successResult.setMessage("false"); + } + return successResult; + } + + /** + * 水表获取配置列表 + */ + @RequestMapping(value = "/watchConfig/list") + @ResponseBody + public Object watchConfigList(@RequestParam(required = false) String keywords, + @RequestParam(required = false) String deptid, + @RequestParam(required = false) String areaId) { + SuccessResponseData successResult = new SuccessResponseData(); + try { + areaId += "%"; + Page page = new PageFactory().defaultPage();//page使用 + DataScope dataScope = service.getCurrUserDataScope(); + List busConfigDTOList = busNoiseConfigService.getConfigList(page, keywords, + deptid, areaId, Long.valueOf(DeviceTypeEnum.WaterMeter.getIndex()), dataScope); page.setRecords(busConfigDTOList); successResult.setData(super.packForBT(page)); successResult.setMessage("success"); @@ -521,7 +549,7 @@ page.setSize(Integer.MAX_VALUE); DataScope dataScope = service.getCurrUserDataScope(); List busConfigDTOList = busConfigService.getConfigList(page, keywords, - deptid, Long.valueOf(DeviceTypeEnum.Liquid.getIndex()), dataScope); + deptid, "", Long.valueOf(DeviceTypeEnum.Liquid.getIndex()), dataScope); busConfigService.exp(busConfigDTOList, response); } catch (Exception e) { e.printStackTrace(); @@ -547,7 +575,7 @@ page.setSize(Integer.MAX_VALUE); DataScope dataScope = service.getCurrUserDataScope(); List busConfigDTOList = busWasteGasConfigService.getConfigList(page, keywords, - deptid, Long.valueOf(DeviceTypeEnum.WasteGas.getIndex()), dataScope); + deptid, "", Long.valueOf(DeviceTypeEnum.WasteGas.getIndex()), dataScope); busWasteGasConfigService.exp(busConfigDTOList, response); } catch (Exception e) { e.printStackTrace(); @@ -573,7 +601,7 @@ page.setSize(Integer.MAX_VALUE); DataScope dataScope = service.getCurrUserDataScope(); List busConfigDTOList = busMethaneConfigService.getConfigList(page, keywords, - deptid, Long.valueOf(DeviceTypeEnum.Methane.getIndex()), dataScope); + deptid, "", Long.valueOf(DeviceTypeEnum.Methane.getIndex()), dataScope); busMethaneConfigService.exp(busConfigDTOList, response); } catch (Exception e) { e.printStackTrace(); @@ -599,7 +627,7 @@ page.setSize(Integer.MAX_VALUE); DataScope dataScope = service.getCurrUserDataScope(); List busConfigDTOList = busTempHumiConfigService.getConfigList(page, keywords, - deptid, Long.valueOf(DeviceTypeEnum.TempHumi.getIndex()), dataScope); + deptid, "", Long.valueOf(DeviceTypeEnum.TempHumi.getIndex()), dataScope); busTempHumiConfigService.exp(busConfigDTOList, response); } catch (Exception e) { e.printStackTrace(); @@ -625,7 +653,7 @@ page.setSize(Integer.MAX_VALUE); DataScope dataScope = service.getCurrUserDataScope(); List busConfigDTOList = busDigConfigService.getConfigList(page, keywords, - deptid, Long.valueOf(DeviceTypeEnum.Dig.getIndex()), dataScope); + deptid, "", Long.valueOf(DeviceTypeEnum.Dig.getIndex()), dataScope); busDigConfigService.exp(busConfigDTOList, response); } catch (Exception e) { e.printStackTrace(); @@ -643,6 +671,7 @@ @ResponseBody public void exportNoise(@RequestParam(required = false) String keywords, @RequestParam(required = false) String deptid, + @RequestParam(required = false) String areaId, HttpServletResponse response) { try { Page page = new PageFactory().defaultPage();//page使用 @@ -650,8 +679,9 @@ page.setSearchCount(false); page.setSize(Integer.MAX_VALUE); DataScope dataScope = service.getCurrUserDataScope(); + areaId += "%"; List busConfigDTOList = busNoiseConfigService.getConfigList(page, keywords, - deptid, Long.valueOf(DeviceTypeEnum.Noise.getIndex()), dataScope); + deptid, areaId, Long.valueOf(DeviceTypeEnum.Noise.getIndex()), dataScope); busNoiseConfigService.exp(busConfigDTOList, response); } catch (Exception e) { e.printStackTrace(); @@ -669,7 +699,7 @@ Page page = new PageFactory().defaultPage();//page使用 DataScope dataScope = service.getCurrUserDataScope(); List busConfigDTOList = busGasLiquidConfigService.getConfigList(page, keywords, - deptid, Long.valueOf(DeviceTypeEnum.LG.getIndex()), dataScope); + deptid, "", Long.valueOf(DeviceTypeEnum.LG.getIndex()), dataScope); page.setRecords(busConfigDTOList); successResult.setData(super.packForBT(page)); successResult.setMessage("success"); diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/BusConfigControllerBak.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/BusConfigControllerBak.java index f386d80..d5d8f39 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/BusConfigControllerBak.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/BusConfigControllerBak.java @@ -88,7 +88,7 @@ busConfigServiceHashMap.get(deviceType.intValue()); Page page = new PageFactory().defaultPage();//page使用 DataScope dataScope = service.getCurrUserDataScope(); - List busConfigDTOList = iBusConfigService.getConfigList(page, keywords, deptid,deviceType, dataScope); + List busConfigDTOList = iBusConfigService.getConfigList(page, keywords, deptid, "", deviceType, dataScope); page.setRecords(busConfigDTOList); successResult.setData(super.packForBT(page)); successResult.setMessage("success"); @@ -262,7 +262,7 @@ page.setSearchCount(false); page.setSize(Integer.MAX_VALUE); DataScope dataScope = service.getCurrUserDataScope(); - List busConfigDTOList = iBusConfigService.getConfigList(page, keywords, deptid,deviceType, dataScope); + List busConfigDTOList = iBusConfigService.getConfigList(page, keywords, deptid, "", deviceType, dataScope); iBusConfigService.exp(busConfigDTOList,response); } catch (Exception e) { e.printStackTrace(); diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java index 988f6a3..21ffcec 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java @@ -80,14 +80,15 @@ @ApiOperation("获取设备列表") @RequestMapping(value = "/list") @ResponseBody - public Object list(String keywords, String deviceType, String deptid, String beginTime, String endTime, String isOnline) { + public Object list(String keywords, String deviceType, String deptid, String beginTime, String endTime, String isOnline, String areaId) { Page page = new PageFactory().defaultPage(); //查询数据权限 使用默认DEPTID 字段 DataScope dataScope = permissionService.getCurrUserDataScope(); - List list = deviceService.selectDataScopePage(dataScope, page, deviceType, deptid, beginTime, endTime, keywords, isOnline); + areaId += "%"; + List list = deviceService.selectDataScopePage(dataScope, page, deviceType, deptid, beginTime, endTime, keywords, isOnline, areaId); list.forEach(deviceDto -> { - deviceDto.setBfztName(permissionService.getDictNameByCode(ModularDictConst.BFZT, deviceDto.getBfzt())); deviceDto.setOnlineStateName(permissionService.getDictNameByCode(ModularDictConst.ONLINESTATUS, deviceDto.getOnlineState())); + deviceDto.setAreaFullName(deviceService.getAreaFullNameById(deviceDto.getArea())); }); page.setRecords(list); return new SuccessResponseData(super.packForBT(page)); @@ -199,14 +200,14 @@ @RequestMapping(value = "/batchExport") @Permission @ResponseBody - public void batchExport(HttpServletResponse response, String keywords, String deviceType, String deptid, String beginTime, String endTime, String isOnline) throws IOException { + public void batchExport(HttpServletResponse response, String keywords, String deviceType, String deptid, String beginTime, String endTime, String isOnline, String areaId) throws IOException { Page page = new PageFactory().defaultPage(); page.setCurrent(1); page.setSearchCount(false); page.setSize(Integer.MAX_VALUE); DataScope dataScope = permissionService.getCurrUserDataScope(); - List list = deviceService.selectDataScopePage(dataScope, page, deviceType, deptid, beginTime, endTime, keywords, isOnline); + List list = deviceService.selectDataScopePage(dataScope, page, deviceType, deptid, beginTime, endTime, keywords, isOnline, areaId); list.forEach(deviceDto -> { deviceDto.setBfztName(permissionService.getDictNameByCode(ModularDictConst.BFZT, deviceDto.getBfzt())); deviceDto.setOnlineStateName(permissionService.getDictNameByCode(ModularDictConst.ONLINESTATUS, deviceDto.getOnlineState())); diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/BusConfigMapper.java b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/BusConfigMapper.java index 8e66b48..6dbf4e2 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/BusConfigMapper.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/BusConfigMapper.java @@ -26,9 +26,12 @@ List> getConfigList(@Param("page") Page page, @Param("keywords") String keywords, @Param("deptid") String deptid, + @Param("areaId") String areaId, @Param("sensorid") String sensorid, @Param("dataScope") DataScope dataScope); + String getArea(@Param("id") String id); + String getAreaPId(@Param("id") String id); String getConcenCodeByDevId(@Param("devID") Long devID); String getWellDeepByDevId(@Param("devID") Long devID); diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceMapper.java b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceMapper.java index de7f150..37a59d8 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceMapper.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceMapper.java @@ -20,10 +20,13 @@ */ public interface DeviceMapper extends BaseMapper { - List selectDataScopePage(@Param("scope") DataScope dataScope, @Param("page") Page page, @Param("deviceType") String deviceType, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords,@Param("isOnline") String isOnline); + List selectDataScopePage(@Param("scope") DataScope dataScope, @Param("page") Page page, @Param("deviceType") String deviceType, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords,@Param("isOnline") String isOnline, @Param("areaId") String areaId); DeviceWellDto selectWellIdByCode(@Param("wellCode") String wellCode); + String getArea(@Param("id") String id); + String getAreaPId(@Param("id") String id); + DeviceConcentratorDto selectDeviceConcentorByCode(@Param("concenCode") String concenCode); List selectWellDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords); diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusConfigMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusConfigMapper.xml index 92d6c14..d85a9cd 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusConfigMapper.xml +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusConfigMapper.xml @@ -67,6 +67,9 @@ and s.ID = + + and a.AREA like #{areaId} + ORDER by writetime DESC @@ -104,5 +107,19 @@ limit 1 + + + + diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml index 3de0ee0..96c6a71 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml @@ -15,7 +15,7 @@ - ID,DEVCODE,DEVICENAME,DEVICETYPE,DEVICETYPENAME,WATCHTYPE,COMMUNICATION,MODELID,MODELNAME,DEPTID,DEPTNAME,WELLCODE,POSITION,CONCENID,CONCENCODE,ONLINESTATE,VALID,TS,BFZT,wellId, + ID,DEVCODE,DEVICENAME,DEVICETYPE,DEVICETYPENAME,WATCHTYPE,COMMUNICATION,MODELID,MODELNAME,DEPTID,DEPTNAME,WELLCODE,POSITION,CONCENID,CONCENCODE,ONLINESTATE,VALID,TS,BFZT,AREA,wellId, as INSTALLDATE @@ -37,6 +37,20 @@ SELECT id,CONCENCODE FROM bus_concentrator WHERE VALID = '1' AND CONCENCODE = #{concenCode} + + + + diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dto/DeviceDto.java b/casic-device/src/main/java/com/casic/missiles/modular/system/dto/DeviceDto.java index 64050e7..4ca24bc 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/dto/DeviceDto.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dto/DeviceDto.java @@ -59,6 +59,8 @@ private String bfzt; private String bfztName; private String wellId; + private String area; + private String areaFullName; @Override protected Serializable pkVal() { diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/IBusConfigService.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/IBusConfigService.java index 032af19..c6c2efa 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/IBusConfigService.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/IBusConfigService.java @@ -24,6 +24,7 @@ List getConfigList(Page page, String keywords, String deptid, + String areaId, Long deviceType, DataScope dataScope); String getConcenCodeByDevId(Long devID); diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/IDeviceService.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/IDeviceService.java index 5374e8a..6b84904 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/IDeviceService.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/IDeviceService.java @@ -30,7 +30,7 @@ * @param endTime 设备安装结束时间 * @return 设备列表 */ - List selectDataScopePage(DataScope dataScope, Page page, String deviceType, String deptid, String beginTime, String endTime, String keywords,String isOnline); + List selectDataScopePage(DataScope dataScope, Page page, String deviceType, String deptid, String beginTime, String endTime, String keywords,String isOnline, String areaId); /** * 根据闸井编号查询闸井ID @@ -137,6 +137,8 @@ void registerGeTui(Long id, String clientid); + String getAreaFullNameById(String area); + List> selectDataList(DataScope dataScope, String wellCode, String watchType, String beginTime, String endTime); /** diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusConfigServiceImpl.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusConfigServiceImpl.java index 364829c..d7e38aa 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusConfigServiceImpl.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusConfigServiceImpl.java @@ -75,9 +75,10 @@ public List getConfigList(Page page, String keywords, String deptid, + String areaId, Long deviceType, DataScope dataScope) { - List> result = this.baseMapper.getConfigList(page, keywords, deptid, + List> result = this.baseMapper.getConfigList(page, keywords, deptid, "", BusConfigDTO.sensorHashMap.get(deviceType.intValue()), dataScope); List busConfigDTOList = new ArrayList<>(); for (Map objectMap : result) { diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusDigConfigServiceImpl.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusDigConfigServiceImpl.java index acca7f9..8c8c592 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusDigConfigServiceImpl.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusDigConfigServiceImpl.java @@ -73,9 +73,10 @@ public List getConfigList(Page page, String keywords, String deptid, + String areaId, Long deviceType, DataScope dataScope) { - List> result = this.baseMapper.getConfigList(page, keywords, deptid, + List> result = this.baseMapper.getConfigList(page, keywords, deptid, "", BusConfigDTO.sensorHashMap.get(deviceType.intValue()), dataScope); List busConfigDTOList = new ArrayList<>(); for (Map objectMap : result) { diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusGasLiquidConfigServiceImpl.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusGasLiquidConfigServiceImpl.java index 528e0cf..62cd290 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusGasLiquidConfigServiceImpl.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusGasLiquidConfigServiceImpl.java @@ -73,9 +73,10 @@ public List getConfigList(Page page, String keywords, String deptid, + String areaId, Long deviceType, DataScope dataScope) { - List> result = this.baseMapper.getConfigList(page, keywords, deptid, + List> result = this.baseMapper.getConfigList(page, keywords, deptid, "", BusConfigDTO.sensorHashMap.get(deviceType.intValue()), dataScope); List busConfigDTOList = new ArrayList<>(); for (Map objectMap : result) { diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusMethaneConfigServiceImpl.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusMethaneConfigServiceImpl.java index 194f897..527cc5b 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusMethaneConfigServiceImpl.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusMethaneConfigServiceImpl.java @@ -73,9 +73,10 @@ public List getConfigList(Page page, String keywords, String deptid, + String areaId, Long deviceType, DataScope dataScope) { - List> result = this.baseMapper.getConfigList(page, keywords, deptid, + List> result = this.baseMapper.getConfigList(page, keywords, deptid, "", BusConfigDTO.sensorHashMap.get(deviceType.intValue()), dataScope); List busConfigDTOList = new ArrayList<>(); for (Map objectMap : result) { diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusNoiseConfigServiceImpl.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusNoiseConfigServiceImpl.java index 303d665..dd7e94b 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusNoiseConfigServiceImpl.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusNoiseConfigServiceImpl.java @@ -73,9 +73,10 @@ public List getConfigList(Page page, String keywords, String deptid, + String areaId, Long deviceType, DataScope dataScope) { - List> result = this.baseMapper.getConfigList(page, keywords, deptid, + List> result = this.baseMapper.getConfigList(page, keywords, deptid, areaId, BusConfigDTO.sensorHashMap.get(deviceType.intValue()), dataScope); List busConfigDTOList = new ArrayList<>(); for (Map objectMap : result) { diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusTempHumiConfigServiceImpl.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusTempHumiConfigServiceImpl.java index 57e4801..63c46c7 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusTempHumiConfigServiceImpl.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusTempHumiConfigServiceImpl.java @@ -73,9 +73,10 @@ public List getConfigList(Page page, String keywords, String deptid, + String areaId, Long deviceType, DataScope dataScope) { - List> result = this.baseMapper.getConfigList(page, keywords, deptid, + List> result = this.baseMapper.getConfigList(page, keywords, deptid, "", BusConfigDTO.sensorHashMap.get(deviceType.intValue()), dataScope); List busConfigDTOList = new ArrayList<>(); for (Map objectMap : result) { diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/BusConfigController.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/BusConfigController.java index 122ebba..e50680b 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/BusConfigController.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/BusConfigController.java @@ -81,7 +81,7 @@ Page page = new PageFactory().defaultPage();//page使用 DataScope dataScope = service.getCurrUserDataScope(); List busConfigDTOList = busConfigService.getConfigList(page, keywords, - deptid, Long.valueOf(DeviceTypeEnum.Liquid.getIndex()), dataScope); + deptid, "", Long.valueOf(DeviceTypeEnum.Liquid.getIndex()), dataScope); page.setRecords(busConfigDTOList); successResult.setData(super.packForBT(page)); successResult.setMessage("success"); @@ -105,7 +105,7 @@ Page page = new PageFactory().defaultPage();//page使用 DataScope dataScope = service.getCurrUserDataScope(); List busConfigDTOList = busWasteGasConfigService.getConfigList(page, keywords, - deptid, Long.valueOf(DeviceTypeEnum.WasteGas.getIndex()), dataScope); + deptid, "", Long.valueOf(DeviceTypeEnum.WasteGas.getIndex()), dataScope); page.setRecords(busConfigDTOList); successResult.setData(super.packForBT(page)); successResult.setMessage("success"); @@ -129,7 +129,7 @@ Page page = new PageFactory().defaultPage();//page使用 DataScope dataScope = service.getCurrUserDataScope(); List busConfigDTOList = busMethaneConfigService.getConfigList(page, keywords, - deptid, Long.valueOf(DeviceTypeEnum.Methane.getIndex()), dataScope); + deptid, "", Long.valueOf(DeviceTypeEnum.Methane.getIndex()), dataScope); page.setRecords(busConfigDTOList); successResult.setData(super.packForBT(page)); successResult.setMessage("success"); @@ -154,7 +154,7 @@ Page page = new PageFactory().defaultPage();//page使用 DataScope dataScope = service.getCurrUserDataScope(); List busConfigDTOList = busTubeConfigService.getConfigList(page, keywords, - deptid, Long.valueOf(DeviceTypeEnum.Tube.getIndex()), dataScope); + deptid, "", Long.valueOf(DeviceTypeEnum.Tube.getIndex()), dataScope); page.setRecords(busConfigDTOList); successResult.setData(super.packForBT(page)); successResult.setMessage("success"); @@ -178,7 +178,7 @@ Page page = new PageFactory().defaultPage();//page使用 DataScope dataScope = service.getCurrUserDataScope(); List busConfigDTOList = busTempHumiConfigService.getConfigList(page, keywords, - deptid, Long.valueOf(DeviceTypeEnum.TempHumi.getIndex()), dataScope); + deptid, "", Long.valueOf(DeviceTypeEnum.TempHumi.getIndex()), dataScope); page.setRecords(busConfigDTOList); successResult.setData(super.packForBT(page)); successResult.setMessage("success"); @@ -202,7 +202,7 @@ Page page = new PageFactory().defaultPage();//page使用 DataScope dataScope = service.getCurrUserDataScope(); List busConfigDTOList = busDigConfigService.getConfigList(page, keywords, - deptid, Long.valueOf(DeviceTypeEnum.Dig.getIndex()), dataScope); + deptid, "", Long.valueOf(DeviceTypeEnum.Dig.getIndex()), dataScope); page.setRecords(busConfigDTOList); successResult.setData(super.packForBT(page)); successResult.setMessage("success"); @@ -220,13 +220,41 @@ @RequestMapping(value = "/noiseConfig/list") @ResponseBody public Object noiseConfigList(@RequestParam(required = false) String keywords, - @RequestParam(required = false) String deptid) { + @RequestParam(required = false) String deptid, + @RequestParam(required = false) String areaId) { SuccessResponseData successResult = new SuccessResponseData(); try { + areaId += "%"; Page page = new PageFactory().defaultPage();//page使用 DataScope dataScope = service.getCurrUserDataScope(); List busConfigDTOList = busNoiseConfigService.getConfigList(page, keywords, - deptid, Long.valueOf(DeviceTypeEnum.Noise.getIndex()), dataScope); + deptid, areaId, Long.valueOf(DeviceTypeEnum.Noise.getIndex()), dataScope); + page.setRecords(busConfigDTOList); + successResult.setData(super.packForBT(page)); + successResult.setMessage("success"); + } catch (Exception e) { + e.printStackTrace(); + successResult.setCode(500); + successResult.setMessage("false"); + } + return successResult; + } + + /** + * 水表获取配置列表 + */ + @RequestMapping(value = "/watchConfig/list") + @ResponseBody + public Object watchConfigList(@RequestParam(required = false) String keywords, + @RequestParam(required = false) String deptid, + @RequestParam(required = false) String areaId) { + SuccessResponseData successResult = new SuccessResponseData(); + try { + areaId += "%"; + Page page = new PageFactory().defaultPage();//page使用 + DataScope dataScope = service.getCurrUserDataScope(); + List busConfigDTOList = busNoiseConfigService.getConfigList(page, keywords, + deptid, areaId, Long.valueOf(DeviceTypeEnum.WaterMeter.getIndex()), dataScope); page.setRecords(busConfigDTOList); successResult.setData(super.packForBT(page)); successResult.setMessage("success"); @@ -521,7 +549,7 @@ page.setSize(Integer.MAX_VALUE); DataScope dataScope = service.getCurrUserDataScope(); List busConfigDTOList = busConfigService.getConfigList(page, keywords, - deptid, Long.valueOf(DeviceTypeEnum.Liquid.getIndex()), dataScope); + deptid, "", Long.valueOf(DeviceTypeEnum.Liquid.getIndex()), dataScope); busConfigService.exp(busConfigDTOList, response); } catch (Exception e) { e.printStackTrace(); @@ -547,7 +575,7 @@ page.setSize(Integer.MAX_VALUE); DataScope dataScope = service.getCurrUserDataScope(); List busConfigDTOList = busWasteGasConfigService.getConfigList(page, keywords, - deptid, Long.valueOf(DeviceTypeEnum.WasteGas.getIndex()), dataScope); + deptid, "", Long.valueOf(DeviceTypeEnum.WasteGas.getIndex()), dataScope); busWasteGasConfigService.exp(busConfigDTOList, response); } catch (Exception e) { e.printStackTrace(); @@ -573,7 +601,7 @@ page.setSize(Integer.MAX_VALUE); DataScope dataScope = service.getCurrUserDataScope(); List busConfigDTOList = busMethaneConfigService.getConfigList(page, keywords, - deptid, Long.valueOf(DeviceTypeEnum.Methane.getIndex()), dataScope); + deptid, "", Long.valueOf(DeviceTypeEnum.Methane.getIndex()), dataScope); busMethaneConfigService.exp(busConfigDTOList, response); } catch (Exception e) { e.printStackTrace(); @@ -599,7 +627,7 @@ page.setSize(Integer.MAX_VALUE); DataScope dataScope = service.getCurrUserDataScope(); List busConfigDTOList = busTempHumiConfigService.getConfigList(page, keywords, - deptid, Long.valueOf(DeviceTypeEnum.TempHumi.getIndex()), dataScope); + deptid, "", Long.valueOf(DeviceTypeEnum.TempHumi.getIndex()), dataScope); busTempHumiConfigService.exp(busConfigDTOList, response); } catch (Exception e) { e.printStackTrace(); @@ -625,7 +653,7 @@ page.setSize(Integer.MAX_VALUE); DataScope dataScope = service.getCurrUserDataScope(); List busConfigDTOList = busDigConfigService.getConfigList(page, keywords, - deptid, Long.valueOf(DeviceTypeEnum.Dig.getIndex()), dataScope); + deptid, "", Long.valueOf(DeviceTypeEnum.Dig.getIndex()), dataScope); busDigConfigService.exp(busConfigDTOList, response); } catch (Exception e) { e.printStackTrace(); @@ -643,6 +671,7 @@ @ResponseBody public void exportNoise(@RequestParam(required = false) String keywords, @RequestParam(required = false) String deptid, + @RequestParam(required = false) String areaId, HttpServletResponse response) { try { Page page = new PageFactory().defaultPage();//page使用 @@ -650,8 +679,9 @@ page.setSearchCount(false); page.setSize(Integer.MAX_VALUE); DataScope dataScope = service.getCurrUserDataScope(); + areaId += "%"; List busConfigDTOList = busNoiseConfigService.getConfigList(page, keywords, - deptid, Long.valueOf(DeviceTypeEnum.Noise.getIndex()), dataScope); + deptid, areaId, Long.valueOf(DeviceTypeEnum.Noise.getIndex()), dataScope); busNoiseConfigService.exp(busConfigDTOList, response); } catch (Exception e) { e.printStackTrace(); @@ -669,7 +699,7 @@ Page page = new PageFactory().defaultPage();//page使用 DataScope dataScope = service.getCurrUserDataScope(); List busConfigDTOList = busGasLiquidConfigService.getConfigList(page, keywords, - deptid, Long.valueOf(DeviceTypeEnum.LG.getIndex()), dataScope); + deptid, "", Long.valueOf(DeviceTypeEnum.LG.getIndex()), dataScope); page.setRecords(busConfigDTOList); successResult.setData(super.packForBT(page)); successResult.setMessage("success"); diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/BusConfigControllerBak.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/BusConfigControllerBak.java index f386d80..d5d8f39 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/BusConfigControllerBak.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/BusConfigControllerBak.java @@ -88,7 +88,7 @@ busConfigServiceHashMap.get(deviceType.intValue()); Page page = new PageFactory().defaultPage();//page使用 DataScope dataScope = service.getCurrUserDataScope(); - List busConfigDTOList = iBusConfigService.getConfigList(page, keywords, deptid,deviceType, dataScope); + List busConfigDTOList = iBusConfigService.getConfigList(page, keywords, deptid, "", deviceType, dataScope); page.setRecords(busConfigDTOList); successResult.setData(super.packForBT(page)); successResult.setMessage("success"); @@ -262,7 +262,7 @@ page.setSearchCount(false); page.setSize(Integer.MAX_VALUE); DataScope dataScope = service.getCurrUserDataScope(); - List busConfigDTOList = iBusConfigService.getConfigList(page, keywords, deptid,deviceType, dataScope); + List busConfigDTOList = iBusConfigService.getConfigList(page, keywords, deptid, "", deviceType, dataScope); iBusConfigService.exp(busConfigDTOList,response); } catch (Exception e) { e.printStackTrace(); diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java index 988f6a3..21ffcec 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java @@ -80,14 +80,15 @@ @ApiOperation("获取设备列表") @RequestMapping(value = "/list") @ResponseBody - public Object list(String keywords, String deviceType, String deptid, String beginTime, String endTime, String isOnline) { + public Object list(String keywords, String deviceType, String deptid, String beginTime, String endTime, String isOnline, String areaId) { Page page = new PageFactory().defaultPage(); //查询数据权限 使用默认DEPTID 字段 DataScope dataScope = permissionService.getCurrUserDataScope(); - List list = deviceService.selectDataScopePage(dataScope, page, deviceType, deptid, beginTime, endTime, keywords, isOnline); + areaId += "%"; + List list = deviceService.selectDataScopePage(dataScope, page, deviceType, deptid, beginTime, endTime, keywords, isOnline, areaId); list.forEach(deviceDto -> { - deviceDto.setBfztName(permissionService.getDictNameByCode(ModularDictConst.BFZT, deviceDto.getBfzt())); deviceDto.setOnlineStateName(permissionService.getDictNameByCode(ModularDictConst.ONLINESTATUS, deviceDto.getOnlineState())); + deviceDto.setAreaFullName(deviceService.getAreaFullNameById(deviceDto.getArea())); }); page.setRecords(list); return new SuccessResponseData(super.packForBT(page)); @@ -199,14 +200,14 @@ @RequestMapping(value = "/batchExport") @Permission @ResponseBody - public void batchExport(HttpServletResponse response, String keywords, String deviceType, String deptid, String beginTime, String endTime, String isOnline) throws IOException { + public void batchExport(HttpServletResponse response, String keywords, String deviceType, String deptid, String beginTime, String endTime, String isOnline, String areaId) throws IOException { Page page = new PageFactory().defaultPage(); page.setCurrent(1); page.setSearchCount(false); page.setSize(Integer.MAX_VALUE); DataScope dataScope = permissionService.getCurrUserDataScope(); - List list = deviceService.selectDataScopePage(dataScope, page, deviceType, deptid, beginTime, endTime, keywords, isOnline); + List list = deviceService.selectDataScopePage(dataScope, page, deviceType, deptid, beginTime, endTime, keywords, isOnline, areaId); list.forEach(deviceDto -> { deviceDto.setBfztName(permissionService.getDictNameByCode(ModularDictConst.BFZT, deviceDto.getBfzt())); deviceDto.setOnlineStateName(permissionService.getDictNameByCode(ModularDictConst.ONLINESTATUS, deviceDto.getOnlineState())); diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/BusConfigMapper.java b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/BusConfigMapper.java index 8e66b48..6dbf4e2 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/BusConfigMapper.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/BusConfigMapper.java @@ -26,9 +26,12 @@ List> getConfigList(@Param("page") Page page, @Param("keywords") String keywords, @Param("deptid") String deptid, + @Param("areaId") String areaId, @Param("sensorid") String sensorid, @Param("dataScope") DataScope dataScope); + String getArea(@Param("id") String id); + String getAreaPId(@Param("id") String id); String getConcenCodeByDevId(@Param("devID") Long devID); String getWellDeepByDevId(@Param("devID") Long devID); diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceMapper.java b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceMapper.java index de7f150..37a59d8 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceMapper.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceMapper.java @@ -20,10 +20,13 @@ */ public interface DeviceMapper extends BaseMapper { - List selectDataScopePage(@Param("scope") DataScope dataScope, @Param("page") Page page, @Param("deviceType") String deviceType, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords,@Param("isOnline") String isOnline); + List selectDataScopePage(@Param("scope") DataScope dataScope, @Param("page") Page page, @Param("deviceType") String deviceType, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords,@Param("isOnline") String isOnline, @Param("areaId") String areaId); DeviceWellDto selectWellIdByCode(@Param("wellCode") String wellCode); + String getArea(@Param("id") String id); + String getAreaPId(@Param("id") String id); + DeviceConcentratorDto selectDeviceConcentorByCode(@Param("concenCode") String concenCode); List selectWellDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords); diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusConfigMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusConfigMapper.xml index 92d6c14..d85a9cd 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusConfigMapper.xml +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusConfigMapper.xml @@ -67,6 +67,9 @@ and s.ID = + + and a.AREA like #{areaId} + ORDER by writetime DESC @@ -104,5 +107,19 @@ limit 1 + + + + diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml index 3de0ee0..96c6a71 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml @@ -15,7 +15,7 @@ - ID,DEVCODE,DEVICENAME,DEVICETYPE,DEVICETYPENAME,WATCHTYPE,COMMUNICATION,MODELID,MODELNAME,DEPTID,DEPTNAME,WELLCODE,POSITION,CONCENID,CONCENCODE,ONLINESTATE,VALID,TS,BFZT,wellId, + ID,DEVCODE,DEVICENAME,DEVICETYPE,DEVICETYPENAME,WATCHTYPE,COMMUNICATION,MODELID,MODELNAME,DEPTID,DEPTNAME,WELLCODE,POSITION,CONCENID,CONCENCODE,ONLINESTATE,VALID,TS,BFZT,AREA,wellId, as INSTALLDATE @@ -37,6 +37,20 @@ SELECT id,CONCENCODE FROM bus_concentrator WHERE VALID = '1' AND CONCENCODE = #{concenCode} + + + + diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dto/DeviceDto.java b/casic-device/src/main/java/com/casic/missiles/modular/system/dto/DeviceDto.java index 64050e7..4ca24bc 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/dto/DeviceDto.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dto/DeviceDto.java @@ -59,6 +59,8 @@ private String bfzt; private String bfztName; private String wellId; + private String area; + private String areaFullName; @Override protected Serializable pkVal() { diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/IBusConfigService.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/IBusConfigService.java index 032af19..c6c2efa 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/IBusConfigService.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/IBusConfigService.java @@ -24,6 +24,7 @@ List getConfigList(Page page, String keywords, String deptid, + String areaId, Long deviceType, DataScope dataScope); String getConcenCodeByDevId(Long devID); diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/IDeviceService.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/IDeviceService.java index 5374e8a..6b84904 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/IDeviceService.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/IDeviceService.java @@ -30,7 +30,7 @@ * @param endTime 设备安装结束时间 * @return 设备列表 */ - List selectDataScopePage(DataScope dataScope, Page page, String deviceType, String deptid, String beginTime, String endTime, String keywords,String isOnline); + List selectDataScopePage(DataScope dataScope, Page page, String deviceType, String deptid, String beginTime, String endTime, String keywords,String isOnline, String areaId); /** * 根据闸井编号查询闸井ID @@ -137,6 +137,8 @@ void registerGeTui(Long id, String clientid); + String getAreaFullNameById(String area); + List> selectDataList(DataScope dataScope, String wellCode, String watchType, String beginTime, String endTime); /** diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusConfigServiceImpl.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusConfigServiceImpl.java index 364829c..d7e38aa 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusConfigServiceImpl.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusConfigServiceImpl.java @@ -75,9 +75,10 @@ public List getConfigList(Page page, String keywords, String deptid, + String areaId, Long deviceType, DataScope dataScope) { - List> result = this.baseMapper.getConfigList(page, keywords, deptid, + List> result = this.baseMapper.getConfigList(page, keywords, deptid, "", BusConfigDTO.sensorHashMap.get(deviceType.intValue()), dataScope); List busConfigDTOList = new ArrayList<>(); for (Map objectMap : result) { diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusDigConfigServiceImpl.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusDigConfigServiceImpl.java index acca7f9..8c8c592 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusDigConfigServiceImpl.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusDigConfigServiceImpl.java @@ -73,9 +73,10 @@ public List getConfigList(Page page, String keywords, String deptid, + String areaId, Long deviceType, DataScope dataScope) { - List> result = this.baseMapper.getConfigList(page, keywords, deptid, + List> result = this.baseMapper.getConfigList(page, keywords, deptid, "", BusConfigDTO.sensorHashMap.get(deviceType.intValue()), dataScope); List busConfigDTOList = new ArrayList<>(); for (Map objectMap : result) { diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusGasLiquidConfigServiceImpl.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusGasLiquidConfigServiceImpl.java index 528e0cf..62cd290 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusGasLiquidConfigServiceImpl.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusGasLiquidConfigServiceImpl.java @@ -73,9 +73,10 @@ public List getConfigList(Page page, String keywords, String deptid, + String areaId, Long deviceType, DataScope dataScope) { - List> result = this.baseMapper.getConfigList(page, keywords, deptid, + List> result = this.baseMapper.getConfigList(page, keywords, deptid, "", BusConfigDTO.sensorHashMap.get(deviceType.intValue()), dataScope); List busConfigDTOList = new ArrayList<>(); for (Map objectMap : result) { diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusMethaneConfigServiceImpl.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusMethaneConfigServiceImpl.java index 194f897..527cc5b 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusMethaneConfigServiceImpl.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusMethaneConfigServiceImpl.java @@ -73,9 +73,10 @@ public List getConfigList(Page page, String keywords, String deptid, + String areaId, Long deviceType, DataScope dataScope) { - List> result = this.baseMapper.getConfigList(page, keywords, deptid, + List> result = this.baseMapper.getConfigList(page, keywords, deptid, "", BusConfigDTO.sensorHashMap.get(deviceType.intValue()), dataScope); List busConfigDTOList = new ArrayList<>(); for (Map objectMap : result) { diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusNoiseConfigServiceImpl.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusNoiseConfigServiceImpl.java index 303d665..dd7e94b 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusNoiseConfigServiceImpl.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusNoiseConfigServiceImpl.java @@ -73,9 +73,10 @@ public List getConfigList(Page page, String keywords, String deptid, + String areaId, Long deviceType, DataScope dataScope) { - List> result = this.baseMapper.getConfigList(page, keywords, deptid, + List> result = this.baseMapper.getConfigList(page, keywords, deptid, areaId, BusConfigDTO.sensorHashMap.get(deviceType.intValue()), dataScope); List busConfigDTOList = new ArrayList<>(); for (Map objectMap : result) { diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusTempHumiConfigServiceImpl.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusTempHumiConfigServiceImpl.java index 57e4801..63c46c7 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusTempHumiConfigServiceImpl.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusTempHumiConfigServiceImpl.java @@ -73,9 +73,10 @@ public List getConfigList(Page page, String keywords, String deptid, + String areaId, Long deviceType, DataScope dataScope) { - List> result = this.baseMapper.getConfigList(page, keywords, deptid, + List> result = this.baseMapper.getConfigList(page, keywords, deptid, "", BusConfigDTO.sensorHashMap.get(deviceType.intValue()), dataScope); List busConfigDTOList = new ArrayList<>(); for (Map objectMap : result) { diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusTubeConfigServiceImpl.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusTubeConfigServiceImpl.java index 4396fd3..51dfbe7 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusTubeConfigServiceImpl.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusTubeConfigServiceImpl.java @@ -73,9 +73,10 @@ public List getConfigList(Page page, String keywords, String deptid, + String areaId, Long deviceType, DataScope dataScope) { - List> result = this.baseMapper.getConfigList(page, keywords, deptid, + List> result = this.baseMapper.getConfigList(page, keywords, deptid, "", BusConfigDTO.sensorHashMap.get(deviceType.intValue()), dataScope); List busConfigDTOList = new ArrayList<>(); for (Map objectMap : result) { diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/BusConfigController.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/BusConfigController.java index 122ebba..e50680b 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/BusConfigController.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/BusConfigController.java @@ -81,7 +81,7 @@ Page page = new PageFactory().defaultPage();//page使用 DataScope dataScope = service.getCurrUserDataScope(); List busConfigDTOList = busConfigService.getConfigList(page, keywords, - deptid, Long.valueOf(DeviceTypeEnum.Liquid.getIndex()), dataScope); + deptid, "", Long.valueOf(DeviceTypeEnum.Liquid.getIndex()), dataScope); page.setRecords(busConfigDTOList); successResult.setData(super.packForBT(page)); successResult.setMessage("success"); @@ -105,7 +105,7 @@ Page page = new PageFactory().defaultPage();//page使用 DataScope dataScope = service.getCurrUserDataScope(); List busConfigDTOList = busWasteGasConfigService.getConfigList(page, keywords, - deptid, Long.valueOf(DeviceTypeEnum.WasteGas.getIndex()), dataScope); + deptid, "", Long.valueOf(DeviceTypeEnum.WasteGas.getIndex()), dataScope); page.setRecords(busConfigDTOList); successResult.setData(super.packForBT(page)); successResult.setMessage("success"); @@ -129,7 +129,7 @@ Page page = new PageFactory().defaultPage();//page使用 DataScope dataScope = service.getCurrUserDataScope(); List busConfigDTOList = busMethaneConfigService.getConfigList(page, keywords, - deptid, Long.valueOf(DeviceTypeEnum.Methane.getIndex()), dataScope); + deptid, "", Long.valueOf(DeviceTypeEnum.Methane.getIndex()), dataScope); page.setRecords(busConfigDTOList); successResult.setData(super.packForBT(page)); successResult.setMessage("success"); @@ -154,7 +154,7 @@ Page page = new PageFactory().defaultPage();//page使用 DataScope dataScope = service.getCurrUserDataScope(); List busConfigDTOList = busTubeConfigService.getConfigList(page, keywords, - deptid, Long.valueOf(DeviceTypeEnum.Tube.getIndex()), dataScope); + deptid, "", Long.valueOf(DeviceTypeEnum.Tube.getIndex()), dataScope); page.setRecords(busConfigDTOList); successResult.setData(super.packForBT(page)); successResult.setMessage("success"); @@ -178,7 +178,7 @@ Page page = new PageFactory().defaultPage();//page使用 DataScope dataScope = service.getCurrUserDataScope(); List busConfigDTOList = busTempHumiConfigService.getConfigList(page, keywords, - deptid, Long.valueOf(DeviceTypeEnum.TempHumi.getIndex()), dataScope); + deptid, "", Long.valueOf(DeviceTypeEnum.TempHumi.getIndex()), dataScope); page.setRecords(busConfigDTOList); successResult.setData(super.packForBT(page)); successResult.setMessage("success"); @@ -202,7 +202,7 @@ Page page = new PageFactory().defaultPage();//page使用 DataScope dataScope = service.getCurrUserDataScope(); List busConfigDTOList = busDigConfigService.getConfigList(page, keywords, - deptid, Long.valueOf(DeviceTypeEnum.Dig.getIndex()), dataScope); + deptid, "", Long.valueOf(DeviceTypeEnum.Dig.getIndex()), dataScope); page.setRecords(busConfigDTOList); successResult.setData(super.packForBT(page)); successResult.setMessage("success"); @@ -220,13 +220,41 @@ @RequestMapping(value = "/noiseConfig/list") @ResponseBody public Object noiseConfigList(@RequestParam(required = false) String keywords, - @RequestParam(required = false) String deptid) { + @RequestParam(required = false) String deptid, + @RequestParam(required = false) String areaId) { SuccessResponseData successResult = new SuccessResponseData(); try { + areaId += "%"; Page page = new PageFactory().defaultPage();//page使用 DataScope dataScope = service.getCurrUserDataScope(); List busConfigDTOList = busNoiseConfigService.getConfigList(page, keywords, - deptid, Long.valueOf(DeviceTypeEnum.Noise.getIndex()), dataScope); + deptid, areaId, Long.valueOf(DeviceTypeEnum.Noise.getIndex()), dataScope); + page.setRecords(busConfigDTOList); + successResult.setData(super.packForBT(page)); + successResult.setMessage("success"); + } catch (Exception e) { + e.printStackTrace(); + successResult.setCode(500); + successResult.setMessage("false"); + } + return successResult; + } + + /** + * 水表获取配置列表 + */ + @RequestMapping(value = "/watchConfig/list") + @ResponseBody + public Object watchConfigList(@RequestParam(required = false) String keywords, + @RequestParam(required = false) String deptid, + @RequestParam(required = false) String areaId) { + SuccessResponseData successResult = new SuccessResponseData(); + try { + areaId += "%"; + Page page = new PageFactory().defaultPage();//page使用 + DataScope dataScope = service.getCurrUserDataScope(); + List busConfigDTOList = busNoiseConfigService.getConfigList(page, keywords, + deptid, areaId, Long.valueOf(DeviceTypeEnum.WaterMeter.getIndex()), dataScope); page.setRecords(busConfigDTOList); successResult.setData(super.packForBT(page)); successResult.setMessage("success"); @@ -521,7 +549,7 @@ page.setSize(Integer.MAX_VALUE); DataScope dataScope = service.getCurrUserDataScope(); List busConfigDTOList = busConfigService.getConfigList(page, keywords, - deptid, Long.valueOf(DeviceTypeEnum.Liquid.getIndex()), dataScope); + deptid, "", Long.valueOf(DeviceTypeEnum.Liquid.getIndex()), dataScope); busConfigService.exp(busConfigDTOList, response); } catch (Exception e) { e.printStackTrace(); @@ -547,7 +575,7 @@ page.setSize(Integer.MAX_VALUE); DataScope dataScope = service.getCurrUserDataScope(); List busConfigDTOList = busWasteGasConfigService.getConfigList(page, keywords, - deptid, Long.valueOf(DeviceTypeEnum.WasteGas.getIndex()), dataScope); + deptid, "", Long.valueOf(DeviceTypeEnum.WasteGas.getIndex()), dataScope); busWasteGasConfigService.exp(busConfigDTOList, response); } catch (Exception e) { e.printStackTrace(); @@ -573,7 +601,7 @@ page.setSize(Integer.MAX_VALUE); DataScope dataScope = service.getCurrUserDataScope(); List busConfigDTOList = busMethaneConfigService.getConfigList(page, keywords, - deptid, Long.valueOf(DeviceTypeEnum.Methane.getIndex()), dataScope); + deptid, "", Long.valueOf(DeviceTypeEnum.Methane.getIndex()), dataScope); busMethaneConfigService.exp(busConfigDTOList, response); } catch (Exception e) { e.printStackTrace(); @@ -599,7 +627,7 @@ page.setSize(Integer.MAX_VALUE); DataScope dataScope = service.getCurrUserDataScope(); List busConfigDTOList = busTempHumiConfigService.getConfigList(page, keywords, - deptid, Long.valueOf(DeviceTypeEnum.TempHumi.getIndex()), dataScope); + deptid, "", Long.valueOf(DeviceTypeEnum.TempHumi.getIndex()), dataScope); busTempHumiConfigService.exp(busConfigDTOList, response); } catch (Exception e) { e.printStackTrace(); @@ -625,7 +653,7 @@ page.setSize(Integer.MAX_VALUE); DataScope dataScope = service.getCurrUserDataScope(); List busConfigDTOList = busDigConfigService.getConfigList(page, keywords, - deptid, Long.valueOf(DeviceTypeEnum.Dig.getIndex()), dataScope); + deptid, "", Long.valueOf(DeviceTypeEnum.Dig.getIndex()), dataScope); busDigConfigService.exp(busConfigDTOList, response); } catch (Exception e) { e.printStackTrace(); @@ -643,6 +671,7 @@ @ResponseBody public void exportNoise(@RequestParam(required = false) String keywords, @RequestParam(required = false) String deptid, + @RequestParam(required = false) String areaId, HttpServletResponse response) { try { Page page = new PageFactory().defaultPage();//page使用 @@ -650,8 +679,9 @@ page.setSearchCount(false); page.setSize(Integer.MAX_VALUE); DataScope dataScope = service.getCurrUserDataScope(); + areaId += "%"; List busConfigDTOList = busNoiseConfigService.getConfigList(page, keywords, - deptid, Long.valueOf(DeviceTypeEnum.Noise.getIndex()), dataScope); + deptid, areaId, Long.valueOf(DeviceTypeEnum.Noise.getIndex()), dataScope); busNoiseConfigService.exp(busConfigDTOList, response); } catch (Exception e) { e.printStackTrace(); @@ -669,7 +699,7 @@ Page page = new PageFactory().defaultPage();//page使用 DataScope dataScope = service.getCurrUserDataScope(); List busConfigDTOList = busGasLiquidConfigService.getConfigList(page, keywords, - deptid, Long.valueOf(DeviceTypeEnum.LG.getIndex()), dataScope); + deptid, "", Long.valueOf(DeviceTypeEnum.LG.getIndex()), dataScope); page.setRecords(busConfigDTOList); successResult.setData(super.packForBT(page)); successResult.setMessage("success"); diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/BusConfigControllerBak.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/BusConfigControllerBak.java index f386d80..d5d8f39 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/BusConfigControllerBak.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/BusConfigControllerBak.java @@ -88,7 +88,7 @@ busConfigServiceHashMap.get(deviceType.intValue()); Page page = new PageFactory().defaultPage();//page使用 DataScope dataScope = service.getCurrUserDataScope(); - List busConfigDTOList = iBusConfigService.getConfigList(page, keywords, deptid,deviceType, dataScope); + List busConfigDTOList = iBusConfigService.getConfigList(page, keywords, deptid, "", deviceType, dataScope); page.setRecords(busConfigDTOList); successResult.setData(super.packForBT(page)); successResult.setMessage("success"); @@ -262,7 +262,7 @@ page.setSearchCount(false); page.setSize(Integer.MAX_VALUE); DataScope dataScope = service.getCurrUserDataScope(); - List busConfigDTOList = iBusConfigService.getConfigList(page, keywords, deptid,deviceType, dataScope); + List busConfigDTOList = iBusConfigService.getConfigList(page, keywords, deptid, "", deviceType, dataScope); iBusConfigService.exp(busConfigDTOList,response); } catch (Exception e) { e.printStackTrace(); diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java index 988f6a3..21ffcec 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java @@ -80,14 +80,15 @@ @ApiOperation("获取设备列表") @RequestMapping(value = "/list") @ResponseBody - public Object list(String keywords, String deviceType, String deptid, String beginTime, String endTime, String isOnline) { + public Object list(String keywords, String deviceType, String deptid, String beginTime, String endTime, String isOnline, String areaId) { Page page = new PageFactory().defaultPage(); //查询数据权限 使用默认DEPTID 字段 DataScope dataScope = permissionService.getCurrUserDataScope(); - List list = deviceService.selectDataScopePage(dataScope, page, deviceType, deptid, beginTime, endTime, keywords, isOnline); + areaId += "%"; + List list = deviceService.selectDataScopePage(dataScope, page, deviceType, deptid, beginTime, endTime, keywords, isOnline, areaId); list.forEach(deviceDto -> { - deviceDto.setBfztName(permissionService.getDictNameByCode(ModularDictConst.BFZT, deviceDto.getBfzt())); deviceDto.setOnlineStateName(permissionService.getDictNameByCode(ModularDictConst.ONLINESTATUS, deviceDto.getOnlineState())); + deviceDto.setAreaFullName(deviceService.getAreaFullNameById(deviceDto.getArea())); }); page.setRecords(list); return new SuccessResponseData(super.packForBT(page)); @@ -199,14 +200,14 @@ @RequestMapping(value = "/batchExport") @Permission @ResponseBody - public void batchExport(HttpServletResponse response, String keywords, String deviceType, String deptid, String beginTime, String endTime, String isOnline) throws IOException { + public void batchExport(HttpServletResponse response, String keywords, String deviceType, String deptid, String beginTime, String endTime, String isOnline, String areaId) throws IOException { Page page = new PageFactory().defaultPage(); page.setCurrent(1); page.setSearchCount(false); page.setSize(Integer.MAX_VALUE); DataScope dataScope = permissionService.getCurrUserDataScope(); - List list = deviceService.selectDataScopePage(dataScope, page, deviceType, deptid, beginTime, endTime, keywords, isOnline); + List list = deviceService.selectDataScopePage(dataScope, page, deviceType, deptid, beginTime, endTime, keywords, isOnline, areaId); list.forEach(deviceDto -> { deviceDto.setBfztName(permissionService.getDictNameByCode(ModularDictConst.BFZT, deviceDto.getBfzt())); deviceDto.setOnlineStateName(permissionService.getDictNameByCode(ModularDictConst.ONLINESTATUS, deviceDto.getOnlineState())); diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/BusConfigMapper.java b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/BusConfigMapper.java index 8e66b48..6dbf4e2 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/BusConfigMapper.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/BusConfigMapper.java @@ -26,9 +26,12 @@ List> getConfigList(@Param("page") Page page, @Param("keywords") String keywords, @Param("deptid") String deptid, + @Param("areaId") String areaId, @Param("sensorid") String sensorid, @Param("dataScope") DataScope dataScope); + String getArea(@Param("id") String id); + String getAreaPId(@Param("id") String id); String getConcenCodeByDevId(@Param("devID") Long devID); String getWellDeepByDevId(@Param("devID") Long devID); diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceMapper.java b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceMapper.java index de7f150..37a59d8 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceMapper.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceMapper.java @@ -20,10 +20,13 @@ */ public interface DeviceMapper extends BaseMapper { - List selectDataScopePage(@Param("scope") DataScope dataScope, @Param("page") Page page, @Param("deviceType") String deviceType, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords,@Param("isOnline") String isOnline); + List selectDataScopePage(@Param("scope") DataScope dataScope, @Param("page") Page page, @Param("deviceType") String deviceType, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords,@Param("isOnline") String isOnline, @Param("areaId") String areaId); DeviceWellDto selectWellIdByCode(@Param("wellCode") String wellCode); + String getArea(@Param("id") String id); + String getAreaPId(@Param("id") String id); + DeviceConcentratorDto selectDeviceConcentorByCode(@Param("concenCode") String concenCode); List selectWellDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords); diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusConfigMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusConfigMapper.xml index 92d6c14..d85a9cd 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusConfigMapper.xml +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusConfigMapper.xml @@ -67,6 +67,9 @@ and s.ID = + + and a.AREA like #{areaId} + ORDER by writetime DESC @@ -104,5 +107,19 @@ limit 1 + + + + diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml index 3de0ee0..96c6a71 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml @@ -15,7 +15,7 @@ - ID,DEVCODE,DEVICENAME,DEVICETYPE,DEVICETYPENAME,WATCHTYPE,COMMUNICATION,MODELID,MODELNAME,DEPTID,DEPTNAME,WELLCODE,POSITION,CONCENID,CONCENCODE,ONLINESTATE,VALID,TS,BFZT,wellId, + ID,DEVCODE,DEVICENAME,DEVICETYPE,DEVICETYPENAME,WATCHTYPE,COMMUNICATION,MODELID,MODELNAME,DEPTID,DEPTNAME,WELLCODE,POSITION,CONCENID,CONCENCODE,ONLINESTATE,VALID,TS,BFZT,AREA,wellId, as INSTALLDATE @@ -37,6 +37,20 @@ SELECT id,CONCENCODE FROM bus_concentrator WHERE VALID = '1' AND CONCENCODE = #{concenCode} + + + + diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dto/DeviceDto.java b/casic-device/src/main/java/com/casic/missiles/modular/system/dto/DeviceDto.java index 64050e7..4ca24bc 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/dto/DeviceDto.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dto/DeviceDto.java @@ -59,6 +59,8 @@ private String bfzt; private String bfztName; private String wellId; + private String area; + private String areaFullName; @Override protected Serializable pkVal() { diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/IBusConfigService.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/IBusConfigService.java index 032af19..c6c2efa 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/IBusConfigService.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/IBusConfigService.java @@ -24,6 +24,7 @@ List getConfigList(Page page, String keywords, String deptid, + String areaId, Long deviceType, DataScope dataScope); String getConcenCodeByDevId(Long devID); diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/IDeviceService.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/IDeviceService.java index 5374e8a..6b84904 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/IDeviceService.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/IDeviceService.java @@ -30,7 +30,7 @@ * @param endTime 设备安装结束时间 * @return 设备列表 */ - List selectDataScopePage(DataScope dataScope, Page page, String deviceType, String deptid, String beginTime, String endTime, String keywords,String isOnline); + List selectDataScopePage(DataScope dataScope, Page page, String deviceType, String deptid, String beginTime, String endTime, String keywords,String isOnline, String areaId); /** * 根据闸井编号查询闸井ID @@ -137,6 +137,8 @@ void registerGeTui(Long id, String clientid); + String getAreaFullNameById(String area); + List> selectDataList(DataScope dataScope, String wellCode, String watchType, String beginTime, String endTime); /** diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusConfigServiceImpl.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusConfigServiceImpl.java index 364829c..d7e38aa 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusConfigServiceImpl.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusConfigServiceImpl.java @@ -75,9 +75,10 @@ public List getConfigList(Page page, String keywords, String deptid, + String areaId, Long deviceType, DataScope dataScope) { - List> result = this.baseMapper.getConfigList(page, keywords, deptid, + List> result = this.baseMapper.getConfigList(page, keywords, deptid, "", BusConfigDTO.sensorHashMap.get(deviceType.intValue()), dataScope); List busConfigDTOList = new ArrayList<>(); for (Map objectMap : result) { diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusDigConfigServiceImpl.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusDigConfigServiceImpl.java index acca7f9..8c8c592 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusDigConfigServiceImpl.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusDigConfigServiceImpl.java @@ -73,9 +73,10 @@ public List getConfigList(Page page, String keywords, String deptid, + String areaId, Long deviceType, DataScope dataScope) { - List> result = this.baseMapper.getConfigList(page, keywords, deptid, + List> result = this.baseMapper.getConfigList(page, keywords, deptid, "", BusConfigDTO.sensorHashMap.get(deviceType.intValue()), dataScope); List busConfigDTOList = new ArrayList<>(); for (Map objectMap : result) { diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusGasLiquidConfigServiceImpl.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusGasLiquidConfigServiceImpl.java index 528e0cf..62cd290 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusGasLiquidConfigServiceImpl.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusGasLiquidConfigServiceImpl.java @@ -73,9 +73,10 @@ public List getConfigList(Page page, String keywords, String deptid, + String areaId, Long deviceType, DataScope dataScope) { - List> result = this.baseMapper.getConfigList(page, keywords, deptid, + List> result = this.baseMapper.getConfigList(page, keywords, deptid, "", BusConfigDTO.sensorHashMap.get(deviceType.intValue()), dataScope); List busConfigDTOList = new ArrayList<>(); for (Map objectMap : result) { diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusMethaneConfigServiceImpl.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusMethaneConfigServiceImpl.java index 194f897..527cc5b 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusMethaneConfigServiceImpl.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusMethaneConfigServiceImpl.java @@ -73,9 +73,10 @@ public List getConfigList(Page page, String keywords, String deptid, + String areaId, Long deviceType, DataScope dataScope) { - List> result = this.baseMapper.getConfigList(page, keywords, deptid, + List> result = this.baseMapper.getConfigList(page, keywords, deptid, "", BusConfigDTO.sensorHashMap.get(deviceType.intValue()), dataScope); List busConfigDTOList = new ArrayList<>(); for (Map objectMap : result) { diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusNoiseConfigServiceImpl.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusNoiseConfigServiceImpl.java index 303d665..dd7e94b 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusNoiseConfigServiceImpl.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusNoiseConfigServiceImpl.java @@ -73,9 +73,10 @@ public List getConfigList(Page page, String keywords, String deptid, + String areaId, Long deviceType, DataScope dataScope) { - List> result = this.baseMapper.getConfigList(page, keywords, deptid, + List> result = this.baseMapper.getConfigList(page, keywords, deptid, areaId, BusConfigDTO.sensorHashMap.get(deviceType.intValue()), dataScope); List busConfigDTOList = new ArrayList<>(); for (Map objectMap : result) { diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusTempHumiConfigServiceImpl.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusTempHumiConfigServiceImpl.java index 57e4801..63c46c7 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusTempHumiConfigServiceImpl.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusTempHumiConfigServiceImpl.java @@ -73,9 +73,10 @@ public List getConfigList(Page page, String keywords, String deptid, + String areaId, Long deviceType, DataScope dataScope) { - List> result = this.baseMapper.getConfigList(page, keywords, deptid, + List> result = this.baseMapper.getConfigList(page, keywords, deptid, "", BusConfigDTO.sensorHashMap.get(deviceType.intValue()), dataScope); List busConfigDTOList = new ArrayList<>(); for (Map objectMap : result) { diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusTubeConfigServiceImpl.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusTubeConfigServiceImpl.java index 4396fd3..51dfbe7 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusTubeConfigServiceImpl.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusTubeConfigServiceImpl.java @@ -73,9 +73,10 @@ public List getConfigList(Page page, String keywords, String deptid, + String areaId, Long deviceType, DataScope dataScope) { - List> result = this.baseMapper.getConfigList(page, keywords, deptid, + List> result = this.baseMapper.getConfigList(page, keywords, deptid, "", BusConfigDTO.sensorHashMap.get(deviceType.intValue()), dataScope); List busConfigDTOList = new ArrayList<>(); for (Map objectMap : result) { diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusWasteGasConfigServiceImpl.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusWasteGasConfigServiceImpl.java index eafc238..c6b4b54 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusWasteGasConfigServiceImpl.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusWasteGasConfigServiceImpl.java @@ -74,9 +74,10 @@ public List getConfigList(Page page, String keywords, String deptid, + String areaId, Long deviceType, DataScope dataScope) { - List> result = this.baseMapper.getConfigList(page, keywords, deptid, + List> result = this.baseMapper.getConfigList(page, keywords, deptid, "", BusConfigDTO.sensorHashMap.get(deviceType.intValue()), dataScope); List busConfigDTOList = new ArrayList<>(); for (Map objectMap : result) { diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/BusConfigController.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/BusConfigController.java index 122ebba..e50680b 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/BusConfigController.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/BusConfigController.java @@ -81,7 +81,7 @@ Page page = new PageFactory().defaultPage();//page使用 DataScope dataScope = service.getCurrUserDataScope(); List busConfigDTOList = busConfigService.getConfigList(page, keywords, - deptid, Long.valueOf(DeviceTypeEnum.Liquid.getIndex()), dataScope); + deptid, "", Long.valueOf(DeviceTypeEnum.Liquid.getIndex()), dataScope); page.setRecords(busConfigDTOList); successResult.setData(super.packForBT(page)); successResult.setMessage("success"); @@ -105,7 +105,7 @@ Page page = new PageFactory().defaultPage();//page使用 DataScope dataScope = service.getCurrUserDataScope(); List busConfigDTOList = busWasteGasConfigService.getConfigList(page, keywords, - deptid, Long.valueOf(DeviceTypeEnum.WasteGas.getIndex()), dataScope); + deptid, "", Long.valueOf(DeviceTypeEnum.WasteGas.getIndex()), dataScope); page.setRecords(busConfigDTOList); successResult.setData(super.packForBT(page)); successResult.setMessage("success"); @@ -129,7 +129,7 @@ Page page = new PageFactory().defaultPage();//page使用 DataScope dataScope = service.getCurrUserDataScope(); List busConfigDTOList = busMethaneConfigService.getConfigList(page, keywords, - deptid, Long.valueOf(DeviceTypeEnum.Methane.getIndex()), dataScope); + deptid, "", Long.valueOf(DeviceTypeEnum.Methane.getIndex()), dataScope); page.setRecords(busConfigDTOList); successResult.setData(super.packForBT(page)); successResult.setMessage("success"); @@ -154,7 +154,7 @@ Page page = new PageFactory().defaultPage();//page使用 DataScope dataScope = service.getCurrUserDataScope(); List busConfigDTOList = busTubeConfigService.getConfigList(page, keywords, - deptid, Long.valueOf(DeviceTypeEnum.Tube.getIndex()), dataScope); + deptid, "", Long.valueOf(DeviceTypeEnum.Tube.getIndex()), dataScope); page.setRecords(busConfigDTOList); successResult.setData(super.packForBT(page)); successResult.setMessage("success"); @@ -178,7 +178,7 @@ Page page = new PageFactory().defaultPage();//page使用 DataScope dataScope = service.getCurrUserDataScope(); List busConfigDTOList = busTempHumiConfigService.getConfigList(page, keywords, - deptid, Long.valueOf(DeviceTypeEnum.TempHumi.getIndex()), dataScope); + deptid, "", Long.valueOf(DeviceTypeEnum.TempHumi.getIndex()), dataScope); page.setRecords(busConfigDTOList); successResult.setData(super.packForBT(page)); successResult.setMessage("success"); @@ -202,7 +202,7 @@ Page page = new PageFactory().defaultPage();//page使用 DataScope dataScope = service.getCurrUserDataScope(); List busConfigDTOList = busDigConfigService.getConfigList(page, keywords, - deptid, Long.valueOf(DeviceTypeEnum.Dig.getIndex()), dataScope); + deptid, "", Long.valueOf(DeviceTypeEnum.Dig.getIndex()), dataScope); page.setRecords(busConfigDTOList); successResult.setData(super.packForBT(page)); successResult.setMessage("success"); @@ -220,13 +220,41 @@ @RequestMapping(value = "/noiseConfig/list") @ResponseBody public Object noiseConfigList(@RequestParam(required = false) String keywords, - @RequestParam(required = false) String deptid) { + @RequestParam(required = false) String deptid, + @RequestParam(required = false) String areaId) { SuccessResponseData successResult = new SuccessResponseData(); try { + areaId += "%"; Page page = new PageFactory().defaultPage();//page使用 DataScope dataScope = service.getCurrUserDataScope(); List busConfigDTOList = busNoiseConfigService.getConfigList(page, keywords, - deptid, Long.valueOf(DeviceTypeEnum.Noise.getIndex()), dataScope); + deptid, areaId, Long.valueOf(DeviceTypeEnum.Noise.getIndex()), dataScope); + page.setRecords(busConfigDTOList); + successResult.setData(super.packForBT(page)); + successResult.setMessage("success"); + } catch (Exception e) { + e.printStackTrace(); + successResult.setCode(500); + successResult.setMessage("false"); + } + return successResult; + } + + /** + * 水表获取配置列表 + */ + @RequestMapping(value = "/watchConfig/list") + @ResponseBody + public Object watchConfigList(@RequestParam(required = false) String keywords, + @RequestParam(required = false) String deptid, + @RequestParam(required = false) String areaId) { + SuccessResponseData successResult = new SuccessResponseData(); + try { + areaId += "%"; + Page page = new PageFactory().defaultPage();//page使用 + DataScope dataScope = service.getCurrUserDataScope(); + List busConfigDTOList = busNoiseConfigService.getConfigList(page, keywords, + deptid, areaId, Long.valueOf(DeviceTypeEnum.WaterMeter.getIndex()), dataScope); page.setRecords(busConfigDTOList); successResult.setData(super.packForBT(page)); successResult.setMessage("success"); @@ -521,7 +549,7 @@ page.setSize(Integer.MAX_VALUE); DataScope dataScope = service.getCurrUserDataScope(); List busConfigDTOList = busConfigService.getConfigList(page, keywords, - deptid, Long.valueOf(DeviceTypeEnum.Liquid.getIndex()), dataScope); + deptid, "", Long.valueOf(DeviceTypeEnum.Liquid.getIndex()), dataScope); busConfigService.exp(busConfigDTOList, response); } catch (Exception e) { e.printStackTrace(); @@ -547,7 +575,7 @@ page.setSize(Integer.MAX_VALUE); DataScope dataScope = service.getCurrUserDataScope(); List busConfigDTOList = busWasteGasConfigService.getConfigList(page, keywords, - deptid, Long.valueOf(DeviceTypeEnum.WasteGas.getIndex()), dataScope); + deptid, "", Long.valueOf(DeviceTypeEnum.WasteGas.getIndex()), dataScope); busWasteGasConfigService.exp(busConfigDTOList, response); } catch (Exception e) { e.printStackTrace(); @@ -573,7 +601,7 @@ page.setSize(Integer.MAX_VALUE); DataScope dataScope = service.getCurrUserDataScope(); List busConfigDTOList = busMethaneConfigService.getConfigList(page, keywords, - deptid, Long.valueOf(DeviceTypeEnum.Methane.getIndex()), dataScope); + deptid, "", Long.valueOf(DeviceTypeEnum.Methane.getIndex()), dataScope); busMethaneConfigService.exp(busConfigDTOList, response); } catch (Exception e) { e.printStackTrace(); @@ -599,7 +627,7 @@ page.setSize(Integer.MAX_VALUE); DataScope dataScope = service.getCurrUserDataScope(); List busConfigDTOList = busTempHumiConfigService.getConfigList(page, keywords, - deptid, Long.valueOf(DeviceTypeEnum.TempHumi.getIndex()), dataScope); + deptid, "", Long.valueOf(DeviceTypeEnum.TempHumi.getIndex()), dataScope); busTempHumiConfigService.exp(busConfigDTOList, response); } catch (Exception e) { e.printStackTrace(); @@ -625,7 +653,7 @@ page.setSize(Integer.MAX_VALUE); DataScope dataScope = service.getCurrUserDataScope(); List busConfigDTOList = busDigConfigService.getConfigList(page, keywords, - deptid, Long.valueOf(DeviceTypeEnum.Dig.getIndex()), dataScope); + deptid, "", Long.valueOf(DeviceTypeEnum.Dig.getIndex()), dataScope); busDigConfigService.exp(busConfigDTOList, response); } catch (Exception e) { e.printStackTrace(); @@ -643,6 +671,7 @@ @ResponseBody public void exportNoise(@RequestParam(required = false) String keywords, @RequestParam(required = false) String deptid, + @RequestParam(required = false) String areaId, HttpServletResponse response) { try { Page page = new PageFactory().defaultPage();//page使用 @@ -650,8 +679,9 @@ page.setSearchCount(false); page.setSize(Integer.MAX_VALUE); DataScope dataScope = service.getCurrUserDataScope(); + areaId += "%"; List busConfigDTOList = busNoiseConfigService.getConfigList(page, keywords, - deptid, Long.valueOf(DeviceTypeEnum.Noise.getIndex()), dataScope); + deptid, areaId, Long.valueOf(DeviceTypeEnum.Noise.getIndex()), dataScope); busNoiseConfigService.exp(busConfigDTOList, response); } catch (Exception e) { e.printStackTrace(); @@ -669,7 +699,7 @@ Page page = new PageFactory().defaultPage();//page使用 DataScope dataScope = service.getCurrUserDataScope(); List busConfigDTOList = busGasLiquidConfigService.getConfigList(page, keywords, - deptid, Long.valueOf(DeviceTypeEnum.LG.getIndex()), dataScope); + deptid, "", Long.valueOf(DeviceTypeEnum.LG.getIndex()), dataScope); page.setRecords(busConfigDTOList); successResult.setData(super.packForBT(page)); successResult.setMessage("success"); diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/BusConfigControllerBak.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/BusConfigControllerBak.java index f386d80..d5d8f39 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/BusConfigControllerBak.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/BusConfigControllerBak.java @@ -88,7 +88,7 @@ busConfigServiceHashMap.get(deviceType.intValue()); Page page = new PageFactory().defaultPage();//page使用 DataScope dataScope = service.getCurrUserDataScope(); - List busConfigDTOList = iBusConfigService.getConfigList(page, keywords, deptid,deviceType, dataScope); + List busConfigDTOList = iBusConfigService.getConfigList(page, keywords, deptid, "", deviceType, dataScope); page.setRecords(busConfigDTOList); successResult.setData(super.packForBT(page)); successResult.setMessage("success"); @@ -262,7 +262,7 @@ page.setSearchCount(false); page.setSize(Integer.MAX_VALUE); DataScope dataScope = service.getCurrUserDataScope(); - List busConfigDTOList = iBusConfigService.getConfigList(page, keywords, deptid,deviceType, dataScope); + List busConfigDTOList = iBusConfigService.getConfigList(page, keywords, deptid, "", deviceType, dataScope); iBusConfigService.exp(busConfigDTOList,response); } catch (Exception e) { e.printStackTrace(); diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java index 988f6a3..21ffcec 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java @@ -80,14 +80,15 @@ @ApiOperation("获取设备列表") @RequestMapping(value = "/list") @ResponseBody - public Object list(String keywords, String deviceType, String deptid, String beginTime, String endTime, String isOnline) { + public Object list(String keywords, String deviceType, String deptid, String beginTime, String endTime, String isOnline, String areaId) { Page page = new PageFactory().defaultPage(); //查询数据权限 使用默认DEPTID 字段 DataScope dataScope = permissionService.getCurrUserDataScope(); - List list = deviceService.selectDataScopePage(dataScope, page, deviceType, deptid, beginTime, endTime, keywords, isOnline); + areaId += "%"; + List list = deviceService.selectDataScopePage(dataScope, page, deviceType, deptid, beginTime, endTime, keywords, isOnline, areaId); list.forEach(deviceDto -> { - deviceDto.setBfztName(permissionService.getDictNameByCode(ModularDictConst.BFZT, deviceDto.getBfzt())); deviceDto.setOnlineStateName(permissionService.getDictNameByCode(ModularDictConst.ONLINESTATUS, deviceDto.getOnlineState())); + deviceDto.setAreaFullName(deviceService.getAreaFullNameById(deviceDto.getArea())); }); page.setRecords(list); return new SuccessResponseData(super.packForBT(page)); @@ -199,14 +200,14 @@ @RequestMapping(value = "/batchExport") @Permission @ResponseBody - public void batchExport(HttpServletResponse response, String keywords, String deviceType, String deptid, String beginTime, String endTime, String isOnline) throws IOException { + public void batchExport(HttpServletResponse response, String keywords, String deviceType, String deptid, String beginTime, String endTime, String isOnline, String areaId) throws IOException { Page page = new PageFactory().defaultPage(); page.setCurrent(1); page.setSearchCount(false); page.setSize(Integer.MAX_VALUE); DataScope dataScope = permissionService.getCurrUserDataScope(); - List list = deviceService.selectDataScopePage(dataScope, page, deviceType, deptid, beginTime, endTime, keywords, isOnline); + List list = deviceService.selectDataScopePage(dataScope, page, deviceType, deptid, beginTime, endTime, keywords, isOnline, areaId); list.forEach(deviceDto -> { deviceDto.setBfztName(permissionService.getDictNameByCode(ModularDictConst.BFZT, deviceDto.getBfzt())); deviceDto.setOnlineStateName(permissionService.getDictNameByCode(ModularDictConst.ONLINESTATUS, deviceDto.getOnlineState())); diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/BusConfigMapper.java b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/BusConfigMapper.java index 8e66b48..6dbf4e2 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/BusConfigMapper.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/BusConfigMapper.java @@ -26,9 +26,12 @@ List> getConfigList(@Param("page") Page page, @Param("keywords") String keywords, @Param("deptid") String deptid, + @Param("areaId") String areaId, @Param("sensorid") String sensorid, @Param("dataScope") DataScope dataScope); + String getArea(@Param("id") String id); + String getAreaPId(@Param("id") String id); String getConcenCodeByDevId(@Param("devID") Long devID); String getWellDeepByDevId(@Param("devID") Long devID); diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceMapper.java b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceMapper.java index de7f150..37a59d8 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceMapper.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceMapper.java @@ -20,10 +20,13 @@ */ public interface DeviceMapper extends BaseMapper { - List selectDataScopePage(@Param("scope") DataScope dataScope, @Param("page") Page page, @Param("deviceType") String deviceType, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords,@Param("isOnline") String isOnline); + List selectDataScopePage(@Param("scope") DataScope dataScope, @Param("page") Page page, @Param("deviceType") String deviceType, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords,@Param("isOnline") String isOnline, @Param("areaId") String areaId); DeviceWellDto selectWellIdByCode(@Param("wellCode") String wellCode); + String getArea(@Param("id") String id); + String getAreaPId(@Param("id") String id); + DeviceConcentratorDto selectDeviceConcentorByCode(@Param("concenCode") String concenCode); List selectWellDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords); diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusConfigMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusConfigMapper.xml index 92d6c14..d85a9cd 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusConfigMapper.xml +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusConfigMapper.xml @@ -67,6 +67,9 @@ and s.ID = + + and a.AREA like #{areaId} + ORDER by writetime DESC @@ -104,5 +107,19 @@ limit 1 + + + + diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml index 3de0ee0..96c6a71 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml @@ -15,7 +15,7 @@ - ID,DEVCODE,DEVICENAME,DEVICETYPE,DEVICETYPENAME,WATCHTYPE,COMMUNICATION,MODELID,MODELNAME,DEPTID,DEPTNAME,WELLCODE,POSITION,CONCENID,CONCENCODE,ONLINESTATE,VALID,TS,BFZT,wellId, + ID,DEVCODE,DEVICENAME,DEVICETYPE,DEVICETYPENAME,WATCHTYPE,COMMUNICATION,MODELID,MODELNAME,DEPTID,DEPTNAME,WELLCODE,POSITION,CONCENID,CONCENCODE,ONLINESTATE,VALID,TS,BFZT,AREA,wellId, as INSTALLDATE @@ -37,6 +37,20 @@ SELECT id,CONCENCODE FROM bus_concentrator WHERE VALID = '1' AND CONCENCODE = #{concenCode} + + + + diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dto/DeviceDto.java b/casic-device/src/main/java/com/casic/missiles/modular/system/dto/DeviceDto.java index 64050e7..4ca24bc 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/dto/DeviceDto.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dto/DeviceDto.java @@ -59,6 +59,8 @@ private String bfzt; private String bfztName; private String wellId; + private String area; + private String areaFullName; @Override protected Serializable pkVal() { diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/IBusConfigService.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/IBusConfigService.java index 032af19..c6c2efa 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/IBusConfigService.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/IBusConfigService.java @@ -24,6 +24,7 @@ List getConfigList(Page page, String keywords, String deptid, + String areaId, Long deviceType, DataScope dataScope); String getConcenCodeByDevId(Long devID); diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/IDeviceService.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/IDeviceService.java index 5374e8a..6b84904 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/IDeviceService.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/IDeviceService.java @@ -30,7 +30,7 @@ * @param endTime 设备安装结束时间 * @return 设备列表 */ - List selectDataScopePage(DataScope dataScope, Page page, String deviceType, String deptid, String beginTime, String endTime, String keywords,String isOnline); + List selectDataScopePage(DataScope dataScope, Page page, String deviceType, String deptid, String beginTime, String endTime, String keywords,String isOnline, String areaId); /** * 根据闸井编号查询闸井ID @@ -137,6 +137,8 @@ void registerGeTui(Long id, String clientid); + String getAreaFullNameById(String area); + List> selectDataList(DataScope dataScope, String wellCode, String watchType, String beginTime, String endTime); /** diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusConfigServiceImpl.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusConfigServiceImpl.java index 364829c..d7e38aa 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusConfigServiceImpl.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusConfigServiceImpl.java @@ -75,9 +75,10 @@ public List getConfigList(Page page, String keywords, String deptid, + String areaId, Long deviceType, DataScope dataScope) { - List> result = this.baseMapper.getConfigList(page, keywords, deptid, + List> result = this.baseMapper.getConfigList(page, keywords, deptid, "", BusConfigDTO.sensorHashMap.get(deviceType.intValue()), dataScope); List busConfigDTOList = new ArrayList<>(); for (Map objectMap : result) { diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusDigConfigServiceImpl.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusDigConfigServiceImpl.java index acca7f9..8c8c592 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusDigConfigServiceImpl.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusDigConfigServiceImpl.java @@ -73,9 +73,10 @@ public List getConfigList(Page page, String keywords, String deptid, + String areaId, Long deviceType, DataScope dataScope) { - List> result = this.baseMapper.getConfigList(page, keywords, deptid, + List> result = this.baseMapper.getConfigList(page, keywords, deptid, "", BusConfigDTO.sensorHashMap.get(deviceType.intValue()), dataScope); List busConfigDTOList = new ArrayList<>(); for (Map objectMap : result) { diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusGasLiquidConfigServiceImpl.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusGasLiquidConfigServiceImpl.java index 528e0cf..62cd290 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusGasLiquidConfigServiceImpl.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusGasLiquidConfigServiceImpl.java @@ -73,9 +73,10 @@ public List getConfigList(Page page, String keywords, String deptid, + String areaId, Long deviceType, DataScope dataScope) { - List> result = this.baseMapper.getConfigList(page, keywords, deptid, + List> result = this.baseMapper.getConfigList(page, keywords, deptid, "", BusConfigDTO.sensorHashMap.get(deviceType.intValue()), dataScope); List busConfigDTOList = new ArrayList<>(); for (Map objectMap : result) { diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusMethaneConfigServiceImpl.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusMethaneConfigServiceImpl.java index 194f897..527cc5b 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusMethaneConfigServiceImpl.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusMethaneConfigServiceImpl.java @@ -73,9 +73,10 @@ public List getConfigList(Page page, String keywords, String deptid, + String areaId, Long deviceType, DataScope dataScope) { - List> result = this.baseMapper.getConfigList(page, keywords, deptid, + List> result = this.baseMapper.getConfigList(page, keywords, deptid, "", BusConfigDTO.sensorHashMap.get(deviceType.intValue()), dataScope); List busConfigDTOList = new ArrayList<>(); for (Map objectMap : result) { diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusNoiseConfigServiceImpl.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusNoiseConfigServiceImpl.java index 303d665..dd7e94b 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusNoiseConfigServiceImpl.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusNoiseConfigServiceImpl.java @@ -73,9 +73,10 @@ public List getConfigList(Page page, String keywords, String deptid, + String areaId, Long deviceType, DataScope dataScope) { - List> result = this.baseMapper.getConfigList(page, keywords, deptid, + List> result = this.baseMapper.getConfigList(page, keywords, deptid, areaId, BusConfigDTO.sensorHashMap.get(deviceType.intValue()), dataScope); List busConfigDTOList = new ArrayList<>(); for (Map objectMap : result) { diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusTempHumiConfigServiceImpl.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusTempHumiConfigServiceImpl.java index 57e4801..63c46c7 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusTempHumiConfigServiceImpl.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusTempHumiConfigServiceImpl.java @@ -73,9 +73,10 @@ public List getConfigList(Page page, String keywords, String deptid, + String areaId, Long deviceType, DataScope dataScope) { - List> result = this.baseMapper.getConfigList(page, keywords, deptid, + List> result = this.baseMapper.getConfigList(page, keywords, deptid, "", BusConfigDTO.sensorHashMap.get(deviceType.intValue()), dataScope); List busConfigDTOList = new ArrayList<>(); for (Map objectMap : result) { diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusTubeConfigServiceImpl.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusTubeConfigServiceImpl.java index 4396fd3..51dfbe7 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusTubeConfigServiceImpl.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusTubeConfigServiceImpl.java @@ -73,9 +73,10 @@ public List getConfigList(Page page, String keywords, String deptid, + String areaId, Long deviceType, DataScope dataScope) { - List> result = this.baseMapper.getConfigList(page, keywords, deptid, + List> result = this.baseMapper.getConfigList(page, keywords, deptid, "", BusConfigDTO.sensorHashMap.get(deviceType.intValue()), dataScope); List busConfigDTOList = new ArrayList<>(); for (Map objectMap : result) { diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusWasteGasConfigServiceImpl.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusWasteGasConfigServiceImpl.java index eafc238..c6b4b54 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusWasteGasConfigServiceImpl.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusWasteGasConfigServiceImpl.java @@ -74,9 +74,10 @@ public List getConfigList(Page page, String keywords, String deptid, + String areaId, Long deviceType, DataScope dataScope) { - List> result = this.baseMapper.getConfigList(page, keywords, deptid, + List> result = this.baseMapper.getConfigList(page, keywords, deptid, "", BusConfigDTO.sensorHashMap.get(deviceType.intValue()), dataScope); List busConfigDTOList = new ArrayList<>(); for (Map objectMap : result) { diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceServiceImpl.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceServiceImpl.java index 9e279da..1298635 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceServiceImpl.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceServiceImpl.java @@ -164,8 +164,8 @@ } @Override - public List selectDataScopePage(DataScope dataScope, Page page, String deviceType, String deptid, String beginTime, String endTime, String keywords,String isOnline) { - return this.baseMapper.selectDataScopePage(dataScope, page, deviceType, deptid, beginTime, endTime, keywords, isOnline); + public List selectDataScopePage(DataScope dataScope, Page page, String deviceType, String deptid, String beginTime, String endTime, String keywords,String isOnline, String areaId) { + return this.baseMapper.selectDataScopePage(dataScope, page, deviceType, deptid, beginTime, endTime, keywords, isOnline, areaId); } @Override @@ -396,8 +396,6 @@ //删除设备集中器关联 deviceConcentratorService.deleteByDeviceId(id); }); - - } } @@ -412,6 +410,17 @@ SqlRunner.db().insert("INSERT INTO SYS_USER_CLIENT (ID, USERID, CLIENTID,LOGTIME) VALUES ({0}, {1},{2},SYSDATE())", IdWorker.getId(), id, clientid); } + public String getAreaFullNameById(String area) { + String fullName = this.baseMapper.getArea(area); + String pid = this.baseMapper.getAreaPId(area); + if (pid.equals("0")) { + return fullName; + } else { + fullName = getAreaFullNameById(pid) + "/" + fullName; + return fullName; + } + } + /** * 关联集中器 * diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/BusConfigController.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/BusConfigController.java index 122ebba..e50680b 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/BusConfigController.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/BusConfigController.java @@ -81,7 +81,7 @@ Page page = new PageFactory().defaultPage();//page使用 DataScope dataScope = service.getCurrUserDataScope(); List busConfigDTOList = busConfigService.getConfigList(page, keywords, - deptid, Long.valueOf(DeviceTypeEnum.Liquid.getIndex()), dataScope); + deptid, "", Long.valueOf(DeviceTypeEnum.Liquid.getIndex()), dataScope); page.setRecords(busConfigDTOList); successResult.setData(super.packForBT(page)); successResult.setMessage("success"); @@ -105,7 +105,7 @@ Page page = new PageFactory().defaultPage();//page使用 DataScope dataScope = service.getCurrUserDataScope(); List busConfigDTOList = busWasteGasConfigService.getConfigList(page, keywords, - deptid, Long.valueOf(DeviceTypeEnum.WasteGas.getIndex()), dataScope); + deptid, "", Long.valueOf(DeviceTypeEnum.WasteGas.getIndex()), dataScope); page.setRecords(busConfigDTOList); successResult.setData(super.packForBT(page)); successResult.setMessage("success"); @@ -129,7 +129,7 @@ Page page = new PageFactory().defaultPage();//page使用 DataScope dataScope = service.getCurrUserDataScope(); List busConfigDTOList = busMethaneConfigService.getConfigList(page, keywords, - deptid, Long.valueOf(DeviceTypeEnum.Methane.getIndex()), dataScope); + deptid, "", Long.valueOf(DeviceTypeEnum.Methane.getIndex()), dataScope); page.setRecords(busConfigDTOList); successResult.setData(super.packForBT(page)); successResult.setMessage("success"); @@ -154,7 +154,7 @@ Page page = new PageFactory().defaultPage();//page使用 DataScope dataScope = service.getCurrUserDataScope(); List busConfigDTOList = busTubeConfigService.getConfigList(page, keywords, - deptid, Long.valueOf(DeviceTypeEnum.Tube.getIndex()), dataScope); + deptid, "", Long.valueOf(DeviceTypeEnum.Tube.getIndex()), dataScope); page.setRecords(busConfigDTOList); successResult.setData(super.packForBT(page)); successResult.setMessage("success"); @@ -178,7 +178,7 @@ Page page = new PageFactory().defaultPage();//page使用 DataScope dataScope = service.getCurrUserDataScope(); List busConfigDTOList = busTempHumiConfigService.getConfigList(page, keywords, - deptid, Long.valueOf(DeviceTypeEnum.TempHumi.getIndex()), dataScope); + deptid, "", Long.valueOf(DeviceTypeEnum.TempHumi.getIndex()), dataScope); page.setRecords(busConfigDTOList); successResult.setData(super.packForBT(page)); successResult.setMessage("success"); @@ -202,7 +202,7 @@ Page page = new PageFactory().defaultPage();//page使用 DataScope dataScope = service.getCurrUserDataScope(); List busConfigDTOList = busDigConfigService.getConfigList(page, keywords, - deptid, Long.valueOf(DeviceTypeEnum.Dig.getIndex()), dataScope); + deptid, "", Long.valueOf(DeviceTypeEnum.Dig.getIndex()), dataScope); page.setRecords(busConfigDTOList); successResult.setData(super.packForBT(page)); successResult.setMessage("success"); @@ -220,13 +220,41 @@ @RequestMapping(value = "/noiseConfig/list") @ResponseBody public Object noiseConfigList(@RequestParam(required = false) String keywords, - @RequestParam(required = false) String deptid) { + @RequestParam(required = false) String deptid, + @RequestParam(required = false) String areaId) { SuccessResponseData successResult = new SuccessResponseData(); try { + areaId += "%"; Page page = new PageFactory().defaultPage();//page使用 DataScope dataScope = service.getCurrUserDataScope(); List busConfigDTOList = busNoiseConfigService.getConfigList(page, keywords, - deptid, Long.valueOf(DeviceTypeEnum.Noise.getIndex()), dataScope); + deptid, areaId, Long.valueOf(DeviceTypeEnum.Noise.getIndex()), dataScope); + page.setRecords(busConfigDTOList); + successResult.setData(super.packForBT(page)); + successResult.setMessage("success"); + } catch (Exception e) { + e.printStackTrace(); + successResult.setCode(500); + successResult.setMessage("false"); + } + return successResult; + } + + /** + * 水表获取配置列表 + */ + @RequestMapping(value = "/watchConfig/list") + @ResponseBody + public Object watchConfigList(@RequestParam(required = false) String keywords, + @RequestParam(required = false) String deptid, + @RequestParam(required = false) String areaId) { + SuccessResponseData successResult = new SuccessResponseData(); + try { + areaId += "%"; + Page page = new PageFactory().defaultPage();//page使用 + DataScope dataScope = service.getCurrUserDataScope(); + List busConfigDTOList = busNoiseConfigService.getConfigList(page, keywords, + deptid, areaId, Long.valueOf(DeviceTypeEnum.WaterMeter.getIndex()), dataScope); page.setRecords(busConfigDTOList); successResult.setData(super.packForBT(page)); successResult.setMessage("success"); @@ -521,7 +549,7 @@ page.setSize(Integer.MAX_VALUE); DataScope dataScope = service.getCurrUserDataScope(); List busConfigDTOList = busConfigService.getConfigList(page, keywords, - deptid, Long.valueOf(DeviceTypeEnum.Liquid.getIndex()), dataScope); + deptid, "", Long.valueOf(DeviceTypeEnum.Liquid.getIndex()), dataScope); busConfigService.exp(busConfigDTOList, response); } catch (Exception e) { e.printStackTrace(); @@ -547,7 +575,7 @@ page.setSize(Integer.MAX_VALUE); DataScope dataScope = service.getCurrUserDataScope(); List busConfigDTOList = busWasteGasConfigService.getConfigList(page, keywords, - deptid, Long.valueOf(DeviceTypeEnum.WasteGas.getIndex()), dataScope); + deptid, "", Long.valueOf(DeviceTypeEnum.WasteGas.getIndex()), dataScope); busWasteGasConfigService.exp(busConfigDTOList, response); } catch (Exception e) { e.printStackTrace(); @@ -573,7 +601,7 @@ page.setSize(Integer.MAX_VALUE); DataScope dataScope = service.getCurrUserDataScope(); List busConfigDTOList = busMethaneConfigService.getConfigList(page, keywords, - deptid, Long.valueOf(DeviceTypeEnum.Methane.getIndex()), dataScope); + deptid, "", Long.valueOf(DeviceTypeEnum.Methane.getIndex()), dataScope); busMethaneConfigService.exp(busConfigDTOList, response); } catch (Exception e) { e.printStackTrace(); @@ -599,7 +627,7 @@ page.setSize(Integer.MAX_VALUE); DataScope dataScope = service.getCurrUserDataScope(); List busConfigDTOList = busTempHumiConfigService.getConfigList(page, keywords, - deptid, Long.valueOf(DeviceTypeEnum.TempHumi.getIndex()), dataScope); + deptid, "", Long.valueOf(DeviceTypeEnum.TempHumi.getIndex()), dataScope); busTempHumiConfigService.exp(busConfigDTOList, response); } catch (Exception e) { e.printStackTrace(); @@ -625,7 +653,7 @@ page.setSize(Integer.MAX_VALUE); DataScope dataScope = service.getCurrUserDataScope(); List busConfigDTOList = busDigConfigService.getConfigList(page, keywords, - deptid, Long.valueOf(DeviceTypeEnum.Dig.getIndex()), dataScope); + deptid, "", Long.valueOf(DeviceTypeEnum.Dig.getIndex()), dataScope); busDigConfigService.exp(busConfigDTOList, response); } catch (Exception e) { e.printStackTrace(); @@ -643,6 +671,7 @@ @ResponseBody public void exportNoise(@RequestParam(required = false) String keywords, @RequestParam(required = false) String deptid, + @RequestParam(required = false) String areaId, HttpServletResponse response) { try { Page page = new PageFactory().defaultPage();//page使用 @@ -650,8 +679,9 @@ page.setSearchCount(false); page.setSize(Integer.MAX_VALUE); DataScope dataScope = service.getCurrUserDataScope(); + areaId += "%"; List busConfigDTOList = busNoiseConfigService.getConfigList(page, keywords, - deptid, Long.valueOf(DeviceTypeEnum.Noise.getIndex()), dataScope); + deptid, areaId, Long.valueOf(DeviceTypeEnum.Noise.getIndex()), dataScope); busNoiseConfigService.exp(busConfigDTOList, response); } catch (Exception e) { e.printStackTrace(); @@ -669,7 +699,7 @@ Page page = new PageFactory().defaultPage();//page使用 DataScope dataScope = service.getCurrUserDataScope(); List busConfigDTOList = busGasLiquidConfigService.getConfigList(page, keywords, - deptid, Long.valueOf(DeviceTypeEnum.LG.getIndex()), dataScope); + deptid, "", Long.valueOf(DeviceTypeEnum.LG.getIndex()), dataScope); page.setRecords(busConfigDTOList); successResult.setData(super.packForBT(page)); successResult.setMessage("success"); diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/BusConfigControllerBak.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/BusConfigControllerBak.java index f386d80..d5d8f39 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/BusConfigControllerBak.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/BusConfigControllerBak.java @@ -88,7 +88,7 @@ busConfigServiceHashMap.get(deviceType.intValue()); Page page = new PageFactory().defaultPage();//page使用 DataScope dataScope = service.getCurrUserDataScope(); - List busConfigDTOList = iBusConfigService.getConfigList(page, keywords, deptid,deviceType, dataScope); + List busConfigDTOList = iBusConfigService.getConfigList(page, keywords, deptid, "", deviceType, dataScope); page.setRecords(busConfigDTOList); successResult.setData(super.packForBT(page)); successResult.setMessage("success"); @@ -262,7 +262,7 @@ page.setSearchCount(false); page.setSize(Integer.MAX_VALUE); DataScope dataScope = service.getCurrUserDataScope(); - List busConfigDTOList = iBusConfigService.getConfigList(page, keywords, deptid,deviceType, dataScope); + List busConfigDTOList = iBusConfigService.getConfigList(page, keywords, deptid, "", deviceType, dataScope); iBusConfigService.exp(busConfigDTOList,response); } catch (Exception e) { e.printStackTrace(); diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java index 988f6a3..21ffcec 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java @@ -80,14 +80,15 @@ @ApiOperation("获取设备列表") @RequestMapping(value = "/list") @ResponseBody - public Object list(String keywords, String deviceType, String deptid, String beginTime, String endTime, String isOnline) { + public Object list(String keywords, String deviceType, String deptid, String beginTime, String endTime, String isOnline, String areaId) { Page page = new PageFactory().defaultPage(); //查询数据权限 使用默认DEPTID 字段 DataScope dataScope = permissionService.getCurrUserDataScope(); - List list = deviceService.selectDataScopePage(dataScope, page, deviceType, deptid, beginTime, endTime, keywords, isOnline); + areaId += "%"; + List list = deviceService.selectDataScopePage(dataScope, page, deviceType, deptid, beginTime, endTime, keywords, isOnline, areaId); list.forEach(deviceDto -> { - deviceDto.setBfztName(permissionService.getDictNameByCode(ModularDictConst.BFZT, deviceDto.getBfzt())); deviceDto.setOnlineStateName(permissionService.getDictNameByCode(ModularDictConst.ONLINESTATUS, deviceDto.getOnlineState())); + deviceDto.setAreaFullName(deviceService.getAreaFullNameById(deviceDto.getArea())); }); page.setRecords(list); return new SuccessResponseData(super.packForBT(page)); @@ -199,14 +200,14 @@ @RequestMapping(value = "/batchExport") @Permission @ResponseBody - public void batchExport(HttpServletResponse response, String keywords, String deviceType, String deptid, String beginTime, String endTime, String isOnline) throws IOException { + public void batchExport(HttpServletResponse response, String keywords, String deviceType, String deptid, String beginTime, String endTime, String isOnline, String areaId) throws IOException { Page page = new PageFactory().defaultPage(); page.setCurrent(1); page.setSearchCount(false); page.setSize(Integer.MAX_VALUE); DataScope dataScope = permissionService.getCurrUserDataScope(); - List list = deviceService.selectDataScopePage(dataScope, page, deviceType, deptid, beginTime, endTime, keywords, isOnline); + List list = deviceService.selectDataScopePage(dataScope, page, deviceType, deptid, beginTime, endTime, keywords, isOnline, areaId); list.forEach(deviceDto -> { deviceDto.setBfztName(permissionService.getDictNameByCode(ModularDictConst.BFZT, deviceDto.getBfzt())); deviceDto.setOnlineStateName(permissionService.getDictNameByCode(ModularDictConst.ONLINESTATUS, deviceDto.getOnlineState())); diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/BusConfigMapper.java b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/BusConfigMapper.java index 8e66b48..6dbf4e2 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/BusConfigMapper.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/BusConfigMapper.java @@ -26,9 +26,12 @@ List> getConfigList(@Param("page") Page page, @Param("keywords") String keywords, @Param("deptid") String deptid, + @Param("areaId") String areaId, @Param("sensorid") String sensorid, @Param("dataScope") DataScope dataScope); + String getArea(@Param("id") String id); + String getAreaPId(@Param("id") String id); String getConcenCodeByDevId(@Param("devID") Long devID); String getWellDeepByDevId(@Param("devID") Long devID); diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceMapper.java b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceMapper.java index de7f150..37a59d8 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceMapper.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceMapper.java @@ -20,10 +20,13 @@ */ public interface DeviceMapper extends BaseMapper { - List selectDataScopePage(@Param("scope") DataScope dataScope, @Param("page") Page page, @Param("deviceType") String deviceType, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords,@Param("isOnline") String isOnline); + List selectDataScopePage(@Param("scope") DataScope dataScope, @Param("page") Page page, @Param("deviceType") String deviceType, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords,@Param("isOnline") String isOnline, @Param("areaId") String areaId); DeviceWellDto selectWellIdByCode(@Param("wellCode") String wellCode); + String getArea(@Param("id") String id); + String getAreaPId(@Param("id") String id); + DeviceConcentratorDto selectDeviceConcentorByCode(@Param("concenCode") String concenCode); List selectWellDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords); diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusConfigMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusConfigMapper.xml index 92d6c14..d85a9cd 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusConfigMapper.xml +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusConfigMapper.xml @@ -67,6 +67,9 @@ and s.ID = + + and a.AREA like #{areaId} + ORDER by writetime DESC @@ -104,5 +107,19 @@ limit 1 + + + + diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml index 3de0ee0..96c6a71 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml @@ -15,7 +15,7 @@ - ID,DEVCODE,DEVICENAME,DEVICETYPE,DEVICETYPENAME,WATCHTYPE,COMMUNICATION,MODELID,MODELNAME,DEPTID,DEPTNAME,WELLCODE,POSITION,CONCENID,CONCENCODE,ONLINESTATE,VALID,TS,BFZT,wellId, + ID,DEVCODE,DEVICENAME,DEVICETYPE,DEVICETYPENAME,WATCHTYPE,COMMUNICATION,MODELID,MODELNAME,DEPTID,DEPTNAME,WELLCODE,POSITION,CONCENID,CONCENCODE,ONLINESTATE,VALID,TS,BFZT,AREA,wellId, as INSTALLDATE @@ -37,6 +37,20 @@ SELECT id,CONCENCODE FROM bus_concentrator WHERE VALID = '1' AND CONCENCODE = #{concenCode} + + + + diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dto/DeviceDto.java b/casic-device/src/main/java/com/casic/missiles/modular/system/dto/DeviceDto.java index 64050e7..4ca24bc 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/dto/DeviceDto.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dto/DeviceDto.java @@ -59,6 +59,8 @@ private String bfzt; private String bfztName; private String wellId; + private String area; + private String areaFullName; @Override protected Serializable pkVal() { diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/IBusConfigService.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/IBusConfigService.java index 032af19..c6c2efa 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/IBusConfigService.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/IBusConfigService.java @@ -24,6 +24,7 @@ List getConfigList(Page page, String keywords, String deptid, + String areaId, Long deviceType, DataScope dataScope); String getConcenCodeByDevId(Long devID); diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/IDeviceService.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/IDeviceService.java index 5374e8a..6b84904 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/IDeviceService.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/IDeviceService.java @@ -30,7 +30,7 @@ * @param endTime 设备安装结束时间 * @return 设备列表 */ - List selectDataScopePage(DataScope dataScope, Page page, String deviceType, String deptid, String beginTime, String endTime, String keywords,String isOnline); + List selectDataScopePage(DataScope dataScope, Page page, String deviceType, String deptid, String beginTime, String endTime, String keywords,String isOnline, String areaId); /** * 根据闸井编号查询闸井ID @@ -137,6 +137,8 @@ void registerGeTui(Long id, String clientid); + String getAreaFullNameById(String area); + List> selectDataList(DataScope dataScope, String wellCode, String watchType, String beginTime, String endTime); /** diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusConfigServiceImpl.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusConfigServiceImpl.java index 364829c..d7e38aa 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusConfigServiceImpl.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusConfigServiceImpl.java @@ -75,9 +75,10 @@ public List getConfigList(Page page, String keywords, String deptid, + String areaId, Long deviceType, DataScope dataScope) { - List> result = this.baseMapper.getConfigList(page, keywords, deptid, + List> result = this.baseMapper.getConfigList(page, keywords, deptid, "", BusConfigDTO.sensorHashMap.get(deviceType.intValue()), dataScope); List busConfigDTOList = new ArrayList<>(); for (Map objectMap : result) { diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusDigConfigServiceImpl.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusDigConfigServiceImpl.java index acca7f9..8c8c592 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusDigConfigServiceImpl.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusDigConfigServiceImpl.java @@ -73,9 +73,10 @@ public List getConfigList(Page page, String keywords, String deptid, + String areaId, Long deviceType, DataScope dataScope) { - List> result = this.baseMapper.getConfigList(page, keywords, deptid, + List> result = this.baseMapper.getConfigList(page, keywords, deptid, "", BusConfigDTO.sensorHashMap.get(deviceType.intValue()), dataScope); List busConfigDTOList = new ArrayList<>(); for (Map objectMap : result) { diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusGasLiquidConfigServiceImpl.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusGasLiquidConfigServiceImpl.java index 528e0cf..62cd290 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusGasLiquidConfigServiceImpl.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusGasLiquidConfigServiceImpl.java @@ -73,9 +73,10 @@ public List getConfigList(Page page, String keywords, String deptid, + String areaId, Long deviceType, DataScope dataScope) { - List> result = this.baseMapper.getConfigList(page, keywords, deptid, + List> result = this.baseMapper.getConfigList(page, keywords, deptid, "", BusConfigDTO.sensorHashMap.get(deviceType.intValue()), dataScope); List busConfigDTOList = new ArrayList<>(); for (Map objectMap : result) { diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusMethaneConfigServiceImpl.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusMethaneConfigServiceImpl.java index 194f897..527cc5b 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusMethaneConfigServiceImpl.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusMethaneConfigServiceImpl.java @@ -73,9 +73,10 @@ public List getConfigList(Page page, String keywords, String deptid, + String areaId, Long deviceType, DataScope dataScope) { - List> result = this.baseMapper.getConfigList(page, keywords, deptid, + List> result = this.baseMapper.getConfigList(page, keywords, deptid, "", BusConfigDTO.sensorHashMap.get(deviceType.intValue()), dataScope); List busConfigDTOList = new ArrayList<>(); for (Map objectMap : result) { diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusNoiseConfigServiceImpl.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusNoiseConfigServiceImpl.java index 303d665..dd7e94b 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusNoiseConfigServiceImpl.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusNoiseConfigServiceImpl.java @@ -73,9 +73,10 @@ public List getConfigList(Page page, String keywords, String deptid, + String areaId, Long deviceType, DataScope dataScope) { - List> result = this.baseMapper.getConfigList(page, keywords, deptid, + List> result = this.baseMapper.getConfigList(page, keywords, deptid, areaId, BusConfigDTO.sensorHashMap.get(deviceType.intValue()), dataScope); List busConfigDTOList = new ArrayList<>(); for (Map objectMap : result) { diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusTempHumiConfigServiceImpl.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusTempHumiConfigServiceImpl.java index 57e4801..63c46c7 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusTempHumiConfigServiceImpl.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusTempHumiConfigServiceImpl.java @@ -73,9 +73,10 @@ public List getConfigList(Page page, String keywords, String deptid, + String areaId, Long deviceType, DataScope dataScope) { - List> result = this.baseMapper.getConfigList(page, keywords, deptid, + List> result = this.baseMapper.getConfigList(page, keywords, deptid, "", BusConfigDTO.sensorHashMap.get(deviceType.intValue()), dataScope); List busConfigDTOList = new ArrayList<>(); for (Map objectMap : result) { diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusTubeConfigServiceImpl.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusTubeConfigServiceImpl.java index 4396fd3..51dfbe7 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusTubeConfigServiceImpl.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusTubeConfigServiceImpl.java @@ -73,9 +73,10 @@ public List getConfigList(Page page, String keywords, String deptid, + String areaId, Long deviceType, DataScope dataScope) { - List> result = this.baseMapper.getConfigList(page, keywords, deptid, + List> result = this.baseMapper.getConfigList(page, keywords, deptid, "", BusConfigDTO.sensorHashMap.get(deviceType.intValue()), dataScope); List busConfigDTOList = new ArrayList<>(); for (Map objectMap : result) { diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusWasteGasConfigServiceImpl.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusWasteGasConfigServiceImpl.java index eafc238..c6b4b54 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusWasteGasConfigServiceImpl.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusWasteGasConfigServiceImpl.java @@ -74,9 +74,10 @@ public List getConfigList(Page page, String keywords, String deptid, + String areaId, Long deviceType, DataScope dataScope) { - List> result = this.baseMapper.getConfigList(page, keywords, deptid, + List> result = this.baseMapper.getConfigList(page, keywords, deptid, "", BusConfigDTO.sensorHashMap.get(deviceType.intValue()), dataScope); List busConfigDTOList = new ArrayList<>(); for (Map objectMap : result) { diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceServiceImpl.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceServiceImpl.java index 9e279da..1298635 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceServiceImpl.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceServiceImpl.java @@ -164,8 +164,8 @@ } @Override - public List selectDataScopePage(DataScope dataScope, Page page, String deviceType, String deptid, String beginTime, String endTime, String keywords,String isOnline) { - return this.baseMapper.selectDataScopePage(dataScope, page, deviceType, deptid, beginTime, endTime, keywords, isOnline); + public List selectDataScopePage(DataScope dataScope, Page page, String deviceType, String deptid, String beginTime, String endTime, String keywords,String isOnline, String areaId) { + return this.baseMapper.selectDataScopePage(dataScope, page, deviceType, deptid, beginTime, endTime, keywords, isOnline, areaId); } @Override @@ -396,8 +396,6 @@ //删除设备集中器关联 deviceConcentratorService.deleteByDeviceId(id); }); - - } } @@ -412,6 +410,17 @@ SqlRunner.db().insert("INSERT INTO SYS_USER_CLIENT (ID, USERID, CLIENTID,LOGTIME) VALUES ({0}, {1},{2},SYSDATE())", IdWorker.getId(), id, clientid); } + public String getAreaFullNameById(String area) { + String fullName = this.baseMapper.getArea(area); + String pid = this.baseMapper.getAreaPId(area); + if (pid.equals("0")) { + return fullName; + } else { + fullName = getAreaFullNameById(pid) + "/" + fullName; + return fullName; + } + } + /** * 关联集中器 * diff --git a/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/controller/BusWellInfoController.java b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/controller/BusWellInfoController.java index 89415c6..5c2ada9 100644 --- a/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/controller/BusWellInfoController.java +++ b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/controller/BusWellInfoController.java @@ -73,7 +73,7 @@ */ @RequestMapping(value = "/list", method = RequestMethod.GET) @ResponseBody - public Object list(String keywords, String wellType, String deptid, String bfzt) { + public Object list(String keywords, String wellType, String deptid, String bfzt, String areaId) { Page page = new PageFactory().defaultPage(); //查询数据权限 使用默认DEPTID 字段 @@ -85,7 +85,8 @@ responsibleDeptIds.add(permissionService.getCurrLoginUser().getDeptId()); dataScope.setDeptIds(responsibleDeptIds); } - List list = busWellInfoService.selectDataScopePage(dataScope, page, keywords, wellType, deptid, bfzt); + areaId += "%"; + List list = busWellInfoService.selectDataScopePage(dataScope, page, keywords, wellType, deptid, bfzt, areaId); page.setRecords(list); return new SuccessResponseData(super.packForBT(page)); } diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/BusConfigController.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/BusConfigController.java index 122ebba..e50680b 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/BusConfigController.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/BusConfigController.java @@ -81,7 +81,7 @@ Page page = new PageFactory().defaultPage();//page使用 DataScope dataScope = service.getCurrUserDataScope(); List busConfigDTOList = busConfigService.getConfigList(page, keywords, - deptid, Long.valueOf(DeviceTypeEnum.Liquid.getIndex()), dataScope); + deptid, "", Long.valueOf(DeviceTypeEnum.Liquid.getIndex()), dataScope); page.setRecords(busConfigDTOList); successResult.setData(super.packForBT(page)); successResult.setMessage("success"); @@ -105,7 +105,7 @@ Page page = new PageFactory().defaultPage();//page使用 DataScope dataScope = service.getCurrUserDataScope(); List busConfigDTOList = busWasteGasConfigService.getConfigList(page, keywords, - deptid, Long.valueOf(DeviceTypeEnum.WasteGas.getIndex()), dataScope); + deptid, "", Long.valueOf(DeviceTypeEnum.WasteGas.getIndex()), dataScope); page.setRecords(busConfigDTOList); successResult.setData(super.packForBT(page)); successResult.setMessage("success"); @@ -129,7 +129,7 @@ Page page = new PageFactory().defaultPage();//page使用 DataScope dataScope = service.getCurrUserDataScope(); List busConfigDTOList = busMethaneConfigService.getConfigList(page, keywords, - deptid, Long.valueOf(DeviceTypeEnum.Methane.getIndex()), dataScope); + deptid, "", Long.valueOf(DeviceTypeEnum.Methane.getIndex()), dataScope); page.setRecords(busConfigDTOList); successResult.setData(super.packForBT(page)); successResult.setMessage("success"); @@ -154,7 +154,7 @@ Page page = new PageFactory().defaultPage();//page使用 DataScope dataScope = service.getCurrUserDataScope(); List busConfigDTOList = busTubeConfigService.getConfigList(page, keywords, - deptid, Long.valueOf(DeviceTypeEnum.Tube.getIndex()), dataScope); + deptid, "", Long.valueOf(DeviceTypeEnum.Tube.getIndex()), dataScope); page.setRecords(busConfigDTOList); successResult.setData(super.packForBT(page)); successResult.setMessage("success"); @@ -178,7 +178,7 @@ Page page = new PageFactory().defaultPage();//page使用 DataScope dataScope = service.getCurrUserDataScope(); List busConfigDTOList = busTempHumiConfigService.getConfigList(page, keywords, - deptid, Long.valueOf(DeviceTypeEnum.TempHumi.getIndex()), dataScope); + deptid, "", Long.valueOf(DeviceTypeEnum.TempHumi.getIndex()), dataScope); page.setRecords(busConfigDTOList); successResult.setData(super.packForBT(page)); successResult.setMessage("success"); @@ -202,7 +202,7 @@ Page page = new PageFactory().defaultPage();//page使用 DataScope dataScope = service.getCurrUserDataScope(); List busConfigDTOList = busDigConfigService.getConfigList(page, keywords, - deptid, Long.valueOf(DeviceTypeEnum.Dig.getIndex()), dataScope); + deptid, "", Long.valueOf(DeviceTypeEnum.Dig.getIndex()), dataScope); page.setRecords(busConfigDTOList); successResult.setData(super.packForBT(page)); successResult.setMessage("success"); @@ -220,13 +220,41 @@ @RequestMapping(value = "/noiseConfig/list") @ResponseBody public Object noiseConfigList(@RequestParam(required = false) String keywords, - @RequestParam(required = false) String deptid) { + @RequestParam(required = false) String deptid, + @RequestParam(required = false) String areaId) { SuccessResponseData successResult = new SuccessResponseData(); try { + areaId += "%"; Page page = new PageFactory().defaultPage();//page使用 DataScope dataScope = service.getCurrUserDataScope(); List busConfigDTOList = busNoiseConfigService.getConfigList(page, keywords, - deptid, Long.valueOf(DeviceTypeEnum.Noise.getIndex()), dataScope); + deptid, areaId, Long.valueOf(DeviceTypeEnum.Noise.getIndex()), dataScope); + page.setRecords(busConfigDTOList); + successResult.setData(super.packForBT(page)); + successResult.setMessage("success"); + } catch (Exception e) { + e.printStackTrace(); + successResult.setCode(500); + successResult.setMessage("false"); + } + return successResult; + } + + /** + * 水表获取配置列表 + */ + @RequestMapping(value = "/watchConfig/list") + @ResponseBody + public Object watchConfigList(@RequestParam(required = false) String keywords, + @RequestParam(required = false) String deptid, + @RequestParam(required = false) String areaId) { + SuccessResponseData successResult = new SuccessResponseData(); + try { + areaId += "%"; + Page page = new PageFactory().defaultPage();//page使用 + DataScope dataScope = service.getCurrUserDataScope(); + List busConfigDTOList = busNoiseConfigService.getConfigList(page, keywords, + deptid, areaId, Long.valueOf(DeviceTypeEnum.WaterMeter.getIndex()), dataScope); page.setRecords(busConfigDTOList); successResult.setData(super.packForBT(page)); successResult.setMessage("success"); @@ -521,7 +549,7 @@ page.setSize(Integer.MAX_VALUE); DataScope dataScope = service.getCurrUserDataScope(); List busConfigDTOList = busConfigService.getConfigList(page, keywords, - deptid, Long.valueOf(DeviceTypeEnum.Liquid.getIndex()), dataScope); + deptid, "", Long.valueOf(DeviceTypeEnum.Liquid.getIndex()), dataScope); busConfigService.exp(busConfigDTOList, response); } catch (Exception e) { e.printStackTrace(); @@ -547,7 +575,7 @@ page.setSize(Integer.MAX_VALUE); DataScope dataScope = service.getCurrUserDataScope(); List busConfigDTOList = busWasteGasConfigService.getConfigList(page, keywords, - deptid, Long.valueOf(DeviceTypeEnum.WasteGas.getIndex()), dataScope); + deptid, "", Long.valueOf(DeviceTypeEnum.WasteGas.getIndex()), dataScope); busWasteGasConfigService.exp(busConfigDTOList, response); } catch (Exception e) { e.printStackTrace(); @@ -573,7 +601,7 @@ page.setSize(Integer.MAX_VALUE); DataScope dataScope = service.getCurrUserDataScope(); List busConfigDTOList = busMethaneConfigService.getConfigList(page, keywords, - deptid, Long.valueOf(DeviceTypeEnum.Methane.getIndex()), dataScope); + deptid, "", Long.valueOf(DeviceTypeEnum.Methane.getIndex()), dataScope); busMethaneConfigService.exp(busConfigDTOList, response); } catch (Exception e) { e.printStackTrace(); @@ -599,7 +627,7 @@ page.setSize(Integer.MAX_VALUE); DataScope dataScope = service.getCurrUserDataScope(); List busConfigDTOList = busTempHumiConfigService.getConfigList(page, keywords, - deptid, Long.valueOf(DeviceTypeEnum.TempHumi.getIndex()), dataScope); + deptid, "", Long.valueOf(DeviceTypeEnum.TempHumi.getIndex()), dataScope); busTempHumiConfigService.exp(busConfigDTOList, response); } catch (Exception e) { e.printStackTrace(); @@ -625,7 +653,7 @@ page.setSize(Integer.MAX_VALUE); DataScope dataScope = service.getCurrUserDataScope(); List busConfigDTOList = busDigConfigService.getConfigList(page, keywords, - deptid, Long.valueOf(DeviceTypeEnum.Dig.getIndex()), dataScope); + deptid, "", Long.valueOf(DeviceTypeEnum.Dig.getIndex()), dataScope); busDigConfigService.exp(busConfigDTOList, response); } catch (Exception e) { e.printStackTrace(); @@ -643,6 +671,7 @@ @ResponseBody public void exportNoise(@RequestParam(required = false) String keywords, @RequestParam(required = false) String deptid, + @RequestParam(required = false) String areaId, HttpServletResponse response) { try { Page page = new PageFactory().defaultPage();//page使用 @@ -650,8 +679,9 @@ page.setSearchCount(false); page.setSize(Integer.MAX_VALUE); DataScope dataScope = service.getCurrUserDataScope(); + areaId += "%"; List busConfigDTOList = busNoiseConfigService.getConfigList(page, keywords, - deptid, Long.valueOf(DeviceTypeEnum.Noise.getIndex()), dataScope); + deptid, areaId, Long.valueOf(DeviceTypeEnum.Noise.getIndex()), dataScope); busNoiseConfigService.exp(busConfigDTOList, response); } catch (Exception e) { e.printStackTrace(); @@ -669,7 +699,7 @@ Page page = new PageFactory().defaultPage();//page使用 DataScope dataScope = service.getCurrUserDataScope(); List busConfigDTOList = busGasLiquidConfigService.getConfigList(page, keywords, - deptid, Long.valueOf(DeviceTypeEnum.LG.getIndex()), dataScope); + deptid, "", Long.valueOf(DeviceTypeEnum.LG.getIndex()), dataScope); page.setRecords(busConfigDTOList); successResult.setData(super.packForBT(page)); successResult.setMessage("success"); diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/BusConfigControllerBak.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/BusConfigControllerBak.java index f386d80..d5d8f39 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/BusConfigControllerBak.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/BusConfigControllerBak.java @@ -88,7 +88,7 @@ busConfigServiceHashMap.get(deviceType.intValue()); Page page = new PageFactory().defaultPage();//page使用 DataScope dataScope = service.getCurrUserDataScope(); - List busConfigDTOList = iBusConfigService.getConfigList(page, keywords, deptid,deviceType, dataScope); + List busConfigDTOList = iBusConfigService.getConfigList(page, keywords, deptid, "", deviceType, dataScope); page.setRecords(busConfigDTOList); successResult.setData(super.packForBT(page)); successResult.setMessage("success"); @@ -262,7 +262,7 @@ page.setSearchCount(false); page.setSize(Integer.MAX_VALUE); DataScope dataScope = service.getCurrUserDataScope(); - List busConfigDTOList = iBusConfigService.getConfigList(page, keywords, deptid,deviceType, dataScope); + List busConfigDTOList = iBusConfigService.getConfigList(page, keywords, deptid, "", deviceType, dataScope); iBusConfigService.exp(busConfigDTOList,response); } catch (Exception e) { e.printStackTrace(); diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java index 988f6a3..21ffcec 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java @@ -80,14 +80,15 @@ @ApiOperation("获取设备列表") @RequestMapping(value = "/list") @ResponseBody - public Object list(String keywords, String deviceType, String deptid, String beginTime, String endTime, String isOnline) { + public Object list(String keywords, String deviceType, String deptid, String beginTime, String endTime, String isOnline, String areaId) { Page page = new PageFactory().defaultPage(); //查询数据权限 使用默认DEPTID 字段 DataScope dataScope = permissionService.getCurrUserDataScope(); - List list = deviceService.selectDataScopePage(dataScope, page, deviceType, deptid, beginTime, endTime, keywords, isOnline); + areaId += "%"; + List list = deviceService.selectDataScopePage(dataScope, page, deviceType, deptid, beginTime, endTime, keywords, isOnline, areaId); list.forEach(deviceDto -> { - deviceDto.setBfztName(permissionService.getDictNameByCode(ModularDictConst.BFZT, deviceDto.getBfzt())); deviceDto.setOnlineStateName(permissionService.getDictNameByCode(ModularDictConst.ONLINESTATUS, deviceDto.getOnlineState())); + deviceDto.setAreaFullName(deviceService.getAreaFullNameById(deviceDto.getArea())); }); page.setRecords(list); return new SuccessResponseData(super.packForBT(page)); @@ -199,14 +200,14 @@ @RequestMapping(value = "/batchExport") @Permission @ResponseBody - public void batchExport(HttpServletResponse response, String keywords, String deviceType, String deptid, String beginTime, String endTime, String isOnline) throws IOException { + public void batchExport(HttpServletResponse response, String keywords, String deviceType, String deptid, String beginTime, String endTime, String isOnline, String areaId) throws IOException { Page page = new PageFactory().defaultPage(); page.setCurrent(1); page.setSearchCount(false); page.setSize(Integer.MAX_VALUE); DataScope dataScope = permissionService.getCurrUserDataScope(); - List list = deviceService.selectDataScopePage(dataScope, page, deviceType, deptid, beginTime, endTime, keywords, isOnline); + List list = deviceService.selectDataScopePage(dataScope, page, deviceType, deptid, beginTime, endTime, keywords, isOnline, areaId); list.forEach(deviceDto -> { deviceDto.setBfztName(permissionService.getDictNameByCode(ModularDictConst.BFZT, deviceDto.getBfzt())); deviceDto.setOnlineStateName(permissionService.getDictNameByCode(ModularDictConst.ONLINESTATUS, deviceDto.getOnlineState())); diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/BusConfigMapper.java b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/BusConfigMapper.java index 8e66b48..6dbf4e2 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/BusConfigMapper.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/BusConfigMapper.java @@ -26,9 +26,12 @@ List> getConfigList(@Param("page") Page page, @Param("keywords") String keywords, @Param("deptid") String deptid, + @Param("areaId") String areaId, @Param("sensorid") String sensorid, @Param("dataScope") DataScope dataScope); + String getArea(@Param("id") String id); + String getAreaPId(@Param("id") String id); String getConcenCodeByDevId(@Param("devID") Long devID); String getWellDeepByDevId(@Param("devID") Long devID); diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceMapper.java b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceMapper.java index de7f150..37a59d8 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceMapper.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceMapper.java @@ -20,10 +20,13 @@ */ public interface DeviceMapper extends BaseMapper { - List selectDataScopePage(@Param("scope") DataScope dataScope, @Param("page") Page page, @Param("deviceType") String deviceType, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords,@Param("isOnline") String isOnline); + List selectDataScopePage(@Param("scope") DataScope dataScope, @Param("page") Page page, @Param("deviceType") String deviceType, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords,@Param("isOnline") String isOnline, @Param("areaId") String areaId); DeviceWellDto selectWellIdByCode(@Param("wellCode") String wellCode); + String getArea(@Param("id") String id); + String getAreaPId(@Param("id") String id); + DeviceConcentratorDto selectDeviceConcentorByCode(@Param("concenCode") String concenCode); List selectWellDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords); diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusConfigMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusConfigMapper.xml index 92d6c14..d85a9cd 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusConfigMapper.xml +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusConfigMapper.xml @@ -67,6 +67,9 @@ and s.ID = + + and a.AREA like #{areaId} + ORDER by writetime DESC @@ -104,5 +107,19 @@ limit 1 + + + + diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml index 3de0ee0..96c6a71 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml @@ -15,7 +15,7 @@ - ID,DEVCODE,DEVICENAME,DEVICETYPE,DEVICETYPENAME,WATCHTYPE,COMMUNICATION,MODELID,MODELNAME,DEPTID,DEPTNAME,WELLCODE,POSITION,CONCENID,CONCENCODE,ONLINESTATE,VALID,TS,BFZT,wellId, + ID,DEVCODE,DEVICENAME,DEVICETYPE,DEVICETYPENAME,WATCHTYPE,COMMUNICATION,MODELID,MODELNAME,DEPTID,DEPTNAME,WELLCODE,POSITION,CONCENID,CONCENCODE,ONLINESTATE,VALID,TS,BFZT,AREA,wellId, as INSTALLDATE @@ -37,6 +37,20 @@ SELECT id,CONCENCODE FROM bus_concentrator WHERE VALID = '1' AND CONCENCODE = #{concenCode} + + + + diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dto/DeviceDto.java b/casic-device/src/main/java/com/casic/missiles/modular/system/dto/DeviceDto.java index 64050e7..4ca24bc 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/dto/DeviceDto.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dto/DeviceDto.java @@ -59,6 +59,8 @@ private String bfzt; private String bfztName; private String wellId; + private String area; + private String areaFullName; @Override protected Serializable pkVal() { diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/IBusConfigService.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/IBusConfigService.java index 032af19..c6c2efa 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/IBusConfigService.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/IBusConfigService.java @@ -24,6 +24,7 @@ List getConfigList(Page page, String keywords, String deptid, + String areaId, Long deviceType, DataScope dataScope); String getConcenCodeByDevId(Long devID); diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/IDeviceService.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/IDeviceService.java index 5374e8a..6b84904 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/IDeviceService.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/IDeviceService.java @@ -30,7 +30,7 @@ * @param endTime 设备安装结束时间 * @return 设备列表 */ - List selectDataScopePage(DataScope dataScope, Page page, String deviceType, String deptid, String beginTime, String endTime, String keywords,String isOnline); + List selectDataScopePage(DataScope dataScope, Page page, String deviceType, String deptid, String beginTime, String endTime, String keywords,String isOnline, String areaId); /** * 根据闸井编号查询闸井ID @@ -137,6 +137,8 @@ void registerGeTui(Long id, String clientid); + String getAreaFullNameById(String area); + List> selectDataList(DataScope dataScope, String wellCode, String watchType, String beginTime, String endTime); /** diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusConfigServiceImpl.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusConfigServiceImpl.java index 364829c..d7e38aa 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusConfigServiceImpl.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusConfigServiceImpl.java @@ -75,9 +75,10 @@ public List getConfigList(Page page, String keywords, String deptid, + String areaId, Long deviceType, DataScope dataScope) { - List> result = this.baseMapper.getConfigList(page, keywords, deptid, + List> result = this.baseMapper.getConfigList(page, keywords, deptid, "", BusConfigDTO.sensorHashMap.get(deviceType.intValue()), dataScope); List busConfigDTOList = new ArrayList<>(); for (Map objectMap : result) { diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusDigConfigServiceImpl.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusDigConfigServiceImpl.java index acca7f9..8c8c592 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusDigConfigServiceImpl.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusDigConfigServiceImpl.java @@ -73,9 +73,10 @@ public List getConfigList(Page page, String keywords, String deptid, + String areaId, Long deviceType, DataScope dataScope) { - List> result = this.baseMapper.getConfigList(page, keywords, deptid, + List> result = this.baseMapper.getConfigList(page, keywords, deptid, "", BusConfigDTO.sensorHashMap.get(deviceType.intValue()), dataScope); List busConfigDTOList = new ArrayList<>(); for (Map objectMap : result) { diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusGasLiquidConfigServiceImpl.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusGasLiquidConfigServiceImpl.java index 528e0cf..62cd290 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusGasLiquidConfigServiceImpl.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusGasLiquidConfigServiceImpl.java @@ -73,9 +73,10 @@ public List getConfigList(Page page, String keywords, String deptid, + String areaId, Long deviceType, DataScope dataScope) { - List> result = this.baseMapper.getConfigList(page, keywords, deptid, + List> result = this.baseMapper.getConfigList(page, keywords, deptid, "", BusConfigDTO.sensorHashMap.get(deviceType.intValue()), dataScope); List busConfigDTOList = new ArrayList<>(); for (Map objectMap : result) { diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusMethaneConfigServiceImpl.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusMethaneConfigServiceImpl.java index 194f897..527cc5b 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusMethaneConfigServiceImpl.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusMethaneConfigServiceImpl.java @@ -73,9 +73,10 @@ public List getConfigList(Page page, String keywords, String deptid, + String areaId, Long deviceType, DataScope dataScope) { - List> result = this.baseMapper.getConfigList(page, keywords, deptid, + List> result = this.baseMapper.getConfigList(page, keywords, deptid, "", BusConfigDTO.sensorHashMap.get(deviceType.intValue()), dataScope); List busConfigDTOList = new ArrayList<>(); for (Map objectMap : result) { diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusNoiseConfigServiceImpl.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusNoiseConfigServiceImpl.java index 303d665..dd7e94b 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusNoiseConfigServiceImpl.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusNoiseConfigServiceImpl.java @@ -73,9 +73,10 @@ public List getConfigList(Page page, String keywords, String deptid, + String areaId, Long deviceType, DataScope dataScope) { - List> result = this.baseMapper.getConfigList(page, keywords, deptid, + List> result = this.baseMapper.getConfigList(page, keywords, deptid, areaId, BusConfigDTO.sensorHashMap.get(deviceType.intValue()), dataScope); List busConfigDTOList = new ArrayList<>(); for (Map objectMap : result) { diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusTempHumiConfigServiceImpl.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusTempHumiConfigServiceImpl.java index 57e4801..63c46c7 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusTempHumiConfigServiceImpl.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusTempHumiConfigServiceImpl.java @@ -73,9 +73,10 @@ public List getConfigList(Page page, String keywords, String deptid, + String areaId, Long deviceType, DataScope dataScope) { - List> result = this.baseMapper.getConfigList(page, keywords, deptid, + List> result = this.baseMapper.getConfigList(page, keywords, deptid, "", BusConfigDTO.sensorHashMap.get(deviceType.intValue()), dataScope); List busConfigDTOList = new ArrayList<>(); for (Map objectMap : result) { diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusTubeConfigServiceImpl.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusTubeConfigServiceImpl.java index 4396fd3..51dfbe7 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusTubeConfigServiceImpl.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusTubeConfigServiceImpl.java @@ -73,9 +73,10 @@ public List getConfigList(Page page, String keywords, String deptid, + String areaId, Long deviceType, DataScope dataScope) { - List> result = this.baseMapper.getConfigList(page, keywords, deptid, + List> result = this.baseMapper.getConfigList(page, keywords, deptid, "", BusConfigDTO.sensorHashMap.get(deviceType.intValue()), dataScope); List busConfigDTOList = new ArrayList<>(); for (Map objectMap : result) { diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusWasteGasConfigServiceImpl.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusWasteGasConfigServiceImpl.java index eafc238..c6b4b54 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusWasteGasConfigServiceImpl.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusWasteGasConfigServiceImpl.java @@ -74,9 +74,10 @@ public List getConfigList(Page page, String keywords, String deptid, + String areaId, Long deviceType, DataScope dataScope) { - List> result = this.baseMapper.getConfigList(page, keywords, deptid, + List> result = this.baseMapper.getConfigList(page, keywords, deptid, "", BusConfigDTO.sensorHashMap.get(deviceType.intValue()), dataScope); List busConfigDTOList = new ArrayList<>(); for (Map objectMap : result) { diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceServiceImpl.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceServiceImpl.java index 9e279da..1298635 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceServiceImpl.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceServiceImpl.java @@ -164,8 +164,8 @@ } @Override - public List selectDataScopePage(DataScope dataScope, Page page, String deviceType, String deptid, String beginTime, String endTime, String keywords,String isOnline) { - return this.baseMapper.selectDataScopePage(dataScope, page, deviceType, deptid, beginTime, endTime, keywords, isOnline); + public List selectDataScopePage(DataScope dataScope, Page page, String deviceType, String deptid, String beginTime, String endTime, String keywords,String isOnline, String areaId) { + return this.baseMapper.selectDataScopePage(dataScope, page, deviceType, deptid, beginTime, endTime, keywords, isOnline, areaId); } @Override @@ -396,8 +396,6 @@ //删除设备集中器关联 deviceConcentratorService.deleteByDeviceId(id); }); - - } } @@ -412,6 +410,17 @@ SqlRunner.db().insert("INSERT INTO SYS_USER_CLIENT (ID, USERID, CLIENTID,LOGTIME) VALUES ({0}, {1},{2},SYSDATE())", IdWorker.getId(), id, clientid); } + public String getAreaFullNameById(String area) { + String fullName = this.baseMapper.getArea(area); + String pid = this.baseMapper.getAreaPId(area); + if (pid.equals("0")) { + return fullName; + } else { + fullName = getAreaFullNameById(pid) + "/" + fullName; + return fullName; + } + } + /** * 关联集中器 * diff --git a/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/controller/BusWellInfoController.java b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/controller/BusWellInfoController.java index 89415c6..5c2ada9 100644 --- a/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/controller/BusWellInfoController.java +++ b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/controller/BusWellInfoController.java @@ -73,7 +73,7 @@ */ @RequestMapping(value = "/list", method = RequestMethod.GET) @ResponseBody - public Object list(String keywords, String wellType, String deptid, String bfzt) { + public Object list(String keywords, String wellType, String deptid, String bfzt, String areaId) { Page page = new PageFactory().defaultPage(); //查询数据权限 使用默认DEPTID 字段 @@ -85,7 +85,8 @@ responsibleDeptIds.add(permissionService.getCurrLoginUser().getDeptId()); dataScope.setDeptIds(responsibleDeptIds); } - List list = busWellInfoService.selectDataScopePage(dataScope, page, keywords, wellType, deptid, bfzt); + areaId += "%"; + List list = busWellInfoService.selectDataScopePage(dataScope, page, keywords, wellType, deptid, bfzt, areaId); page.setRecords(list); return new SuccessResponseData(super.packForBT(page)); } diff --git a/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/dao/BusWellInfoMapper.java b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/dao/BusWellInfoMapper.java index caa2ca1..f7a64c7 100644 --- a/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/dao/BusWellInfoMapper.java +++ b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/dao/BusWellInfoMapper.java @@ -19,7 +19,7 @@ */ public interface BusWellInfoMapper extends BaseMapper { - List selectDataScopePage(@Param("scope") DataScope dataScope, @Param("page") Page page, @Param("keywords") String keywords, @Param("wellType") String wellType, @Param("deptid") String deptid, @Param("bfzt") String bfzt); + List selectDataScopePage(@Param("scope") DataScope dataScope, @Param("page") Page page, @Param("keywords") String keywords, @Param("wellType") String wellType, @Param("deptid") String deptid, @Param("bfzt") String bfzt, @Param("areaId") String areaId); List getDeviceInWellInfo(@Param("id") Long id); @@ -59,6 +59,7 @@ String getAreaId(@Param("qu") String qu, @Param("area") String area); + String getArea(@Param("id") String id); String getAreaPId(@Param("id") String id); List getWellList(@Param("scope") DataScope dataScope, @Param("keywords") String keywords, @Param("wellType") String deviceType, @Param("deptid") String deptid); diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/BusConfigController.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/BusConfigController.java index 122ebba..e50680b 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/BusConfigController.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/BusConfigController.java @@ -81,7 +81,7 @@ Page page = new PageFactory().defaultPage();//page使用 DataScope dataScope = service.getCurrUserDataScope(); List busConfigDTOList = busConfigService.getConfigList(page, keywords, - deptid, Long.valueOf(DeviceTypeEnum.Liquid.getIndex()), dataScope); + deptid, "", Long.valueOf(DeviceTypeEnum.Liquid.getIndex()), dataScope); page.setRecords(busConfigDTOList); successResult.setData(super.packForBT(page)); successResult.setMessage("success"); @@ -105,7 +105,7 @@ Page page = new PageFactory().defaultPage();//page使用 DataScope dataScope = service.getCurrUserDataScope(); List busConfigDTOList = busWasteGasConfigService.getConfigList(page, keywords, - deptid, Long.valueOf(DeviceTypeEnum.WasteGas.getIndex()), dataScope); + deptid, "", Long.valueOf(DeviceTypeEnum.WasteGas.getIndex()), dataScope); page.setRecords(busConfigDTOList); successResult.setData(super.packForBT(page)); successResult.setMessage("success"); @@ -129,7 +129,7 @@ Page page = new PageFactory().defaultPage();//page使用 DataScope dataScope = service.getCurrUserDataScope(); List busConfigDTOList = busMethaneConfigService.getConfigList(page, keywords, - deptid, Long.valueOf(DeviceTypeEnum.Methane.getIndex()), dataScope); + deptid, "", Long.valueOf(DeviceTypeEnum.Methane.getIndex()), dataScope); page.setRecords(busConfigDTOList); successResult.setData(super.packForBT(page)); successResult.setMessage("success"); @@ -154,7 +154,7 @@ Page page = new PageFactory().defaultPage();//page使用 DataScope dataScope = service.getCurrUserDataScope(); List busConfigDTOList = busTubeConfigService.getConfigList(page, keywords, - deptid, Long.valueOf(DeviceTypeEnum.Tube.getIndex()), dataScope); + deptid, "", Long.valueOf(DeviceTypeEnum.Tube.getIndex()), dataScope); page.setRecords(busConfigDTOList); successResult.setData(super.packForBT(page)); successResult.setMessage("success"); @@ -178,7 +178,7 @@ Page page = new PageFactory().defaultPage();//page使用 DataScope dataScope = service.getCurrUserDataScope(); List busConfigDTOList = busTempHumiConfigService.getConfigList(page, keywords, - deptid, Long.valueOf(DeviceTypeEnum.TempHumi.getIndex()), dataScope); + deptid, "", Long.valueOf(DeviceTypeEnum.TempHumi.getIndex()), dataScope); page.setRecords(busConfigDTOList); successResult.setData(super.packForBT(page)); successResult.setMessage("success"); @@ -202,7 +202,7 @@ Page page = new PageFactory().defaultPage();//page使用 DataScope dataScope = service.getCurrUserDataScope(); List busConfigDTOList = busDigConfigService.getConfigList(page, keywords, - deptid, Long.valueOf(DeviceTypeEnum.Dig.getIndex()), dataScope); + deptid, "", Long.valueOf(DeviceTypeEnum.Dig.getIndex()), dataScope); page.setRecords(busConfigDTOList); successResult.setData(super.packForBT(page)); successResult.setMessage("success"); @@ -220,13 +220,41 @@ @RequestMapping(value = "/noiseConfig/list") @ResponseBody public Object noiseConfigList(@RequestParam(required = false) String keywords, - @RequestParam(required = false) String deptid) { + @RequestParam(required = false) String deptid, + @RequestParam(required = false) String areaId) { SuccessResponseData successResult = new SuccessResponseData(); try { + areaId += "%"; Page page = new PageFactory().defaultPage();//page使用 DataScope dataScope = service.getCurrUserDataScope(); List busConfigDTOList = busNoiseConfigService.getConfigList(page, keywords, - deptid, Long.valueOf(DeviceTypeEnum.Noise.getIndex()), dataScope); + deptid, areaId, Long.valueOf(DeviceTypeEnum.Noise.getIndex()), dataScope); + page.setRecords(busConfigDTOList); + successResult.setData(super.packForBT(page)); + successResult.setMessage("success"); + } catch (Exception e) { + e.printStackTrace(); + successResult.setCode(500); + successResult.setMessage("false"); + } + return successResult; + } + + /** + * 水表获取配置列表 + */ + @RequestMapping(value = "/watchConfig/list") + @ResponseBody + public Object watchConfigList(@RequestParam(required = false) String keywords, + @RequestParam(required = false) String deptid, + @RequestParam(required = false) String areaId) { + SuccessResponseData successResult = new SuccessResponseData(); + try { + areaId += "%"; + Page page = new PageFactory().defaultPage();//page使用 + DataScope dataScope = service.getCurrUserDataScope(); + List busConfigDTOList = busNoiseConfigService.getConfigList(page, keywords, + deptid, areaId, Long.valueOf(DeviceTypeEnum.WaterMeter.getIndex()), dataScope); page.setRecords(busConfigDTOList); successResult.setData(super.packForBT(page)); successResult.setMessage("success"); @@ -521,7 +549,7 @@ page.setSize(Integer.MAX_VALUE); DataScope dataScope = service.getCurrUserDataScope(); List busConfigDTOList = busConfigService.getConfigList(page, keywords, - deptid, Long.valueOf(DeviceTypeEnum.Liquid.getIndex()), dataScope); + deptid, "", Long.valueOf(DeviceTypeEnum.Liquid.getIndex()), dataScope); busConfigService.exp(busConfigDTOList, response); } catch (Exception e) { e.printStackTrace(); @@ -547,7 +575,7 @@ page.setSize(Integer.MAX_VALUE); DataScope dataScope = service.getCurrUserDataScope(); List busConfigDTOList = busWasteGasConfigService.getConfigList(page, keywords, - deptid, Long.valueOf(DeviceTypeEnum.WasteGas.getIndex()), dataScope); + deptid, "", Long.valueOf(DeviceTypeEnum.WasteGas.getIndex()), dataScope); busWasteGasConfigService.exp(busConfigDTOList, response); } catch (Exception e) { e.printStackTrace(); @@ -573,7 +601,7 @@ page.setSize(Integer.MAX_VALUE); DataScope dataScope = service.getCurrUserDataScope(); List busConfigDTOList = busMethaneConfigService.getConfigList(page, keywords, - deptid, Long.valueOf(DeviceTypeEnum.Methane.getIndex()), dataScope); + deptid, "", Long.valueOf(DeviceTypeEnum.Methane.getIndex()), dataScope); busMethaneConfigService.exp(busConfigDTOList, response); } catch (Exception e) { e.printStackTrace(); @@ -599,7 +627,7 @@ page.setSize(Integer.MAX_VALUE); DataScope dataScope = service.getCurrUserDataScope(); List busConfigDTOList = busTempHumiConfigService.getConfigList(page, keywords, - deptid, Long.valueOf(DeviceTypeEnum.TempHumi.getIndex()), dataScope); + deptid, "", Long.valueOf(DeviceTypeEnum.TempHumi.getIndex()), dataScope); busTempHumiConfigService.exp(busConfigDTOList, response); } catch (Exception e) { e.printStackTrace(); @@ -625,7 +653,7 @@ page.setSize(Integer.MAX_VALUE); DataScope dataScope = service.getCurrUserDataScope(); List busConfigDTOList = busDigConfigService.getConfigList(page, keywords, - deptid, Long.valueOf(DeviceTypeEnum.Dig.getIndex()), dataScope); + deptid, "", Long.valueOf(DeviceTypeEnum.Dig.getIndex()), dataScope); busDigConfigService.exp(busConfigDTOList, response); } catch (Exception e) { e.printStackTrace(); @@ -643,6 +671,7 @@ @ResponseBody public void exportNoise(@RequestParam(required = false) String keywords, @RequestParam(required = false) String deptid, + @RequestParam(required = false) String areaId, HttpServletResponse response) { try { Page page = new PageFactory().defaultPage();//page使用 @@ -650,8 +679,9 @@ page.setSearchCount(false); page.setSize(Integer.MAX_VALUE); DataScope dataScope = service.getCurrUserDataScope(); + areaId += "%"; List busConfigDTOList = busNoiseConfigService.getConfigList(page, keywords, - deptid, Long.valueOf(DeviceTypeEnum.Noise.getIndex()), dataScope); + deptid, areaId, Long.valueOf(DeviceTypeEnum.Noise.getIndex()), dataScope); busNoiseConfigService.exp(busConfigDTOList, response); } catch (Exception e) { e.printStackTrace(); @@ -669,7 +699,7 @@ Page page = new PageFactory().defaultPage();//page使用 DataScope dataScope = service.getCurrUserDataScope(); List busConfigDTOList = busGasLiquidConfigService.getConfigList(page, keywords, - deptid, Long.valueOf(DeviceTypeEnum.LG.getIndex()), dataScope); + deptid, "", Long.valueOf(DeviceTypeEnum.LG.getIndex()), dataScope); page.setRecords(busConfigDTOList); successResult.setData(super.packForBT(page)); successResult.setMessage("success"); diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/BusConfigControllerBak.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/BusConfigControllerBak.java index f386d80..d5d8f39 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/BusConfigControllerBak.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/BusConfigControllerBak.java @@ -88,7 +88,7 @@ busConfigServiceHashMap.get(deviceType.intValue()); Page page = new PageFactory().defaultPage();//page使用 DataScope dataScope = service.getCurrUserDataScope(); - List busConfigDTOList = iBusConfigService.getConfigList(page, keywords, deptid,deviceType, dataScope); + List busConfigDTOList = iBusConfigService.getConfigList(page, keywords, deptid, "", deviceType, dataScope); page.setRecords(busConfigDTOList); successResult.setData(super.packForBT(page)); successResult.setMessage("success"); @@ -262,7 +262,7 @@ page.setSearchCount(false); page.setSize(Integer.MAX_VALUE); DataScope dataScope = service.getCurrUserDataScope(); - List busConfigDTOList = iBusConfigService.getConfigList(page, keywords, deptid,deviceType, dataScope); + List busConfigDTOList = iBusConfigService.getConfigList(page, keywords, deptid, "", deviceType, dataScope); iBusConfigService.exp(busConfigDTOList,response); } catch (Exception e) { e.printStackTrace(); diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java index 988f6a3..21ffcec 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java @@ -80,14 +80,15 @@ @ApiOperation("获取设备列表") @RequestMapping(value = "/list") @ResponseBody - public Object list(String keywords, String deviceType, String deptid, String beginTime, String endTime, String isOnline) { + public Object list(String keywords, String deviceType, String deptid, String beginTime, String endTime, String isOnline, String areaId) { Page page = new PageFactory().defaultPage(); //查询数据权限 使用默认DEPTID 字段 DataScope dataScope = permissionService.getCurrUserDataScope(); - List list = deviceService.selectDataScopePage(dataScope, page, deviceType, deptid, beginTime, endTime, keywords, isOnline); + areaId += "%"; + List list = deviceService.selectDataScopePage(dataScope, page, deviceType, deptid, beginTime, endTime, keywords, isOnline, areaId); list.forEach(deviceDto -> { - deviceDto.setBfztName(permissionService.getDictNameByCode(ModularDictConst.BFZT, deviceDto.getBfzt())); deviceDto.setOnlineStateName(permissionService.getDictNameByCode(ModularDictConst.ONLINESTATUS, deviceDto.getOnlineState())); + deviceDto.setAreaFullName(deviceService.getAreaFullNameById(deviceDto.getArea())); }); page.setRecords(list); return new SuccessResponseData(super.packForBT(page)); @@ -199,14 +200,14 @@ @RequestMapping(value = "/batchExport") @Permission @ResponseBody - public void batchExport(HttpServletResponse response, String keywords, String deviceType, String deptid, String beginTime, String endTime, String isOnline) throws IOException { + public void batchExport(HttpServletResponse response, String keywords, String deviceType, String deptid, String beginTime, String endTime, String isOnline, String areaId) throws IOException { Page page = new PageFactory().defaultPage(); page.setCurrent(1); page.setSearchCount(false); page.setSize(Integer.MAX_VALUE); DataScope dataScope = permissionService.getCurrUserDataScope(); - List list = deviceService.selectDataScopePage(dataScope, page, deviceType, deptid, beginTime, endTime, keywords, isOnline); + List list = deviceService.selectDataScopePage(dataScope, page, deviceType, deptid, beginTime, endTime, keywords, isOnline, areaId); list.forEach(deviceDto -> { deviceDto.setBfztName(permissionService.getDictNameByCode(ModularDictConst.BFZT, deviceDto.getBfzt())); deviceDto.setOnlineStateName(permissionService.getDictNameByCode(ModularDictConst.ONLINESTATUS, deviceDto.getOnlineState())); diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/BusConfigMapper.java b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/BusConfigMapper.java index 8e66b48..6dbf4e2 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/BusConfigMapper.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/BusConfigMapper.java @@ -26,9 +26,12 @@ List> getConfigList(@Param("page") Page page, @Param("keywords") String keywords, @Param("deptid") String deptid, + @Param("areaId") String areaId, @Param("sensorid") String sensorid, @Param("dataScope") DataScope dataScope); + String getArea(@Param("id") String id); + String getAreaPId(@Param("id") String id); String getConcenCodeByDevId(@Param("devID") Long devID); String getWellDeepByDevId(@Param("devID") Long devID); diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceMapper.java b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceMapper.java index de7f150..37a59d8 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceMapper.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceMapper.java @@ -20,10 +20,13 @@ */ public interface DeviceMapper extends BaseMapper { - List selectDataScopePage(@Param("scope") DataScope dataScope, @Param("page") Page page, @Param("deviceType") String deviceType, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords,@Param("isOnline") String isOnline); + List selectDataScopePage(@Param("scope") DataScope dataScope, @Param("page") Page page, @Param("deviceType") String deviceType, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords,@Param("isOnline") String isOnline, @Param("areaId") String areaId); DeviceWellDto selectWellIdByCode(@Param("wellCode") String wellCode); + String getArea(@Param("id") String id); + String getAreaPId(@Param("id") String id); + DeviceConcentratorDto selectDeviceConcentorByCode(@Param("concenCode") String concenCode); List selectWellDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page") Page page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords); diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusConfigMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusConfigMapper.xml index 92d6c14..d85a9cd 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusConfigMapper.xml +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusConfigMapper.xml @@ -67,6 +67,9 @@ and s.ID = + + and a.AREA like #{areaId} + ORDER by writetime DESC @@ -104,5 +107,19 @@ limit 1 + + + + diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml index 3de0ee0..96c6a71 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml @@ -15,7 +15,7 @@ - ID,DEVCODE,DEVICENAME,DEVICETYPE,DEVICETYPENAME,WATCHTYPE,COMMUNICATION,MODELID,MODELNAME,DEPTID,DEPTNAME,WELLCODE,POSITION,CONCENID,CONCENCODE,ONLINESTATE,VALID,TS,BFZT,wellId, + ID,DEVCODE,DEVICENAME,DEVICETYPE,DEVICETYPENAME,WATCHTYPE,COMMUNICATION,MODELID,MODELNAME,DEPTID,DEPTNAME,WELLCODE,POSITION,CONCENID,CONCENCODE,ONLINESTATE,VALID,TS,BFZT,AREA,wellId, as INSTALLDATE @@ -37,6 +37,20 @@ SELECT id,CONCENCODE FROM bus_concentrator WHERE VALID = '1' AND CONCENCODE = #{concenCode} + + + + diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dto/DeviceDto.java b/casic-device/src/main/java/com/casic/missiles/modular/system/dto/DeviceDto.java index 64050e7..4ca24bc 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/dto/DeviceDto.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dto/DeviceDto.java @@ -59,6 +59,8 @@ private String bfzt; private String bfztName; private String wellId; + private String area; + private String areaFullName; @Override protected Serializable pkVal() { diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/IBusConfigService.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/IBusConfigService.java index 032af19..c6c2efa 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/IBusConfigService.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/IBusConfigService.java @@ -24,6 +24,7 @@ List getConfigList(Page page, String keywords, String deptid, + String areaId, Long deviceType, DataScope dataScope); String getConcenCodeByDevId(Long devID); diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/IDeviceService.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/IDeviceService.java index 5374e8a..6b84904 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/IDeviceService.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/IDeviceService.java @@ -30,7 +30,7 @@ * @param endTime 设备安装结束时间 * @return 设备列表 */ - List selectDataScopePage(DataScope dataScope, Page page, String deviceType, String deptid, String beginTime, String endTime, String keywords,String isOnline); + List selectDataScopePage(DataScope dataScope, Page page, String deviceType, String deptid, String beginTime, String endTime, String keywords,String isOnline, String areaId); /** * 根据闸井编号查询闸井ID @@ -137,6 +137,8 @@ void registerGeTui(Long id, String clientid); + String getAreaFullNameById(String area); + List> selectDataList(DataScope dataScope, String wellCode, String watchType, String beginTime, String endTime); /** diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusConfigServiceImpl.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusConfigServiceImpl.java index 364829c..d7e38aa 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusConfigServiceImpl.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusConfigServiceImpl.java @@ -75,9 +75,10 @@ public List getConfigList(Page page, String keywords, String deptid, + String areaId, Long deviceType, DataScope dataScope) { - List> result = this.baseMapper.getConfigList(page, keywords, deptid, + List> result = this.baseMapper.getConfigList(page, keywords, deptid, "", BusConfigDTO.sensorHashMap.get(deviceType.intValue()), dataScope); List busConfigDTOList = new ArrayList<>(); for (Map objectMap : result) { diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusDigConfigServiceImpl.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusDigConfigServiceImpl.java index acca7f9..8c8c592 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusDigConfigServiceImpl.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusDigConfigServiceImpl.java @@ -73,9 +73,10 @@ public List getConfigList(Page page, String keywords, String deptid, + String areaId, Long deviceType, DataScope dataScope) { - List> result = this.baseMapper.getConfigList(page, keywords, deptid, + List> result = this.baseMapper.getConfigList(page, keywords, deptid, "", BusConfigDTO.sensorHashMap.get(deviceType.intValue()), dataScope); List busConfigDTOList = new ArrayList<>(); for (Map objectMap : result) { diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusGasLiquidConfigServiceImpl.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusGasLiquidConfigServiceImpl.java index 528e0cf..62cd290 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusGasLiquidConfigServiceImpl.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusGasLiquidConfigServiceImpl.java @@ -73,9 +73,10 @@ public List getConfigList(Page page, String keywords, String deptid, + String areaId, Long deviceType, DataScope dataScope) { - List> result = this.baseMapper.getConfigList(page, keywords, deptid, + List> result = this.baseMapper.getConfigList(page, keywords, deptid, "", BusConfigDTO.sensorHashMap.get(deviceType.intValue()), dataScope); List busConfigDTOList = new ArrayList<>(); for (Map objectMap : result) { diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusMethaneConfigServiceImpl.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusMethaneConfigServiceImpl.java index 194f897..527cc5b 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusMethaneConfigServiceImpl.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusMethaneConfigServiceImpl.java @@ -73,9 +73,10 @@ public List getConfigList(Page page, String keywords, String deptid, + String areaId, Long deviceType, DataScope dataScope) { - List> result = this.baseMapper.getConfigList(page, keywords, deptid, + List> result = this.baseMapper.getConfigList(page, keywords, deptid, "", BusConfigDTO.sensorHashMap.get(deviceType.intValue()), dataScope); List busConfigDTOList = new ArrayList<>(); for (Map objectMap : result) { diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusNoiseConfigServiceImpl.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusNoiseConfigServiceImpl.java index 303d665..dd7e94b 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusNoiseConfigServiceImpl.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusNoiseConfigServiceImpl.java @@ -73,9 +73,10 @@ public List getConfigList(Page page, String keywords, String deptid, + String areaId, Long deviceType, DataScope dataScope) { - List> result = this.baseMapper.getConfigList(page, keywords, deptid, + List> result = this.baseMapper.getConfigList(page, keywords, deptid, areaId, BusConfigDTO.sensorHashMap.get(deviceType.intValue()), dataScope); List busConfigDTOList = new ArrayList<>(); for (Map objectMap : result) { diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusTempHumiConfigServiceImpl.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusTempHumiConfigServiceImpl.java index 57e4801..63c46c7 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusTempHumiConfigServiceImpl.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusTempHumiConfigServiceImpl.java @@ -73,9 +73,10 @@ public List getConfigList(Page page, String keywords, String deptid, + String areaId, Long deviceType, DataScope dataScope) { - List> result = this.baseMapper.getConfigList(page, keywords, deptid, + List> result = this.baseMapper.getConfigList(page, keywords, deptid, "", BusConfigDTO.sensorHashMap.get(deviceType.intValue()), dataScope); List busConfigDTOList = new ArrayList<>(); for (Map objectMap : result) { diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusTubeConfigServiceImpl.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusTubeConfigServiceImpl.java index 4396fd3..51dfbe7 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusTubeConfigServiceImpl.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusTubeConfigServiceImpl.java @@ -73,9 +73,10 @@ public List getConfigList(Page page, String keywords, String deptid, + String areaId, Long deviceType, DataScope dataScope) { - List> result = this.baseMapper.getConfigList(page, keywords, deptid, + List> result = this.baseMapper.getConfigList(page, keywords, deptid, "", BusConfigDTO.sensorHashMap.get(deviceType.intValue()), dataScope); List busConfigDTOList = new ArrayList<>(); for (Map objectMap : result) { diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusWasteGasConfigServiceImpl.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusWasteGasConfigServiceImpl.java index eafc238..c6b4b54 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusWasteGasConfigServiceImpl.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusWasteGasConfigServiceImpl.java @@ -74,9 +74,10 @@ public List getConfigList(Page page, String keywords, String deptid, + String areaId, Long deviceType, DataScope dataScope) { - List> result = this.baseMapper.getConfigList(page, keywords, deptid, + List> result = this.baseMapper.getConfigList(page, keywords, deptid, "", BusConfigDTO.sensorHashMap.get(deviceType.intValue()), dataScope); List busConfigDTOList = new ArrayList<>(); for (Map objectMap : result) { diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceServiceImpl.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceServiceImpl.java index 9e279da..1298635 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceServiceImpl.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceServiceImpl.java @@ -164,8 +164,8 @@ } @Override - public List selectDataScopePage(DataScope dataScope, Page page, String deviceType, String deptid, String beginTime, String endTime, String keywords,String isOnline) { - return this.baseMapper.selectDataScopePage(dataScope, page, deviceType, deptid, beginTime, endTime, keywords, isOnline); + public List selectDataScopePage(DataScope dataScope, Page page, String deviceType, String deptid, String beginTime, String endTime, String keywords,String isOnline, String areaId) { + return this.baseMapper.selectDataScopePage(dataScope, page, deviceType, deptid, beginTime, endTime, keywords, isOnline, areaId); } @Override @@ -396,8 +396,6 @@ //删除设备集中器关联 deviceConcentratorService.deleteByDeviceId(id); }); - - } } @@ -412,6 +410,17 @@ SqlRunner.db().insert("INSERT INTO SYS_USER_CLIENT (ID, USERID, CLIENTID,LOGTIME) VALUES ({0}, {1},{2},SYSDATE())", IdWorker.getId(), id, clientid); } + public String getAreaFullNameById(String area) { + String fullName = this.baseMapper.getArea(area); + String pid = this.baseMapper.getAreaPId(area); + if (pid.equals("0")) { + return fullName; + } else { + fullName = getAreaFullNameById(pid) + "/" + fullName; + return fullName; + } + } + /** * 关联集中器 * diff --git a/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/controller/BusWellInfoController.java b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/controller/BusWellInfoController.java index 89415c6..5c2ada9 100644 --- a/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/controller/BusWellInfoController.java +++ b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/controller/BusWellInfoController.java @@ -73,7 +73,7 @@ */ @RequestMapping(value = "/list", method = RequestMethod.GET) @ResponseBody - public Object list(String keywords, String wellType, String deptid, String bfzt) { + public Object list(String keywords, String wellType, String deptid, String bfzt, String areaId) { Page page = new PageFactory().defaultPage(); //查询数据权限 使用默认DEPTID 字段 @@ -85,7 +85,8 @@ responsibleDeptIds.add(permissionService.getCurrLoginUser().getDeptId()); dataScope.setDeptIds(responsibleDeptIds); } - List list = busWellInfoService.selectDataScopePage(dataScope, page, keywords, wellType, deptid, bfzt); + areaId += "%"; + List list = busWellInfoService.selectDataScopePage(dataScope, page, keywords, wellType, deptid, bfzt, areaId); page.setRecords(list); return new SuccessResponseData(super.packForBT(page)); } diff --git a/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/dao/BusWellInfoMapper.java b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/dao/BusWellInfoMapper.java index caa2ca1..f7a64c7 100644 --- a/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/dao/BusWellInfoMapper.java +++ b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/dao/BusWellInfoMapper.java @@ -19,7 +19,7 @@ */ public interface BusWellInfoMapper extends BaseMapper { - List selectDataScopePage(@Param("scope") DataScope dataScope, @Param("page") Page page, @Param("keywords") String keywords, @Param("wellType") String wellType, @Param("deptid") String deptid, @Param("bfzt") String bfzt); + List selectDataScopePage(@Param("scope") DataScope dataScope, @Param("page") Page page, @Param("keywords") String keywords, @Param("wellType") String wellType, @Param("deptid") String deptid, @Param("bfzt") String bfzt, @Param("areaId") String areaId); List getDeviceInWellInfo(@Param("id") Long id); @@ -59,6 +59,7 @@ String getAreaId(@Param("qu") String qu, @Param("area") String area); + String getArea(@Param("id") String id); String getAreaPId(@Param("id") String id); List getWellList(@Param("scope") DataScope dataScope, @Param("keywords") String keywords, @Param("wellType") String deviceType, @Param("deptid") String deptid); diff --git a/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusWellInfoMapper.xml b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusWellInfoMapper.xml index dcc5bff..b884b6a 100644 --- a/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusWellInfoMapper.xml +++ b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusWellInfoMapper.xml @@ -76,6 +76,9 @@ ) + + and w.AREA like #{areaId} + '%' || @@ -306,6 +309,13 @@ AND r.id = a.pid + + @@ -104,5 +107,19 @@ limit 1 + + + + diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml index 3de0ee0..96c6a71 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml @@ -15,7 +15,7 @@ - ID,DEVCODE,DEVICENAME,DEVICETYPE,DEVICETYPENAME,WATCHTYPE,COMMUNICATION,MODELID,MODELNAME,DEPTID,DEPTNAME,WELLCODE,POSITION,CONCENID,CONCENCODE,ONLINESTATE,VALID,TS,BFZT,wellId, + ID,DEVCODE,DEVICENAME,DEVICETYPE,DEVICETYPENAME,WATCHTYPE,COMMUNICATION,MODELID,MODELNAME,DEPTID,DEPTNAME,WELLCODE,POSITION,CONCENID,CONCENCODE,ONLINESTATE,VALID,TS,BFZT,AREA,wellId, as INSTALLDATE @@ -37,6 +37,20 @@ SELECT id,CONCENCODE FROM bus_concentrator WHERE VALID = '1' AND CONCENCODE = #{concenCode} + + + + diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dto/DeviceDto.java b/casic-device/src/main/java/com/casic/missiles/modular/system/dto/DeviceDto.java index 64050e7..4ca24bc 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/dto/DeviceDto.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dto/DeviceDto.java @@ -59,6 +59,8 @@ private String bfzt; private String bfztName; private String wellId; + private String area; + private String areaFullName; @Override protected Serializable pkVal() { diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/IBusConfigService.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/IBusConfigService.java index 032af19..c6c2efa 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/IBusConfigService.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/IBusConfigService.java @@ -24,6 +24,7 @@ List getConfigList(Page page, String keywords, String deptid, + String areaId, Long deviceType, DataScope dataScope); String getConcenCodeByDevId(Long devID); diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/IDeviceService.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/IDeviceService.java index 5374e8a..6b84904 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/IDeviceService.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/IDeviceService.java @@ -30,7 +30,7 @@ * @param endTime 设备安装结束时间 * @return 设备列表 */ - List selectDataScopePage(DataScope dataScope, Page page, String deviceType, String deptid, String beginTime, String endTime, String keywords,String isOnline); + List selectDataScopePage(DataScope dataScope, Page page, String deviceType, String deptid, String beginTime, String endTime, String keywords,String isOnline, String areaId); /** * 根据闸井编号查询闸井ID @@ -137,6 +137,8 @@ void registerGeTui(Long id, String clientid); + String getAreaFullNameById(String area); + List> selectDataList(DataScope dataScope, String wellCode, String watchType, String beginTime, String endTime); /** diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusConfigServiceImpl.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusConfigServiceImpl.java index 364829c..d7e38aa 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusConfigServiceImpl.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusConfigServiceImpl.java @@ -75,9 +75,10 @@ public List getConfigList(Page page, String keywords, String deptid, + String areaId, Long deviceType, DataScope dataScope) { - List> result = this.baseMapper.getConfigList(page, keywords, deptid, + List> result = this.baseMapper.getConfigList(page, keywords, deptid, "", BusConfigDTO.sensorHashMap.get(deviceType.intValue()), dataScope); List busConfigDTOList = new ArrayList<>(); for (Map objectMap : result) { diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusDigConfigServiceImpl.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusDigConfigServiceImpl.java index acca7f9..8c8c592 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusDigConfigServiceImpl.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusDigConfigServiceImpl.java @@ -73,9 +73,10 @@ public List getConfigList(Page page, String keywords, String deptid, + String areaId, Long deviceType, DataScope dataScope) { - List> result = this.baseMapper.getConfigList(page, keywords, deptid, + List> result = this.baseMapper.getConfigList(page, keywords, deptid, "", BusConfigDTO.sensorHashMap.get(deviceType.intValue()), dataScope); List busConfigDTOList = new ArrayList<>(); for (Map objectMap : result) { diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusGasLiquidConfigServiceImpl.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusGasLiquidConfigServiceImpl.java index 528e0cf..62cd290 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusGasLiquidConfigServiceImpl.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusGasLiquidConfigServiceImpl.java @@ -73,9 +73,10 @@ public List getConfigList(Page page, String keywords, String deptid, + String areaId, Long deviceType, DataScope dataScope) { - List> result = this.baseMapper.getConfigList(page, keywords, deptid, + List> result = this.baseMapper.getConfigList(page, keywords, deptid, "", BusConfigDTO.sensorHashMap.get(deviceType.intValue()), dataScope); List busConfigDTOList = new ArrayList<>(); for (Map objectMap : result) { diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusMethaneConfigServiceImpl.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusMethaneConfigServiceImpl.java index 194f897..527cc5b 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusMethaneConfigServiceImpl.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusMethaneConfigServiceImpl.java @@ -73,9 +73,10 @@ public List getConfigList(Page page, String keywords, String deptid, + String areaId, Long deviceType, DataScope dataScope) { - List> result = this.baseMapper.getConfigList(page, keywords, deptid, + List> result = this.baseMapper.getConfigList(page, keywords, deptid, "", BusConfigDTO.sensorHashMap.get(deviceType.intValue()), dataScope); List busConfigDTOList = new ArrayList<>(); for (Map objectMap : result) { diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusNoiseConfigServiceImpl.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusNoiseConfigServiceImpl.java index 303d665..dd7e94b 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusNoiseConfigServiceImpl.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusNoiseConfigServiceImpl.java @@ -73,9 +73,10 @@ public List getConfigList(Page page, String keywords, String deptid, + String areaId, Long deviceType, DataScope dataScope) { - List> result = this.baseMapper.getConfigList(page, keywords, deptid, + List> result = this.baseMapper.getConfigList(page, keywords, deptid, areaId, BusConfigDTO.sensorHashMap.get(deviceType.intValue()), dataScope); List busConfigDTOList = new ArrayList<>(); for (Map objectMap : result) { diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusTempHumiConfigServiceImpl.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusTempHumiConfigServiceImpl.java index 57e4801..63c46c7 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusTempHumiConfigServiceImpl.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusTempHumiConfigServiceImpl.java @@ -73,9 +73,10 @@ public List getConfigList(Page page, String keywords, String deptid, + String areaId, Long deviceType, DataScope dataScope) { - List> result = this.baseMapper.getConfigList(page, keywords, deptid, + List> result = this.baseMapper.getConfigList(page, keywords, deptid, "", BusConfigDTO.sensorHashMap.get(deviceType.intValue()), dataScope); List busConfigDTOList = new ArrayList<>(); for (Map objectMap : result) { diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusTubeConfigServiceImpl.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusTubeConfigServiceImpl.java index 4396fd3..51dfbe7 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusTubeConfigServiceImpl.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusTubeConfigServiceImpl.java @@ -73,9 +73,10 @@ public List getConfigList(Page page, String keywords, String deptid, + String areaId, Long deviceType, DataScope dataScope) { - List> result = this.baseMapper.getConfigList(page, keywords, deptid, + List> result = this.baseMapper.getConfigList(page, keywords, deptid, "", BusConfigDTO.sensorHashMap.get(deviceType.intValue()), dataScope); List busConfigDTOList = new ArrayList<>(); for (Map objectMap : result) { diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusWasteGasConfigServiceImpl.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusWasteGasConfigServiceImpl.java index eafc238..c6b4b54 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusWasteGasConfigServiceImpl.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusWasteGasConfigServiceImpl.java @@ -74,9 +74,10 @@ public List getConfigList(Page page, String keywords, String deptid, + String areaId, Long deviceType, DataScope dataScope) { - List> result = this.baseMapper.getConfigList(page, keywords, deptid, + List> result = this.baseMapper.getConfigList(page, keywords, deptid, "", BusConfigDTO.sensorHashMap.get(deviceType.intValue()), dataScope); List busConfigDTOList = new ArrayList<>(); for (Map objectMap : result) { diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceServiceImpl.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceServiceImpl.java index 9e279da..1298635 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceServiceImpl.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceServiceImpl.java @@ -164,8 +164,8 @@ } @Override - public List selectDataScopePage(DataScope dataScope, Page page, String deviceType, String deptid, String beginTime, String endTime, String keywords,String isOnline) { - return this.baseMapper.selectDataScopePage(dataScope, page, deviceType, deptid, beginTime, endTime, keywords, isOnline); + public List selectDataScopePage(DataScope dataScope, Page page, String deviceType, String deptid, String beginTime, String endTime, String keywords,String isOnline, String areaId) { + return this.baseMapper.selectDataScopePage(dataScope, page, deviceType, deptid, beginTime, endTime, keywords, isOnline, areaId); } @Override @@ -396,8 +396,6 @@ //删除设备集中器关联 deviceConcentratorService.deleteByDeviceId(id); }); - - } } @@ -412,6 +410,17 @@ SqlRunner.db().insert("INSERT INTO SYS_USER_CLIENT (ID, USERID, CLIENTID,LOGTIME) VALUES ({0}, {1},{2},SYSDATE())", IdWorker.getId(), id, clientid); } + public String getAreaFullNameById(String area) { + String fullName = this.baseMapper.getArea(area); + String pid = this.baseMapper.getAreaPId(area); + if (pid.equals("0")) { + return fullName; + } else { + fullName = getAreaFullNameById(pid) + "/" + fullName; + return fullName; + } + } + /** * 关联集中器 * diff --git a/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/controller/BusWellInfoController.java b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/controller/BusWellInfoController.java index 89415c6..5c2ada9 100644 --- a/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/controller/BusWellInfoController.java +++ b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/controller/BusWellInfoController.java @@ -73,7 +73,7 @@ */ @RequestMapping(value = "/list", method = RequestMethod.GET) @ResponseBody - public Object list(String keywords, String wellType, String deptid, String bfzt) { + public Object list(String keywords, String wellType, String deptid, String bfzt, String areaId) { Page page = new PageFactory().defaultPage(); //查询数据权限 使用默认DEPTID 字段 @@ -85,7 +85,8 @@ responsibleDeptIds.add(permissionService.getCurrLoginUser().getDeptId()); dataScope.setDeptIds(responsibleDeptIds); } - List list = busWellInfoService.selectDataScopePage(dataScope, page, keywords, wellType, deptid, bfzt); + areaId += "%"; + List list = busWellInfoService.selectDataScopePage(dataScope, page, keywords, wellType, deptid, bfzt, areaId); page.setRecords(list); return new SuccessResponseData(super.packForBT(page)); } diff --git a/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/dao/BusWellInfoMapper.java b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/dao/BusWellInfoMapper.java index caa2ca1..f7a64c7 100644 --- a/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/dao/BusWellInfoMapper.java +++ b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/dao/BusWellInfoMapper.java @@ -19,7 +19,7 @@ */ public interface BusWellInfoMapper extends BaseMapper { - List selectDataScopePage(@Param("scope") DataScope dataScope, @Param("page") Page page, @Param("keywords") String keywords, @Param("wellType") String wellType, @Param("deptid") String deptid, @Param("bfzt") String bfzt); + List selectDataScopePage(@Param("scope") DataScope dataScope, @Param("page") Page page, @Param("keywords") String keywords, @Param("wellType") String wellType, @Param("deptid") String deptid, @Param("bfzt") String bfzt, @Param("areaId") String areaId); List getDeviceInWellInfo(@Param("id") Long id); @@ -59,6 +59,7 @@ String getAreaId(@Param("qu") String qu, @Param("area") String area); + String getArea(@Param("id") String id); String getAreaPId(@Param("id") String id); List getWellList(@Param("scope") DataScope dataScope, @Param("keywords") String keywords, @Param("wellType") String deviceType, @Param("deptid") String deptid); diff --git a/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusWellInfoMapper.xml b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusWellInfoMapper.xml index dcc5bff..b884b6a 100644 --- a/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusWellInfoMapper.xml +++ b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusWellInfoMapper.xml @@ -76,6 +76,9 @@ ) + + and w.AREA like #{areaId} + '%' || @@ -306,6 +309,13 @@ AND r.id = a.pid + + @@ -104,5 +107,19 @@ limit 1 + + + + diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml index 3de0ee0..96c6a71 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml @@ -15,7 +15,7 @@ - ID,DEVCODE,DEVICENAME,DEVICETYPE,DEVICETYPENAME,WATCHTYPE,COMMUNICATION,MODELID,MODELNAME,DEPTID,DEPTNAME,WELLCODE,POSITION,CONCENID,CONCENCODE,ONLINESTATE,VALID,TS,BFZT,wellId, + ID,DEVCODE,DEVICENAME,DEVICETYPE,DEVICETYPENAME,WATCHTYPE,COMMUNICATION,MODELID,MODELNAME,DEPTID,DEPTNAME,WELLCODE,POSITION,CONCENID,CONCENCODE,ONLINESTATE,VALID,TS,BFZT,AREA,wellId, as INSTALLDATE @@ -37,6 +37,20 @@ SELECT id,CONCENCODE FROM bus_concentrator WHERE VALID = '1' AND CONCENCODE = #{concenCode} + + + + diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dto/DeviceDto.java b/casic-device/src/main/java/com/casic/missiles/modular/system/dto/DeviceDto.java index 64050e7..4ca24bc 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/dto/DeviceDto.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dto/DeviceDto.java @@ -59,6 +59,8 @@ private String bfzt; private String bfztName; private String wellId; + private String area; + private String areaFullName; @Override protected Serializable pkVal() { diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/IBusConfigService.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/IBusConfigService.java index 032af19..c6c2efa 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/IBusConfigService.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/IBusConfigService.java @@ -24,6 +24,7 @@ List getConfigList(Page page, String keywords, String deptid, + String areaId, Long deviceType, DataScope dataScope); String getConcenCodeByDevId(Long devID); diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/IDeviceService.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/IDeviceService.java index 5374e8a..6b84904 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/IDeviceService.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/IDeviceService.java @@ -30,7 +30,7 @@ * @param endTime 设备安装结束时间 * @return 设备列表 */ - List selectDataScopePage(DataScope dataScope, Page page, String deviceType, String deptid, String beginTime, String endTime, String keywords,String isOnline); + List selectDataScopePage(DataScope dataScope, Page page, String deviceType, String deptid, String beginTime, String endTime, String keywords,String isOnline, String areaId); /** * 根据闸井编号查询闸井ID @@ -137,6 +137,8 @@ void registerGeTui(Long id, String clientid); + String getAreaFullNameById(String area); + List> selectDataList(DataScope dataScope, String wellCode, String watchType, String beginTime, String endTime); /** diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusConfigServiceImpl.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusConfigServiceImpl.java index 364829c..d7e38aa 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusConfigServiceImpl.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusConfigServiceImpl.java @@ -75,9 +75,10 @@ public List getConfigList(Page page, String keywords, String deptid, + String areaId, Long deviceType, DataScope dataScope) { - List> result = this.baseMapper.getConfigList(page, keywords, deptid, + List> result = this.baseMapper.getConfigList(page, keywords, deptid, "", BusConfigDTO.sensorHashMap.get(deviceType.intValue()), dataScope); List busConfigDTOList = new ArrayList<>(); for (Map objectMap : result) { diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusDigConfigServiceImpl.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusDigConfigServiceImpl.java index acca7f9..8c8c592 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusDigConfigServiceImpl.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusDigConfigServiceImpl.java @@ -73,9 +73,10 @@ public List getConfigList(Page page, String keywords, String deptid, + String areaId, Long deviceType, DataScope dataScope) { - List> result = this.baseMapper.getConfigList(page, keywords, deptid, + List> result = this.baseMapper.getConfigList(page, keywords, deptid, "", BusConfigDTO.sensorHashMap.get(deviceType.intValue()), dataScope); List busConfigDTOList = new ArrayList<>(); for (Map objectMap : result) { diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusGasLiquidConfigServiceImpl.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusGasLiquidConfigServiceImpl.java index 528e0cf..62cd290 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusGasLiquidConfigServiceImpl.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusGasLiquidConfigServiceImpl.java @@ -73,9 +73,10 @@ public List getConfigList(Page page, String keywords, String deptid, + String areaId, Long deviceType, DataScope dataScope) { - List> result = this.baseMapper.getConfigList(page, keywords, deptid, + List> result = this.baseMapper.getConfigList(page, keywords, deptid, "", BusConfigDTO.sensorHashMap.get(deviceType.intValue()), dataScope); List busConfigDTOList = new ArrayList<>(); for (Map objectMap : result) { diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusMethaneConfigServiceImpl.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusMethaneConfigServiceImpl.java index 194f897..527cc5b 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusMethaneConfigServiceImpl.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusMethaneConfigServiceImpl.java @@ -73,9 +73,10 @@ public List getConfigList(Page page, String keywords, String deptid, + String areaId, Long deviceType, DataScope dataScope) { - List> result = this.baseMapper.getConfigList(page, keywords, deptid, + List> result = this.baseMapper.getConfigList(page, keywords, deptid, "", BusConfigDTO.sensorHashMap.get(deviceType.intValue()), dataScope); List busConfigDTOList = new ArrayList<>(); for (Map objectMap : result) { diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusNoiseConfigServiceImpl.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusNoiseConfigServiceImpl.java index 303d665..dd7e94b 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusNoiseConfigServiceImpl.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusNoiseConfigServiceImpl.java @@ -73,9 +73,10 @@ public List getConfigList(Page page, String keywords, String deptid, + String areaId, Long deviceType, DataScope dataScope) { - List> result = this.baseMapper.getConfigList(page, keywords, deptid, + List> result = this.baseMapper.getConfigList(page, keywords, deptid, areaId, BusConfigDTO.sensorHashMap.get(deviceType.intValue()), dataScope); List busConfigDTOList = new ArrayList<>(); for (Map objectMap : result) { diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusTempHumiConfigServiceImpl.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusTempHumiConfigServiceImpl.java index 57e4801..63c46c7 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusTempHumiConfigServiceImpl.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusTempHumiConfigServiceImpl.java @@ -73,9 +73,10 @@ public List getConfigList(Page page, String keywords, String deptid, + String areaId, Long deviceType, DataScope dataScope) { - List> result = this.baseMapper.getConfigList(page, keywords, deptid, + List> result = this.baseMapper.getConfigList(page, keywords, deptid, "", BusConfigDTO.sensorHashMap.get(deviceType.intValue()), dataScope); List busConfigDTOList = new ArrayList<>(); for (Map objectMap : result) { diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusTubeConfigServiceImpl.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusTubeConfigServiceImpl.java index 4396fd3..51dfbe7 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusTubeConfigServiceImpl.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusTubeConfigServiceImpl.java @@ -73,9 +73,10 @@ public List getConfigList(Page page, String keywords, String deptid, + String areaId, Long deviceType, DataScope dataScope) { - List> result = this.baseMapper.getConfigList(page, keywords, deptid, + List> result = this.baseMapper.getConfigList(page, keywords, deptid, "", BusConfigDTO.sensorHashMap.get(deviceType.intValue()), dataScope); List busConfigDTOList = new ArrayList<>(); for (Map objectMap : result) { diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusWasteGasConfigServiceImpl.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusWasteGasConfigServiceImpl.java index eafc238..c6b4b54 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusWasteGasConfigServiceImpl.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusWasteGasConfigServiceImpl.java @@ -74,9 +74,10 @@ public List getConfigList(Page page, String keywords, String deptid, + String areaId, Long deviceType, DataScope dataScope) { - List> result = this.baseMapper.getConfigList(page, keywords, deptid, + List> result = this.baseMapper.getConfigList(page, keywords, deptid, "", BusConfigDTO.sensorHashMap.get(deviceType.intValue()), dataScope); List busConfigDTOList = new ArrayList<>(); for (Map objectMap : result) { diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceServiceImpl.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceServiceImpl.java index 9e279da..1298635 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceServiceImpl.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceServiceImpl.java @@ -164,8 +164,8 @@ } @Override - public List selectDataScopePage(DataScope dataScope, Page page, String deviceType, String deptid, String beginTime, String endTime, String keywords,String isOnline) { - return this.baseMapper.selectDataScopePage(dataScope, page, deviceType, deptid, beginTime, endTime, keywords, isOnline); + public List selectDataScopePage(DataScope dataScope, Page page, String deviceType, String deptid, String beginTime, String endTime, String keywords,String isOnline, String areaId) { + return this.baseMapper.selectDataScopePage(dataScope, page, deviceType, deptid, beginTime, endTime, keywords, isOnline, areaId); } @Override @@ -396,8 +396,6 @@ //删除设备集中器关联 deviceConcentratorService.deleteByDeviceId(id); }); - - } } @@ -412,6 +410,17 @@ SqlRunner.db().insert("INSERT INTO SYS_USER_CLIENT (ID, USERID, CLIENTID,LOGTIME) VALUES ({0}, {1},{2},SYSDATE())", IdWorker.getId(), id, clientid); } + public String getAreaFullNameById(String area) { + String fullName = this.baseMapper.getArea(area); + String pid = this.baseMapper.getAreaPId(area); + if (pid.equals("0")) { + return fullName; + } else { + fullName = getAreaFullNameById(pid) + "/" + fullName; + return fullName; + } + } + /** * 关联集中器 * diff --git a/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/controller/BusWellInfoController.java b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/controller/BusWellInfoController.java index 89415c6..5c2ada9 100644 --- a/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/controller/BusWellInfoController.java +++ b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/controller/BusWellInfoController.java @@ -73,7 +73,7 @@ */ @RequestMapping(value = "/list", method = RequestMethod.GET) @ResponseBody - public Object list(String keywords, String wellType, String deptid, String bfzt) { + public Object list(String keywords, String wellType, String deptid, String bfzt, String areaId) { Page page = new PageFactory().defaultPage(); //查询数据权限 使用默认DEPTID 字段 @@ -85,7 +85,8 @@ responsibleDeptIds.add(permissionService.getCurrLoginUser().getDeptId()); dataScope.setDeptIds(responsibleDeptIds); } - List list = busWellInfoService.selectDataScopePage(dataScope, page, keywords, wellType, deptid, bfzt); + areaId += "%"; + List list = busWellInfoService.selectDataScopePage(dataScope, page, keywords, wellType, deptid, bfzt, areaId); page.setRecords(list); return new SuccessResponseData(super.packForBT(page)); } diff --git a/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/dao/BusWellInfoMapper.java b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/dao/BusWellInfoMapper.java index caa2ca1..f7a64c7 100644 --- a/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/dao/BusWellInfoMapper.java +++ b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/dao/BusWellInfoMapper.java @@ -19,7 +19,7 @@ */ public interface BusWellInfoMapper extends BaseMapper { - List selectDataScopePage(@Param("scope") DataScope dataScope, @Param("page") Page page, @Param("keywords") String keywords, @Param("wellType") String wellType, @Param("deptid") String deptid, @Param("bfzt") String bfzt); + List selectDataScopePage(@Param("scope") DataScope dataScope, @Param("page") Page page, @Param("keywords") String keywords, @Param("wellType") String wellType, @Param("deptid") String deptid, @Param("bfzt") String bfzt, @Param("areaId") String areaId); List getDeviceInWellInfo(@Param("id") Long id); @@ -59,6 +59,7 @@ String getAreaId(@Param("qu") String qu, @Param("area") String area); + String getArea(@Param("id") String id); String getAreaPId(@Param("id") String id); List getWellList(@Param("scope") DataScope dataScope, @Param("keywords") String keywords, @Param("wellType") String deviceType, @Param("deptid") String deptid); diff --git a/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusWellInfoMapper.xml b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusWellInfoMapper.xml index dcc5bff..b884b6a 100644 --- a/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusWellInfoMapper.xml +++ b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusWellInfoMapper.xml @@ -76,6 +76,9 @@ ) + + and w.AREA like #{areaId} + '%' || @@ -306,6 +309,13 @@ AND r.id = a.pid + + @@ -104,5 +107,19 @@ limit 1 + + + + diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml index 3de0ee0..96c6a71 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml @@ -15,7 +15,7 @@ - ID,DEVCODE,DEVICENAME,DEVICETYPE,DEVICETYPENAME,WATCHTYPE,COMMUNICATION,MODELID,MODELNAME,DEPTID,DEPTNAME,WELLCODE,POSITION,CONCENID,CONCENCODE,ONLINESTATE,VALID,TS,BFZT,wellId, + ID,DEVCODE,DEVICENAME,DEVICETYPE,DEVICETYPENAME,WATCHTYPE,COMMUNICATION,MODELID,MODELNAME,DEPTID,DEPTNAME,WELLCODE,POSITION,CONCENID,CONCENCODE,ONLINESTATE,VALID,TS,BFZT,AREA,wellId, as INSTALLDATE @@ -37,6 +37,20 @@ SELECT id,CONCENCODE FROM bus_concentrator WHERE VALID = '1' AND CONCENCODE = #{concenCode} + + + + diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dto/DeviceDto.java b/casic-device/src/main/java/com/casic/missiles/modular/system/dto/DeviceDto.java index 64050e7..4ca24bc 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/dto/DeviceDto.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dto/DeviceDto.java @@ -59,6 +59,8 @@ private String bfzt; private String bfztName; private String wellId; + private String area; + private String areaFullName; @Override protected Serializable pkVal() { diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/IBusConfigService.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/IBusConfigService.java index 032af19..c6c2efa 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/IBusConfigService.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/IBusConfigService.java @@ -24,6 +24,7 @@ List getConfigList(Page page, String keywords, String deptid, + String areaId, Long deviceType, DataScope dataScope); String getConcenCodeByDevId(Long devID); diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/IDeviceService.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/IDeviceService.java index 5374e8a..6b84904 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/IDeviceService.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/IDeviceService.java @@ -30,7 +30,7 @@ * @param endTime 设备安装结束时间 * @return 设备列表 */ - List selectDataScopePage(DataScope dataScope, Page page, String deviceType, String deptid, String beginTime, String endTime, String keywords,String isOnline); + List selectDataScopePage(DataScope dataScope, Page page, String deviceType, String deptid, String beginTime, String endTime, String keywords,String isOnline, String areaId); /** * 根据闸井编号查询闸井ID @@ -137,6 +137,8 @@ void registerGeTui(Long id, String clientid); + String getAreaFullNameById(String area); + List> selectDataList(DataScope dataScope, String wellCode, String watchType, String beginTime, String endTime); /** diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusConfigServiceImpl.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusConfigServiceImpl.java index 364829c..d7e38aa 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusConfigServiceImpl.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusConfigServiceImpl.java @@ -75,9 +75,10 @@ public List getConfigList(Page page, String keywords, String deptid, + String areaId, Long deviceType, DataScope dataScope) { - List> result = this.baseMapper.getConfigList(page, keywords, deptid, + List> result = this.baseMapper.getConfigList(page, keywords, deptid, "", BusConfigDTO.sensorHashMap.get(deviceType.intValue()), dataScope); List busConfigDTOList = new ArrayList<>(); for (Map objectMap : result) { diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusDigConfigServiceImpl.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusDigConfigServiceImpl.java index acca7f9..8c8c592 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusDigConfigServiceImpl.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusDigConfigServiceImpl.java @@ -73,9 +73,10 @@ public List getConfigList(Page page, String keywords, String deptid, + String areaId, Long deviceType, DataScope dataScope) { - List> result = this.baseMapper.getConfigList(page, keywords, deptid, + List> result = this.baseMapper.getConfigList(page, keywords, deptid, "", BusConfigDTO.sensorHashMap.get(deviceType.intValue()), dataScope); List busConfigDTOList = new ArrayList<>(); for (Map objectMap : result) { diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusGasLiquidConfigServiceImpl.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusGasLiquidConfigServiceImpl.java index 528e0cf..62cd290 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusGasLiquidConfigServiceImpl.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusGasLiquidConfigServiceImpl.java @@ -73,9 +73,10 @@ public List getConfigList(Page page, String keywords, String deptid, + String areaId, Long deviceType, DataScope dataScope) { - List> result = this.baseMapper.getConfigList(page, keywords, deptid, + List> result = this.baseMapper.getConfigList(page, keywords, deptid, "", BusConfigDTO.sensorHashMap.get(deviceType.intValue()), dataScope); List busConfigDTOList = new ArrayList<>(); for (Map objectMap : result) { diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusMethaneConfigServiceImpl.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusMethaneConfigServiceImpl.java index 194f897..527cc5b 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusMethaneConfigServiceImpl.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusMethaneConfigServiceImpl.java @@ -73,9 +73,10 @@ public List getConfigList(Page page, String keywords, String deptid, + String areaId, Long deviceType, DataScope dataScope) { - List> result = this.baseMapper.getConfigList(page, keywords, deptid, + List> result = this.baseMapper.getConfigList(page, keywords, deptid, "", BusConfigDTO.sensorHashMap.get(deviceType.intValue()), dataScope); List busConfigDTOList = new ArrayList<>(); for (Map objectMap : result) { diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusNoiseConfigServiceImpl.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusNoiseConfigServiceImpl.java index 303d665..dd7e94b 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusNoiseConfigServiceImpl.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusNoiseConfigServiceImpl.java @@ -73,9 +73,10 @@ public List getConfigList(Page page, String keywords, String deptid, + String areaId, Long deviceType, DataScope dataScope) { - List> result = this.baseMapper.getConfigList(page, keywords, deptid, + List> result = this.baseMapper.getConfigList(page, keywords, deptid, areaId, BusConfigDTO.sensorHashMap.get(deviceType.intValue()), dataScope); List busConfigDTOList = new ArrayList<>(); for (Map objectMap : result) { diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusTempHumiConfigServiceImpl.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusTempHumiConfigServiceImpl.java index 57e4801..63c46c7 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusTempHumiConfigServiceImpl.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusTempHumiConfigServiceImpl.java @@ -73,9 +73,10 @@ public List getConfigList(Page page, String keywords, String deptid, + String areaId, Long deviceType, DataScope dataScope) { - List> result = this.baseMapper.getConfigList(page, keywords, deptid, + List> result = this.baseMapper.getConfigList(page, keywords, deptid, "", BusConfigDTO.sensorHashMap.get(deviceType.intValue()), dataScope); List busConfigDTOList = new ArrayList<>(); for (Map objectMap : result) { diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusTubeConfigServiceImpl.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusTubeConfigServiceImpl.java index 4396fd3..51dfbe7 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusTubeConfigServiceImpl.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusTubeConfigServiceImpl.java @@ -73,9 +73,10 @@ public List getConfigList(Page page, String keywords, String deptid, + String areaId, Long deviceType, DataScope dataScope) { - List> result = this.baseMapper.getConfigList(page, keywords, deptid, + List> result = this.baseMapper.getConfigList(page, keywords, deptid, "", BusConfigDTO.sensorHashMap.get(deviceType.intValue()), dataScope); List busConfigDTOList = new ArrayList<>(); for (Map objectMap : result) { diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusWasteGasConfigServiceImpl.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusWasteGasConfigServiceImpl.java index eafc238..c6b4b54 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusWasteGasConfigServiceImpl.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/BusWasteGasConfigServiceImpl.java @@ -74,9 +74,10 @@ public List getConfigList(Page page, String keywords, String deptid, + String areaId, Long deviceType, DataScope dataScope) { - List> result = this.baseMapper.getConfigList(page, keywords, deptid, + List> result = this.baseMapper.getConfigList(page, keywords, deptid, "", BusConfigDTO.sensorHashMap.get(deviceType.intValue()), dataScope); List busConfigDTOList = new ArrayList<>(); for (Map objectMap : result) { diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceServiceImpl.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceServiceImpl.java index 9e279da..1298635 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceServiceImpl.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceServiceImpl.java @@ -164,8 +164,8 @@ } @Override - public List selectDataScopePage(DataScope dataScope, Page page, String deviceType, String deptid, String beginTime, String endTime, String keywords,String isOnline) { - return this.baseMapper.selectDataScopePage(dataScope, page, deviceType, deptid, beginTime, endTime, keywords, isOnline); + public List selectDataScopePage(DataScope dataScope, Page page, String deviceType, String deptid, String beginTime, String endTime, String keywords,String isOnline, String areaId) { + return this.baseMapper.selectDataScopePage(dataScope, page, deviceType, deptid, beginTime, endTime, keywords, isOnline, areaId); } @Override @@ -396,8 +396,6 @@ //删除设备集中器关联 deviceConcentratorService.deleteByDeviceId(id); }); - - } } @@ -412,6 +410,17 @@ SqlRunner.db().insert("INSERT INTO SYS_USER_CLIENT (ID, USERID, CLIENTID,LOGTIME) VALUES ({0}, {1},{2},SYSDATE())", IdWorker.getId(), id, clientid); } + public String getAreaFullNameById(String area) { + String fullName = this.baseMapper.getArea(area); + String pid = this.baseMapper.getAreaPId(area); + if (pid.equals("0")) { + return fullName; + } else { + fullName = getAreaFullNameById(pid) + "/" + fullName; + return fullName; + } + } + /** * 关联集中器 * diff --git a/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/controller/BusWellInfoController.java b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/controller/BusWellInfoController.java index 89415c6..5c2ada9 100644 --- a/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/controller/BusWellInfoController.java +++ b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/controller/BusWellInfoController.java @@ -73,7 +73,7 @@ */ @RequestMapping(value = "/list", method = RequestMethod.GET) @ResponseBody - public Object list(String keywords, String wellType, String deptid, String bfzt) { + public Object list(String keywords, String wellType, String deptid, String bfzt, String areaId) { Page page = new PageFactory().defaultPage(); //查询数据权限 使用默认DEPTID 字段 @@ -85,7 +85,8 @@ responsibleDeptIds.add(permissionService.getCurrLoginUser().getDeptId()); dataScope.setDeptIds(responsibleDeptIds); } - List list = busWellInfoService.selectDataScopePage(dataScope, page, keywords, wellType, deptid, bfzt); + areaId += "%"; + List list = busWellInfoService.selectDataScopePage(dataScope, page, keywords, wellType, deptid, bfzt, areaId); page.setRecords(list); return new SuccessResponseData(super.packForBT(page)); } diff --git a/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/dao/BusWellInfoMapper.java b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/dao/BusWellInfoMapper.java index caa2ca1..f7a64c7 100644 --- a/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/dao/BusWellInfoMapper.java +++ b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/dao/BusWellInfoMapper.java @@ -19,7 +19,7 @@ */ public interface BusWellInfoMapper extends BaseMapper { - List selectDataScopePage(@Param("scope") DataScope dataScope, @Param("page") Page page, @Param("keywords") String keywords, @Param("wellType") String wellType, @Param("deptid") String deptid, @Param("bfzt") String bfzt); + List selectDataScopePage(@Param("scope") DataScope dataScope, @Param("page") Page page, @Param("keywords") String keywords, @Param("wellType") String wellType, @Param("deptid") String deptid, @Param("bfzt") String bfzt, @Param("areaId") String areaId); List getDeviceInWellInfo(@Param("id") Long id); @@ -59,6 +59,7 @@ String getAreaId(@Param("qu") String qu, @Param("area") String area); + String getArea(@Param("id") String id); String getAreaPId(@Param("id") String id); List getWellList(@Param("scope") DataScope dataScope, @Param("keywords") String keywords, @Param("wellType") String deviceType, @Param("deptid") String deptid); diff --git a/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusWellInfoMapper.xml b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusWellInfoMapper.xml index dcc5bff..b884b6a 100644 --- a/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusWellInfoMapper.xml +++ b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusWellInfoMapper.xml @@ -76,6 +76,9 @@ ) + + and w.AREA like #{areaId} + '%' || @@ -306,6 +309,13 @@ AND r.id = a.pid + +