|
@@ -130,6 +130,21 @@ public class SpecificController {
|
|
|
*
|
|
|
* @return
|
|
|
*/
|
|
|
+ @GetMapping("/fdlList2")
|
|
|
+ @ResponseBody
|
|
|
+ @ApiOperation(value = "专题分析-发电量", notes = "专题分析-发电量")
|
|
|
+ public R fdlList2(@RequestParam(value = "companys") String companys,
|
|
|
+ @RequestParam(value = "type") String type,
|
|
|
+ @RequestParam(value = "year") String year) throws ParseException {
|
|
|
+
|
|
|
+ List<SpecificTarget> resultList = specificService.fdlList2(companys, type, year);
|
|
|
+ if (StringUtils.isNotNull(resultList)) {
|
|
|
+ return R.data(ResultMsg.ok(resultList));
|
|
|
+ } else {
|
|
|
+ return R.error(ResultMsg.error());
|
|
|
+ }
|
|
|
+ }
|
|
|
+
|
|
|
@GetMapping("/fdlList")
|
|
|
@ResponseBody
|
|
|
@ApiOperation(value = "专题分析-发电量", notes = "专题分析-发电量")
|
|
@@ -145,11 +160,27 @@ public class SpecificController {
|
|
|
}
|
|
|
}
|
|
|
|
|
|
+
|
|
|
|
|
|
* 查询综合厂用电量
|
|
|
*
|
|
|
* @return
|
|
|
*/
|
|
|
+ @GetMapping("/zhcydlList2")
|
|
|
+ @ResponseBody
|
|
|
+ @ApiOperation(value = "专题分析-综合厂用电量", notes = "专题分析-综合厂用电量")
|
|
|
+ public R zhcydlList2(@RequestParam(value = "companys") String companys,
|
|
|
+ @RequestParam(value = "type") String type,
|
|
|
+ @RequestParam(value = "year") String year) throws ParseException {
|
|
|
+
|
|
|
+ List<SpecificTarget> resultList = specificService.zhcydlList2(companys, type, year);
|
|
|
+ if (StringUtils.isNotNull(resultList)) {
|
|
|
+ return R.data(ResultMsg.ok(resultList));
|
|
|
+ } else {
|
|
|
+ return R.error(ResultMsg.error());
|
|
|
+ }
|
|
|
+ }
|
|
|
+
|
|
|
@GetMapping("/zhcydlList")
|
|
|
@ResponseBody
|
|
|
@ApiOperation(value = "专题分析-综合厂用电量", notes = "专题分析-综合厂用电量")
|
|
@@ -170,6 +201,21 @@ public class SpecificController {
|
|
|
*
|
|
|
* @return
|
|
|
*/
|
|
|
+ @GetMapping("/gwdlList2")
|
|
|
+ @ResponseBody
|
|
|
+ @ApiOperation(value = "专题分析-购网电量", notes = "专题分析-购网电量")
|
|
|
+ public R gwdldlList2(@RequestParam(value = "companys") String companys,
|
|
|
+ @RequestParam(value = "type") String type,
|
|
|
+ @RequestParam(value = "year") String year) throws ParseException {
|
|
|
+
|
|
|
+ List<SpecificTarget> resultList = specificService.gwdlList2(companys, type, year);
|
|
|
+ if (StringUtils.isNotNull(resultList)) {
|
|
|
+ return R.data(ResultMsg.ok(resultList));
|
|
|
+ } else {
|
|
|
+ return R.error(ResultMsg.error());
|
|
|
+ }
|
|
|
+ }
|
|
|
+
|
|
|
@GetMapping("/gwdlList")
|
|
|
@ResponseBody
|
|
|
@ApiOperation(value = "专题分析-购网电量", notes = "专题分析-购网电量")
|
|
@@ -191,6 +237,21 @@ public class SpecificController {
|
|
|
*
|
|
|
* @return
|
|
|
*/
|
|
|
+ @GetMapping("/swdlList2")
|
|
|
+ @ResponseBody
|
|
|
+ @ApiOperation(value = "专题分析-购网电量", notes = "专题分析-购网电量")
|
|
|
+ public R swdldlList2(@RequestParam(value = "companys") String companys,
|
|
|
+ @RequestParam(value = "type") String type,
|
|
|
+ @RequestParam(value = "year") String year) throws ParseException {
|
|
|
+
|
|
|
+ List<SpecificTarget> resultList = specificService.swdlList2(companys, type, year);
|
|
|
+ if (StringUtils.isNotNull(resultList)) {
|
|
|
+ return R.data(ResultMsg.ok(resultList));
|
|
|
+ } else {
|
|
|
+ return R.error(ResultMsg.error());
|
|
|
+ }
|
|
|
+ }
|
|
|
+
|
|
|
@GetMapping("/swdlList")
|
|
|
@ResponseBody
|
|
|
@ApiOperation(value = "专题分析-购网电量", notes = "专题分析-购网电量")
|
|
@@ -212,6 +273,22 @@ public class SpecificController {
|
|
|
*
|
|
|
* @return
|
|
|
*/
|
|
|
+ @GetMapping("/lyxsList2")
|
|
|
+ @ResponseBody
|
|
|
+ @ApiOperation(value = "专题分析-利用小时", notes = "专题分析-利用小时")
|
|
|
+ public R lyxsList2(@RequestParam(value = "companys") String companys,
|
|
|
+ @RequestParam(value = "type") String type,
|
|
|
+ @RequestParam(value = "year") String year) throws ParseException {
|
|
|
+
|
|
|
+ List<SpecificTarget> resultList = specificService.lyxsList2(companys, type, year);
|
|
|
+ if (StringUtils.isNotNull(resultList)) {
|
|
|
+ return R.data(ResultMsg.ok(resultList));
|
|
|
+ } else {
|
|
|
+ return R.error(ResultMsg.error());
|
|
|
+ }
|
|
|
+ }
|
|
|
+
|
|
|
+
|
|
|
@GetMapping("/lyxsList")
|
|
|
@ResponseBody
|
|
|
@ApiOperation(value = "专题分析-利用小时", notes = "专题分析-利用小时")
|
|
@@ -232,6 +309,22 @@ public class SpecificController {
|
|
|
*
|
|
|
* @return
|
|
|
*/
|
|
|
+ @GetMapping("/gzsslList2")
|
|
|
+ @ResponseBody
|
|
|
+ @ApiOperation(value = "专题分析-故障损失率", notes = "专题分析-故障损失率")
|
|
|
+ public R gzsslList2(@RequestParam(value = "companys") String companys,
|
|
|
+ @RequestParam(value = "type") String type,
|
|
|
+ @RequestParam(value = "year") String year) throws ParseException {
|
|
|
+
|
|
|
+ List<SpecificTarget> resultList = specificService.gzsslList2(companys, type, year);
|
|
|
+ if (StringUtils.isNotNull(resultList)) {
|
|
|
+ return R.data(ResultMsg.ok(resultList));
|
|
|
+ } else {
|
|
|
+ return R.error(ResultMsg.error());
|
|
|
+ }
|
|
|
+ }
|
|
|
+
|
|
|
+
|
|
|
@GetMapping("/gzsslList")
|
|
|
@ResponseBody
|
|
|
@ApiOperation(value = "专题分析-故障损失率", notes = "专题分析-故障损失率")
|
|
@@ -247,11 +340,28 @@ public class SpecificController {
|
|
|
}
|
|
|
}
|
|
|
|
|
|
+
|
|
|
|
|
|
* 查询维护损失率
|
|
|
*
|
|
|
* @return
|
|
|
*/
|
|
|
+ @GetMapping("/whsslList2")
|
|
|
+ @ResponseBody
|
|
|
+ @ApiOperation(value = "专题分析-维护损失率", notes = "专题分析-维护损失率")
|
|
|
+ public R whsslList2(@RequestParam(value = "companys") String companys,
|
|
|
+ @RequestParam(value = "type") String type,
|
|
|
+ @RequestParam(value = "year") String year) throws ParseException {
|
|
|
+
|
|
|
+ List<SpecificTarget> resultList = specificService.whsslList2(companys, type, year);
|
|
|
+ if (StringUtils.isNotNull(resultList)) {
|
|
|
+ return R.data(ResultMsg.ok(resultList));
|
|
|
+ } else {
|
|
|
+ return R.error(ResultMsg.error());
|
|
|
+ }
|
|
|
+ }
|
|
|
+
|
|
|
+
|
|
|
@GetMapping("/whsslList")
|
|
|
@ResponseBody
|
|
|
@ApiOperation(value = "专题分析-维护损失率", notes = "专题分析-维护损失率")
|
|
@@ -267,11 +377,28 @@ public class SpecificController {
|
|
|
}
|
|
|
}
|
|
|
|
|
|
+
|
|
|
|
|
|
* 查询限电损失率
|
|
|
*
|
|
|
* @return
|
|
|
*/
|
|
|
+ @GetMapping("/xdsslList2")
|
|
|
+ @ResponseBody
|
|
|
+ @ApiOperation(value = "专题分析-限电损失率", notes = "专题分析-限电损失率")
|
|
|
+ public R xdsslList2(@RequestParam(value = "companys", required = true) String companys,
|
|
|
+ @RequestParam(value = "type", required = true) String type,
|
|
|
+ @RequestParam(value = "year", required = true) String year) throws ParseException {
|
|
|
+
|
|
|
+ List<SpecificTarget> resultList = specificService.xdsslList2(companys, type, year);
|
|
|
+ if (StringUtils.isNotNull(resultList)) {
|
|
|
+ return R.data(ResultMsg.ok(resultList));
|
|
|
+ } else {
|
|
|
+ return R.error(ResultMsg.error());
|
|
|
+ }
|
|
|
+ }
|
|
|
+
|
|
|
+
|
|
|
@GetMapping("/xdsslList")
|
|
|
@ResponseBody
|
|
|
@ApiOperation(value = "专题分析-限电损失率", notes = "专题分析-限电损失率")
|
|
@@ -287,11 +414,27 @@ public class SpecificController {
|
|
|
}
|
|
|
}
|
|
|
|
|
|
+
|
|
|
|
|
|
* 查询性能损失率
|
|
|
*
|
|
|
* @return
|
|
|
*/
|
|
|
+ @GetMapping("/xnsslList2")
|
|
|
+ @ResponseBody
|
|
|
+ @ApiOperation(value = "专题分析-性能损失率", notes = "专题分析-性能损失率")
|
|
|
+ public R xnsslList2(@RequestParam(value = "companys", required = true) String companys,
|
|
|
+ @RequestParam(value = "type", required = true) String type,
|
|
|
+ @RequestParam(value = "year", required = true) String year) throws ParseException {
|
|
|
+
|
|
|
+ List<SpecificTarget> resultList = specificService.xnsslList2(companys, type, year);
|
|
|
+ if (StringUtils.isNotNull(resultList)) {
|
|
|
+ return R.data(ResultMsg.ok(resultList));
|
|
|
+ } else {
|
|
|
+ return R.error(ResultMsg.error());
|
|
|
+ }
|
|
|
+ }
|
|
|
+
|
|
|
@GetMapping("/xnsslList")
|
|
|
@ResponseBody
|
|
|
@ApiOperation(value = "专题分析-性能损失率", notes = "专题分析-性能损失率")
|
|
@@ -312,13 +455,28 @@ public class SpecificController {
|
|
|
*
|
|
|
* @return
|
|
|
*/
|
|
|
- @GetMapping("/slsslList")
|
|
|
+ @GetMapping("/slsslList2")
|
|
|
@ResponseBody
|
|
|
@ApiOperation(value = "专题分析-受累损失率", notes = "专题分析-受累损失率")
|
|
|
- public R slsslList(@RequestParam(value = "companys", required = true) String companys,
|
|
|
+ public R slsslList2(@RequestParam(value = "companys", required = true) String companys,
|
|
|
@RequestParam(value = "type", required = true) String type,
|
|
|
@RequestParam(value = "year", required = true) String year) throws ParseException {
|
|
|
|
|
|
+ List<SpecificTarget> resultList = specificService.slsslList2(companys, type, year);
|
|
|
+ if (StringUtils.isNotNull(resultList)) {
|
|
|
+ return R.data(ResultMsg.ok(resultList));
|
|
|
+ } else {
|
|
|
+ return R.error(ResultMsg.error());
|
|
|
+ }
|
|
|
+ }
|
|
|
+
|
|
|
+ @GetMapping("/slsslList")
|
|
|
+ @ResponseBody
|
|
|
+ @ApiOperation(value = "专题分析-受累损失率", notes = "专题分析-受累损失率")
|
|
|
+ public R slsslList(@RequestParam(value = "companys") String companys,
|
|
|
+ @RequestParam(value = "type") String type,
|
|
|
+ @RequestParam(value = "year") String year) throws ParseException {
|
|
|
+
|
|
|
List<SpecificTarget> resultList = specificService.slsslList(companys, type, year);
|
|
|
if (StringUtils.isNotNull(resultList)) {
|
|
|
return R.data(ResultMsg.ok(resultList));
|
|
@@ -327,6 +485,7 @@ public class SpecificController {
|
|
|
}
|
|
|
}
|
|
|
|
|
|
+
|
|
|
|
|
|
* 查询复位及时率
|
|
|
*
|