Commit 3ca7219b authored by co_dengxiongwen's avatar co_dengxiongwen

接口调整

parent f9b5df50
...@@ -126,7 +126,7 @@ public class AnalysisController extends AbstractController { ...@@ -126,7 +126,7 @@ public class AnalysisController extends AbstractController {
*/ */
@ApiOperation(value="获取室内气象数据", notes="获取室内气象数据") @ApiOperation(value="获取室内气象数据", notes="获取室内气象数据")
@GetMapping("/getSnqxzInfoTj") @GetMapping("/getSnqxzInfoTj")
public R getSnqxzInfoTj(@RequestParam("resourceId") String resourceId,@RequestParam("startTime") String startTime,@RequestParam("endTime") String endTime,@RequestParam("region") Integer region) { public R getSnqxzInfoTj(String resourceId,String startTime,String endTime,Integer region) {
List<Map<String,Object>> list = new ArrayList<>(); List<Map<String,Object>> list = new ArrayList<>();
startTime = DateUtil.getStringOfFirstDay(startTime); startTime = DateUtil.getStringOfFirstDay(startTime);
endTime = DateUtil.getStringOfLastDay(endTime); endTime = DateUtil.getStringOfLastDay(endTime);
...@@ -171,7 +171,7 @@ public class AnalysisController extends AbstractController { ...@@ -171,7 +171,7 @@ public class AnalysisController extends AbstractController {
*/ */
@ApiOperation(value="获取用电数据-统计图表", notes="获取用电数据-统计图表") @ApiOperation(value="获取用电数据-统计图表", notes="获取用电数据-统计图表")
@GetMapping("/getEnergyTb") @GetMapping("/getEnergyTb")
public R getEnergyTb(@RequestParam("resourceId") String resourceId,@RequestParam("startTime") String startTime,@RequestParam("endTime") String endTime,@RequestParam("resourceType") String resourceType) { public R getEnergyTb(String resourceId, String startTime, String endTime, String resourceType) {
startTime = DateUtil.getStringOfFirstDay(startTime); startTime = DateUtil.getStringOfFirstDay(startTime);
endTime = DateUtil.getStringOfLastDay(endTime); endTime = DateUtil.getStringOfLastDay(endTime);
List<List<String>> list = analysisService.getEnergyListTb(resourceId,startTime,endTime,resourceType); List<List<String>> list = analysisService.getEnergyListTb(resourceId,startTime,endTime,resourceType);
...@@ -184,7 +184,7 @@ public class AnalysisController extends AbstractController { ...@@ -184,7 +184,7 @@ public class AnalysisController extends AbstractController {
*/ */
@ApiOperation(value="获取能耗数据分析", notes="获取能耗数据分析") @ApiOperation(value="获取能耗数据分析", notes="获取能耗数据分析")
@GetMapping("/getEnergyFx") @GetMapping("/getEnergyFx")
public R getEnergyFx(@RequestParam("startTime") String startTime,@RequestParam("endTime") String endTime,@RequestParam("resourceType") String resourceType) { public R getEnergyFx(String startTime,String endTime, String resourceType) {
startTime = DateUtil.getStringOfFirstDay(startTime); startTime = DateUtil.getStringOfFirstDay(startTime);
endTime = DateUtil.getStringOfLastDay(endTime); endTime = DateUtil.getStringOfLastDay(endTime);
List<List<String>> list = analysisService.getEnergyListFx(startTime,endTime,resourceType); List<List<String>> list = analysisService.getEnergyListFx(startTime,endTime,resourceType);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment