diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceDataListController.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceDataListController.java index 09d3c0d..0f13e84 100644 --- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceDataListController.java +++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceDataListController.java @@ -1,13 +1,8 @@ package com.casic.missiles.modular.system.controller; -import cn.hutool.core.collection.CollectionUtil; -import com.baomidou.mybatisplus.core.metadata.OrderItem; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.casic.missiles.core.application.context.AbstractPermissionContext; import com.casic.missiles.core.datascope.DataScope; -import com.casic.missiles.core.page.PageFactory; import com.casic.missiles.model.response.ResponseData; -import com.casic.missiles.modular.system.dto.ExcelModel.*; import com.casic.missiles.modular.system.dto.statistic.*; import com.casic.missiles.modular.system.service.DeviceDataListService; import lombok.extern.slf4j.Slf4j; @@ -27,92 +22,88 @@ // @Permission @GetMapping(value = "/welldata/list") - public Object wellDataList(String keywords, String deptid, String beginTime, String endTime) { + public Object wellDataList(String devcode, String wellCode, String beginTime, String endTime) { //查询数据权限 使用默认DEPTID 字段 DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope(); - List list = deviceDataListService.selectWellDataScope(dataScope, deptid, beginTime, endTime, keywords); - + List list = deviceDataListService.selectWellDataScope(dataScope, devcode, beginTime, endTime, wellCode); return ResponseData.success(list); } - /** * 开挖监测仪数据查询 * - * @param keywords - * @param deptid + * @param devcode + * @param wellCode * @param beginTime * @param endTime * @return */ - // @Permission + //@Permission @GetMapping(value = "/digdata/list") - public Object digDataList(String keywords, String deptid, String beginTime, String endTime) { + public Object digDataList(String devcode, String wellCode, String beginTime, String endTime) { DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope(); - List mapList = deviceDataListService.selectDigDataScope(dataScope, deptid, beginTime, endTime, keywords); + List mapList = deviceDataListService.selectDigDataScope(dataScope, devcode, beginTime, endTime, wellCode); return ResponseData.success(mapList); } @GetMapping(value = "/liquiddata/list") -// @Permission - public Object liquidDataList(String keywords, String deptid, String beginTime, String endTime) { + //@Permission + public Object liquidDataList(String devcode, String wellCode, String beginTime, String endTime) { //查询数据权限 使用默认DEPTID 字段 DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope(); - List list = deviceDataListService.selectLiquidDataScope(dataScope, deptid, beginTime, endTime, keywords); + List list = deviceDataListService.selectLiquidDataScope(dataScope, devcode, beginTime, endTime, wellCode); return ResponseData.success(list); } @GetMapping(value = "/gasdata/list") - //@Permission - public Object gasDataList(String keywords, String deptid, String beginTime, String endTime) { + public Object gasDataList(String devcode, String wellCode, String beginTime, String endTime) { DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope(); - List deviceDataExcelDtoList = deviceDataListService.selectGasDataScope(dataScope, deptid, beginTime, endTime, keywords); + List deviceDataExcelDtoList = deviceDataListService.selectGasDataScope(dataScope, devcode, beginTime, endTime, wellCode); return ResponseData.success(deviceDataExcelDtoList); } @GetMapping(value = "/noisedata/list") - public Object noiseDataList(String keywords, String deptid, String beginTime, String endTime) { + public Object noiseDataList(String devcode, String wellCode, String beginTime, String endTime) { DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope(); - List mapList = deviceDataListService.selectNoiseDataScope(dataScope, deptid, beginTime, endTime, keywords); + List mapList = deviceDataListService.selectNoiseDataScope(dataScope, devcode, beginTime, endTime, wellCode); return ResponseData.success(mapList); } @GetMapping(value = "/harmfuldata/list") - public Object harmfulDataList(String keywords, String deptid, String beginTime, String endTime) { + public Object harmfulDataList(String devcode, String wellCode, String beginTime, String endTime) { DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope(); - List mapList = deviceDataListService.selectHarmfulDataScope(dataScope, deptid, beginTime, endTime, keywords); + List mapList = deviceDataListService.selectHarmfulDataScope(dataScope, devcode, beginTime, endTime, wellCode); return ResponseData.success(mapList); } @GetMapping(value = "/tempdata/list") - public Object tempDataList(String keywords, String deptid, String beginTime, String endTime) { + public Object tempDataList(String devcode, String wellCode, String beginTime, String endTime) { DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope(); - List mapList = deviceDataListService.selectTempDataScope(dataScope, deptid, beginTime, endTime, keywords); + List mapList = deviceDataListService.selectTempDataScope(dataScope, devcode, beginTime, endTime, wellCode); return ResponseData.success(mapList); } - @GetMapping(value = "/welllocadata/list") - public Object wellLocDataList(String keywords, String deptid, String beginTime, String endTime) { + public Object wellLocDataList(String devcode, String wellCode, String beginTime, String endTime) { DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope(); - List mapList = deviceDataListService.selectWellLocDataScope(dataScope, deptid, beginTime, endTime, keywords); + List mapList = deviceDataListService.selectWellLocDataScope(dataScope, devcode, beginTime, endTime, wellCode); return ResponseData.success(mapList); } @GetMapping(value = "/liquidGasData/list") - public Object liquidGasDataList(String keywords, String deptid, String sensorType, String beginTime, String endTime) { + public Object liquidGasDataList(String devcode, String wellCode, String sensorType, String beginTime, String endTime) { DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope(); - List mapList = deviceDataListService.selectGasLiquidDataScope(dataScope, sensorType, deptid, beginTime, endTime, keywords); + List mapList = deviceDataListService.selectGasLiquidDataScope(dataScope, sensorType, devcode, beginTime, endTime, wellCode); return ResponseData.success(mapList); } @GetMapping(value = "/tubedata/list") //@Permission - public Object tubeDataList(String keywords, String deptid, String beginTime, String endTime) { + public Object tubeDataList(String devcode, String wellCode, String beginTime, String endTime) { DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope(); - List mapList = deviceDataListService.selectTubeDataScope(dataScope, deptid, beginTime, endTime, keywords); + List mapList = deviceDataListService.selectTubeDataScope(dataScope, devcode, beginTime, endTime, wellCode); return ResponseData.success(mapList); } @@ -120,23 +111,20 @@ * 消防栓列表 */ @GetMapping(value = "/hydrant/list") - public Object hydrantList(String keywords, String deptid, String beginTime, String endTime) { + public Object hydrantList(String devcode, String wellCode, String beginTime, String endTime) { DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope(); - List mapList= deviceDataListService.getHydrantlist(dataScope, deptid, beginTime, endTime, keywords); + List mapList= deviceDataListService.getHydrantlist(dataScope, devcode, beginTime, endTime, wellCode); return ResponseData.success(mapList); } - /** * 硫化氢列表 */ @GetMapping(value = "/h2s/list") - public Object h2sList(String keywords, String deptid, String beginTime, String endTime) { + public Object h2sList(String devcode, String wellCode, String beginTime, String endTime) { DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope(); - System.out.println(keywords); - List mapList= deviceDataListService.getH2sDataScope(dataScope, deptid, beginTime, endTime, keywords); + List mapList= deviceDataListService.getH2sDataScope(dataScope, devcode, beginTime, endTime, wellCode); return ResponseData.success(mapList); } - } diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceDataListController.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceDataListController.java index 09d3c0d..0f13e84 100644 --- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceDataListController.java +++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceDataListController.java @@ -1,13 +1,8 @@ package com.casic.missiles.modular.system.controller; -import cn.hutool.core.collection.CollectionUtil; -import com.baomidou.mybatisplus.core.metadata.OrderItem; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.casic.missiles.core.application.context.AbstractPermissionContext; import com.casic.missiles.core.datascope.DataScope; -import com.casic.missiles.core.page.PageFactory; import com.casic.missiles.model.response.ResponseData; -import com.casic.missiles.modular.system.dto.ExcelModel.*; import com.casic.missiles.modular.system.dto.statistic.*; import com.casic.missiles.modular.system.service.DeviceDataListService; import lombok.extern.slf4j.Slf4j; @@ -27,92 +22,88 @@ // @Permission @GetMapping(value = "/welldata/list") - public Object wellDataList(String keywords, String deptid, String beginTime, String endTime) { + public Object wellDataList(String devcode, String wellCode, String beginTime, String endTime) { //查询数据权限 使用默认DEPTID 字段 DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope(); - List list = deviceDataListService.selectWellDataScope(dataScope, deptid, beginTime, endTime, keywords); - + List list = deviceDataListService.selectWellDataScope(dataScope, devcode, beginTime, endTime, wellCode); return ResponseData.success(list); } - /** * 开挖监测仪数据查询 * - * @param keywords - * @param deptid + * @param devcode + * @param wellCode * @param beginTime * @param endTime * @return */ - // @Permission + //@Permission @GetMapping(value = "/digdata/list") - public Object digDataList(String keywords, String deptid, String beginTime, String endTime) { + public Object digDataList(String devcode, String wellCode, String beginTime, String endTime) { DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope(); - List mapList = deviceDataListService.selectDigDataScope(dataScope, deptid, beginTime, endTime, keywords); + List mapList = deviceDataListService.selectDigDataScope(dataScope, devcode, beginTime, endTime, wellCode); return ResponseData.success(mapList); } @GetMapping(value = "/liquiddata/list") -// @Permission - public Object liquidDataList(String keywords, String deptid, String beginTime, String endTime) { + //@Permission + public Object liquidDataList(String devcode, String wellCode, String beginTime, String endTime) { //查询数据权限 使用默认DEPTID 字段 DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope(); - List list = deviceDataListService.selectLiquidDataScope(dataScope, deptid, beginTime, endTime, keywords); + List list = deviceDataListService.selectLiquidDataScope(dataScope, devcode, beginTime, endTime, wellCode); return ResponseData.success(list); } @GetMapping(value = "/gasdata/list") - //@Permission - public Object gasDataList(String keywords, String deptid, String beginTime, String endTime) { + public Object gasDataList(String devcode, String wellCode, String beginTime, String endTime) { DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope(); - List deviceDataExcelDtoList = deviceDataListService.selectGasDataScope(dataScope, deptid, beginTime, endTime, keywords); + List deviceDataExcelDtoList = deviceDataListService.selectGasDataScope(dataScope, devcode, beginTime, endTime, wellCode); return ResponseData.success(deviceDataExcelDtoList); } @GetMapping(value = "/noisedata/list") - public Object noiseDataList(String keywords, String deptid, String beginTime, String endTime) { + public Object noiseDataList(String devcode, String wellCode, String beginTime, String endTime) { DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope(); - List mapList = deviceDataListService.selectNoiseDataScope(dataScope, deptid, beginTime, endTime, keywords); + List mapList = deviceDataListService.selectNoiseDataScope(dataScope, devcode, beginTime, endTime, wellCode); return ResponseData.success(mapList); } @GetMapping(value = "/harmfuldata/list") - public Object harmfulDataList(String keywords, String deptid, String beginTime, String endTime) { + public Object harmfulDataList(String devcode, String wellCode, String beginTime, String endTime) { DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope(); - List mapList = deviceDataListService.selectHarmfulDataScope(dataScope, deptid, beginTime, endTime, keywords); + List mapList = deviceDataListService.selectHarmfulDataScope(dataScope, devcode, beginTime, endTime, wellCode); return ResponseData.success(mapList); } @GetMapping(value = "/tempdata/list") - public Object tempDataList(String keywords, String deptid, String beginTime, String endTime) { + public Object tempDataList(String devcode, String wellCode, String beginTime, String endTime) { DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope(); - List mapList = deviceDataListService.selectTempDataScope(dataScope, deptid, beginTime, endTime, keywords); + List mapList = deviceDataListService.selectTempDataScope(dataScope, devcode, beginTime, endTime, wellCode); return ResponseData.success(mapList); } - @GetMapping(value = "/welllocadata/list") - public Object wellLocDataList(String keywords, String deptid, String beginTime, String endTime) { + public Object wellLocDataList(String devcode, String wellCode, String beginTime, String endTime) { DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope(); - List mapList = deviceDataListService.selectWellLocDataScope(dataScope, deptid, beginTime, endTime, keywords); + List mapList = deviceDataListService.selectWellLocDataScope(dataScope, devcode, beginTime, endTime, wellCode); return ResponseData.success(mapList); } @GetMapping(value = "/liquidGasData/list") - public Object liquidGasDataList(String keywords, String deptid, String sensorType, String beginTime, String endTime) { + public Object liquidGasDataList(String devcode, String wellCode, String sensorType, String beginTime, String endTime) { DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope(); - List mapList = deviceDataListService.selectGasLiquidDataScope(dataScope, sensorType, deptid, beginTime, endTime, keywords); + List mapList = deviceDataListService.selectGasLiquidDataScope(dataScope, sensorType, devcode, beginTime, endTime, wellCode); return ResponseData.success(mapList); } @GetMapping(value = "/tubedata/list") //@Permission - public Object tubeDataList(String keywords, String deptid, String beginTime, String endTime) { + public Object tubeDataList(String devcode, String wellCode, String beginTime, String endTime) { DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope(); - List mapList = deviceDataListService.selectTubeDataScope(dataScope, deptid, beginTime, endTime, keywords); + List mapList = deviceDataListService.selectTubeDataScope(dataScope, devcode, beginTime, endTime, wellCode); return ResponseData.success(mapList); } @@ -120,23 +111,20 @@ * 消防栓列表 */ @GetMapping(value = "/hydrant/list") - public Object hydrantList(String keywords, String deptid, String beginTime, String endTime) { + public Object hydrantList(String devcode, String wellCode, String beginTime, String endTime) { DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope(); - List mapList= deviceDataListService.getHydrantlist(dataScope, deptid, beginTime, endTime, keywords); + List mapList= deviceDataListService.getHydrantlist(dataScope, devcode, beginTime, endTime, wellCode); return ResponseData.success(mapList); } - /** * 硫化氢列表 */ @GetMapping(value = "/h2s/list") - public Object h2sList(String keywords, String deptid, String beginTime, String endTime) { + public Object h2sList(String devcode, String wellCode, String beginTime, String endTime) { DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope(); - System.out.println(keywords); - List mapList= deviceDataListService.getH2sDataScope(dataScope, deptid, beginTime, endTime, keywords); + List mapList= deviceDataListService.getH2sDataScope(dataScope, devcode, beginTime, endTime, wellCode); return ResponseData.success(mapList); } - } diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java index 837e653..3d7ae31 100644 --- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java +++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java @@ -623,9 +623,9 @@ */ @GetMapping(value = "/h2s/list-page") public Object h2sList(String keywords, String deptid, String beginTime, String endTime) { - Page page = PageFactory.defaultPage(); + Page page = PageFactory.defaultPage(); DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope(); - ResponseData responseData = deviceService.getH2slist(dataScope, page, deptid, beginTime, endTime, keywords); + ResponseData responseData = deviceService.getH2slist(dataScope, page, keywords, beginTime, endTime, deptid); responseData.setData(super.packForBT(page)); return responseData; } @@ -634,10 +634,10 @@ */ @GetMapping(value = "/h2s/export") public void h2sExport(String keywords, String deptid, String beginTime, String endTime) throws IOException { - Page page = PageFactory.defaultPage(); + Page page = PageFactory.defaultPage(); DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope(); deviceService.getH2slist(dataScope, page, deptid, beginTime, endTime, keywords); - super.exportExcel(DataH2s.class, page.getRecords(), DeviceExportEnum.HYDRANT_EXPORT.getFileName()); + super.exportExcel(H2SDataDto.class, page.getRecords(), DeviceExportEnum.H2S_EXPORT.getFileName()); } } diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceDataListController.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceDataListController.java index 09d3c0d..0f13e84 100644 --- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceDataListController.java +++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceDataListController.java @@ -1,13 +1,8 @@ package com.casic.missiles.modular.system.controller; -import cn.hutool.core.collection.CollectionUtil; -import com.baomidou.mybatisplus.core.metadata.OrderItem; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.casic.missiles.core.application.context.AbstractPermissionContext; import com.casic.missiles.core.datascope.DataScope; -import com.casic.missiles.core.page.PageFactory; import com.casic.missiles.model.response.ResponseData; -import com.casic.missiles.modular.system.dto.ExcelModel.*; import com.casic.missiles.modular.system.dto.statistic.*; import com.casic.missiles.modular.system.service.DeviceDataListService; import lombok.extern.slf4j.Slf4j; @@ -27,92 +22,88 @@ // @Permission @GetMapping(value = "/welldata/list") - public Object wellDataList(String keywords, String deptid, String beginTime, String endTime) { + public Object wellDataList(String devcode, String wellCode, String beginTime, String endTime) { //查询数据权限 使用默认DEPTID 字段 DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope(); - List list = deviceDataListService.selectWellDataScope(dataScope, deptid, beginTime, endTime, keywords); - + List list = deviceDataListService.selectWellDataScope(dataScope, devcode, beginTime, endTime, wellCode); return ResponseData.success(list); } - /** * 开挖监测仪数据查询 * - * @param keywords - * @param deptid + * @param devcode + * @param wellCode * @param beginTime * @param endTime * @return */ - // @Permission + //@Permission @GetMapping(value = "/digdata/list") - public Object digDataList(String keywords, String deptid, String beginTime, String endTime) { + public Object digDataList(String devcode, String wellCode, String beginTime, String endTime) { DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope(); - List mapList = deviceDataListService.selectDigDataScope(dataScope, deptid, beginTime, endTime, keywords); + List mapList = deviceDataListService.selectDigDataScope(dataScope, devcode, beginTime, endTime, wellCode); return ResponseData.success(mapList); } @GetMapping(value = "/liquiddata/list") -// @Permission - public Object liquidDataList(String keywords, String deptid, String beginTime, String endTime) { + //@Permission + public Object liquidDataList(String devcode, String wellCode, String beginTime, String endTime) { //查询数据权限 使用默认DEPTID 字段 DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope(); - List list = deviceDataListService.selectLiquidDataScope(dataScope, deptid, beginTime, endTime, keywords); + List list = deviceDataListService.selectLiquidDataScope(dataScope, devcode, beginTime, endTime, wellCode); return ResponseData.success(list); } @GetMapping(value = "/gasdata/list") - //@Permission - public Object gasDataList(String keywords, String deptid, String beginTime, String endTime) { + public Object gasDataList(String devcode, String wellCode, String beginTime, String endTime) { DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope(); - List deviceDataExcelDtoList = deviceDataListService.selectGasDataScope(dataScope, deptid, beginTime, endTime, keywords); + List deviceDataExcelDtoList = deviceDataListService.selectGasDataScope(dataScope, devcode, beginTime, endTime, wellCode); return ResponseData.success(deviceDataExcelDtoList); } @GetMapping(value = "/noisedata/list") - public Object noiseDataList(String keywords, String deptid, String beginTime, String endTime) { + public Object noiseDataList(String devcode, String wellCode, String beginTime, String endTime) { DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope(); - List mapList = deviceDataListService.selectNoiseDataScope(dataScope, deptid, beginTime, endTime, keywords); + List mapList = deviceDataListService.selectNoiseDataScope(dataScope, devcode, beginTime, endTime, wellCode); return ResponseData.success(mapList); } @GetMapping(value = "/harmfuldata/list") - public Object harmfulDataList(String keywords, String deptid, String beginTime, String endTime) { + public Object harmfulDataList(String devcode, String wellCode, String beginTime, String endTime) { DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope(); - List mapList = deviceDataListService.selectHarmfulDataScope(dataScope, deptid, beginTime, endTime, keywords); + List mapList = deviceDataListService.selectHarmfulDataScope(dataScope, devcode, beginTime, endTime, wellCode); return ResponseData.success(mapList); } @GetMapping(value = "/tempdata/list") - public Object tempDataList(String keywords, String deptid, String beginTime, String endTime) { + public Object tempDataList(String devcode, String wellCode, String beginTime, String endTime) { DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope(); - List mapList = deviceDataListService.selectTempDataScope(dataScope, deptid, beginTime, endTime, keywords); + List mapList = deviceDataListService.selectTempDataScope(dataScope, devcode, beginTime, endTime, wellCode); return ResponseData.success(mapList); } - @GetMapping(value = "/welllocadata/list") - public Object wellLocDataList(String keywords, String deptid, String beginTime, String endTime) { + public Object wellLocDataList(String devcode, String wellCode, String beginTime, String endTime) { DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope(); - List mapList = deviceDataListService.selectWellLocDataScope(dataScope, deptid, beginTime, endTime, keywords); + List mapList = deviceDataListService.selectWellLocDataScope(dataScope, devcode, beginTime, endTime, wellCode); return ResponseData.success(mapList); } @GetMapping(value = "/liquidGasData/list") - public Object liquidGasDataList(String keywords, String deptid, String sensorType, String beginTime, String endTime) { + public Object liquidGasDataList(String devcode, String wellCode, String sensorType, String beginTime, String endTime) { DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope(); - List mapList = deviceDataListService.selectGasLiquidDataScope(dataScope, sensorType, deptid, beginTime, endTime, keywords); + List mapList = deviceDataListService.selectGasLiquidDataScope(dataScope, sensorType, devcode, beginTime, endTime, wellCode); return ResponseData.success(mapList); } @GetMapping(value = "/tubedata/list") //@Permission - public Object tubeDataList(String keywords, String deptid, String beginTime, String endTime) { + public Object tubeDataList(String devcode, String wellCode, String beginTime, String endTime) { DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope(); - List mapList = deviceDataListService.selectTubeDataScope(dataScope, deptid, beginTime, endTime, keywords); + List mapList = deviceDataListService.selectTubeDataScope(dataScope, devcode, beginTime, endTime, wellCode); return ResponseData.success(mapList); } @@ -120,23 +111,20 @@ * 消防栓列表 */ @GetMapping(value = "/hydrant/list") - public Object hydrantList(String keywords, String deptid, String beginTime, String endTime) { + public Object hydrantList(String devcode, String wellCode, String beginTime, String endTime) { DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope(); - List mapList= deviceDataListService.getHydrantlist(dataScope, deptid, beginTime, endTime, keywords); + List mapList= deviceDataListService.getHydrantlist(dataScope, devcode, beginTime, endTime, wellCode); return ResponseData.success(mapList); } - /** * 硫化氢列表 */ @GetMapping(value = "/h2s/list") - public Object h2sList(String keywords, String deptid, String beginTime, String endTime) { + public Object h2sList(String devcode, String wellCode, String beginTime, String endTime) { DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope(); - System.out.println(keywords); - List mapList= deviceDataListService.getH2sDataScope(dataScope, deptid, beginTime, endTime, keywords); + List mapList= deviceDataListService.getH2sDataScope(dataScope, devcode, beginTime, endTime, wellCode); return ResponseData.success(mapList); } - } diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java index 837e653..3d7ae31 100644 --- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java +++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java @@ -623,9 +623,9 @@ */ @GetMapping(value = "/h2s/list-page") public Object h2sList(String keywords, String deptid, String beginTime, String endTime) { - Page page = PageFactory.defaultPage(); + Page page = PageFactory.defaultPage(); DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope(); - ResponseData responseData = deviceService.getH2slist(dataScope, page, deptid, beginTime, endTime, keywords); + ResponseData responseData = deviceService.getH2slist(dataScope, page, keywords, beginTime, endTime, deptid); responseData.setData(super.packForBT(page)); return responseData; } @@ -634,10 +634,10 @@ */ @GetMapping(value = "/h2s/export") public void h2sExport(String keywords, String deptid, String beginTime, String endTime) throws IOException { - Page page = PageFactory.defaultPage(); + Page page = PageFactory.defaultPage(); DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope(); deviceService.getH2slist(dataScope, page, deptid, beginTime, endTime, keywords); - super.exportExcel(DataH2s.class, page.getRecords(), DeviceExportEnum.HYDRANT_EXPORT.getFileName()); + super.exportExcel(H2SDataDto.class, page.getRecords(), DeviceExportEnum.H2S_EXPORT.getFileName()); } } diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/DataAnalysisMapper.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/DataAnalysisMapper.java index ab62e2e..67fb9c9 100644 --- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/DataAnalysisMapper.java +++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/DataAnalysisMapper.java @@ -97,6 +97,6 @@ List getHydrantlist(@Param("dataScope") DataScope dataScope,@Param("page")Page page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords); - List selectH2sListDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page")Page page, @Param("deptid") String deptid, - @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords); + List selectH2sListDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page")Page page, @Param("keywords") String keywords, + @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("deptid") String deptid); } diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceDataListController.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceDataListController.java index 09d3c0d..0f13e84 100644 --- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceDataListController.java +++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceDataListController.java @@ -1,13 +1,8 @@ package com.casic.missiles.modular.system.controller; -import cn.hutool.core.collection.CollectionUtil; -import com.baomidou.mybatisplus.core.metadata.OrderItem; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.casic.missiles.core.application.context.AbstractPermissionContext; import com.casic.missiles.core.datascope.DataScope; -import com.casic.missiles.core.page.PageFactory; import com.casic.missiles.model.response.ResponseData; -import com.casic.missiles.modular.system.dto.ExcelModel.*; import com.casic.missiles.modular.system.dto.statistic.*; import com.casic.missiles.modular.system.service.DeviceDataListService; import lombok.extern.slf4j.Slf4j; @@ -27,92 +22,88 @@ // @Permission @GetMapping(value = "/welldata/list") - public Object wellDataList(String keywords, String deptid, String beginTime, String endTime) { + public Object wellDataList(String devcode, String wellCode, String beginTime, String endTime) { //查询数据权限 使用默认DEPTID 字段 DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope(); - List list = deviceDataListService.selectWellDataScope(dataScope, deptid, beginTime, endTime, keywords); - + List list = deviceDataListService.selectWellDataScope(dataScope, devcode, beginTime, endTime, wellCode); return ResponseData.success(list); } - /** * 开挖监测仪数据查询 * - * @param keywords - * @param deptid + * @param devcode + * @param wellCode * @param beginTime * @param endTime * @return */ - // @Permission + //@Permission @GetMapping(value = "/digdata/list") - public Object digDataList(String keywords, String deptid, String beginTime, String endTime) { + public Object digDataList(String devcode, String wellCode, String beginTime, String endTime) { DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope(); - List mapList = deviceDataListService.selectDigDataScope(dataScope, deptid, beginTime, endTime, keywords); + List mapList = deviceDataListService.selectDigDataScope(dataScope, devcode, beginTime, endTime, wellCode); return ResponseData.success(mapList); } @GetMapping(value = "/liquiddata/list") -// @Permission - public Object liquidDataList(String keywords, String deptid, String beginTime, String endTime) { + //@Permission + public Object liquidDataList(String devcode, String wellCode, String beginTime, String endTime) { //查询数据权限 使用默认DEPTID 字段 DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope(); - List list = deviceDataListService.selectLiquidDataScope(dataScope, deptid, beginTime, endTime, keywords); + List list = deviceDataListService.selectLiquidDataScope(dataScope, devcode, beginTime, endTime, wellCode); return ResponseData.success(list); } @GetMapping(value = "/gasdata/list") - //@Permission - public Object gasDataList(String keywords, String deptid, String beginTime, String endTime) { + public Object gasDataList(String devcode, String wellCode, String beginTime, String endTime) { DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope(); - List deviceDataExcelDtoList = deviceDataListService.selectGasDataScope(dataScope, deptid, beginTime, endTime, keywords); + List deviceDataExcelDtoList = deviceDataListService.selectGasDataScope(dataScope, devcode, beginTime, endTime, wellCode); return ResponseData.success(deviceDataExcelDtoList); } @GetMapping(value = "/noisedata/list") - public Object noiseDataList(String keywords, String deptid, String beginTime, String endTime) { + public Object noiseDataList(String devcode, String wellCode, String beginTime, String endTime) { DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope(); - List mapList = deviceDataListService.selectNoiseDataScope(dataScope, deptid, beginTime, endTime, keywords); + List mapList = deviceDataListService.selectNoiseDataScope(dataScope, devcode, beginTime, endTime, wellCode); return ResponseData.success(mapList); } @GetMapping(value = "/harmfuldata/list") - public Object harmfulDataList(String keywords, String deptid, String beginTime, String endTime) { + public Object harmfulDataList(String devcode, String wellCode, String beginTime, String endTime) { DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope(); - List mapList = deviceDataListService.selectHarmfulDataScope(dataScope, deptid, beginTime, endTime, keywords); + List mapList = deviceDataListService.selectHarmfulDataScope(dataScope, devcode, beginTime, endTime, wellCode); return ResponseData.success(mapList); } @GetMapping(value = "/tempdata/list") - public Object tempDataList(String keywords, String deptid, String beginTime, String endTime) { + public Object tempDataList(String devcode, String wellCode, String beginTime, String endTime) { DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope(); - List mapList = deviceDataListService.selectTempDataScope(dataScope, deptid, beginTime, endTime, keywords); + List mapList = deviceDataListService.selectTempDataScope(dataScope, devcode, beginTime, endTime, wellCode); return ResponseData.success(mapList); } - @GetMapping(value = "/welllocadata/list") - public Object wellLocDataList(String keywords, String deptid, String beginTime, String endTime) { + public Object wellLocDataList(String devcode, String wellCode, String beginTime, String endTime) { DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope(); - List mapList = deviceDataListService.selectWellLocDataScope(dataScope, deptid, beginTime, endTime, keywords); + List mapList = deviceDataListService.selectWellLocDataScope(dataScope, devcode, beginTime, endTime, wellCode); return ResponseData.success(mapList); } @GetMapping(value = "/liquidGasData/list") - public Object liquidGasDataList(String keywords, String deptid, String sensorType, String beginTime, String endTime) { + public Object liquidGasDataList(String devcode, String wellCode, String sensorType, String beginTime, String endTime) { DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope(); - List mapList = deviceDataListService.selectGasLiquidDataScope(dataScope, sensorType, deptid, beginTime, endTime, keywords); + List mapList = deviceDataListService.selectGasLiquidDataScope(dataScope, sensorType, devcode, beginTime, endTime, wellCode); return ResponseData.success(mapList); } @GetMapping(value = "/tubedata/list") //@Permission - public Object tubeDataList(String keywords, String deptid, String beginTime, String endTime) { + public Object tubeDataList(String devcode, String wellCode, String beginTime, String endTime) { DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope(); - List mapList = deviceDataListService.selectTubeDataScope(dataScope, deptid, beginTime, endTime, keywords); + List mapList = deviceDataListService.selectTubeDataScope(dataScope, devcode, beginTime, endTime, wellCode); return ResponseData.success(mapList); } @@ -120,23 +111,20 @@ * 消防栓列表 */ @GetMapping(value = "/hydrant/list") - public Object hydrantList(String keywords, String deptid, String beginTime, String endTime) { + public Object hydrantList(String devcode, String wellCode, String beginTime, String endTime) { DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope(); - List mapList= deviceDataListService.getHydrantlist(dataScope, deptid, beginTime, endTime, keywords); + List mapList= deviceDataListService.getHydrantlist(dataScope, devcode, beginTime, endTime, wellCode); return ResponseData.success(mapList); } - /** * 硫化氢列表 */ @GetMapping(value = "/h2s/list") - public Object h2sList(String keywords, String deptid, String beginTime, String endTime) { + public Object h2sList(String devcode, String wellCode, String beginTime, String endTime) { DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope(); - System.out.println(keywords); - List mapList= deviceDataListService.getH2sDataScope(dataScope, deptid, beginTime, endTime, keywords); + List mapList= deviceDataListService.getH2sDataScope(dataScope, devcode, beginTime, endTime, wellCode); return ResponseData.success(mapList); } - } diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java index 837e653..3d7ae31 100644 --- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java +++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java @@ -623,9 +623,9 @@ */ @GetMapping(value = "/h2s/list-page") public Object h2sList(String keywords, String deptid, String beginTime, String endTime) { - Page page = PageFactory.defaultPage(); + Page page = PageFactory.defaultPage(); DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope(); - ResponseData responseData = deviceService.getH2slist(dataScope, page, deptid, beginTime, endTime, keywords); + ResponseData responseData = deviceService.getH2slist(dataScope, page, keywords, beginTime, endTime, deptid); responseData.setData(super.packForBT(page)); return responseData; } @@ -634,10 +634,10 @@ */ @GetMapping(value = "/h2s/export") public void h2sExport(String keywords, String deptid, String beginTime, String endTime) throws IOException { - Page page = PageFactory.defaultPage(); + Page page = PageFactory.defaultPage(); DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope(); deviceService.getH2slist(dataScope, page, deptid, beginTime, endTime, keywords); - super.exportExcel(DataH2s.class, page.getRecords(), DeviceExportEnum.HYDRANT_EXPORT.getFileName()); + super.exportExcel(H2SDataDto.class, page.getRecords(), DeviceExportEnum.H2S_EXPORT.getFileName()); } } diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/DataAnalysisMapper.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/DataAnalysisMapper.java index ab62e2e..67fb9c9 100644 --- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/DataAnalysisMapper.java +++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/DataAnalysisMapper.java @@ -97,6 +97,6 @@ List getHydrantlist(@Param("dataScope") DataScope dataScope,@Param("page")Page page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords); - List selectH2sListDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page")Page page, @Param("deptid") String deptid, - @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords); + List selectH2sListDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page")Page page, @Param("keywords") String keywords, + @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("deptid") String deptid); } diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/DeviceDataListMapper.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/DeviceDataListMapper.java index 7114492..732dcc6 100644 --- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/DeviceDataListMapper.java +++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/DeviceDataListMapper.java @@ -19,29 +19,30 @@ * @since 2019-05-13 */ public interface DeviceDataListMapper extends BaseMapper { - List selectWellDataScope(@Param("dataScope") DataScope dataScope, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords); + List selectWellDataScope(@Param("dataScope") DataScope dataScope, @Param("devcode") String devcode, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("wellCode") String wellCode); - List selectDigDataScope(@Param("dataScope") DataScope dataScope, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords); + List selectDigDataScope(@Param("dataScope") DataScope dataScope, @Param("devcode") String devcode, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("wellCode") String wellCode); - List selectLiquidDataScope(@Param("dataScope") DataScope dataScope, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords); + List selectLiquidDataScope(@Param("dataScope") DataScope dataScope, @Param("devcode") String devcode, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("wellCode") String wellCode); - List selectGasDataScope(@Param("dataScope") DataScope dataScope, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords); + List selectGasDataScope(@Param("dataScope") DataScope dataScope, @Param("devcode") String devcode, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("wellCode") String wellCode); - List selectNoiseDataScope(@Param("dataScope") DataScope dataScope, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords); + List selectNoiseDataScope(@Param("dataScope") DataScope dataScope, @Param("devcode") String devcode, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("wellCode") String wellCode); - List selectHarmfulDataScope(@Param("dataScope") DataScope dataScope, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords); + List selectHarmfulDataScope(@Param("dataScope") DataScope dataScope, @Param("devcode") String devcode, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("wellCode") String wellCode); - List selectTempDataScope(@Param("dataScope") DataScope dataScope, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords); + List selectTempDataScope(@Param("dataScope") DataScope dataScope, @Param("devcode") String devcode, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("wellCode") String wellCode); - List selectWellLocDataScope(@Param("dataScope") DataScope dataScope, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords); + List selectWellLocDataScope(@Param("dataScope") DataScope dataScope, @Param("devcode") String devcode, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("wellCode") String wellCode); - List selectGasLiquidDataLiquidScope(@Param("dataScope") DataScope dataScope, @Param("deptIds") List deptIds, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords); + List selectGasLiquidDataLiquidScope(@Param("dataScope") DataScope dataScope, @Param("devcode")String devcode, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("wellCode") String wellCode); - List selectGasLiquidDataGasScope(@Param("dataScope") DataScope dataScope, @Param("deptIds") List deptIds, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords); + List selectGasLiquidDataGasScope(@Param("dataScope") DataScope dataScope, @Param("devcode")String devcode, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("wellCode") String wellCode); - List selectTubeDataScope(@Param("dataScope") DataScope dataScope, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords); + List selectTubeDataScope(@Param("dataScope") DataScope dataScope, @Param("devcode") String devcode, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("wellCode") String wellCode); - List getHydrantlist(@Param("dataScope") DataScope dataScope, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords); + List getHydrantlist(@Param("dataScope") DataScope dataScope, @Param("devcode") String devcode, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("wellCode") String wellCode); - List selectH2sListDataScope(@Param("dataScope") DataScope dataScope, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords); + List selectH2sListDataScope(@Param("dataScope") DataScope dataScope, @Param("devcode") String devcode, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("wellCode") String wellCode); + } diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceDataListController.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceDataListController.java index 09d3c0d..0f13e84 100644 --- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceDataListController.java +++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceDataListController.java @@ -1,13 +1,8 @@ package com.casic.missiles.modular.system.controller; -import cn.hutool.core.collection.CollectionUtil; -import com.baomidou.mybatisplus.core.metadata.OrderItem; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.casic.missiles.core.application.context.AbstractPermissionContext; import com.casic.missiles.core.datascope.DataScope; -import com.casic.missiles.core.page.PageFactory; import com.casic.missiles.model.response.ResponseData; -import com.casic.missiles.modular.system.dto.ExcelModel.*; import com.casic.missiles.modular.system.dto.statistic.*; import com.casic.missiles.modular.system.service.DeviceDataListService; import lombok.extern.slf4j.Slf4j; @@ -27,92 +22,88 @@ // @Permission @GetMapping(value = "/welldata/list") - public Object wellDataList(String keywords, String deptid, String beginTime, String endTime) { + public Object wellDataList(String devcode, String wellCode, String beginTime, String endTime) { //查询数据权限 使用默认DEPTID 字段 DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope(); - List list = deviceDataListService.selectWellDataScope(dataScope, deptid, beginTime, endTime, keywords); - + List list = deviceDataListService.selectWellDataScope(dataScope, devcode, beginTime, endTime, wellCode); return ResponseData.success(list); } - /** * 开挖监测仪数据查询 * - * @param keywords - * @param deptid + * @param devcode + * @param wellCode * @param beginTime * @param endTime * @return */ - // @Permission + //@Permission @GetMapping(value = "/digdata/list") - public Object digDataList(String keywords, String deptid, String beginTime, String endTime) { + public Object digDataList(String devcode, String wellCode, String beginTime, String endTime) { DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope(); - List mapList = deviceDataListService.selectDigDataScope(dataScope, deptid, beginTime, endTime, keywords); + List mapList = deviceDataListService.selectDigDataScope(dataScope, devcode, beginTime, endTime, wellCode); return ResponseData.success(mapList); } @GetMapping(value = "/liquiddata/list") -// @Permission - public Object liquidDataList(String keywords, String deptid, String beginTime, String endTime) { + //@Permission + public Object liquidDataList(String devcode, String wellCode, String beginTime, String endTime) { //查询数据权限 使用默认DEPTID 字段 DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope(); - List list = deviceDataListService.selectLiquidDataScope(dataScope, deptid, beginTime, endTime, keywords); + List list = deviceDataListService.selectLiquidDataScope(dataScope, devcode, beginTime, endTime, wellCode); return ResponseData.success(list); } @GetMapping(value = "/gasdata/list") - //@Permission - public Object gasDataList(String keywords, String deptid, String beginTime, String endTime) { + public Object gasDataList(String devcode, String wellCode, String beginTime, String endTime) { DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope(); - List deviceDataExcelDtoList = deviceDataListService.selectGasDataScope(dataScope, deptid, beginTime, endTime, keywords); + List deviceDataExcelDtoList = deviceDataListService.selectGasDataScope(dataScope, devcode, beginTime, endTime, wellCode); return ResponseData.success(deviceDataExcelDtoList); } @GetMapping(value = "/noisedata/list") - public Object noiseDataList(String keywords, String deptid, String beginTime, String endTime) { + public Object noiseDataList(String devcode, String wellCode, String beginTime, String endTime) { DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope(); - List mapList = deviceDataListService.selectNoiseDataScope(dataScope, deptid, beginTime, endTime, keywords); + List mapList = deviceDataListService.selectNoiseDataScope(dataScope, devcode, beginTime, endTime, wellCode); return ResponseData.success(mapList); } @GetMapping(value = "/harmfuldata/list") - public Object harmfulDataList(String keywords, String deptid, String beginTime, String endTime) { + public Object harmfulDataList(String devcode, String wellCode, String beginTime, String endTime) { DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope(); - List mapList = deviceDataListService.selectHarmfulDataScope(dataScope, deptid, beginTime, endTime, keywords); + List mapList = deviceDataListService.selectHarmfulDataScope(dataScope, devcode, beginTime, endTime, wellCode); return ResponseData.success(mapList); } @GetMapping(value = "/tempdata/list") - public Object tempDataList(String keywords, String deptid, String beginTime, String endTime) { + public Object tempDataList(String devcode, String wellCode, String beginTime, String endTime) { DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope(); - List mapList = deviceDataListService.selectTempDataScope(dataScope, deptid, beginTime, endTime, keywords); + List mapList = deviceDataListService.selectTempDataScope(dataScope, devcode, beginTime, endTime, wellCode); return ResponseData.success(mapList); } - @GetMapping(value = "/welllocadata/list") - public Object wellLocDataList(String keywords, String deptid, String beginTime, String endTime) { + public Object wellLocDataList(String devcode, String wellCode, String beginTime, String endTime) { DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope(); - List mapList = deviceDataListService.selectWellLocDataScope(dataScope, deptid, beginTime, endTime, keywords); + List mapList = deviceDataListService.selectWellLocDataScope(dataScope, devcode, beginTime, endTime, wellCode); return ResponseData.success(mapList); } @GetMapping(value = "/liquidGasData/list") - public Object liquidGasDataList(String keywords, String deptid, String sensorType, String beginTime, String endTime) { + public Object liquidGasDataList(String devcode, String wellCode, String sensorType, String beginTime, String endTime) { DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope(); - List mapList = deviceDataListService.selectGasLiquidDataScope(dataScope, sensorType, deptid, beginTime, endTime, keywords); + List mapList = deviceDataListService.selectGasLiquidDataScope(dataScope, sensorType, devcode, beginTime, endTime, wellCode); return ResponseData.success(mapList); } @GetMapping(value = "/tubedata/list") //@Permission - public Object tubeDataList(String keywords, String deptid, String beginTime, String endTime) { + public Object tubeDataList(String devcode, String wellCode, String beginTime, String endTime) { DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope(); - List mapList = deviceDataListService.selectTubeDataScope(dataScope, deptid, beginTime, endTime, keywords); + List mapList = deviceDataListService.selectTubeDataScope(dataScope, devcode, beginTime, endTime, wellCode); return ResponseData.success(mapList); } @@ -120,23 +111,20 @@ * 消防栓列表 */ @GetMapping(value = "/hydrant/list") - public Object hydrantList(String keywords, String deptid, String beginTime, String endTime) { + public Object hydrantList(String devcode, String wellCode, String beginTime, String endTime) { DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope(); - List mapList= deviceDataListService.getHydrantlist(dataScope, deptid, beginTime, endTime, keywords); + List mapList= deviceDataListService.getHydrantlist(dataScope, devcode, beginTime, endTime, wellCode); return ResponseData.success(mapList); } - /** * 硫化氢列表 */ @GetMapping(value = "/h2s/list") - public Object h2sList(String keywords, String deptid, String beginTime, String endTime) { + public Object h2sList(String devcode, String wellCode, String beginTime, String endTime) { DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope(); - System.out.println(keywords); - List mapList= deviceDataListService.getH2sDataScope(dataScope, deptid, beginTime, endTime, keywords); + List mapList= deviceDataListService.getH2sDataScope(dataScope, devcode, beginTime, endTime, wellCode); return ResponseData.success(mapList); } - } diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java index 837e653..3d7ae31 100644 --- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java +++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java @@ -623,9 +623,9 @@ */ @GetMapping(value = "/h2s/list-page") public Object h2sList(String keywords, String deptid, String beginTime, String endTime) { - Page page = PageFactory.defaultPage(); + Page page = PageFactory.defaultPage(); DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope(); - ResponseData responseData = deviceService.getH2slist(dataScope, page, deptid, beginTime, endTime, keywords); + ResponseData responseData = deviceService.getH2slist(dataScope, page, keywords, beginTime, endTime, deptid); responseData.setData(super.packForBT(page)); return responseData; } @@ -634,10 +634,10 @@ */ @GetMapping(value = "/h2s/export") public void h2sExport(String keywords, String deptid, String beginTime, String endTime) throws IOException { - Page page = PageFactory.defaultPage(); + Page page = PageFactory.defaultPage(); DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope(); deviceService.getH2slist(dataScope, page, deptid, beginTime, endTime, keywords); - super.exportExcel(DataH2s.class, page.getRecords(), DeviceExportEnum.HYDRANT_EXPORT.getFileName()); + super.exportExcel(H2SDataDto.class, page.getRecords(), DeviceExportEnum.H2S_EXPORT.getFileName()); } } diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/DataAnalysisMapper.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/DataAnalysisMapper.java index ab62e2e..67fb9c9 100644 --- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/DataAnalysisMapper.java +++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/DataAnalysisMapper.java @@ -97,6 +97,6 @@ List getHydrantlist(@Param("dataScope") DataScope dataScope,@Param("page")Page page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords); - List selectH2sListDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page")Page page, @Param("deptid") String deptid, - @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords); + List selectH2sListDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page")Page page, @Param("keywords") String keywords, + @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("deptid") String deptid); } diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/DeviceDataListMapper.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/DeviceDataListMapper.java index 7114492..732dcc6 100644 --- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/DeviceDataListMapper.java +++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/DeviceDataListMapper.java @@ -19,29 +19,30 @@ * @since 2019-05-13 */ public interface DeviceDataListMapper extends BaseMapper { - List selectWellDataScope(@Param("dataScope") DataScope dataScope, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords); + List selectWellDataScope(@Param("dataScope") DataScope dataScope, @Param("devcode") String devcode, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("wellCode") String wellCode); - List selectDigDataScope(@Param("dataScope") DataScope dataScope, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords); + List selectDigDataScope(@Param("dataScope") DataScope dataScope, @Param("devcode") String devcode, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("wellCode") String wellCode); - List selectLiquidDataScope(@Param("dataScope") DataScope dataScope, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords); + List selectLiquidDataScope(@Param("dataScope") DataScope dataScope, @Param("devcode") String devcode, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("wellCode") String wellCode); - List selectGasDataScope(@Param("dataScope") DataScope dataScope, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords); + List selectGasDataScope(@Param("dataScope") DataScope dataScope, @Param("devcode") String devcode, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("wellCode") String wellCode); - List selectNoiseDataScope(@Param("dataScope") DataScope dataScope, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords); + List selectNoiseDataScope(@Param("dataScope") DataScope dataScope, @Param("devcode") String devcode, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("wellCode") String wellCode); - List selectHarmfulDataScope(@Param("dataScope") DataScope dataScope, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords); + List selectHarmfulDataScope(@Param("dataScope") DataScope dataScope, @Param("devcode") String devcode, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("wellCode") String wellCode); - List selectTempDataScope(@Param("dataScope") DataScope dataScope, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords); + List selectTempDataScope(@Param("dataScope") DataScope dataScope, @Param("devcode") String devcode, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("wellCode") String wellCode); - List selectWellLocDataScope(@Param("dataScope") DataScope dataScope, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords); + List selectWellLocDataScope(@Param("dataScope") DataScope dataScope, @Param("devcode") String devcode, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("wellCode") String wellCode); - List selectGasLiquidDataLiquidScope(@Param("dataScope") DataScope dataScope, @Param("deptIds") List deptIds, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords); + List selectGasLiquidDataLiquidScope(@Param("dataScope") DataScope dataScope, @Param("devcode")String devcode, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("wellCode") String wellCode); - List selectGasLiquidDataGasScope(@Param("dataScope") DataScope dataScope, @Param("deptIds") List deptIds, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords); + List selectGasLiquidDataGasScope(@Param("dataScope") DataScope dataScope, @Param("devcode")String devcode, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("wellCode") String wellCode); - List selectTubeDataScope(@Param("dataScope") DataScope dataScope, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords); + List selectTubeDataScope(@Param("dataScope") DataScope dataScope, @Param("devcode") String devcode, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("wellCode") String wellCode); - List getHydrantlist(@Param("dataScope") DataScope dataScope, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords); + List getHydrantlist(@Param("dataScope") DataScope dataScope, @Param("devcode") String devcode, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("wellCode") String wellCode); - List selectH2sListDataScope(@Param("dataScope") DataScope dataScope, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords); + List selectH2sListDataScope(@Param("dataScope") DataScope dataScope, @Param("devcode") String devcode, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("wellCode") String wellCode); + } diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/DataAnalysisMapper.xml b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/DataAnalysisMapper.xml index a0117ca..6ed130a 100644 --- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/DataAnalysisMapper.xml +++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/DataAnalysisMapper.xml @@ -1255,7 +1255,6 @@ - SELECT dh2s.DEVCODE AS devcode, dh2s.WELL_CODE AS "wellCode", - dh2s.STRENGTH, - dh2s.CELL, + dh2s.STRENGTH AS strength, + dh2s.CELL AS cell, AS uptime, - dh2s.device_type as deviceType + + + + AS logtime, + bdt.TYPE_NAME AS "deviceTypeName", + bd.device_type as deviceType, + bwi.DEPTID AS deptid FROM data_h2s dh2s JOIN bus_well_info bwi ON bwi.WELL_CODE= dh2s.WELL_CODE JOIN bus_device bd ON dh2s.DEVCODE = bd.DEVCODE + LEFT JOIN base_device_type bdt ON bd.DEVICE_TYPE = bdt.ID bd.VALID = '1' AND bwi.VALID = '1' @@ -1323,11 +1329,9 @@ - and (dh2s.DEVCODE like + AND (bd.DEVCODE LIKE - OR dh2s.WELL_CODE LIKE - - ) + OR bd.WELL_CODE LIKE) diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceDataListController.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceDataListController.java index 09d3c0d..0f13e84 100644 --- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceDataListController.java +++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceDataListController.java @@ -1,13 +1,8 @@ package com.casic.missiles.modular.system.controller; -import cn.hutool.core.collection.CollectionUtil; -import com.baomidou.mybatisplus.core.metadata.OrderItem; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.casic.missiles.core.application.context.AbstractPermissionContext; import com.casic.missiles.core.datascope.DataScope; -import com.casic.missiles.core.page.PageFactory; import com.casic.missiles.model.response.ResponseData; -import com.casic.missiles.modular.system.dto.ExcelModel.*; import com.casic.missiles.modular.system.dto.statistic.*; import com.casic.missiles.modular.system.service.DeviceDataListService; import lombok.extern.slf4j.Slf4j; @@ -27,92 +22,88 @@ // @Permission @GetMapping(value = "/welldata/list") - public Object wellDataList(String keywords, String deptid, String beginTime, String endTime) { + public Object wellDataList(String devcode, String wellCode, String beginTime, String endTime) { //查询数据权限 使用默认DEPTID 字段 DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope(); - List list = deviceDataListService.selectWellDataScope(dataScope, deptid, beginTime, endTime, keywords); - + List list = deviceDataListService.selectWellDataScope(dataScope, devcode, beginTime, endTime, wellCode); return ResponseData.success(list); } - /** * 开挖监测仪数据查询 * - * @param keywords - * @param deptid + * @param devcode + * @param wellCode * @param beginTime * @param endTime * @return */ - // @Permission + //@Permission @GetMapping(value = "/digdata/list") - public Object digDataList(String keywords, String deptid, String beginTime, String endTime) { + public Object digDataList(String devcode, String wellCode, String beginTime, String endTime) { DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope(); - List mapList = deviceDataListService.selectDigDataScope(dataScope, deptid, beginTime, endTime, keywords); + List mapList = deviceDataListService.selectDigDataScope(dataScope, devcode, beginTime, endTime, wellCode); return ResponseData.success(mapList); } @GetMapping(value = "/liquiddata/list") -// @Permission - public Object liquidDataList(String keywords, String deptid, String beginTime, String endTime) { + //@Permission + public Object liquidDataList(String devcode, String wellCode, String beginTime, String endTime) { //查询数据权限 使用默认DEPTID 字段 DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope(); - List list = deviceDataListService.selectLiquidDataScope(dataScope, deptid, beginTime, endTime, keywords); + List list = deviceDataListService.selectLiquidDataScope(dataScope, devcode, beginTime, endTime, wellCode); return ResponseData.success(list); } @GetMapping(value = "/gasdata/list") - //@Permission - public Object gasDataList(String keywords, String deptid, String beginTime, String endTime) { + public Object gasDataList(String devcode, String wellCode, String beginTime, String endTime) { DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope(); - List deviceDataExcelDtoList = deviceDataListService.selectGasDataScope(dataScope, deptid, beginTime, endTime, keywords); + List deviceDataExcelDtoList = deviceDataListService.selectGasDataScope(dataScope, devcode, beginTime, endTime, wellCode); return ResponseData.success(deviceDataExcelDtoList); } @GetMapping(value = "/noisedata/list") - public Object noiseDataList(String keywords, String deptid, String beginTime, String endTime) { + public Object noiseDataList(String devcode, String wellCode, String beginTime, String endTime) { DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope(); - List mapList = deviceDataListService.selectNoiseDataScope(dataScope, deptid, beginTime, endTime, keywords); + List mapList = deviceDataListService.selectNoiseDataScope(dataScope, devcode, beginTime, endTime, wellCode); return ResponseData.success(mapList); } @GetMapping(value = "/harmfuldata/list") - public Object harmfulDataList(String keywords, String deptid, String beginTime, String endTime) { + public Object harmfulDataList(String devcode, String wellCode, String beginTime, String endTime) { DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope(); - List mapList = deviceDataListService.selectHarmfulDataScope(dataScope, deptid, beginTime, endTime, keywords); + List mapList = deviceDataListService.selectHarmfulDataScope(dataScope, devcode, beginTime, endTime, wellCode); return ResponseData.success(mapList); } @GetMapping(value = "/tempdata/list") - public Object tempDataList(String keywords, String deptid, String beginTime, String endTime) { + public Object tempDataList(String devcode, String wellCode, String beginTime, String endTime) { DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope(); - List mapList = deviceDataListService.selectTempDataScope(dataScope, deptid, beginTime, endTime, keywords); + List mapList = deviceDataListService.selectTempDataScope(dataScope, devcode, beginTime, endTime, wellCode); return ResponseData.success(mapList); } - @GetMapping(value = "/welllocadata/list") - public Object wellLocDataList(String keywords, String deptid, String beginTime, String endTime) { + public Object wellLocDataList(String devcode, String wellCode, String beginTime, String endTime) { DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope(); - List mapList = deviceDataListService.selectWellLocDataScope(dataScope, deptid, beginTime, endTime, keywords); + List mapList = deviceDataListService.selectWellLocDataScope(dataScope, devcode, beginTime, endTime, wellCode); return ResponseData.success(mapList); } @GetMapping(value = "/liquidGasData/list") - public Object liquidGasDataList(String keywords, String deptid, String sensorType, String beginTime, String endTime) { + public Object liquidGasDataList(String devcode, String wellCode, String sensorType, String beginTime, String endTime) { DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope(); - List mapList = deviceDataListService.selectGasLiquidDataScope(dataScope, sensorType, deptid, beginTime, endTime, keywords); + List mapList = deviceDataListService.selectGasLiquidDataScope(dataScope, sensorType, devcode, beginTime, endTime, wellCode); return ResponseData.success(mapList); } @GetMapping(value = "/tubedata/list") //@Permission - public Object tubeDataList(String keywords, String deptid, String beginTime, String endTime) { + public Object tubeDataList(String devcode, String wellCode, String beginTime, String endTime) { DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope(); - List mapList = deviceDataListService.selectTubeDataScope(dataScope, deptid, beginTime, endTime, keywords); + List mapList = deviceDataListService.selectTubeDataScope(dataScope, devcode, beginTime, endTime, wellCode); return ResponseData.success(mapList); } @@ -120,23 +111,20 @@ * 消防栓列表 */ @GetMapping(value = "/hydrant/list") - public Object hydrantList(String keywords, String deptid, String beginTime, String endTime) { + public Object hydrantList(String devcode, String wellCode, String beginTime, String endTime) { DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope(); - List mapList= deviceDataListService.getHydrantlist(dataScope, deptid, beginTime, endTime, keywords); + List mapList= deviceDataListService.getHydrantlist(dataScope, devcode, beginTime, endTime, wellCode); return ResponseData.success(mapList); } - /** * 硫化氢列表 */ @GetMapping(value = "/h2s/list") - public Object h2sList(String keywords, String deptid, String beginTime, String endTime) { + public Object h2sList(String devcode, String wellCode, String beginTime, String endTime) { DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope(); - System.out.println(keywords); - List mapList= deviceDataListService.getH2sDataScope(dataScope, deptid, beginTime, endTime, keywords); + List mapList= deviceDataListService.getH2sDataScope(dataScope, devcode, beginTime, endTime, wellCode); return ResponseData.success(mapList); } - } diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java index 837e653..3d7ae31 100644 --- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java +++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java @@ -623,9 +623,9 @@ */ @GetMapping(value = "/h2s/list-page") public Object h2sList(String keywords, String deptid, String beginTime, String endTime) { - Page page = PageFactory.defaultPage(); + Page page = PageFactory.defaultPage(); DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope(); - ResponseData responseData = deviceService.getH2slist(dataScope, page, deptid, beginTime, endTime, keywords); + ResponseData responseData = deviceService.getH2slist(dataScope, page, keywords, beginTime, endTime, deptid); responseData.setData(super.packForBT(page)); return responseData; } @@ -634,10 +634,10 @@ */ @GetMapping(value = "/h2s/export") public void h2sExport(String keywords, String deptid, String beginTime, String endTime) throws IOException { - Page page = PageFactory.defaultPage(); + Page page = PageFactory.defaultPage(); DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope(); deviceService.getH2slist(dataScope, page, deptid, beginTime, endTime, keywords); - super.exportExcel(DataH2s.class, page.getRecords(), DeviceExportEnum.HYDRANT_EXPORT.getFileName()); + super.exportExcel(H2SDataDto.class, page.getRecords(), DeviceExportEnum.H2S_EXPORT.getFileName()); } } diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/DataAnalysisMapper.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/DataAnalysisMapper.java index ab62e2e..67fb9c9 100644 --- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/DataAnalysisMapper.java +++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/DataAnalysisMapper.java @@ -97,6 +97,6 @@ List getHydrantlist(@Param("dataScope") DataScope dataScope,@Param("page")Page page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords); - List selectH2sListDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page")Page page, @Param("deptid") String deptid, - @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords); + List selectH2sListDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page")Page page, @Param("keywords") String keywords, + @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("deptid") String deptid); } diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/DeviceDataListMapper.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/DeviceDataListMapper.java index 7114492..732dcc6 100644 --- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/DeviceDataListMapper.java +++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/DeviceDataListMapper.java @@ -19,29 +19,30 @@ * @since 2019-05-13 */ public interface DeviceDataListMapper extends BaseMapper { - List selectWellDataScope(@Param("dataScope") DataScope dataScope, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords); + List selectWellDataScope(@Param("dataScope") DataScope dataScope, @Param("devcode") String devcode, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("wellCode") String wellCode); - List selectDigDataScope(@Param("dataScope") DataScope dataScope, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords); + List selectDigDataScope(@Param("dataScope") DataScope dataScope, @Param("devcode") String devcode, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("wellCode") String wellCode); - List selectLiquidDataScope(@Param("dataScope") DataScope dataScope, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords); + List selectLiquidDataScope(@Param("dataScope") DataScope dataScope, @Param("devcode") String devcode, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("wellCode") String wellCode); - List selectGasDataScope(@Param("dataScope") DataScope dataScope, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords); + List selectGasDataScope(@Param("dataScope") DataScope dataScope, @Param("devcode") String devcode, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("wellCode") String wellCode); - List selectNoiseDataScope(@Param("dataScope") DataScope dataScope, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords); + List selectNoiseDataScope(@Param("dataScope") DataScope dataScope, @Param("devcode") String devcode, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("wellCode") String wellCode); - List selectHarmfulDataScope(@Param("dataScope") DataScope dataScope, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords); + List selectHarmfulDataScope(@Param("dataScope") DataScope dataScope, @Param("devcode") String devcode, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("wellCode") String wellCode); - List selectTempDataScope(@Param("dataScope") DataScope dataScope, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords); + List selectTempDataScope(@Param("dataScope") DataScope dataScope, @Param("devcode") String devcode, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("wellCode") String wellCode); - List selectWellLocDataScope(@Param("dataScope") DataScope dataScope, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords); + List selectWellLocDataScope(@Param("dataScope") DataScope dataScope, @Param("devcode") String devcode, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("wellCode") String wellCode); - List selectGasLiquidDataLiquidScope(@Param("dataScope") DataScope dataScope, @Param("deptIds") List deptIds, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords); + List selectGasLiquidDataLiquidScope(@Param("dataScope") DataScope dataScope, @Param("devcode")String devcode, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("wellCode") String wellCode); - List selectGasLiquidDataGasScope(@Param("dataScope") DataScope dataScope, @Param("deptIds") List deptIds, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords); + List selectGasLiquidDataGasScope(@Param("dataScope") DataScope dataScope, @Param("devcode")String devcode, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("wellCode") String wellCode); - List selectTubeDataScope(@Param("dataScope") DataScope dataScope, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords); + List selectTubeDataScope(@Param("dataScope") DataScope dataScope, @Param("devcode") String devcode, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("wellCode") String wellCode); - List getHydrantlist(@Param("dataScope") DataScope dataScope, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords); + List getHydrantlist(@Param("dataScope") DataScope dataScope, @Param("devcode") String devcode, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("wellCode") String wellCode); - List selectH2sListDataScope(@Param("dataScope") DataScope dataScope, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords); + List selectH2sListDataScope(@Param("dataScope") DataScope dataScope, @Param("devcode") String devcode, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("wellCode") String wellCode); + } diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/DataAnalysisMapper.xml b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/DataAnalysisMapper.xml index a0117ca..6ed130a 100644 --- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/DataAnalysisMapper.xml +++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/DataAnalysisMapper.xml @@ -1255,7 +1255,6 @@ - SELECT dh2s.DEVCODE AS devcode, dh2s.WELL_CODE AS "wellCode", - dh2s.STRENGTH, - dh2s.CELL, + dh2s.STRENGTH AS strength, + dh2s.CELL AS cell, AS uptime, - dh2s.device_type as deviceType + + + + AS logtime, + bdt.TYPE_NAME AS "deviceTypeName", + bd.device_type as deviceType, + bwi.DEPTID AS deptid FROM data_h2s dh2s JOIN bus_well_info bwi ON bwi.WELL_CODE= dh2s.WELL_CODE JOIN bus_device bd ON dh2s.DEVCODE = bd.DEVCODE + LEFT JOIN base_device_type bdt ON bd.DEVICE_TYPE = bdt.ID bd.VALID = '1' AND bwi.VALID = '1' @@ -1323,11 +1329,9 @@ - and (dh2s.DEVCODE like + AND (bd.DEVCODE LIKE - OR dh2s.WELL_CODE LIKE - - ) + OR bd.WELL_CODE LIKE) diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceDataListMapper.xml b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceDataListMapper.xml index adc10af..7010493 100644 --- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceDataListMapper.xml +++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceDataListMapper.xml @@ -107,17 +107,17 @@ - as "LOGTIME", - DESCN, - STATUS + as "logtime", + DESCN as descn, + STATUS as status FROM data_wellcover dw INNER JOIN bus_well_info bwi on dw.WELL_CODE = bwi.WELL_CODE INNER JOIN bus_device bd ON dw.DEVCODE = bd.DEVCODE bd.VALID = '1' AND bwi.VALID = '1' - - and bwi.DEPTID = #{deptid} + + AND dw.DEVCODE = #{devcode} and dw.LOGTIME = ]]> @@ -131,12 +131,8 @@ - - and (dw.DEVCODE like - - OR dw.WELL_CODE LIKE - - ) + + AND dw.WELL_CODE = #{wellCode} ORDER BY LOGTIME DESC @@ -164,76 +160,64 @@ INNER JOIN bus_device bd ON dd.DEVCODE = bd.DEVCODE bd.VALID = '1' AND bwi.VALID = '1' - - and bwi.DEPTID = #{deptid} + + AND dd.DEVCODE = #{devcode} - and dd.UPTIME = ]]> + AND dd.UPTIME = ]]> - and dd.UPTIME + AND dd.UPTIME - - and (dd.DEVCODE like - - OR dd.WELL_CODE LIKE - - ) + + AND dd.WELL_CODE = #{wellCode} ORDER BY dd.UPTIME DESC - - - - @@ -257,8 +241,11 @@ INNER JOIN bus_device bd ON dg.DEVCODE = bd.DEVCODE bd.VALID = '1' AND bwi.VALID = '1' - - and bwi.DEPTID = #{deptid} + + AND dg.DEVCODE = #{devcode} + + + AND dg.WELL_CODE = #{wellCode} and dg.UPTIME = ]]> @@ -272,18 +259,10 @@ - - and (dg.DEVCODE like - - OR dg.WELL_CODE LIKE - - ) - ORDER BY dg.UPTIME DESC - @@ -353,8 +328,11 @@ INNER JOIN bus_device bd ON dth.DEVCODE = bd.DEVCODE bd.VALID = '1' AND bwi.VALID = '1' - - and bwi.DEPTID = #{deptid} + + AND dth.DEVCODE = #{devcode} + + + AND dth.WELL_CODE = #{wellCode} and dth.UPTIME = ]]> @@ -368,13 +346,6 @@ - - and (dth.DEVCODE like - - OR dth.WELL_CODE LIKE - - ) - ORDER BY dth.UPTIME DESC @@ -399,8 +370,11 @@ INNER JOIN bus_device bd ON dn.DEVCODE = bd.DEVCODE bd.VALID = '1' AND bwi.VALID = '1' - - and bwi.DEPTID = #{deptid} + + AND dn.DEVCODE = #{devcode} + + + AND dn.WELL_CODE = #{wellCode} and dn.UPTIME = ]]> @@ -414,13 +388,6 @@ - - and (dn.DEVCODE like - - OR dn.WELL_CODE LIKE - - ) - ORDER BY dn.UPTIME DESC @@ -446,8 +413,11 @@ INNER JOIN bus_device bd ON dwl.DEVCODE = bd.DEVCODE bd.VALID = '1' AND bwi.VALID = '1' - - and bwi.DEPTID = #{deptid} + + AND dwl.DEVCODE = #{devcode} + + + AND dwl.WELL_CODE = #{wellCode} and dwl.UPTIME = ]]> @@ -461,125 +431,104 @@ - - and (dwl.DEVCODE like - - OR dwl.WELL_CODE LIKE - - ) - ORDER BY dwl.UPTIME DESC - + @@ -639,14 +583,17 @@ AS logtime, - dh.DESCN AS descn + dh.DESCN AS descn FROM data_hydrant dh JOIN bus_well_info bwi ON bwi.WELL_CODE= dh.WELL_CODE JOIN bus_device bd ON dh.DEVCODE = bd.DEVCODE bd.VALID = '1' AND bwi.VALID = '1' - - and bwi.DEPTID = #{deptid} + + AND dh.DEVCODE = #{devcode} + + + AND dh.WELL_CODE = #{wellCode} and dh.LOGTIME = ]]> @@ -660,13 +607,6 @@ - - and (dh.DEVCODE like - - OR dh.WELL_CODE LIKE - - ) - @@ -681,14 +621,17 @@ AS uptime, bwi.deptid, - dh2s.device_type as deviceType + bd.device_type as deviceType FROM data_h2s dh2s JOIN bus_well_info bwi ON bwi.WELL_CODE= dh2s.WELL_CODE JOIN bus_device bd ON dh2s.DEVCODE = bd.DEVCODE bd.VALID = '1' AND bwi.VALID = '1' - - and bwi.DEPTID = #{deptid} + + AND dh2s.DEVCODE = #{devcode} + + + AND dh2s.WELL_CODE = #{wellCode} and dh2s.UPTIME = ]]> @@ -702,13 +645,6 @@ - - and (dh2s.DEVCODE like - - OR dh2s.WELL_CODE LIKE - - ) - diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceDataListController.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceDataListController.java index 09d3c0d..0f13e84 100644 --- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceDataListController.java +++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceDataListController.java @@ -1,13 +1,8 @@ package com.casic.missiles.modular.system.controller; -import cn.hutool.core.collection.CollectionUtil; -import com.baomidou.mybatisplus.core.metadata.OrderItem; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.casic.missiles.core.application.context.AbstractPermissionContext; import com.casic.missiles.core.datascope.DataScope; -import com.casic.missiles.core.page.PageFactory; import com.casic.missiles.model.response.ResponseData; -import com.casic.missiles.modular.system.dto.ExcelModel.*; import com.casic.missiles.modular.system.dto.statistic.*; import com.casic.missiles.modular.system.service.DeviceDataListService; import lombok.extern.slf4j.Slf4j; @@ -27,92 +22,88 @@ // @Permission @GetMapping(value = "/welldata/list") - public Object wellDataList(String keywords, String deptid, String beginTime, String endTime) { + public Object wellDataList(String devcode, String wellCode, String beginTime, String endTime) { //查询数据权限 使用默认DEPTID 字段 DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope(); - List list = deviceDataListService.selectWellDataScope(dataScope, deptid, beginTime, endTime, keywords); - + List list = deviceDataListService.selectWellDataScope(dataScope, devcode, beginTime, endTime, wellCode); return ResponseData.success(list); } - /** * 开挖监测仪数据查询 * - * @param keywords - * @param deptid + * @param devcode + * @param wellCode * @param beginTime * @param endTime * @return */ - // @Permission + //@Permission @GetMapping(value = "/digdata/list") - public Object digDataList(String keywords, String deptid, String beginTime, String endTime) { + public Object digDataList(String devcode, String wellCode, String beginTime, String endTime) { DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope(); - List mapList = deviceDataListService.selectDigDataScope(dataScope, deptid, beginTime, endTime, keywords); + List mapList = deviceDataListService.selectDigDataScope(dataScope, devcode, beginTime, endTime, wellCode); return ResponseData.success(mapList); } @GetMapping(value = "/liquiddata/list") -// @Permission - public Object liquidDataList(String keywords, String deptid, String beginTime, String endTime) { + //@Permission + public Object liquidDataList(String devcode, String wellCode, String beginTime, String endTime) { //查询数据权限 使用默认DEPTID 字段 DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope(); - List list = deviceDataListService.selectLiquidDataScope(dataScope, deptid, beginTime, endTime, keywords); + List list = deviceDataListService.selectLiquidDataScope(dataScope, devcode, beginTime, endTime, wellCode); return ResponseData.success(list); } @GetMapping(value = "/gasdata/list") - //@Permission - public Object gasDataList(String keywords, String deptid, String beginTime, String endTime) { + public Object gasDataList(String devcode, String wellCode, String beginTime, String endTime) { DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope(); - List deviceDataExcelDtoList = deviceDataListService.selectGasDataScope(dataScope, deptid, beginTime, endTime, keywords); + List deviceDataExcelDtoList = deviceDataListService.selectGasDataScope(dataScope, devcode, beginTime, endTime, wellCode); return ResponseData.success(deviceDataExcelDtoList); } @GetMapping(value = "/noisedata/list") - public Object noiseDataList(String keywords, String deptid, String beginTime, String endTime) { + public Object noiseDataList(String devcode, String wellCode, String beginTime, String endTime) { DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope(); - List mapList = deviceDataListService.selectNoiseDataScope(dataScope, deptid, beginTime, endTime, keywords); + List mapList = deviceDataListService.selectNoiseDataScope(dataScope, devcode, beginTime, endTime, wellCode); return ResponseData.success(mapList); } @GetMapping(value = "/harmfuldata/list") - public Object harmfulDataList(String keywords, String deptid, String beginTime, String endTime) { + public Object harmfulDataList(String devcode, String wellCode, String beginTime, String endTime) { DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope(); - List mapList = deviceDataListService.selectHarmfulDataScope(dataScope, deptid, beginTime, endTime, keywords); + List mapList = deviceDataListService.selectHarmfulDataScope(dataScope, devcode, beginTime, endTime, wellCode); return ResponseData.success(mapList); } @GetMapping(value = "/tempdata/list") - public Object tempDataList(String keywords, String deptid, String beginTime, String endTime) { + public Object tempDataList(String devcode, String wellCode, String beginTime, String endTime) { DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope(); - List mapList = deviceDataListService.selectTempDataScope(dataScope, deptid, beginTime, endTime, keywords); + List mapList = deviceDataListService.selectTempDataScope(dataScope, devcode, beginTime, endTime, wellCode); return ResponseData.success(mapList); } - @GetMapping(value = "/welllocadata/list") - public Object wellLocDataList(String keywords, String deptid, String beginTime, String endTime) { + public Object wellLocDataList(String devcode, String wellCode, String beginTime, String endTime) { DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope(); - List mapList = deviceDataListService.selectWellLocDataScope(dataScope, deptid, beginTime, endTime, keywords); + List mapList = deviceDataListService.selectWellLocDataScope(dataScope, devcode, beginTime, endTime, wellCode); return ResponseData.success(mapList); } @GetMapping(value = "/liquidGasData/list") - public Object liquidGasDataList(String keywords, String deptid, String sensorType, String beginTime, String endTime) { + public Object liquidGasDataList(String devcode, String wellCode, String sensorType, String beginTime, String endTime) { DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope(); - List mapList = deviceDataListService.selectGasLiquidDataScope(dataScope, sensorType, deptid, beginTime, endTime, keywords); + List mapList = deviceDataListService.selectGasLiquidDataScope(dataScope, sensorType, devcode, beginTime, endTime, wellCode); return ResponseData.success(mapList); } @GetMapping(value = "/tubedata/list") //@Permission - public Object tubeDataList(String keywords, String deptid, String beginTime, String endTime) { + public Object tubeDataList(String devcode, String wellCode, String beginTime, String endTime) { DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope(); - List mapList = deviceDataListService.selectTubeDataScope(dataScope, deptid, beginTime, endTime, keywords); + List mapList = deviceDataListService.selectTubeDataScope(dataScope, devcode, beginTime, endTime, wellCode); return ResponseData.success(mapList); } @@ -120,23 +111,20 @@ * 消防栓列表 */ @GetMapping(value = "/hydrant/list") - public Object hydrantList(String keywords, String deptid, String beginTime, String endTime) { + public Object hydrantList(String devcode, String wellCode, String beginTime, String endTime) { DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope(); - List mapList= deviceDataListService.getHydrantlist(dataScope, deptid, beginTime, endTime, keywords); + List mapList= deviceDataListService.getHydrantlist(dataScope, devcode, beginTime, endTime, wellCode); return ResponseData.success(mapList); } - /** * 硫化氢列表 */ @GetMapping(value = "/h2s/list") - public Object h2sList(String keywords, String deptid, String beginTime, String endTime) { + public Object h2sList(String devcode, String wellCode, String beginTime, String endTime) { DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope(); - System.out.println(keywords); - List mapList= deviceDataListService.getH2sDataScope(dataScope, deptid, beginTime, endTime, keywords); + List mapList= deviceDataListService.getH2sDataScope(dataScope, devcode, beginTime, endTime, wellCode); return ResponseData.success(mapList); } - } diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java index 837e653..3d7ae31 100644 --- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java +++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java @@ -623,9 +623,9 @@ */ @GetMapping(value = "/h2s/list-page") public Object h2sList(String keywords, String deptid, String beginTime, String endTime) { - Page page = PageFactory.defaultPage(); + Page page = PageFactory.defaultPage(); DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope(); - ResponseData responseData = deviceService.getH2slist(dataScope, page, deptid, beginTime, endTime, keywords); + ResponseData responseData = deviceService.getH2slist(dataScope, page, keywords, beginTime, endTime, deptid); responseData.setData(super.packForBT(page)); return responseData; } @@ -634,10 +634,10 @@ */ @GetMapping(value = "/h2s/export") public void h2sExport(String keywords, String deptid, String beginTime, String endTime) throws IOException { - Page page = PageFactory.defaultPage(); + Page page = PageFactory.defaultPage(); DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope(); deviceService.getH2slist(dataScope, page, deptid, beginTime, endTime, keywords); - super.exportExcel(DataH2s.class, page.getRecords(), DeviceExportEnum.HYDRANT_EXPORT.getFileName()); + super.exportExcel(H2SDataDto.class, page.getRecords(), DeviceExportEnum.H2S_EXPORT.getFileName()); } } diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/DataAnalysisMapper.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/DataAnalysisMapper.java index ab62e2e..67fb9c9 100644 --- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/DataAnalysisMapper.java +++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/DataAnalysisMapper.java @@ -97,6 +97,6 @@ List getHydrantlist(@Param("dataScope") DataScope dataScope,@Param("page")Page page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords); - List selectH2sListDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page")Page page, @Param("deptid") String deptid, - @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords); + List selectH2sListDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page")Page page, @Param("keywords") String keywords, + @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("deptid") String deptid); } diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/DeviceDataListMapper.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/DeviceDataListMapper.java index 7114492..732dcc6 100644 --- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/DeviceDataListMapper.java +++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/DeviceDataListMapper.java @@ -19,29 +19,30 @@ * @since 2019-05-13 */ public interface DeviceDataListMapper extends BaseMapper { - List selectWellDataScope(@Param("dataScope") DataScope dataScope, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords); + List selectWellDataScope(@Param("dataScope") DataScope dataScope, @Param("devcode") String devcode, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("wellCode") String wellCode); - List selectDigDataScope(@Param("dataScope") DataScope dataScope, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords); + List selectDigDataScope(@Param("dataScope") DataScope dataScope, @Param("devcode") String devcode, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("wellCode") String wellCode); - List selectLiquidDataScope(@Param("dataScope") DataScope dataScope, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords); + List selectLiquidDataScope(@Param("dataScope") DataScope dataScope, @Param("devcode") String devcode, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("wellCode") String wellCode); - List selectGasDataScope(@Param("dataScope") DataScope dataScope, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords); + List selectGasDataScope(@Param("dataScope") DataScope dataScope, @Param("devcode") String devcode, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("wellCode") String wellCode); - List selectNoiseDataScope(@Param("dataScope") DataScope dataScope, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords); + List selectNoiseDataScope(@Param("dataScope") DataScope dataScope, @Param("devcode") String devcode, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("wellCode") String wellCode); - List selectHarmfulDataScope(@Param("dataScope") DataScope dataScope, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords); + List selectHarmfulDataScope(@Param("dataScope") DataScope dataScope, @Param("devcode") String devcode, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("wellCode") String wellCode); - List selectTempDataScope(@Param("dataScope") DataScope dataScope, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords); + List selectTempDataScope(@Param("dataScope") DataScope dataScope, @Param("devcode") String devcode, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("wellCode") String wellCode); - List selectWellLocDataScope(@Param("dataScope") DataScope dataScope, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords); + List selectWellLocDataScope(@Param("dataScope") DataScope dataScope, @Param("devcode") String devcode, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("wellCode") String wellCode); - List selectGasLiquidDataLiquidScope(@Param("dataScope") DataScope dataScope, @Param("deptIds") List deptIds, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords); + List selectGasLiquidDataLiquidScope(@Param("dataScope") DataScope dataScope, @Param("devcode")String devcode, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("wellCode") String wellCode); - List selectGasLiquidDataGasScope(@Param("dataScope") DataScope dataScope, @Param("deptIds") List deptIds, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords); + List selectGasLiquidDataGasScope(@Param("dataScope") DataScope dataScope, @Param("devcode")String devcode, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("wellCode") String wellCode); - List selectTubeDataScope(@Param("dataScope") DataScope dataScope, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords); + List selectTubeDataScope(@Param("dataScope") DataScope dataScope, @Param("devcode") String devcode, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("wellCode") String wellCode); - List getHydrantlist(@Param("dataScope") DataScope dataScope, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords); + List getHydrantlist(@Param("dataScope") DataScope dataScope, @Param("devcode") String devcode, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("wellCode") String wellCode); - List selectH2sListDataScope(@Param("dataScope") DataScope dataScope, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords); + List selectH2sListDataScope(@Param("dataScope") DataScope dataScope, @Param("devcode") String devcode, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("wellCode") String wellCode); + } diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/DataAnalysisMapper.xml b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/DataAnalysisMapper.xml index a0117ca..6ed130a 100644 --- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/DataAnalysisMapper.xml +++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/DataAnalysisMapper.xml @@ -1255,7 +1255,6 @@ - SELECT dh2s.DEVCODE AS devcode, dh2s.WELL_CODE AS "wellCode", - dh2s.STRENGTH, - dh2s.CELL, + dh2s.STRENGTH AS strength, + dh2s.CELL AS cell, AS uptime, - dh2s.device_type as deviceType + + + + AS logtime, + bdt.TYPE_NAME AS "deviceTypeName", + bd.device_type as deviceType, + bwi.DEPTID AS deptid FROM data_h2s dh2s JOIN bus_well_info bwi ON bwi.WELL_CODE= dh2s.WELL_CODE JOIN bus_device bd ON dh2s.DEVCODE = bd.DEVCODE + LEFT JOIN base_device_type bdt ON bd.DEVICE_TYPE = bdt.ID bd.VALID = '1' AND bwi.VALID = '1' @@ -1323,11 +1329,9 @@ - and (dh2s.DEVCODE like + AND (bd.DEVCODE LIKE - OR dh2s.WELL_CODE LIKE - - ) + OR bd.WELL_CODE LIKE) diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceDataListMapper.xml b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceDataListMapper.xml index adc10af..7010493 100644 --- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceDataListMapper.xml +++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceDataListMapper.xml @@ -107,17 +107,17 @@ - as "LOGTIME", - DESCN, - STATUS + as "logtime", + DESCN as descn, + STATUS as status FROM data_wellcover dw INNER JOIN bus_well_info bwi on dw.WELL_CODE = bwi.WELL_CODE INNER JOIN bus_device bd ON dw.DEVCODE = bd.DEVCODE bd.VALID = '1' AND bwi.VALID = '1' - - and bwi.DEPTID = #{deptid} + + AND dw.DEVCODE = #{devcode} and dw.LOGTIME = ]]> @@ -131,12 +131,8 @@ - - and (dw.DEVCODE like - - OR dw.WELL_CODE LIKE - - ) + + AND dw.WELL_CODE = #{wellCode} ORDER BY LOGTIME DESC @@ -164,76 +160,64 @@ INNER JOIN bus_device bd ON dd.DEVCODE = bd.DEVCODE bd.VALID = '1' AND bwi.VALID = '1' - - and bwi.DEPTID = #{deptid} + + AND dd.DEVCODE = #{devcode} - and dd.UPTIME = ]]> + AND dd.UPTIME = ]]> - and dd.UPTIME + AND dd.UPTIME - - and (dd.DEVCODE like - - OR dd.WELL_CODE LIKE - - ) + + AND dd.WELL_CODE = #{wellCode} ORDER BY dd.UPTIME DESC - - - - @@ -257,8 +241,11 @@ INNER JOIN bus_device bd ON dg.DEVCODE = bd.DEVCODE bd.VALID = '1' AND bwi.VALID = '1' - - and bwi.DEPTID = #{deptid} + + AND dg.DEVCODE = #{devcode} + + + AND dg.WELL_CODE = #{wellCode} and dg.UPTIME = ]]> @@ -272,18 +259,10 @@ - - and (dg.DEVCODE like - - OR dg.WELL_CODE LIKE - - ) - ORDER BY dg.UPTIME DESC - @@ -353,8 +328,11 @@ INNER JOIN bus_device bd ON dth.DEVCODE = bd.DEVCODE bd.VALID = '1' AND bwi.VALID = '1' - - and bwi.DEPTID = #{deptid} + + AND dth.DEVCODE = #{devcode} + + + AND dth.WELL_CODE = #{wellCode} and dth.UPTIME = ]]> @@ -368,13 +346,6 @@ - - and (dth.DEVCODE like - - OR dth.WELL_CODE LIKE - - ) - ORDER BY dth.UPTIME DESC @@ -399,8 +370,11 @@ INNER JOIN bus_device bd ON dn.DEVCODE = bd.DEVCODE bd.VALID = '1' AND bwi.VALID = '1' - - and bwi.DEPTID = #{deptid} + + AND dn.DEVCODE = #{devcode} + + + AND dn.WELL_CODE = #{wellCode} and dn.UPTIME = ]]> @@ -414,13 +388,6 @@ - - and (dn.DEVCODE like - - OR dn.WELL_CODE LIKE - - ) - ORDER BY dn.UPTIME DESC @@ -446,8 +413,11 @@ INNER JOIN bus_device bd ON dwl.DEVCODE = bd.DEVCODE bd.VALID = '1' AND bwi.VALID = '1' - - and bwi.DEPTID = #{deptid} + + AND dwl.DEVCODE = #{devcode} + + + AND dwl.WELL_CODE = #{wellCode} and dwl.UPTIME = ]]> @@ -461,125 +431,104 @@ - - and (dwl.DEVCODE like - - OR dwl.WELL_CODE LIKE - - ) - ORDER BY dwl.UPTIME DESC - + @@ -639,14 +583,17 @@ AS logtime, - dh.DESCN AS descn + dh.DESCN AS descn FROM data_hydrant dh JOIN bus_well_info bwi ON bwi.WELL_CODE= dh.WELL_CODE JOIN bus_device bd ON dh.DEVCODE = bd.DEVCODE bd.VALID = '1' AND bwi.VALID = '1' - - and bwi.DEPTID = #{deptid} + + AND dh.DEVCODE = #{devcode} + + + AND dh.WELL_CODE = #{wellCode} and dh.LOGTIME = ]]> @@ -660,13 +607,6 @@ - - and (dh.DEVCODE like - - OR dh.WELL_CODE LIKE - - ) - @@ -681,14 +621,17 @@ AS uptime, bwi.deptid, - dh2s.device_type as deviceType + bd.device_type as deviceType FROM data_h2s dh2s JOIN bus_well_info bwi ON bwi.WELL_CODE= dh2s.WELL_CODE JOIN bus_device bd ON dh2s.DEVCODE = bd.DEVCODE bd.VALID = '1' AND bwi.VALID = '1' - - and bwi.DEPTID = #{deptid} + + AND dh2s.DEVCODE = #{devcode} + + + AND dh2s.WELL_CODE = #{wellCode} and dh2s.UPTIME = ]]> @@ -702,13 +645,6 @@ - - and (dh2s.DEVCODE like - - OR dh2s.WELL_CODE LIKE - - ) - diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/DeviceDataListService.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/DeviceDataListService.java index 698a8ea..9bfe937 100644 --- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/DeviceDataListService.java +++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/DeviceDataListService.java @@ -19,46 +19,46 @@ /** * 开挖监测仪数据查询 */ - List selectDigDataScope(DataScope dataScope, String deptid, String beginTime, String endTime, String keywords); + List selectDigDataScope(DataScope dataScope, String devcode, String beginTime, String endTime, String wellCode); /** * 根据条件检索井盖监测数据列表 */ - List selectWellDataScope(DataScope dataScope, String deptid, String beginTime, String endTime, String keywords); + List selectWellDataScope(DataScope dataScope, String devcode, String beginTime, String endTime, String wellCode); /** * 根据检索条件查询液位检测数据 */ - List selectLiquidDataScope(DataScope dataScope, String deptid, String beginTime, String endTime, String keywords); + List selectLiquidDataScope(DataScope dataScope, String devcode, String beginTime, String endTime, String wellCode); /** * 燃气数据查询 */ - List selectGasDataScope(DataScope dataScope, String deptid, String beginTime, String endTime, String keywords); + List selectGasDataScope(DataScope dataScope, String devcode, String beginTime, String endTime, String wellCode); /** * 噪声记录仪数据查询 */ - List selectNoiseDataScope(DataScope dataScope, String deptid, String beginTime, String endTime, String keywords); + List selectNoiseDataScope(DataScope dataScope, String devcode, String beginTime, String endTime, String wellCode); /** * 有害气体数据查询 */ - List selectHarmfulDataScope(DataScope dataScope, String deptid, String beginTime, String endTime, String keywords); + List selectHarmfulDataScope(DataScope dataScope, String devcode, String beginTime, String endTime, String wellCode); /** * 温湿度数据查询 */ - List selectTempDataScope(DataScope dataScope, String deptid, String beginTime, String endTime, String keywords); + List selectTempDataScope(DataScope dataScope, String devcode, String beginTime, String endTime, String wellCode); /** * 井盖定位监测仪数据查询 */ - List selectWellLocDataScope(DataScope dataScope, String deptid, String beginTime, String endTime, String keywords); + List selectWellLocDataScope(DataScope dataScope, String devcode, String beginTime, String endTime, String wellCode); - List selectGasLiquidDataScope(DataScope dataScope, String sensorType, String deptid, String beginTime, String endTime, String keywords); + List selectGasLiquidDataScope(DataScope dataScope, String sensorType, String devcode, String beginTime, String endTime, String wellCode); /** * 管盯数据查询 */ - List selectTubeDataScope(DataScope dataScope, String deptid, String beginTime, String endTime, String keywords); + List selectTubeDataScope(DataScope dataScope, String devcode, String beginTime, String endTime, String wellCode); - List getHydrantlist(DataScope dataScope, String deptid, String beginTime, String endTime, String keywords); + List getHydrantlist(DataScope dataScope, String devcode, String beginTime, String endTime, String wellCode); - List getH2sDataScope(DataScope dataScope, String deptid, String beginTime, String endTime, String keywords); + List getH2sDataScope(DataScope dataScope, String devcode, String beginTime, String endTime, String wellCode); } \ No newline at end of file diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceDataListController.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceDataListController.java index 09d3c0d..0f13e84 100644 --- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceDataListController.java +++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceDataListController.java @@ -1,13 +1,8 @@ package com.casic.missiles.modular.system.controller; -import cn.hutool.core.collection.CollectionUtil; -import com.baomidou.mybatisplus.core.metadata.OrderItem; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.casic.missiles.core.application.context.AbstractPermissionContext; import com.casic.missiles.core.datascope.DataScope; -import com.casic.missiles.core.page.PageFactory; import com.casic.missiles.model.response.ResponseData; -import com.casic.missiles.modular.system.dto.ExcelModel.*; import com.casic.missiles.modular.system.dto.statistic.*; import com.casic.missiles.modular.system.service.DeviceDataListService; import lombok.extern.slf4j.Slf4j; @@ -27,92 +22,88 @@ // @Permission @GetMapping(value = "/welldata/list") - public Object wellDataList(String keywords, String deptid, String beginTime, String endTime) { + public Object wellDataList(String devcode, String wellCode, String beginTime, String endTime) { //查询数据权限 使用默认DEPTID 字段 DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope(); - List list = deviceDataListService.selectWellDataScope(dataScope, deptid, beginTime, endTime, keywords); - + List list = deviceDataListService.selectWellDataScope(dataScope, devcode, beginTime, endTime, wellCode); return ResponseData.success(list); } - /** * 开挖监测仪数据查询 * - * @param keywords - * @param deptid + * @param devcode + * @param wellCode * @param beginTime * @param endTime * @return */ - // @Permission + //@Permission @GetMapping(value = "/digdata/list") - public Object digDataList(String keywords, String deptid, String beginTime, String endTime) { + public Object digDataList(String devcode, String wellCode, String beginTime, String endTime) { DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope(); - List mapList = deviceDataListService.selectDigDataScope(dataScope, deptid, beginTime, endTime, keywords); + List mapList = deviceDataListService.selectDigDataScope(dataScope, devcode, beginTime, endTime, wellCode); return ResponseData.success(mapList); } @GetMapping(value = "/liquiddata/list") -// @Permission - public Object liquidDataList(String keywords, String deptid, String beginTime, String endTime) { + //@Permission + public Object liquidDataList(String devcode, String wellCode, String beginTime, String endTime) { //查询数据权限 使用默认DEPTID 字段 DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope(); - List list = deviceDataListService.selectLiquidDataScope(dataScope, deptid, beginTime, endTime, keywords); + List list = deviceDataListService.selectLiquidDataScope(dataScope, devcode, beginTime, endTime, wellCode); return ResponseData.success(list); } @GetMapping(value = "/gasdata/list") - //@Permission - public Object gasDataList(String keywords, String deptid, String beginTime, String endTime) { + public Object gasDataList(String devcode, String wellCode, String beginTime, String endTime) { DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope(); - List deviceDataExcelDtoList = deviceDataListService.selectGasDataScope(dataScope, deptid, beginTime, endTime, keywords); + List deviceDataExcelDtoList = deviceDataListService.selectGasDataScope(dataScope, devcode, beginTime, endTime, wellCode); return ResponseData.success(deviceDataExcelDtoList); } @GetMapping(value = "/noisedata/list") - public Object noiseDataList(String keywords, String deptid, String beginTime, String endTime) { + public Object noiseDataList(String devcode, String wellCode, String beginTime, String endTime) { DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope(); - List mapList = deviceDataListService.selectNoiseDataScope(dataScope, deptid, beginTime, endTime, keywords); + List mapList = deviceDataListService.selectNoiseDataScope(dataScope, devcode, beginTime, endTime, wellCode); return ResponseData.success(mapList); } @GetMapping(value = "/harmfuldata/list") - public Object harmfulDataList(String keywords, String deptid, String beginTime, String endTime) { + public Object harmfulDataList(String devcode, String wellCode, String beginTime, String endTime) { DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope(); - List mapList = deviceDataListService.selectHarmfulDataScope(dataScope, deptid, beginTime, endTime, keywords); + List mapList = deviceDataListService.selectHarmfulDataScope(dataScope, devcode, beginTime, endTime, wellCode); return ResponseData.success(mapList); } @GetMapping(value = "/tempdata/list") - public Object tempDataList(String keywords, String deptid, String beginTime, String endTime) { + public Object tempDataList(String devcode, String wellCode, String beginTime, String endTime) { DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope(); - List mapList = deviceDataListService.selectTempDataScope(dataScope, deptid, beginTime, endTime, keywords); + List mapList = deviceDataListService.selectTempDataScope(dataScope, devcode, beginTime, endTime, wellCode); return ResponseData.success(mapList); } - @GetMapping(value = "/welllocadata/list") - public Object wellLocDataList(String keywords, String deptid, String beginTime, String endTime) { + public Object wellLocDataList(String devcode, String wellCode, String beginTime, String endTime) { DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope(); - List mapList = deviceDataListService.selectWellLocDataScope(dataScope, deptid, beginTime, endTime, keywords); + List mapList = deviceDataListService.selectWellLocDataScope(dataScope, devcode, beginTime, endTime, wellCode); return ResponseData.success(mapList); } @GetMapping(value = "/liquidGasData/list") - public Object liquidGasDataList(String keywords, String deptid, String sensorType, String beginTime, String endTime) { + public Object liquidGasDataList(String devcode, String wellCode, String sensorType, String beginTime, String endTime) { DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope(); - List mapList = deviceDataListService.selectGasLiquidDataScope(dataScope, sensorType, deptid, beginTime, endTime, keywords); + List mapList = deviceDataListService.selectGasLiquidDataScope(dataScope, sensorType, devcode, beginTime, endTime, wellCode); return ResponseData.success(mapList); } @GetMapping(value = "/tubedata/list") //@Permission - public Object tubeDataList(String keywords, String deptid, String beginTime, String endTime) { + public Object tubeDataList(String devcode, String wellCode, String beginTime, String endTime) { DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope(); - List mapList = deviceDataListService.selectTubeDataScope(dataScope, deptid, beginTime, endTime, keywords); + List mapList = deviceDataListService.selectTubeDataScope(dataScope, devcode, beginTime, endTime, wellCode); return ResponseData.success(mapList); } @@ -120,23 +111,20 @@ * 消防栓列表 */ @GetMapping(value = "/hydrant/list") - public Object hydrantList(String keywords, String deptid, String beginTime, String endTime) { + public Object hydrantList(String devcode, String wellCode, String beginTime, String endTime) { DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope(); - List mapList= deviceDataListService.getHydrantlist(dataScope, deptid, beginTime, endTime, keywords); + List mapList= deviceDataListService.getHydrantlist(dataScope, devcode, beginTime, endTime, wellCode); return ResponseData.success(mapList); } - /** * 硫化氢列表 */ @GetMapping(value = "/h2s/list") - public Object h2sList(String keywords, String deptid, String beginTime, String endTime) { + public Object h2sList(String devcode, String wellCode, String beginTime, String endTime) { DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope(); - System.out.println(keywords); - List mapList= deviceDataListService.getH2sDataScope(dataScope, deptid, beginTime, endTime, keywords); + List mapList= deviceDataListService.getH2sDataScope(dataScope, devcode, beginTime, endTime, wellCode); return ResponseData.success(mapList); } - } diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java index 837e653..3d7ae31 100644 --- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java +++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java @@ -623,9 +623,9 @@ */ @GetMapping(value = "/h2s/list-page") public Object h2sList(String keywords, String deptid, String beginTime, String endTime) { - Page page = PageFactory.defaultPage(); + Page page = PageFactory.defaultPage(); DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope(); - ResponseData responseData = deviceService.getH2slist(dataScope, page, deptid, beginTime, endTime, keywords); + ResponseData responseData = deviceService.getH2slist(dataScope, page, keywords, beginTime, endTime, deptid); responseData.setData(super.packForBT(page)); return responseData; } @@ -634,10 +634,10 @@ */ @GetMapping(value = "/h2s/export") public void h2sExport(String keywords, String deptid, String beginTime, String endTime) throws IOException { - Page page = PageFactory.defaultPage(); + Page page = PageFactory.defaultPage(); DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope(); deviceService.getH2slist(dataScope, page, deptid, beginTime, endTime, keywords); - super.exportExcel(DataH2s.class, page.getRecords(), DeviceExportEnum.HYDRANT_EXPORT.getFileName()); + super.exportExcel(H2SDataDto.class, page.getRecords(), DeviceExportEnum.H2S_EXPORT.getFileName()); } } diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/DataAnalysisMapper.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/DataAnalysisMapper.java index ab62e2e..67fb9c9 100644 --- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/DataAnalysisMapper.java +++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/DataAnalysisMapper.java @@ -97,6 +97,6 @@ List getHydrantlist(@Param("dataScope") DataScope dataScope,@Param("page")Page page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords); - List selectH2sListDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page")Page page, @Param("deptid") String deptid, - @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords); + List selectH2sListDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page")Page page, @Param("keywords") String keywords, + @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("deptid") String deptid); } diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/DeviceDataListMapper.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/DeviceDataListMapper.java index 7114492..732dcc6 100644 --- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/DeviceDataListMapper.java +++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/DeviceDataListMapper.java @@ -19,29 +19,30 @@ * @since 2019-05-13 */ public interface DeviceDataListMapper extends BaseMapper { - List selectWellDataScope(@Param("dataScope") DataScope dataScope, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords); + List selectWellDataScope(@Param("dataScope") DataScope dataScope, @Param("devcode") String devcode, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("wellCode") String wellCode); - List selectDigDataScope(@Param("dataScope") DataScope dataScope, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords); + List selectDigDataScope(@Param("dataScope") DataScope dataScope, @Param("devcode") String devcode, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("wellCode") String wellCode); - List selectLiquidDataScope(@Param("dataScope") DataScope dataScope, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords); + List selectLiquidDataScope(@Param("dataScope") DataScope dataScope, @Param("devcode") String devcode, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("wellCode") String wellCode); - List selectGasDataScope(@Param("dataScope") DataScope dataScope, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords); + List selectGasDataScope(@Param("dataScope") DataScope dataScope, @Param("devcode") String devcode, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("wellCode") String wellCode); - List selectNoiseDataScope(@Param("dataScope") DataScope dataScope, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords); + List selectNoiseDataScope(@Param("dataScope") DataScope dataScope, @Param("devcode") String devcode, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("wellCode") String wellCode); - List selectHarmfulDataScope(@Param("dataScope") DataScope dataScope, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords); + List selectHarmfulDataScope(@Param("dataScope") DataScope dataScope, @Param("devcode") String devcode, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("wellCode") String wellCode); - List selectTempDataScope(@Param("dataScope") DataScope dataScope, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords); + List selectTempDataScope(@Param("dataScope") DataScope dataScope, @Param("devcode") String devcode, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("wellCode") String wellCode); - List selectWellLocDataScope(@Param("dataScope") DataScope dataScope, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords); + List selectWellLocDataScope(@Param("dataScope") DataScope dataScope, @Param("devcode") String devcode, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("wellCode") String wellCode); - List selectGasLiquidDataLiquidScope(@Param("dataScope") DataScope dataScope, @Param("deptIds") List deptIds, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords); + List selectGasLiquidDataLiquidScope(@Param("dataScope") DataScope dataScope, @Param("devcode")String devcode, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("wellCode") String wellCode); - List selectGasLiquidDataGasScope(@Param("dataScope") DataScope dataScope, @Param("deptIds") List deptIds, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords); + List selectGasLiquidDataGasScope(@Param("dataScope") DataScope dataScope, @Param("devcode")String devcode, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("wellCode") String wellCode); - List selectTubeDataScope(@Param("dataScope") DataScope dataScope, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords); + List selectTubeDataScope(@Param("dataScope") DataScope dataScope, @Param("devcode") String devcode, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("wellCode") String wellCode); - List getHydrantlist(@Param("dataScope") DataScope dataScope, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords); + List getHydrantlist(@Param("dataScope") DataScope dataScope, @Param("devcode") String devcode, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("wellCode") String wellCode); - List selectH2sListDataScope(@Param("dataScope") DataScope dataScope, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords); + List selectH2sListDataScope(@Param("dataScope") DataScope dataScope, @Param("devcode") String devcode, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("wellCode") String wellCode); + } diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/DataAnalysisMapper.xml b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/DataAnalysisMapper.xml index a0117ca..6ed130a 100644 --- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/DataAnalysisMapper.xml +++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/DataAnalysisMapper.xml @@ -1255,7 +1255,6 @@ - SELECT dh2s.DEVCODE AS devcode, dh2s.WELL_CODE AS "wellCode", - dh2s.STRENGTH, - dh2s.CELL, + dh2s.STRENGTH AS strength, + dh2s.CELL AS cell, AS uptime, - dh2s.device_type as deviceType + + + + AS logtime, + bdt.TYPE_NAME AS "deviceTypeName", + bd.device_type as deviceType, + bwi.DEPTID AS deptid FROM data_h2s dh2s JOIN bus_well_info bwi ON bwi.WELL_CODE= dh2s.WELL_CODE JOIN bus_device bd ON dh2s.DEVCODE = bd.DEVCODE + LEFT JOIN base_device_type bdt ON bd.DEVICE_TYPE = bdt.ID bd.VALID = '1' AND bwi.VALID = '1' @@ -1323,11 +1329,9 @@ - and (dh2s.DEVCODE like + AND (bd.DEVCODE LIKE - OR dh2s.WELL_CODE LIKE - - ) + OR bd.WELL_CODE LIKE) diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceDataListMapper.xml b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceDataListMapper.xml index adc10af..7010493 100644 --- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceDataListMapper.xml +++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceDataListMapper.xml @@ -107,17 +107,17 @@ - as "LOGTIME", - DESCN, - STATUS + as "logtime", + DESCN as descn, + STATUS as status FROM data_wellcover dw INNER JOIN bus_well_info bwi on dw.WELL_CODE = bwi.WELL_CODE INNER JOIN bus_device bd ON dw.DEVCODE = bd.DEVCODE bd.VALID = '1' AND bwi.VALID = '1' - - and bwi.DEPTID = #{deptid} + + AND dw.DEVCODE = #{devcode} and dw.LOGTIME = ]]> @@ -131,12 +131,8 @@ - - and (dw.DEVCODE like - - OR dw.WELL_CODE LIKE - - ) + + AND dw.WELL_CODE = #{wellCode} ORDER BY LOGTIME DESC @@ -164,76 +160,64 @@ INNER JOIN bus_device bd ON dd.DEVCODE = bd.DEVCODE bd.VALID = '1' AND bwi.VALID = '1' - - and bwi.DEPTID = #{deptid} + + AND dd.DEVCODE = #{devcode} - and dd.UPTIME = ]]> + AND dd.UPTIME = ]]> - and dd.UPTIME + AND dd.UPTIME - - and (dd.DEVCODE like - - OR dd.WELL_CODE LIKE - - ) + + AND dd.WELL_CODE = #{wellCode} ORDER BY dd.UPTIME DESC - - - - @@ -257,8 +241,11 @@ INNER JOIN bus_device bd ON dg.DEVCODE = bd.DEVCODE bd.VALID = '1' AND bwi.VALID = '1' - - and bwi.DEPTID = #{deptid} + + AND dg.DEVCODE = #{devcode} + + + AND dg.WELL_CODE = #{wellCode} and dg.UPTIME = ]]> @@ -272,18 +259,10 @@ - - and (dg.DEVCODE like - - OR dg.WELL_CODE LIKE - - ) - ORDER BY dg.UPTIME DESC - @@ -353,8 +328,11 @@ INNER JOIN bus_device bd ON dth.DEVCODE = bd.DEVCODE bd.VALID = '1' AND bwi.VALID = '1' - - and bwi.DEPTID = #{deptid} + + AND dth.DEVCODE = #{devcode} + + + AND dth.WELL_CODE = #{wellCode} and dth.UPTIME = ]]> @@ -368,13 +346,6 @@ - - and (dth.DEVCODE like - - OR dth.WELL_CODE LIKE - - ) - ORDER BY dth.UPTIME DESC @@ -399,8 +370,11 @@ INNER JOIN bus_device bd ON dn.DEVCODE = bd.DEVCODE bd.VALID = '1' AND bwi.VALID = '1' - - and bwi.DEPTID = #{deptid} + + AND dn.DEVCODE = #{devcode} + + + AND dn.WELL_CODE = #{wellCode} and dn.UPTIME = ]]> @@ -414,13 +388,6 @@ - - and (dn.DEVCODE like - - OR dn.WELL_CODE LIKE - - ) - ORDER BY dn.UPTIME DESC @@ -446,8 +413,11 @@ INNER JOIN bus_device bd ON dwl.DEVCODE = bd.DEVCODE bd.VALID = '1' AND bwi.VALID = '1' - - and bwi.DEPTID = #{deptid} + + AND dwl.DEVCODE = #{devcode} + + + AND dwl.WELL_CODE = #{wellCode} and dwl.UPTIME = ]]> @@ -461,125 +431,104 @@ - - and (dwl.DEVCODE like - - OR dwl.WELL_CODE LIKE - - ) - ORDER BY dwl.UPTIME DESC - + @@ -639,14 +583,17 @@ AS logtime, - dh.DESCN AS descn + dh.DESCN AS descn FROM data_hydrant dh JOIN bus_well_info bwi ON bwi.WELL_CODE= dh.WELL_CODE JOIN bus_device bd ON dh.DEVCODE = bd.DEVCODE bd.VALID = '1' AND bwi.VALID = '1' - - and bwi.DEPTID = #{deptid} + + AND dh.DEVCODE = #{devcode} + + + AND dh.WELL_CODE = #{wellCode} and dh.LOGTIME = ]]> @@ -660,13 +607,6 @@ - - and (dh.DEVCODE like - - OR dh.WELL_CODE LIKE - - ) - @@ -681,14 +621,17 @@ AS uptime, bwi.deptid, - dh2s.device_type as deviceType + bd.device_type as deviceType FROM data_h2s dh2s JOIN bus_well_info bwi ON bwi.WELL_CODE= dh2s.WELL_CODE JOIN bus_device bd ON dh2s.DEVCODE = bd.DEVCODE bd.VALID = '1' AND bwi.VALID = '1' - - and bwi.DEPTID = #{deptid} + + AND dh2s.DEVCODE = #{devcode} + + + AND dh2s.WELL_CODE = #{wellCode} and dh2s.UPTIME = ]]> @@ -702,13 +645,6 @@ - - and (dh2s.DEVCODE like - - OR dh2s.WELL_CODE LIKE - - ) - diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/DeviceDataListService.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/DeviceDataListService.java index 698a8ea..9bfe937 100644 --- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/DeviceDataListService.java +++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/DeviceDataListService.java @@ -19,46 +19,46 @@ /** * 开挖监测仪数据查询 */ - List selectDigDataScope(DataScope dataScope, String deptid, String beginTime, String endTime, String keywords); + List selectDigDataScope(DataScope dataScope, String devcode, String beginTime, String endTime, String wellCode); /** * 根据条件检索井盖监测数据列表 */ - List selectWellDataScope(DataScope dataScope, String deptid, String beginTime, String endTime, String keywords); + List selectWellDataScope(DataScope dataScope, String devcode, String beginTime, String endTime, String wellCode); /** * 根据检索条件查询液位检测数据 */ - List selectLiquidDataScope(DataScope dataScope, String deptid, String beginTime, String endTime, String keywords); + List selectLiquidDataScope(DataScope dataScope, String devcode, String beginTime, String endTime, String wellCode); /** * 燃气数据查询 */ - List selectGasDataScope(DataScope dataScope, String deptid, String beginTime, String endTime, String keywords); + List selectGasDataScope(DataScope dataScope, String devcode, String beginTime, String endTime, String wellCode); /** * 噪声记录仪数据查询 */ - List selectNoiseDataScope(DataScope dataScope, String deptid, String beginTime, String endTime, String keywords); + List selectNoiseDataScope(DataScope dataScope, String devcode, String beginTime, String endTime, String wellCode); /** * 有害气体数据查询 */ - List selectHarmfulDataScope(DataScope dataScope, String deptid, String beginTime, String endTime, String keywords); + List selectHarmfulDataScope(DataScope dataScope, String devcode, String beginTime, String endTime, String wellCode); /** * 温湿度数据查询 */ - List selectTempDataScope(DataScope dataScope, String deptid, String beginTime, String endTime, String keywords); + List selectTempDataScope(DataScope dataScope, String devcode, String beginTime, String endTime, String wellCode); /** * 井盖定位监测仪数据查询 */ - List selectWellLocDataScope(DataScope dataScope, String deptid, String beginTime, String endTime, String keywords); + List selectWellLocDataScope(DataScope dataScope, String devcode, String beginTime, String endTime, String wellCode); - List selectGasLiquidDataScope(DataScope dataScope, String sensorType, String deptid, String beginTime, String endTime, String keywords); + List selectGasLiquidDataScope(DataScope dataScope, String sensorType, String devcode, String beginTime, String endTime, String wellCode); /** * 管盯数据查询 */ - List selectTubeDataScope(DataScope dataScope, String deptid, String beginTime, String endTime, String keywords); + List selectTubeDataScope(DataScope dataScope, String devcode, String beginTime, String endTime, String wellCode); - List getHydrantlist(DataScope dataScope, String deptid, String beginTime, String endTime, String keywords); + List getHydrantlist(DataScope dataScope, String devcode, String beginTime, String endTime, String wellCode); - List getH2sDataScope(DataScope dataScope, String deptid, String beginTime, String endTime, String keywords); + List getH2sDataScope(DataScope dataScope, String devcode, String beginTime, String endTime, String wellCode); } \ No newline at end of file diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/IDataAnalysisService.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/IDataAnalysisService.java index d09c12e..a75ed02 100644 --- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/IDataAnalysisService.java +++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/IDataAnalysisService.java @@ -126,5 +126,5 @@ ResponseData getHydrantlist(DataScope dataScope, Page page, String deptid, String beginTime, String endTime, String keywords); - ResponseData getH2slist(DataScope dataScope, Page page, String deptid, String beginTime, String endTime, String keywords); + ResponseData getH2slist(DataScope dataScope, Page page, String keywords, String beginTime, String endTime, String deptid); } diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceDataListController.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceDataListController.java index 09d3c0d..0f13e84 100644 --- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceDataListController.java +++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceDataListController.java @@ -1,13 +1,8 @@ package com.casic.missiles.modular.system.controller; -import cn.hutool.core.collection.CollectionUtil; -import com.baomidou.mybatisplus.core.metadata.OrderItem; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.casic.missiles.core.application.context.AbstractPermissionContext; import com.casic.missiles.core.datascope.DataScope; -import com.casic.missiles.core.page.PageFactory; import com.casic.missiles.model.response.ResponseData; -import com.casic.missiles.modular.system.dto.ExcelModel.*; import com.casic.missiles.modular.system.dto.statistic.*; import com.casic.missiles.modular.system.service.DeviceDataListService; import lombok.extern.slf4j.Slf4j; @@ -27,92 +22,88 @@ // @Permission @GetMapping(value = "/welldata/list") - public Object wellDataList(String keywords, String deptid, String beginTime, String endTime) { + public Object wellDataList(String devcode, String wellCode, String beginTime, String endTime) { //查询数据权限 使用默认DEPTID 字段 DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope(); - List list = deviceDataListService.selectWellDataScope(dataScope, deptid, beginTime, endTime, keywords); - + List list = deviceDataListService.selectWellDataScope(dataScope, devcode, beginTime, endTime, wellCode); return ResponseData.success(list); } - /** * 开挖监测仪数据查询 * - * @param keywords - * @param deptid + * @param devcode + * @param wellCode * @param beginTime * @param endTime * @return */ - // @Permission + //@Permission @GetMapping(value = "/digdata/list") - public Object digDataList(String keywords, String deptid, String beginTime, String endTime) { + public Object digDataList(String devcode, String wellCode, String beginTime, String endTime) { DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope(); - List mapList = deviceDataListService.selectDigDataScope(dataScope, deptid, beginTime, endTime, keywords); + List mapList = deviceDataListService.selectDigDataScope(dataScope, devcode, beginTime, endTime, wellCode); return ResponseData.success(mapList); } @GetMapping(value = "/liquiddata/list") -// @Permission - public Object liquidDataList(String keywords, String deptid, String beginTime, String endTime) { + //@Permission + public Object liquidDataList(String devcode, String wellCode, String beginTime, String endTime) { //查询数据权限 使用默认DEPTID 字段 DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope(); - List list = deviceDataListService.selectLiquidDataScope(dataScope, deptid, beginTime, endTime, keywords); + List list = deviceDataListService.selectLiquidDataScope(dataScope, devcode, beginTime, endTime, wellCode); return ResponseData.success(list); } @GetMapping(value = "/gasdata/list") - //@Permission - public Object gasDataList(String keywords, String deptid, String beginTime, String endTime) { + public Object gasDataList(String devcode, String wellCode, String beginTime, String endTime) { DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope(); - List deviceDataExcelDtoList = deviceDataListService.selectGasDataScope(dataScope, deptid, beginTime, endTime, keywords); + List deviceDataExcelDtoList = deviceDataListService.selectGasDataScope(dataScope, devcode, beginTime, endTime, wellCode); return ResponseData.success(deviceDataExcelDtoList); } @GetMapping(value = "/noisedata/list") - public Object noiseDataList(String keywords, String deptid, String beginTime, String endTime) { + public Object noiseDataList(String devcode, String wellCode, String beginTime, String endTime) { DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope(); - List mapList = deviceDataListService.selectNoiseDataScope(dataScope, deptid, beginTime, endTime, keywords); + List mapList = deviceDataListService.selectNoiseDataScope(dataScope, devcode, beginTime, endTime, wellCode); return ResponseData.success(mapList); } @GetMapping(value = "/harmfuldata/list") - public Object harmfulDataList(String keywords, String deptid, String beginTime, String endTime) { + public Object harmfulDataList(String devcode, String wellCode, String beginTime, String endTime) { DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope(); - List mapList = deviceDataListService.selectHarmfulDataScope(dataScope, deptid, beginTime, endTime, keywords); + List mapList = deviceDataListService.selectHarmfulDataScope(dataScope, devcode, beginTime, endTime, wellCode); return ResponseData.success(mapList); } @GetMapping(value = "/tempdata/list") - public Object tempDataList(String keywords, String deptid, String beginTime, String endTime) { + public Object tempDataList(String devcode, String wellCode, String beginTime, String endTime) { DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope(); - List mapList = deviceDataListService.selectTempDataScope(dataScope, deptid, beginTime, endTime, keywords); + List mapList = deviceDataListService.selectTempDataScope(dataScope, devcode, beginTime, endTime, wellCode); return ResponseData.success(mapList); } - @GetMapping(value = "/welllocadata/list") - public Object wellLocDataList(String keywords, String deptid, String beginTime, String endTime) { + public Object wellLocDataList(String devcode, String wellCode, String beginTime, String endTime) { DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope(); - List mapList = deviceDataListService.selectWellLocDataScope(dataScope, deptid, beginTime, endTime, keywords); + List mapList = deviceDataListService.selectWellLocDataScope(dataScope, devcode, beginTime, endTime, wellCode); return ResponseData.success(mapList); } @GetMapping(value = "/liquidGasData/list") - public Object liquidGasDataList(String keywords, String deptid, String sensorType, String beginTime, String endTime) { + public Object liquidGasDataList(String devcode, String wellCode, String sensorType, String beginTime, String endTime) { DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope(); - List mapList = deviceDataListService.selectGasLiquidDataScope(dataScope, sensorType, deptid, beginTime, endTime, keywords); + List mapList = deviceDataListService.selectGasLiquidDataScope(dataScope, sensorType, devcode, beginTime, endTime, wellCode); return ResponseData.success(mapList); } @GetMapping(value = "/tubedata/list") //@Permission - public Object tubeDataList(String keywords, String deptid, String beginTime, String endTime) { + public Object tubeDataList(String devcode, String wellCode, String beginTime, String endTime) { DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope(); - List mapList = deviceDataListService.selectTubeDataScope(dataScope, deptid, beginTime, endTime, keywords); + List mapList = deviceDataListService.selectTubeDataScope(dataScope, devcode, beginTime, endTime, wellCode); return ResponseData.success(mapList); } @@ -120,23 +111,20 @@ * 消防栓列表 */ @GetMapping(value = "/hydrant/list") - public Object hydrantList(String keywords, String deptid, String beginTime, String endTime) { + public Object hydrantList(String devcode, String wellCode, String beginTime, String endTime) { DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope(); - List mapList= deviceDataListService.getHydrantlist(dataScope, deptid, beginTime, endTime, keywords); + List mapList= deviceDataListService.getHydrantlist(dataScope, devcode, beginTime, endTime, wellCode); return ResponseData.success(mapList); } - /** * 硫化氢列表 */ @GetMapping(value = "/h2s/list") - public Object h2sList(String keywords, String deptid, String beginTime, String endTime) { + public Object h2sList(String devcode, String wellCode, String beginTime, String endTime) { DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope(); - System.out.println(keywords); - List mapList= deviceDataListService.getH2sDataScope(dataScope, deptid, beginTime, endTime, keywords); + List mapList= deviceDataListService.getH2sDataScope(dataScope, devcode, beginTime, endTime, wellCode); return ResponseData.success(mapList); } - } diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java index 837e653..3d7ae31 100644 --- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java +++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java @@ -623,9 +623,9 @@ */ @GetMapping(value = "/h2s/list-page") public Object h2sList(String keywords, String deptid, String beginTime, String endTime) { - Page page = PageFactory.defaultPage(); + Page page = PageFactory.defaultPage(); DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope(); - ResponseData responseData = deviceService.getH2slist(dataScope, page, deptid, beginTime, endTime, keywords); + ResponseData responseData = deviceService.getH2slist(dataScope, page, keywords, beginTime, endTime, deptid); responseData.setData(super.packForBT(page)); return responseData; } @@ -634,10 +634,10 @@ */ @GetMapping(value = "/h2s/export") public void h2sExport(String keywords, String deptid, String beginTime, String endTime) throws IOException { - Page page = PageFactory.defaultPage(); + Page page = PageFactory.defaultPage(); DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope(); deviceService.getH2slist(dataScope, page, deptid, beginTime, endTime, keywords); - super.exportExcel(DataH2s.class, page.getRecords(), DeviceExportEnum.HYDRANT_EXPORT.getFileName()); + super.exportExcel(H2SDataDto.class, page.getRecords(), DeviceExportEnum.H2S_EXPORT.getFileName()); } } diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/DataAnalysisMapper.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/DataAnalysisMapper.java index ab62e2e..67fb9c9 100644 --- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/DataAnalysisMapper.java +++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/DataAnalysisMapper.java @@ -97,6 +97,6 @@ List getHydrantlist(@Param("dataScope") DataScope dataScope,@Param("page")Page page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords); - List selectH2sListDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page")Page page, @Param("deptid") String deptid, - @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords); + List selectH2sListDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page")Page page, @Param("keywords") String keywords, + @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("deptid") String deptid); } diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/DeviceDataListMapper.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/DeviceDataListMapper.java index 7114492..732dcc6 100644 --- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/DeviceDataListMapper.java +++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/DeviceDataListMapper.java @@ -19,29 +19,30 @@ * @since 2019-05-13 */ public interface DeviceDataListMapper extends BaseMapper { - List selectWellDataScope(@Param("dataScope") DataScope dataScope, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords); + List selectWellDataScope(@Param("dataScope") DataScope dataScope, @Param("devcode") String devcode, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("wellCode") String wellCode); - List selectDigDataScope(@Param("dataScope") DataScope dataScope, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords); + List selectDigDataScope(@Param("dataScope") DataScope dataScope, @Param("devcode") String devcode, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("wellCode") String wellCode); - List selectLiquidDataScope(@Param("dataScope") DataScope dataScope, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords); + List selectLiquidDataScope(@Param("dataScope") DataScope dataScope, @Param("devcode") String devcode, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("wellCode") String wellCode); - List selectGasDataScope(@Param("dataScope") DataScope dataScope, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords); + List selectGasDataScope(@Param("dataScope") DataScope dataScope, @Param("devcode") String devcode, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("wellCode") String wellCode); - List selectNoiseDataScope(@Param("dataScope") DataScope dataScope, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords); + List selectNoiseDataScope(@Param("dataScope") DataScope dataScope, @Param("devcode") String devcode, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("wellCode") String wellCode); - List selectHarmfulDataScope(@Param("dataScope") DataScope dataScope, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords); + List selectHarmfulDataScope(@Param("dataScope") DataScope dataScope, @Param("devcode") String devcode, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("wellCode") String wellCode); - List selectTempDataScope(@Param("dataScope") DataScope dataScope, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords); + List selectTempDataScope(@Param("dataScope") DataScope dataScope, @Param("devcode") String devcode, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("wellCode") String wellCode); - List selectWellLocDataScope(@Param("dataScope") DataScope dataScope, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords); + List selectWellLocDataScope(@Param("dataScope") DataScope dataScope, @Param("devcode") String devcode, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("wellCode") String wellCode); - List selectGasLiquidDataLiquidScope(@Param("dataScope") DataScope dataScope, @Param("deptIds") List deptIds, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords); + List selectGasLiquidDataLiquidScope(@Param("dataScope") DataScope dataScope, @Param("devcode")String devcode, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("wellCode") String wellCode); - List selectGasLiquidDataGasScope(@Param("dataScope") DataScope dataScope, @Param("deptIds") List deptIds, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords); + List selectGasLiquidDataGasScope(@Param("dataScope") DataScope dataScope, @Param("devcode")String devcode, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("wellCode") String wellCode); - List selectTubeDataScope(@Param("dataScope") DataScope dataScope, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords); + List selectTubeDataScope(@Param("dataScope") DataScope dataScope, @Param("devcode") String devcode, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("wellCode") String wellCode); - List getHydrantlist(@Param("dataScope") DataScope dataScope, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords); + List getHydrantlist(@Param("dataScope") DataScope dataScope, @Param("devcode") String devcode, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("wellCode") String wellCode); - List selectH2sListDataScope(@Param("dataScope") DataScope dataScope, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords); + List selectH2sListDataScope(@Param("dataScope") DataScope dataScope, @Param("devcode") String devcode, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("wellCode") String wellCode); + } diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/DataAnalysisMapper.xml b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/DataAnalysisMapper.xml index a0117ca..6ed130a 100644 --- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/DataAnalysisMapper.xml +++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/DataAnalysisMapper.xml @@ -1255,7 +1255,6 @@ - SELECT dh2s.DEVCODE AS devcode, dh2s.WELL_CODE AS "wellCode", - dh2s.STRENGTH, - dh2s.CELL, + dh2s.STRENGTH AS strength, + dh2s.CELL AS cell, AS uptime, - dh2s.device_type as deviceType + + + + AS logtime, + bdt.TYPE_NAME AS "deviceTypeName", + bd.device_type as deviceType, + bwi.DEPTID AS deptid FROM data_h2s dh2s JOIN bus_well_info bwi ON bwi.WELL_CODE= dh2s.WELL_CODE JOIN bus_device bd ON dh2s.DEVCODE = bd.DEVCODE + LEFT JOIN base_device_type bdt ON bd.DEVICE_TYPE = bdt.ID bd.VALID = '1' AND bwi.VALID = '1' @@ -1323,11 +1329,9 @@ - and (dh2s.DEVCODE like + AND (bd.DEVCODE LIKE - OR dh2s.WELL_CODE LIKE - - ) + OR bd.WELL_CODE LIKE) diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceDataListMapper.xml b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceDataListMapper.xml index adc10af..7010493 100644 --- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceDataListMapper.xml +++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceDataListMapper.xml @@ -107,17 +107,17 @@ - as "LOGTIME", - DESCN, - STATUS + as "logtime", + DESCN as descn, + STATUS as status FROM data_wellcover dw INNER JOIN bus_well_info bwi on dw.WELL_CODE = bwi.WELL_CODE INNER JOIN bus_device bd ON dw.DEVCODE = bd.DEVCODE bd.VALID = '1' AND bwi.VALID = '1' - - and bwi.DEPTID = #{deptid} + + AND dw.DEVCODE = #{devcode} and dw.LOGTIME = ]]> @@ -131,12 +131,8 @@ - - and (dw.DEVCODE like - - OR dw.WELL_CODE LIKE - - ) + + AND dw.WELL_CODE = #{wellCode} ORDER BY LOGTIME DESC @@ -164,76 +160,64 @@ INNER JOIN bus_device bd ON dd.DEVCODE = bd.DEVCODE bd.VALID = '1' AND bwi.VALID = '1' - - and bwi.DEPTID = #{deptid} + + AND dd.DEVCODE = #{devcode} - and dd.UPTIME = ]]> + AND dd.UPTIME = ]]> - and dd.UPTIME + AND dd.UPTIME - - and (dd.DEVCODE like - - OR dd.WELL_CODE LIKE - - ) + + AND dd.WELL_CODE = #{wellCode} ORDER BY dd.UPTIME DESC - - - - @@ -257,8 +241,11 @@ INNER JOIN bus_device bd ON dg.DEVCODE = bd.DEVCODE bd.VALID = '1' AND bwi.VALID = '1' - - and bwi.DEPTID = #{deptid} + + AND dg.DEVCODE = #{devcode} + + + AND dg.WELL_CODE = #{wellCode} and dg.UPTIME = ]]> @@ -272,18 +259,10 @@ - - and (dg.DEVCODE like - - OR dg.WELL_CODE LIKE - - ) - ORDER BY dg.UPTIME DESC - @@ -353,8 +328,11 @@ INNER JOIN bus_device bd ON dth.DEVCODE = bd.DEVCODE bd.VALID = '1' AND bwi.VALID = '1' - - and bwi.DEPTID = #{deptid} + + AND dth.DEVCODE = #{devcode} + + + AND dth.WELL_CODE = #{wellCode} and dth.UPTIME = ]]> @@ -368,13 +346,6 @@ - - and (dth.DEVCODE like - - OR dth.WELL_CODE LIKE - - ) - ORDER BY dth.UPTIME DESC @@ -399,8 +370,11 @@ INNER JOIN bus_device bd ON dn.DEVCODE = bd.DEVCODE bd.VALID = '1' AND bwi.VALID = '1' - - and bwi.DEPTID = #{deptid} + + AND dn.DEVCODE = #{devcode} + + + AND dn.WELL_CODE = #{wellCode} and dn.UPTIME = ]]> @@ -414,13 +388,6 @@ - - and (dn.DEVCODE like - - OR dn.WELL_CODE LIKE - - ) - ORDER BY dn.UPTIME DESC @@ -446,8 +413,11 @@ INNER JOIN bus_device bd ON dwl.DEVCODE = bd.DEVCODE bd.VALID = '1' AND bwi.VALID = '1' - - and bwi.DEPTID = #{deptid} + + AND dwl.DEVCODE = #{devcode} + + + AND dwl.WELL_CODE = #{wellCode} and dwl.UPTIME = ]]> @@ -461,125 +431,104 @@ - - and (dwl.DEVCODE like - - OR dwl.WELL_CODE LIKE - - ) - ORDER BY dwl.UPTIME DESC - + @@ -639,14 +583,17 @@ AS logtime, - dh.DESCN AS descn + dh.DESCN AS descn FROM data_hydrant dh JOIN bus_well_info bwi ON bwi.WELL_CODE= dh.WELL_CODE JOIN bus_device bd ON dh.DEVCODE = bd.DEVCODE bd.VALID = '1' AND bwi.VALID = '1' - - and bwi.DEPTID = #{deptid} + + AND dh.DEVCODE = #{devcode} + + + AND dh.WELL_CODE = #{wellCode} and dh.LOGTIME = ]]> @@ -660,13 +607,6 @@ - - and (dh.DEVCODE like - - OR dh.WELL_CODE LIKE - - ) - @@ -681,14 +621,17 @@ AS uptime, bwi.deptid, - dh2s.device_type as deviceType + bd.device_type as deviceType FROM data_h2s dh2s JOIN bus_well_info bwi ON bwi.WELL_CODE= dh2s.WELL_CODE JOIN bus_device bd ON dh2s.DEVCODE = bd.DEVCODE bd.VALID = '1' AND bwi.VALID = '1' - - and bwi.DEPTID = #{deptid} + + AND dh2s.DEVCODE = #{devcode} + + + AND dh2s.WELL_CODE = #{wellCode} and dh2s.UPTIME = ]]> @@ -702,13 +645,6 @@ - - and (dh2s.DEVCODE like - - OR dh2s.WELL_CODE LIKE - - ) - diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/DeviceDataListService.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/DeviceDataListService.java index 698a8ea..9bfe937 100644 --- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/DeviceDataListService.java +++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/DeviceDataListService.java @@ -19,46 +19,46 @@ /** * 开挖监测仪数据查询 */ - List selectDigDataScope(DataScope dataScope, String deptid, String beginTime, String endTime, String keywords); + List selectDigDataScope(DataScope dataScope, String devcode, String beginTime, String endTime, String wellCode); /** * 根据条件检索井盖监测数据列表 */ - List selectWellDataScope(DataScope dataScope, String deptid, String beginTime, String endTime, String keywords); + List selectWellDataScope(DataScope dataScope, String devcode, String beginTime, String endTime, String wellCode); /** * 根据检索条件查询液位检测数据 */ - List selectLiquidDataScope(DataScope dataScope, String deptid, String beginTime, String endTime, String keywords); + List selectLiquidDataScope(DataScope dataScope, String devcode, String beginTime, String endTime, String wellCode); /** * 燃气数据查询 */ - List selectGasDataScope(DataScope dataScope, String deptid, String beginTime, String endTime, String keywords); + List selectGasDataScope(DataScope dataScope, String devcode, String beginTime, String endTime, String wellCode); /** * 噪声记录仪数据查询 */ - List selectNoiseDataScope(DataScope dataScope, String deptid, String beginTime, String endTime, String keywords); + List selectNoiseDataScope(DataScope dataScope, String devcode, String beginTime, String endTime, String wellCode); /** * 有害气体数据查询 */ - List selectHarmfulDataScope(DataScope dataScope, String deptid, String beginTime, String endTime, String keywords); + List selectHarmfulDataScope(DataScope dataScope, String devcode, String beginTime, String endTime, String wellCode); /** * 温湿度数据查询 */ - List selectTempDataScope(DataScope dataScope, String deptid, String beginTime, String endTime, String keywords); + List selectTempDataScope(DataScope dataScope, String devcode, String beginTime, String endTime, String wellCode); /** * 井盖定位监测仪数据查询 */ - List selectWellLocDataScope(DataScope dataScope, String deptid, String beginTime, String endTime, String keywords); + List selectWellLocDataScope(DataScope dataScope, String devcode, String beginTime, String endTime, String wellCode); - List selectGasLiquidDataScope(DataScope dataScope, String sensorType, String deptid, String beginTime, String endTime, String keywords); + List selectGasLiquidDataScope(DataScope dataScope, String sensorType, String devcode, String beginTime, String endTime, String wellCode); /** * 管盯数据查询 */ - List selectTubeDataScope(DataScope dataScope, String deptid, String beginTime, String endTime, String keywords); + List selectTubeDataScope(DataScope dataScope, String devcode, String beginTime, String endTime, String wellCode); - List getHydrantlist(DataScope dataScope, String deptid, String beginTime, String endTime, String keywords); + List getHydrantlist(DataScope dataScope, String devcode, String beginTime, String endTime, String wellCode); - List getH2sDataScope(DataScope dataScope, String deptid, String beginTime, String endTime, String keywords); + List getH2sDataScope(DataScope dataScope, String devcode, String beginTime, String endTime, String wellCode); } \ No newline at end of file diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/IDataAnalysisService.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/IDataAnalysisService.java index d09c12e..a75ed02 100644 --- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/IDataAnalysisService.java +++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/IDataAnalysisService.java @@ -126,5 +126,5 @@ ResponseData getHydrantlist(DataScope dataScope, Page page, String deptid, String beginTime, String endTime, String keywords); - ResponseData getH2slist(DataScope dataScope, Page page, String deptid, String beginTime, String endTime, String keywords); + ResponseData getH2slist(DataScope dataScope, Page page, String keywords, String beginTime, String endTime, String deptid); } diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceDataListServiceImpl.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceDataListServiceImpl.java index 95baa10..5abf45c 100644 --- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceDataListServiceImpl.java +++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceDataListServiceImpl.java @@ -37,81 +37,76 @@ private AbstractPermissionContext permissionService; @Override - public List selectWellDataScope(DataScope dataScope, String deptid, String beginTime, String endTime, String keywords) { - return this.baseMapper.selectWellDataScope(dataScope, deptid, beginTime, endTime, keywords); + public List selectWellDataScope(DataScope dataScope, String devcode, String beginTime, String endTime, String wellCode){ + return this.baseMapper.selectWellDataScope(dataScope, devcode, beginTime, endTime, wellCode); } @Override - public List selectDigDataScope(DataScope dataScope, String deptid, String beginTime, String endTime, String keywords) { - return this.baseMapper.selectDigDataScope(dataScope, deptid, beginTime, endTime, keywords); + public List selectDigDataScope(DataScope dataScope, String devcode, String beginTime, String endTime, String wellCode) { + return this.baseMapper.selectDigDataScope(dataScope, devcode, beginTime, endTime, wellCode); } @Override - public List selectLiquidDataScope(DataScope dataScope, String deptid, String beginTime, String endTime, String keywords) { - return this.baseMapper.selectLiquidDataScope(dataScope, deptid, beginTime, endTime, keywords); + public List selectLiquidDataScope(DataScope dataScope, String devcode, String beginTime, String endTime, String wellCode) { + return this.baseMapper.selectLiquidDataScope(dataScope, devcode, beginTime, endTime, wellCode); } @Override - public List selectGasDataScope(DataScope dataScope, String deptid, String beginTime, String endTime, String keywords) { - return this.baseMapper.selectGasDataScope(dataScope, deptid, beginTime, endTime, keywords); + public List selectGasDataScope(DataScope dataScope, String devcode, String beginTime, String endTime, String wellCode) { + return this.baseMapper.selectGasDataScope(dataScope, devcode, beginTime, endTime, wellCode); } @Override - public List selectNoiseDataScope(DataScope dataScope, String deptid, String beginTime, String endTime, String keywords) { - return this.baseMapper.selectNoiseDataScope(dataScope, deptid, beginTime, endTime, keywords); + public List selectNoiseDataScope(DataScope dataScope, String devcode, String beginTime, String endTime, String wellCode) { + return this.baseMapper.selectNoiseDataScope(dataScope, devcode, beginTime, endTime, wellCode); } @Override - public List selectHarmfulDataScope(DataScope dataScope, String deptid, String beginTime, String endTime, String keywords) { - return this.baseMapper.selectHarmfulDataScope(dataScope, deptid, beginTime, endTime, keywords); + public List selectHarmfulDataScope(DataScope dataScope, String devcode, String beginTime, String endTime, String wellCode){ + return this.baseMapper.selectHarmfulDataScope(dataScope, devcode, beginTime, endTime, wellCode); } @Override - public List selectTempDataScope(DataScope dataScope, String deptid, String beginTime, String endTime, String keywords) { - return this.baseMapper.selectTempDataScope(dataScope, deptid, beginTime, endTime, keywords); + public List selectTempDataScope(DataScope dataScope, String devcode, String beginTime, String endTime, String wellCode){ + return this.baseMapper.selectTempDataScope(dataScope, devcode, beginTime, endTime, wellCode); } @Override - public List selectWellLocDataScope(DataScope dataScope, String deptid, String beginTime, String endTime, String keywords) { - List mapList = this.baseMapper.selectWellLocDataScope(dataScope, deptid, beginTime, endTime, keywords); + public List selectWellLocDataScope(DataScope dataScope, String devcode, String beginTime, String endTime, String wellCode) { + List mapList = this.baseMapper.selectWellLocDataScope(dataScope, devcode, beginTime, endTime, wellCode); return mapList; } @Override - public List selectGasLiquidDataScope(DataScope dataScope, String sensorType, String deptid, String beginTime, String endTime, String keywords) { - List deptIds = null; - if (StrUtil.isNotEmpty(deptid)) { - deptIds = permissionService.getDeptService().getIdsByPid(deptid, null); - deptIds.add(Long.valueOf(deptid)); - } + public List selectGasLiquidDataScope(DataScope dataScope, String sensorType, String devcode, String beginTime, String endTime, String wellCode) { List dataGasLiquidList = new ArrayList<>(); if ("liquid".equals(sensorType)) { - dataGasLiquidList = this.baseMapper.selectGasLiquidDataLiquidScope(dataScope, deptIds, beginTime, endTime, keywords); + dataGasLiquidList = this.baseMapper.selectGasLiquidDataLiquidScope(dataScope, devcode, beginTime, endTime, wellCode); } if ("gas".equals(sensorType)) { - dataGasLiquidList = this.baseMapper.selectGasLiquidDataGasScope(dataScope, deptIds, beginTime, endTime, keywords); + dataGasLiquidList = this.baseMapper.selectGasLiquidDataGasScope(dataScope, devcode, beginTime, endTime, wellCode); } System.out.println(dataGasLiquidList); return dataGasLiquidList; } @Override - public List selectTubeDataScope(DataScope dataScope, String deptid, String beginTime, String endTime, String keywords) { - List mapList = this.baseMapper.selectTubeDataScope(dataScope, deptid, beginTime, endTime, keywords); + public List selectTubeDataScope(DataScope dataScope, String devcode, String beginTime, String endTime, String wellCode){ + List mapList = this.baseMapper.selectTubeDataScope(dataScope, devcode, beginTime, endTime, wellCode); return mapList; } @Override - public List getHydrantlist(DataScope dataScope, String deptid, String beginTime, String endTime, String keywords) { - List mapList = this.baseMapper.getHydrantlist(dataScope, deptid, beginTime, endTime, keywords); + public List getHydrantlist(DataScope dataScope, String devcode, String beginTime, String endTime, String wellCode){ + List mapList = this.baseMapper.getHydrantlist(dataScope, devcode, beginTime, endTime, wellCode); return mapList; } @Override - public List getH2sDataScope(DataScope dataScope, String deptid, String beginTime, String endTime, String keywords) { - return this.baseMapper.selectH2sListDataScope(dataScope, deptid, beginTime, endTime, keywords); + public List getH2sDataScope(DataScope dataScope, String devcode, String beginTime, String endTime, String wellCode) { + return this.baseMapper.selectH2sListDataScope(dataScope, devcode, beginTime, endTime, wellCode); } } diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceDataListController.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceDataListController.java index 09d3c0d..0f13e84 100644 --- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceDataListController.java +++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceDataListController.java @@ -1,13 +1,8 @@ package com.casic.missiles.modular.system.controller; -import cn.hutool.core.collection.CollectionUtil; -import com.baomidou.mybatisplus.core.metadata.OrderItem; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.casic.missiles.core.application.context.AbstractPermissionContext; import com.casic.missiles.core.datascope.DataScope; -import com.casic.missiles.core.page.PageFactory; import com.casic.missiles.model.response.ResponseData; -import com.casic.missiles.modular.system.dto.ExcelModel.*; import com.casic.missiles.modular.system.dto.statistic.*; import com.casic.missiles.modular.system.service.DeviceDataListService; import lombok.extern.slf4j.Slf4j; @@ -27,92 +22,88 @@ // @Permission @GetMapping(value = "/welldata/list") - public Object wellDataList(String keywords, String deptid, String beginTime, String endTime) { + public Object wellDataList(String devcode, String wellCode, String beginTime, String endTime) { //查询数据权限 使用默认DEPTID 字段 DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope(); - List list = deviceDataListService.selectWellDataScope(dataScope, deptid, beginTime, endTime, keywords); - + List list = deviceDataListService.selectWellDataScope(dataScope, devcode, beginTime, endTime, wellCode); return ResponseData.success(list); } - /** * 开挖监测仪数据查询 * - * @param keywords - * @param deptid + * @param devcode + * @param wellCode * @param beginTime * @param endTime * @return */ - // @Permission + //@Permission @GetMapping(value = "/digdata/list") - public Object digDataList(String keywords, String deptid, String beginTime, String endTime) { + public Object digDataList(String devcode, String wellCode, String beginTime, String endTime) { DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope(); - List mapList = deviceDataListService.selectDigDataScope(dataScope, deptid, beginTime, endTime, keywords); + List mapList = deviceDataListService.selectDigDataScope(dataScope, devcode, beginTime, endTime, wellCode); return ResponseData.success(mapList); } @GetMapping(value = "/liquiddata/list") -// @Permission - public Object liquidDataList(String keywords, String deptid, String beginTime, String endTime) { + //@Permission + public Object liquidDataList(String devcode, String wellCode, String beginTime, String endTime) { //查询数据权限 使用默认DEPTID 字段 DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope(); - List list = deviceDataListService.selectLiquidDataScope(dataScope, deptid, beginTime, endTime, keywords); + List list = deviceDataListService.selectLiquidDataScope(dataScope, devcode, beginTime, endTime, wellCode); return ResponseData.success(list); } @GetMapping(value = "/gasdata/list") - //@Permission - public Object gasDataList(String keywords, String deptid, String beginTime, String endTime) { + public Object gasDataList(String devcode, String wellCode, String beginTime, String endTime) { DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope(); - List deviceDataExcelDtoList = deviceDataListService.selectGasDataScope(dataScope, deptid, beginTime, endTime, keywords); + List deviceDataExcelDtoList = deviceDataListService.selectGasDataScope(dataScope, devcode, beginTime, endTime, wellCode); return ResponseData.success(deviceDataExcelDtoList); } @GetMapping(value = "/noisedata/list") - public Object noiseDataList(String keywords, String deptid, String beginTime, String endTime) { + public Object noiseDataList(String devcode, String wellCode, String beginTime, String endTime) { DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope(); - List mapList = deviceDataListService.selectNoiseDataScope(dataScope, deptid, beginTime, endTime, keywords); + List mapList = deviceDataListService.selectNoiseDataScope(dataScope, devcode, beginTime, endTime, wellCode); return ResponseData.success(mapList); } @GetMapping(value = "/harmfuldata/list") - public Object harmfulDataList(String keywords, String deptid, String beginTime, String endTime) { + public Object harmfulDataList(String devcode, String wellCode, String beginTime, String endTime) { DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope(); - List mapList = deviceDataListService.selectHarmfulDataScope(dataScope, deptid, beginTime, endTime, keywords); + List mapList = deviceDataListService.selectHarmfulDataScope(dataScope, devcode, beginTime, endTime, wellCode); return ResponseData.success(mapList); } @GetMapping(value = "/tempdata/list") - public Object tempDataList(String keywords, String deptid, String beginTime, String endTime) { + public Object tempDataList(String devcode, String wellCode, String beginTime, String endTime) { DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope(); - List mapList = deviceDataListService.selectTempDataScope(dataScope, deptid, beginTime, endTime, keywords); + List mapList = deviceDataListService.selectTempDataScope(dataScope, devcode, beginTime, endTime, wellCode); return ResponseData.success(mapList); } - @GetMapping(value = "/welllocadata/list") - public Object wellLocDataList(String keywords, String deptid, String beginTime, String endTime) { + public Object wellLocDataList(String devcode, String wellCode, String beginTime, String endTime) { DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope(); - List mapList = deviceDataListService.selectWellLocDataScope(dataScope, deptid, beginTime, endTime, keywords); + List mapList = deviceDataListService.selectWellLocDataScope(dataScope, devcode, beginTime, endTime, wellCode); return ResponseData.success(mapList); } @GetMapping(value = "/liquidGasData/list") - public Object liquidGasDataList(String keywords, String deptid, String sensorType, String beginTime, String endTime) { + public Object liquidGasDataList(String devcode, String wellCode, String sensorType, String beginTime, String endTime) { DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope(); - List mapList = deviceDataListService.selectGasLiquidDataScope(dataScope, sensorType, deptid, beginTime, endTime, keywords); + List mapList = deviceDataListService.selectGasLiquidDataScope(dataScope, sensorType, devcode, beginTime, endTime, wellCode); return ResponseData.success(mapList); } @GetMapping(value = "/tubedata/list") //@Permission - public Object tubeDataList(String keywords, String deptid, String beginTime, String endTime) { + public Object tubeDataList(String devcode, String wellCode, String beginTime, String endTime) { DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope(); - List mapList = deviceDataListService.selectTubeDataScope(dataScope, deptid, beginTime, endTime, keywords); + List mapList = deviceDataListService.selectTubeDataScope(dataScope, devcode, beginTime, endTime, wellCode); return ResponseData.success(mapList); } @@ -120,23 +111,20 @@ * 消防栓列表 */ @GetMapping(value = "/hydrant/list") - public Object hydrantList(String keywords, String deptid, String beginTime, String endTime) { + public Object hydrantList(String devcode, String wellCode, String beginTime, String endTime) { DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope(); - List mapList= deviceDataListService.getHydrantlist(dataScope, deptid, beginTime, endTime, keywords); + List mapList= deviceDataListService.getHydrantlist(dataScope, devcode, beginTime, endTime, wellCode); return ResponseData.success(mapList); } - /** * 硫化氢列表 */ @GetMapping(value = "/h2s/list") - public Object h2sList(String keywords, String deptid, String beginTime, String endTime) { + public Object h2sList(String devcode, String wellCode, String beginTime, String endTime) { DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope(); - System.out.println(keywords); - List mapList= deviceDataListService.getH2sDataScope(dataScope, deptid, beginTime, endTime, keywords); + List mapList= deviceDataListService.getH2sDataScope(dataScope, devcode, beginTime, endTime, wellCode); return ResponseData.success(mapList); } - } diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java index 837e653..3d7ae31 100644 --- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java +++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java @@ -623,9 +623,9 @@ */ @GetMapping(value = "/h2s/list-page") public Object h2sList(String keywords, String deptid, String beginTime, String endTime) { - Page page = PageFactory.defaultPage(); + Page page = PageFactory.defaultPage(); DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope(); - ResponseData responseData = deviceService.getH2slist(dataScope, page, deptid, beginTime, endTime, keywords); + ResponseData responseData = deviceService.getH2slist(dataScope, page, keywords, beginTime, endTime, deptid); responseData.setData(super.packForBT(page)); return responseData; } @@ -634,10 +634,10 @@ */ @GetMapping(value = "/h2s/export") public void h2sExport(String keywords, String deptid, String beginTime, String endTime) throws IOException { - Page page = PageFactory.defaultPage(); + Page page = PageFactory.defaultPage(); DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope(); deviceService.getH2slist(dataScope, page, deptid, beginTime, endTime, keywords); - super.exportExcel(DataH2s.class, page.getRecords(), DeviceExportEnum.HYDRANT_EXPORT.getFileName()); + super.exportExcel(H2SDataDto.class, page.getRecords(), DeviceExportEnum.H2S_EXPORT.getFileName()); } } diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/DataAnalysisMapper.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/DataAnalysisMapper.java index ab62e2e..67fb9c9 100644 --- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/DataAnalysisMapper.java +++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/DataAnalysisMapper.java @@ -97,6 +97,6 @@ List getHydrantlist(@Param("dataScope") DataScope dataScope,@Param("page")Page page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords); - List selectH2sListDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page")Page page, @Param("deptid") String deptid, - @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords); + List selectH2sListDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page")Page page, @Param("keywords") String keywords, + @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("deptid") String deptid); } diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/DeviceDataListMapper.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/DeviceDataListMapper.java index 7114492..732dcc6 100644 --- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/DeviceDataListMapper.java +++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/DeviceDataListMapper.java @@ -19,29 +19,30 @@ * @since 2019-05-13 */ public interface DeviceDataListMapper extends BaseMapper { - List selectWellDataScope(@Param("dataScope") DataScope dataScope, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords); + List selectWellDataScope(@Param("dataScope") DataScope dataScope, @Param("devcode") String devcode, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("wellCode") String wellCode); - List selectDigDataScope(@Param("dataScope") DataScope dataScope, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords); + List selectDigDataScope(@Param("dataScope") DataScope dataScope, @Param("devcode") String devcode, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("wellCode") String wellCode); - List selectLiquidDataScope(@Param("dataScope") DataScope dataScope, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords); + List selectLiquidDataScope(@Param("dataScope") DataScope dataScope, @Param("devcode") String devcode, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("wellCode") String wellCode); - List selectGasDataScope(@Param("dataScope") DataScope dataScope, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords); + List selectGasDataScope(@Param("dataScope") DataScope dataScope, @Param("devcode") String devcode, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("wellCode") String wellCode); - List selectNoiseDataScope(@Param("dataScope") DataScope dataScope, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords); + List selectNoiseDataScope(@Param("dataScope") DataScope dataScope, @Param("devcode") String devcode, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("wellCode") String wellCode); - List selectHarmfulDataScope(@Param("dataScope") DataScope dataScope, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords); + List selectHarmfulDataScope(@Param("dataScope") DataScope dataScope, @Param("devcode") String devcode, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("wellCode") String wellCode); - List selectTempDataScope(@Param("dataScope") DataScope dataScope, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords); + List selectTempDataScope(@Param("dataScope") DataScope dataScope, @Param("devcode") String devcode, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("wellCode") String wellCode); - List selectWellLocDataScope(@Param("dataScope") DataScope dataScope, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords); + List selectWellLocDataScope(@Param("dataScope") DataScope dataScope, @Param("devcode") String devcode, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("wellCode") String wellCode); - List selectGasLiquidDataLiquidScope(@Param("dataScope") DataScope dataScope, @Param("deptIds") List deptIds, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords); + List selectGasLiquidDataLiquidScope(@Param("dataScope") DataScope dataScope, @Param("devcode")String devcode, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("wellCode") String wellCode); - List selectGasLiquidDataGasScope(@Param("dataScope") DataScope dataScope, @Param("deptIds") List deptIds, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords); + List selectGasLiquidDataGasScope(@Param("dataScope") DataScope dataScope, @Param("devcode")String devcode, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("wellCode") String wellCode); - List selectTubeDataScope(@Param("dataScope") DataScope dataScope, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords); + List selectTubeDataScope(@Param("dataScope") DataScope dataScope, @Param("devcode") String devcode, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("wellCode") String wellCode); - List getHydrantlist(@Param("dataScope") DataScope dataScope, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords); + List getHydrantlist(@Param("dataScope") DataScope dataScope, @Param("devcode") String devcode, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("wellCode") String wellCode); - List selectH2sListDataScope(@Param("dataScope") DataScope dataScope, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords); + List selectH2sListDataScope(@Param("dataScope") DataScope dataScope, @Param("devcode") String devcode, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("wellCode") String wellCode); + } diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/DataAnalysisMapper.xml b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/DataAnalysisMapper.xml index a0117ca..6ed130a 100644 --- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/DataAnalysisMapper.xml +++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/DataAnalysisMapper.xml @@ -1255,7 +1255,6 @@ - SELECT dh2s.DEVCODE AS devcode, dh2s.WELL_CODE AS "wellCode", - dh2s.STRENGTH, - dh2s.CELL, + dh2s.STRENGTH AS strength, + dh2s.CELL AS cell, AS uptime, - dh2s.device_type as deviceType + + + + AS logtime, + bdt.TYPE_NAME AS "deviceTypeName", + bd.device_type as deviceType, + bwi.DEPTID AS deptid FROM data_h2s dh2s JOIN bus_well_info bwi ON bwi.WELL_CODE= dh2s.WELL_CODE JOIN bus_device bd ON dh2s.DEVCODE = bd.DEVCODE + LEFT JOIN base_device_type bdt ON bd.DEVICE_TYPE = bdt.ID bd.VALID = '1' AND bwi.VALID = '1' @@ -1323,11 +1329,9 @@ - and (dh2s.DEVCODE like + AND (bd.DEVCODE LIKE - OR dh2s.WELL_CODE LIKE - - ) + OR bd.WELL_CODE LIKE) diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceDataListMapper.xml b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceDataListMapper.xml index adc10af..7010493 100644 --- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceDataListMapper.xml +++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceDataListMapper.xml @@ -107,17 +107,17 @@ - as "LOGTIME", - DESCN, - STATUS + as "logtime", + DESCN as descn, + STATUS as status FROM data_wellcover dw INNER JOIN bus_well_info bwi on dw.WELL_CODE = bwi.WELL_CODE INNER JOIN bus_device bd ON dw.DEVCODE = bd.DEVCODE bd.VALID = '1' AND bwi.VALID = '1' - - and bwi.DEPTID = #{deptid} + + AND dw.DEVCODE = #{devcode} and dw.LOGTIME = ]]> @@ -131,12 +131,8 @@ - - and (dw.DEVCODE like - - OR dw.WELL_CODE LIKE - - ) + + AND dw.WELL_CODE = #{wellCode} ORDER BY LOGTIME DESC @@ -164,76 +160,64 @@ INNER JOIN bus_device bd ON dd.DEVCODE = bd.DEVCODE bd.VALID = '1' AND bwi.VALID = '1' - - and bwi.DEPTID = #{deptid} + + AND dd.DEVCODE = #{devcode} - and dd.UPTIME = ]]> + AND dd.UPTIME = ]]> - and dd.UPTIME + AND dd.UPTIME - - and (dd.DEVCODE like - - OR dd.WELL_CODE LIKE - - ) + + AND dd.WELL_CODE = #{wellCode} ORDER BY dd.UPTIME DESC - - - - @@ -257,8 +241,11 @@ INNER JOIN bus_device bd ON dg.DEVCODE = bd.DEVCODE bd.VALID = '1' AND bwi.VALID = '1' - - and bwi.DEPTID = #{deptid} + + AND dg.DEVCODE = #{devcode} + + + AND dg.WELL_CODE = #{wellCode} and dg.UPTIME = ]]> @@ -272,18 +259,10 @@ - - and (dg.DEVCODE like - - OR dg.WELL_CODE LIKE - - ) - ORDER BY dg.UPTIME DESC - @@ -353,8 +328,11 @@ INNER JOIN bus_device bd ON dth.DEVCODE = bd.DEVCODE bd.VALID = '1' AND bwi.VALID = '1' - - and bwi.DEPTID = #{deptid} + + AND dth.DEVCODE = #{devcode} + + + AND dth.WELL_CODE = #{wellCode} and dth.UPTIME = ]]> @@ -368,13 +346,6 @@ - - and (dth.DEVCODE like - - OR dth.WELL_CODE LIKE - - ) - ORDER BY dth.UPTIME DESC @@ -399,8 +370,11 @@ INNER JOIN bus_device bd ON dn.DEVCODE = bd.DEVCODE bd.VALID = '1' AND bwi.VALID = '1' - - and bwi.DEPTID = #{deptid} + + AND dn.DEVCODE = #{devcode} + + + AND dn.WELL_CODE = #{wellCode} and dn.UPTIME = ]]> @@ -414,13 +388,6 @@ - - and (dn.DEVCODE like - - OR dn.WELL_CODE LIKE - - ) - ORDER BY dn.UPTIME DESC @@ -446,8 +413,11 @@ INNER JOIN bus_device bd ON dwl.DEVCODE = bd.DEVCODE bd.VALID = '1' AND bwi.VALID = '1' - - and bwi.DEPTID = #{deptid} + + AND dwl.DEVCODE = #{devcode} + + + AND dwl.WELL_CODE = #{wellCode} and dwl.UPTIME = ]]> @@ -461,125 +431,104 @@ - - and (dwl.DEVCODE like - - OR dwl.WELL_CODE LIKE - - ) - ORDER BY dwl.UPTIME DESC - + @@ -639,14 +583,17 @@ AS logtime, - dh.DESCN AS descn + dh.DESCN AS descn FROM data_hydrant dh JOIN bus_well_info bwi ON bwi.WELL_CODE= dh.WELL_CODE JOIN bus_device bd ON dh.DEVCODE = bd.DEVCODE bd.VALID = '1' AND bwi.VALID = '1' - - and bwi.DEPTID = #{deptid} + + AND dh.DEVCODE = #{devcode} + + + AND dh.WELL_CODE = #{wellCode} and dh.LOGTIME = ]]> @@ -660,13 +607,6 @@ - - and (dh.DEVCODE like - - OR dh.WELL_CODE LIKE - - ) - @@ -681,14 +621,17 @@ AS uptime, bwi.deptid, - dh2s.device_type as deviceType + bd.device_type as deviceType FROM data_h2s dh2s JOIN bus_well_info bwi ON bwi.WELL_CODE= dh2s.WELL_CODE JOIN bus_device bd ON dh2s.DEVCODE = bd.DEVCODE bd.VALID = '1' AND bwi.VALID = '1' - - and bwi.DEPTID = #{deptid} + + AND dh2s.DEVCODE = #{devcode} + + + AND dh2s.WELL_CODE = #{wellCode} and dh2s.UPTIME = ]]> @@ -702,13 +645,6 @@ - - and (dh2s.DEVCODE like - - OR dh2s.WELL_CODE LIKE - - ) - diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/DeviceDataListService.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/DeviceDataListService.java index 698a8ea..9bfe937 100644 --- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/DeviceDataListService.java +++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/DeviceDataListService.java @@ -19,46 +19,46 @@ /** * 开挖监测仪数据查询 */ - List selectDigDataScope(DataScope dataScope, String deptid, String beginTime, String endTime, String keywords); + List selectDigDataScope(DataScope dataScope, String devcode, String beginTime, String endTime, String wellCode); /** * 根据条件检索井盖监测数据列表 */ - List selectWellDataScope(DataScope dataScope, String deptid, String beginTime, String endTime, String keywords); + List selectWellDataScope(DataScope dataScope, String devcode, String beginTime, String endTime, String wellCode); /** * 根据检索条件查询液位检测数据 */ - List selectLiquidDataScope(DataScope dataScope, String deptid, String beginTime, String endTime, String keywords); + List selectLiquidDataScope(DataScope dataScope, String devcode, String beginTime, String endTime, String wellCode); /** * 燃气数据查询 */ - List selectGasDataScope(DataScope dataScope, String deptid, String beginTime, String endTime, String keywords); + List selectGasDataScope(DataScope dataScope, String devcode, String beginTime, String endTime, String wellCode); /** * 噪声记录仪数据查询 */ - List selectNoiseDataScope(DataScope dataScope, String deptid, String beginTime, String endTime, String keywords); + List selectNoiseDataScope(DataScope dataScope, String devcode, String beginTime, String endTime, String wellCode); /** * 有害气体数据查询 */ - List selectHarmfulDataScope(DataScope dataScope, String deptid, String beginTime, String endTime, String keywords); + List selectHarmfulDataScope(DataScope dataScope, String devcode, String beginTime, String endTime, String wellCode); /** * 温湿度数据查询 */ - List selectTempDataScope(DataScope dataScope, String deptid, String beginTime, String endTime, String keywords); + List selectTempDataScope(DataScope dataScope, String devcode, String beginTime, String endTime, String wellCode); /** * 井盖定位监测仪数据查询 */ - List selectWellLocDataScope(DataScope dataScope, String deptid, String beginTime, String endTime, String keywords); + List selectWellLocDataScope(DataScope dataScope, String devcode, String beginTime, String endTime, String wellCode); - List selectGasLiquidDataScope(DataScope dataScope, String sensorType, String deptid, String beginTime, String endTime, String keywords); + List selectGasLiquidDataScope(DataScope dataScope, String sensorType, String devcode, String beginTime, String endTime, String wellCode); /** * 管盯数据查询 */ - List selectTubeDataScope(DataScope dataScope, String deptid, String beginTime, String endTime, String keywords); + List selectTubeDataScope(DataScope dataScope, String devcode, String beginTime, String endTime, String wellCode); - List getHydrantlist(DataScope dataScope, String deptid, String beginTime, String endTime, String keywords); + List getHydrantlist(DataScope dataScope, String devcode, String beginTime, String endTime, String wellCode); - List getH2sDataScope(DataScope dataScope, String deptid, String beginTime, String endTime, String keywords); + List getH2sDataScope(DataScope dataScope, String devcode, String beginTime, String endTime, String wellCode); } \ No newline at end of file diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/IDataAnalysisService.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/IDataAnalysisService.java index d09c12e..a75ed02 100644 --- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/IDataAnalysisService.java +++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/IDataAnalysisService.java @@ -126,5 +126,5 @@ ResponseData getHydrantlist(DataScope dataScope, Page page, String deptid, String beginTime, String endTime, String keywords); - ResponseData getH2slist(DataScope dataScope, Page page, String deptid, String beginTime, String endTime, String keywords); + ResponseData getH2slist(DataScope dataScope, Page page, String keywords, String beginTime, String endTime, String deptid); } diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceDataListServiceImpl.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceDataListServiceImpl.java index 95baa10..5abf45c 100644 --- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceDataListServiceImpl.java +++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceDataListServiceImpl.java @@ -37,81 +37,76 @@ private AbstractPermissionContext permissionService; @Override - public List selectWellDataScope(DataScope dataScope, String deptid, String beginTime, String endTime, String keywords) { - return this.baseMapper.selectWellDataScope(dataScope, deptid, beginTime, endTime, keywords); + public List selectWellDataScope(DataScope dataScope, String devcode, String beginTime, String endTime, String wellCode){ + return this.baseMapper.selectWellDataScope(dataScope, devcode, beginTime, endTime, wellCode); } @Override - public List selectDigDataScope(DataScope dataScope, String deptid, String beginTime, String endTime, String keywords) { - return this.baseMapper.selectDigDataScope(dataScope, deptid, beginTime, endTime, keywords); + public List selectDigDataScope(DataScope dataScope, String devcode, String beginTime, String endTime, String wellCode) { + return this.baseMapper.selectDigDataScope(dataScope, devcode, beginTime, endTime, wellCode); } @Override - public List selectLiquidDataScope(DataScope dataScope, String deptid, String beginTime, String endTime, String keywords) { - return this.baseMapper.selectLiquidDataScope(dataScope, deptid, beginTime, endTime, keywords); + public List selectLiquidDataScope(DataScope dataScope, String devcode, String beginTime, String endTime, String wellCode) { + return this.baseMapper.selectLiquidDataScope(dataScope, devcode, beginTime, endTime, wellCode); } @Override - public List selectGasDataScope(DataScope dataScope, String deptid, String beginTime, String endTime, String keywords) { - return this.baseMapper.selectGasDataScope(dataScope, deptid, beginTime, endTime, keywords); + public List selectGasDataScope(DataScope dataScope, String devcode, String beginTime, String endTime, String wellCode) { + return this.baseMapper.selectGasDataScope(dataScope, devcode, beginTime, endTime, wellCode); } @Override - public List selectNoiseDataScope(DataScope dataScope, String deptid, String beginTime, String endTime, String keywords) { - return this.baseMapper.selectNoiseDataScope(dataScope, deptid, beginTime, endTime, keywords); + public List selectNoiseDataScope(DataScope dataScope, String devcode, String beginTime, String endTime, String wellCode) { + return this.baseMapper.selectNoiseDataScope(dataScope, devcode, beginTime, endTime, wellCode); } @Override - public List selectHarmfulDataScope(DataScope dataScope, String deptid, String beginTime, String endTime, String keywords) { - return this.baseMapper.selectHarmfulDataScope(dataScope, deptid, beginTime, endTime, keywords); + public List selectHarmfulDataScope(DataScope dataScope, String devcode, String beginTime, String endTime, String wellCode){ + return this.baseMapper.selectHarmfulDataScope(dataScope, devcode, beginTime, endTime, wellCode); } @Override - public List selectTempDataScope(DataScope dataScope, String deptid, String beginTime, String endTime, String keywords) { - return this.baseMapper.selectTempDataScope(dataScope, deptid, beginTime, endTime, keywords); + public List selectTempDataScope(DataScope dataScope, String devcode, String beginTime, String endTime, String wellCode){ + return this.baseMapper.selectTempDataScope(dataScope, devcode, beginTime, endTime, wellCode); } @Override - public List selectWellLocDataScope(DataScope dataScope, String deptid, String beginTime, String endTime, String keywords) { - List mapList = this.baseMapper.selectWellLocDataScope(dataScope, deptid, beginTime, endTime, keywords); + public List selectWellLocDataScope(DataScope dataScope, String devcode, String beginTime, String endTime, String wellCode) { + List mapList = this.baseMapper.selectWellLocDataScope(dataScope, devcode, beginTime, endTime, wellCode); return mapList; } @Override - public List selectGasLiquidDataScope(DataScope dataScope, String sensorType, String deptid, String beginTime, String endTime, String keywords) { - List deptIds = null; - if (StrUtil.isNotEmpty(deptid)) { - deptIds = permissionService.getDeptService().getIdsByPid(deptid, null); - deptIds.add(Long.valueOf(deptid)); - } + public List selectGasLiquidDataScope(DataScope dataScope, String sensorType, String devcode, String beginTime, String endTime, String wellCode) { List dataGasLiquidList = new ArrayList<>(); if ("liquid".equals(sensorType)) { - dataGasLiquidList = this.baseMapper.selectGasLiquidDataLiquidScope(dataScope, deptIds, beginTime, endTime, keywords); + dataGasLiquidList = this.baseMapper.selectGasLiquidDataLiquidScope(dataScope, devcode, beginTime, endTime, wellCode); } if ("gas".equals(sensorType)) { - dataGasLiquidList = this.baseMapper.selectGasLiquidDataGasScope(dataScope, deptIds, beginTime, endTime, keywords); + dataGasLiquidList = this.baseMapper.selectGasLiquidDataGasScope(dataScope, devcode, beginTime, endTime, wellCode); } System.out.println(dataGasLiquidList); return dataGasLiquidList; } @Override - public List selectTubeDataScope(DataScope dataScope, String deptid, String beginTime, String endTime, String keywords) { - List mapList = this.baseMapper.selectTubeDataScope(dataScope, deptid, beginTime, endTime, keywords); + public List selectTubeDataScope(DataScope dataScope, String devcode, String beginTime, String endTime, String wellCode){ + List mapList = this.baseMapper.selectTubeDataScope(dataScope, devcode, beginTime, endTime, wellCode); return mapList; } @Override - public List getHydrantlist(DataScope dataScope, String deptid, String beginTime, String endTime, String keywords) { - List mapList = this.baseMapper.getHydrantlist(dataScope, deptid, beginTime, endTime, keywords); + public List getHydrantlist(DataScope dataScope, String devcode, String beginTime, String endTime, String wellCode){ + List mapList = this.baseMapper.getHydrantlist(dataScope, devcode, beginTime, endTime, wellCode); return mapList; } @Override - public List getH2sDataScope(DataScope dataScope, String deptid, String beginTime, String endTime, String keywords) { - return this.baseMapper.selectH2sListDataScope(dataScope, deptid, beginTime, endTime, keywords); + public List getH2sDataScope(DataScope dataScope, String devcode, String beginTime, String endTime, String wellCode) { + return this.baseMapper.selectH2sListDataScope(dataScope, devcode, beginTime, endTime, wellCode); } } diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/IDataAnalysisServiceImpl.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/IDataAnalysisServiceImpl.java index 9ae5886..5b03b61 100644 --- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/IDataAnalysisServiceImpl.java +++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/IDataAnalysisServiceImpl.java @@ -559,16 +559,19 @@ return responseData; } - public ResponseData getH2slist(DataScope dataScope, Page page, String deptid, String beginTime, String endTime, String keywords) { + public ResponseData getH2slist(DataScope dataScope, Page page, String keywords, String beginTime, String endTime, String deptid){ ResponseData responseData = new ResponseData(); try { - List h2sDataDtoList = this.baseMapper.selectH2sListDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords); + List h2sDataDtoList = this.baseMapper.selectH2sListDataScopePage(dataScope, page, keywords, beginTime, endTime, deptid); + h2sDataDtoList.forEach( + h2sDataDto->h2sDataDto.setDeptName(permissionService.getDeptService().getDeptName(h2sDataDto.getDeptid())) + ); page.setRecords(h2sDataDtoList); responseData.setData(page); responseData.setCode(200); responseData.setMessage("查询成功"); } catch (DataAccessException dex) { - log.error("主题：硫化氢数据库异常，关键字{}，开始时间{}，结束时间{}，部门编号{}，异常信息", + log.error("主题：硫化氢数据库异常，关键字{}，开始时间{}，结束时间{}，部门编号{}，异常信息{}", keywords, beginTime, endTime, deptid, dex); responseData.setCode(500); responseData.setMessage("数据库查询异常"); diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceDataListController.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceDataListController.java index 09d3c0d..0f13e84 100644 --- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceDataListController.java +++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceDataListController.java @@ -1,13 +1,8 @@ package com.casic.missiles.modular.system.controller; -import cn.hutool.core.collection.CollectionUtil; -import com.baomidou.mybatisplus.core.metadata.OrderItem; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.casic.missiles.core.application.context.AbstractPermissionContext; import com.casic.missiles.core.datascope.DataScope; -import com.casic.missiles.core.page.PageFactory; import com.casic.missiles.model.response.ResponseData; -import com.casic.missiles.modular.system.dto.ExcelModel.*; import com.casic.missiles.modular.system.dto.statistic.*; import com.casic.missiles.modular.system.service.DeviceDataListService; import lombok.extern.slf4j.Slf4j; @@ -27,92 +22,88 @@ // @Permission @GetMapping(value = "/welldata/list") - public Object wellDataList(String keywords, String deptid, String beginTime, String endTime) { + public Object wellDataList(String devcode, String wellCode, String beginTime, String endTime) { //查询数据权限 使用默认DEPTID 字段 DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope(); - List list = deviceDataListService.selectWellDataScope(dataScope, deptid, beginTime, endTime, keywords); - + List list = deviceDataListService.selectWellDataScope(dataScope, devcode, beginTime, endTime, wellCode); return ResponseData.success(list); } - /** * 开挖监测仪数据查询 * - * @param keywords - * @param deptid + * @param devcode + * @param wellCode * @param beginTime * @param endTime * @return */ - // @Permission + //@Permission @GetMapping(value = "/digdata/list") - public Object digDataList(String keywords, String deptid, String beginTime, String endTime) { + public Object digDataList(String devcode, String wellCode, String beginTime, String endTime) { DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope(); - List mapList = deviceDataListService.selectDigDataScope(dataScope, deptid, beginTime, endTime, keywords); + List mapList = deviceDataListService.selectDigDataScope(dataScope, devcode, beginTime, endTime, wellCode); return ResponseData.success(mapList); } @GetMapping(value = "/liquiddata/list") -// @Permission - public Object liquidDataList(String keywords, String deptid, String beginTime, String endTime) { + //@Permission + public Object liquidDataList(String devcode, String wellCode, String beginTime, String endTime) { //查询数据权限 使用默认DEPTID 字段 DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope(); - List list = deviceDataListService.selectLiquidDataScope(dataScope, deptid, beginTime, endTime, keywords); + List list = deviceDataListService.selectLiquidDataScope(dataScope, devcode, beginTime, endTime, wellCode); return ResponseData.success(list); } @GetMapping(value = "/gasdata/list") - //@Permission - public Object gasDataList(String keywords, String deptid, String beginTime, String endTime) { + public Object gasDataList(String devcode, String wellCode, String beginTime, String endTime) { DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope(); - List deviceDataExcelDtoList = deviceDataListService.selectGasDataScope(dataScope, deptid, beginTime, endTime, keywords); + List deviceDataExcelDtoList = deviceDataListService.selectGasDataScope(dataScope, devcode, beginTime, endTime, wellCode); return ResponseData.success(deviceDataExcelDtoList); } @GetMapping(value = "/noisedata/list") - public Object noiseDataList(String keywords, String deptid, String beginTime, String endTime) { + public Object noiseDataList(String devcode, String wellCode, String beginTime, String endTime) { DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope(); - List mapList = deviceDataListService.selectNoiseDataScope(dataScope, deptid, beginTime, endTime, keywords); + List mapList = deviceDataListService.selectNoiseDataScope(dataScope, devcode, beginTime, endTime, wellCode); return ResponseData.success(mapList); } @GetMapping(value = "/harmfuldata/list") - public Object harmfulDataList(String keywords, String deptid, String beginTime, String endTime) { + public Object harmfulDataList(String devcode, String wellCode, String beginTime, String endTime) { DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope(); - List mapList = deviceDataListService.selectHarmfulDataScope(dataScope, deptid, beginTime, endTime, keywords); + List mapList = deviceDataListService.selectHarmfulDataScope(dataScope, devcode, beginTime, endTime, wellCode); return ResponseData.success(mapList); } @GetMapping(value = "/tempdata/list") - public Object tempDataList(String keywords, String deptid, String beginTime, String endTime) { + public Object tempDataList(String devcode, String wellCode, String beginTime, String endTime) { DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope(); - List mapList = deviceDataListService.selectTempDataScope(dataScope, deptid, beginTime, endTime, keywords); + List mapList = deviceDataListService.selectTempDataScope(dataScope, devcode, beginTime, endTime, wellCode); return ResponseData.success(mapList); } - @GetMapping(value = "/welllocadata/list") - public Object wellLocDataList(String keywords, String deptid, String beginTime, String endTime) { + public Object wellLocDataList(String devcode, String wellCode, String beginTime, String endTime) { DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope(); - List mapList = deviceDataListService.selectWellLocDataScope(dataScope, deptid, beginTime, endTime, keywords); + List mapList = deviceDataListService.selectWellLocDataScope(dataScope, devcode, beginTime, endTime, wellCode); return ResponseData.success(mapList); } @GetMapping(value = "/liquidGasData/list") - public Object liquidGasDataList(String keywords, String deptid, String sensorType, String beginTime, String endTime) { + public Object liquidGasDataList(String devcode, String wellCode, String sensorType, String beginTime, String endTime) { DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope(); - List mapList = deviceDataListService.selectGasLiquidDataScope(dataScope, sensorType, deptid, beginTime, endTime, keywords); + List mapList = deviceDataListService.selectGasLiquidDataScope(dataScope, sensorType, devcode, beginTime, endTime, wellCode); return ResponseData.success(mapList); } @GetMapping(value = "/tubedata/list") //@Permission - public Object tubeDataList(String keywords, String deptid, String beginTime, String endTime) { + public Object tubeDataList(String devcode, String wellCode, String beginTime, String endTime) { DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope(); - List mapList = deviceDataListService.selectTubeDataScope(dataScope, deptid, beginTime, endTime, keywords); + List mapList = deviceDataListService.selectTubeDataScope(dataScope, devcode, beginTime, endTime, wellCode); return ResponseData.success(mapList); } @@ -120,23 +111,20 @@ * 消防栓列表 */ @GetMapping(value = "/hydrant/list") - public Object hydrantList(String keywords, String deptid, String beginTime, String endTime) { + public Object hydrantList(String devcode, String wellCode, String beginTime, String endTime) { DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope(); - List mapList= deviceDataListService.getHydrantlist(dataScope, deptid, beginTime, endTime, keywords); + List mapList= deviceDataListService.getHydrantlist(dataScope, devcode, beginTime, endTime, wellCode); return ResponseData.success(mapList); } - /** * 硫化氢列表 */ @GetMapping(value = "/h2s/list") - public Object h2sList(String keywords, String deptid, String beginTime, String endTime) { + public Object h2sList(String devcode, String wellCode, String beginTime, String endTime) { DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope(); - System.out.println(keywords); - List mapList= deviceDataListService.getH2sDataScope(dataScope, deptid, beginTime, endTime, keywords); + List mapList= deviceDataListService.getH2sDataScope(dataScope, devcode, beginTime, endTime, wellCode); return ResponseData.success(mapList); } - } diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java index 837e653..3d7ae31 100644 --- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java +++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java @@ -623,9 +623,9 @@ */ @GetMapping(value = "/h2s/list-page") public Object h2sList(String keywords, String deptid, String beginTime, String endTime) { - Page page = PageFactory.defaultPage(); + Page page = PageFactory.defaultPage(); DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope(); - ResponseData responseData = deviceService.getH2slist(dataScope, page, deptid, beginTime, endTime, keywords); + ResponseData responseData = deviceService.getH2slist(dataScope, page, keywords, beginTime, endTime, deptid); responseData.setData(super.packForBT(page)); return responseData; } @@ -634,10 +634,10 @@ */ @GetMapping(value = "/h2s/export") public void h2sExport(String keywords, String deptid, String beginTime, String endTime) throws IOException { - Page page = PageFactory.defaultPage(); + Page page = PageFactory.defaultPage(); DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope(); deviceService.getH2slist(dataScope, page, deptid, beginTime, endTime, keywords); - super.exportExcel(DataH2s.class, page.getRecords(), DeviceExportEnum.HYDRANT_EXPORT.getFileName()); + super.exportExcel(H2SDataDto.class, page.getRecords(), DeviceExportEnum.H2S_EXPORT.getFileName()); } } diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/DataAnalysisMapper.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/DataAnalysisMapper.java index ab62e2e..67fb9c9 100644 --- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/DataAnalysisMapper.java +++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/DataAnalysisMapper.java @@ -97,6 +97,6 @@ List getHydrantlist(@Param("dataScope") DataScope dataScope,@Param("page")Page page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords); - List selectH2sListDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page")Page page, @Param("deptid") String deptid, - @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords); + List selectH2sListDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page")Page page, @Param("keywords") String keywords, + @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("deptid") String deptid); } diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/DeviceDataListMapper.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/DeviceDataListMapper.java index 7114492..732dcc6 100644 --- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/DeviceDataListMapper.java +++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/DeviceDataListMapper.java @@ -19,29 +19,30 @@ * @since 2019-05-13 */ public interface DeviceDataListMapper extends BaseMapper { - List selectWellDataScope(@Param("dataScope") DataScope dataScope, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords); + List selectWellDataScope(@Param("dataScope") DataScope dataScope, @Param("devcode") String devcode, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("wellCode") String wellCode); - List selectDigDataScope(@Param("dataScope") DataScope dataScope, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords); + List selectDigDataScope(@Param("dataScope") DataScope dataScope, @Param("devcode") String devcode, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("wellCode") String wellCode); - List selectLiquidDataScope(@Param("dataScope") DataScope dataScope, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords); + List selectLiquidDataScope(@Param("dataScope") DataScope dataScope, @Param("devcode") String devcode, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("wellCode") String wellCode); - List selectGasDataScope(@Param("dataScope") DataScope dataScope, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords); + List selectGasDataScope(@Param("dataScope") DataScope dataScope, @Param("devcode") String devcode, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("wellCode") String wellCode); - List selectNoiseDataScope(@Param("dataScope") DataScope dataScope, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords); + List selectNoiseDataScope(@Param("dataScope") DataScope dataScope, @Param("devcode") String devcode, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("wellCode") String wellCode); - List selectHarmfulDataScope(@Param("dataScope") DataScope dataScope, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords); + List selectHarmfulDataScope(@Param("dataScope") DataScope dataScope, @Param("devcode") String devcode, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("wellCode") String wellCode); - List selectTempDataScope(@Param("dataScope") DataScope dataScope, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords); + List selectTempDataScope(@Param("dataScope") DataScope dataScope, @Param("devcode") String devcode, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("wellCode") String wellCode); - List selectWellLocDataScope(@Param("dataScope") DataScope dataScope, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords); + List selectWellLocDataScope(@Param("dataScope") DataScope dataScope, @Param("devcode") String devcode, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("wellCode") String wellCode); - List selectGasLiquidDataLiquidScope(@Param("dataScope") DataScope dataScope, @Param("deptIds") List deptIds, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords); + List selectGasLiquidDataLiquidScope(@Param("dataScope") DataScope dataScope, @Param("devcode")String devcode, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("wellCode") String wellCode); - List selectGasLiquidDataGasScope(@Param("dataScope") DataScope dataScope, @Param("deptIds") List deptIds, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords); + List selectGasLiquidDataGasScope(@Param("dataScope") DataScope dataScope, @Param("devcode")String devcode, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("wellCode") String wellCode); - List selectTubeDataScope(@Param("dataScope") DataScope dataScope, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords); + List selectTubeDataScope(@Param("dataScope") DataScope dataScope, @Param("devcode") String devcode, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("wellCode") String wellCode); - List getHydrantlist(@Param("dataScope") DataScope dataScope, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords); + List getHydrantlist(@Param("dataScope") DataScope dataScope, @Param("devcode") String devcode, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("wellCode") String wellCode); - List selectH2sListDataScope(@Param("dataScope") DataScope dataScope, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords); + List selectH2sListDataScope(@Param("dataScope") DataScope dataScope, @Param("devcode") String devcode, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("wellCode") String wellCode); + } diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/DataAnalysisMapper.xml b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/DataAnalysisMapper.xml index a0117ca..6ed130a 100644 --- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/DataAnalysisMapper.xml +++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/DataAnalysisMapper.xml @@ -1255,7 +1255,6 @@ - SELECT dh2s.DEVCODE AS devcode, dh2s.WELL_CODE AS "wellCode", - dh2s.STRENGTH, - dh2s.CELL, + dh2s.STRENGTH AS strength, + dh2s.CELL AS cell, AS uptime, - dh2s.device_type as deviceType + + + + AS logtime, + bdt.TYPE_NAME AS "deviceTypeName", + bd.device_type as deviceType, + bwi.DEPTID AS deptid FROM data_h2s dh2s JOIN bus_well_info bwi ON bwi.WELL_CODE= dh2s.WELL_CODE JOIN bus_device bd ON dh2s.DEVCODE = bd.DEVCODE + LEFT JOIN base_device_type bdt ON bd.DEVICE_TYPE = bdt.ID bd.VALID = '1' AND bwi.VALID = '1' @@ -1323,11 +1329,9 @@ - and (dh2s.DEVCODE like + AND (bd.DEVCODE LIKE - OR dh2s.WELL_CODE LIKE - - ) + OR bd.WELL_CODE LIKE) diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceDataListMapper.xml b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceDataListMapper.xml index adc10af..7010493 100644 --- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceDataListMapper.xml +++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceDataListMapper.xml @@ -107,17 +107,17 @@ - as "LOGTIME", - DESCN, - STATUS + as "logtime", + DESCN as descn, + STATUS as status FROM data_wellcover dw INNER JOIN bus_well_info bwi on dw.WELL_CODE = bwi.WELL_CODE INNER JOIN bus_device bd ON dw.DEVCODE = bd.DEVCODE bd.VALID = '1' AND bwi.VALID = '1' - - and bwi.DEPTID = #{deptid} + + AND dw.DEVCODE = #{devcode} and dw.LOGTIME = ]]> @@ -131,12 +131,8 @@ - - and (dw.DEVCODE like - - OR dw.WELL_CODE LIKE - - ) + + AND dw.WELL_CODE = #{wellCode} ORDER BY LOGTIME DESC @@ -164,76 +160,64 @@ INNER JOIN bus_device bd ON dd.DEVCODE = bd.DEVCODE bd.VALID = '1' AND bwi.VALID = '1' - - and bwi.DEPTID = #{deptid} + + AND dd.DEVCODE = #{devcode} - and dd.UPTIME = ]]> + AND dd.UPTIME = ]]> - and dd.UPTIME + AND dd.UPTIME - - and (dd.DEVCODE like - - OR dd.WELL_CODE LIKE - - ) + + AND dd.WELL_CODE = #{wellCode} ORDER BY dd.UPTIME DESC - - - - @@ -257,8 +241,11 @@ INNER JOIN bus_device bd ON dg.DEVCODE = bd.DEVCODE bd.VALID = '1' AND bwi.VALID = '1' - - and bwi.DEPTID = #{deptid} + + AND dg.DEVCODE = #{devcode} + + + AND dg.WELL_CODE = #{wellCode} and dg.UPTIME = ]]> @@ -272,18 +259,10 @@ - - and (dg.DEVCODE like - - OR dg.WELL_CODE LIKE - - ) - ORDER BY dg.UPTIME DESC - @@ -353,8 +328,11 @@ INNER JOIN bus_device bd ON dth.DEVCODE = bd.DEVCODE bd.VALID = '1' AND bwi.VALID = '1' - - and bwi.DEPTID = #{deptid} + + AND dth.DEVCODE = #{devcode} + + + AND dth.WELL_CODE = #{wellCode} and dth.UPTIME = ]]> @@ -368,13 +346,6 @@ - - and (dth.DEVCODE like - - OR dth.WELL_CODE LIKE - - ) - ORDER BY dth.UPTIME DESC @@ -399,8 +370,11 @@ INNER JOIN bus_device bd ON dn.DEVCODE = bd.DEVCODE bd.VALID = '1' AND bwi.VALID = '1' - - and bwi.DEPTID = #{deptid} + + AND dn.DEVCODE = #{devcode} + + + AND dn.WELL_CODE = #{wellCode} and dn.UPTIME = ]]> @@ -414,13 +388,6 @@ - - and (dn.DEVCODE like - - OR dn.WELL_CODE LIKE - - ) - ORDER BY dn.UPTIME DESC @@ -446,8 +413,11 @@ INNER JOIN bus_device bd ON dwl.DEVCODE = bd.DEVCODE bd.VALID = '1' AND bwi.VALID = '1' - - and bwi.DEPTID = #{deptid} + + AND dwl.DEVCODE = #{devcode} + + + AND dwl.WELL_CODE = #{wellCode} and dwl.UPTIME = ]]> @@ -461,125 +431,104 @@ - - and (dwl.DEVCODE like - - OR dwl.WELL_CODE LIKE - - ) - ORDER BY dwl.UPTIME DESC - + @@ -639,14 +583,17 @@ AS logtime, - dh.DESCN AS descn + dh.DESCN AS descn FROM data_hydrant dh JOIN bus_well_info bwi ON bwi.WELL_CODE= dh.WELL_CODE JOIN bus_device bd ON dh.DEVCODE = bd.DEVCODE bd.VALID = '1' AND bwi.VALID = '1' - - and bwi.DEPTID = #{deptid} + + AND dh.DEVCODE = #{devcode} + + + AND dh.WELL_CODE = #{wellCode} and dh.LOGTIME = ]]> @@ -660,13 +607,6 @@ - - and (dh.DEVCODE like - - OR dh.WELL_CODE LIKE - - ) - @@ -681,14 +621,17 @@ AS uptime, bwi.deptid, - dh2s.device_type as deviceType + bd.device_type as deviceType FROM data_h2s dh2s JOIN bus_well_info bwi ON bwi.WELL_CODE= dh2s.WELL_CODE JOIN bus_device bd ON dh2s.DEVCODE = bd.DEVCODE bd.VALID = '1' AND bwi.VALID = '1' - - and bwi.DEPTID = #{deptid} + + AND dh2s.DEVCODE = #{devcode} + + + AND dh2s.WELL_CODE = #{wellCode} and dh2s.UPTIME = ]]> @@ -702,13 +645,6 @@ - - and (dh2s.DEVCODE like - - OR dh2s.WELL_CODE LIKE - - ) - diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/DeviceDataListService.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/DeviceDataListService.java index 698a8ea..9bfe937 100644 --- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/DeviceDataListService.java +++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/DeviceDataListService.java @@ -19,46 +19,46 @@ /** * 开挖监测仪数据查询 */ - List selectDigDataScope(DataScope dataScope, String deptid, String beginTime, String endTime, String keywords); + List selectDigDataScope(DataScope dataScope, String devcode, String beginTime, String endTime, String wellCode); /** * 根据条件检索井盖监测数据列表 */ - List selectWellDataScope(DataScope dataScope, String deptid, String beginTime, String endTime, String keywords); + List selectWellDataScope(DataScope dataScope, String devcode, String beginTime, String endTime, String wellCode); /** * 根据检索条件查询液位检测数据 */ - List selectLiquidDataScope(DataScope dataScope, String deptid, String beginTime, String endTime, String keywords); + List selectLiquidDataScope(DataScope dataScope, String devcode, String beginTime, String endTime, String wellCode); /** * 燃气数据查询 */ - List selectGasDataScope(DataScope dataScope, String deptid, String beginTime, String endTime, String keywords); + List selectGasDataScope(DataScope dataScope, String devcode, String beginTime, String endTime, String wellCode); /** * 噪声记录仪数据查询 */ - List selectNoiseDataScope(DataScope dataScope, String deptid, String beginTime, String endTime, String keywords); + List selectNoiseDataScope(DataScope dataScope, String devcode, String beginTime, String endTime, String wellCode); /** * 有害气体数据查询 */ - List selectHarmfulDataScope(DataScope dataScope, String deptid, String beginTime, String endTime, String keywords); + List selectHarmfulDataScope(DataScope dataScope, String devcode, String beginTime, String endTime, String wellCode); /** * 温湿度数据查询 */ - List selectTempDataScope(DataScope dataScope, String deptid, String beginTime, String endTime, String keywords); + List selectTempDataScope(DataScope dataScope, String devcode, String beginTime, String endTime, String wellCode); /** * 井盖定位监测仪数据查询 */ - List selectWellLocDataScope(DataScope dataScope, String deptid, String beginTime, String endTime, String keywords); + List selectWellLocDataScope(DataScope dataScope, String devcode, String beginTime, String endTime, String wellCode); - List selectGasLiquidDataScope(DataScope dataScope, String sensorType, String deptid, String beginTime, String endTime, String keywords); + List selectGasLiquidDataScope(DataScope dataScope, String sensorType, String devcode, String beginTime, String endTime, String wellCode); /** * 管盯数据查询 */ - List selectTubeDataScope(DataScope dataScope, String deptid, String beginTime, String endTime, String keywords); + List selectTubeDataScope(DataScope dataScope, String devcode, String beginTime, String endTime, String wellCode); - List getHydrantlist(DataScope dataScope, String deptid, String beginTime, String endTime, String keywords); + List getHydrantlist(DataScope dataScope, String devcode, String beginTime, String endTime, String wellCode); - List getH2sDataScope(DataScope dataScope, String deptid, String beginTime, String endTime, String keywords); + List getH2sDataScope(DataScope dataScope, String devcode, String beginTime, String endTime, String wellCode); } \ No newline at end of file diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/IDataAnalysisService.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/IDataAnalysisService.java index d09c12e..a75ed02 100644 --- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/IDataAnalysisService.java +++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/IDataAnalysisService.java @@ -126,5 +126,5 @@ ResponseData getHydrantlist(DataScope dataScope, Page page, String deptid, String beginTime, String endTime, String keywords); - ResponseData getH2slist(DataScope dataScope, Page page, String deptid, String beginTime, String endTime, String keywords); + ResponseData getH2slist(DataScope dataScope, Page page, String keywords, String beginTime, String endTime, String deptid); } diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceDataListServiceImpl.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceDataListServiceImpl.java index 95baa10..5abf45c 100644 --- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceDataListServiceImpl.java +++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceDataListServiceImpl.java @@ -37,81 +37,76 @@ private AbstractPermissionContext permissionService; @Override - public List selectWellDataScope(DataScope dataScope, String deptid, String beginTime, String endTime, String keywords) { - return this.baseMapper.selectWellDataScope(dataScope, deptid, beginTime, endTime, keywords); + public List selectWellDataScope(DataScope dataScope, String devcode, String beginTime, String endTime, String wellCode){ + return this.baseMapper.selectWellDataScope(dataScope, devcode, beginTime, endTime, wellCode); } @Override - public List selectDigDataScope(DataScope dataScope, String deptid, String beginTime, String endTime, String keywords) { - return this.baseMapper.selectDigDataScope(dataScope, deptid, beginTime, endTime, keywords); + public List selectDigDataScope(DataScope dataScope, String devcode, String beginTime, String endTime, String wellCode) { + return this.baseMapper.selectDigDataScope(dataScope, devcode, beginTime, endTime, wellCode); } @Override - public List selectLiquidDataScope(DataScope dataScope, String deptid, String beginTime, String endTime, String keywords) { - return this.baseMapper.selectLiquidDataScope(dataScope, deptid, beginTime, endTime, keywords); + public List selectLiquidDataScope(DataScope dataScope, String devcode, String beginTime, String endTime, String wellCode) { + return this.baseMapper.selectLiquidDataScope(dataScope, devcode, beginTime, endTime, wellCode); } @Override - public List selectGasDataScope(DataScope dataScope, String deptid, String beginTime, String endTime, String keywords) { - return this.baseMapper.selectGasDataScope(dataScope, deptid, beginTime, endTime, keywords); + public List selectGasDataScope(DataScope dataScope, String devcode, String beginTime, String endTime, String wellCode) { + return this.baseMapper.selectGasDataScope(dataScope, devcode, beginTime, endTime, wellCode); } @Override - public List selectNoiseDataScope(DataScope dataScope, String deptid, String beginTime, String endTime, String keywords) { - return this.baseMapper.selectNoiseDataScope(dataScope, deptid, beginTime, endTime, keywords); + public List selectNoiseDataScope(DataScope dataScope, String devcode, String beginTime, String endTime, String wellCode) { + return this.baseMapper.selectNoiseDataScope(dataScope, devcode, beginTime, endTime, wellCode); } @Override - public List selectHarmfulDataScope(DataScope dataScope, String deptid, String beginTime, String endTime, String keywords) { - return this.baseMapper.selectHarmfulDataScope(dataScope, deptid, beginTime, endTime, keywords); + public List selectHarmfulDataScope(DataScope dataScope, String devcode, String beginTime, String endTime, String wellCode){ + return this.baseMapper.selectHarmfulDataScope(dataScope, devcode, beginTime, endTime, wellCode); } @Override - public List selectTempDataScope(DataScope dataScope, String deptid, String beginTime, String endTime, String keywords) { - return this.baseMapper.selectTempDataScope(dataScope, deptid, beginTime, endTime, keywords); + public List selectTempDataScope(DataScope dataScope, String devcode, String beginTime, String endTime, String wellCode){ + return this.baseMapper.selectTempDataScope(dataScope, devcode, beginTime, endTime, wellCode); } @Override - public List selectWellLocDataScope(DataScope dataScope, String deptid, String beginTime, String endTime, String keywords) { - List mapList = this.baseMapper.selectWellLocDataScope(dataScope, deptid, beginTime, endTime, keywords); + public List selectWellLocDataScope(DataScope dataScope, String devcode, String beginTime, String endTime, String wellCode) { + List mapList = this.baseMapper.selectWellLocDataScope(dataScope, devcode, beginTime, endTime, wellCode); return mapList; } @Override - public List selectGasLiquidDataScope(DataScope dataScope, String sensorType, String deptid, String beginTime, String endTime, String keywords) { - List deptIds = null; - if (StrUtil.isNotEmpty(deptid)) { - deptIds = permissionService.getDeptService().getIdsByPid(deptid, null); - deptIds.add(Long.valueOf(deptid)); - } + public List selectGasLiquidDataScope(DataScope dataScope, String sensorType, String devcode, String beginTime, String endTime, String wellCode) { List dataGasLiquidList = new ArrayList<>(); if ("liquid".equals(sensorType)) { - dataGasLiquidList = this.baseMapper.selectGasLiquidDataLiquidScope(dataScope, deptIds, beginTime, endTime, keywords); + dataGasLiquidList = this.baseMapper.selectGasLiquidDataLiquidScope(dataScope, devcode, beginTime, endTime, wellCode); } if ("gas".equals(sensorType)) { - dataGasLiquidList = this.baseMapper.selectGasLiquidDataGasScope(dataScope, deptIds, beginTime, endTime, keywords); + dataGasLiquidList = this.baseMapper.selectGasLiquidDataGasScope(dataScope, devcode, beginTime, endTime, wellCode); } System.out.println(dataGasLiquidList); return dataGasLiquidList; } @Override - public List selectTubeDataScope(DataScope dataScope, String deptid, String beginTime, String endTime, String keywords) { - List mapList = this.baseMapper.selectTubeDataScope(dataScope, deptid, beginTime, endTime, keywords); + public List selectTubeDataScope(DataScope dataScope, String devcode, String beginTime, String endTime, String wellCode){ + List mapList = this.baseMapper.selectTubeDataScope(dataScope, devcode, beginTime, endTime, wellCode); return mapList; } @Override - public List getHydrantlist(DataScope dataScope, String deptid, String beginTime, String endTime, String keywords) { - List mapList = this.baseMapper.getHydrantlist(dataScope, deptid, beginTime, endTime, keywords); + public List getHydrantlist(DataScope dataScope, String devcode, String beginTime, String endTime, String wellCode){ + List mapList = this.baseMapper.getHydrantlist(dataScope, devcode, beginTime, endTime, wellCode); return mapList; } @Override - public List getH2sDataScope(DataScope dataScope, String deptid, String beginTime, String endTime, String keywords) { - return this.baseMapper.selectH2sListDataScope(dataScope, deptid, beginTime, endTime, keywords); + public List getH2sDataScope(DataScope dataScope, String devcode, String beginTime, String endTime, String wellCode) { + return this.baseMapper.selectH2sListDataScope(dataScope, devcode, beginTime, endTime, wellCode); } } diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/IDataAnalysisServiceImpl.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/IDataAnalysisServiceImpl.java index 9ae5886..5b03b61 100644 --- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/IDataAnalysisServiceImpl.java +++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/IDataAnalysisServiceImpl.java @@ -559,16 +559,19 @@ return responseData; } - public ResponseData getH2slist(DataScope dataScope, Page page, String deptid, String beginTime, String endTime, String keywords) { + public ResponseData getH2slist(DataScope dataScope, Page page, String keywords, String beginTime, String endTime, String deptid){ ResponseData responseData = new ResponseData(); try { - List h2sDataDtoList = this.baseMapper.selectH2sListDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords); + List h2sDataDtoList = this.baseMapper.selectH2sListDataScopePage(dataScope, page, keywords, beginTime, endTime, deptid); + h2sDataDtoList.forEach( + h2sDataDto->h2sDataDto.setDeptName(permissionService.getDeptService().getDeptName(h2sDataDto.getDeptid())) + ); page.setRecords(h2sDataDtoList); responseData.setData(page); responseData.setCode(200); responseData.setMessage("查询成功"); } catch (DataAccessException dex) { - log.error("主题：硫化氢数据库异常，关键字{}，开始时间{}，结束时间{}，部门编号{}，异常信息", + log.error("主题：硫化氢数据库异常，关键字{}，开始时间{}，结束时间{}，部门编号{}，异常信息{}", keywords, beginTime, endTime, deptid, dex); responseData.setCode(500); responseData.setMessage("数据库查询异常"); diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/H2SDataDto.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/H2SDataDto.java new file mode 100644 index 0000000..8771495 --- /dev/null +++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/H2SDataDto.java @@ -0,0 +1,53 @@ +package com.casic.missiles.modular.system.dto.ExcelModel; + +import com.alibaba.excel.annotation.ExcelProperty; +import com.alibaba.excel.annotation.write.style.ColumnWidth; +import com.alibaba.excel.annotation.write.style.ContentRowHeight; +import com.alibaba.excel.annotation.write.style.ContentStyle; +import com.alibaba.excel.annotation.write.style.HeadRowHeight; +import com.alibaba.excel.enums.poi.BorderStyleEnum; +import lombok.Data; +import lombok.NoArgsConstructor; + +/** + * 氢硫酸 + * + * @author cz + * @date 2022-07-28 + */ +@ColumnWidth(30) +@HeadRowHeight(15) +@ContentRowHeight(20) +@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) +@Data +@NoArgsConstructor +public class H2SDataDto { + @ExcelProperty("设备编号") + private String devcode; + + @ExcelProperty("点位编号") + private String wellCode; + + @ExcelProperty("设备类型") + private String deviceType; + + @ExcelProperty("设备类型") + private String deviceTypeName; + + private String deptid; + + @ExcelProperty("权属部门") + private String deptName; + + @ExcelProperty("硫化氢浓度") + private String strength; + + @ExcelProperty("电量") + private String cell; + + @ExcelProperty("采集时间") + private String logtime; + @ExcelProperty("记录时间") + private String uptime; + +} diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceDataListController.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceDataListController.java index 09d3c0d..0f13e84 100644 --- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceDataListController.java +++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceDataListController.java @@ -1,13 +1,8 @@ package com.casic.missiles.modular.system.controller; -import cn.hutool.core.collection.CollectionUtil; -import com.baomidou.mybatisplus.core.metadata.OrderItem; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.casic.missiles.core.application.context.AbstractPermissionContext; import com.casic.missiles.core.datascope.DataScope; -import com.casic.missiles.core.page.PageFactory; import com.casic.missiles.model.response.ResponseData; -import com.casic.missiles.modular.system.dto.ExcelModel.*; import com.casic.missiles.modular.system.dto.statistic.*; import com.casic.missiles.modular.system.service.DeviceDataListService; import lombok.extern.slf4j.Slf4j; @@ -27,92 +22,88 @@ // @Permission @GetMapping(value = "/welldata/list") - public Object wellDataList(String keywords, String deptid, String beginTime, String endTime) { + public Object wellDataList(String devcode, String wellCode, String beginTime, String endTime) { //查询数据权限 使用默认DEPTID 字段 DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope(); - List list = deviceDataListService.selectWellDataScope(dataScope, deptid, beginTime, endTime, keywords); - + List list = deviceDataListService.selectWellDataScope(dataScope, devcode, beginTime, endTime, wellCode); return ResponseData.success(list); } - /** * 开挖监测仪数据查询 * - * @param keywords - * @param deptid + * @param devcode + * @param wellCode * @param beginTime * @param endTime * @return */ - // @Permission + //@Permission @GetMapping(value = "/digdata/list") - public Object digDataList(String keywords, String deptid, String beginTime, String endTime) { + public Object digDataList(String devcode, String wellCode, String beginTime, String endTime) { DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope(); - List mapList = deviceDataListService.selectDigDataScope(dataScope, deptid, beginTime, endTime, keywords); + List mapList = deviceDataListService.selectDigDataScope(dataScope, devcode, beginTime, endTime, wellCode); return ResponseData.success(mapList); } @GetMapping(value = "/liquiddata/list") -// @Permission - public Object liquidDataList(String keywords, String deptid, String beginTime, String endTime) { + //@Permission + public Object liquidDataList(String devcode, String wellCode, String beginTime, String endTime) { //查询数据权限 使用默认DEPTID 字段 DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope(); - List list = deviceDataListService.selectLiquidDataScope(dataScope, deptid, beginTime, endTime, keywords); + List list = deviceDataListService.selectLiquidDataScope(dataScope, devcode, beginTime, endTime, wellCode); return ResponseData.success(list); } @GetMapping(value = "/gasdata/list") - //@Permission - public Object gasDataList(String keywords, String deptid, String beginTime, String endTime) { + public Object gasDataList(String devcode, String wellCode, String beginTime, String endTime) { DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope(); - List deviceDataExcelDtoList = deviceDataListService.selectGasDataScope(dataScope, deptid, beginTime, endTime, keywords); + List deviceDataExcelDtoList = deviceDataListService.selectGasDataScope(dataScope, devcode, beginTime, endTime, wellCode); return ResponseData.success(deviceDataExcelDtoList); } @GetMapping(value = "/noisedata/list") - public Object noiseDataList(String keywords, String deptid, String beginTime, String endTime) { + public Object noiseDataList(String devcode, String wellCode, String beginTime, String endTime) { DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope(); - List mapList = deviceDataListService.selectNoiseDataScope(dataScope, deptid, beginTime, endTime, keywords); + List mapList = deviceDataListService.selectNoiseDataScope(dataScope, devcode, beginTime, endTime, wellCode); return ResponseData.success(mapList); } @GetMapping(value = "/harmfuldata/list") - public Object harmfulDataList(String keywords, String deptid, String beginTime, String endTime) { + public Object harmfulDataList(String devcode, String wellCode, String beginTime, String endTime) { DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope(); - List mapList = deviceDataListService.selectHarmfulDataScope(dataScope, deptid, beginTime, endTime, keywords); + List mapList = deviceDataListService.selectHarmfulDataScope(dataScope, devcode, beginTime, endTime, wellCode); return ResponseData.success(mapList); } @GetMapping(value = "/tempdata/list") - public Object tempDataList(String keywords, String deptid, String beginTime, String endTime) { + public Object tempDataList(String devcode, String wellCode, String beginTime, String endTime) { DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope(); - List mapList = deviceDataListService.selectTempDataScope(dataScope, deptid, beginTime, endTime, keywords); + List mapList = deviceDataListService.selectTempDataScope(dataScope, devcode, beginTime, endTime, wellCode); return ResponseData.success(mapList); } - @GetMapping(value = "/welllocadata/list") - public Object wellLocDataList(String keywords, String deptid, String beginTime, String endTime) { + public Object wellLocDataList(String devcode, String wellCode, String beginTime, String endTime) { DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope(); - List mapList = deviceDataListService.selectWellLocDataScope(dataScope, deptid, beginTime, endTime, keywords); + List mapList = deviceDataListService.selectWellLocDataScope(dataScope, devcode, beginTime, endTime, wellCode); return ResponseData.success(mapList); } @GetMapping(value = "/liquidGasData/list") - public Object liquidGasDataList(String keywords, String deptid, String sensorType, String beginTime, String endTime) { + public Object liquidGasDataList(String devcode, String wellCode, String sensorType, String beginTime, String endTime) { DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope(); - List mapList = deviceDataListService.selectGasLiquidDataScope(dataScope, sensorType, deptid, beginTime, endTime, keywords); + List mapList = deviceDataListService.selectGasLiquidDataScope(dataScope, sensorType, devcode, beginTime, endTime, wellCode); return ResponseData.success(mapList); } @GetMapping(value = "/tubedata/list") //@Permission - public Object tubeDataList(String keywords, String deptid, String beginTime, String endTime) { + public Object tubeDataList(String devcode, String wellCode, String beginTime, String endTime) { DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope(); - List mapList = deviceDataListService.selectTubeDataScope(dataScope, deptid, beginTime, endTime, keywords); + List mapList = deviceDataListService.selectTubeDataScope(dataScope, devcode, beginTime, endTime, wellCode); return ResponseData.success(mapList); } @@ -120,23 +111,20 @@ * 消防栓列表 */ @GetMapping(value = "/hydrant/list") - public Object hydrantList(String keywords, String deptid, String beginTime, String endTime) { + public Object hydrantList(String devcode, String wellCode, String beginTime, String endTime) { DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope(); - List mapList= deviceDataListService.getHydrantlist(dataScope, deptid, beginTime, endTime, keywords); + List mapList= deviceDataListService.getHydrantlist(dataScope, devcode, beginTime, endTime, wellCode); return ResponseData.success(mapList); } - /** * 硫化氢列表 */ @GetMapping(value = "/h2s/list") - public Object h2sList(String keywords, String deptid, String beginTime, String endTime) { + public Object h2sList(String devcode, String wellCode, String beginTime, String endTime) { DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope(); - System.out.println(keywords); - List mapList= deviceDataListService.getH2sDataScope(dataScope, deptid, beginTime, endTime, keywords); + List mapList= deviceDataListService.getH2sDataScope(dataScope, devcode, beginTime, endTime, wellCode); return ResponseData.success(mapList); } - } diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java index 837e653..3d7ae31 100644 --- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java +++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java @@ -623,9 +623,9 @@ */ @GetMapping(value = "/h2s/list-page") public Object h2sList(String keywords, String deptid, String beginTime, String endTime) { - Page page = PageFactory.defaultPage(); + Page page = PageFactory.defaultPage(); DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope(); - ResponseData responseData = deviceService.getH2slist(dataScope, page, deptid, beginTime, endTime, keywords); + ResponseData responseData = deviceService.getH2slist(dataScope, page, keywords, beginTime, endTime, deptid); responseData.setData(super.packForBT(page)); return responseData; } @@ -634,10 +634,10 @@ */ @GetMapping(value = "/h2s/export") public void h2sExport(String keywords, String deptid, String beginTime, String endTime) throws IOException { - Page page = PageFactory.defaultPage(); + Page page = PageFactory.defaultPage(); DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope(); deviceService.getH2slist(dataScope, page, deptid, beginTime, endTime, keywords); - super.exportExcel(DataH2s.class, page.getRecords(), DeviceExportEnum.HYDRANT_EXPORT.getFileName()); + super.exportExcel(H2SDataDto.class, page.getRecords(), DeviceExportEnum.H2S_EXPORT.getFileName()); } } diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/DataAnalysisMapper.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/DataAnalysisMapper.java index ab62e2e..67fb9c9 100644 --- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/DataAnalysisMapper.java +++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/DataAnalysisMapper.java @@ -97,6 +97,6 @@ List getHydrantlist(@Param("dataScope") DataScope dataScope,@Param("page")Page page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords); - List selectH2sListDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page")Page page, @Param("deptid") String deptid, - @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords); + List selectH2sListDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page")Page page, @Param("keywords") String keywords, + @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("deptid") String deptid); } diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/DeviceDataListMapper.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/DeviceDataListMapper.java index 7114492..732dcc6 100644 --- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/DeviceDataListMapper.java +++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/DeviceDataListMapper.java @@ -19,29 +19,30 @@ * @since 2019-05-13 */ public interface DeviceDataListMapper extends BaseMapper { - List selectWellDataScope(@Param("dataScope") DataScope dataScope, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords); + List selectWellDataScope(@Param("dataScope") DataScope dataScope, @Param("devcode") String devcode, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("wellCode") String wellCode); - List selectDigDataScope(@Param("dataScope") DataScope dataScope, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords); + List selectDigDataScope(@Param("dataScope") DataScope dataScope, @Param("devcode") String devcode, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("wellCode") String wellCode); - List selectLiquidDataScope(@Param("dataScope") DataScope dataScope, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords); + List selectLiquidDataScope(@Param("dataScope") DataScope dataScope, @Param("devcode") String devcode, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("wellCode") String wellCode); - List selectGasDataScope(@Param("dataScope") DataScope dataScope, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords); + List selectGasDataScope(@Param("dataScope") DataScope dataScope, @Param("devcode") String devcode, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("wellCode") String wellCode); - List selectNoiseDataScope(@Param("dataScope") DataScope dataScope, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords); + List selectNoiseDataScope(@Param("dataScope") DataScope dataScope, @Param("devcode") String devcode, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("wellCode") String wellCode); - List selectHarmfulDataScope(@Param("dataScope") DataScope dataScope, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords); + List selectHarmfulDataScope(@Param("dataScope") DataScope dataScope, @Param("devcode") String devcode, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("wellCode") String wellCode); - List selectTempDataScope(@Param("dataScope") DataScope dataScope, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords); + List selectTempDataScope(@Param("dataScope") DataScope dataScope, @Param("devcode") String devcode, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("wellCode") String wellCode); - List selectWellLocDataScope(@Param("dataScope") DataScope dataScope, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords); + List selectWellLocDataScope(@Param("dataScope") DataScope dataScope, @Param("devcode") String devcode, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("wellCode") String wellCode); - List selectGasLiquidDataLiquidScope(@Param("dataScope") DataScope dataScope, @Param("deptIds") List deptIds, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords); + List selectGasLiquidDataLiquidScope(@Param("dataScope") DataScope dataScope, @Param("devcode")String devcode, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("wellCode") String wellCode); - List selectGasLiquidDataGasScope(@Param("dataScope") DataScope dataScope, @Param("deptIds") List deptIds, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords); + List selectGasLiquidDataGasScope(@Param("dataScope") DataScope dataScope, @Param("devcode")String devcode, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("wellCode") String wellCode); - List selectTubeDataScope(@Param("dataScope") DataScope dataScope, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords); + List selectTubeDataScope(@Param("dataScope") DataScope dataScope, @Param("devcode") String devcode, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("wellCode") String wellCode); - List getHydrantlist(@Param("dataScope") DataScope dataScope, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords); + List getHydrantlist(@Param("dataScope") DataScope dataScope, @Param("devcode") String devcode, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("wellCode") String wellCode); - List selectH2sListDataScope(@Param("dataScope") DataScope dataScope, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords); + List selectH2sListDataScope(@Param("dataScope") DataScope dataScope, @Param("devcode") String devcode, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("wellCode") String wellCode); + } diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/DataAnalysisMapper.xml b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/DataAnalysisMapper.xml index a0117ca..6ed130a 100644 --- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/DataAnalysisMapper.xml +++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/DataAnalysisMapper.xml @@ -1255,7 +1255,6 @@ - SELECT dh2s.DEVCODE AS devcode, dh2s.WELL_CODE AS "wellCode", - dh2s.STRENGTH, - dh2s.CELL, + dh2s.STRENGTH AS strength, + dh2s.CELL AS cell, AS uptime, - dh2s.device_type as deviceType + + + + AS logtime, + bdt.TYPE_NAME AS "deviceTypeName", + bd.device_type as deviceType, + bwi.DEPTID AS deptid FROM data_h2s dh2s JOIN bus_well_info bwi ON bwi.WELL_CODE= dh2s.WELL_CODE JOIN bus_device bd ON dh2s.DEVCODE = bd.DEVCODE + LEFT JOIN base_device_type bdt ON bd.DEVICE_TYPE = bdt.ID bd.VALID = '1' AND bwi.VALID = '1' @@ -1323,11 +1329,9 @@ - and (dh2s.DEVCODE like + AND (bd.DEVCODE LIKE - OR dh2s.WELL_CODE LIKE - - ) + OR bd.WELL_CODE LIKE) diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceDataListMapper.xml b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceDataListMapper.xml index adc10af..7010493 100644 --- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceDataListMapper.xml +++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceDataListMapper.xml @@ -107,17 +107,17 @@ - as "LOGTIME", - DESCN, - STATUS + as "logtime", + DESCN as descn, + STATUS as status FROM data_wellcover dw INNER JOIN bus_well_info bwi on dw.WELL_CODE = bwi.WELL_CODE INNER JOIN bus_device bd ON dw.DEVCODE = bd.DEVCODE bd.VALID = '1' AND bwi.VALID = '1' - - and bwi.DEPTID = #{deptid} + + AND dw.DEVCODE = #{devcode} and dw.LOGTIME = ]]> @@ -131,12 +131,8 @@ - - and (dw.DEVCODE like - - OR dw.WELL_CODE LIKE - - ) + + AND dw.WELL_CODE = #{wellCode} ORDER BY LOGTIME DESC @@ -164,76 +160,64 @@ INNER JOIN bus_device bd ON dd.DEVCODE = bd.DEVCODE bd.VALID = '1' AND bwi.VALID = '1' - - and bwi.DEPTID = #{deptid} + + AND dd.DEVCODE = #{devcode} - and dd.UPTIME = ]]> + AND dd.UPTIME = ]]> - and dd.UPTIME + AND dd.UPTIME - - and (dd.DEVCODE like - - OR dd.WELL_CODE LIKE - - ) + + AND dd.WELL_CODE = #{wellCode} ORDER BY dd.UPTIME DESC - - - - @@ -257,8 +241,11 @@ INNER JOIN bus_device bd ON dg.DEVCODE = bd.DEVCODE bd.VALID = '1' AND bwi.VALID = '1' - - and bwi.DEPTID = #{deptid} + + AND dg.DEVCODE = #{devcode} + + + AND dg.WELL_CODE = #{wellCode} and dg.UPTIME = ]]> @@ -272,18 +259,10 @@ - - and (dg.DEVCODE like - - OR dg.WELL_CODE LIKE - - ) - ORDER BY dg.UPTIME DESC - @@ -353,8 +328,11 @@ INNER JOIN bus_device bd ON dth.DEVCODE = bd.DEVCODE bd.VALID = '1' AND bwi.VALID = '1' - - and bwi.DEPTID = #{deptid} + + AND dth.DEVCODE = #{devcode} + + + AND dth.WELL_CODE = #{wellCode} and dth.UPTIME = ]]> @@ -368,13 +346,6 @@ - - and (dth.DEVCODE like - - OR dth.WELL_CODE LIKE - - ) - ORDER BY dth.UPTIME DESC @@ -399,8 +370,11 @@ INNER JOIN bus_device bd ON dn.DEVCODE = bd.DEVCODE bd.VALID = '1' AND bwi.VALID = '1' - - and bwi.DEPTID = #{deptid} + + AND dn.DEVCODE = #{devcode} + + + AND dn.WELL_CODE = #{wellCode} and dn.UPTIME = ]]> @@ -414,13 +388,6 @@ - - and (dn.DEVCODE like - - OR dn.WELL_CODE LIKE - - ) - ORDER BY dn.UPTIME DESC @@ -446,8 +413,11 @@ INNER JOIN bus_device bd ON dwl.DEVCODE = bd.DEVCODE bd.VALID = '1' AND bwi.VALID = '1' - - and bwi.DEPTID = #{deptid} + + AND dwl.DEVCODE = #{devcode} + + + AND dwl.WELL_CODE = #{wellCode} and dwl.UPTIME = ]]> @@ -461,125 +431,104 @@ - - and (dwl.DEVCODE like - - OR dwl.WELL_CODE LIKE - - ) - ORDER BY dwl.UPTIME DESC - + @@ -639,14 +583,17 @@ AS logtime, - dh.DESCN AS descn + dh.DESCN AS descn FROM data_hydrant dh JOIN bus_well_info bwi ON bwi.WELL_CODE= dh.WELL_CODE JOIN bus_device bd ON dh.DEVCODE = bd.DEVCODE bd.VALID = '1' AND bwi.VALID = '1' - - and bwi.DEPTID = #{deptid} + + AND dh.DEVCODE = #{devcode} + + + AND dh.WELL_CODE = #{wellCode} and dh.LOGTIME = ]]> @@ -660,13 +607,6 @@ - - and (dh.DEVCODE like - - OR dh.WELL_CODE LIKE - - ) - @@ -681,14 +621,17 @@ AS uptime, bwi.deptid, - dh2s.device_type as deviceType + bd.device_type as deviceType FROM data_h2s dh2s JOIN bus_well_info bwi ON bwi.WELL_CODE= dh2s.WELL_CODE JOIN bus_device bd ON dh2s.DEVCODE = bd.DEVCODE bd.VALID = '1' AND bwi.VALID = '1' - - and bwi.DEPTID = #{deptid} + + AND dh2s.DEVCODE = #{devcode} + + + AND dh2s.WELL_CODE = #{wellCode} and dh2s.UPTIME = ]]> @@ -702,13 +645,6 @@ - - and (dh2s.DEVCODE like - - OR dh2s.WELL_CODE LIKE - - ) - diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/DeviceDataListService.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/DeviceDataListService.java index 698a8ea..9bfe937 100644 --- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/DeviceDataListService.java +++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/DeviceDataListService.java @@ -19,46 +19,46 @@ /** * 开挖监测仪数据查询 */ - List selectDigDataScope(DataScope dataScope, String deptid, String beginTime, String endTime, String keywords); + List selectDigDataScope(DataScope dataScope, String devcode, String beginTime, String endTime, String wellCode); /** * 根据条件检索井盖监测数据列表 */ - List selectWellDataScope(DataScope dataScope, String deptid, String beginTime, String endTime, String keywords); + List selectWellDataScope(DataScope dataScope, String devcode, String beginTime, String endTime, String wellCode); /** * 根据检索条件查询液位检测数据 */ - List selectLiquidDataScope(DataScope dataScope, String deptid, String beginTime, String endTime, String keywords); + List selectLiquidDataScope(DataScope dataScope, String devcode, String beginTime, String endTime, String wellCode); /** * 燃气数据查询 */ - List selectGasDataScope(DataScope dataScope, String deptid, String beginTime, String endTime, String keywords); + List selectGasDataScope(DataScope dataScope, String devcode, String beginTime, String endTime, String wellCode); /** * 噪声记录仪数据查询 */ - List selectNoiseDataScope(DataScope dataScope, String deptid, String beginTime, String endTime, String keywords); + List selectNoiseDataScope(DataScope dataScope, String devcode, String beginTime, String endTime, String wellCode); /** * 有害气体数据查询 */ - List selectHarmfulDataScope(DataScope dataScope, String deptid, String beginTime, String endTime, String keywords); + List selectHarmfulDataScope(DataScope dataScope, String devcode, String beginTime, String endTime, String wellCode); /** * 温湿度数据查询 */ - List selectTempDataScope(DataScope dataScope, String deptid, String beginTime, String endTime, String keywords); + List selectTempDataScope(DataScope dataScope, String devcode, String beginTime, String endTime, String wellCode); /** * 井盖定位监测仪数据查询 */ - List selectWellLocDataScope(DataScope dataScope, String deptid, String beginTime, String endTime, String keywords); + List selectWellLocDataScope(DataScope dataScope, String devcode, String beginTime, String endTime, String wellCode); - List selectGasLiquidDataScope(DataScope dataScope, String sensorType, String deptid, String beginTime, String endTime, String keywords); + List selectGasLiquidDataScope(DataScope dataScope, String sensorType, String devcode, String beginTime, String endTime, String wellCode); /** * 管盯数据查询 */ - List selectTubeDataScope(DataScope dataScope, String deptid, String beginTime, String endTime, String keywords); + List selectTubeDataScope(DataScope dataScope, String devcode, String beginTime, String endTime, String wellCode); - List getHydrantlist(DataScope dataScope, String deptid, String beginTime, String endTime, String keywords); + List getHydrantlist(DataScope dataScope, String devcode, String beginTime, String endTime, String wellCode); - List getH2sDataScope(DataScope dataScope, String deptid, String beginTime, String endTime, String keywords); + List getH2sDataScope(DataScope dataScope, String devcode, String beginTime, String endTime, String wellCode); } \ No newline at end of file diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/IDataAnalysisService.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/IDataAnalysisService.java index d09c12e..a75ed02 100644 --- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/IDataAnalysisService.java +++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/IDataAnalysisService.java @@ -126,5 +126,5 @@ ResponseData getHydrantlist(DataScope dataScope, Page page, String deptid, String beginTime, String endTime, String keywords); - ResponseData getH2slist(DataScope dataScope, Page page, String deptid, String beginTime, String endTime, String keywords); + ResponseData getH2slist(DataScope dataScope, Page page, String keywords, String beginTime, String endTime, String deptid); } diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceDataListServiceImpl.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceDataListServiceImpl.java index 95baa10..5abf45c 100644 --- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceDataListServiceImpl.java +++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceDataListServiceImpl.java @@ -37,81 +37,76 @@ private AbstractPermissionContext permissionService; @Override - public List selectWellDataScope(DataScope dataScope, String deptid, String beginTime, String endTime, String keywords) { - return this.baseMapper.selectWellDataScope(dataScope, deptid, beginTime, endTime, keywords); + public List selectWellDataScope(DataScope dataScope, String devcode, String beginTime, String endTime, String wellCode){ + return this.baseMapper.selectWellDataScope(dataScope, devcode, beginTime, endTime, wellCode); } @Override - public List selectDigDataScope(DataScope dataScope, String deptid, String beginTime, String endTime, String keywords) { - return this.baseMapper.selectDigDataScope(dataScope, deptid, beginTime, endTime, keywords); + public List selectDigDataScope(DataScope dataScope, String devcode, String beginTime, String endTime, String wellCode) { + return this.baseMapper.selectDigDataScope(dataScope, devcode, beginTime, endTime, wellCode); } @Override - public List selectLiquidDataScope(DataScope dataScope, String deptid, String beginTime, String endTime, String keywords) { - return this.baseMapper.selectLiquidDataScope(dataScope, deptid, beginTime, endTime, keywords); + public List selectLiquidDataScope(DataScope dataScope, String devcode, String beginTime, String endTime, String wellCode) { + return this.baseMapper.selectLiquidDataScope(dataScope, devcode, beginTime, endTime, wellCode); } @Override - public List selectGasDataScope(DataScope dataScope, String deptid, String beginTime, String endTime, String keywords) { - return this.baseMapper.selectGasDataScope(dataScope, deptid, beginTime, endTime, keywords); + public List selectGasDataScope(DataScope dataScope, String devcode, String beginTime, String endTime, String wellCode) { + return this.baseMapper.selectGasDataScope(dataScope, devcode, beginTime, endTime, wellCode); } @Override - public List selectNoiseDataScope(DataScope dataScope, String deptid, String beginTime, String endTime, String keywords) { - return this.baseMapper.selectNoiseDataScope(dataScope, deptid, beginTime, endTime, keywords); + public List selectNoiseDataScope(DataScope dataScope, String devcode, String beginTime, String endTime, String wellCode) { + return this.baseMapper.selectNoiseDataScope(dataScope, devcode, beginTime, endTime, wellCode); } @Override - public List selectHarmfulDataScope(DataScope dataScope, String deptid, String beginTime, String endTime, String keywords) { - return this.baseMapper.selectHarmfulDataScope(dataScope, deptid, beginTime, endTime, keywords); + public List selectHarmfulDataScope(DataScope dataScope, String devcode, String beginTime, String endTime, String wellCode){ + return this.baseMapper.selectHarmfulDataScope(dataScope, devcode, beginTime, endTime, wellCode); } @Override - public List selectTempDataScope(DataScope dataScope, String deptid, String beginTime, String endTime, String keywords) { - return this.baseMapper.selectTempDataScope(dataScope, deptid, beginTime, endTime, keywords); + public List selectTempDataScope(DataScope dataScope, String devcode, String beginTime, String endTime, String wellCode){ + return this.baseMapper.selectTempDataScope(dataScope, devcode, beginTime, endTime, wellCode); } @Override - public List selectWellLocDataScope(DataScope dataScope, String deptid, String beginTime, String endTime, String keywords) { - List mapList = this.baseMapper.selectWellLocDataScope(dataScope, deptid, beginTime, endTime, keywords); + public List selectWellLocDataScope(DataScope dataScope, String devcode, String beginTime, String endTime, String wellCode) { + List mapList = this.baseMapper.selectWellLocDataScope(dataScope, devcode, beginTime, endTime, wellCode); return mapList; } @Override - public List selectGasLiquidDataScope(DataScope dataScope, String sensorType, String deptid, String beginTime, String endTime, String keywords) { - List deptIds = null; - if (StrUtil.isNotEmpty(deptid)) { - deptIds = permissionService.getDeptService().getIdsByPid(deptid, null); - deptIds.add(Long.valueOf(deptid)); - } + public List selectGasLiquidDataScope(DataScope dataScope, String sensorType, String devcode, String beginTime, String endTime, String wellCode) { List dataGasLiquidList = new ArrayList<>(); if ("liquid".equals(sensorType)) { - dataGasLiquidList = this.baseMapper.selectGasLiquidDataLiquidScope(dataScope, deptIds, beginTime, endTime, keywords); + dataGasLiquidList = this.baseMapper.selectGasLiquidDataLiquidScope(dataScope, devcode, beginTime, endTime, wellCode); } if ("gas".equals(sensorType)) { - dataGasLiquidList = this.baseMapper.selectGasLiquidDataGasScope(dataScope, deptIds, beginTime, endTime, keywords); + dataGasLiquidList = this.baseMapper.selectGasLiquidDataGasScope(dataScope, devcode, beginTime, endTime, wellCode); } System.out.println(dataGasLiquidList); return dataGasLiquidList; } @Override - public List selectTubeDataScope(DataScope dataScope, String deptid, String beginTime, String endTime, String keywords) { - List mapList = this.baseMapper.selectTubeDataScope(dataScope, deptid, beginTime, endTime, keywords); + public List selectTubeDataScope(DataScope dataScope, String devcode, String beginTime, String endTime, String wellCode){ + List mapList = this.baseMapper.selectTubeDataScope(dataScope, devcode, beginTime, endTime, wellCode); return mapList; } @Override - public List getHydrantlist(DataScope dataScope, String deptid, String beginTime, String endTime, String keywords) { - List mapList = this.baseMapper.getHydrantlist(dataScope, deptid, beginTime, endTime, keywords); + public List getHydrantlist(DataScope dataScope, String devcode, String beginTime, String endTime, String wellCode){ + List mapList = this.baseMapper.getHydrantlist(dataScope, devcode, beginTime, endTime, wellCode); return mapList; } @Override - public List getH2sDataScope(DataScope dataScope, String deptid, String beginTime, String endTime, String keywords) { - return this.baseMapper.selectH2sListDataScope(dataScope, deptid, beginTime, endTime, keywords); + public List getH2sDataScope(DataScope dataScope, String devcode, String beginTime, String endTime, String wellCode) { + return this.baseMapper.selectH2sListDataScope(dataScope, devcode, beginTime, endTime, wellCode); } } diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/IDataAnalysisServiceImpl.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/IDataAnalysisServiceImpl.java index 9ae5886..5b03b61 100644 --- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/IDataAnalysisServiceImpl.java +++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/IDataAnalysisServiceImpl.java @@ -559,16 +559,19 @@ return responseData; } - public ResponseData getH2slist(DataScope dataScope, Page page, String deptid, String beginTime, String endTime, String keywords) { + public ResponseData getH2slist(DataScope dataScope, Page page, String keywords, String beginTime, String endTime, String deptid){ ResponseData responseData = new ResponseData(); try { - List h2sDataDtoList = this.baseMapper.selectH2sListDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords); + List h2sDataDtoList = this.baseMapper.selectH2sListDataScopePage(dataScope, page, keywords, beginTime, endTime, deptid); + h2sDataDtoList.forEach( + h2sDataDto->h2sDataDto.setDeptName(permissionService.getDeptService().getDeptName(h2sDataDto.getDeptid())) + ); page.setRecords(h2sDataDtoList); responseData.setData(page); responseData.setCode(200); responseData.setMessage("查询成功"); } catch (DataAccessException dex) { - log.error("主题：硫化氢数据库异常，关键字{}，开始时间{}，结束时间{}，部门编号{}，异常信息", + log.error("主题：硫化氢数据库异常，关键字{}，开始时间{}，结束时间{}，部门编号{}，异常信息{}", keywords, beginTime, endTime, deptid, dex); responseData.setCode(500); responseData.setMessage("数据库查询异常"); diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/H2SDataDto.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/H2SDataDto.java new file mode 100644 index 0000000..8771495 --- /dev/null +++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/H2SDataDto.java @@ -0,0 +1,53 @@ +package com.casic.missiles.modular.system.dto.ExcelModel; + +import com.alibaba.excel.annotation.ExcelProperty; +import com.alibaba.excel.annotation.write.style.ColumnWidth; +import com.alibaba.excel.annotation.write.style.ContentRowHeight; +import com.alibaba.excel.annotation.write.style.ContentStyle; +import com.alibaba.excel.annotation.write.style.HeadRowHeight; +import com.alibaba.excel.enums.poi.BorderStyleEnum; +import lombok.Data; +import lombok.NoArgsConstructor; + +/** + * 氢硫酸 + * + * @author cz + * @date 2022-07-28 + */ +@ColumnWidth(30) +@HeadRowHeight(15) +@ContentRowHeight(20) +@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) +@Data +@NoArgsConstructor +public class H2SDataDto { + @ExcelProperty("设备编号") + private String devcode; + + @ExcelProperty("点位编号") + private String wellCode; + + @ExcelProperty("设备类型") + private String deviceType; + + @ExcelProperty("设备类型") + private String deviceTypeName; + + private String deptid; + + @ExcelProperty("权属部门") + private String deptName; + + @ExcelProperty("硫化氢浓度") + private String strength; + + @ExcelProperty("电量") + private String cell; + + @ExcelProperty("采集时间") + private String logtime; + @ExcelProperty("记录时间") + private String uptime; + +} diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/statistic/DataGasLiquid.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/statistic/DataGasLiquid.java index ad3eca0..c24a391 100644 --- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/statistic/DataGasLiquid.java +++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/statistic/DataGasLiquid.java @@ -9,7 +9,7 @@ private String liquiddata; private String cell; private String strength; - private String logTime; - private String upTime; + private String logtime; + private String uptime; } diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceDataListController.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceDataListController.java index 09d3c0d..0f13e84 100644 --- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceDataListController.java +++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceDataListController.java @@ -1,13 +1,8 @@ package com.casic.missiles.modular.system.controller; -import cn.hutool.core.collection.CollectionUtil; -import com.baomidou.mybatisplus.core.metadata.OrderItem; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.casic.missiles.core.application.context.AbstractPermissionContext; import com.casic.missiles.core.datascope.DataScope; -import com.casic.missiles.core.page.PageFactory; import com.casic.missiles.model.response.ResponseData; -import com.casic.missiles.modular.system.dto.ExcelModel.*; import com.casic.missiles.modular.system.dto.statistic.*; import com.casic.missiles.modular.system.service.DeviceDataListService; import lombok.extern.slf4j.Slf4j; @@ -27,92 +22,88 @@ // @Permission @GetMapping(value = "/welldata/list") - public Object wellDataList(String keywords, String deptid, String beginTime, String endTime) { + public Object wellDataList(String devcode, String wellCode, String beginTime, String endTime) { //查询数据权限 使用默认DEPTID 字段 DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope(); - List list = deviceDataListService.selectWellDataScope(dataScope, deptid, beginTime, endTime, keywords); - + List list = deviceDataListService.selectWellDataScope(dataScope, devcode, beginTime, endTime, wellCode); return ResponseData.success(list); } - /** * 开挖监测仪数据查询 * - * @param keywords - * @param deptid + * @param devcode + * @param wellCode * @param beginTime * @param endTime * @return */ - // @Permission + //@Permission @GetMapping(value = "/digdata/list") - public Object digDataList(String keywords, String deptid, String beginTime, String endTime) { + public Object digDataList(String devcode, String wellCode, String beginTime, String endTime) { DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope(); - List mapList = deviceDataListService.selectDigDataScope(dataScope, deptid, beginTime, endTime, keywords); + List mapList = deviceDataListService.selectDigDataScope(dataScope, devcode, beginTime, endTime, wellCode); return ResponseData.success(mapList); } @GetMapping(value = "/liquiddata/list") -// @Permission - public Object liquidDataList(String keywords, String deptid, String beginTime, String endTime) { + //@Permission + public Object liquidDataList(String devcode, String wellCode, String beginTime, String endTime) { //查询数据权限 使用默认DEPTID 字段 DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope(); - List list = deviceDataListService.selectLiquidDataScope(dataScope, deptid, beginTime, endTime, keywords); + List list = deviceDataListService.selectLiquidDataScope(dataScope, devcode, beginTime, endTime, wellCode); return ResponseData.success(list); } @GetMapping(value = "/gasdata/list") - //@Permission - public Object gasDataList(String keywords, String deptid, String beginTime, String endTime) { + public Object gasDataList(String devcode, String wellCode, String beginTime, String endTime) { DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope(); - List deviceDataExcelDtoList = deviceDataListService.selectGasDataScope(dataScope, deptid, beginTime, endTime, keywords); + List deviceDataExcelDtoList = deviceDataListService.selectGasDataScope(dataScope, devcode, beginTime, endTime, wellCode); return ResponseData.success(deviceDataExcelDtoList); } @GetMapping(value = "/noisedata/list") - public Object noiseDataList(String keywords, String deptid, String beginTime, String endTime) { + public Object noiseDataList(String devcode, String wellCode, String beginTime, String endTime) { DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope(); - List mapList = deviceDataListService.selectNoiseDataScope(dataScope, deptid, beginTime, endTime, keywords); + List mapList = deviceDataListService.selectNoiseDataScope(dataScope, devcode, beginTime, endTime, wellCode); return ResponseData.success(mapList); } @GetMapping(value = "/harmfuldata/list") - public Object harmfulDataList(String keywords, String deptid, String beginTime, String endTime) { + public Object harmfulDataList(String devcode, String wellCode, String beginTime, String endTime) { DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope(); - List mapList = deviceDataListService.selectHarmfulDataScope(dataScope, deptid, beginTime, endTime, keywords); + List mapList = deviceDataListService.selectHarmfulDataScope(dataScope, devcode, beginTime, endTime, wellCode); return ResponseData.success(mapList); } @GetMapping(value = "/tempdata/list") - public Object tempDataList(String keywords, String deptid, String beginTime, String endTime) { + public Object tempDataList(String devcode, String wellCode, String beginTime, String endTime) { DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope(); - List mapList = deviceDataListService.selectTempDataScope(dataScope, deptid, beginTime, endTime, keywords); + List mapList = deviceDataListService.selectTempDataScope(dataScope, devcode, beginTime, endTime, wellCode); return ResponseData.success(mapList); } - @GetMapping(value = "/welllocadata/list") - public Object wellLocDataList(String keywords, String deptid, String beginTime, String endTime) { + public Object wellLocDataList(String devcode, String wellCode, String beginTime, String endTime) { DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope(); - List mapList = deviceDataListService.selectWellLocDataScope(dataScope, deptid, beginTime, endTime, keywords); + List mapList = deviceDataListService.selectWellLocDataScope(dataScope, devcode, beginTime, endTime, wellCode); return ResponseData.success(mapList); } @GetMapping(value = "/liquidGasData/list") - public Object liquidGasDataList(String keywords, String deptid, String sensorType, String beginTime, String endTime) { + public Object liquidGasDataList(String devcode, String wellCode, String sensorType, String beginTime, String endTime) { DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope(); - List mapList = deviceDataListService.selectGasLiquidDataScope(dataScope, sensorType, deptid, beginTime, endTime, keywords); + List mapList = deviceDataListService.selectGasLiquidDataScope(dataScope, sensorType, devcode, beginTime, endTime, wellCode); return ResponseData.success(mapList); } @GetMapping(value = "/tubedata/list") //@Permission - public Object tubeDataList(String keywords, String deptid, String beginTime, String endTime) { + public Object tubeDataList(String devcode, String wellCode, String beginTime, String endTime) { DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope(); - List mapList = deviceDataListService.selectTubeDataScope(dataScope, deptid, beginTime, endTime, keywords); + List mapList = deviceDataListService.selectTubeDataScope(dataScope, devcode, beginTime, endTime, wellCode); return ResponseData.success(mapList); } @@ -120,23 +111,20 @@ * 消防栓列表 */ @GetMapping(value = "/hydrant/list") - public Object hydrantList(String keywords, String deptid, String beginTime, String endTime) { + public Object hydrantList(String devcode, String wellCode, String beginTime, String endTime) { DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope(); - List mapList= deviceDataListService.getHydrantlist(dataScope, deptid, beginTime, endTime, keywords); + List mapList= deviceDataListService.getHydrantlist(dataScope, devcode, beginTime, endTime, wellCode); return ResponseData.success(mapList); } - /** * 硫化氢列表 */ @GetMapping(value = "/h2s/list") - public Object h2sList(String keywords, String deptid, String beginTime, String endTime) { + public Object h2sList(String devcode, String wellCode, String beginTime, String endTime) { DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope(); - System.out.println(keywords); - List mapList= deviceDataListService.getH2sDataScope(dataScope, deptid, beginTime, endTime, keywords); + List mapList= deviceDataListService.getH2sDataScope(dataScope, devcode, beginTime, endTime, wellCode); return ResponseData.success(mapList); } - } diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java index 837e653..3d7ae31 100644 --- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java +++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java @@ -623,9 +623,9 @@ */ @GetMapping(value = "/h2s/list-page") public Object h2sList(String keywords, String deptid, String beginTime, String endTime) { - Page page = PageFactory.defaultPage(); + Page page = PageFactory.defaultPage(); DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope(); - ResponseData responseData = deviceService.getH2slist(dataScope, page, deptid, beginTime, endTime, keywords); + ResponseData responseData = deviceService.getH2slist(dataScope, page, keywords, beginTime, endTime, deptid); responseData.setData(super.packForBT(page)); return responseData; } @@ -634,10 +634,10 @@ */ @GetMapping(value = "/h2s/export") public void h2sExport(String keywords, String deptid, String beginTime, String endTime) throws IOException { - Page page = PageFactory.defaultPage(); + Page page = PageFactory.defaultPage(); DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope(); deviceService.getH2slist(dataScope, page, deptid, beginTime, endTime, keywords); - super.exportExcel(DataH2s.class, page.getRecords(), DeviceExportEnum.HYDRANT_EXPORT.getFileName()); + super.exportExcel(H2SDataDto.class, page.getRecords(), DeviceExportEnum.H2S_EXPORT.getFileName()); } } diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/DataAnalysisMapper.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/DataAnalysisMapper.java index ab62e2e..67fb9c9 100644 --- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/DataAnalysisMapper.java +++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/DataAnalysisMapper.java @@ -97,6 +97,6 @@ List getHydrantlist(@Param("dataScope") DataScope dataScope,@Param("page")Page page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords); - List selectH2sListDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page")Page page, @Param("deptid") String deptid, - @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords); + List selectH2sListDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page")Page page, @Param("keywords") String keywords, + @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("deptid") String deptid); } diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/DeviceDataListMapper.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/DeviceDataListMapper.java index 7114492..732dcc6 100644 --- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/DeviceDataListMapper.java +++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/DeviceDataListMapper.java @@ -19,29 +19,30 @@ * @since 2019-05-13 */ public interface DeviceDataListMapper extends BaseMapper { - List selectWellDataScope(@Param("dataScope") DataScope dataScope, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords); + List selectWellDataScope(@Param("dataScope") DataScope dataScope, @Param("devcode") String devcode, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("wellCode") String wellCode); - List selectDigDataScope(@Param("dataScope") DataScope dataScope, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords); + List selectDigDataScope(@Param("dataScope") DataScope dataScope, @Param("devcode") String devcode, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("wellCode") String wellCode); - List selectLiquidDataScope(@Param("dataScope") DataScope dataScope, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords); + List selectLiquidDataScope(@Param("dataScope") DataScope dataScope, @Param("devcode") String devcode, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("wellCode") String wellCode); - List selectGasDataScope(@Param("dataScope") DataScope dataScope, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords); + List selectGasDataScope(@Param("dataScope") DataScope dataScope, @Param("devcode") String devcode, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("wellCode") String wellCode); - List selectNoiseDataScope(@Param("dataScope") DataScope dataScope, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords); + List selectNoiseDataScope(@Param("dataScope") DataScope dataScope, @Param("devcode") String devcode, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("wellCode") String wellCode); - List selectHarmfulDataScope(@Param("dataScope") DataScope dataScope, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords); + List selectHarmfulDataScope(@Param("dataScope") DataScope dataScope, @Param("devcode") String devcode, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("wellCode") String wellCode); - List selectTempDataScope(@Param("dataScope") DataScope dataScope, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords); + List selectTempDataScope(@Param("dataScope") DataScope dataScope, @Param("devcode") String devcode, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("wellCode") String wellCode); - List selectWellLocDataScope(@Param("dataScope") DataScope dataScope, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords); + List selectWellLocDataScope(@Param("dataScope") DataScope dataScope, @Param("devcode") String devcode, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("wellCode") String wellCode); - List selectGasLiquidDataLiquidScope(@Param("dataScope") DataScope dataScope, @Param("deptIds") List deptIds, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords); + List selectGasLiquidDataLiquidScope(@Param("dataScope") DataScope dataScope, @Param("devcode")String devcode, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("wellCode") String wellCode); - List selectGasLiquidDataGasScope(@Param("dataScope") DataScope dataScope, @Param("deptIds") List deptIds, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords); + List selectGasLiquidDataGasScope(@Param("dataScope") DataScope dataScope, @Param("devcode")String devcode, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("wellCode") String wellCode); - List selectTubeDataScope(@Param("dataScope") DataScope dataScope, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords); + List selectTubeDataScope(@Param("dataScope") DataScope dataScope, @Param("devcode") String devcode, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("wellCode") String wellCode); - List getHydrantlist(@Param("dataScope") DataScope dataScope, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords); + List getHydrantlist(@Param("dataScope") DataScope dataScope, @Param("devcode") String devcode, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("wellCode") String wellCode); - List selectH2sListDataScope(@Param("dataScope") DataScope dataScope, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords); + List selectH2sListDataScope(@Param("dataScope") DataScope dataScope, @Param("devcode") String devcode, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("wellCode") String wellCode); + } diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/DataAnalysisMapper.xml b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/DataAnalysisMapper.xml index a0117ca..6ed130a 100644 --- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/DataAnalysisMapper.xml +++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/DataAnalysisMapper.xml @@ -1255,7 +1255,6 @@ - SELECT dh2s.DEVCODE AS devcode, dh2s.WELL_CODE AS "wellCode", - dh2s.STRENGTH, - dh2s.CELL, + dh2s.STRENGTH AS strength, + dh2s.CELL AS cell, AS uptime, - dh2s.device_type as deviceType + + + + AS logtime, + bdt.TYPE_NAME AS "deviceTypeName", + bd.device_type as deviceType, + bwi.DEPTID AS deptid FROM data_h2s dh2s JOIN bus_well_info bwi ON bwi.WELL_CODE= dh2s.WELL_CODE JOIN bus_device bd ON dh2s.DEVCODE = bd.DEVCODE + LEFT JOIN base_device_type bdt ON bd.DEVICE_TYPE = bdt.ID bd.VALID = '1' AND bwi.VALID = '1' @@ -1323,11 +1329,9 @@ - and (dh2s.DEVCODE like + AND (bd.DEVCODE LIKE - OR dh2s.WELL_CODE LIKE - - ) + OR bd.WELL_CODE LIKE) diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceDataListMapper.xml b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceDataListMapper.xml index adc10af..7010493 100644 --- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceDataListMapper.xml +++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceDataListMapper.xml @@ -107,17 +107,17 @@ - as "LOGTIME", - DESCN, - STATUS + as "logtime", + DESCN as descn, + STATUS as status FROM data_wellcover dw INNER JOIN bus_well_info bwi on dw.WELL_CODE = bwi.WELL_CODE INNER JOIN bus_device bd ON dw.DEVCODE = bd.DEVCODE bd.VALID = '1' AND bwi.VALID = '1' - - and bwi.DEPTID = #{deptid} + + AND dw.DEVCODE = #{devcode} and dw.LOGTIME = ]]> @@ -131,12 +131,8 @@ - - and (dw.DEVCODE like - - OR dw.WELL_CODE LIKE - - ) + + AND dw.WELL_CODE = #{wellCode} ORDER BY LOGTIME DESC @@ -164,76 +160,64 @@ INNER JOIN bus_device bd ON dd.DEVCODE = bd.DEVCODE bd.VALID = '1' AND bwi.VALID = '1' - - and bwi.DEPTID = #{deptid} + + AND dd.DEVCODE = #{devcode} - and dd.UPTIME = ]]> + AND dd.UPTIME = ]]> - and dd.UPTIME + AND dd.UPTIME - - and (dd.DEVCODE like - - OR dd.WELL_CODE LIKE - - ) + + AND dd.WELL_CODE = #{wellCode} ORDER BY dd.UPTIME DESC - - - - @@ -257,8 +241,11 @@ INNER JOIN bus_device bd ON dg.DEVCODE = bd.DEVCODE bd.VALID = '1' AND bwi.VALID = '1' - - and bwi.DEPTID = #{deptid} + + AND dg.DEVCODE = #{devcode} + + + AND dg.WELL_CODE = #{wellCode} and dg.UPTIME = ]]> @@ -272,18 +259,10 @@ - - and (dg.DEVCODE like - - OR dg.WELL_CODE LIKE - - ) - ORDER BY dg.UPTIME DESC - @@ -353,8 +328,11 @@ INNER JOIN bus_device bd ON dth.DEVCODE = bd.DEVCODE bd.VALID = '1' AND bwi.VALID = '1' - - and bwi.DEPTID = #{deptid} + + AND dth.DEVCODE = #{devcode} + + + AND dth.WELL_CODE = #{wellCode} and dth.UPTIME = ]]> @@ -368,13 +346,6 @@ - - and (dth.DEVCODE like - - OR dth.WELL_CODE LIKE - - ) - ORDER BY dth.UPTIME DESC @@ -399,8 +370,11 @@ INNER JOIN bus_device bd ON dn.DEVCODE = bd.DEVCODE bd.VALID = '1' AND bwi.VALID = '1' - - and bwi.DEPTID = #{deptid} + + AND dn.DEVCODE = #{devcode} + + + AND dn.WELL_CODE = #{wellCode} and dn.UPTIME = ]]> @@ -414,13 +388,6 @@ - - and (dn.DEVCODE like - - OR dn.WELL_CODE LIKE - - ) - ORDER BY dn.UPTIME DESC @@ -446,8 +413,11 @@ INNER JOIN bus_device bd ON dwl.DEVCODE = bd.DEVCODE bd.VALID = '1' AND bwi.VALID = '1' - - and bwi.DEPTID = #{deptid} + + AND dwl.DEVCODE = #{devcode} + + + AND dwl.WELL_CODE = #{wellCode} and dwl.UPTIME = ]]> @@ -461,125 +431,104 @@ - - and (dwl.DEVCODE like - - OR dwl.WELL_CODE LIKE - - ) - ORDER BY dwl.UPTIME DESC - + @@ -639,14 +583,17 @@ AS logtime, - dh.DESCN AS descn + dh.DESCN AS descn FROM data_hydrant dh JOIN bus_well_info bwi ON bwi.WELL_CODE= dh.WELL_CODE JOIN bus_device bd ON dh.DEVCODE = bd.DEVCODE bd.VALID = '1' AND bwi.VALID = '1' - - and bwi.DEPTID = #{deptid} + + AND dh.DEVCODE = #{devcode} + + + AND dh.WELL_CODE = #{wellCode} and dh.LOGTIME = ]]> @@ -660,13 +607,6 @@ - - and (dh.DEVCODE like - - OR dh.WELL_CODE LIKE - - ) - @@ -681,14 +621,17 @@ AS uptime, bwi.deptid, - dh2s.device_type as deviceType + bd.device_type as deviceType FROM data_h2s dh2s JOIN bus_well_info bwi ON bwi.WELL_CODE= dh2s.WELL_CODE JOIN bus_device bd ON dh2s.DEVCODE = bd.DEVCODE bd.VALID = '1' AND bwi.VALID = '1' - - and bwi.DEPTID = #{deptid} + + AND dh2s.DEVCODE = #{devcode} + + + AND dh2s.WELL_CODE = #{wellCode} and dh2s.UPTIME = ]]> @@ -702,13 +645,6 @@ - - and (dh2s.DEVCODE like - - OR dh2s.WELL_CODE LIKE - - ) - diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/DeviceDataListService.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/DeviceDataListService.java index 698a8ea..9bfe937 100644 --- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/DeviceDataListService.java +++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/DeviceDataListService.java @@ -19,46 +19,46 @@ /** * 开挖监测仪数据查询 */ - List selectDigDataScope(DataScope dataScope, String deptid, String beginTime, String endTime, String keywords); + List selectDigDataScope(DataScope dataScope, String devcode, String beginTime, String endTime, String wellCode); /** * 根据条件检索井盖监测数据列表 */ - List selectWellDataScope(DataScope dataScope, String deptid, String beginTime, String endTime, String keywords); + List selectWellDataScope(DataScope dataScope, String devcode, String beginTime, String endTime, String wellCode); /** * 根据检索条件查询液位检测数据 */ - List selectLiquidDataScope(DataScope dataScope, String deptid, String beginTime, String endTime, String keywords); + List selectLiquidDataScope(DataScope dataScope, String devcode, String beginTime, String endTime, String wellCode); /** * 燃气数据查询 */ - List selectGasDataScope(DataScope dataScope, String deptid, String beginTime, String endTime, String keywords); + List selectGasDataScope(DataScope dataScope, String devcode, String beginTime, String endTime, String wellCode); /** * 噪声记录仪数据查询 */ - List selectNoiseDataScope(DataScope dataScope, String deptid, String beginTime, String endTime, String keywords); + List selectNoiseDataScope(DataScope dataScope, String devcode, String beginTime, String endTime, String wellCode); /** * 有害气体数据查询 */ - List selectHarmfulDataScope(DataScope dataScope, String deptid, String beginTime, String endTime, String keywords); + List selectHarmfulDataScope(DataScope dataScope, String devcode, String beginTime, String endTime, String wellCode); /** * 温湿度数据查询 */ - List selectTempDataScope(DataScope dataScope, String deptid, String beginTime, String endTime, String keywords); + List selectTempDataScope(DataScope dataScope, String devcode, String beginTime, String endTime, String wellCode); /** * 井盖定位监测仪数据查询 */ - List selectWellLocDataScope(DataScope dataScope, String deptid, String beginTime, String endTime, String keywords); + List selectWellLocDataScope(DataScope dataScope, String devcode, String beginTime, String endTime, String wellCode); - List selectGasLiquidDataScope(DataScope dataScope, String sensorType, String deptid, String beginTime, String endTime, String keywords); + List selectGasLiquidDataScope(DataScope dataScope, String sensorType, String devcode, String beginTime, String endTime, String wellCode); /** * 管盯数据查询 */ - List selectTubeDataScope(DataScope dataScope, String deptid, String beginTime, String endTime, String keywords); + List selectTubeDataScope(DataScope dataScope, String devcode, String beginTime, String endTime, String wellCode); - List getHydrantlist(DataScope dataScope, String deptid, String beginTime, String endTime, String keywords); + List getHydrantlist(DataScope dataScope, String devcode, String beginTime, String endTime, String wellCode); - List getH2sDataScope(DataScope dataScope, String deptid, String beginTime, String endTime, String keywords); + List getH2sDataScope(DataScope dataScope, String devcode, String beginTime, String endTime, String wellCode); } \ No newline at end of file diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/IDataAnalysisService.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/IDataAnalysisService.java index d09c12e..a75ed02 100644 --- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/IDataAnalysisService.java +++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/IDataAnalysisService.java @@ -126,5 +126,5 @@ ResponseData getHydrantlist(DataScope dataScope, Page page, String deptid, String beginTime, String endTime, String keywords); - ResponseData getH2slist(DataScope dataScope, Page page, String deptid, String beginTime, String endTime, String keywords); + ResponseData getH2slist(DataScope dataScope, Page page, String keywords, String beginTime, String endTime, String deptid); } diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceDataListServiceImpl.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceDataListServiceImpl.java index 95baa10..5abf45c 100644 --- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceDataListServiceImpl.java +++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceDataListServiceImpl.java @@ -37,81 +37,76 @@ private AbstractPermissionContext permissionService; @Override - public List selectWellDataScope(DataScope dataScope, String deptid, String beginTime, String endTime, String keywords) { - return this.baseMapper.selectWellDataScope(dataScope, deptid, beginTime, endTime, keywords); + public List selectWellDataScope(DataScope dataScope, String devcode, String beginTime, String endTime, String wellCode){ + return this.baseMapper.selectWellDataScope(dataScope, devcode, beginTime, endTime, wellCode); } @Override - public List selectDigDataScope(DataScope dataScope, String deptid, String beginTime, String endTime, String keywords) { - return this.baseMapper.selectDigDataScope(dataScope, deptid, beginTime, endTime, keywords); + public List selectDigDataScope(DataScope dataScope, String devcode, String beginTime, String endTime, String wellCode) { + return this.baseMapper.selectDigDataScope(dataScope, devcode, beginTime, endTime, wellCode); } @Override - public List selectLiquidDataScope(DataScope dataScope, String deptid, String beginTime, String endTime, String keywords) { - return this.baseMapper.selectLiquidDataScope(dataScope, deptid, beginTime, endTime, keywords); + public List selectLiquidDataScope(DataScope dataScope, String devcode, String beginTime, String endTime, String wellCode) { + return this.baseMapper.selectLiquidDataScope(dataScope, devcode, beginTime, endTime, wellCode); } @Override - public List selectGasDataScope(DataScope dataScope, String deptid, String beginTime, String endTime, String keywords) { - return this.baseMapper.selectGasDataScope(dataScope, deptid, beginTime, endTime, keywords); + public List selectGasDataScope(DataScope dataScope, String devcode, String beginTime, String endTime, String wellCode) { + return this.baseMapper.selectGasDataScope(dataScope, devcode, beginTime, endTime, wellCode); } @Override - public List selectNoiseDataScope(DataScope dataScope, String deptid, String beginTime, String endTime, String keywords) { - return this.baseMapper.selectNoiseDataScope(dataScope, deptid, beginTime, endTime, keywords); + public List selectNoiseDataScope(DataScope dataScope, String devcode, String beginTime, String endTime, String wellCode) { + return this.baseMapper.selectNoiseDataScope(dataScope, devcode, beginTime, endTime, wellCode); } @Override - public List selectHarmfulDataScope(DataScope dataScope, String deptid, String beginTime, String endTime, String keywords) { - return this.baseMapper.selectHarmfulDataScope(dataScope, deptid, beginTime, endTime, keywords); + public List selectHarmfulDataScope(DataScope dataScope, String devcode, String beginTime, String endTime, String wellCode){ + return this.baseMapper.selectHarmfulDataScope(dataScope, devcode, beginTime, endTime, wellCode); } @Override - public List selectTempDataScope(DataScope dataScope, String deptid, String beginTime, String endTime, String keywords) { - return this.baseMapper.selectTempDataScope(dataScope, deptid, beginTime, endTime, keywords); + public List selectTempDataScope(DataScope dataScope, String devcode, String beginTime, String endTime, String wellCode){ + return this.baseMapper.selectTempDataScope(dataScope, devcode, beginTime, endTime, wellCode); } @Override - public List selectWellLocDataScope(DataScope dataScope, String deptid, String beginTime, String endTime, String keywords) { - List mapList = this.baseMapper.selectWellLocDataScope(dataScope, deptid, beginTime, endTime, keywords); + public List selectWellLocDataScope(DataScope dataScope, String devcode, String beginTime, String endTime, String wellCode) { + List mapList = this.baseMapper.selectWellLocDataScope(dataScope, devcode, beginTime, endTime, wellCode); return mapList; } @Override - public List selectGasLiquidDataScope(DataScope dataScope, String sensorType, String deptid, String beginTime, String endTime, String keywords) { - List deptIds = null; - if (StrUtil.isNotEmpty(deptid)) { - deptIds = permissionService.getDeptService().getIdsByPid(deptid, null); - deptIds.add(Long.valueOf(deptid)); - } + public List selectGasLiquidDataScope(DataScope dataScope, String sensorType, String devcode, String beginTime, String endTime, String wellCode) { List dataGasLiquidList = new ArrayList<>(); if ("liquid".equals(sensorType)) { - dataGasLiquidList = this.baseMapper.selectGasLiquidDataLiquidScope(dataScope, deptIds, beginTime, endTime, keywords); + dataGasLiquidList = this.baseMapper.selectGasLiquidDataLiquidScope(dataScope, devcode, beginTime, endTime, wellCode); } if ("gas".equals(sensorType)) { - dataGasLiquidList = this.baseMapper.selectGasLiquidDataGasScope(dataScope, deptIds, beginTime, endTime, keywords); + dataGasLiquidList = this.baseMapper.selectGasLiquidDataGasScope(dataScope, devcode, beginTime, endTime, wellCode); } System.out.println(dataGasLiquidList); return dataGasLiquidList; } @Override - public List selectTubeDataScope(DataScope dataScope, String deptid, String beginTime, String endTime, String keywords) { - List mapList = this.baseMapper.selectTubeDataScope(dataScope, deptid, beginTime, endTime, keywords); + public List selectTubeDataScope(DataScope dataScope, String devcode, String beginTime, String endTime, String wellCode){ + List mapList = this.baseMapper.selectTubeDataScope(dataScope, devcode, beginTime, endTime, wellCode); return mapList; } @Override - public List getHydrantlist(DataScope dataScope, String deptid, String beginTime, String endTime, String keywords) { - List mapList = this.baseMapper.getHydrantlist(dataScope, deptid, beginTime, endTime, keywords); + public List getHydrantlist(DataScope dataScope, String devcode, String beginTime, String endTime, String wellCode){ + List mapList = this.baseMapper.getHydrantlist(dataScope, devcode, beginTime, endTime, wellCode); return mapList; } @Override - public List getH2sDataScope(DataScope dataScope, String deptid, String beginTime, String endTime, String keywords) { - return this.baseMapper.selectH2sListDataScope(dataScope, deptid, beginTime, endTime, keywords); + public List getH2sDataScope(DataScope dataScope, String devcode, String beginTime, String endTime, String wellCode) { + return this.baseMapper.selectH2sListDataScope(dataScope, devcode, beginTime, endTime, wellCode); } } diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/IDataAnalysisServiceImpl.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/IDataAnalysisServiceImpl.java index 9ae5886..5b03b61 100644 --- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/IDataAnalysisServiceImpl.java +++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/IDataAnalysisServiceImpl.java @@ -559,16 +559,19 @@ return responseData; } - public ResponseData getH2slist(DataScope dataScope, Page page, String deptid, String beginTime, String endTime, String keywords) { + public ResponseData getH2slist(DataScope dataScope, Page page, String keywords, String beginTime, String endTime, String deptid){ ResponseData responseData = new ResponseData(); try { - List h2sDataDtoList = this.baseMapper.selectH2sListDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords); + List h2sDataDtoList = this.baseMapper.selectH2sListDataScopePage(dataScope, page, keywords, beginTime, endTime, deptid); + h2sDataDtoList.forEach( + h2sDataDto->h2sDataDto.setDeptName(permissionService.getDeptService().getDeptName(h2sDataDto.getDeptid())) + ); page.setRecords(h2sDataDtoList); responseData.setData(page); responseData.setCode(200); responseData.setMessage("查询成功"); } catch (DataAccessException dex) { - log.error("主题：硫化氢数据库异常，关键字{}，开始时间{}，结束时间{}，部门编号{}，异常信息", + log.error("主题：硫化氢数据库异常，关键字{}，开始时间{}，结束时间{}，部门编号{}，异常信息{}", keywords, beginTime, endTime, deptid, dex); responseData.setCode(500); responseData.setMessage("数据库查询异常"); diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/H2SDataDto.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/H2SDataDto.java new file mode 100644 index 0000000..8771495 --- /dev/null +++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/H2SDataDto.java @@ -0,0 +1,53 @@ +package com.casic.missiles.modular.system.dto.ExcelModel; + +import com.alibaba.excel.annotation.ExcelProperty; +import com.alibaba.excel.annotation.write.style.ColumnWidth; +import com.alibaba.excel.annotation.write.style.ContentRowHeight; +import com.alibaba.excel.annotation.write.style.ContentStyle; +import com.alibaba.excel.annotation.write.style.HeadRowHeight; +import com.alibaba.excel.enums.poi.BorderStyleEnum; +import lombok.Data; +import lombok.NoArgsConstructor; + +/** + * 氢硫酸 + * + * @author cz + * @date 2022-07-28 + */ +@ColumnWidth(30) +@HeadRowHeight(15) +@ContentRowHeight(20) +@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) +@Data +@NoArgsConstructor +public class H2SDataDto { + @ExcelProperty("设备编号") + private String devcode; + + @ExcelProperty("点位编号") + private String wellCode; + + @ExcelProperty("设备类型") + private String deviceType; + + @ExcelProperty("设备类型") + private String deviceTypeName; + + private String deptid; + + @ExcelProperty("权属部门") + private String deptName; + + @ExcelProperty("硫化氢浓度") + private String strength; + + @ExcelProperty("电量") + private String cell; + + @ExcelProperty("采集时间") + private String logtime; + @ExcelProperty("记录时间") + private String uptime; + +} diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/statistic/DataGasLiquid.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/statistic/DataGasLiquid.java index ad3eca0..c24a391 100644 --- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/statistic/DataGasLiquid.java +++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/statistic/DataGasLiquid.java @@ -9,7 +9,7 @@ private String liquiddata; private String cell; private String strength; - private String logTime; - private String upTime; + private String logtime; + private String uptime; } diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/statistic/DataH2s.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/statistic/DataH2s.java index b7ce91a..993a9b3 100644 --- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/statistic/DataH2s.java +++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/statistic/DataH2s.java @@ -9,12 +9,7 @@ import lombok.Data; import lombok.NoArgsConstructor; -@ColumnWidth(30) -@HeadRowHeight(15) -@ContentRowHeight(20) -@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) @Data -@NoArgsConstructor public class DataH2s { @ExcelProperty("设备编号") private String devcode; diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceDataListController.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceDataListController.java index 09d3c0d..0f13e84 100644 --- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceDataListController.java +++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceDataListController.java @@ -1,13 +1,8 @@ package com.casic.missiles.modular.system.controller; -import cn.hutool.core.collection.CollectionUtil; -import com.baomidou.mybatisplus.core.metadata.OrderItem; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.casic.missiles.core.application.context.AbstractPermissionContext; import com.casic.missiles.core.datascope.DataScope; -import com.casic.missiles.core.page.PageFactory; import com.casic.missiles.model.response.ResponseData; -import com.casic.missiles.modular.system.dto.ExcelModel.*; import com.casic.missiles.modular.system.dto.statistic.*; import com.casic.missiles.modular.system.service.DeviceDataListService; import lombok.extern.slf4j.Slf4j; @@ -27,92 +22,88 @@ // @Permission @GetMapping(value = "/welldata/list") - public Object wellDataList(String keywords, String deptid, String beginTime, String endTime) { + public Object wellDataList(String devcode, String wellCode, String beginTime, String endTime) { //查询数据权限 使用默认DEPTID 字段 DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope(); - List list = deviceDataListService.selectWellDataScope(dataScope, deptid, beginTime, endTime, keywords); - + List list = deviceDataListService.selectWellDataScope(dataScope, devcode, beginTime, endTime, wellCode); return ResponseData.success(list); } - /** * 开挖监测仪数据查询 * - * @param keywords - * @param deptid + * @param devcode + * @param wellCode * @param beginTime * @param endTime * @return */ - // @Permission + //@Permission @GetMapping(value = "/digdata/list") - public Object digDataList(String keywords, String deptid, String beginTime, String endTime) { + public Object digDataList(String devcode, String wellCode, String beginTime, String endTime) { DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope(); - List mapList = deviceDataListService.selectDigDataScope(dataScope, deptid, beginTime, endTime, keywords); + List mapList = deviceDataListService.selectDigDataScope(dataScope, devcode, beginTime, endTime, wellCode); return ResponseData.success(mapList); } @GetMapping(value = "/liquiddata/list") -// @Permission - public Object liquidDataList(String keywords, String deptid, String beginTime, String endTime) { + //@Permission + public Object liquidDataList(String devcode, String wellCode, String beginTime, String endTime) { //查询数据权限 使用默认DEPTID 字段 DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope(); - List list = deviceDataListService.selectLiquidDataScope(dataScope, deptid, beginTime, endTime, keywords); + List list = deviceDataListService.selectLiquidDataScope(dataScope, devcode, beginTime, endTime, wellCode); return ResponseData.success(list); } @GetMapping(value = "/gasdata/list") - //@Permission - public Object gasDataList(String keywords, String deptid, String beginTime, String endTime) { + public Object gasDataList(String devcode, String wellCode, String beginTime, String endTime) { DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope(); - List deviceDataExcelDtoList = deviceDataListService.selectGasDataScope(dataScope, deptid, beginTime, endTime, keywords); + List deviceDataExcelDtoList = deviceDataListService.selectGasDataScope(dataScope, devcode, beginTime, endTime, wellCode); return ResponseData.success(deviceDataExcelDtoList); } @GetMapping(value = "/noisedata/list") - public Object noiseDataList(String keywords, String deptid, String beginTime, String endTime) { + public Object noiseDataList(String devcode, String wellCode, String beginTime, String endTime) { DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope(); - List mapList = deviceDataListService.selectNoiseDataScope(dataScope, deptid, beginTime, endTime, keywords); + List mapList = deviceDataListService.selectNoiseDataScope(dataScope, devcode, beginTime, endTime, wellCode); return ResponseData.success(mapList); } @GetMapping(value = "/harmfuldata/list") - public Object harmfulDataList(String keywords, String deptid, String beginTime, String endTime) { + public Object harmfulDataList(String devcode, String wellCode, String beginTime, String endTime) { DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope(); - List mapList = deviceDataListService.selectHarmfulDataScope(dataScope, deptid, beginTime, endTime, keywords); + List mapList = deviceDataListService.selectHarmfulDataScope(dataScope, devcode, beginTime, endTime, wellCode); return ResponseData.success(mapList); } @GetMapping(value = "/tempdata/list") - public Object tempDataList(String keywords, String deptid, String beginTime, String endTime) { + public Object tempDataList(String devcode, String wellCode, String beginTime, String endTime) { DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope(); - List mapList = deviceDataListService.selectTempDataScope(dataScope, deptid, beginTime, endTime, keywords); + List mapList = deviceDataListService.selectTempDataScope(dataScope, devcode, beginTime, endTime, wellCode); return ResponseData.success(mapList); } - @GetMapping(value = "/welllocadata/list") - public Object wellLocDataList(String keywords, String deptid, String beginTime, String endTime) { + public Object wellLocDataList(String devcode, String wellCode, String beginTime, String endTime) { DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope(); - List mapList = deviceDataListService.selectWellLocDataScope(dataScope, deptid, beginTime, endTime, keywords); + List mapList = deviceDataListService.selectWellLocDataScope(dataScope, devcode, beginTime, endTime, wellCode); return ResponseData.success(mapList); } @GetMapping(value = "/liquidGasData/list") - public Object liquidGasDataList(String keywords, String deptid, String sensorType, String beginTime, String endTime) { + public Object liquidGasDataList(String devcode, String wellCode, String sensorType, String beginTime, String endTime) { DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope(); - List mapList = deviceDataListService.selectGasLiquidDataScope(dataScope, sensorType, deptid, beginTime, endTime, keywords); + List mapList = deviceDataListService.selectGasLiquidDataScope(dataScope, sensorType, devcode, beginTime, endTime, wellCode); return ResponseData.success(mapList); } @GetMapping(value = "/tubedata/list") //@Permission - public Object tubeDataList(String keywords, String deptid, String beginTime, String endTime) { + public Object tubeDataList(String devcode, String wellCode, String beginTime, String endTime) { DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope(); - List mapList = deviceDataListService.selectTubeDataScope(dataScope, deptid, beginTime, endTime, keywords); + List mapList = deviceDataListService.selectTubeDataScope(dataScope, devcode, beginTime, endTime, wellCode); return ResponseData.success(mapList); } @@ -120,23 +111,20 @@ * 消防栓列表 */ @GetMapping(value = "/hydrant/list") - public Object hydrantList(String keywords, String deptid, String beginTime, String endTime) { + public Object hydrantList(String devcode, String wellCode, String beginTime, String endTime) { DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope(); - List mapList= deviceDataListService.getHydrantlist(dataScope, deptid, beginTime, endTime, keywords); + List mapList= deviceDataListService.getHydrantlist(dataScope, devcode, beginTime, endTime, wellCode); return ResponseData.success(mapList); } - /** * 硫化氢列表 */ @GetMapping(value = "/h2s/list") - public Object h2sList(String keywords, String deptid, String beginTime, String endTime) { + public Object h2sList(String devcode, String wellCode, String beginTime, String endTime) { DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope(); - System.out.println(keywords); - List mapList= deviceDataListService.getH2sDataScope(dataScope, deptid, beginTime, endTime, keywords); + List mapList= deviceDataListService.getH2sDataScope(dataScope, devcode, beginTime, endTime, wellCode); return ResponseData.success(mapList); } - } diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java index 837e653..3d7ae31 100644 --- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java +++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java @@ -623,9 +623,9 @@ */ @GetMapping(value = "/h2s/list-page") public Object h2sList(String keywords, String deptid, String beginTime, String endTime) { - Page page = PageFactory.defaultPage(); + Page page = PageFactory.defaultPage(); DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope(); - ResponseData responseData = deviceService.getH2slist(dataScope, page, deptid, beginTime, endTime, keywords); + ResponseData responseData = deviceService.getH2slist(dataScope, page, keywords, beginTime, endTime, deptid); responseData.setData(super.packForBT(page)); return responseData; } @@ -634,10 +634,10 @@ */ @GetMapping(value = "/h2s/export") public void h2sExport(String keywords, String deptid, String beginTime, String endTime) throws IOException { - Page page = PageFactory.defaultPage(); + Page page = PageFactory.defaultPage(); DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope(); deviceService.getH2slist(dataScope, page, deptid, beginTime, endTime, keywords); - super.exportExcel(DataH2s.class, page.getRecords(), DeviceExportEnum.HYDRANT_EXPORT.getFileName()); + super.exportExcel(H2SDataDto.class, page.getRecords(), DeviceExportEnum.H2S_EXPORT.getFileName()); } } diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/DataAnalysisMapper.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/DataAnalysisMapper.java index ab62e2e..67fb9c9 100644 --- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/DataAnalysisMapper.java +++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/DataAnalysisMapper.java @@ -97,6 +97,6 @@ List getHydrantlist(@Param("dataScope") DataScope dataScope,@Param("page")Page page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords); - List selectH2sListDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page")Page page, @Param("deptid") String deptid, - @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords); + List selectH2sListDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page")Page page, @Param("keywords") String keywords, + @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("deptid") String deptid); } diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/DeviceDataListMapper.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/DeviceDataListMapper.java index 7114492..732dcc6 100644 --- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/DeviceDataListMapper.java +++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/DeviceDataListMapper.java @@ -19,29 +19,30 @@ * @since 2019-05-13 */ public interface DeviceDataListMapper extends BaseMapper { - List selectWellDataScope(@Param("dataScope") DataScope dataScope, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords); + List selectWellDataScope(@Param("dataScope") DataScope dataScope, @Param("devcode") String devcode, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("wellCode") String wellCode); - List selectDigDataScope(@Param("dataScope") DataScope dataScope, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords); + List selectDigDataScope(@Param("dataScope") DataScope dataScope, @Param("devcode") String devcode, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("wellCode") String wellCode); - List selectLiquidDataScope(@Param("dataScope") DataScope dataScope, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords); + List selectLiquidDataScope(@Param("dataScope") DataScope dataScope, @Param("devcode") String devcode, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("wellCode") String wellCode); - List selectGasDataScope(@Param("dataScope") DataScope dataScope, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords); + List selectGasDataScope(@Param("dataScope") DataScope dataScope, @Param("devcode") String devcode, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("wellCode") String wellCode); - List selectNoiseDataScope(@Param("dataScope") DataScope dataScope, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords); + List selectNoiseDataScope(@Param("dataScope") DataScope dataScope, @Param("devcode") String devcode, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("wellCode") String wellCode); - List selectHarmfulDataScope(@Param("dataScope") DataScope dataScope, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords); + List selectHarmfulDataScope(@Param("dataScope") DataScope dataScope, @Param("devcode") String devcode, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("wellCode") String wellCode); - List selectTempDataScope(@Param("dataScope") DataScope dataScope, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords); + List selectTempDataScope(@Param("dataScope") DataScope dataScope, @Param("devcode") String devcode, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("wellCode") String wellCode); - List selectWellLocDataScope(@Param("dataScope") DataScope dataScope, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords); + List selectWellLocDataScope(@Param("dataScope") DataScope dataScope, @Param("devcode") String devcode, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("wellCode") String wellCode); - List selectGasLiquidDataLiquidScope(@Param("dataScope") DataScope dataScope, @Param("deptIds") List deptIds, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords); + List selectGasLiquidDataLiquidScope(@Param("dataScope") DataScope dataScope, @Param("devcode")String devcode, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("wellCode") String wellCode); - List selectGasLiquidDataGasScope(@Param("dataScope") DataScope dataScope, @Param("deptIds") List deptIds, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords); + List selectGasLiquidDataGasScope(@Param("dataScope") DataScope dataScope, @Param("devcode")String devcode, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("wellCode") String wellCode); - List selectTubeDataScope(@Param("dataScope") DataScope dataScope, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords); + List selectTubeDataScope(@Param("dataScope") DataScope dataScope, @Param("devcode") String devcode, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("wellCode") String wellCode); - List getHydrantlist(@Param("dataScope") DataScope dataScope, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords); + List getHydrantlist(@Param("dataScope") DataScope dataScope, @Param("devcode") String devcode, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("wellCode") String wellCode); - List selectH2sListDataScope(@Param("dataScope") DataScope dataScope, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords); + List selectH2sListDataScope(@Param("dataScope") DataScope dataScope, @Param("devcode") String devcode, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("wellCode") String wellCode); + } diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/DataAnalysisMapper.xml b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/DataAnalysisMapper.xml index a0117ca..6ed130a 100644 --- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/DataAnalysisMapper.xml +++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/DataAnalysisMapper.xml @@ -1255,7 +1255,6 @@ - SELECT dh2s.DEVCODE AS devcode, dh2s.WELL_CODE AS "wellCode", - dh2s.STRENGTH, - dh2s.CELL, + dh2s.STRENGTH AS strength, + dh2s.CELL AS cell, AS uptime, - dh2s.device_type as deviceType + + + + AS logtime, + bdt.TYPE_NAME AS "deviceTypeName", + bd.device_type as deviceType, + bwi.DEPTID AS deptid FROM data_h2s dh2s JOIN bus_well_info bwi ON bwi.WELL_CODE= dh2s.WELL_CODE JOIN bus_device bd ON dh2s.DEVCODE = bd.DEVCODE + LEFT JOIN base_device_type bdt ON bd.DEVICE_TYPE = bdt.ID bd.VALID = '1' AND bwi.VALID = '1' @@ -1323,11 +1329,9 @@ - and (dh2s.DEVCODE like + AND (bd.DEVCODE LIKE - OR dh2s.WELL_CODE LIKE - - ) + OR bd.WELL_CODE LIKE) diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceDataListMapper.xml b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceDataListMapper.xml index adc10af..7010493 100644 --- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceDataListMapper.xml +++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceDataListMapper.xml @@ -107,17 +107,17 @@ - as "LOGTIME", - DESCN, - STATUS + as "logtime", + DESCN as descn, + STATUS as status FROM data_wellcover dw INNER JOIN bus_well_info bwi on dw.WELL_CODE = bwi.WELL_CODE INNER JOIN bus_device bd ON dw.DEVCODE = bd.DEVCODE bd.VALID = '1' AND bwi.VALID = '1' - - and bwi.DEPTID = #{deptid} + + AND dw.DEVCODE = #{devcode} and dw.LOGTIME = ]]> @@ -131,12 +131,8 @@ - - and (dw.DEVCODE like - - OR dw.WELL_CODE LIKE - - ) + + AND dw.WELL_CODE = #{wellCode} ORDER BY LOGTIME DESC @@ -164,76 +160,64 @@ INNER JOIN bus_device bd ON dd.DEVCODE = bd.DEVCODE bd.VALID = '1' AND bwi.VALID = '1' - - and bwi.DEPTID = #{deptid} + + AND dd.DEVCODE = #{devcode} - and dd.UPTIME = ]]> + AND dd.UPTIME = ]]> - and dd.UPTIME + AND dd.UPTIME - - and (dd.DEVCODE like - - OR dd.WELL_CODE LIKE - - ) + + AND dd.WELL_CODE = #{wellCode} ORDER BY dd.UPTIME DESC - - - - @@ -257,8 +241,11 @@ INNER JOIN bus_device bd ON dg.DEVCODE = bd.DEVCODE bd.VALID = '1' AND bwi.VALID = '1' - - and bwi.DEPTID = #{deptid} + + AND dg.DEVCODE = #{devcode} + + + AND dg.WELL_CODE = #{wellCode} and dg.UPTIME = ]]> @@ -272,18 +259,10 @@ - - and (dg.DEVCODE like - - OR dg.WELL_CODE LIKE - - ) - ORDER BY dg.UPTIME DESC - @@ -353,8 +328,11 @@ INNER JOIN bus_device bd ON dth.DEVCODE = bd.DEVCODE bd.VALID = '1' AND bwi.VALID = '1' - - and bwi.DEPTID = #{deptid} + + AND dth.DEVCODE = #{devcode} + + + AND dth.WELL_CODE = #{wellCode} and dth.UPTIME = ]]> @@ -368,13 +346,6 @@ - - and (dth.DEVCODE like - - OR dth.WELL_CODE LIKE - - ) - ORDER BY dth.UPTIME DESC @@ -399,8 +370,11 @@ INNER JOIN bus_device bd ON dn.DEVCODE = bd.DEVCODE bd.VALID = '1' AND bwi.VALID = '1' - - and bwi.DEPTID = #{deptid} + + AND dn.DEVCODE = #{devcode} + + + AND dn.WELL_CODE = #{wellCode} and dn.UPTIME = ]]> @@ -414,13 +388,6 @@ - - and (dn.DEVCODE like - - OR dn.WELL_CODE LIKE - - ) - ORDER BY dn.UPTIME DESC @@ -446,8 +413,11 @@ INNER JOIN bus_device bd ON dwl.DEVCODE = bd.DEVCODE bd.VALID = '1' AND bwi.VALID = '1' - - and bwi.DEPTID = #{deptid} + + AND dwl.DEVCODE = #{devcode} + + + AND dwl.WELL_CODE = #{wellCode} and dwl.UPTIME = ]]> @@ -461,125 +431,104 @@ - - and (dwl.DEVCODE like - - OR dwl.WELL_CODE LIKE - - ) - ORDER BY dwl.UPTIME DESC - + @@ -639,14 +583,17 @@ AS logtime, - dh.DESCN AS descn + dh.DESCN AS descn FROM data_hydrant dh JOIN bus_well_info bwi ON bwi.WELL_CODE= dh.WELL_CODE JOIN bus_device bd ON dh.DEVCODE = bd.DEVCODE bd.VALID = '1' AND bwi.VALID = '1' - - and bwi.DEPTID = #{deptid} + + AND dh.DEVCODE = #{devcode} + + + AND dh.WELL_CODE = #{wellCode} and dh.LOGTIME = ]]> @@ -660,13 +607,6 @@ - - and (dh.DEVCODE like - - OR dh.WELL_CODE LIKE - - ) - @@ -681,14 +621,17 @@ AS uptime, bwi.deptid, - dh2s.device_type as deviceType + bd.device_type as deviceType FROM data_h2s dh2s JOIN bus_well_info bwi ON bwi.WELL_CODE= dh2s.WELL_CODE JOIN bus_device bd ON dh2s.DEVCODE = bd.DEVCODE bd.VALID = '1' AND bwi.VALID = '1' - - and bwi.DEPTID = #{deptid} + + AND dh2s.DEVCODE = #{devcode} + + + AND dh2s.WELL_CODE = #{wellCode} and dh2s.UPTIME = ]]> @@ -702,13 +645,6 @@ - - and (dh2s.DEVCODE like - - OR dh2s.WELL_CODE LIKE - - ) - diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/DeviceDataListService.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/DeviceDataListService.java index 698a8ea..9bfe937 100644 --- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/DeviceDataListService.java +++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/DeviceDataListService.java @@ -19,46 +19,46 @@ /** * 开挖监测仪数据查询 */ - List selectDigDataScope(DataScope dataScope, String deptid, String beginTime, String endTime, String keywords); + List selectDigDataScope(DataScope dataScope, String devcode, String beginTime, String endTime, String wellCode); /** * 根据条件检索井盖监测数据列表 */ - List selectWellDataScope(DataScope dataScope, String deptid, String beginTime, String endTime, String keywords); + List selectWellDataScope(DataScope dataScope, String devcode, String beginTime, String endTime, String wellCode); /** * 根据检索条件查询液位检测数据 */ - List selectLiquidDataScope(DataScope dataScope, String deptid, String beginTime, String endTime, String keywords); + List selectLiquidDataScope(DataScope dataScope, String devcode, String beginTime, String endTime, String wellCode); /** * 燃气数据查询 */ - List selectGasDataScope(DataScope dataScope, String deptid, String beginTime, String endTime, String keywords); + List selectGasDataScope(DataScope dataScope, String devcode, String beginTime, String endTime, String wellCode); /** * 噪声记录仪数据查询 */ - List selectNoiseDataScope(DataScope dataScope, String deptid, String beginTime, String endTime, String keywords); + List selectNoiseDataScope(DataScope dataScope, String devcode, String beginTime, String endTime, String wellCode); /** * 有害气体数据查询 */ - List selectHarmfulDataScope(DataScope dataScope, String deptid, String beginTime, String endTime, String keywords); + List selectHarmfulDataScope(DataScope dataScope, String devcode, String beginTime, String endTime, String wellCode); /** * 温湿度数据查询 */ - List selectTempDataScope(DataScope dataScope, String deptid, String beginTime, String endTime, String keywords); + List selectTempDataScope(DataScope dataScope, String devcode, String beginTime, String endTime, String wellCode); /** * 井盖定位监测仪数据查询 */ - List selectWellLocDataScope(DataScope dataScope, String deptid, String beginTime, String endTime, String keywords); + List selectWellLocDataScope(DataScope dataScope, String devcode, String beginTime, String endTime, String wellCode); - List selectGasLiquidDataScope(DataScope dataScope, String sensorType, String deptid, String beginTime, String endTime, String keywords); + List selectGasLiquidDataScope(DataScope dataScope, String sensorType, String devcode, String beginTime, String endTime, String wellCode); /** * 管盯数据查询 */ - List selectTubeDataScope(DataScope dataScope, String deptid, String beginTime, String endTime, String keywords); + List selectTubeDataScope(DataScope dataScope, String devcode, String beginTime, String endTime, String wellCode); - List getHydrantlist(DataScope dataScope, String deptid, String beginTime, String endTime, String keywords); + List getHydrantlist(DataScope dataScope, String devcode, String beginTime, String endTime, String wellCode); - List getH2sDataScope(DataScope dataScope, String deptid, String beginTime, String endTime, String keywords); + List getH2sDataScope(DataScope dataScope, String devcode, String beginTime, String endTime, String wellCode); } \ No newline at end of file diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/IDataAnalysisService.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/IDataAnalysisService.java index d09c12e..a75ed02 100644 --- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/IDataAnalysisService.java +++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/IDataAnalysisService.java @@ -126,5 +126,5 @@ ResponseData getHydrantlist(DataScope dataScope, Page page, String deptid, String beginTime, String endTime, String keywords); - ResponseData getH2slist(DataScope dataScope, Page page, String deptid, String beginTime, String endTime, String keywords); + ResponseData getH2slist(DataScope dataScope, Page page, String keywords, String beginTime, String endTime, String deptid); } diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceDataListServiceImpl.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceDataListServiceImpl.java index 95baa10..5abf45c 100644 --- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceDataListServiceImpl.java +++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceDataListServiceImpl.java @@ -37,81 +37,76 @@ private AbstractPermissionContext permissionService; @Override - public List selectWellDataScope(DataScope dataScope, String deptid, String beginTime, String endTime, String keywords) { - return this.baseMapper.selectWellDataScope(dataScope, deptid, beginTime, endTime, keywords); + public List selectWellDataScope(DataScope dataScope, String devcode, String beginTime, String endTime, String wellCode){ + return this.baseMapper.selectWellDataScope(dataScope, devcode, beginTime, endTime, wellCode); } @Override - public List selectDigDataScope(DataScope dataScope, String deptid, String beginTime, String endTime, String keywords) { - return this.baseMapper.selectDigDataScope(dataScope, deptid, beginTime, endTime, keywords); + public List selectDigDataScope(DataScope dataScope, String devcode, String beginTime, String endTime, String wellCode) { + return this.baseMapper.selectDigDataScope(dataScope, devcode, beginTime, endTime, wellCode); } @Override - public List selectLiquidDataScope(DataScope dataScope, String deptid, String beginTime, String endTime, String keywords) { - return this.baseMapper.selectLiquidDataScope(dataScope, deptid, beginTime, endTime, keywords); + public List selectLiquidDataScope(DataScope dataScope, String devcode, String beginTime, String endTime, String wellCode) { + return this.baseMapper.selectLiquidDataScope(dataScope, devcode, beginTime, endTime, wellCode); } @Override - public List selectGasDataScope(DataScope dataScope, String deptid, String beginTime, String endTime, String keywords) { - return this.baseMapper.selectGasDataScope(dataScope, deptid, beginTime, endTime, keywords); + public List selectGasDataScope(DataScope dataScope, String devcode, String beginTime, String endTime, String wellCode) { + return this.baseMapper.selectGasDataScope(dataScope, devcode, beginTime, endTime, wellCode); } @Override - public List selectNoiseDataScope(DataScope dataScope, String deptid, String beginTime, String endTime, String keywords) { - return this.baseMapper.selectNoiseDataScope(dataScope, deptid, beginTime, endTime, keywords); + public List selectNoiseDataScope(DataScope dataScope, String devcode, String beginTime, String endTime, String wellCode) { + return this.baseMapper.selectNoiseDataScope(dataScope, devcode, beginTime, endTime, wellCode); } @Override - public List selectHarmfulDataScope(DataScope dataScope, String deptid, String beginTime, String endTime, String keywords) { - return this.baseMapper.selectHarmfulDataScope(dataScope, deptid, beginTime, endTime, keywords); + public List selectHarmfulDataScope(DataScope dataScope, String devcode, String beginTime, String endTime, String wellCode){ + return this.baseMapper.selectHarmfulDataScope(dataScope, devcode, beginTime, endTime, wellCode); } @Override - public List selectTempDataScope(DataScope dataScope, String deptid, String beginTime, String endTime, String keywords) { - return this.baseMapper.selectTempDataScope(dataScope, deptid, beginTime, endTime, keywords); + public List selectTempDataScope(DataScope dataScope, String devcode, String beginTime, String endTime, String wellCode){ + return this.baseMapper.selectTempDataScope(dataScope, devcode, beginTime, endTime, wellCode); } @Override - public List selectWellLocDataScope(DataScope dataScope, String deptid, String beginTime, String endTime, String keywords) { - List mapList = this.baseMapper.selectWellLocDataScope(dataScope, deptid, beginTime, endTime, keywords); + public List selectWellLocDataScope(DataScope dataScope, String devcode, String beginTime, String endTime, String wellCode) { + List mapList = this.baseMapper.selectWellLocDataScope(dataScope, devcode, beginTime, endTime, wellCode); return mapList; } @Override - public List selectGasLiquidDataScope(DataScope dataScope, String sensorType, String deptid, String beginTime, String endTime, String keywords) { - List deptIds = null; - if (StrUtil.isNotEmpty(deptid)) { - deptIds = permissionService.getDeptService().getIdsByPid(deptid, null); - deptIds.add(Long.valueOf(deptid)); - } + public List selectGasLiquidDataScope(DataScope dataScope, String sensorType, String devcode, String beginTime, String endTime, String wellCode) { List dataGasLiquidList = new ArrayList<>(); if ("liquid".equals(sensorType)) { - dataGasLiquidList = this.baseMapper.selectGasLiquidDataLiquidScope(dataScope, deptIds, beginTime, endTime, keywords); + dataGasLiquidList = this.baseMapper.selectGasLiquidDataLiquidScope(dataScope, devcode, beginTime, endTime, wellCode); } if ("gas".equals(sensorType)) { - dataGasLiquidList = this.baseMapper.selectGasLiquidDataGasScope(dataScope, deptIds, beginTime, endTime, keywords); + dataGasLiquidList = this.baseMapper.selectGasLiquidDataGasScope(dataScope, devcode, beginTime, endTime, wellCode); } System.out.println(dataGasLiquidList); return dataGasLiquidList; } @Override - public List selectTubeDataScope(DataScope dataScope, String deptid, String beginTime, String endTime, String keywords) { - List mapList = this.baseMapper.selectTubeDataScope(dataScope, deptid, beginTime, endTime, keywords); + public List selectTubeDataScope(DataScope dataScope, String devcode, String beginTime, String endTime, String wellCode){ + List mapList = this.baseMapper.selectTubeDataScope(dataScope, devcode, beginTime, endTime, wellCode); return mapList; } @Override - public List getHydrantlist(DataScope dataScope, String deptid, String beginTime, String endTime, String keywords) { - List mapList = this.baseMapper.getHydrantlist(dataScope, deptid, beginTime, endTime, keywords); + public List getHydrantlist(DataScope dataScope, String devcode, String beginTime, String endTime, String wellCode){ + List mapList = this.baseMapper.getHydrantlist(dataScope, devcode, beginTime, endTime, wellCode); return mapList; } @Override - public List getH2sDataScope(DataScope dataScope, String deptid, String beginTime, String endTime, String keywords) { - return this.baseMapper.selectH2sListDataScope(dataScope, deptid, beginTime, endTime, keywords); + public List getH2sDataScope(DataScope dataScope, String devcode, String beginTime, String endTime, String wellCode) { + return this.baseMapper.selectH2sListDataScope(dataScope, devcode, beginTime, endTime, wellCode); } } diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/IDataAnalysisServiceImpl.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/IDataAnalysisServiceImpl.java index 9ae5886..5b03b61 100644 --- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/IDataAnalysisServiceImpl.java +++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/IDataAnalysisServiceImpl.java @@ -559,16 +559,19 @@ return responseData; } - public ResponseData getH2slist(DataScope dataScope, Page page, String deptid, String beginTime, String endTime, String keywords) { + public ResponseData getH2slist(DataScope dataScope, Page page, String keywords, String beginTime, String endTime, String deptid){ ResponseData responseData = new ResponseData(); try { - List h2sDataDtoList = this.baseMapper.selectH2sListDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords); + List h2sDataDtoList = this.baseMapper.selectH2sListDataScopePage(dataScope, page, keywords, beginTime, endTime, deptid); + h2sDataDtoList.forEach( + h2sDataDto->h2sDataDto.setDeptName(permissionService.getDeptService().getDeptName(h2sDataDto.getDeptid())) + ); page.setRecords(h2sDataDtoList); responseData.setData(page); responseData.setCode(200); responseData.setMessage("查询成功"); } catch (DataAccessException dex) { - log.error("主题：硫化氢数据库异常，关键字{}，开始时间{}，结束时间{}，部门编号{}，异常信息", + log.error("主题：硫化氢数据库异常，关键字{}，开始时间{}，结束时间{}，部门编号{}，异常信息{}", keywords, beginTime, endTime, deptid, dex); responseData.setCode(500); responseData.setMessage("数据库查询异常"); diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/H2SDataDto.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/H2SDataDto.java new file mode 100644 index 0000000..8771495 --- /dev/null +++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/H2SDataDto.java @@ -0,0 +1,53 @@ +package com.casic.missiles.modular.system.dto.ExcelModel; + +import com.alibaba.excel.annotation.ExcelProperty; +import com.alibaba.excel.annotation.write.style.ColumnWidth; +import com.alibaba.excel.annotation.write.style.ContentRowHeight; +import com.alibaba.excel.annotation.write.style.ContentStyle; +import com.alibaba.excel.annotation.write.style.HeadRowHeight; +import com.alibaba.excel.enums.poi.BorderStyleEnum; +import lombok.Data; +import lombok.NoArgsConstructor; + +/** + * 氢硫酸 + * + * @author cz + * @date 2022-07-28 + */ +@ColumnWidth(30) +@HeadRowHeight(15) +@ContentRowHeight(20) +@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) +@Data +@NoArgsConstructor +public class H2SDataDto { + @ExcelProperty("设备编号") + private String devcode; + + @ExcelProperty("点位编号") + private String wellCode; + + @ExcelProperty("设备类型") + private String deviceType; + + @ExcelProperty("设备类型") + private String deviceTypeName; + + private String deptid; + + @ExcelProperty("权属部门") + private String deptName; + + @ExcelProperty("硫化氢浓度") + private String strength; + + @ExcelProperty("电量") + private String cell; + + @ExcelProperty("采集时间") + private String logtime; + @ExcelProperty("记录时间") + private String uptime; + +} diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/statistic/DataGasLiquid.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/statistic/DataGasLiquid.java index ad3eca0..c24a391 100644 --- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/statistic/DataGasLiquid.java +++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/statistic/DataGasLiquid.java @@ -9,7 +9,7 @@ private String liquiddata; private String cell; private String strength; - private String logTime; - private String upTime; + private String logtime; + private String uptime; } diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/statistic/DataH2s.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/statistic/DataH2s.java index b7ce91a..993a9b3 100644 --- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/statistic/DataH2s.java +++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/statistic/DataH2s.java @@ -9,12 +9,7 @@ import lombok.Data; import lombok.NoArgsConstructor; -@ColumnWidth(30) -@HeadRowHeight(15) -@ContentRowHeight(20) -@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) @Data -@NoArgsConstructor public class DataH2s { @ExcelProperty("设备编号") private String devcode; diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/statistic/DataHarmfulGas.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/statistic/DataHarmfulGas.java index a483d73..3c20b8b 100644 --- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/statistic/DataHarmfulGas.java +++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/statistic/DataHarmfulGas.java @@ -1,14 +1,19 @@ package com.casic.missiles.modular.system.dto.statistic; +import com.alibaba.fastjson.annotation.JSONField; import lombok.Data; @Data public class DataHarmfulGas { private String devcode; + @JSONField(name="CO") private String CO; + @JSONField(name="CH4") private String CH4; + @JSONField(name="H2S") private String H2S; + @JSONField(name="O2") private String O2; private String liquidSwitch; private String logtime; diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceDataListController.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceDataListController.java index 09d3c0d..0f13e84 100644 --- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceDataListController.java +++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceDataListController.java @@ -1,13 +1,8 @@ package com.casic.missiles.modular.system.controller; -import cn.hutool.core.collection.CollectionUtil; -import com.baomidou.mybatisplus.core.metadata.OrderItem; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.casic.missiles.core.application.context.AbstractPermissionContext; import com.casic.missiles.core.datascope.DataScope; -import com.casic.missiles.core.page.PageFactory; import com.casic.missiles.model.response.ResponseData; -import com.casic.missiles.modular.system.dto.ExcelModel.*; import com.casic.missiles.modular.system.dto.statistic.*; import com.casic.missiles.modular.system.service.DeviceDataListService; import lombok.extern.slf4j.Slf4j; @@ -27,92 +22,88 @@ // @Permission @GetMapping(value = "/welldata/list") - public Object wellDataList(String keywords, String deptid, String beginTime, String endTime) { + public Object wellDataList(String devcode, String wellCode, String beginTime, String endTime) { //查询数据权限 使用默认DEPTID 字段 DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope(); - List list = deviceDataListService.selectWellDataScope(dataScope, deptid, beginTime, endTime, keywords); - + List list = deviceDataListService.selectWellDataScope(dataScope, devcode, beginTime, endTime, wellCode); return ResponseData.success(list); } - /** * 开挖监测仪数据查询 * - * @param keywords - * @param deptid + * @param devcode + * @param wellCode * @param beginTime * @param endTime * @return */ - // @Permission + //@Permission @GetMapping(value = "/digdata/list") - public Object digDataList(String keywords, String deptid, String beginTime, String endTime) { + public Object digDataList(String devcode, String wellCode, String beginTime, String endTime) { DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope(); - List mapList = deviceDataListService.selectDigDataScope(dataScope, deptid, beginTime, endTime, keywords); + List mapList = deviceDataListService.selectDigDataScope(dataScope, devcode, beginTime, endTime, wellCode); return ResponseData.success(mapList); } @GetMapping(value = "/liquiddata/list") -// @Permission - public Object liquidDataList(String keywords, String deptid, String beginTime, String endTime) { + //@Permission + public Object liquidDataList(String devcode, String wellCode, String beginTime, String endTime) { //查询数据权限 使用默认DEPTID 字段 DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope(); - List list = deviceDataListService.selectLiquidDataScope(dataScope, deptid, beginTime, endTime, keywords); + List list = deviceDataListService.selectLiquidDataScope(dataScope, devcode, beginTime, endTime, wellCode); return ResponseData.success(list); } @GetMapping(value = "/gasdata/list") - //@Permission - public Object gasDataList(String keywords, String deptid, String beginTime, String endTime) { + public Object gasDataList(String devcode, String wellCode, String beginTime, String endTime) { DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope(); - List deviceDataExcelDtoList = deviceDataListService.selectGasDataScope(dataScope, deptid, beginTime, endTime, keywords); + List deviceDataExcelDtoList = deviceDataListService.selectGasDataScope(dataScope, devcode, beginTime, endTime, wellCode); return ResponseData.success(deviceDataExcelDtoList); } @GetMapping(value = "/noisedata/list") - public Object noiseDataList(String keywords, String deptid, String beginTime, String endTime) { + public Object noiseDataList(String devcode, String wellCode, String beginTime, String endTime) { DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope(); - List mapList = deviceDataListService.selectNoiseDataScope(dataScope, deptid, beginTime, endTime, keywords); + List mapList = deviceDataListService.selectNoiseDataScope(dataScope, devcode, beginTime, endTime, wellCode); return ResponseData.success(mapList); } @GetMapping(value = "/harmfuldata/list") - public Object harmfulDataList(String keywords, String deptid, String beginTime, String endTime) { + public Object harmfulDataList(String devcode, String wellCode, String beginTime, String endTime) { DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope(); - List mapList = deviceDataListService.selectHarmfulDataScope(dataScope, deptid, beginTime, endTime, keywords); + List mapList = deviceDataListService.selectHarmfulDataScope(dataScope, devcode, beginTime, endTime, wellCode); return ResponseData.success(mapList); } @GetMapping(value = "/tempdata/list") - public Object tempDataList(String keywords, String deptid, String beginTime, String endTime) { + public Object tempDataList(String devcode, String wellCode, String beginTime, String endTime) { DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope(); - List mapList = deviceDataListService.selectTempDataScope(dataScope, deptid, beginTime, endTime, keywords); + List mapList = deviceDataListService.selectTempDataScope(dataScope, devcode, beginTime, endTime, wellCode); return ResponseData.success(mapList); } - @GetMapping(value = "/welllocadata/list") - public Object wellLocDataList(String keywords, String deptid, String beginTime, String endTime) { + public Object wellLocDataList(String devcode, String wellCode, String beginTime, String endTime) { DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope(); - List mapList = deviceDataListService.selectWellLocDataScope(dataScope, deptid, beginTime, endTime, keywords); + List mapList = deviceDataListService.selectWellLocDataScope(dataScope, devcode, beginTime, endTime, wellCode); return ResponseData.success(mapList); } @GetMapping(value = "/liquidGasData/list") - public Object liquidGasDataList(String keywords, String deptid, String sensorType, String beginTime, String endTime) { + public Object liquidGasDataList(String devcode, String wellCode, String sensorType, String beginTime, String endTime) { DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope(); - List mapList = deviceDataListService.selectGasLiquidDataScope(dataScope, sensorType, deptid, beginTime, endTime, keywords); + List mapList = deviceDataListService.selectGasLiquidDataScope(dataScope, sensorType, devcode, beginTime, endTime, wellCode); return ResponseData.success(mapList); } @GetMapping(value = "/tubedata/list") //@Permission - public Object tubeDataList(String keywords, String deptid, String beginTime, String endTime) { + public Object tubeDataList(String devcode, String wellCode, String beginTime, String endTime) { DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope(); - List mapList = deviceDataListService.selectTubeDataScope(dataScope, deptid, beginTime, endTime, keywords); + List mapList = deviceDataListService.selectTubeDataScope(dataScope, devcode, beginTime, endTime, wellCode); return ResponseData.success(mapList); } @@ -120,23 +111,20 @@ * 消防栓列表 */ @GetMapping(value = "/hydrant/list") - public Object hydrantList(String keywords, String deptid, String beginTime, String endTime) { + public Object hydrantList(String devcode, String wellCode, String beginTime, String endTime) { DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope(); - List mapList= deviceDataListService.getHydrantlist(dataScope, deptid, beginTime, endTime, keywords); + List mapList= deviceDataListService.getHydrantlist(dataScope, devcode, beginTime, endTime, wellCode); return ResponseData.success(mapList); } - /** * 硫化氢列表 */ @GetMapping(value = "/h2s/list") - public Object h2sList(String keywords, String deptid, String beginTime, String endTime) { + public Object h2sList(String devcode, String wellCode, String beginTime, String endTime) { DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope(); - System.out.println(keywords); - List mapList= deviceDataListService.getH2sDataScope(dataScope, deptid, beginTime, endTime, keywords); + List mapList= deviceDataListService.getH2sDataScope(dataScope, devcode, beginTime, endTime, wellCode); return ResponseData.success(mapList); } - } diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java index 837e653..3d7ae31 100644 --- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java +++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java @@ -623,9 +623,9 @@ */ @GetMapping(value = "/h2s/list-page") public Object h2sList(String keywords, String deptid, String beginTime, String endTime) { - Page page = PageFactory.defaultPage(); + Page page = PageFactory.defaultPage(); DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope(); - ResponseData responseData = deviceService.getH2slist(dataScope, page, deptid, beginTime, endTime, keywords); + ResponseData responseData = deviceService.getH2slist(dataScope, page, keywords, beginTime, endTime, deptid); responseData.setData(super.packForBT(page)); return responseData; } @@ -634,10 +634,10 @@ */ @GetMapping(value = "/h2s/export") public void h2sExport(String keywords, String deptid, String beginTime, String endTime) throws IOException { - Page page = PageFactory.defaultPage(); + Page page = PageFactory.defaultPage(); DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope(); deviceService.getH2slist(dataScope, page, deptid, beginTime, endTime, keywords); - super.exportExcel(DataH2s.class, page.getRecords(), DeviceExportEnum.HYDRANT_EXPORT.getFileName()); + super.exportExcel(H2SDataDto.class, page.getRecords(), DeviceExportEnum.H2S_EXPORT.getFileName()); } } diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/DataAnalysisMapper.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/DataAnalysisMapper.java index ab62e2e..67fb9c9 100644 --- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/DataAnalysisMapper.java +++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/DataAnalysisMapper.java @@ -97,6 +97,6 @@ List getHydrantlist(@Param("dataScope") DataScope dataScope,@Param("page")Page page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords); - List selectH2sListDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page")Page page, @Param("deptid") String deptid, - @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords); + List selectH2sListDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page")Page page, @Param("keywords") String keywords, + @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("deptid") String deptid); } diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/DeviceDataListMapper.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/DeviceDataListMapper.java index 7114492..732dcc6 100644 --- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/DeviceDataListMapper.java +++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/DeviceDataListMapper.java @@ -19,29 +19,30 @@ * @since 2019-05-13 */ public interface DeviceDataListMapper extends BaseMapper { - List selectWellDataScope(@Param("dataScope") DataScope dataScope, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords); + List selectWellDataScope(@Param("dataScope") DataScope dataScope, @Param("devcode") String devcode, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("wellCode") String wellCode); - List selectDigDataScope(@Param("dataScope") DataScope dataScope, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords); + List selectDigDataScope(@Param("dataScope") DataScope dataScope, @Param("devcode") String devcode, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("wellCode") String wellCode); - List selectLiquidDataScope(@Param("dataScope") DataScope dataScope, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords); + List selectLiquidDataScope(@Param("dataScope") DataScope dataScope, @Param("devcode") String devcode, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("wellCode") String wellCode); - List selectGasDataScope(@Param("dataScope") DataScope dataScope, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords); + List selectGasDataScope(@Param("dataScope") DataScope dataScope, @Param("devcode") String devcode, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("wellCode") String wellCode); - List selectNoiseDataScope(@Param("dataScope") DataScope dataScope, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords); + List selectNoiseDataScope(@Param("dataScope") DataScope dataScope, @Param("devcode") String devcode, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("wellCode") String wellCode); - List selectHarmfulDataScope(@Param("dataScope") DataScope dataScope, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords); + List selectHarmfulDataScope(@Param("dataScope") DataScope dataScope, @Param("devcode") String devcode, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("wellCode") String wellCode); - List selectTempDataScope(@Param("dataScope") DataScope dataScope, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords); + List selectTempDataScope(@Param("dataScope") DataScope dataScope, @Param("devcode") String devcode, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("wellCode") String wellCode); - List selectWellLocDataScope(@Param("dataScope") DataScope dataScope, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords); + List selectWellLocDataScope(@Param("dataScope") DataScope dataScope, @Param("devcode") String devcode, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("wellCode") String wellCode); - List selectGasLiquidDataLiquidScope(@Param("dataScope") DataScope dataScope, @Param("deptIds") List deptIds, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords); + List selectGasLiquidDataLiquidScope(@Param("dataScope") DataScope dataScope, @Param("devcode")String devcode, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("wellCode") String wellCode); - List selectGasLiquidDataGasScope(@Param("dataScope") DataScope dataScope, @Param("deptIds") List deptIds, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords); + List selectGasLiquidDataGasScope(@Param("dataScope") DataScope dataScope, @Param("devcode")String devcode, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("wellCode") String wellCode); - List selectTubeDataScope(@Param("dataScope") DataScope dataScope, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords); + List selectTubeDataScope(@Param("dataScope") DataScope dataScope, @Param("devcode") String devcode, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("wellCode") String wellCode); - List getHydrantlist(@Param("dataScope") DataScope dataScope, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords); + List getHydrantlist(@Param("dataScope") DataScope dataScope, @Param("devcode") String devcode, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("wellCode") String wellCode); - List selectH2sListDataScope(@Param("dataScope") DataScope dataScope, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords); + List selectH2sListDataScope(@Param("dataScope") DataScope dataScope, @Param("devcode") String devcode, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("wellCode") String wellCode); + } diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/DataAnalysisMapper.xml b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/DataAnalysisMapper.xml index a0117ca..6ed130a 100644 --- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/DataAnalysisMapper.xml +++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/DataAnalysisMapper.xml @@ -1255,7 +1255,6 @@ - SELECT dh2s.DEVCODE AS devcode, dh2s.WELL_CODE AS "wellCode", - dh2s.STRENGTH, - dh2s.CELL, + dh2s.STRENGTH AS strength, + dh2s.CELL AS cell, AS uptime, - dh2s.device_type as deviceType + + + + AS logtime, + bdt.TYPE_NAME AS "deviceTypeName", + bd.device_type as deviceType, + bwi.DEPTID AS deptid FROM data_h2s dh2s JOIN bus_well_info bwi ON bwi.WELL_CODE= dh2s.WELL_CODE JOIN bus_device bd ON dh2s.DEVCODE = bd.DEVCODE + LEFT JOIN base_device_type bdt ON bd.DEVICE_TYPE = bdt.ID bd.VALID = '1' AND bwi.VALID = '1' @@ -1323,11 +1329,9 @@ - and (dh2s.DEVCODE like + AND (bd.DEVCODE LIKE - OR dh2s.WELL_CODE LIKE - - ) + OR bd.WELL_CODE LIKE) diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceDataListMapper.xml b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceDataListMapper.xml index adc10af..7010493 100644 --- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceDataListMapper.xml +++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceDataListMapper.xml @@ -107,17 +107,17 @@ - as "LOGTIME", - DESCN, - STATUS + as "logtime", + DESCN as descn, + STATUS as status FROM data_wellcover dw INNER JOIN bus_well_info bwi on dw.WELL_CODE = bwi.WELL_CODE INNER JOIN bus_device bd ON dw.DEVCODE = bd.DEVCODE bd.VALID = '1' AND bwi.VALID = '1' - - and bwi.DEPTID = #{deptid} + + AND dw.DEVCODE = #{devcode} and dw.LOGTIME = ]]> @@ -131,12 +131,8 @@ - - and (dw.DEVCODE like - - OR dw.WELL_CODE LIKE - - ) + + AND dw.WELL_CODE = #{wellCode} ORDER BY LOGTIME DESC @@ -164,76 +160,64 @@ INNER JOIN bus_device bd ON dd.DEVCODE = bd.DEVCODE bd.VALID = '1' AND bwi.VALID = '1' - - and bwi.DEPTID = #{deptid} + + AND dd.DEVCODE = #{devcode} - and dd.UPTIME = ]]> + AND dd.UPTIME = ]]> - and dd.UPTIME + AND dd.UPTIME - - and (dd.DEVCODE like - - OR dd.WELL_CODE LIKE - - ) + + AND dd.WELL_CODE = #{wellCode} ORDER BY dd.UPTIME DESC - - - - @@ -257,8 +241,11 @@ INNER JOIN bus_device bd ON dg.DEVCODE = bd.DEVCODE bd.VALID = '1' AND bwi.VALID = '1' - - and bwi.DEPTID = #{deptid} + + AND dg.DEVCODE = #{devcode} + + + AND dg.WELL_CODE = #{wellCode} and dg.UPTIME = ]]> @@ -272,18 +259,10 @@ - - and (dg.DEVCODE like - - OR dg.WELL_CODE LIKE - - ) - ORDER BY dg.UPTIME DESC - @@ -353,8 +328,11 @@ INNER JOIN bus_device bd ON dth.DEVCODE = bd.DEVCODE bd.VALID = '1' AND bwi.VALID = '1' - - and bwi.DEPTID = #{deptid} + + AND dth.DEVCODE = #{devcode} + + + AND dth.WELL_CODE = #{wellCode} and dth.UPTIME = ]]> @@ -368,13 +346,6 @@ - - and (dth.DEVCODE like - - OR dth.WELL_CODE LIKE - - ) - ORDER BY dth.UPTIME DESC @@ -399,8 +370,11 @@ INNER JOIN bus_device bd ON dn.DEVCODE = bd.DEVCODE bd.VALID = '1' AND bwi.VALID = '1' - - and bwi.DEPTID = #{deptid} + + AND dn.DEVCODE = #{devcode} + + + AND dn.WELL_CODE = #{wellCode} and dn.UPTIME = ]]> @@ -414,13 +388,6 @@ - - and (dn.DEVCODE like - - OR dn.WELL_CODE LIKE - - ) - ORDER BY dn.UPTIME DESC @@ -446,8 +413,11 @@ INNER JOIN bus_device bd ON dwl.DEVCODE = bd.DEVCODE bd.VALID = '1' AND bwi.VALID = '1' - - and bwi.DEPTID = #{deptid} + + AND dwl.DEVCODE = #{devcode} + + + AND dwl.WELL_CODE = #{wellCode} and dwl.UPTIME = ]]> @@ -461,125 +431,104 @@ - - and (dwl.DEVCODE like - - OR dwl.WELL_CODE LIKE - - ) - ORDER BY dwl.UPTIME DESC - + @@ -639,14 +583,17 @@ AS logtime, - dh.DESCN AS descn + dh.DESCN AS descn FROM data_hydrant dh JOIN bus_well_info bwi ON bwi.WELL_CODE= dh.WELL_CODE JOIN bus_device bd ON dh.DEVCODE = bd.DEVCODE bd.VALID = '1' AND bwi.VALID = '1' - - and bwi.DEPTID = #{deptid} + + AND dh.DEVCODE = #{devcode} + + + AND dh.WELL_CODE = #{wellCode} and dh.LOGTIME = ]]> @@ -660,13 +607,6 @@ - - and (dh.DEVCODE like - - OR dh.WELL_CODE LIKE - - ) - @@ -681,14 +621,17 @@ AS uptime, bwi.deptid, - dh2s.device_type as deviceType + bd.device_type as deviceType FROM data_h2s dh2s JOIN bus_well_info bwi ON bwi.WELL_CODE= dh2s.WELL_CODE JOIN bus_device bd ON dh2s.DEVCODE = bd.DEVCODE bd.VALID = '1' AND bwi.VALID = '1' - - and bwi.DEPTID = #{deptid} + + AND dh2s.DEVCODE = #{devcode} + + + AND dh2s.WELL_CODE = #{wellCode} and dh2s.UPTIME = ]]> @@ -702,13 +645,6 @@ - - and (dh2s.DEVCODE like - - OR dh2s.WELL_CODE LIKE - - ) - diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/DeviceDataListService.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/DeviceDataListService.java index 698a8ea..9bfe937 100644 --- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/DeviceDataListService.java +++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/DeviceDataListService.java @@ -19,46 +19,46 @@ /** * 开挖监测仪数据查询 */ - List selectDigDataScope(DataScope dataScope, String deptid, String beginTime, String endTime, String keywords); + List selectDigDataScope(DataScope dataScope, String devcode, String beginTime, String endTime, String wellCode); /** * 根据条件检索井盖监测数据列表 */ - List selectWellDataScope(DataScope dataScope, String deptid, String beginTime, String endTime, String keywords); + List selectWellDataScope(DataScope dataScope, String devcode, String beginTime, String endTime, String wellCode); /** * 根据检索条件查询液位检测数据 */ - List selectLiquidDataScope(DataScope dataScope, String deptid, String beginTime, String endTime, String keywords); + List selectLiquidDataScope(DataScope dataScope, String devcode, String beginTime, String endTime, String wellCode); /** * 燃气数据查询 */ - List selectGasDataScope(DataScope dataScope, String deptid, String beginTime, String endTime, String keywords); + List selectGasDataScope(DataScope dataScope, String devcode, String beginTime, String endTime, String wellCode); /** * 噪声记录仪数据查询 */ - List selectNoiseDataScope(DataScope dataScope, String deptid, String beginTime, String endTime, String keywords); + List selectNoiseDataScope(DataScope dataScope, String devcode, String beginTime, String endTime, String wellCode); /** * 有害气体数据查询 */ - List selectHarmfulDataScope(DataScope dataScope, String deptid, String beginTime, String endTime, String keywords); + List selectHarmfulDataScope(DataScope dataScope, String devcode, String beginTime, String endTime, String wellCode); /** * 温湿度数据查询 */ - List selectTempDataScope(DataScope dataScope, String deptid, String beginTime, String endTime, String keywords); + List selectTempDataScope(DataScope dataScope, String devcode, String beginTime, String endTime, String wellCode); /** * 井盖定位监测仪数据查询 */ - List selectWellLocDataScope(DataScope dataScope, String deptid, String beginTime, String endTime, String keywords); + List selectWellLocDataScope(DataScope dataScope, String devcode, String beginTime, String endTime, String wellCode); - List selectGasLiquidDataScope(DataScope dataScope, String sensorType, String deptid, String beginTime, String endTime, String keywords); + List selectGasLiquidDataScope(DataScope dataScope, String sensorType, String devcode, String beginTime, String endTime, String wellCode); /** * 管盯数据查询 */ - List selectTubeDataScope(DataScope dataScope, String deptid, String beginTime, String endTime, String keywords); + List selectTubeDataScope(DataScope dataScope, String devcode, String beginTime, String endTime, String wellCode); - List getHydrantlist(DataScope dataScope, String deptid, String beginTime, String endTime, String keywords); + List getHydrantlist(DataScope dataScope, String devcode, String beginTime, String endTime, String wellCode); - List getH2sDataScope(DataScope dataScope, String deptid, String beginTime, String endTime, String keywords); + List getH2sDataScope(DataScope dataScope, String devcode, String beginTime, String endTime, String wellCode); } \ No newline at end of file diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/IDataAnalysisService.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/IDataAnalysisService.java index d09c12e..a75ed02 100644 --- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/IDataAnalysisService.java +++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/IDataAnalysisService.java @@ -126,5 +126,5 @@ ResponseData getHydrantlist(DataScope dataScope, Page page, String deptid, String beginTime, String endTime, String keywords); - ResponseData getH2slist(DataScope dataScope, Page page, String deptid, String beginTime, String endTime, String keywords); + ResponseData getH2slist(DataScope dataScope, Page page, String keywords, String beginTime, String endTime, String deptid); } diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceDataListServiceImpl.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceDataListServiceImpl.java index 95baa10..5abf45c 100644 --- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceDataListServiceImpl.java +++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceDataListServiceImpl.java @@ -37,81 +37,76 @@ private AbstractPermissionContext permissionService; @Override - public List selectWellDataScope(DataScope dataScope, String deptid, String beginTime, String endTime, String keywords) { - return this.baseMapper.selectWellDataScope(dataScope, deptid, beginTime, endTime, keywords); + public List selectWellDataScope(DataScope dataScope, String devcode, String beginTime, String endTime, String wellCode){ + return this.baseMapper.selectWellDataScope(dataScope, devcode, beginTime, endTime, wellCode); } @Override - public List selectDigDataScope(DataScope dataScope, String deptid, String beginTime, String endTime, String keywords) { - return this.baseMapper.selectDigDataScope(dataScope, deptid, beginTime, endTime, keywords); + public List selectDigDataScope(DataScope dataScope, String devcode, String beginTime, String endTime, String wellCode) { + return this.baseMapper.selectDigDataScope(dataScope, devcode, beginTime, endTime, wellCode); } @Override - public List selectLiquidDataScope(DataScope dataScope, String deptid, String beginTime, String endTime, String keywords) { - return this.baseMapper.selectLiquidDataScope(dataScope, deptid, beginTime, endTime, keywords); + public List selectLiquidDataScope(DataScope dataScope, String devcode, String beginTime, String endTime, String wellCode) { + return this.baseMapper.selectLiquidDataScope(dataScope, devcode, beginTime, endTime, wellCode); } @Override - public List selectGasDataScope(DataScope dataScope, String deptid, String beginTime, String endTime, String keywords) { - return this.baseMapper.selectGasDataScope(dataScope, deptid, beginTime, endTime, keywords); + public List selectGasDataScope(DataScope dataScope, String devcode, String beginTime, String endTime, String wellCode) { + return this.baseMapper.selectGasDataScope(dataScope, devcode, beginTime, endTime, wellCode); } @Override - public List selectNoiseDataScope(DataScope dataScope, String deptid, String beginTime, String endTime, String keywords) { - return this.baseMapper.selectNoiseDataScope(dataScope, deptid, beginTime, endTime, keywords); + public List selectNoiseDataScope(DataScope dataScope, String devcode, String beginTime, String endTime, String wellCode) { + return this.baseMapper.selectNoiseDataScope(dataScope, devcode, beginTime, endTime, wellCode); } @Override - public List selectHarmfulDataScope(DataScope dataScope, String deptid, String beginTime, String endTime, String keywords) { - return this.baseMapper.selectHarmfulDataScope(dataScope, deptid, beginTime, endTime, keywords); + public List selectHarmfulDataScope(DataScope dataScope, String devcode, String beginTime, String endTime, String wellCode){ + return this.baseMapper.selectHarmfulDataScope(dataScope, devcode, beginTime, endTime, wellCode); } @Override - public List selectTempDataScope(DataScope dataScope, String deptid, String beginTime, String endTime, String keywords) { - return this.baseMapper.selectTempDataScope(dataScope, deptid, beginTime, endTime, keywords); + public List selectTempDataScope(DataScope dataScope, String devcode, String beginTime, String endTime, String wellCode){ + return this.baseMapper.selectTempDataScope(dataScope, devcode, beginTime, endTime, wellCode); } @Override - public List selectWellLocDataScope(DataScope dataScope, String deptid, String beginTime, String endTime, String keywords) { - List mapList = this.baseMapper.selectWellLocDataScope(dataScope, deptid, beginTime, endTime, keywords); + public List selectWellLocDataScope(DataScope dataScope, String devcode, String beginTime, String endTime, String wellCode) { + List mapList = this.baseMapper.selectWellLocDataScope(dataScope, devcode, beginTime, endTime, wellCode); return mapList; } @Override - public List selectGasLiquidDataScope(DataScope dataScope, String sensorType, String deptid, String beginTime, String endTime, String keywords) { - List deptIds = null; - if (StrUtil.isNotEmpty(deptid)) { - deptIds = permissionService.getDeptService().getIdsByPid(deptid, null); - deptIds.add(Long.valueOf(deptid)); - } + public List selectGasLiquidDataScope(DataScope dataScope, String sensorType, String devcode, String beginTime, String endTime, String wellCode) { List dataGasLiquidList = new ArrayList<>(); if ("liquid".equals(sensorType)) { - dataGasLiquidList = this.baseMapper.selectGasLiquidDataLiquidScope(dataScope, deptIds, beginTime, endTime, keywords); + dataGasLiquidList = this.baseMapper.selectGasLiquidDataLiquidScope(dataScope, devcode, beginTime, endTime, wellCode); } if ("gas".equals(sensorType)) { - dataGasLiquidList = this.baseMapper.selectGasLiquidDataGasScope(dataScope, deptIds, beginTime, endTime, keywords); + dataGasLiquidList = this.baseMapper.selectGasLiquidDataGasScope(dataScope, devcode, beginTime, endTime, wellCode); } System.out.println(dataGasLiquidList); return dataGasLiquidList; } @Override - public List selectTubeDataScope(DataScope dataScope, String deptid, String beginTime, String endTime, String keywords) { - List mapList = this.baseMapper.selectTubeDataScope(dataScope, deptid, beginTime, endTime, keywords); + public List selectTubeDataScope(DataScope dataScope, String devcode, String beginTime, String endTime, String wellCode){ + List mapList = this.baseMapper.selectTubeDataScope(dataScope, devcode, beginTime, endTime, wellCode); return mapList; } @Override - public List getHydrantlist(DataScope dataScope, String deptid, String beginTime, String endTime, String keywords) { - List mapList = this.baseMapper.getHydrantlist(dataScope, deptid, beginTime, endTime, keywords); + public List getHydrantlist(DataScope dataScope, String devcode, String beginTime, String endTime, String wellCode){ + List mapList = this.baseMapper.getHydrantlist(dataScope, devcode, beginTime, endTime, wellCode); return mapList; } @Override - public List getH2sDataScope(DataScope dataScope, String deptid, String beginTime, String endTime, String keywords) { - return this.baseMapper.selectH2sListDataScope(dataScope, deptid, beginTime, endTime, keywords); + public List getH2sDataScope(DataScope dataScope, String devcode, String beginTime, String endTime, String wellCode) { + return this.baseMapper.selectH2sListDataScope(dataScope, devcode, beginTime, endTime, wellCode); } } diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/IDataAnalysisServiceImpl.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/IDataAnalysisServiceImpl.java index 9ae5886..5b03b61 100644 --- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/IDataAnalysisServiceImpl.java +++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/IDataAnalysisServiceImpl.java @@ -559,16 +559,19 @@ return responseData; } - public ResponseData getH2slist(DataScope dataScope, Page page, String deptid, String beginTime, String endTime, String keywords) { + public ResponseData getH2slist(DataScope dataScope, Page page, String keywords, String beginTime, String endTime, String deptid){ ResponseData responseData = new ResponseData(); try { - List h2sDataDtoList = this.baseMapper.selectH2sListDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords); + List h2sDataDtoList = this.baseMapper.selectH2sListDataScopePage(dataScope, page, keywords, beginTime, endTime, deptid); + h2sDataDtoList.forEach( + h2sDataDto->h2sDataDto.setDeptName(permissionService.getDeptService().getDeptName(h2sDataDto.getDeptid())) + ); page.setRecords(h2sDataDtoList); responseData.setData(page); responseData.setCode(200); responseData.setMessage("查询成功"); } catch (DataAccessException dex) { - log.error("主题：硫化氢数据库异常，关键字{}，开始时间{}，结束时间{}，部门编号{}，异常信息", + log.error("主题：硫化氢数据库异常，关键字{}，开始时间{}，结束时间{}，部门编号{}，异常信息{}", keywords, beginTime, endTime, deptid, dex); responseData.setCode(500); responseData.setMessage("数据库查询异常"); diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/H2SDataDto.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/H2SDataDto.java new file mode 100644 index 0000000..8771495 --- /dev/null +++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/H2SDataDto.java @@ -0,0 +1,53 @@ +package com.casic.missiles.modular.system.dto.ExcelModel; + +import com.alibaba.excel.annotation.ExcelProperty; +import com.alibaba.excel.annotation.write.style.ColumnWidth; +import com.alibaba.excel.annotation.write.style.ContentRowHeight; +import com.alibaba.excel.annotation.write.style.ContentStyle; +import com.alibaba.excel.annotation.write.style.HeadRowHeight; +import com.alibaba.excel.enums.poi.BorderStyleEnum; +import lombok.Data; +import lombok.NoArgsConstructor; + +/** + * 氢硫酸 + * + * @author cz + * @date 2022-07-28 + */ +@ColumnWidth(30) +@HeadRowHeight(15) +@ContentRowHeight(20) +@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) +@Data +@NoArgsConstructor +public class H2SDataDto { + @ExcelProperty("设备编号") + private String devcode; + + @ExcelProperty("点位编号") + private String wellCode; + + @ExcelProperty("设备类型") + private String deviceType; + + @ExcelProperty("设备类型") + private String deviceTypeName; + + private String deptid; + + @ExcelProperty("权属部门") + private String deptName; + + @ExcelProperty("硫化氢浓度") + private String strength; + + @ExcelProperty("电量") + private String cell; + + @ExcelProperty("采集时间") + private String logtime; + @ExcelProperty("记录时间") + private String uptime; + +} diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/statistic/DataGasLiquid.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/statistic/DataGasLiquid.java index ad3eca0..c24a391 100644 --- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/statistic/DataGasLiquid.java +++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/statistic/DataGasLiquid.java @@ -9,7 +9,7 @@ private String liquiddata; private String cell; private String strength; - private String logTime; - private String upTime; + private String logtime; + private String uptime; } diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/statistic/DataH2s.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/statistic/DataH2s.java index b7ce91a..993a9b3 100644 --- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/statistic/DataH2s.java +++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/statistic/DataH2s.java @@ -9,12 +9,7 @@ import lombok.Data; import lombok.NoArgsConstructor; -@ColumnWidth(30) -@HeadRowHeight(15) -@ContentRowHeight(20) -@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) @Data -@NoArgsConstructor public class DataH2s { @ExcelProperty("设备编号") private String devcode; diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/statistic/DataHarmfulGas.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/statistic/DataHarmfulGas.java index a483d73..3c20b8b 100644 --- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/statistic/DataHarmfulGas.java +++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/statistic/DataHarmfulGas.java @@ -1,14 +1,19 @@ package com.casic.missiles.modular.system.dto.statistic; +import com.alibaba.fastjson.annotation.JSONField; import lombok.Data; @Data public class DataHarmfulGas { private String devcode; + @JSONField(name="CO") private String CO; + @JSONField(name="CH4") private String CH4; + @JSONField(name="H2S") private String H2S; + @JSONField(name="O2") private String O2; private String liquidSwitch; private String logtime; diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/statistic/DataHydrant.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/statistic/DataHydrant.java index 3685e90..530ae58 100644 --- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/statistic/DataHydrant.java +++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/statistic/DataHydrant.java @@ -8,5 +8,5 @@ private String wellCode; private String status; private String descn; - private String logTime; + private String logtime; } diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceDataListController.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceDataListController.java index 09d3c0d..0f13e84 100644 --- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceDataListController.java +++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceDataListController.java @@ -1,13 +1,8 @@ package com.casic.missiles.modular.system.controller; -import cn.hutool.core.collection.CollectionUtil; -import com.baomidou.mybatisplus.core.metadata.OrderItem; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.casic.missiles.core.application.context.AbstractPermissionContext; import com.casic.missiles.core.datascope.DataScope; -import com.casic.missiles.core.page.PageFactory; import com.casic.missiles.model.response.ResponseData; -import com.casic.missiles.modular.system.dto.ExcelModel.*; import com.casic.missiles.modular.system.dto.statistic.*; import com.casic.missiles.modular.system.service.DeviceDataListService; import lombok.extern.slf4j.Slf4j; @@ -27,92 +22,88 @@ // @Permission @GetMapping(value = "/welldata/list") - public Object wellDataList(String keywords, String deptid, String beginTime, String endTime) { + public Object wellDataList(String devcode, String wellCode, String beginTime, String endTime) { //查询数据权限 使用默认DEPTID 字段 DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope(); - List list = deviceDataListService.selectWellDataScope(dataScope, deptid, beginTime, endTime, keywords); - + List list = deviceDataListService.selectWellDataScope(dataScope, devcode, beginTime, endTime, wellCode); return ResponseData.success(list); } - /** * 开挖监测仪数据查询 * - * @param keywords - * @param deptid + * @param devcode + * @param wellCode * @param beginTime * @param endTime * @return */ - // @Permission + //@Permission @GetMapping(value = "/digdata/list") - public Object digDataList(String keywords, String deptid, String beginTime, String endTime) { + public Object digDataList(String devcode, String wellCode, String beginTime, String endTime) { DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope(); - List mapList = deviceDataListService.selectDigDataScope(dataScope, deptid, beginTime, endTime, keywords); + List mapList = deviceDataListService.selectDigDataScope(dataScope, devcode, beginTime, endTime, wellCode); return ResponseData.success(mapList); } @GetMapping(value = "/liquiddata/list") -// @Permission - public Object liquidDataList(String keywords, String deptid, String beginTime, String endTime) { + //@Permission + public Object liquidDataList(String devcode, String wellCode, String beginTime, String endTime) { //查询数据权限 使用默认DEPTID 字段 DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope(); - List list = deviceDataListService.selectLiquidDataScope(dataScope, deptid, beginTime, endTime, keywords); + List list = deviceDataListService.selectLiquidDataScope(dataScope, devcode, beginTime, endTime, wellCode); return ResponseData.success(list); } @GetMapping(value = "/gasdata/list") - //@Permission - public Object gasDataList(String keywords, String deptid, String beginTime, String endTime) { + public Object gasDataList(String devcode, String wellCode, String beginTime, String endTime) { DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope(); - List deviceDataExcelDtoList = deviceDataListService.selectGasDataScope(dataScope, deptid, beginTime, endTime, keywords); + List deviceDataExcelDtoList = deviceDataListService.selectGasDataScope(dataScope, devcode, beginTime, endTime, wellCode); return ResponseData.success(deviceDataExcelDtoList); } @GetMapping(value = "/noisedata/list") - public Object noiseDataList(String keywords, String deptid, String beginTime, String endTime) { + public Object noiseDataList(String devcode, String wellCode, String beginTime, String endTime) { DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope(); - List mapList = deviceDataListService.selectNoiseDataScope(dataScope, deptid, beginTime, endTime, keywords); + List mapList = deviceDataListService.selectNoiseDataScope(dataScope, devcode, beginTime, endTime, wellCode); return ResponseData.success(mapList); } @GetMapping(value = "/harmfuldata/list") - public Object harmfulDataList(String keywords, String deptid, String beginTime, String endTime) { + public Object harmfulDataList(String devcode, String wellCode, String beginTime, String endTime) { DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope(); - List mapList = deviceDataListService.selectHarmfulDataScope(dataScope, deptid, beginTime, endTime, keywords); + List mapList = deviceDataListService.selectHarmfulDataScope(dataScope, devcode, beginTime, endTime, wellCode); return ResponseData.success(mapList); } @GetMapping(value = "/tempdata/list") - public Object tempDataList(String keywords, String deptid, String beginTime, String endTime) { + public Object tempDataList(String devcode, String wellCode, String beginTime, String endTime) { DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope(); - List mapList = deviceDataListService.selectTempDataScope(dataScope, deptid, beginTime, endTime, keywords); + List mapList = deviceDataListService.selectTempDataScope(dataScope, devcode, beginTime, endTime, wellCode); return ResponseData.success(mapList); } - @GetMapping(value = "/welllocadata/list") - public Object wellLocDataList(String keywords, String deptid, String beginTime, String endTime) { + public Object wellLocDataList(String devcode, String wellCode, String beginTime, String endTime) { DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope(); - List mapList = deviceDataListService.selectWellLocDataScope(dataScope, deptid, beginTime, endTime, keywords); + List mapList = deviceDataListService.selectWellLocDataScope(dataScope, devcode, beginTime, endTime, wellCode); return ResponseData.success(mapList); } @GetMapping(value = "/liquidGasData/list") - public Object liquidGasDataList(String keywords, String deptid, String sensorType, String beginTime, String endTime) { + public Object liquidGasDataList(String devcode, String wellCode, String sensorType, String beginTime, String endTime) { DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope(); - List mapList = deviceDataListService.selectGasLiquidDataScope(dataScope, sensorType, deptid, beginTime, endTime, keywords); + List mapList = deviceDataListService.selectGasLiquidDataScope(dataScope, sensorType, devcode, beginTime, endTime, wellCode); return ResponseData.success(mapList); } @GetMapping(value = "/tubedata/list") //@Permission - public Object tubeDataList(String keywords, String deptid, String beginTime, String endTime) { + public Object tubeDataList(String devcode, String wellCode, String beginTime, String endTime) { DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope(); - List mapList = deviceDataListService.selectTubeDataScope(dataScope, deptid, beginTime, endTime, keywords); + List mapList = deviceDataListService.selectTubeDataScope(dataScope, devcode, beginTime, endTime, wellCode); return ResponseData.success(mapList); } @@ -120,23 +111,20 @@ * 消防栓列表 */ @GetMapping(value = "/hydrant/list") - public Object hydrantList(String keywords, String deptid, String beginTime, String endTime) { + public Object hydrantList(String devcode, String wellCode, String beginTime, String endTime) { DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope(); - List mapList= deviceDataListService.getHydrantlist(dataScope, deptid, beginTime, endTime, keywords); + List mapList= deviceDataListService.getHydrantlist(dataScope, devcode, beginTime, endTime, wellCode); return ResponseData.success(mapList); } - /** * 硫化氢列表 */ @GetMapping(value = "/h2s/list") - public Object h2sList(String keywords, String deptid, String beginTime, String endTime) { + public Object h2sList(String devcode, String wellCode, String beginTime, String endTime) { DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope(); - System.out.println(keywords); - List mapList= deviceDataListService.getH2sDataScope(dataScope, deptid, beginTime, endTime, keywords); + List mapList= deviceDataListService.getH2sDataScope(dataScope, devcode, beginTime, endTime, wellCode); return ResponseData.success(mapList); } - } diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java index 837e653..3d7ae31 100644 --- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java +++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java @@ -623,9 +623,9 @@ */ @GetMapping(value = "/h2s/list-page") public Object h2sList(String keywords, String deptid, String beginTime, String endTime) { - Page page = PageFactory.defaultPage(); + Page page = PageFactory.defaultPage(); DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope(); - ResponseData responseData = deviceService.getH2slist(dataScope, page, deptid, beginTime, endTime, keywords); + ResponseData responseData = deviceService.getH2slist(dataScope, page, keywords, beginTime, endTime, deptid); responseData.setData(super.packForBT(page)); return responseData; } @@ -634,10 +634,10 @@ */ @GetMapping(value = "/h2s/export") public void h2sExport(String keywords, String deptid, String beginTime, String endTime) throws IOException { - Page page = PageFactory.defaultPage(); + Page page = PageFactory.defaultPage(); DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope(); deviceService.getH2slist(dataScope, page, deptid, beginTime, endTime, keywords); - super.exportExcel(DataH2s.class, page.getRecords(), DeviceExportEnum.HYDRANT_EXPORT.getFileName()); + super.exportExcel(H2SDataDto.class, page.getRecords(), DeviceExportEnum.H2S_EXPORT.getFileName()); } } diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/DataAnalysisMapper.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/DataAnalysisMapper.java index ab62e2e..67fb9c9 100644 --- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/DataAnalysisMapper.java +++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/DataAnalysisMapper.java @@ -97,6 +97,6 @@ List getHydrantlist(@Param("dataScope") DataScope dataScope,@Param("page")Page page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords); - List selectH2sListDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page")Page page, @Param("deptid") String deptid, - @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords); + List selectH2sListDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page")Page page, @Param("keywords") String keywords, + @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("deptid") String deptid); } diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/DeviceDataListMapper.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/DeviceDataListMapper.java index 7114492..732dcc6 100644 --- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/DeviceDataListMapper.java +++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/DeviceDataListMapper.java @@ -19,29 +19,30 @@ * @since 2019-05-13 */ public interface DeviceDataListMapper extends BaseMapper { - List selectWellDataScope(@Param("dataScope") DataScope dataScope, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords); + List selectWellDataScope(@Param("dataScope") DataScope dataScope, @Param("devcode") String devcode, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("wellCode") String wellCode); - List selectDigDataScope(@Param("dataScope") DataScope dataScope, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords); + List selectDigDataScope(@Param("dataScope") DataScope dataScope, @Param("devcode") String devcode, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("wellCode") String wellCode); - List selectLiquidDataScope(@Param("dataScope") DataScope dataScope, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords); + List selectLiquidDataScope(@Param("dataScope") DataScope dataScope, @Param("devcode") String devcode, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("wellCode") String wellCode); - List selectGasDataScope(@Param("dataScope") DataScope dataScope, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords); + List selectGasDataScope(@Param("dataScope") DataScope dataScope, @Param("devcode") String devcode, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("wellCode") String wellCode); - List selectNoiseDataScope(@Param("dataScope") DataScope dataScope, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords); + List selectNoiseDataScope(@Param("dataScope") DataScope dataScope, @Param("devcode") String devcode, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("wellCode") String wellCode); - List selectHarmfulDataScope(@Param("dataScope") DataScope dataScope, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords); + List selectHarmfulDataScope(@Param("dataScope") DataScope dataScope, @Param("devcode") String devcode, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("wellCode") String wellCode); - List selectTempDataScope(@Param("dataScope") DataScope dataScope, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords); + List selectTempDataScope(@Param("dataScope") DataScope dataScope, @Param("devcode") String devcode, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("wellCode") String wellCode); - List selectWellLocDataScope(@Param("dataScope") DataScope dataScope, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords); + List selectWellLocDataScope(@Param("dataScope") DataScope dataScope, @Param("devcode") String devcode, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("wellCode") String wellCode); - List selectGasLiquidDataLiquidScope(@Param("dataScope") DataScope dataScope, @Param("deptIds") List deptIds, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords); + List selectGasLiquidDataLiquidScope(@Param("dataScope") DataScope dataScope, @Param("devcode")String devcode, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("wellCode") String wellCode); - List selectGasLiquidDataGasScope(@Param("dataScope") DataScope dataScope, @Param("deptIds") List deptIds, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords); + List selectGasLiquidDataGasScope(@Param("dataScope") DataScope dataScope, @Param("devcode")String devcode, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("wellCode") String wellCode); - List selectTubeDataScope(@Param("dataScope") DataScope dataScope, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords); + List selectTubeDataScope(@Param("dataScope") DataScope dataScope, @Param("devcode") String devcode, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("wellCode") String wellCode); - List getHydrantlist(@Param("dataScope") DataScope dataScope, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords); + List getHydrantlist(@Param("dataScope") DataScope dataScope, @Param("devcode") String devcode, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("wellCode") String wellCode); - List selectH2sListDataScope(@Param("dataScope") DataScope dataScope, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords); + List selectH2sListDataScope(@Param("dataScope") DataScope dataScope, @Param("devcode") String devcode, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("wellCode") String wellCode); + } diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/DataAnalysisMapper.xml b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/DataAnalysisMapper.xml index a0117ca..6ed130a 100644 --- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/DataAnalysisMapper.xml +++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/DataAnalysisMapper.xml @@ -1255,7 +1255,6 @@ - SELECT dh2s.DEVCODE AS devcode, dh2s.WELL_CODE AS "wellCode", - dh2s.STRENGTH, - dh2s.CELL, + dh2s.STRENGTH AS strength, + dh2s.CELL AS cell, AS uptime, - dh2s.device_type as deviceType + + + + AS logtime, + bdt.TYPE_NAME AS "deviceTypeName", + bd.device_type as deviceType, + bwi.DEPTID AS deptid FROM data_h2s dh2s JOIN bus_well_info bwi ON bwi.WELL_CODE= dh2s.WELL_CODE JOIN bus_device bd ON dh2s.DEVCODE = bd.DEVCODE + LEFT JOIN base_device_type bdt ON bd.DEVICE_TYPE = bdt.ID bd.VALID = '1' AND bwi.VALID = '1' @@ -1323,11 +1329,9 @@ - and (dh2s.DEVCODE like + AND (bd.DEVCODE LIKE - OR dh2s.WELL_CODE LIKE - - ) + OR bd.WELL_CODE LIKE) diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceDataListMapper.xml b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceDataListMapper.xml index adc10af..7010493 100644 --- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceDataListMapper.xml +++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceDataListMapper.xml @@ -107,17 +107,17 @@ - as "LOGTIME", - DESCN, - STATUS + as "logtime", + DESCN as descn, + STATUS as status FROM data_wellcover dw INNER JOIN bus_well_info bwi on dw.WELL_CODE = bwi.WELL_CODE INNER JOIN bus_device bd ON dw.DEVCODE = bd.DEVCODE bd.VALID = '1' AND bwi.VALID = '1' - - and bwi.DEPTID = #{deptid} + + AND dw.DEVCODE = #{devcode} and dw.LOGTIME = ]]> @@ -131,12 +131,8 @@ - - and (dw.DEVCODE like - - OR dw.WELL_CODE LIKE - - ) + + AND dw.WELL_CODE = #{wellCode} ORDER BY LOGTIME DESC @@ -164,76 +160,64 @@ INNER JOIN bus_device bd ON dd.DEVCODE = bd.DEVCODE bd.VALID = '1' AND bwi.VALID = '1' - - and bwi.DEPTID = #{deptid} + + AND dd.DEVCODE = #{devcode} - and dd.UPTIME = ]]> + AND dd.UPTIME = ]]> - and dd.UPTIME + AND dd.UPTIME - - and (dd.DEVCODE like - - OR dd.WELL_CODE LIKE - - ) + + AND dd.WELL_CODE = #{wellCode} ORDER BY dd.UPTIME DESC - - - - @@ -257,8 +241,11 @@ INNER JOIN bus_device bd ON dg.DEVCODE = bd.DEVCODE bd.VALID = '1' AND bwi.VALID = '1' - - and bwi.DEPTID = #{deptid} + + AND dg.DEVCODE = #{devcode} + + + AND dg.WELL_CODE = #{wellCode} and dg.UPTIME = ]]> @@ -272,18 +259,10 @@ - - and (dg.DEVCODE like - - OR dg.WELL_CODE LIKE - - ) - ORDER BY dg.UPTIME DESC - @@ -353,8 +328,11 @@ INNER JOIN bus_device bd ON dth.DEVCODE = bd.DEVCODE bd.VALID = '1' AND bwi.VALID = '1' - - and bwi.DEPTID = #{deptid} + + AND dth.DEVCODE = #{devcode} + + + AND dth.WELL_CODE = #{wellCode} and dth.UPTIME = ]]> @@ -368,13 +346,6 @@ - - and (dth.DEVCODE like - - OR dth.WELL_CODE LIKE - - ) - ORDER BY dth.UPTIME DESC @@ -399,8 +370,11 @@ INNER JOIN bus_device bd ON dn.DEVCODE = bd.DEVCODE bd.VALID = '1' AND bwi.VALID = '1' - - and bwi.DEPTID = #{deptid} + + AND dn.DEVCODE = #{devcode} + + + AND dn.WELL_CODE = #{wellCode} and dn.UPTIME = ]]> @@ -414,13 +388,6 @@ - - and (dn.DEVCODE like - - OR dn.WELL_CODE LIKE - - ) - ORDER BY dn.UPTIME DESC @@ -446,8 +413,11 @@ INNER JOIN bus_device bd ON dwl.DEVCODE = bd.DEVCODE bd.VALID = '1' AND bwi.VALID = '1' - - and bwi.DEPTID = #{deptid} + + AND dwl.DEVCODE = #{devcode} + + + AND dwl.WELL_CODE = #{wellCode} and dwl.UPTIME = ]]> @@ -461,125 +431,104 @@ - - and (dwl.DEVCODE like - - OR dwl.WELL_CODE LIKE - - ) - ORDER BY dwl.UPTIME DESC - + @@ -639,14 +583,17 @@ AS logtime, - dh.DESCN AS descn + dh.DESCN AS descn FROM data_hydrant dh JOIN bus_well_info bwi ON bwi.WELL_CODE= dh.WELL_CODE JOIN bus_device bd ON dh.DEVCODE = bd.DEVCODE bd.VALID = '1' AND bwi.VALID = '1' - - and bwi.DEPTID = #{deptid} + + AND dh.DEVCODE = #{devcode} + + + AND dh.WELL_CODE = #{wellCode} and dh.LOGTIME = ]]> @@ -660,13 +607,6 @@ - - and (dh.DEVCODE like - - OR dh.WELL_CODE LIKE - - ) - @@ -681,14 +621,17 @@ AS uptime, bwi.deptid, - dh2s.device_type as deviceType + bd.device_type as deviceType FROM data_h2s dh2s JOIN bus_well_info bwi ON bwi.WELL_CODE= dh2s.WELL_CODE JOIN bus_device bd ON dh2s.DEVCODE = bd.DEVCODE bd.VALID = '1' AND bwi.VALID = '1' - - and bwi.DEPTID = #{deptid} + + AND dh2s.DEVCODE = #{devcode} + + + AND dh2s.WELL_CODE = #{wellCode} and dh2s.UPTIME = ]]> @@ -702,13 +645,6 @@ - - and (dh2s.DEVCODE like - - OR dh2s.WELL_CODE LIKE - - ) - diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/DeviceDataListService.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/DeviceDataListService.java index 698a8ea..9bfe937 100644 --- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/DeviceDataListService.java +++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/DeviceDataListService.java @@ -19,46 +19,46 @@ /** * 开挖监测仪数据查询 */ - List selectDigDataScope(DataScope dataScope, String deptid, String beginTime, String endTime, String keywords); + List selectDigDataScope(DataScope dataScope, String devcode, String beginTime, String endTime, String wellCode); /** * 根据条件检索井盖监测数据列表 */ - List selectWellDataScope(DataScope dataScope, String deptid, String beginTime, String endTime, String keywords); + List selectWellDataScope(DataScope dataScope, String devcode, String beginTime, String endTime, String wellCode); /** * 根据检索条件查询液位检测数据 */ - List selectLiquidDataScope(DataScope dataScope, String deptid, String beginTime, String endTime, String keywords); + List selectLiquidDataScope(DataScope dataScope, String devcode, String beginTime, String endTime, String wellCode); /** * 燃气数据查询 */ - List selectGasDataScope(DataScope dataScope, String deptid, String beginTime, String endTime, String keywords); + List selectGasDataScope(DataScope dataScope, String devcode, String beginTime, String endTime, String wellCode); /** * 噪声记录仪数据查询 */ - List selectNoiseDataScope(DataScope dataScope, String deptid, String beginTime, String endTime, String keywords); + List selectNoiseDataScope(DataScope dataScope, String devcode, String beginTime, String endTime, String wellCode); /** * 有害气体数据查询 */ - List selectHarmfulDataScope(DataScope dataScope, String deptid, String beginTime, String endTime, String keywords); + List selectHarmfulDataScope(DataScope dataScope, String devcode, String beginTime, String endTime, String wellCode); /** * 温湿度数据查询 */ - List selectTempDataScope(DataScope dataScope, String deptid, String beginTime, String endTime, String keywords); + List selectTempDataScope(DataScope dataScope, String devcode, String beginTime, String endTime, String wellCode); /** * 井盖定位监测仪数据查询 */ - List selectWellLocDataScope(DataScope dataScope, String deptid, String beginTime, String endTime, String keywords); + List selectWellLocDataScope(DataScope dataScope, String devcode, String beginTime, String endTime, String wellCode); - List selectGasLiquidDataScope(DataScope dataScope, String sensorType, String deptid, String beginTime, String endTime, String keywords); + List selectGasLiquidDataScope(DataScope dataScope, String sensorType, String devcode, String beginTime, String endTime, String wellCode); /** * 管盯数据查询 */ - List selectTubeDataScope(DataScope dataScope, String deptid, String beginTime, String endTime, String keywords); + List selectTubeDataScope(DataScope dataScope, String devcode, String beginTime, String endTime, String wellCode); - List getHydrantlist(DataScope dataScope, String deptid, String beginTime, String endTime, String keywords); + List getHydrantlist(DataScope dataScope, String devcode, String beginTime, String endTime, String wellCode); - List getH2sDataScope(DataScope dataScope, String deptid, String beginTime, String endTime, String keywords); + List getH2sDataScope(DataScope dataScope, String devcode, String beginTime, String endTime, String wellCode); } \ No newline at end of file diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/IDataAnalysisService.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/IDataAnalysisService.java index d09c12e..a75ed02 100644 --- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/IDataAnalysisService.java +++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/IDataAnalysisService.java @@ -126,5 +126,5 @@ ResponseData getHydrantlist(DataScope dataScope, Page page, String deptid, String beginTime, String endTime, String keywords); - ResponseData getH2slist(DataScope dataScope, Page page, String deptid, String beginTime, String endTime, String keywords); + ResponseData getH2slist(DataScope dataScope, Page page, String keywords, String beginTime, String endTime, String deptid); } diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceDataListServiceImpl.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceDataListServiceImpl.java index 95baa10..5abf45c 100644 --- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceDataListServiceImpl.java +++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceDataListServiceImpl.java @@ -37,81 +37,76 @@ private AbstractPermissionContext permissionService; @Override - public List selectWellDataScope(DataScope dataScope, String deptid, String beginTime, String endTime, String keywords) { - return this.baseMapper.selectWellDataScope(dataScope, deptid, beginTime, endTime, keywords); + public List selectWellDataScope(DataScope dataScope, String devcode, String beginTime, String endTime, String wellCode){ + return this.baseMapper.selectWellDataScope(dataScope, devcode, beginTime, endTime, wellCode); } @Override - public List selectDigDataScope(DataScope dataScope, String deptid, String beginTime, String endTime, String keywords) { - return this.baseMapper.selectDigDataScope(dataScope, deptid, beginTime, endTime, keywords); + public List selectDigDataScope(DataScope dataScope, String devcode, String beginTime, String endTime, String wellCode) { + return this.baseMapper.selectDigDataScope(dataScope, devcode, beginTime, endTime, wellCode); } @Override - public List selectLiquidDataScope(DataScope dataScope, String deptid, String beginTime, String endTime, String keywords) { - return this.baseMapper.selectLiquidDataScope(dataScope, deptid, beginTime, endTime, keywords); + public List selectLiquidDataScope(DataScope dataScope, String devcode, String beginTime, String endTime, String wellCode) { + return this.baseMapper.selectLiquidDataScope(dataScope, devcode, beginTime, endTime, wellCode); } @Override - public List selectGasDataScope(DataScope dataScope, String deptid, String beginTime, String endTime, String keywords) { - return this.baseMapper.selectGasDataScope(dataScope, deptid, beginTime, endTime, keywords); + public List selectGasDataScope(DataScope dataScope, String devcode, String beginTime, String endTime, String wellCode) { + return this.baseMapper.selectGasDataScope(dataScope, devcode, beginTime, endTime, wellCode); } @Override - public List selectNoiseDataScope(DataScope dataScope, String deptid, String beginTime, String endTime, String keywords) { - return this.baseMapper.selectNoiseDataScope(dataScope, deptid, beginTime, endTime, keywords); + public List selectNoiseDataScope(DataScope dataScope, String devcode, String beginTime, String endTime, String wellCode) { + return this.baseMapper.selectNoiseDataScope(dataScope, devcode, beginTime, endTime, wellCode); } @Override - public List selectHarmfulDataScope(DataScope dataScope, String deptid, String beginTime, String endTime, String keywords) { - return this.baseMapper.selectHarmfulDataScope(dataScope, deptid, beginTime, endTime, keywords); + public List selectHarmfulDataScope(DataScope dataScope, String devcode, String beginTime, String endTime, String wellCode){ + return this.baseMapper.selectHarmfulDataScope(dataScope, devcode, beginTime, endTime, wellCode); } @Override - public List selectTempDataScope(DataScope dataScope, String deptid, String beginTime, String endTime, String keywords) { - return this.baseMapper.selectTempDataScope(dataScope, deptid, beginTime, endTime, keywords); + public List selectTempDataScope(DataScope dataScope, String devcode, String beginTime, String endTime, String wellCode){ + return this.baseMapper.selectTempDataScope(dataScope, devcode, beginTime, endTime, wellCode); } @Override - public List selectWellLocDataScope(DataScope dataScope, String deptid, String beginTime, String endTime, String keywords) { - List mapList = this.baseMapper.selectWellLocDataScope(dataScope, deptid, beginTime, endTime, keywords); + public List selectWellLocDataScope(DataScope dataScope, String devcode, String beginTime, String endTime, String wellCode) { + List mapList = this.baseMapper.selectWellLocDataScope(dataScope, devcode, beginTime, endTime, wellCode); return mapList; } @Override - public List selectGasLiquidDataScope(DataScope dataScope, String sensorType, String deptid, String beginTime, String endTime, String keywords) { - List deptIds = null; - if (StrUtil.isNotEmpty(deptid)) { - deptIds = permissionService.getDeptService().getIdsByPid(deptid, null); - deptIds.add(Long.valueOf(deptid)); - } + public List selectGasLiquidDataScope(DataScope dataScope, String sensorType, String devcode, String beginTime, String endTime, String wellCode) { List dataGasLiquidList = new ArrayList<>(); if ("liquid".equals(sensorType)) { - dataGasLiquidList = this.baseMapper.selectGasLiquidDataLiquidScope(dataScope, deptIds, beginTime, endTime, keywords); + dataGasLiquidList = this.baseMapper.selectGasLiquidDataLiquidScope(dataScope, devcode, beginTime, endTime, wellCode); } if ("gas".equals(sensorType)) { - dataGasLiquidList = this.baseMapper.selectGasLiquidDataGasScope(dataScope, deptIds, beginTime, endTime, keywords); + dataGasLiquidList = this.baseMapper.selectGasLiquidDataGasScope(dataScope, devcode, beginTime, endTime, wellCode); } System.out.println(dataGasLiquidList); return dataGasLiquidList; } @Override - public List selectTubeDataScope(DataScope dataScope, String deptid, String beginTime, String endTime, String keywords) { - List mapList = this.baseMapper.selectTubeDataScope(dataScope, deptid, beginTime, endTime, keywords); + public List selectTubeDataScope(DataScope dataScope, String devcode, String beginTime, String endTime, String wellCode){ + List mapList = this.baseMapper.selectTubeDataScope(dataScope, devcode, beginTime, endTime, wellCode); return mapList; } @Override - public List getHydrantlist(DataScope dataScope, String deptid, String beginTime, String endTime, String keywords) { - List mapList = this.baseMapper.getHydrantlist(dataScope, deptid, beginTime, endTime, keywords); + public List getHydrantlist(DataScope dataScope, String devcode, String beginTime, String endTime, String wellCode){ + List mapList = this.baseMapper.getHydrantlist(dataScope, devcode, beginTime, endTime, wellCode); return mapList; } @Override - public List getH2sDataScope(DataScope dataScope, String deptid, String beginTime, String endTime, String keywords) { - return this.baseMapper.selectH2sListDataScope(dataScope, deptid, beginTime, endTime, keywords); + public List getH2sDataScope(DataScope dataScope, String devcode, String beginTime, String endTime, String wellCode) { + return this.baseMapper.selectH2sListDataScope(dataScope, devcode, beginTime, endTime, wellCode); } } diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/IDataAnalysisServiceImpl.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/IDataAnalysisServiceImpl.java index 9ae5886..5b03b61 100644 --- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/IDataAnalysisServiceImpl.java +++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/IDataAnalysisServiceImpl.java @@ -559,16 +559,19 @@ return responseData; } - public ResponseData getH2slist(DataScope dataScope, Page page, String deptid, String beginTime, String endTime, String keywords) { + public ResponseData getH2slist(DataScope dataScope, Page page, String keywords, String beginTime, String endTime, String deptid){ ResponseData responseData = new ResponseData(); try { - List h2sDataDtoList = this.baseMapper.selectH2sListDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords); + List h2sDataDtoList = this.baseMapper.selectH2sListDataScopePage(dataScope, page, keywords, beginTime, endTime, deptid); + h2sDataDtoList.forEach( + h2sDataDto->h2sDataDto.setDeptName(permissionService.getDeptService().getDeptName(h2sDataDto.getDeptid())) + ); page.setRecords(h2sDataDtoList); responseData.setData(page); responseData.setCode(200); responseData.setMessage("查询成功"); } catch (DataAccessException dex) { - log.error("主题：硫化氢数据库异常，关键字{}，开始时间{}，结束时间{}，部门编号{}，异常信息", + log.error("主题：硫化氢数据库异常，关键字{}，开始时间{}，结束时间{}，部门编号{}，异常信息{}", keywords, beginTime, endTime, deptid, dex); responseData.setCode(500); responseData.setMessage("数据库查询异常"); diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/H2SDataDto.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/H2SDataDto.java new file mode 100644 index 0000000..8771495 --- /dev/null +++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/H2SDataDto.java @@ -0,0 +1,53 @@ +package com.casic.missiles.modular.system.dto.ExcelModel; + +import com.alibaba.excel.annotation.ExcelProperty; +import com.alibaba.excel.annotation.write.style.ColumnWidth; +import com.alibaba.excel.annotation.write.style.ContentRowHeight; +import com.alibaba.excel.annotation.write.style.ContentStyle; +import com.alibaba.excel.annotation.write.style.HeadRowHeight; +import com.alibaba.excel.enums.poi.BorderStyleEnum; +import lombok.Data; +import lombok.NoArgsConstructor; + +/** + * 氢硫酸 + * + * @author cz + * @date 2022-07-28 + */ +@ColumnWidth(30) +@HeadRowHeight(15) +@ContentRowHeight(20) +@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) +@Data +@NoArgsConstructor +public class H2SDataDto { + @ExcelProperty("设备编号") + private String devcode; + + @ExcelProperty("点位编号") + private String wellCode; + + @ExcelProperty("设备类型") + private String deviceType; + + @ExcelProperty("设备类型") + private String deviceTypeName; + + private String deptid; + + @ExcelProperty("权属部门") + private String deptName; + + @ExcelProperty("硫化氢浓度") + private String strength; + + @ExcelProperty("电量") + private String cell; + + @ExcelProperty("采集时间") + private String logtime; + @ExcelProperty("记录时间") + private String uptime; + +} diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/statistic/DataGasLiquid.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/statistic/DataGasLiquid.java index ad3eca0..c24a391 100644 --- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/statistic/DataGasLiquid.java +++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/statistic/DataGasLiquid.java @@ -9,7 +9,7 @@ private String liquiddata; private String cell; private String strength; - private String logTime; - private String upTime; + private String logtime; + private String uptime; } diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/statistic/DataH2s.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/statistic/DataH2s.java index b7ce91a..993a9b3 100644 --- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/statistic/DataH2s.java +++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/statistic/DataH2s.java @@ -9,12 +9,7 @@ import lombok.Data; import lombok.NoArgsConstructor; -@ColumnWidth(30) -@HeadRowHeight(15) -@ContentRowHeight(20) -@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) @Data -@NoArgsConstructor public class DataH2s { @ExcelProperty("设备编号") private String devcode; diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/statistic/DataHarmfulGas.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/statistic/DataHarmfulGas.java index a483d73..3c20b8b 100644 --- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/statistic/DataHarmfulGas.java +++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/statistic/DataHarmfulGas.java @@ -1,14 +1,19 @@ package com.casic.missiles.modular.system.dto.statistic; +import com.alibaba.fastjson.annotation.JSONField; import lombok.Data; @Data public class DataHarmfulGas { private String devcode; + @JSONField(name="CO") private String CO; + @JSONField(name="CH4") private String CH4; + @JSONField(name="H2S") private String H2S; + @JSONField(name="O2") private String O2; private String liquidSwitch; private String logtime; diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/statistic/DataHydrant.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/statistic/DataHydrant.java index 3685e90..530ae58 100644 --- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/statistic/DataHydrant.java +++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/statistic/DataHydrant.java @@ -8,5 +8,5 @@ private String wellCode; private String status; private String descn; - private String logTime; + private String logtime; } diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/statistic/DataWellCover.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/statistic/DataWellCover.java index 4296ad2..874900d 100644 --- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/statistic/DataWellCover.java +++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/statistic/DataWellCover.java @@ -13,6 +13,6 @@ private String wellCode; private String status; private String descn; - private String logTime; + private String logtime; } diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceDataListController.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceDataListController.java index 09d3c0d..0f13e84 100644 --- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceDataListController.java +++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceDataListController.java @@ -1,13 +1,8 @@ package com.casic.missiles.modular.system.controller; -import cn.hutool.core.collection.CollectionUtil; -import com.baomidou.mybatisplus.core.metadata.OrderItem; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.casic.missiles.core.application.context.AbstractPermissionContext; import com.casic.missiles.core.datascope.DataScope; -import com.casic.missiles.core.page.PageFactory; import com.casic.missiles.model.response.ResponseData; -import com.casic.missiles.modular.system.dto.ExcelModel.*; import com.casic.missiles.modular.system.dto.statistic.*; import com.casic.missiles.modular.system.service.DeviceDataListService; import lombok.extern.slf4j.Slf4j; @@ -27,92 +22,88 @@ // @Permission @GetMapping(value = "/welldata/list") - public Object wellDataList(String keywords, String deptid, String beginTime, String endTime) { + public Object wellDataList(String devcode, String wellCode, String beginTime, String endTime) { //查询数据权限 使用默认DEPTID 字段 DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope(); - List list = deviceDataListService.selectWellDataScope(dataScope, deptid, beginTime, endTime, keywords); - + List list = deviceDataListService.selectWellDataScope(dataScope, devcode, beginTime, endTime, wellCode); return ResponseData.success(list); } - /** * 开挖监测仪数据查询 * - * @param keywords - * @param deptid + * @param devcode + * @param wellCode * @param beginTime * @param endTime * @return */ - // @Permission + //@Permission @GetMapping(value = "/digdata/list") - public Object digDataList(String keywords, String deptid, String beginTime, String endTime) { + public Object digDataList(String devcode, String wellCode, String beginTime, String endTime) { DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope(); - List mapList = deviceDataListService.selectDigDataScope(dataScope, deptid, beginTime, endTime, keywords); + List mapList = deviceDataListService.selectDigDataScope(dataScope, devcode, beginTime, endTime, wellCode); return ResponseData.success(mapList); } @GetMapping(value = "/liquiddata/list") -// @Permission - public Object liquidDataList(String keywords, String deptid, String beginTime, String endTime) { + //@Permission + public Object liquidDataList(String devcode, String wellCode, String beginTime, String endTime) { //查询数据权限 使用默认DEPTID 字段 DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope(); - List list = deviceDataListService.selectLiquidDataScope(dataScope, deptid, beginTime, endTime, keywords); + List list = deviceDataListService.selectLiquidDataScope(dataScope, devcode, beginTime, endTime, wellCode); return ResponseData.success(list); } @GetMapping(value = "/gasdata/list") - //@Permission - public Object gasDataList(String keywords, String deptid, String beginTime, String endTime) { + public Object gasDataList(String devcode, String wellCode, String beginTime, String endTime) { DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope(); - List deviceDataExcelDtoList = deviceDataListService.selectGasDataScope(dataScope, deptid, beginTime, endTime, keywords); + List deviceDataExcelDtoList = deviceDataListService.selectGasDataScope(dataScope, devcode, beginTime, endTime, wellCode); return ResponseData.success(deviceDataExcelDtoList); } @GetMapping(value = "/noisedata/list") - public Object noiseDataList(String keywords, String deptid, String beginTime, String endTime) { + public Object noiseDataList(String devcode, String wellCode, String beginTime, String endTime) { DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope(); - List mapList = deviceDataListService.selectNoiseDataScope(dataScope, deptid, beginTime, endTime, keywords); + List mapList = deviceDataListService.selectNoiseDataScope(dataScope, devcode, beginTime, endTime, wellCode); return ResponseData.success(mapList); } @GetMapping(value = "/harmfuldata/list") - public Object harmfulDataList(String keywords, String deptid, String beginTime, String endTime) { + public Object harmfulDataList(String devcode, String wellCode, String beginTime, String endTime) { DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope(); - List mapList = deviceDataListService.selectHarmfulDataScope(dataScope, deptid, beginTime, endTime, keywords); + List mapList = deviceDataListService.selectHarmfulDataScope(dataScope, devcode, beginTime, endTime, wellCode); return ResponseData.success(mapList); } @GetMapping(value = "/tempdata/list") - public Object tempDataList(String keywords, String deptid, String beginTime, String endTime) { + public Object tempDataList(String devcode, String wellCode, String beginTime, String endTime) { DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope(); - List mapList = deviceDataListService.selectTempDataScope(dataScope, deptid, beginTime, endTime, keywords); + List mapList = deviceDataListService.selectTempDataScope(dataScope, devcode, beginTime, endTime, wellCode); return ResponseData.success(mapList); } - @GetMapping(value = "/welllocadata/list") - public Object wellLocDataList(String keywords, String deptid, String beginTime, String endTime) { + public Object wellLocDataList(String devcode, String wellCode, String beginTime, String endTime) { DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope(); - List mapList = deviceDataListService.selectWellLocDataScope(dataScope, deptid, beginTime, endTime, keywords); + List mapList = deviceDataListService.selectWellLocDataScope(dataScope, devcode, beginTime, endTime, wellCode); return ResponseData.success(mapList); } @GetMapping(value = "/liquidGasData/list") - public Object liquidGasDataList(String keywords, String deptid, String sensorType, String beginTime, String endTime) { + public Object liquidGasDataList(String devcode, String wellCode, String sensorType, String beginTime, String endTime) { DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope(); - List mapList = deviceDataListService.selectGasLiquidDataScope(dataScope, sensorType, deptid, beginTime, endTime, keywords); + List mapList = deviceDataListService.selectGasLiquidDataScope(dataScope, sensorType, devcode, beginTime, endTime, wellCode); return ResponseData.success(mapList); } @GetMapping(value = "/tubedata/list") //@Permission - public Object tubeDataList(String keywords, String deptid, String beginTime, String endTime) { + public Object tubeDataList(String devcode, String wellCode, String beginTime, String endTime) { DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope(); - List mapList = deviceDataListService.selectTubeDataScope(dataScope, deptid, beginTime, endTime, keywords); + List mapList = deviceDataListService.selectTubeDataScope(dataScope, devcode, beginTime, endTime, wellCode); return ResponseData.success(mapList); } @@ -120,23 +111,20 @@ * 消防栓列表 */ @GetMapping(value = "/hydrant/list") - public Object hydrantList(String keywords, String deptid, String beginTime, String endTime) { + public Object hydrantList(String devcode, String wellCode, String beginTime, String endTime) { DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope(); - List mapList= deviceDataListService.getHydrantlist(dataScope, deptid, beginTime, endTime, keywords); + List mapList= deviceDataListService.getHydrantlist(dataScope, devcode, beginTime, endTime, wellCode); return ResponseData.success(mapList); } - /** * 硫化氢列表 */ @GetMapping(value = "/h2s/list") - public Object h2sList(String keywords, String deptid, String beginTime, String endTime) { + public Object h2sList(String devcode, String wellCode, String beginTime, String endTime) { DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope(); - System.out.println(keywords); - List mapList= deviceDataListService.getH2sDataScope(dataScope, deptid, beginTime, endTime, keywords); + List mapList= deviceDataListService.getH2sDataScope(dataScope, devcode, beginTime, endTime, wellCode); return ResponseData.success(mapList); } - } diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java index 837e653..3d7ae31 100644 --- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java +++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java @@ -623,9 +623,9 @@ */ @GetMapping(value = "/h2s/list-page") public Object h2sList(String keywords, String deptid, String beginTime, String endTime) { - Page page = PageFactory.defaultPage(); + Page page = PageFactory.defaultPage(); DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope(); - ResponseData responseData = deviceService.getH2slist(dataScope, page, deptid, beginTime, endTime, keywords); + ResponseData responseData = deviceService.getH2slist(dataScope, page, keywords, beginTime, endTime, deptid); responseData.setData(super.packForBT(page)); return responseData; } @@ -634,10 +634,10 @@ */ @GetMapping(value = "/h2s/export") public void h2sExport(String keywords, String deptid, String beginTime, String endTime) throws IOException { - Page page = PageFactory.defaultPage(); + Page page = PageFactory.defaultPage(); DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope(); deviceService.getH2slist(dataScope, page, deptid, beginTime, endTime, keywords); - super.exportExcel(DataH2s.class, page.getRecords(), DeviceExportEnum.HYDRANT_EXPORT.getFileName()); + super.exportExcel(H2SDataDto.class, page.getRecords(), DeviceExportEnum.H2S_EXPORT.getFileName()); } } diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/DataAnalysisMapper.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/DataAnalysisMapper.java index ab62e2e..67fb9c9 100644 --- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/DataAnalysisMapper.java +++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/DataAnalysisMapper.java @@ -97,6 +97,6 @@ List getHydrantlist(@Param("dataScope") DataScope dataScope,@Param("page")Page page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords); - List selectH2sListDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page")Page page, @Param("deptid") String deptid, - @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords); + List selectH2sListDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page")Page page, @Param("keywords") String keywords, + @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("deptid") String deptid); } diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/DeviceDataListMapper.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/DeviceDataListMapper.java index 7114492..732dcc6 100644 --- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/DeviceDataListMapper.java +++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/DeviceDataListMapper.java @@ -19,29 +19,30 @@ * @since 2019-05-13 */ public interface DeviceDataListMapper extends BaseMapper { - List selectWellDataScope(@Param("dataScope") DataScope dataScope, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords); + List selectWellDataScope(@Param("dataScope") DataScope dataScope, @Param("devcode") String devcode, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("wellCode") String wellCode); - List selectDigDataScope(@Param("dataScope") DataScope dataScope, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords); + List selectDigDataScope(@Param("dataScope") DataScope dataScope, @Param("devcode") String devcode, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("wellCode") String wellCode); - List selectLiquidDataScope(@Param("dataScope") DataScope dataScope, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords); + List selectLiquidDataScope(@Param("dataScope") DataScope dataScope, @Param("devcode") String devcode, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("wellCode") String wellCode); - List selectGasDataScope(@Param("dataScope") DataScope dataScope, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords); + List selectGasDataScope(@Param("dataScope") DataScope dataScope, @Param("devcode") String devcode, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("wellCode") String wellCode); - List selectNoiseDataScope(@Param("dataScope") DataScope dataScope, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords); + List selectNoiseDataScope(@Param("dataScope") DataScope dataScope, @Param("devcode") String devcode, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("wellCode") String wellCode); - List selectHarmfulDataScope(@Param("dataScope") DataScope dataScope, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords); + List selectHarmfulDataScope(@Param("dataScope") DataScope dataScope, @Param("devcode") String devcode, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("wellCode") String wellCode); - List selectTempDataScope(@Param("dataScope") DataScope dataScope, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords); + List selectTempDataScope(@Param("dataScope") DataScope dataScope, @Param("devcode") String devcode, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("wellCode") String wellCode); - List selectWellLocDataScope(@Param("dataScope") DataScope dataScope, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords); + List selectWellLocDataScope(@Param("dataScope") DataScope dataScope, @Param("devcode") String devcode, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("wellCode") String wellCode); - List selectGasLiquidDataLiquidScope(@Param("dataScope") DataScope dataScope, @Param("deptIds") List deptIds, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords); + List selectGasLiquidDataLiquidScope(@Param("dataScope") DataScope dataScope, @Param("devcode")String devcode, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("wellCode") String wellCode); - List selectGasLiquidDataGasScope(@Param("dataScope") DataScope dataScope, @Param("deptIds") List deptIds, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords); + List selectGasLiquidDataGasScope(@Param("dataScope") DataScope dataScope, @Param("devcode")String devcode, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("wellCode") String wellCode); - List selectTubeDataScope(@Param("dataScope") DataScope dataScope, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords); + List selectTubeDataScope(@Param("dataScope") DataScope dataScope, @Param("devcode") String devcode, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("wellCode") String wellCode); - List getHydrantlist(@Param("dataScope") DataScope dataScope, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords); + List getHydrantlist(@Param("dataScope") DataScope dataScope, @Param("devcode") String devcode, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("wellCode") String wellCode); - List selectH2sListDataScope(@Param("dataScope") DataScope dataScope, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords); + List selectH2sListDataScope(@Param("dataScope") DataScope dataScope, @Param("devcode") String devcode, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("wellCode") String wellCode); + } diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/DataAnalysisMapper.xml b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/DataAnalysisMapper.xml index a0117ca..6ed130a 100644 --- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/DataAnalysisMapper.xml +++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/DataAnalysisMapper.xml @@ -1255,7 +1255,6 @@ - SELECT dh2s.DEVCODE AS devcode, dh2s.WELL_CODE AS "wellCode", - dh2s.STRENGTH, - dh2s.CELL, + dh2s.STRENGTH AS strength, + dh2s.CELL AS cell, AS uptime, - dh2s.device_type as deviceType + + + + AS logtime, + bdt.TYPE_NAME AS "deviceTypeName", + bd.device_type as deviceType, + bwi.DEPTID AS deptid FROM data_h2s dh2s JOIN bus_well_info bwi ON bwi.WELL_CODE= dh2s.WELL_CODE JOIN bus_device bd ON dh2s.DEVCODE = bd.DEVCODE + LEFT JOIN base_device_type bdt ON bd.DEVICE_TYPE = bdt.ID bd.VALID = '1' AND bwi.VALID = '1' @@ -1323,11 +1329,9 @@ - and (dh2s.DEVCODE like + AND (bd.DEVCODE LIKE - OR dh2s.WELL_CODE LIKE - - ) + OR bd.WELL_CODE LIKE) diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceDataListMapper.xml b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceDataListMapper.xml index adc10af..7010493 100644 --- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceDataListMapper.xml +++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceDataListMapper.xml @@ -107,17 +107,17 @@ - as "LOGTIME", - DESCN, - STATUS + as "logtime", + DESCN as descn, + STATUS as status FROM data_wellcover dw INNER JOIN bus_well_info bwi on dw.WELL_CODE = bwi.WELL_CODE INNER JOIN bus_device bd ON dw.DEVCODE = bd.DEVCODE bd.VALID = '1' AND bwi.VALID = '1' - - and bwi.DEPTID = #{deptid} + + AND dw.DEVCODE = #{devcode} and dw.LOGTIME = ]]> @@ -131,12 +131,8 @@ - - and (dw.DEVCODE like - - OR dw.WELL_CODE LIKE - - ) + + AND dw.WELL_CODE = #{wellCode} ORDER BY LOGTIME DESC @@ -164,76 +160,64 @@ INNER JOIN bus_device bd ON dd.DEVCODE = bd.DEVCODE bd.VALID = '1' AND bwi.VALID = '1' - - and bwi.DEPTID = #{deptid} + + AND dd.DEVCODE = #{devcode} - and dd.UPTIME = ]]> + AND dd.UPTIME = ]]> - and dd.UPTIME + AND dd.UPTIME - - and (dd.DEVCODE like - - OR dd.WELL_CODE LIKE - - ) + + AND dd.WELL_CODE = #{wellCode} ORDER BY dd.UPTIME DESC - - - - @@ -257,8 +241,11 @@ INNER JOIN bus_device bd ON dg.DEVCODE = bd.DEVCODE bd.VALID = '1' AND bwi.VALID = '1' - - and bwi.DEPTID = #{deptid} + + AND dg.DEVCODE = #{devcode} + + + AND dg.WELL_CODE = #{wellCode} and dg.UPTIME = ]]> @@ -272,18 +259,10 @@ - - and (dg.DEVCODE like - - OR dg.WELL_CODE LIKE - - ) - ORDER BY dg.UPTIME DESC - @@ -353,8 +328,11 @@ INNER JOIN bus_device bd ON dth.DEVCODE = bd.DEVCODE bd.VALID = '1' AND bwi.VALID = '1' - - and bwi.DEPTID = #{deptid} + + AND dth.DEVCODE = #{devcode} + + + AND dth.WELL_CODE = #{wellCode} and dth.UPTIME = ]]> @@ -368,13 +346,6 @@ - - and (dth.DEVCODE like - - OR dth.WELL_CODE LIKE - - ) - ORDER BY dth.UPTIME DESC @@ -399,8 +370,11 @@ INNER JOIN bus_device bd ON dn.DEVCODE = bd.DEVCODE bd.VALID = '1' AND bwi.VALID = '1' - - and bwi.DEPTID = #{deptid} + + AND dn.DEVCODE = #{devcode} + + + AND dn.WELL_CODE = #{wellCode} and dn.UPTIME = ]]> @@ -414,13 +388,6 @@ - - and (dn.DEVCODE like - - OR dn.WELL_CODE LIKE - - ) - ORDER BY dn.UPTIME DESC @@ -446,8 +413,11 @@ INNER JOIN bus_device bd ON dwl.DEVCODE = bd.DEVCODE bd.VALID = '1' AND bwi.VALID = '1' - - and bwi.DEPTID = #{deptid} + + AND dwl.DEVCODE = #{devcode} + + + AND dwl.WELL_CODE = #{wellCode} and dwl.UPTIME = ]]> @@ -461,125 +431,104 @@ - - and (dwl.DEVCODE like - - OR dwl.WELL_CODE LIKE - - ) - ORDER BY dwl.UPTIME DESC - + @@ -639,14 +583,17 @@ AS logtime, - dh.DESCN AS descn + dh.DESCN AS descn FROM data_hydrant dh JOIN bus_well_info bwi ON bwi.WELL_CODE= dh.WELL_CODE JOIN bus_device bd ON dh.DEVCODE = bd.DEVCODE bd.VALID = '1' AND bwi.VALID = '1' - - and bwi.DEPTID = #{deptid} + + AND dh.DEVCODE = #{devcode} + + + AND dh.WELL_CODE = #{wellCode} and dh.LOGTIME = ]]> @@ -660,13 +607,6 @@ - - and (dh.DEVCODE like - - OR dh.WELL_CODE LIKE - - ) - @@ -681,14 +621,17 @@ AS uptime, bwi.deptid, - dh2s.device_type as deviceType + bd.device_type as deviceType FROM data_h2s dh2s JOIN bus_well_info bwi ON bwi.WELL_CODE= dh2s.WELL_CODE JOIN bus_device bd ON dh2s.DEVCODE = bd.DEVCODE bd.VALID = '1' AND bwi.VALID = '1' - - and bwi.DEPTID = #{deptid} + + AND dh2s.DEVCODE = #{devcode} + + + AND dh2s.WELL_CODE = #{wellCode} and dh2s.UPTIME = ]]> @@ -702,13 +645,6 @@ - - and (dh2s.DEVCODE like - - OR dh2s.WELL_CODE LIKE - - ) - diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/DeviceDataListService.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/DeviceDataListService.java index 698a8ea..9bfe937 100644 --- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/DeviceDataListService.java +++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/DeviceDataListService.java @@ -19,46 +19,46 @@ /** * 开挖监测仪数据查询 */ - List selectDigDataScope(DataScope dataScope, String deptid, String beginTime, String endTime, String keywords); + List selectDigDataScope(DataScope dataScope, String devcode, String beginTime, String endTime, String wellCode); /** * 根据条件检索井盖监测数据列表 */ - List selectWellDataScope(DataScope dataScope, String deptid, String beginTime, String endTime, String keywords); + List selectWellDataScope(DataScope dataScope, String devcode, String beginTime, String endTime, String wellCode); /** * 根据检索条件查询液位检测数据 */ - List selectLiquidDataScope(DataScope dataScope, String deptid, String beginTime, String endTime, String keywords); + List selectLiquidDataScope(DataScope dataScope, String devcode, String beginTime, String endTime, String wellCode); /** * 燃气数据查询 */ - List selectGasDataScope(DataScope dataScope, String deptid, String beginTime, String endTime, String keywords); + List selectGasDataScope(DataScope dataScope, String devcode, String beginTime, String endTime, String wellCode); /** * 噪声记录仪数据查询 */ - List selectNoiseDataScope(DataScope dataScope, String deptid, String beginTime, String endTime, String keywords); + List selectNoiseDataScope(DataScope dataScope, String devcode, String beginTime, String endTime, String wellCode); /** * 有害气体数据查询 */ - List selectHarmfulDataScope(DataScope dataScope, String deptid, String beginTime, String endTime, String keywords); + List selectHarmfulDataScope(DataScope dataScope, String devcode, String beginTime, String endTime, String wellCode); /** * 温湿度数据查询 */ - List selectTempDataScope(DataScope dataScope, String deptid, String beginTime, String endTime, String keywords); + List selectTempDataScope(DataScope dataScope, String devcode, String beginTime, String endTime, String wellCode); /** * 井盖定位监测仪数据查询 */ - List selectWellLocDataScope(DataScope dataScope, String deptid, String beginTime, String endTime, String keywords); + List selectWellLocDataScope(DataScope dataScope, String devcode, String beginTime, String endTime, String wellCode); - List selectGasLiquidDataScope(DataScope dataScope, String sensorType, String deptid, String beginTime, String endTime, String keywords); + List selectGasLiquidDataScope(DataScope dataScope, String sensorType, String devcode, String beginTime, String endTime, String wellCode); /** * 管盯数据查询 */ - List selectTubeDataScope(DataScope dataScope, String deptid, String beginTime, String endTime, String keywords); + List selectTubeDataScope(DataScope dataScope, String devcode, String beginTime, String endTime, String wellCode); - List getHydrantlist(DataScope dataScope, String deptid, String beginTime, String endTime, String keywords); + List getHydrantlist(DataScope dataScope, String devcode, String beginTime, String endTime, String wellCode); - List getH2sDataScope(DataScope dataScope, String deptid, String beginTime, String endTime, String keywords); + List getH2sDataScope(DataScope dataScope, String devcode, String beginTime, String endTime, String wellCode); } \ No newline at end of file diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/IDataAnalysisService.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/IDataAnalysisService.java index d09c12e..a75ed02 100644 --- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/IDataAnalysisService.java +++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/IDataAnalysisService.java @@ -126,5 +126,5 @@ ResponseData getHydrantlist(DataScope dataScope, Page page, String deptid, String beginTime, String endTime, String keywords); - ResponseData getH2slist(DataScope dataScope, Page page, String deptid, String beginTime, String endTime, String keywords); + ResponseData getH2slist(DataScope dataScope, Page page, String keywords, String beginTime, String endTime, String deptid); } diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceDataListServiceImpl.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceDataListServiceImpl.java index 95baa10..5abf45c 100644 --- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceDataListServiceImpl.java +++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceDataListServiceImpl.java @@ -37,81 +37,76 @@ private AbstractPermissionContext permissionService; @Override - public List selectWellDataScope(DataScope dataScope, String deptid, String beginTime, String endTime, String keywords) { - return this.baseMapper.selectWellDataScope(dataScope, deptid, beginTime, endTime, keywords); + public List selectWellDataScope(DataScope dataScope, String devcode, String beginTime, String endTime, String wellCode){ + return this.baseMapper.selectWellDataScope(dataScope, devcode, beginTime, endTime, wellCode); } @Override - public List selectDigDataScope(DataScope dataScope, String deptid, String beginTime, String endTime, String keywords) { - return this.baseMapper.selectDigDataScope(dataScope, deptid, beginTime, endTime, keywords); + public List selectDigDataScope(DataScope dataScope, String devcode, String beginTime, String endTime, String wellCode) { + return this.baseMapper.selectDigDataScope(dataScope, devcode, beginTime, endTime, wellCode); } @Override - public List selectLiquidDataScope(DataScope dataScope, String deptid, String beginTime, String endTime, String keywords) { - return this.baseMapper.selectLiquidDataScope(dataScope, deptid, beginTime, endTime, keywords); + public List selectLiquidDataScope(DataScope dataScope, String devcode, String beginTime, String endTime, String wellCode) { + return this.baseMapper.selectLiquidDataScope(dataScope, devcode, beginTime, endTime, wellCode); } @Override - public List selectGasDataScope(DataScope dataScope, String deptid, String beginTime, String endTime, String keywords) { - return this.baseMapper.selectGasDataScope(dataScope, deptid, beginTime, endTime, keywords); + public List selectGasDataScope(DataScope dataScope, String devcode, String beginTime, String endTime, String wellCode) { + return this.baseMapper.selectGasDataScope(dataScope, devcode, beginTime, endTime, wellCode); } @Override - public List selectNoiseDataScope(DataScope dataScope, String deptid, String beginTime, String endTime, String keywords) { - return this.baseMapper.selectNoiseDataScope(dataScope, deptid, beginTime, endTime, keywords); + public List selectNoiseDataScope(DataScope dataScope, String devcode, String beginTime, String endTime, String wellCode) { + return this.baseMapper.selectNoiseDataScope(dataScope, devcode, beginTime, endTime, wellCode); } @Override - public List selectHarmfulDataScope(DataScope dataScope, String deptid, String beginTime, String endTime, String keywords) { - return this.baseMapper.selectHarmfulDataScope(dataScope, deptid, beginTime, endTime, keywords); + public List selectHarmfulDataScope(DataScope dataScope, String devcode, String beginTime, String endTime, String wellCode){ + return this.baseMapper.selectHarmfulDataScope(dataScope, devcode, beginTime, endTime, wellCode); } @Override - public List selectTempDataScope(DataScope dataScope, String deptid, String beginTime, String endTime, String keywords) { - return this.baseMapper.selectTempDataScope(dataScope, deptid, beginTime, endTime, keywords); + public List selectTempDataScope(DataScope dataScope, String devcode, String beginTime, String endTime, String wellCode){ + return this.baseMapper.selectTempDataScope(dataScope, devcode, beginTime, endTime, wellCode); } @Override - public List selectWellLocDataScope(DataScope dataScope, String deptid, String beginTime, String endTime, String keywords) { - List mapList = this.baseMapper.selectWellLocDataScope(dataScope, deptid, beginTime, endTime, keywords); + public List selectWellLocDataScope(DataScope dataScope, String devcode, String beginTime, String endTime, String wellCode) { + List mapList = this.baseMapper.selectWellLocDataScope(dataScope, devcode, beginTime, endTime, wellCode); return mapList; } @Override - public List selectGasLiquidDataScope(DataScope dataScope, String sensorType, String deptid, String beginTime, String endTime, String keywords) { - List deptIds = null; - if (StrUtil.isNotEmpty(deptid)) { - deptIds = permissionService.getDeptService().getIdsByPid(deptid, null); - deptIds.add(Long.valueOf(deptid)); - } + public List selectGasLiquidDataScope(DataScope dataScope, String sensorType, String devcode, String beginTime, String endTime, String wellCode) { List dataGasLiquidList = new ArrayList<>(); if ("liquid".equals(sensorType)) { - dataGasLiquidList = this.baseMapper.selectGasLiquidDataLiquidScope(dataScope, deptIds, beginTime, endTime, keywords); + dataGasLiquidList = this.baseMapper.selectGasLiquidDataLiquidScope(dataScope, devcode, beginTime, endTime, wellCode); } if ("gas".equals(sensorType)) { - dataGasLiquidList = this.baseMapper.selectGasLiquidDataGasScope(dataScope, deptIds, beginTime, endTime, keywords); + dataGasLiquidList = this.baseMapper.selectGasLiquidDataGasScope(dataScope, devcode, beginTime, endTime, wellCode); } System.out.println(dataGasLiquidList); return dataGasLiquidList; } @Override - public List selectTubeDataScope(DataScope dataScope, String deptid, String beginTime, String endTime, String keywords) { - List mapList = this.baseMapper.selectTubeDataScope(dataScope, deptid, beginTime, endTime, keywords); + public List selectTubeDataScope(DataScope dataScope, String devcode, String beginTime, String endTime, String wellCode){ + List mapList = this.baseMapper.selectTubeDataScope(dataScope, devcode, beginTime, endTime, wellCode); return mapList; } @Override - public List getHydrantlist(DataScope dataScope, String deptid, String beginTime, String endTime, String keywords) { - List mapList = this.baseMapper.getHydrantlist(dataScope, deptid, beginTime, endTime, keywords); + public List getHydrantlist(DataScope dataScope, String devcode, String beginTime, String endTime, String wellCode){ + List mapList = this.baseMapper.getHydrantlist(dataScope, devcode, beginTime, endTime, wellCode); return mapList; } @Override - public List getH2sDataScope(DataScope dataScope, String deptid, String beginTime, String endTime, String keywords) { - return this.baseMapper.selectH2sListDataScope(dataScope, deptid, beginTime, endTime, keywords); + public List getH2sDataScope(DataScope dataScope, String devcode, String beginTime, String endTime, String wellCode) { + return this.baseMapper.selectH2sListDataScope(dataScope, devcode, beginTime, endTime, wellCode); } } diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/IDataAnalysisServiceImpl.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/IDataAnalysisServiceImpl.java index 9ae5886..5b03b61 100644 --- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/IDataAnalysisServiceImpl.java +++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/IDataAnalysisServiceImpl.java @@ -559,16 +559,19 @@ return responseData; } - public ResponseData getH2slist(DataScope dataScope, Page page, String deptid, String beginTime, String endTime, String keywords) { + public ResponseData getH2slist(DataScope dataScope, Page page, String keywords, String beginTime, String endTime, String deptid){ ResponseData responseData = new ResponseData(); try { - List h2sDataDtoList = this.baseMapper.selectH2sListDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords); + List h2sDataDtoList = this.baseMapper.selectH2sListDataScopePage(dataScope, page, keywords, beginTime, endTime, deptid); + h2sDataDtoList.forEach( + h2sDataDto->h2sDataDto.setDeptName(permissionService.getDeptService().getDeptName(h2sDataDto.getDeptid())) + ); page.setRecords(h2sDataDtoList); responseData.setData(page); responseData.setCode(200); responseData.setMessage("查询成功"); } catch (DataAccessException dex) { - log.error("主题：硫化氢数据库异常，关键字{}，开始时间{}，结束时间{}，部门编号{}，异常信息", + log.error("主题：硫化氢数据库异常，关键字{}，开始时间{}，结束时间{}，部门编号{}，异常信息{}", keywords, beginTime, endTime, deptid, dex); responseData.setCode(500); responseData.setMessage("数据库查询异常"); diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/H2SDataDto.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/H2SDataDto.java new file mode 100644 index 0000000..8771495 --- /dev/null +++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/H2SDataDto.java @@ -0,0 +1,53 @@ +package com.casic.missiles.modular.system.dto.ExcelModel; + +import com.alibaba.excel.annotation.ExcelProperty; +import com.alibaba.excel.annotation.write.style.ColumnWidth; +import com.alibaba.excel.annotation.write.style.ContentRowHeight; +import com.alibaba.excel.annotation.write.style.ContentStyle; +import com.alibaba.excel.annotation.write.style.HeadRowHeight; +import com.alibaba.excel.enums.poi.BorderStyleEnum; +import lombok.Data; +import lombok.NoArgsConstructor; + +/** + * 氢硫酸 + * + * @author cz + * @date 2022-07-28 + */ +@ColumnWidth(30) +@HeadRowHeight(15) +@ContentRowHeight(20) +@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) +@Data +@NoArgsConstructor +public class H2SDataDto { + @ExcelProperty("设备编号") + private String devcode; + + @ExcelProperty("点位编号") + private String wellCode; + + @ExcelProperty("设备类型") + private String deviceType; + + @ExcelProperty("设备类型") + private String deviceTypeName; + + private String deptid; + + @ExcelProperty("权属部门") + private String deptName; + + @ExcelProperty("硫化氢浓度") + private String strength; + + @ExcelProperty("电量") + private String cell; + + @ExcelProperty("采集时间") + private String logtime; + @ExcelProperty("记录时间") + private String uptime; + +} diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/statistic/DataGasLiquid.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/statistic/DataGasLiquid.java index ad3eca0..c24a391 100644 --- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/statistic/DataGasLiquid.java +++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/statistic/DataGasLiquid.java @@ -9,7 +9,7 @@ private String liquiddata; private String cell; private String strength; - private String logTime; - private String upTime; + private String logtime; + private String uptime; } diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/statistic/DataH2s.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/statistic/DataH2s.java index b7ce91a..993a9b3 100644 --- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/statistic/DataH2s.java +++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/statistic/DataH2s.java @@ -9,12 +9,7 @@ import lombok.Data; import lombok.NoArgsConstructor; -@ColumnWidth(30) -@HeadRowHeight(15) -@ContentRowHeight(20) -@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) @Data -@NoArgsConstructor public class DataH2s { @ExcelProperty("设备编号") private String devcode; diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/statistic/DataHarmfulGas.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/statistic/DataHarmfulGas.java index a483d73..3c20b8b 100644 --- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/statistic/DataHarmfulGas.java +++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/statistic/DataHarmfulGas.java @@ -1,14 +1,19 @@ package com.casic.missiles.modular.system.dto.statistic; +import com.alibaba.fastjson.annotation.JSONField; import lombok.Data; @Data public class DataHarmfulGas { private String devcode; + @JSONField(name="CO") private String CO; + @JSONField(name="CH4") private String CH4; + @JSONField(name="H2S") private String H2S; + @JSONField(name="O2") private String O2; private String liquidSwitch; private String logtime; diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/statistic/DataHydrant.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/statistic/DataHydrant.java index 3685e90..530ae58 100644 --- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/statistic/DataHydrant.java +++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/statistic/DataHydrant.java @@ -8,5 +8,5 @@ private String wellCode; private String status; private String descn; - private String logTime; + private String logtime; } diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/statistic/DataWellCover.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/statistic/DataWellCover.java index 4296ad2..874900d 100644 --- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/statistic/DataWellCover.java +++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/statistic/DataWellCover.java @@ -13,6 +13,6 @@ private String wellCode; private String status; private String descn; - private String logTime; + private String logtime; } diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/statistic/DataWellCoverLoca.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/statistic/DataWellCoverLoca.java index 4f23a92..eb88b83 100644 --- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/statistic/DataWellCoverLoca.java +++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/statistic/DataWellCoverLoca.java @@ -8,6 +8,6 @@ private String wellCode; private String lat; private String lng; - private String logTime; - private String upTime; + private String logtime; + private String uptime; } diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceDataListController.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceDataListController.java index 09d3c0d..0f13e84 100644 --- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceDataListController.java +++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceDataListController.java @@ -1,13 +1,8 @@ package com.casic.missiles.modular.system.controller; -import cn.hutool.core.collection.CollectionUtil; -import com.baomidou.mybatisplus.core.metadata.OrderItem; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.casic.missiles.core.application.context.AbstractPermissionContext; import com.casic.missiles.core.datascope.DataScope; -import com.casic.missiles.core.page.PageFactory; import com.casic.missiles.model.response.ResponseData; -import com.casic.missiles.modular.system.dto.ExcelModel.*; import com.casic.missiles.modular.system.dto.statistic.*; import com.casic.missiles.modular.system.service.DeviceDataListService; import lombok.extern.slf4j.Slf4j; @@ -27,92 +22,88 @@ // @Permission @GetMapping(value = "/welldata/list") - public Object wellDataList(String keywords, String deptid, String beginTime, String endTime) { + public Object wellDataList(String devcode, String wellCode, String beginTime, String endTime) { //查询数据权限 使用默认DEPTID 字段 DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope(); - List list = deviceDataListService.selectWellDataScope(dataScope, deptid, beginTime, endTime, keywords); - + List list = deviceDataListService.selectWellDataScope(dataScope, devcode, beginTime, endTime, wellCode); return ResponseData.success(list); } - /** * 开挖监测仪数据查询 * - * @param keywords - * @param deptid + * @param devcode + * @param wellCode * @param beginTime * @param endTime * @return */ - // @Permission + //@Permission @GetMapping(value = "/digdata/list") - public Object digDataList(String keywords, String deptid, String beginTime, String endTime) { + public Object digDataList(String devcode, String wellCode, String beginTime, String endTime) { DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope(); - List mapList = deviceDataListService.selectDigDataScope(dataScope, deptid, beginTime, endTime, keywords); + List mapList = deviceDataListService.selectDigDataScope(dataScope, devcode, beginTime, endTime, wellCode); return ResponseData.success(mapList); } @GetMapping(value = "/liquiddata/list") -// @Permission - public Object liquidDataList(String keywords, String deptid, String beginTime, String endTime) { + //@Permission + public Object liquidDataList(String devcode, String wellCode, String beginTime, String endTime) { //查询数据权限 使用默认DEPTID 字段 DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope(); - List list = deviceDataListService.selectLiquidDataScope(dataScope, deptid, beginTime, endTime, keywords); + List list = deviceDataListService.selectLiquidDataScope(dataScope, devcode, beginTime, endTime, wellCode); return ResponseData.success(list); } @GetMapping(value = "/gasdata/list") - //@Permission - public Object gasDataList(String keywords, String deptid, String beginTime, String endTime) { + public Object gasDataList(String devcode, String wellCode, String beginTime, String endTime) { DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope(); - List deviceDataExcelDtoList = deviceDataListService.selectGasDataScope(dataScope, deptid, beginTime, endTime, keywords); + List deviceDataExcelDtoList = deviceDataListService.selectGasDataScope(dataScope, devcode, beginTime, endTime, wellCode); return ResponseData.success(deviceDataExcelDtoList); } @GetMapping(value = "/noisedata/list") - public Object noiseDataList(String keywords, String deptid, String beginTime, String endTime) { + public Object noiseDataList(String devcode, String wellCode, String beginTime, String endTime) { DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope(); - List mapList = deviceDataListService.selectNoiseDataScope(dataScope, deptid, beginTime, endTime, keywords); + List mapList = deviceDataListService.selectNoiseDataScope(dataScope, devcode, beginTime, endTime, wellCode); return ResponseData.success(mapList); } @GetMapping(value = "/harmfuldata/list") - public Object harmfulDataList(String keywords, String deptid, String beginTime, String endTime) { + public Object harmfulDataList(String devcode, String wellCode, String beginTime, String endTime) { DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope(); - List mapList = deviceDataListService.selectHarmfulDataScope(dataScope, deptid, beginTime, endTime, keywords); + List mapList = deviceDataListService.selectHarmfulDataScope(dataScope, devcode, beginTime, endTime, wellCode); return ResponseData.success(mapList); } @GetMapping(value = "/tempdata/list") - public Object tempDataList(String keywords, String deptid, String beginTime, String endTime) { + public Object tempDataList(String devcode, String wellCode, String beginTime, String endTime) { DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope(); - List mapList = deviceDataListService.selectTempDataScope(dataScope, deptid, beginTime, endTime, keywords); + List mapList = deviceDataListService.selectTempDataScope(dataScope, devcode, beginTime, endTime, wellCode); return ResponseData.success(mapList); } - @GetMapping(value = "/welllocadata/list") - public Object wellLocDataList(String keywords, String deptid, String beginTime, String endTime) { + public Object wellLocDataList(String devcode, String wellCode, String beginTime, String endTime) { DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope(); - List mapList = deviceDataListService.selectWellLocDataScope(dataScope, deptid, beginTime, endTime, keywords); + List mapList = deviceDataListService.selectWellLocDataScope(dataScope, devcode, beginTime, endTime, wellCode); return ResponseData.success(mapList); } @GetMapping(value = "/liquidGasData/list") - public Object liquidGasDataList(String keywords, String deptid, String sensorType, String beginTime, String endTime) { + public Object liquidGasDataList(String devcode, String wellCode, String sensorType, String beginTime, String endTime) { DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope(); - List mapList = deviceDataListService.selectGasLiquidDataScope(dataScope, sensorType, deptid, beginTime, endTime, keywords); + List mapList = deviceDataListService.selectGasLiquidDataScope(dataScope, sensorType, devcode, beginTime, endTime, wellCode); return ResponseData.success(mapList); } @GetMapping(value = "/tubedata/list") //@Permission - public Object tubeDataList(String keywords, String deptid, String beginTime, String endTime) { + public Object tubeDataList(String devcode, String wellCode, String beginTime, String endTime) { DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope(); - List mapList = deviceDataListService.selectTubeDataScope(dataScope, deptid, beginTime, endTime, keywords); + List mapList = deviceDataListService.selectTubeDataScope(dataScope, devcode, beginTime, endTime, wellCode); return ResponseData.success(mapList); } @@ -120,23 +111,20 @@ * 消防栓列表 */ @GetMapping(value = "/hydrant/list") - public Object hydrantList(String keywords, String deptid, String beginTime, String endTime) { + public Object hydrantList(String devcode, String wellCode, String beginTime, String endTime) { DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope(); - List mapList= deviceDataListService.getHydrantlist(dataScope, deptid, beginTime, endTime, keywords); + List mapList= deviceDataListService.getHydrantlist(dataScope, devcode, beginTime, endTime, wellCode); return ResponseData.success(mapList); } - /** * 硫化氢列表 */ @GetMapping(value = "/h2s/list") - public Object h2sList(String keywords, String deptid, String beginTime, String endTime) { + public Object h2sList(String devcode, String wellCode, String beginTime, String endTime) { DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope(); - System.out.println(keywords); - List mapList= deviceDataListService.getH2sDataScope(dataScope, deptid, beginTime, endTime, keywords); + List mapList= deviceDataListService.getH2sDataScope(dataScope, devcode, beginTime, endTime, wellCode); return ResponseData.success(mapList); } - } diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java index 837e653..3d7ae31 100644 --- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java +++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java @@ -623,9 +623,9 @@ */ @GetMapping(value = "/h2s/list-page") public Object h2sList(String keywords, String deptid, String beginTime, String endTime) { - Page page = PageFactory.defaultPage(); + Page page = PageFactory.defaultPage(); DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope(); - ResponseData responseData = deviceService.getH2slist(dataScope, page, deptid, beginTime, endTime, keywords); + ResponseData responseData = deviceService.getH2slist(dataScope, page, keywords, beginTime, endTime, deptid); responseData.setData(super.packForBT(page)); return responseData; } @@ -634,10 +634,10 @@ */ @GetMapping(value = "/h2s/export") public void h2sExport(String keywords, String deptid, String beginTime, String endTime) throws IOException { - Page page = PageFactory.defaultPage(); + Page page = PageFactory.defaultPage(); DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope(); deviceService.getH2slist(dataScope, page, deptid, beginTime, endTime, keywords); - super.exportExcel(DataH2s.class, page.getRecords(), DeviceExportEnum.HYDRANT_EXPORT.getFileName()); + super.exportExcel(H2SDataDto.class, page.getRecords(), DeviceExportEnum.H2S_EXPORT.getFileName()); } } diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/DataAnalysisMapper.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/DataAnalysisMapper.java index ab62e2e..67fb9c9 100644 --- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/DataAnalysisMapper.java +++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/DataAnalysisMapper.java @@ -97,6 +97,6 @@ List getHydrantlist(@Param("dataScope") DataScope dataScope,@Param("page")Page page, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords); - List selectH2sListDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page")Page page, @Param("deptid") String deptid, - @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords); + List selectH2sListDataScopePage(@Param("dataScope") DataScope dataScope, @Param("page")Page page, @Param("keywords") String keywords, + @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("deptid") String deptid); } diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/DeviceDataListMapper.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/DeviceDataListMapper.java index 7114492..732dcc6 100644 --- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/DeviceDataListMapper.java +++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/DeviceDataListMapper.java @@ -19,29 +19,30 @@ * @since 2019-05-13 */ public interface DeviceDataListMapper extends BaseMapper { - List selectWellDataScope(@Param("dataScope") DataScope dataScope, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords); + List selectWellDataScope(@Param("dataScope") DataScope dataScope, @Param("devcode") String devcode, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("wellCode") String wellCode); - List selectDigDataScope(@Param("dataScope") DataScope dataScope, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords); + List selectDigDataScope(@Param("dataScope") DataScope dataScope, @Param("devcode") String devcode, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("wellCode") String wellCode); - List selectLiquidDataScope(@Param("dataScope") DataScope dataScope, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords); + List selectLiquidDataScope(@Param("dataScope") DataScope dataScope, @Param("devcode") String devcode, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("wellCode") String wellCode); - List selectGasDataScope(@Param("dataScope") DataScope dataScope, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords); + List selectGasDataScope(@Param("dataScope") DataScope dataScope, @Param("devcode") String devcode, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("wellCode") String wellCode); - List selectNoiseDataScope(@Param("dataScope") DataScope dataScope, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords); + List selectNoiseDataScope(@Param("dataScope") DataScope dataScope, @Param("devcode") String devcode, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("wellCode") String wellCode); - List selectHarmfulDataScope(@Param("dataScope") DataScope dataScope, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords); + List selectHarmfulDataScope(@Param("dataScope") DataScope dataScope, @Param("devcode") String devcode, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("wellCode") String wellCode); - List selectTempDataScope(@Param("dataScope") DataScope dataScope, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords); + List selectTempDataScope(@Param("dataScope") DataScope dataScope, @Param("devcode") String devcode, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("wellCode") String wellCode); - List selectWellLocDataScope(@Param("dataScope") DataScope dataScope, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords); + List selectWellLocDataScope(@Param("dataScope") DataScope dataScope, @Param("devcode") String devcode, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("wellCode") String wellCode); - List selectGasLiquidDataLiquidScope(@Param("dataScope") DataScope dataScope, @Param("deptIds") List deptIds, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords); + List selectGasLiquidDataLiquidScope(@Param("dataScope") DataScope dataScope, @Param("devcode")String devcode, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("wellCode") String wellCode); - List selectGasLiquidDataGasScope(@Param("dataScope") DataScope dataScope, @Param("deptIds") List deptIds, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords); + List selectGasLiquidDataGasScope(@Param("dataScope") DataScope dataScope, @Param("devcode")String devcode, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("wellCode") String wellCode); - List selectTubeDataScope(@Param("dataScope") DataScope dataScope, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords); + List selectTubeDataScope(@Param("dataScope") DataScope dataScope, @Param("devcode") String devcode, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("wellCode") String wellCode); - List getHydrantlist(@Param("dataScope") DataScope dataScope, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords); + List getHydrantlist(@Param("dataScope") DataScope dataScope, @Param("devcode") String devcode, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("wellCode") String wellCode); - List selectH2sListDataScope(@Param("dataScope") DataScope dataScope, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords); + List selectH2sListDataScope(@Param("dataScope") DataScope dataScope, @Param("devcode") String devcode, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("wellCode") String wellCode); + } diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/DataAnalysisMapper.xml b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/DataAnalysisMapper.xml index a0117ca..6ed130a 100644 --- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/DataAnalysisMapper.xml +++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/DataAnalysisMapper.xml @@ -1255,7 +1255,6 @@ - SELECT dh2s.DEVCODE AS devcode, dh2s.WELL_CODE AS "wellCode", - dh2s.STRENGTH, - dh2s.CELL, + dh2s.STRENGTH AS strength, + dh2s.CELL AS cell, AS uptime, - dh2s.device_type as deviceType + + + + AS logtime, + bdt.TYPE_NAME AS "deviceTypeName", + bd.device_type as deviceType, + bwi.DEPTID AS deptid FROM data_h2s dh2s JOIN bus_well_info bwi ON bwi.WELL_CODE= dh2s.WELL_CODE JOIN bus_device bd ON dh2s.DEVCODE = bd.DEVCODE + LEFT JOIN base_device_type bdt ON bd.DEVICE_TYPE = bdt.ID bd.VALID = '1' AND bwi.VALID = '1' @@ -1323,11 +1329,9 @@ - and (dh2s.DEVCODE like + AND (bd.DEVCODE LIKE - OR dh2s.WELL_CODE LIKE - - ) + OR bd.WELL_CODE LIKE) diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceDataListMapper.xml b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceDataListMapper.xml index adc10af..7010493 100644 --- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceDataListMapper.xml +++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceDataListMapper.xml @@ -107,17 +107,17 @@ - as "LOGTIME", - DESCN, - STATUS + as "logtime", + DESCN as descn, + STATUS as status FROM data_wellcover dw INNER JOIN bus_well_info bwi on dw.WELL_CODE = bwi.WELL_CODE INNER JOIN bus_device bd ON dw.DEVCODE = bd.DEVCODE bd.VALID = '1' AND bwi.VALID = '1' - - and bwi.DEPTID = #{deptid} + + AND dw.DEVCODE = #{devcode} and dw.LOGTIME = ]]> @@ -131,12 +131,8 @@ - - and (dw.DEVCODE like - - OR dw.WELL_CODE LIKE - - ) + + AND dw.WELL_CODE = #{wellCode} ORDER BY LOGTIME DESC @@ -164,76 +160,64 @@ INNER JOIN bus_device bd ON dd.DEVCODE = bd.DEVCODE bd.VALID = '1' AND bwi.VALID = '1' - - and bwi.DEPTID = #{deptid} + + AND dd.DEVCODE = #{devcode} - and dd.UPTIME = ]]> + AND dd.UPTIME = ]]> - and dd.UPTIME + AND dd.UPTIME - - and (dd.DEVCODE like - - OR dd.WELL_CODE LIKE - - ) + + AND dd.WELL_CODE = #{wellCode} ORDER BY dd.UPTIME DESC - - - - @@ -257,8 +241,11 @@ INNER JOIN bus_device bd ON dg.DEVCODE = bd.DEVCODE bd.VALID = '1' AND bwi.VALID = '1' - - and bwi.DEPTID = #{deptid} + + AND dg.DEVCODE = #{devcode} + + + AND dg.WELL_CODE = #{wellCode} and dg.UPTIME = ]]> @@ -272,18 +259,10 @@ - - and (dg.DEVCODE like - - OR dg.WELL_CODE LIKE - - ) - ORDER BY dg.UPTIME DESC - @@ -353,8 +328,11 @@ INNER JOIN bus_device bd ON dth.DEVCODE = bd.DEVCODE bd.VALID = '1' AND bwi.VALID = '1' - - and bwi.DEPTID = #{deptid} + + AND dth.DEVCODE = #{devcode} + + + AND dth.WELL_CODE = #{wellCode} and dth.UPTIME = ]]> @@ -368,13 +346,6 @@ - - and (dth.DEVCODE like - - OR dth.WELL_CODE LIKE - - ) - ORDER BY dth.UPTIME DESC @@ -399,8 +370,11 @@ INNER JOIN bus_device bd ON dn.DEVCODE = bd.DEVCODE bd.VALID = '1' AND bwi.VALID = '1' - - and bwi.DEPTID = #{deptid} + + AND dn.DEVCODE = #{devcode} + + + AND dn.WELL_CODE = #{wellCode} and dn.UPTIME = ]]> @@ -414,13 +388,6 @@ - - and (dn.DEVCODE like - - OR dn.WELL_CODE LIKE - - ) - ORDER BY dn.UPTIME DESC @@ -446,8 +413,11 @@ INNER JOIN bus_device bd ON dwl.DEVCODE = bd.DEVCODE bd.VALID = '1' AND bwi.VALID = '1' - - and bwi.DEPTID = #{deptid} + + AND dwl.DEVCODE = #{devcode} + + + AND dwl.WELL_CODE = #{wellCode} and dwl.UPTIME = ]]> @@ -461,125 +431,104 @@ - - and (dwl.DEVCODE like - - OR dwl.WELL_CODE LIKE - - ) - ORDER BY dwl.UPTIME DESC - + @@ -639,14 +583,17 @@ AS logtime, - dh.DESCN AS descn + dh.DESCN AS descn FROM data_hydrant dh JOIN bus_well_info bwi ON bwi.WELL_CODE= dh.WELL_CODE JOIN bus_device bd ON dh.DEVCODE = bd.DEVCODE bd.VALID = '1' AND bwi.VALID = '1' - - and bwi.DEPTID = #{deptid} + + AND dh.DEVCODE = #{devcode} + + + AND dh.WELL_CODE = #{wellCode} and dh.LOGTIME = ]]> @@ -660,13 +607,6 @@ - - and (dh.DEVCODE like - - OR dh.WELL_CODE LIKE - - ) - @@ -681,14 +621,17 @@ AS uptime, bwi.deptid, - dh2s.device_type as deviceType + bd.device_type as deviceType FROM data_h2s dh2s JOIN bus_well_info bwi ON bwi.WELL_CODE= dh2s.WELL_CODE JOIN bus_device bd ON dh2s.DEVCODE = bd.DEVCODE bd.VALID = '1' AND bwi.VALID = '1' - - and bwi.DEPTID = #{deptid} + + AND dh2s.DEVCODE = #{devcode} + + + AND dh2s.WELL_CODE = #{wellCode} and dh2s.UPTIME = ]]> @@ -702,13 +645,6 @@ - - and (dh2s.DEVCODE like - - OR dh2s.WELL_CODE LIKE - - ) - diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/DeviceDataListService.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/DeviceDataListService.java index 698a8ea..9bfe937 100644 --- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/DeviceDataListService.java +++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/DeviceDataListService.java @@ -19,46 +19,46 @@ /** * 开挖监测仪数据查询 */ - List selectDigDataScope(DataScope dataScope, String deptid, String beginTime, String endTime, String keywords); + List selectDigDataScope(DataScope dataScope, String devcode, String beginTime, String endTime, String wellCode); /** * 根据条件检索井盖监测数据列表 */ - List selectWellDataScope(DataScope dataScope, String deptid, String beginTime, String endTime, String keywords); + List selectWellDataScope(DataScope dataScope, String devcode, String beginTime, String endTime, String wellCode); /** * 根据检索条件查询液位检测数据 */ - List selectLiquidDataScope(DataScope dataScope, String deptid, String beginTime, String endTime, String keywords); + List selectLiquidDataScope(DataScope dataScope, String devcode, String beginTime, String endTime, String wellCode); /** * 燃气数据查询 */ - List selectGasDataScope(DataScope dataScope, String deptid, String beginTime, String endTime, String keywords); + List selectGasDataScope(DataScope dataScope, String devcode, String beginTime, String endTime, String wellCode); /** * 噪声记录仪数据查询 */ - List selectNoiseDataScope(DataScope dataScope, String deptid, String beginTime, String endTime, String keywords); + List selectNoiseDataScope(DataScope dataScope, String devcode, String beginTime, String endTime, String wellCode); /** * 有害气体数据查询 */ - List selectHarmfulDataScope(DataScope dataScope, String deptid, String beginTime, String endTime, String keywords); + List selectHarmfulDataScope(DataScope dataScope, String devcode, String beginTime, String endTime, String wellCode); /** * 温湿度数据查询 */ - List selectTempDataScope(DataScope dataScope, String deptid, String beginTime, String endTime, String keywords); + List selectTempDataScope(DataScope dataScope, String devcode, String beginTime, String endTime, String wellCode); /** * 井盖定位监测仪数据查询 */ - List selectWellLocDataScope(DataScope dataScope, String deptid, String beginTime, String endTime, String keywords); + List selectWellLocDataScope(DataScope dataScope, String devcode, String beginTime, String endTime, String wellCode); - List selectGasLiquidDataScope(DataScope dataScope, String sensorType, String deptid, String beginTime, String endTime, String keywords); + List selectGasLiquidDataScope(DataScope dataScope, String sensorType, String devcode, String beginTime, String endTime, String wellCode); /** * 管盯数据查询 */ - List selectTubeDataScope(DataScope dataScope, String deptid, String beginTime, String endTime, String keywords); + List selectTubeDataScope(DataScope dataScope, String devcode, String beginTime, String endTime, String wellCode); - List getHydrantlist(DataScope dataScope, String deptid, String beginTime, String endTime, String keywords); + List getHydrantlist(DataScope dataScope, String devcode, String beginTime, String endTime, String wellCode); - List getH2sDataScope(DataScope dataScope, String deptid, String beginTime, String endTime, String keywords); + List getH2sDataScope(DataScope dataScope, String devcode, String beginTime, String endTime, String wellCode); } \ No newline at end of file diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/IDataAnalysisService.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/IDataAnalysisService.java index d09c12e..a75ed02 100644 --- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/IDataAnalysisService.java +++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/IDataAnalysisService.java @@ -126,5 +126,5 @@ ResponseData getHydrantlist(DataScope dataScope, Page page, String deptid, String beginTime, String endTime, String keywords); - ResponseData getH2slist(DataScope dataScope, Page page, String deptid, String beginTime, String endTime, String keywords); + ResponseData getH2slist(DataScope dataScope, Page page, String keywords, String beginTime, String endTime, String deptid); } diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceDataListServiceImpl.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceDataListServiceImpl.java index 95baa10..5abf45c 100644 --- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceDataListServiceImpl.java +++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceDataListServiceImpl.java @@ -37,81 +37,76 @@ private AbstractPermissionContext permissionService; @Override - public List selectWellDataScope(DataScope dataScope, String deptid, String beginTime, String endTime, String keywords) { - return this.baseMapper.selectWellDataScope(dataScope, deptid, beginTime, endTime, keywords); + public List selectWellDataScope(DataScope dataScope, String devcode, String beginTime, String endTime, String wellCode){ + return this.baseMapper.selectWellDataScope(dataScope, devcode, beginTime, endTime, wellCode); } @Override - public List selectDigDataScope(DataScope dataScope, String deptid, String beginTime, String endTime, String keywords) { - return this.baseMapper.selectDigDataScope(dataScope, deptid, beginTime, endTime, keywords); + public List selectDigDataScope(DataScope dataScope, String devcode, String beginTime, String endTime, String wellCode) { + return this.baseMapper.selectDigDataScope(dataScope, devcode, beginTime, endTime, wellCode); } @Override - public List selectLiquidDataScope(DataScope dataScope, String deptid, String beginTime, String endTime, String keywords) { - return this.baseMapper.selectLiquidDataScope(dataScope, deptid, beginTime, endTime, keywords); + public List selectLiquidDataScope(DataScope dataScope, String devcode, String beginTime, String endTime, String wellCode) { + return this.baseMapper.selectLiquidDataScope(dataScope, devcode, beginTime, endTime, wellCode); } @Override - public List selectGasDataScope(DataScope dataScope, String deptid, String beginTime, String endTime, String keywords) { - return this.baseMapper.selectGasDataScope(dataScope, deptid, beginTime, endTime, keywords); + public List selectGasDataScope(DataScope dataScope, String devcode, String beginTime, String endTime, String wellCode) { + return this.baseMapper.selectGasDataScope(dataScope, devcode, beginTime, endTime, wellCode); } @Override - public List selectNoiseDataScope(DataScope dataScope, String deptid, String beginTime, String endTime, String keywords) { - return this.baseMapper.selectNoiseDataScope(dataScope, deptid, beginTime, endTime, keywords); + public List selectNoiseDataScope(DataScope dataScope, String devcode, String beginTime, String endTime, String wellCode) { + return this.baseMapper.selectNoiseDataScope(dataScope, devcode, beginTime, endTime, wellCode); } @Override - public List selectHarmfulDataScope(DataScope dataScope, String deptid, String beginTime, String endTime, String keywords) { - return this.baseMapper.selectHarmfulDataScope(dataScope, deptid, beginTime, endTime, keywords); + public List selectHarmfulDataScope(DataScope dataScope, String devcode, String beginTime, String endTime, String wellCode){ + return this.baseMapper.selectHarmfulDataScope(dataScope, devcode, beginTime, endTime, wellCode); } @Override - public List selectTempDataScope(DataScope dataScope, String deptid, String beginTime, String endTime, String keywords) { - return this.baseMapper.selectTempDataScope(dataScope, deptid, beginTime, endTime, keywords); + public List selectTempDataScope(DataScope dataScope, String devcode, String beginTime, String endTime, String wellCode){ + return this.baseMapper.selectTempDataScope(dataScope, devcode, beginTime, endTime, wellCode); } @Override - public List selectWellLocDataScope(DataScope dataScope, String deptid, String beginTime, String endTime, String keywords) { - List mapList = this.baseMapper.selectWellLocDataScope(dataScope, deptid, beginTime, endTime, keywords); + public List selectWellLocDataScope(DataScope dataScope, String devcode, String beginTime, String endTime, String wellCode) { + List mapList = this.baseMapper.selectWellLocDataScope(dataScope, devcode, beginTime, endTime, wellCode); return mapList; } @Override - public List selectGasLiquidDataScope(DataScope dataScope, String sensorType, String deptid, String beginTime, String endTime, String keywords) { - List deptIds = null; - if (StrUtil.isNotEmpty(deptid)) { - deptIds = permissionService.getDeptService().getIdsByPid(deptid, null); - deptIds.add(Long.valueOf(deptid)); - } + public List selectGasLiquidDataScope(DataScope dataScope, String sensorType, String devcode, String beginTime, String endTime, String wellCode) { List dataGasLiquidList = new ArrayList<>(); if ("liquid".equals(sensorType)) { - dataGasLiquidList = this.baseMapper.selectGasLiquidDataLiquidScope(dataScope, deptIds, beginTime, endTime, keywords); + dataGasLiquidList = this.baseMapper.selectGasLiquidDataLiquidScope(dataScope, devcode, beginTime, endTime, wellCode); } if ("gas".equals(sensorType)) { - dataGasLiquidList = this.baseMapper.selectGasLiquidDataGasScope(dataScope, deptIds, beginTime, endTime, keywords); + dataGasLiquidList = this.baseMapper.selectGasLiquidDataGasScope(dataScope, devcode, beginTime, endTime, wellCode); } System.out.println(dataGasLiquidList); return dataGasLiquidList; } @Override - public List selectTubeDataScope(DataScope dataScope, String deptid, String beginTime, String endTime, String keywords) { - List mapList = this.baseMapper.selectTubeDataScope(dataScope, deptid, beginTime, endTime, keywords); + public List selectTubeDataScope(DataScope dataScope, String devcode, String beginTime, String endTime, String wellCode){ + List mapList = this.baseMapper.selectTubeDataScope(dataScope, devcode, beginTime, endTime, wellCode); return mapList; } @Override - public List getHydrantlist(DataScope dataScope, String deptid, String beginTime, String endTime, String keywords) { - List mapList = this.baseMapper.getHydrantlist(dataScope, deptid, beginTime, endTime, keywords); + public List getHydrantlist(DataScope dataScope, String devcode, String beginTime, String endTime, String wellCode){ + List mapList = this.baseMapper.getHydrantlist(dataScope, devcode, beginTime, endTime, wellCode); return mapList; } @Override - public List getH2sDataScope(DataScope dataScope, String deptid, String beginTime, String endTime, String keywords) { - return this.baseMapper.selectH2sListDataScope(dataScope, deptid, beginTime, endTime, keywords); + public List getH2sDataScope(DataScope dataScope, String devcode, String beginTime, String endTime, String wellCode) { + return this.baseMapper.selectH2sListDataScope(dataScope, devcode, beginTime, endTime, wellCode); } } diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/IDataAnalysisServiceImpl.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/IDataAnalysisServiceImpl.java index 9ae5886..5b03b61 100644 --- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/IDataAnalysisServiceImpl.java +++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/IDataAnalysisServiceImpl.java @@ -559,16 +559,19 @@ return responseData; } - public ResponseData getH2slist(DataScope dataScope, Page page, String deptid, String beginTime, String endTime, String keywords) { + public ResponseData getH2slist(DataScope dataScope, Page page, String keywords, String beginTime, String endTime, String deptid){ ResponseData responseData = new ResponseData(); try { - List h2sDataDtoList = this.baseMapper.selectH2sListDataScopePage(dataScope, page, deptid, beginTime, endTime, keywords); + List h2sDataDtoList = this.baseMapper.selectH2sListDataScopePage(dataScope, page, keywords, beginTime, endTime, deptid); + h2sDataDtoList.forEach( + h2sDataDto->h2sDataDto.setDeptName(permissionService.getDeptService().getDeptName(h2sDataDto.getDeptid())) + ); page.setRecords(h2sDataDtoList); responseData.setData(page); responseData.setCode(200); responseData.setMessage("查询成功"); } catch (DataAccessException dex) { - log.error("主题：硫化氢数据库异常，关键字{}，开始时间{}，结束时间{}，部门编号{}，异常信息", + log.error("主题：硫化氢数据库异常，关键字{}，开始时间{}，结束时间{}，部门编号{}，异常信息{}", keywords, beginTime, endTime, deptid, dex); responseData.setCode(500); responseData.setMessage("数据库查询异常"); diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/H2SDataDto.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/H2SDataDto.java new file mode 100644 index 0000000..8771495 --- /dev/null +++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/ExcelModel/H2SDataDto.java @@ -0,0 +1,53 @@ +package com.casic.missiles.modular.system.dto.ExcelModel; + +import com.alibaba.excel.annotation.ExcelProperty; +import com.alibaba.excel.annotation.write.style.ColumnWidth; +import com.alibaba.excel.annotation.write.style.ContentRowHeight; +import com.alibaba.excel.annotation.write.style.ContentStyle; +import com.alibaba.excel.annotation.write.style.HeadRowHeight; +import com.alibaba.excel.enums.poi.BorderStyleEnum; +import lombok.Data; +import lombok.NoArgsConstructor; + +/** + * 氢硫酸 + * + * @author cz + * @date 2022-07-28 + */ +@ColumnWidth(30) +@HeadRowHeight(15) +@ContentRowHeight(20) +@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) +@Data +@NoArgsConstructor +public class H2SDataDto { + @ExcelProperty("设备编号") + private String devcode; + + @ExcelProperty("点位编号") + private String wellCode; + + @ExcelProperty("设备类型") + private String deviceType; + + @ExcelProperty("设备类型") + private String deviceTypeName; + + private String deptid; + + @ExcelProperty("权属部门") + private String deptName; + + @ExcelProperty("硫化氢浓度") + private String strength; + + @ExcelProperty("电量") + private String cell; + + @ExcelProperty("采集时间") + private String logtime; + @ExcelProperty("记录时间") + private String uptime; + +} diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/statistic/DataGasLiquid.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/statistic/DataGasLiquid.java index ad3eca0..c24a391 100644 --- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/statistic/DataGasLiquid.java +++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/statistic/DataGasLiquid.java @@ -9,7 +9,7 @@ private String liquiddata; private String cell; private String strength; - private String logTime; - private String upTime; + private String logtime; + private String uptime; } diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/statistic/DataH2s.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/statistic/DataH2s.java index b7ce91a..993a9b3 100644 --- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/statistic/DataH2s.java +++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/statistic/DataH2s.java @@ -9,12 +9,7 @@ import lombok.Data; import lombok.NoArgsConstructor; -@ColumnWidth(30) -@HeadRowHeight(15) -@ContentRowHeight(20) -@ContentStyle(borderLeft = BorderStyleEnum.THIN, borderBottom = BorderStyleEnum.THIN, borderTop = BorderStyleEnum.THIN, borderRight = BorderStyleEnum.THIN) @Data -@NoArgsConstructor public class DataH2s { @ExcelProperty("设备编号") private String devcode; diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/statistic/DataHarmfulGas.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/statistic/DataHarmfulGas.java index a483d73..3c20b8b 100644 --- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/statistic/DataHarmfulGas.java +++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/statistic/DataHarmfulGas.java @@ -1,14 +1,19 @@ package com.casic.missiles.modular.system.dto.statistic; +import com.alibaba.fastjson.annotation.JSONField; import lombok.Data; @Data public class DataHarmfulGas { private String devcode; + @JSONField(name="CO") private String CO; + @JSONField(name="CH4") private String CH4; + @JSONField(name="H2S") private String H2S; + @JSONField(name="O2") private String O2; private String liquidSwitch; private String logtime; diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/statistic/DataHydrant.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/statistic/DataHydrant.java index 3685e90..530ae58 100644 --- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/statistic/DataHydrant.java +++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/statistic/DataHydrant.java @@ -8,5 +8,5 @@ private String wellCode; private String status; private String descn; - private String logTime; + private String logtime; } diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/statistic/DataWellCover.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/statistic/DataWellCover.java index 4296ad2..874900d 100644 --- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/statistic/DataWellCover.java +++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/statistic/DataWellCover.java @@ -13,6 +13,6 @@ private String wellCode; private String status; private String descn; - private String logTime; + private String logtime; } diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/statistic/DataWellCoverLoca.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/statistic/DataWellCoverLoca.java index 4f23a92..eb88b83 100644 --- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/statistic/DataWellCoverLoca.java +++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/dto/statistic/DataWellCoverLoca.java @@ -8,6 +8,6 @@ private String wellCode; private String lat; private String lng; - private String logTime; - private String upTime; + private String logtime; + private String uptime; } diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/enums/DeviceExportEnum.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/enums/DeviceExportEnum.java index dc6e332..df02eed 100644 --- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/enums/DeviceExportEnum.java +++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/enums/DeviceExportEnum.java @@ -22,7 +22,8 @@ ALARMJOB_EXPORT("alarmJobData.xlsx", "alarmJobData.xlsx", "预警工单"), ALARMRECORD_EXPORT("alarmRecordData.xlsx", "alarmRecordData.xlsx", "预警工单"), METHANE_EXPORT("methaneData.xlsx", "methaneData.xlsx", "甲烷数据"), - HYDRANT_EXPORT("hydrantData.xlsx", "hydrantData.xlsx", "消防栓数据") ; + HYDRANT_EXPORT("hydrantData.xlsx", "hydrantData.xlsx", "消防栓数据"), + H2S_EXPORT("h2sData.xlsx", "h2sData.xlsx", "硫化氢数据") ; /** * 导出模板相对路径 */