diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/OverViewController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/OverViewController.java
index e85aa7b..9c2060c 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/OverViewController.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/OverViewController.java
@@ -134,5 +134,40 @@
return ReturnUtil.success(iOverViewService.stationDetail(tagNumber));
}
+
+ @ApiOperation("资源供应-线路当日数据")
+ @PostMapping("/lineData")
+ @ResponseBody
+ public ReturnDTO lineData() {
+ return ReturnUtil.success(iOverViewService.lineData());
+ }
+
+ @ApiOperation("用户用气-电厂监控数据")
+ @PostMapping("/powerMonitorData")
+ @ResponseBody
+ public ReturnDTO powerMonitorData() {
+ return ReturnUtil.success(iOverViewService.powerMonitorData());
+ }
+
+ @ApiOperation("综合运行-管网综合预警")
+ @PostMapping("/comprehensiveWarn")
+ @ResponseBody
+ public ReturnDTO comprehensiveWarn() {
+ return ReturnUtil.success(iOverViewService.comprehensiveWarn());
+ }
+
+ @ApiOperation("施工配合-施工配合地图(znzj_bdc_coordination_task_result)" +
+ "-施工配合情况(znzj_bdc_Construction)" +
+ "-施工配合新增量(znzj_bdc_group_month)" +
+ "-施工配合统计数据(znzj_intro_coordination_case)" +
+ "" +
+ "生产作业-地图作业和执行中作业(znzj_pmplan_basinfo)" +
+ "-生产作业统计 (znzj_intro_production_work)")
+ @PostMapping("/constructionData")
+ @ResponseBody
+ public ReturnDTO constructionData(String tableName) {
+ return ReturnUtil.success(iOverViewService.constructionData(tableName));
+ }
+
}
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/OverViewController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/OverViewController.java
index e85aa7b..9c2060c 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/OverViewController.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/OverViewController.java
@@ -134,5 +134,40 @@
return ReturnUtil.success(iOverViewService.stationDetail(tagNumber));
}
+
+ @ApiOperation("资源供应-线路当日数据")
+ @PostMapping("/lineData")
+ @ResponseBody
+ public ReturnDTO lineData() {
+ return ReturnUtil.success(iOverViewService.lineData());
+ }
+
+ @ApiOperation("用户用气-电厂监控数据")
+ @PostMapping("/powerMonitorData")
+ @ResponseBody
+ public ReturnDTO powerMonitorData() {
+ return ReturnUtil.success(iOverViewService.powerMonitorData());
+ }
+
+ @ApiOperation("综合运行-管网综合预警")
+ @PostMapping("/comprehensiveWarn")
+ @ResponseBody
+ public ReturnDTO comprehensiveWarn() {
+ return ReturnUtil.success(iOverViewService.comprehensiveWarn());
+ }
+
+ @ApiOperation("施工配合-施工配合地图(znzj_bdc_coordination_task_result)" +
+ "-施工配合情况(znzj_bdc_Construction)" +
+ "-施工配合新增量(znzj_bdc_group_month)" +
+ "-施工配合统计数据(znzj_intro_coordination_case)" +
+ "" +
+ "生产作业-地图作业和执行中作业(znzj_pmplan_basinfo)" +
+ "-生产作业统计 (znzj_intro_production_work)")
+ @PostMapping("/constructionData")
+ @ResponseBody
+ public ReturnDTO constructionData(String tableName) {
+ return ReturnUtil.success(iOverViewService.constructionData(tableName));
+ }
+
}
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/OverViewMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/OverViewMapper.java
index 33660c5..88d2ed7 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/OverViewMapper.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/dao/OverViewMapper.java
@@ -12,6 +12,7 @@
import org.apache.ibatis.annotations.Select;
import java.util.List;
+import java.util.Map;
/**
*
@@ -115,4 +116,18 @@
@Select("WITH station_tmp AS ( SELECT bs.PRESS_IN_CODE, bs.PRESS_OUT_CODE, bl.LEDGER_NAME AS tagName FROM bus_station bs JOIN bus_ledger bl ON bs.TAG_NUMBER = bl.TAG_NUMBER WHERE bl.TAG_NUMBER = #{tagNumber} ) SELECT tagName,sv.`value`, 'in' AS 'flag' FROM `station_tmp` bs JOIN ods_scada_data_temp sv ON bs.PRESS_IN_CODE = sv.point WHERE PRESS_IN_CODE != '' UNION ALL SELECT tagName,sv.`value`, 'out' AS 'flag' FROM `station_tmp` bs JOIN ods_scada_data_temp sv ON bs.PRESS_OUT_CODE = sv.point WHERE PRESS_OUT_CODE != ''")
List stationDetail(@Param("tagNumber") String tagNumber);
+
+
+
+ @Select("SELECT * FROM `daily_supply_volume`")
+ List