diff --git a/src/main/java/com/xydl/cac/controller/WarningController.java b/src/main/java/com/xydl/cac/controller/WarningController.java index d6a67d5..be9086c 100644 --- a/src/main/java/com/xydl/cac/controller/WarningController.java +++ b/src/main/java/com/xydl/cac/controller/WarningController.java @@ -54,13 +54,13 @@ public class WarningController extends BasicController { .doWrite(result); } - @PostMapping("updateRead") - @ApiOperation("修改是否已读状态") - public Response updateRead(@Validated @RequestBody Warning warning) throws Exception { + @PostMapping("updateState") + @ApiOperation("修改处理状态") + public Response updateState(@Validated @RequestBody Warning warning) throws Exception { if (warning.getId() == null) { throw new BusinessException("id不能为空!"); } - service.updateRead(warning); + service.updateState(warning); return Response.success("OK"); } diff --git a/src/main/java/com/xydl/cac/entity/Warning.java b/src/main/java/com/xydl/cac/entity/Warning.java index bc8627b..8255a4c 100644 --- a/src/main/java/com/xydl/cac/entity/Warning.java +++ b/src/main/java/com/xydl/cac/entity/Warning.java @@ -118,9 +118,4 @@ public class Warning { @ExcelIgnore private Date processTime; - @ApiModelProperty("是否已读 0:未读 1:已读") - @Column(name = "isread") - @ExcelIgnore - private Integer isread; - } \ No newline at end of file diff --git a/src/main/java/com/xydl/cac/service/WarningService.java b/src/main/java/com/xydl/cac/service/WarningService.java index c0f6a6d..8e9dcb5 100644 --- a/src/main/java/com/xydl/cac/service/WarningService.java +++ b/src/main/java/com/xydl/cac/service/WarningService.java @@ -13,5 +13,5 @@ public interface WarningService { List listAll(ConditionModel condition) throws Exception; - void updateRead(Warning warning) throws Exception; + void updateState(Warning warning) throws Exception; } diff --git a/src/main/java/com/xydl/cac/service/impl/WarningServiceImpl.java b/src/main/java/com/xydl/cac/service/impl/WarningServiceImpl.java index 07abf02..7806c93 100644 --- a/src/main/java/com/xydl/cac/service/impl/WarningServiceImpl.java +++ b/src/main/java/com/xydl/cac/service/impl/WarningServiceImpl.java @@ -74,13 +74,13 @@ public class WarningServiceImpl implements WarningService { } @Override - public void updateRead(Warning warning) throws Exception { + public void updateState(Warning warning) throws Exception { Optional byId = repository.findById(warning.getId()); if (!byId.isPresent()) { throw new BusinessException("未找到该告警" + warning.getId()); } Warning war = byId.get(); - war.setIsread(warning.getIsread()); + war.setState(warning.getState()); repository.save(war); } } diff --git a/src/main/java/com/xydl/cac/task/RuleCheckTask.java b/src/main/java/com/xydl/cac/task/RuleCheckTask.java index e482300..2afd2dd 100644 --- a/src/main/java/com/xydl/cac/task/RuleCheckTask.java +++ b/src/main/java/com/xydl/cac/task/RuleCheckTask.java @@ -85,7 +85,6 @@ public class RuleCheckTask { .triggerDesc(rule.getOperatorDesc() + " 阈值(" + rule.getThreshold() + ")") .warnTime(new Date()) .processTime(new Date()) - .isread(0) .build(); warningRepository.save(warning); String str = warning.getZsbName() + "--" + warning.getWarnDesc() + " "