Skip to content

张雷 / skboot-zhongye

转到一个项目
切换导航栏
切换导航栏固定状态
2a2c0638 由 张雷
选项

Merge remote-tracking branch 'origin/master' into master

2 个父辈 9028d2ff 82dbfeb4
内嵌 并排
正在显示 1 个修改的文件 包含 12 行增加 和 12 行删除
sk-module-biz/src/main/java/com/skua/modules/algorithm/controller/SysCommandCentreController.java
...@@ -90,11 +90,11 @@ public class SysCommandCentreController { ...@@ -90,11 +90,11 @@ public class SysCommandCentreController {
90 @ApiOperation(value="指挥中心-运行负荷率分析", notes="指挥中心-运行负荷率分析") 90 @ApiOperation(value="指挥中心-运行负荷率分析", notes="指挥中心-运行负荷率分析")
91 //指挥中心-运行负荷率分析 91 //指挥中心-运行负荷率分析
92 @GetMapping(value = "/statisticsByLoadRate") 92 @GetMapping(value = "/statisticsByLoadRate")
93 public Result<DepartLoadRateResultVO > statisticsByLoadRate(String startTime , String endTime,Integer loadRateType) throws Exception { 93 public Result<DepartLoadRateResultVO > statisticsByLoadRate(String startDate , String endTime,Integer loadRateType) throws Exception {
94 Result<DepartLoadRateResultVO > result = new Result<>(); 94 Result<DepartLoadRateResultVO > result = new Result<>();
95 String departIds = BaseContextHandler.getDeparts();//1818214519948836864,1711662624459804674 95 String departIds = BaseContextHandler.getDeparts();//1818214519948836864,1711662624459804674
96 if(loadRateType == null ) loadRateType = 1; 96 if(loadRateType == null ) loadRateType = 1;
97 DepartLoadRateResultVO departLoadRateResultVO = reportItemvService.statisticsByLoadRate( departIds,startTime , endTime, loadRateType); 97 DepartLoadRateResultVO departLoadRateResultVO = reportItemvService.statisticsByLoadRate( departIds,startDate , endTime, loadRateType);
98 result.setSuccess(true); 98 result.setSuccess(true);
99 result.setResult(departLoadRateResultVO); 99 result.setResult(departLoadRateResultVO);
100 return result; 100 return result;
...@@ -105,10 +105,10 @@ public class SysCommandCentreController { ...@@ -105,10 +105,10 @@ public class SysCommandCentreController {
105 @ApiOperation(value="指挥中心-运行负荷率分析---列表详情", notes="指挥中心-运行负荷率分析----列表详情") 105 @ApiOperation(value="指挥中心-运行负荷率分析---列表详情", notes="指挥中心-运行负荷率分析----列表详情")
106 //指挥中心-运行负荷率分析 106 //指挥中心-运行负荷率分析
107 @GetMapping(value = "/statisticsByLoadRateList") 107 @GetMapping(value = "/statisticsByLoadRateList")
108 public Result< List<DepartLoadRateVO> > statisticsByLoadRateList(String startTime , String endTime) throws Exception { 108 public Result< List<DepartLoadRateVO> > statisticsByLoadRateList(String startDate , String endDate) throws Exception {
109 Result< List<DepartLoadRateVO> > result = new Result<>(); 109 Result< List<DepartLoadRateVO> > result = new Result<>();
110 String departIds = BaseContextHandler.getDeparts();//1818214519948836864,1711662624459804674 110 String departIds = BaseContextHandler.getDeparts();//1818214519948836864,1711662624459804674
111 List<DepartLoadRateVO> departLoadRateResultVO = reportItemvService.statisticsByLoadRateList( departIds,startTime , endTime,null); 111 List<DepartLoadRateVO> departLoadRateResultVO = reportItemvService.statisticsByLoadRateList( departIds,startDate , endDate,null);
112 result.setSuccess(true); 112 result.setSuccess(true);
113 result.setResult(departLoadRateResultVO); 113 result.setResult(departLoadRateResultVO);
114 return result; 114 return result;
...@@ -119,10 +119,10 @@ public class SysCommandCentreController { ...@@ -119,10 +119,10 @@ public class SysCommandCentreController {
119 @AutoLog(value = "指挥中心-泥量统计") 119 @AutoLog(value = "指挥中心-泥量统计")
120 @ApiOperation(value="指挥中心-泥量统计", notes="指挥中心-泥量统计") 120 @ApiOperation(value="指挥中心-泥量统计", notes="指挥中心-泥量统计")
121 @GetMapping(value = "/statisticsByCement") 121 @GetMapping(value = "/statisticsByCement")
122 public Result<List<FRportlCommandCenterVO>> statisticsByCement(String startTime , String endTime) throws Exception { 122 public Result<List<FRportlCommandCenterVO>> statisticsByCement(String startDate , String endDate) throws Exception {
123 Result<List<FRportlCommandCenterVO>> result = new Result(); 123 Result<List<FRportlCommandCenterVO>> result = new Result();
124 String departIds = BaseContextHandler.getDeparts();//1818214519948836864,1711662624459804674 124 String departIds = BaseContextHandler.getDeparts();//1818214519948836864,1711662624459804674
125 List<FRportlCommandCenterVO> dataList = reportItemvService.statisticsByCement(departIds,startTime,endTime); 125 List<FRportlCommandCenterVO> dataList = reportItemvService.statisticsByCement(departIds,startDate,endDate);
126 result.setResult(dataList ); 126 result.setResult(dataList );
127 return result; 127 return result;
128 } 128 }
...@@ -130,10 +130,10 @@ public class SysCommandCentreController { ...@@ -130,10 +130,10 @@ public class SysCommandCentreController {
130 @ApiOperation(value="指挥中心-泥量统计--详情列表", notes="指挥中心-泥量统计--详情列表") 130 @ApiOperation(value="指挥中心-泥量统计--详情列表", notes="指挥中心-泥量统计--详情列表")
131 //指挥中心-泥量统计--详情列表 131 //指挥中心-泥量统计--详情列表
132 @GetMapping(value = "/statisticsByCementList") 132 @GetMapping(value = "/statisticsByCementList")
133 public Result<List<ReportItemVO>> statisticsByCementList(String startTime , String endTime) throws Exception { 133 public Result<List<ReportItemVO>> statisticsByCementList(String startDate , String endDate) throws Exception {
134 Result<List<ReportItemVO>> result = new Result(); 134 Result<List<ReportItemVO>> result = new Result();
135 String departIds = BaseContextHandler.getDeparts();//1818214519948836864,1711662624459804674 135 String departIds = BaseContextHandler.getDeparts();//1818214519948836864,1711662624459804674
136 List<ReportItemVO> dataList = reportItemvService.statisticsByCementList(departIds,startTime,endTime); 136 List<ReportItemVO> dataList = reportItemvService.statisticsByCementList(departIds,startDate,endDate);
137 result.setResult(dataList ); 137 result.setResult(dataList );
138 return result; 138 return result;
139 } 139 }
...@@ -143,20 +143,20 @@ public class SysCommandCentreController { ...@@ -143,20 +143,20 @@ public class SysCommandCentreController {
143 @AutoLog(value = "指挥中心-能耗分析") 143 @AutoLog(value = "指挥中心-能耗分析")
144 @ApiOperation(value="指挥中心-能耗分析", notes="指挥中心-能耗分析") 144 @ApiOperation(value="指挥中心-能耗分析", notes="指挥中心-能耗分析")
145 @GetMapping(value = "/statisticsByElectricity") 145 @GetMapping(value = "/statisticsByElectricity")
146 public Result<List<FRportlCommandCenterVO>> statisticsByElectricity(String startTime ,String endTime) throws Exception { 146 public Result<List<FRportlCommandCenterVO>> statisticsByElectricity(String startDate ,String endDate) throws Exception {
147 Result<List<FRportlCommandCenterVO>> result = new Result(); 147 Result<List<FRportlCommandCenterVO>> result = new Result();
148 String departId = "1818214519948836864,1711662624459804674"; 148 String departId = "1818214519948836864,1711662624459804674";
149 List<FRportlCommandCenterVO> dataList = reportItemvService.statisticsByElectricity(departId,startTime,endTime); 149 List<FRportlCommandCenterVO> dataList = reportItemvService.statisticsByElectricity(departId,startDate,endDate);
150 result.setResult(dataList ); 150 result.setResult(dataList );
151 return result; 151 return result;
152 } 152 }
153 @AutoLog(value = "指挥中心-能耗分析") 153 @AutoLog(value = "指挥中心-能耗分析")
154 @ApiOperation(value="指挥中心-能耗分析--详情列表", notes="指挥中心-能耗分析--详情列表") 154 @ApiOperation(value="指挥中心-能耗分析--详情列表", notes="指挥中心-能耗分析--详情列表")
155 @GetMapping(value = "/statisticsByElectricityList") 155 @GetMapping(value = "/statisticsByElectricityList")
156 public Result<List<ReportItemVO>> statisticsByElectricityList(String startTime ,String endTime) throws Exception { 156 public Result<List<ReportItemVO>> statisticsByElectricityList(String startDate ,String endDate) throws Exception {
157 Result<List<ReportItemVO>> result = new Result(); 157 Result<List<ReportItemVO>> result = new Result();
158 String departIds = BaseContextHandler.getDeparts();//1818214519948836864,1711662624459804674 158 String departIds = BaseContextHandler.getDeparts();//1818214519948836864,1711662624459804674
159 List<ReportItemVO> dataList = reportItemvService.statisticsByElectricityList(departIds,startTime,endTime); 159 List<ReportItemVO> dataList = reportItemvService.statisticsByElectricityList(departIds,startDate,endDate);
160 result.setResult(dataList ); 160 result.setResult(dataList );
161 return result; 161 return result;
162 } 162 }
......
支持 Markdown 格式
你添加了 0 人 到此讨论。请谨慎行事。
Finish editing this message first!