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 c4c55a7..ff88c26 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 @@ -104,7 +104,7 @@ @GetMapping(value = "/liquidGasData/list") public Object liquidGasDataList(String keywords, String deptid, 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, deptid, beginTime, endTime, keywords); 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 c4c55a7..ff88c26 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 @@ -104,7 +104,7 @@ @GetMapping(value = "/liquidGasData/list") public Object liquidGasDataList(String keywords, String deptid, 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, deptid, beginTime, endTime, keywords); return ResponseData.success(mapList); } 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 f167c0f..12ce114 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 @@ -1,6 +1,7 @@ package com.casic.missiles.modular.system.dao; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.casic.missiles.core.datascope.DataScope; import com.casic.missiles.modular.system.dto.ExcelModel.*; import com.casic.missiles.modular.system.dto.statistic.*; @@ -34,8 +35,9 @@ List selectWellLocDataScope(@Param("dataScope") DataScope dataScope, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords); - List selectGasLiquidDataScope(@Param("dataScope") DataScope dataScope, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords); + List selectGasLiquidDataLiquidScope(@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("deptIds") List deptIds, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords); List selectTubeDataScope(@Param("dataScope") DataScope dataScope, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords); 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 c4c55a7..ff88c26 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 @@ -104,7 +104,7 @@ @GetMapping(value = "/liquidGasData/list") public Object liquidGasDataList(String keywords, String deptid, 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, deptid, beginTime, endTime, keywords); return ResponseData.success(mapList); } 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 f167c0f..12ce114 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 @@ -1,6 +1,7 @@ package com.casic.missiles.modular.system.dao; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.casic.missiles.core.datascope.DataScope; import com.casic.missiles.modular.system.dto.ExcelModel.*; import com.casic.missiles.modular.system.dto.statistic.*; @@ -34,8 +35,9 @@ List selectWellLocDataScope(@Param("dataScope") DataScope dataScope, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords); - List selectGasLiquidDataScope(@Param("dataScope") DataScope dataScope, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords); + List selectGasLiquidDataLiquidScope(@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("deptIds") List deptIds, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords); List selectTubeDataScope(@Param("dataScope") DataScope dataScope, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords); diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/ThirdPartyDataMapper.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/ThirdPartyDataMapper.java index 16225e9..44d1029 100644 --- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/ThirdPartyDataMapper.java +++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/ThirdPartyDataMapper.java @@ -26,4 +26,8 @@ String getDeviceType(@Param("deptid")Long deptId); + + int countRecordsToday(@Param("dataScope") DataScope dataScope, @Param("endTime") String endTime, + @Param("beginTime") String beginTime); + } 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 c4c55a7..ff88c26 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 @@ -104,7 +104,7 @@ @GetMapping(value = "/liquidGasData/list") public Object liquidGasDataList(String keywords, String deptid, 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, deptid, beginTime, endTime, keywords); return ResponseData.success(mapList); } 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 f167c0f..12ce114 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 @@ -1,6 +1,7 @@ package com.casic.missiles.modular.system.dao; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.casic.missiles.core.datascope.DataScope; import com.casic.missiles.modular.system.dto.ExcelModel.*; import com.casic.missiles.modular.system.dto.statistic.*; @@ -34,8 +35,9 @@ List selectWellLocDataScope(@Param("dataScope") DataScope dataScope, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords); - List selectGasLiquidDataScope(@Param("dataScope") DataScope dataScope, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords); + List selectGasLiquidDataLiquidScope(@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("deptIds") List deptIds, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords); List selectTubeDataScope(@Param("dataScope") DataScope dataScope, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords); diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/ThirdPartyDataMapper.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/ThirdPartyDataMapper.java index 16225e9..44d1029 100644 --- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/ThirdPartyDataMapper.java +++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/ThirdPartyDataMapper.java @@ -26,4 +26,8 @@ String getDeviceType(@Param("deptid")Long deptId); + + int countRecordsToday(@Param("dataScope") DataScope dataScope, @Param("endTime") String endTime, + @Param("beginTime") String beginTime); + } 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 8362835..6e2e8fd 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 @@ -292,7 +292,7 @@ dhg.CH4 AS "CH4", dhg.H2S AS "H2S", dhg.O2 AS "O2", - dhg.SWITCH AS switchStart, + dhg.SWITCH AS liquidSwitch, @@ -472,12 +472,17 @@ ORDER BY dwl.UPTIME DESC - SELECT glview.DEVCODE AS devcode , + bd.DEVICE_TYPE AS "deviceType", + bdt.TYPE_NAME AS "deviceTypeName", + bwi.DEPTID AS deptid, glview.WELL_CODE AS "wellCode", + glview.DESCN AS descn, glview.CELL AS cell, - glg.Strength As strength, @@ -489,13 +494,16 @@ glview.LIQUIDDATA FROM data_gasliquid_liquid glview - INNER JOIN data_gasliquid_gas glg ON glview.DEVCODE = glg.DEVCODE - INNER JOIN bus_well_info bwi ON glview.WELL_CODE = bwi.WELL_CODE - INNER JOIN bus_device bd ON glview.DEVCODE = bd.DEVCODE + LEFT JOIN bus_device bd ON glview.DEVCODE = bd.DEVCODE + LEFT JOIN bus_well_info bwi ON glview.WELL_CODE = bwi.WELL_CODE + LEFT JOIN base_device_type bdt ON bd.DEVICE_TYPE = bdt.ID bd.VALID = '1' AND bwi.VALID = '1' - - and bwi.DEPTID = #{deptid} + + and bwi.DEPTID in + + #{i} + and glview.UPTIME = ]]> @@ -519,7 +527,60 @@ ORDER BY glview.UPTIME DESC - + - SELECT glview.DEVCODE AS devcode , + bd.DEVICE_TYPE AS "deviceType", + bdt.TYPE_NAME AS "deviceTypeName", + bwi.DEPTID AS deptid, glview.WELL_CODE AS "wellCode", + glview.DESCN AS descn, glview.CELL AS cell, - glg.Strength As strength, @@ -489,13 +494,16 @@ glview.LIQUIDDATA FROM data_gasliquid_liquid glview - INNER JOIN data_gasliquid_gas glg ON glview.DEVCODE = glg.DEVCODE - INNER JOIN bus_well_info bwi ON glview.WELL_CODE = bwi.WELL_CODE - INNER JOIN bus_device bd ON glview.DEVCODE = bd.DEVCODE + LEFT JOIN bus_device bd ON glview.DEVCODE = bd.DEVCODE + LEFT JOIN bus_well_info bwi ON glview.WELL_CODE = bwi.WELL_CODE + LEFT JOIN base_device_type bdt ON bd.DEVICE_TYPE = bdt.ID bd.VALID = '1' AND bwi.VALID = '1' - - and bwi.DEPTID = #{deptid} + + and bwi.DEPTID in + + #{i} + and glview.UPTIME = ]]> @@ -519,7 +527,60 @@ ORDER BY glview.UPTIME DESC - + + + \ 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 c4c55a7..ff88c26 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 @@ -104,7 +104,7 @@ @GetMapping(value = "/liquidGasData/list") public Object liquidGasDataList(String keywords, String deptid, 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, deptid, beginTime, endTime, keywords); return ResponseData.success(mapList); } 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 f167c0f..12ce114 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 @@ -1,6 +1,7 @@ package com.casic.missiles.modular.system.dao; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.casic.missiles.core.datascope.DataScope; import com.casic.missiles.modular.system.dto.ExcelModel.*; import com.casic.missiles.modular.system.dto.statistic.*; @@ -34,8 +35,9 @@ List selectWellLocDataScope(@Param("dataScope") DataScope dataScope, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords); - List selectGasLiquidDataScope(@Param("dataScope") DataScope dataScope, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords); + List selectGasLiquidDataLiquidScope(@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("deptIds") List deptIds, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords); List selectTubeDataScope(@Param("dataScope") DataScope dataScope, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords); diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/ThirdPartyDataMapper.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/ThirdPartyDataMapper.java index 16225e9..44d1029 100644 --- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/ThirdPartyDataMapper.java +++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/ThirdPartyDataMapper.java @@ -26,4 +26,8 @@ String getDeviceType(@Param("deptid")Long deptId); + + int countRecordsToday(@Param("dataScope") DataScope dataScope, @Param("endTime") String endTime, + @Param("beginTime") String beginTime); + } 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 8362835..6e2e8fd 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 @@ -292,7 +292,7 @@ dhg.CH4 AS "CH4", dhg.H2S AS "H2S", dhg.O2 AS "O2", - dhg.SWITCH AS switchStart, + dhg.SWITCH AS liquidSwitch, @@ -472,12 +472,17 @@ ORDER BY dwl.UPTIME DESC - SELECT glview.DEVCODE AS devcode , + bd.DEVICE_TYPE AS "deviceType", + bdt.TYPE_NAME AS "deviceTypeName", + bwi.DEPTID AS deptid, glview.WELL_CODE AS "wellCode", + glview.DESCN AS descn, glview.CELL AS cell, - glg.Strength As strength, @@ -489,13 +494,16 @@ glview.LIQUIDDATA FROM data_gasliquid_liquid glview - INNER JOIN data_gasliquid_gas glg ON glview.DEVCODE = glg.DEVCODE - INNER JOIN bus_well_info bwi ON glview.WELL_CODE = bwi.WELL_CODE - INNER JOIN bus_device bd ON glview.DEVCODE = bd.DEVCODE + LEFT JOIN bus_device bd ON glview.DEVCODE = bd.DEVCODE + LEFT JOIN bus_well_info bwi ON glview.WELL_CODE = bwi.WELL_CODE + LEFT JOIN base_device_type bdt ON bd.DEVICE_TYPE = bdt.ID bd.VALID = '1' AND bwi.VALID = '1' - - and bwi.DEPTID = #{deptid} + + and bwi.DEPTID in + + #{i} + and glview.UPTIME = ]]> @@ -519,7 +527,60 @@ ORDER BY glview.UPTIME DESC - + + + \ No newline at end of file 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 8df461f..99d1ca1 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 @@ -51,7 +51,7 @@ */ List selectWellLocDataScope(DataScope dataScope, String deptid, String beginTime, String endTime, String keywords); - List selectGasLiquidDataScope(DataScope dataScope, String sensorType, String deptid, String beginTime, String endTime, String keywords); + List selectGasLiquidDataScope(DataScope dataScope, String sensorType, String deptid, String beginTime, String endTime, String keywords); /** * 管盯数据查询 */ 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 c4c55a7..ff88c26 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 @@ -104,7 +104,7 @@ @GetMapping(value = "/liquidGasData/list") public Object liquidGasDataList(String keywords, String deptid, 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, deptid, beginTime, endTime, keywords); return ResponseData.success(mapList); } 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 f167c0f..12ce114 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 @@ -1,6 +1,7 @@ package com.casic.missiles.modular.system.dao; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.casic.missiles.core.datascope.DataScope; import com.casic.missiles.modular.system.dto.ExcelModel.*; import com.casic.missiles.modular.system.dto.statistic.*; @@ -34,8 +35,9 @@ List selectWellLocDataScope(@Param("dataScope") DataScope dataScope, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords); - List selectGasLiquidDataScope(@Param("dataScope") DataScope dataScope, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords); + List selectGasLiquidDataLiquidScope(@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("deptIds") List deptIds, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords); List selectTubeDataScope(@Param("dataScope") DataScope dataScope, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords); diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/ThirdPartyDataMapper.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/ThirdPartyDataMapper.java index 16225e9..44d1029 100644 --- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/ThirdPartyDataMapper.java +++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/ThirdPartyDataMapper.java @@ -26,4 +26,8 @@ String getDeviceType(@Param("deptid")Long deptId); + + int countRecordsToday(@Param("dataScope") DataScope dataScope, @Param("endTime") String endTime, + @Param("beginTime") String beginTime); + } 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 8362835..6e2e8fd 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 @@ -292,7 +292,7 @@ dhg.CH4 AS "CH4", dhg.H2S AS "H2S", dhg.O2 AS "O2", - dhg.SWITCH AS switchStart, + dhg.SWITCH AS liquidSwitch, @@ -472,12 +472,17 @@ ORDER BY dwl.UPTIME DESC - SELECT glview.DEVCODE AS devcode , + bd.DEVICE_TYPE AS "deviceType", + bdt.TYPE_NAME AS "deviceTypeName", + bwi.DEPTID AS deptid, glview.WELL_CODE AS "wellCode", + glview.DESCN AS descn, glview.CELL AS cell, - glg.Strength As strength, @@ -489,13 +494,16 @@ glview.LIQUIDDATA FROM data_gasliquid_liquid glview - INNER JOIN data_gasliquid_gas glg ON glview.DEVCODE = glg.DEVCODE - INNER JOIN bus_well_info bwi ON glview.WELL_CODE = bwi.WELL_CODE - INNER JOIN bus_device bd ON glview.DEVCODE = bd.DEVCODE + LEFT JOIN bus_device bd ON glview.DEVCODE = bd.DEVCODE + LEFT JOIN bus_well_info bwi ON glview.WELL_CODE = bwi.WELL_CODE + LEFT JOIN base_device_type bdt ON bd.DEVICE_TYPE = bdt.ID bd.VALID = '1' AND bwi.VALID = '1' - - and bwi.DEPTID = #{deptid} + + and bwi.DEPTID in + + #{i} + and glview.UPTIME = ]]> @@ -519,7 +527,60 @@ ORDER BY glview.UPTIME DESC - + + + \ No newline at end of file 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 8df461f..99d1ca1 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 @@ -51,7 +51,7 @@ */ List selectWellLocDataScope(DataScope dataScope, String deptid, String beginTime, String endTime, String keywords); - List selectGasLiquidDataScope(DataScope dataScope, String sensorType, String deptid, String beginTime, String endTime, String keywords); + List selectGasLiquidDataScope(DataScope dataScope, String sensorType, String deptid, String beginTime, String endTime, String keywords); /** * 管盯数据查询 */ 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 a2ed0fd..3d758d2 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 @@ -81,8 +81,21 @@ } @Override - public List selectGasLiquidDataScope(DataScope dataScope, String sensorType, String deptid, String beginTime, String endTime, String keywords) { - return this.baseMapper.selectGasLiquidDataScope(dataScope, deptid, beginTime, endTime, keywords); + 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)); + } + List dataGasLiquidList = new ArrayList<>(); + if ("liquid".equals(sensorType)) { + dataGasLiquidList = this.baseMapper.selectGasLiquidDataLiquidScope(dataScope, deptIds, beginTime, endTime, keywords); + } + if ("gas".equals(sensorType)) { + dataGasLiquidList = this.baseMapper.selectGasLiquidDataGasScope(dataScope, deptIds, beginTime, endTime, keywords); + } + System.out.println(dataGasLiquidList); + return dataGasLiquidList; } @Override 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 c4c55a7..ff88c26 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 @@ -104,7 +104,7 @@ @GetMapping(value = "/liquidGasData/list") public Object liquidGasDataList(String keywords, String deptid, 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, deptid, beginTime, endTime, keywords); return ResponseData.success(mapList); } 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 f167c0f..12ce114 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 @@ -1,6 +1,7 @@ package com.casic.missiles.modular.system.dao; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.casic.missiles.core.datascope.DataScope; import com.casic.missiles.modular.system.dto.ExcelModel.*; import com.casic.missiles.modular.system.dto.statistic.*; @@ -34,8 +35,9 @@ List selectWellLocDataScope(@Param("dataScope") DataScope dataScope, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords); - List selectGasLiquidDataScope(@Param("dataScope") DataScope dataScope, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords); + List selectGasLiquidDataLiquidScope(@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("deptIds") List deptIds, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords); List selectTubeDataScope(@Param("dataScope") DataScope dataScope, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords); diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/ThirdPartyDataMapper.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/ThirdPartyDataMapper.java index 16225e9..44d1029 100644 --- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/ThirdPartyDataMapper.java +++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/ThirdPartyDataMapper.java @@ -26,4 +26,8 @@ String getDeviceType(@Param("deptid")Long deptId); + + int countRecordsToday(@Param("dataScope") DataScope dataScope, @Param("endTime") String endTime, + @Param("beginTime") String beginTime); + } 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 8362835..6e2e8fd 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 @@ -292,7 +292,7 @@ dhg.CH4 AS "CH4", dhg.H2S AS "H2S", dhg.O2 AS "O2", - dhg.SWITCH AS switchStart, + dhg.SWITCH AS liquidSwitch, @@ -472,12 +472,17 @@ ORDER BY dwl.UPTIME DESC - SELECT glview.DEVCODE AS devcode , + bd.DEVICE_TYPE AS "deviceType", + bdt.TYPE_NAME AS "deviceTypeName", + bwi.DEPTID AS deptid, glview.WELL_CODE AS "wellCode", + glview.DESCN AS descn, glview.CELL AS cell, - glg.Strength As strength, @@ -489,13 +494,16 @@ glview.LIQUIDDATA FROM data_gasliquid_liquid glview - INNER JOIN data_gasliquid_gas glg ON glview.DEVCODE = glg.DEVCODE - INNER JOIN bus_well_info bwi ON glview.WELL_CODE = bwi.WELL_CODE - INNER JOIN bus_device bd ON glview.DEVCODE = bd.DEVCODE + LEFT JOIN bus_device bd ON glview.DEVCODE = bd.DEVCODE + LEFT JOIN bus_well_info bwi ON glview.WELL_CODE = bwi.WELL_CODE + LEFT JOIN base_device_type bdt ON bd.DEVICE_TYPE = bdt.ID bd.VALID = '1' AND bwi.VALID = '1' - - and bwi.DEPTID = #{deptid} + + and bwi.DEPTID in + + #{i} + and glview.UPTIME = ]]> @@ -519,7 +527,60 @@ ORDER BY glview.UPTIME DESC - + + + \ No newline at end of file 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 8df461f..99d1ca1 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 @@ -51,7 +51,7 @@ */ List selectWellLocDataScope(DataScope dataScope, String deptid, String beginTime, String endTime, String keywords); - List selectGasLiquidDataScope(DataScope dataScope, String sensorType, String deptid, String beginTime, String endTime, String keywords); + List selectGasLiquidDataScope(DataScope dataScope, String sensorType, String deptid, String beginTime, String endTime, String keywords); /** * 管盯数据查询 */ 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 a2ed0fd..3d758d2 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 @@ -81,8 +81,21 @@ } @Override - public List selectGasLiquidDataScope(DataScope dataScope, String sensorType, String deptid, String beginTime, String endTime, String keywords) { - return this.baseMapper.selectGasLiquidDataScope(dataScope, deptid, beginTime, endTime, keywords); + 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)); + } + List dataGasLiquidList = new ArrayList<>(); + if ("liquid".equals(sensorType)) { + dataGasLiquidList = this.baseMapper.selectGasLiquidDataLiquidScope(dataScope, deptIds, beginTime, endTime, keywords); + } + if ("gas".equals(sensorType)) { + dataGasLiquidList = this.baseMapper.selectGasLiquidDataGasScope(dataScope, deptIds, beginTime, endTime, keywords); + } + System.out.println(dataGasLiquidList); + return dataGasLiquidList; } @Override diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/ThirdPartyDataServiceImpl.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/ThirdPartyDataServiceImpl.java index 6980ad4..dd59ab7 100644 --- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/ThirdPartyDataServiceImpl.java +++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/ThirdPartyDataServiceImpl.java @@ -108,10 +108,15 @@ String beginTime = today + " 00:00:00"; String endTime = today + " 23:59:59"; try { - Long deptId = permissionService.getAuthService().getLoginUser().getDeptId(); - String deviceTypes = thirdPartyMapper.getDeviceType(deptId); //设备类型 - List> result = countThirdRecord(dataScope, deviceTypes, beginTime, endTime); - responseData.setData(result.size()); + Long deptId = permissionService.getAuthService().getLoginUser().getDeptId();//根绝当前角色获取所在部门 +// String deviceTypes = thirdPartyMapper.getDeviceType(deptId); //根据所在部门获取已授权的设备类型 +// List deviceList = new ArrayList<>(); +// //转化为列表类型 +// for (Object deviceType : JSON.parseObject(deviceTypes, List.class)) { +// deviceList.add(deviceType.toString()); +// } + int num = thirdPartyMapper.countRecordsToday(dataScope, endTime, beginTime); // + responseData.setData(num); responseData.setMessage("查询成功"); responseData.setCode(200); } catch (DataAccessException dex) { 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 c4c55a7..ff88c26 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 @@ -104,7 +104,7 @@ @GetMapping(value = "/liquidGasData/list") public Object liquidGasDataList(String keywords, String deptid, 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, deptid, beginTime, endTime, keywords); return ResponseData.success(mapList); } 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 f167c0f..12ce114 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 @@ -1,6 +1,7 @@ package com.casic.missiles.modular.system.dao; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.casic.missiles.core.datascope.DataScope; import com.casic.missiles.modular.system.dto.ExcelModel.*; import com.casic.missiles.modular.system.dto.statistic.*; @@ -34,8 +35,9 @@ List selectWellLocDataScope(@Param("dataScope") DataScope dataScope, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords); - List selectGasLiquidDataScope(@Param("dataScope") DataScope dataScope, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords); + List selectGasLiquidDataLiquidScope(@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("deptIds") List deptIds, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords); List selectTubeDataScope(@Param("dataScope") DataScope dataScope, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords); diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/ThirdPartyDataMapper.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/ThirdPartyDataMapper.java index 16225e9..44d1029 100644 --- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/ThirdPartyDataMapper.java +++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/ThirdPartyDataMapper.java @@ -26,4 +26,8 @@ String getDeviceType(@Param("deptid")Long deptId); + + int countRecordsToday(@Param("dataScope") DataScope dataScope, @Param("endTime") String endTime, + @Param("beginTime") String beginTime); + } 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 8362835..6e2e8fd 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 @@ -292,7 +292,7 @@ dhg.CH4 AS "CH4", dhg.H2S AS "H2S", dhg.O2 AS "O2", - dhg.SWITCH AS switchStart, + dhg.SWITCH AS liquidSwitch, @@ -472,12 +472,17 @@ ORDER BY dwl.UPTIME DESC - SELECT glview.DEVCODE AS devcode , + bd.DEVICE_TYPE AS "deviceType", + bdt.TYPE_NAME AS "deviceTypeName", + bwi.DEPTID AS deptid, glview.WELL_CODE AS "wellCode", + glview.DESCN AS descn, glview.CELL AS cell, - glg.Strength As strength, @@ -489,13 +494,16 @@ glview.LIQUIDDATA FROM data_gasliquid_liquid glview - INNER JOIN data_gasliquid_gas glg ON glview.DEVCODE = glg.DEVCODE - INNER JOIN bus_well_info bwi ON glview.WELL_CODE = bwi.WELL_CODE - INNER JOIN bus_device bd ON glview.DEVCODE = bd.DEVCODE + LEFT JOIN bus_device bd ON glview.DEVCODE = bd.DEVCODE + LEFT JOIN bus_well_info bwi ON glview.WELL_CODE = bwi.WELL_CODE + LEFT JOIN base_device_type bdt ON bd.DEVICE_TYPE = bdt.ID bd.VALID = '1' AND bwi.VALID = '1' - - and bwi.DEPTID = #{deptid} + + and bwi.DEPTID in + + #{i} + and glview.UPTIME = ]]> @@ -519,7 +527,60 @@ ORDER BY glview.UPTIME DESC - + + + \ No newline at end of file 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 8df461f..99d1ca1 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 @@ -51,7 +51,7 @@ */ List selectWellLocDataScope(DataScope dataScope, String deptid, String beginTime, String endTime, String keywords); - List selectGasLiquidDataScope(DataScope dataScope, String sensorType, String deptid, String beginTime, String endTime, String keywords); + List selectGasLiquidDataScope(DataScope dataScope, String sensorType, String deptid, String beginTime, String endTime, String keywords); /** * 管盯数据查询 */ 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 a2ed0fd..3d758d2 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 @@ -81,8 +81,21 @@ } @Override - public List selectGasLiquidDataScope(DataScope dataScope, String sensorType, String deptid, String beginTime, String endTime, String keywords) { - return this.baseMapper.selectGasLiquidDataScope(dataScope, deptid, beginTime, endTime, keywords); + 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)); + } + List dataGasLiquidList = new ArrayList<>(); + if ("liquid".equals(sensorType)) { + dataGasLiquidList = this.baseMapper.selectGasLiquidDataLiquidScope(dataScope, deptIds, beginTime, endTime, keywords); + } + if ("gas".equals(sensorType)) { + dataGasLiquidList = this.baseMapper.selectGasLiquidDataGasScope(dataScope, deptIds, beginTime, endTime, keywords); + } + System.out.println(dataGasLiquidList); + return dataGasLiquidList; } @Override diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/ThirdPartyDataServiceImpl.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/ThirdPartyDataServiceImpl.java index 6980ad4..dd59ab7 100644 --- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/ThirdPartyDataServiceImpl.java +++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/ThirdPartyDataServiceImpl.java @@ -108,10 +108,15 @@ String beginTime = today + " 00:00:00"; String endTime = today + " 23:59:59"; try { - Long deptId = permissionService.getAuthService().getLoginUser().getDeptId(); - String deviceTypes = thirdPartyMapper.getDeviceType(deptId); //设备类型 - List> result = countThirdRecord(dataScope, deviceTypes, beginTime, endTime); - responseData.setData(result.size()); + Long deptId = permissionService.getAuthService().getLoginUser().getDeptId();//根绝当前角色获取所在部门 +// String deviceTypes = thirdPartyMapper.getDeviceType(deptId); //根据所在部门获取已授权的设备类型 +// List deviceList = new ArrayList<>(); +// //转化为列表类型 +// for (Object deviceType : JSON.parseObject(deviceTypes, List.class)) { +// deviceList.add(deviceType.toString()); +// } + int num = thirdPartyMapper.countRecordsToday(dataScope, endTime, beginTime); // + responseData.setData(num); responseData.setMessage("查询成功"); responseData.setCode(200); } catch (DataAccessException dex) { diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java index e45613c..6a62043 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java @@ -276,7 +276,7 @@ /** * 离线设备列表 */ - @RequestMapping(value = "/offlineListPage") + @RequestMapping(value = "/offline-list-page") @ResponseBody @BussinessLog(value = "离线设备列表") public Object offlineListPage(String deviceCode, String deviceType) { 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 c4c55a7..ff88c26 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 @@ -104,7 +104,7 @@ @GetMapping(value = "/liquidGasData/list") public Object liquidGasDataList(String keywords, String deptid, 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, deptid, beginTime, endTime, keywords); return ResponseData.success(mapList); } 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 f167c0f..12ce114 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 @@ -1,6 +1,7 @@ package com.casic.missiles.modular.system.dao; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.casic.missiles.core.datascope.DataScope; import com.casic.missiles.modular.system.dto.ExcelModel.*; import com.casic.missiles.modular.system.dto.statistic.*; @@ -34,8 +35,9 @@ List selectWellLocDataScope(@Param("dataScope") DataScope dataScope, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords); - List selectGasLiquidDataScope(@Param("dataScope") DataScope dataScope, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords); + List selectGasLiquidDataLiquidScope(@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("deptIds") List deptIds, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords); List selectTubeDataScope(@Param("dataScope") DataScope dataScope, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords); diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/ThirdPartyDataMapper.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/ThirdPartyDataMapper.java index 16225e9..44d1029 100644 --- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/ThirdPartyDataMapper.java +++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/ThirdPartyDataMapper.java @@ -26,4 +26,8 @@ String getDeviceType(@Param("deptid")Long deptId); + + int countRecordsToday(@Param("dataScope") DataScope dataScope, @Param("endTime") String endTime, + @Param("beginTime") String beginTime); + } 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 8362835..6e2e8fd 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 @@ -292,7 +292,7 @@ dhg.CH4 AS "CH4", dhg.H2S AS "H2S", dhg.O2 AS "O2", - dhg.SWITCH AS switchStart, + dhg.SWITCH AS liquidSwitch, @@ -472,12 +472,17 @@ ORDER BY dwl.UPTIME DESC - SELECT glview.DEVCODE AS devcode , + bd.DEVICE_TYPE AS "deviceType", + bdt.TYPE_NAME AS "deviceTypeName", + bwi.DEPTID AS deptid, glview.WELL_CODE AS "wellCode", + glview.DESCN AS descn, glview.CELL AS cell, - glg.Strength As strength, @@ -489,13 +494,16 @@ glview.LIQUIDDATA FROM data_gasliquid_liquid glview - INNER JOIN data_gasliquid_gas glg ON glview.DEVCODE = glg.DEVCODE - INNER JOIN bus_well_info bwi ON glview.WELL_CODE = bwi.WELL_CODE - INNER JOIN bus_device bd ON glview.DEVCODE = bd.DEVCODE + LEFT JOIN bus_device bd ON glview.DEVCODE = bd.DEVCODE + LEFT JOIN bus_well_info bwi ON glview.WELL_CODE = bwi.WELL_CODE + LEFT JOIN base_device_type bdt ON bd.DEVICE_TYPE = bdt.ID bd.VALID = '1' AND bwi.VALID = '1' - - and bwi.DEPTID = #{deptid} + + and bwi.DEPTID in + + #{i} + and glview.UPTIME = ]]> @@ -519,7 +527,60 @@ ORDER BY glview.UPTIME DESC - + + + \ No newline at end of file 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 8df461f..99d1ca1 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 @@ -51,7 +51,7 @@ */ List selectWellLocDataScope(DataScope dataScope, String deptid, String beginTime, String endTime, String keywords); - List selectGasLiquidDataScope(DataScope dataScope, String sensorType, String deptid, String beginTime, String endTime, String keywords); + List selectGasLiquidDataScope(DataScope dataScope, String sensorType, String deptid, String beginTime, String endTime, String keywords); /** * 管盯数据查询 */ 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 a2ed0fd..3d758d2 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 @@ -81,8 +81,21 @@ } @Override - public List selectGasLiquidDataScope(DataScope dataScope, String sensorType, String deptid, String beginTime, String endTime, String keywords) { - return this.baseMapper.selectGasLiquidDataScope(dataScope, deptid, beginTime, endTime, keywords); + 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)); + } + List dataGasLiquidList = new ArrayList<>(); + if ("liquid".equals(sensorType)) { + dataGasLiquidList = this.baseMapper.selectGasLiquidDataLiquidScope(dataScope, deptIds, beginTime, endTime, keywords); + } + if ("gas".equals(sensorType)) { + dataGasLiquidList = this.baseMapper.selectGasLiquidDataGasScope(dataScope, deptIds, beginTime, endTime, keywords); + } + System.out.println(dataGasLiquidList); + return dataGasLiquidList; } @Override diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/ThirdPartyDataServiceImpl.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/ThirdPartyDataServiceImpl.java index 6980ad4..dd59ab7 100644 --- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/ThirdPartyDataServiceImpl.java +++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/ThirdPartyDataServiceImpl.java @@ -108,10 +108,15 @@ String beginTime = today + " 00:00:00"; String endTime = today + " 23:59:59"; try { - Long deptId = permissionService.getAuthService().getLoginUser().getDeptId(); - String deviceTypes = thirdPartyMapper.getDeviceType(deptId); //设备类型 - List> result = countThirdRecord(dataScope, deviceTypes, beginTime, endTime); - responseData.setData(result.size()); + Long deptId = permissionService.getAuthService().getLoginUser().getDeptId();//根绝当前角色获取所在部门 +// String deviceTypes = thirdPartyMapper.getDeviceType(deptId); //根据所在部门获取已授权的设备类型 +// List deviceList = new ArrayList<>(); +// //转化为列表类型 +// for (Object deviceType : JSON.parseObject(deviceTypes, List.class)) { +// deviceList.add(deviceType.toString()); +// } + int num = thirdPartyMapper.countRecordsToday(dataScope, endTime, beginTime); // + responseData.setData(num); responseData.setMessage("查询成功"); responseData.setCode(200); } catch (DataAccessException dex) { diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java index e45613c..6a62043 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java @@ -276,7 +276,7 @@ /** * 离线设备列表 */ - @RequestMapping(value = "/offlineListPage") + @RequestMapping(value = "/offline-list-page") @ResponseBody @BussinessLog(value = "离线设备列表") public Object offlineListPage(String deviceCode, String deviceType) { diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml index 09ff2ff..da250a4 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml @@ -248,7 +248,7 @@ - SELECT glview.DEVCODE AS devcode , + bd.DEVICE_TYPE AS "deviceType", + bdt.TYPE_NAME AS "deviceTypeName", + bwi.DEPTID AS deptid, glview.WELL_CODE AS "wellCode", + glview.DESCN AS descn, glview.CELL AS cell, - glg.Strength As strength, @@ -489,13 +494,16 @@ glview.LIQUIDDATA FROM data_gasliquid_liquid glview - INNER JOIN data_gasliquid_gas glg ON glview.DEVCODE = glg.DEVCODE - INNER JOIN bus_well_info bwi ON glview.WELL_CODE = bwi.WELL_CODE - INNER JOIN bus_device bd ON glview.DEVCODE = bd.DEVCODE + LEFT JOIN bus_device bd ON glview.DEVCODE = bd.DEVCODE + LEFT JOIN bus_well_info bwi ON glview.WELL_CODE = bwi.WELL_CODE + LEFT JOIN base_device_type bdt ON bd.DEVICE_TYPE = bdt.ID bd.VALID = '1' AND bwi.VALID = '1' - - and bwi.DEPTID = #{deptid} + + and bwi.DEPTID in + + #{i} + and glview.UPTIME = ]]> @@ -519,7 +527,60 @@ ORDER BY glview.UPTIME DESC - + + + \ No newline at end of file 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 8df461f..99d1ca1 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 @@ -51,7 +51,7 @@ */ List selectWellLocDataScope(DataScope dataScope, String deptid, String beginTime, String endTime, String keywords); - List selectGasLiquidDataScope(DataScope dataScope, String sensorType, String deptid, String beginTime, String endTime, String keywords); + List selectGasLiquidDataScope(DataScope dataScope, String sensorType, String deptid, String beginTime, String endTime, String keywords); /** * 管盯数据查询 */ 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 a2ed0fd..3d758d2 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 @@ -81,8 +81,21 @@ } @Override - public List selectGasLiquidDataScope(DataScope dataScope, String sensorType, String deptid, String beginTime, String endTime, String keywords) { - return this.baseMapper.selectGasLiquidDataScope(dataScope, deptid, beginTime, endTime, keywords); + 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)); + } + List dataGasLiquidList = new ArrayList<>(); + if ("liquid".equals(sensorType)) { + dataGasLiquidList = this.baseMapper.selectGasLiquidDataLiquidScope(dataScope, deptIds, beginTime, endTime, keywords); + } + if ("gas".equals(sensorType)) { + dataGasLiquidList = this.baseMapper.selectGasLiquidDataGasScope(dataScope, deptIds, beginTime, endTime, keywords); + } + System.out.println(dataGasLiquidList); + return dataGasLiquidList; } @Override diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/ThirdPartyDataServiceImpl.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/ThirdPartyDataServiceImpl.java index 6980ad4..dd59ab7 100644 --- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/ThirdPartyDataServiceImpl.java +++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/ThirdPartyDataServiceImpl.java @@ -108,10 +108,15 @@ String beginTime = today + " 00:00:00"; String endTime = today + " 23:59:59"; try { - Long deptId = permissionService.getAuthService().getLoginUser().getDeptId(); - String deviceTypes = thirdPartyMapper.getDeviceType(deptId); //设备类型 - List> result = countThirdRecord(dataScope, deviceTypes, beginTime, endTime); - responseData.setData(result.size()); + Long deptId = permissionService.getAuthService().getLoginUser().getDeptId();//根绝当前角色获取所在部门 +// String deviceTypes = thirdPartyMapper.getDeviceType(deptId); //根据所在部门获取已授权的设备类型 +// List deviceList = new ArrayList<>(); +// //转化为列表类型 +// for (Object deviceType : JSON.parseObject(deviceTypes, List.class)) { +// deviceList.add(deviceType.toString()); +// } + int num = thirdPartyMapper.countRecordsToday(dataScope, endTime, beginTime); // + responseData.setData(num); responseData.setMessage("查询成功"); responseData.setCode(200); } catch (DataAccessException dex) { diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java index e45613c..6a62043 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/controller/DeviceController.java @@ -276,7 +276,7 @@ /** * 离线设备列表 */ - @RequestMapping(value = "/offlineListPage") + @RequestMapping(value = "/offline-list-page") @ResponseBody @BussinessLog(value = "离线设备列表") public Object offlineListPage(String deviceCode, String deviceType) { diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml index 09ff2ff..da250a4 100644 --- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml +++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml @@ -248,7 +248,7 @@