diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticMapper.xml index dd0541d..8b1ca4e 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticMapper.xml +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticMapper.xml @@ -127,6 +127,7 @@ count(1) AS total,bdt.TYPE_NAME AS "typeName" FROM bus_device BD + LEFT JOIN bus_device_status bds ON bds.DEVICE_ID=BD.ID LEFT JOIN bus_device_well BDW ON BDW.DEVICE_ID = BD.ID LEFT JOIN bus_well_info BWI ON BDW.WELL_ID = BWI.ID, base_device_type bdt diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticMapper.xml index dd0541d..8b1ca4e 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticMapper.xml +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticMapper.xml @@ -127,6 +127,7 @@ count(1) AS total,bdt.TYPE_NAME AS "typeName" FROM bus_device BD + LEFT JOIN bus_device_status bds ON bds.DEVICE_ID=BD.ID LEFT JOIN bus_device_well BDW ON BDW.DEVICE_ID = BD.ID LEFT JOIN bus_well_info BWI ON BDW.WELL_ID = BWI.ID, base_device_type bdt 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 1e7abd0..837e653 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 @@ -89,7 +89,6 @@ * @return */ @GetMapping(value = "/liquiddata/list-page") - @Permission public Object liquidDataList(String keywords, String deptid, String beginTime, String endTime) { Page page = PageFactory.defaultPage(); if (CollectionUtil.isEmpty(page.orders())) { diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticMapper.xml index dd0541d..8b1ca4e 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticMapper.xml +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticMapper.xml @@ -127,6 +127,7 @@ count(1) AS total,bdt.TYPE_NAME AS "typeName" FROM bus_device BD + LEFT JOIN bus_device_status bds ON bds.DEVICE_ID=BD.ID LEFT JOIN bus_device_well BDW ON BDW.DEVICE_ID = BD.ID LEFT JOIN bus_well_info BWI ON BDW.WELL_ID = BWI.ID, base_device_type bdt 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 1e7abd0..837e653 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 @@ -89,7 +89,6 @@ * @return */ @GetMapping(value = "/liquiddata/list-page") - @Permission public Object liquidDataList(String keywords, String deptid, String beginTime, String endTime) { Page page = PageFactory.defaultPage(); if (CollectionUtil.isEmpty(page.orders())) { 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 c72050e..a0117ca 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 @@ -265,7 +265,7 @@ AS "UPTIME", - LIQUIDDATA, + LIQUIDDATA AS strength, CELL, DESCN, DEPTID,