|
@@ -46,14 +46,20 @@ public class ElecUseHController extends BaseController {
|
|
|
@GetMapping("/list")
|
|
|
public TableDataInfo list(ElecUseH elecUseH) {
|
|
|
startPage();
|
|
|
- List<ElecUseH> list = elecUseHService.selectElecUseHList(elecUseH);
|
|
|
+ List<ElecUseH> list = elecUseHService.getElecUseHList(elecUseH);
|
|
|
return getDataTable(list);
|
|
|
}
|
|
|
|
|
|
+ @GetMapping("/sumBySubCategory")
|
|
|
+ public AjaxResult sumBySubCategory(ElecUseH elecUseH) {
|
|
|
+ List<ElecUseH> list = elecUseHService.getSumBySubCategory(elecUseH);
|
|
|
+ return success(list);
|
|
|
+ }
|
|
|
+
|
|
|
@GetMapping("/listSum")
|
|
|
public TableDataInfo listSum(ElecUseH elecUseH) {
|
|
|
startPage();
|
|
|
- List<ElecUseH> list = elecUseHService.selectElecUseHListSum(elecUseH);
|
|
|
+ List<ElecUseH> list = elecUseHService.getElecUseHListSum(elecUseH);
|
|
|
return getDataTable(list);
|
|
|
}
|
|
|
|
|
@@ -64,7 +70,7 @@ public class ElecUseHController extends BaseController {
|
|
|
@Log(title = "用能计量-小时", businessType = BusinessType.EXPORT)
|
|
|
@PostMapping("/export")
|
|
|
public void export(HttpServletResponse response, ElecUseH elecUseH) {
|
|
|
- List<ElecUseH> list = elecUseHService.selectElecUseHList(elecUseH);
|
|
|
+ List<ElecUseH> list = elecUseHService.getElecUseHList(elecUseH);
|
|
|
ExcelUtil<ElecUseH> util = new ExcelUtil<ElecUseH>(ElecUseH.class);
|
|
|
util.exportExcel(response, list, "用能计量-小时数据");
|
|
|
}
|
|
@@ -74,7 +80,7 @@ public class ElecUseHController extends BaseController {
|
|
|
*/
|
|
|
@GetMapping(value = "/{id}")
|
|
|
public AjaxResult getInfo(@PathVariable("id") Long id) {
|
|
|
- return success(elecUseHService.selectElecUseHById(id));
|
|
|
+ return success(elecUseHService.getElecUseHById(id));
|
|
|
}
|
|
|
|
|
|
/**
|
|
@@ -127,7 +133,7 @@ public class ElecUseHController extends BaseController {
|
|
|
*/
|
|
|
@GetMapping("/area/month/elec/use")
|
|
|
public AjaxResult getAreaMonthElecUse(@RequestParam(value = "area", required = false) String area) {
|
|
|
- return success(elecUseHService.selectMonthElecUse(area));
|
|
|
+ return success(elecUseHService.getMonthElecUse(area));
|
|
|
}
|
|
|
|
|
|
/**
|
|
@@ -138,7 +144,7 @@ public class ElecUseHController extends BaseController {
|
|
|
*/
|
|
|
@GetMapping("/area/thisday/fac/category/elec/use")
|
|
|
public AjaxResult getAreaThisDayFacCategoryElecUse(@RequestParam(value = "area", required = false) String area) {
|
|
|
- return success(elecUseHService.selectThisDayFacsCategoryElecUse(area));
|
|
|
+ return success(elecUseHService.getThisDayFacsCategoryElecUse(area));
|
|
|
}
|
|
|
|
|
|
/**
|
|
@@ -149,6 +155,6 @@ public class ElecUseHController extends BaseController {
|
|
|
*/
|
|
|
@GetMapping("/area/thisday/elec/use")
|
|
|
public AjaxResult getAreaThisDayElecUse(@RequestParam(value = "area", required = false) String area) {
|
|
|
- return success(elecUseHService.selectThisDayAreaElecUse(area));
|
|
|
+ return success(elecUseHService.getThisDayAreaElecUse(area));
|
|
|
}
|
|
|
}
|