From 2ccc7b070d0f732ecb7492f64a1bcad0e81d7e80 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AD=A6=E4=B9=A0=E4=BB=A3=E7=A0=81=E7=9A=84=E5=B0=8F?= =?UTF-8?q?=E7=99=BD?= <8145789+learning-code@user.noreply.gitee.com> Date: Fri, 18 Feb 2022 05:11:59 +0000 Subject: [PATCH] =?UTF-8?q?!4=20=E6=96=B0=E5=A2=9Econtroller=E5=B1=82?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E5=85=A5=E5=8F=82=E9=99=90=E5=AE=9A=E4=BF=AE?= =?UTF-8?q?=E9=A5=B0=E7=AC=A6=20*=20feature:=20=E6=96=B0=E5=A2=9Econtrolle?= =?UTF-8?q?r=E6=8E=A5=E5=8F=A3=E5=85=A5=E5=8F=82=E9=99=90=E5=AE=9A?= =?UTF-8?q?=E4=BF=AE=E9=A5=B0=E7=AC=A6=20#I4U9BT?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../manager/controller/AccountController.java | 2 +- .../usthe/manager/controller/AppController.java | 4 ++-- .../manager/controller/MonitorController.java | 4 ++-- .../manager/controller/MonitorsController.java | 14 +++++++------- .../manager/controller/NoticeConfigController.java | 8 ++++---- 5 files changed, 16 insertions(+), 16 deletions(-) diff --git a/manager/src/main/java/com/usthe/manager/controller/AccountController.java b/manager/src/main/java/com/usthe/manager/controller/AccountController.java index a8284d6..7d53d29 100644 --- a/manager/src/main/java/com/usthe/manager/controller/AccountController.java +++ b/manager/src/main/java/com/usthe/manager/controller/AccountController.java @@ -91,7 +91,7 @@ public class AccountController { @ApiOperation(value = "TOKEN刷新", notes = "使用刷新TOKEN重新获取TOKEN") public ResponseEntity>> refreshToken( @ApiParam(value = "刷新TOKEN", example = "xxx") - @PathVariable("refreshToken") @NotNull String refreshToken) { + @PathVariable("refreshToken") @NotNull final String refreshToken) { String userId; boolean isRefresh; try { diff --git a/manager/src/main/java/com/usthe/manager/controller/AppController.java b/manager/src/main/java/com/usthe/manager/controller/AppController.java index d6e1a96..48f544b 100644 --- a/manager/src/main/java/com/usthe/manager/controller/AppController.java +++ b/manager/src/main/java/com/usthe/manager/controller/AppController.java @@ -36,7 +36,7 @@ public class AppController { @GetMapping(path = "/{app}/params") @ApiOperation(value = "查询监控类型的参数结构", notes = "根据app查询指定监控类型的需要输入参数的结构") public ResponseEntity>> queryAppParamDefines( - @ApiParam(value = "监控类型名称", example = "api") @PathVariable("app") String app) { + @ApiParam(value = "监控类型名称", example = "api") @PathVariable("app") final String app) { List paramDefines = appService.getAppParamDefines(app.toLowerCase()); return ResponseEntity.ok(new Message<>(paramDefines)); } @@ -44,7 +44,7 @@ public class AppController { @GetMapping(path = "/{app}/define") @ApiOperation(value = "查询监控类型的结构定义", notes = "根据app查询指定监控类型的定义结构") public ResponseEntity> queryAppDefine( - @ApiParam(value = "监控类型名称", example = "api") @PathVariable("app") String app) { + @ApiParam(value = "监控类型名称", example = "api") @PathVariable("app") final String app) { Job define = appService.getAppDefine(app.toLowerCase()); return ResponseEntity.ok(new Message<>(define)); } diff --git a/manager/src/main/java/com/usthe/manager/controller/MonitorController.java b/manager/src/main/java/com/usthe/manager/controller/MonitorController.java index 7588326..ef3e7ec 100644 --- a/manager/src/main/java/com/usthe/manager/controller/MonitorController.java +++ b/manager/src/main/java/com/usthe/manager/controller/MonitorController.java @@ -64,7 +64,7 @@ public class MonitorController { @GetMapping(path = "/{id}") @ApiOperation(value = "查询监控", notes = "根据监控ID获取监控信息") public ResponseEntity> getMonitor( - @ApiParam(value = "监控ID", example = "6565463543") @PathVariable("id") long id) { + @ApiParam(value = "监控ID", example = "6565463543") @PathVariable("id") final long id) { // 获取监控信息 MonitorDto monitorDto = monitorService.getMonitorDto(id); Message.MessageBuilder messageBuilder = Message.builder(); @@ -79,7 +79,7 @@ public class MonitorController { @DeleteMapping(path = "/{id}") @ApiOperation(value = "删除监控", notes = "根据监控ID删除监控应用,监控不存在也是删除成功") public ResponseEntity> deleteMonitor( - @ApiParam(value = "监控ID", example = "6565463543") @PathVariable("id") long id) { + @ApiParam(value = "监控ID", example = "6565463543") @PathVariable("id") final long id) { // 删除监控,监控不存在或删除成功都返回成功 monitorService.deleteMonitor(id); return ResponseEntity.ok(new Message<>("Delete success")); diff --git a/manager/src/main/java/com/usthe/manager/controller/MonitorsController.java b/manager/src/main/java/com/usthe/manager/controller/MonitorsController.java index c807c32..53be6f6 100644 --- a/manager/src/main/java/com/usthe/manager/controller/MonitorsController.java +++ b/manager/src/main/java/com/usthe/manager/controller/MonitorsController.java @@ -44,12 +44,12 @@ public class MonitorsController { @GetMapping @ApiOperation(value = "查询监控列表", notes = "根据查询过滤项获取监控信息列表") public ResponseEntity>> getMonitors( - @ApiParam(value = "监控ID", example = "6565463543") @RequestParam(required = false) List ids, - @ApiParam(value = "监控类型", example = "linux") @RequestParam(required = false) String app, - @ApiParam(value = "监控名称，模糊查询", example = "linux-127.0.0.1") @RequestParam(required = false) String name, - @ApiParam(value = "监控Host，模糊查询", example = "127.0.0.1") @RequestParam(required = false) String host, - @ApiParam(value = "排序字段，默认id", example = "name") @RequestParam(defaultValue = "id") String sort, - @ApiParam(value = "排序方式，asc:升序，desc:降序", example = "desc") @RequestParam(defaultValue = "desc") String order, + @ApiParam(value = "监控ID", example = "6565463543") @RequestParam(required = false) final List ids, + @ApiParam(value = "监控类型", example = "linux") @RequestParam(required = false) final String app, + @ApiParam(value = "监控名称，模糊查询", example = "linux-127.0.0.1") @RequestParam(required = false) final String name, + @ApiParam(value = "监控Host，模糊查询", example = "127.0.0.1") @RequestParam(required = false) final String host, + @ApiParam(value = "排序字段，默认id", example = "name") @RequestParam(defaultValue = "id") final String sort, + @ApiParam(value = "排序方式，asc:升序，desc:降序", example = "desc") @RequestParam(defaultValue = "desc") final String order, @ApiParam(value = "列表当前分页", example = "0") @RequestParam(defaultValue = "0") int pageIndex, @ApiParam(value = "列表分页数量", example = "8") @RequestParam(defaultValue = "8") int pageSize) { @@ -94,7 +94,7 @@ public class MonitorsController { @GetMapping(path = "/{app}") @ApiOperation(value = "查询指定监控类型的监控列表", notes = "根据查询过滤指定监控类型的所有获取监控信息列表") public ResponseEntity>> getAppMonitors( - @ApiParam(value = "监控类型", example = "linux") @PathVariable(required = false) String app) { + @ApiParam(value = "监控类型", example = "linux") @PathVariable(required = false) final String app) { List monitors = monitorService.getAppMonitors(app); Message> message = new Message<>(monitors); return ResponseEntity.ok(message); diff --git a/manager/src/main/java/com/usthe/manager/controller/NoticeConfigController.java b/manager/src/main/java/com/usthe/manager/controller/NoticeConfigController.java index c498941..2aaf181 100644 --- a/manager/src/main/java/com/usthe/manager/controller/NoticeConfigController.java +++ b/manager/src/main/java/com/usthe/manager/controller/NoticeConfigController.java @@ -57,7 +57,7 @@ public class NoticeConfigController { @DeleteMapping(path = "/receiver/{id}") @ApiOperation(value = "删除指定接收人", notes = "删除已存在的接收人信息") public ResponseEntity> deleteNoticeReceiver( - @ApiParam(value = "接收人ID", example = "6565463543") @PathVariable("id") Long receiverId) { + @ApiParam(value = "接收人ID", example = "6565463543") @PathVariable("id") final Long receiverId) { // 不存在或删除成功都返回成功 noticeConfigService.deleteReceiver(receiverId); return ResponseEntity.ok(new Message<>("Delete success")); @@ -66,7 +66,7 @@ public class NoticeConfigController { @GetMapping(path = "/receivers") @ApiOperation(value = "查询消息通知接收人", notes = "根据查询过滤项获取消息通知接收人列表") public ResponseEntity>> getReceivers( - @ApiParam(value = "接收人名称，模糊查询", example = "tom") @RequestParam(required = false) String name) { + @ApiParam(value = "接收人名称，模糊查询", example = "tom") @RequestParam(required = false) final String name) { Specification specification = (root, query, criteriaBuilder) -> { Predicate predicate = criteriaBuilder.conjunction(); @@ -99,7 +99,7 @@ public class NoticeConfigController { @DeleteMapping(path = "/rule/{id}") @ApiOperation(value = "删除指定通知策略", notes = "删除已存在的通知策略信息") public ResponseEntity> deleteNoticeRule( - @ApiParam(value = "通知策略ID", example = "6565463543") @PathVariable("id") Long ruleId) { + @ApiParam(value = "通知策略ID", example = "6565463543") @PathVariable("id") final Long ruleId) { // 不存在或删除成功都返回成功 noticeConfigService.deleteNoticeRule(ruleId); return ResponseEntity.ok(new Message<>("Delete success")); @@ -108,7 +108,7 @@ public class NoticeConfigController { @GetMapping(path = "/rules") @ApiOperation(value = "查询消息通知策略", notes = "根据查询过滤项获取消息通知策略列表") public ResponseEntity>> getRules( - @ApiParam(value = "接收人名称，模糊查询", example = "rule1") @RequestParam(required = false) String name) { + @ApiParam(value = "接收人名称，模糊查询", example = "rule1") @RequestParam(required = false) final String name) { Specification specification = (root, query, criteriaBuilder) -> { Predicate predicate = criteriaBuilder.conjunction();