From f80f06353f1c318ae734884ebcc37a8967ed3aef Mon Sep 17 00:00:00 2001
From: rain <1679827795@qq.com>
Date: Mon, 26 Jan 2026 10:29:19 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
drone-service/drone-fw/src/main/java/org/sxkj/fw/record/controller/FwAlarmFavoriteController.java | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/drone-service/drone-fw/src/main/java/org/sxkj/fw/record/controller/FwAlarmFavoriteController.java b/drone-service/drone-fw/src/main/java/org/sxkj/fw/record/controller/FwAlarmFavoriteController.java
index b700b48..ab5019e 100644
--- a/drone-service/drone-fw/src/main/java/org/sxkj/fw/record/controller/FwAlarmFavoriteController.java
+++ b/drone-service/drone-fw/src/main/java/org/sxkj/fw/record/controller/FwAlarmFavoriteController.java
@@ -73,17 +73,17 @@
public R save(@Valid @RequestBody FwAlarmFavoriteAddParam fwAlarmFavorite) {
FwAlarmFavoriteEntity fwAlarmFavoriteEntity = Objects.requireNonNull(BeanUtil.copy(fwAlarmFavorite, FwAlarmFavoriteEntity.class));
fwAlarmFavoriteEntity.setUserId(AuthUtil.getUserId());
- return R.status(fwAlarmFavoriteService.save(fwAlarmFavoriteEntity));
+ return R.status(fwAlarmFavoriteService.saveFwAlarmFavorite(fwAlarmFavoriteEntity));
}
/**
- * 告警记录关注表 删除
+ * 告警记录关注表 取消
*/
- @PostMapping("/remove")
+ @PostMapping("/cancelFavorite")
@ApiOperationSupport(order = 7)
@ApiOperation(value = "取消关注", notes = "传入ids")
public R remove(@ApiParam(value = "主键集合", required = true) @RequestParam String ids) {
- return R.status(fwAlarmFavoriteService.deleteLogic(Func.toLongList(ids)));
+ return R.status(fwAlarmFavoriteService.cancelFavorite(Func.toLongList(ids)));
}
--
Gitblit v1.9.3