From 2deeeb8b1e671cfeb421f973c644ffc2d3182841 Mon Sep 17 00:00:00 2001
From: zengh <123456>
Date: Mon, 26 Jul 2021 15:36:00 +0800
Subject: [PATCH] 修改意见问题修改
---
blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/alarm/controller/AlarmController.java | 24 +++++++++++++++++++++++-
1 files changed, 23 insertions(+), 1 deletions(-)
diff --git a/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/alarm/controller/AlarmController.java b/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/alarm/controller/AlarmController.java
index c208cc7..75b3105 100644
--- a/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/alarm/controller/AlarmController.java
+++ b/blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/alarm/controller/AlarmController.java
@@ -136,6 +136,28 @@
}
/**
+ * 自定义分页
+ */
+ @GetMapping("/page_az")
+ @ApiOperationSupport(order = 3)
+ @ApiOperation(value = "分页", notes = "传入alarm")
+ public R<IPage<AlarmVO>> page_az(AlarmVO alarm, Query query) {
+ IPage<AlarmVO> pages = alarmService.selectazPage(Condition.getPage(query), alarm);
+ return R.data(pages);
+ }
+
+ /**
+ * 安装任务图表接口
+ */
+ @GetMapping("/getChartData")
+ @ApiOperationSupport(order = 3)
+ @ApiOperation(value = "分页", notes = "传入alarm")
+ public R<List> getChartData(AlarmVO alarm) {
+ List<Map<String,Object>> list = alarmService.getChartData(alarm);
+ return R.data(list);
+ }
+
+ /**
* 查询所有
* @return
*/
@@ -529,7 +551,7 @@
bs = "0";
}else if(operation.getZc().equals("办结")){
bs = "1";
- }else {
+ }else if(operation.getZc().equals("推送110")){
bs = "2";
}
}
--
Gitblit v1.9.3