diff --git a/modules/core/src/main/java/com/bytedesk/core/action/ActionRestController.java b/modules/core/src/main/java/com/bytedesk/core/action/ActionRestController.java index a3f7965116..a02a10ef87 100644 --- a/modules/core/src/main/java/com/bytedesk/core/action/ActionRestController.java +++ b/modules/core/src/main/java/com/bytedesk/core/action/ActionRestController.java @@ -2,7 +2,7 @@ * @Author: jackning 270580156@qq.com * @Date: 2024-04-25 15:40:19 * @LastEditors: jackning 270580156@qq.com - * @LastEditTime: 2025-04-10 12:00:53 + * @LastEditTime: 2025-05-03 10:47:49 * @Description: bytedesk.com https://github.com/Bytedesk/bytedesk * Please be aware of the BSL license restrictions before installing Bytedesk IM – * selling, reselling, or hosting Bytedesk IM as a service is a breach of the terms and automatically terminates your rights under the license. @@ -42,26 +42,42 @@ public class ActionRestController extends BaseRestController { @Override public ResponseEntity queryByUser(ActionRequest request) { - // TODO Auto-generated method stub - throw new UnsupportedOperationException("Unimplemented method 'query'"); + + Page page = actionRestService.queryByUser(request); + + return ResponseEntity.ok(JsonResult.success(page)); + } + + @Override + public ResponseEntity queryByUid(ActionRequest request) { + + ActionResponse action = actionRestService.queryByUid(request); + + return ResponseEntity.ok(JsonResult.success(action)); } @Override public ResponseEntity create(ActionRequest request) { - // TODO Auto-generated method stub - throw new UnsupportedOperationException("Unimplemented method 'create'"); + + ActionResponse action = actionRestService.create(request); + + return ResponseEntity.ok(JsonResult.success(action)); } @Override public ResponseEntity update(ActionRequest request) { - // TODO Auto-generated method stub - throw new UnsupportedOperationException("Unimplemented method 'update'"); + + ActionResponse action = actionRestService.update(request); + + return ResponseEntity.ok(JsonResult.success(action)); } @Override public ResponseEntity delete(ActionRequest request) { - // TODO Auto-generated method stub - throw new UnsupportedOperationException("Unimplemented method 'delete'"); + + actionRestService.delete(request); + + return ResponseEntity.ok(JsonResult.success("ok")); } // https://github.com/alibaba/easyexcel @@ -79,11 +95,7 @@ public class ActionRestController extends BaseRestController { ); } - @Override - public ResponseEntity queryByUid(ActionRequest request) { - // TODO Auto-generated method stub - throw new UnsupportedOperationException("Unimplemented method 'queryByUid'"); - } + } diff --git a/modules/core/src/main/java/com/bytedesk/core/action/ActionRestService.java b/modules/core/src/main/java/com/bytedesk/core/action/ActionRestService.java index b90adfed8b..a9febc6292 100644 --- a/modules/core/src/main/java/com/bytedesk/core/action/ActionRestService.java +++ b/modules/core/src/main/java/com/bytedesk/core/action/ActionRestService.java @@ -2,7 +2,7 @@ * @Author: jackning 270580156@qq.com * @Date: 2024-04-25 15:41:47 * @LastEditors: jackning 270580156@qq.com - * @LastEditTime: 2025-04-30 22:02:53 + * @LastEditTime: 2025-05-03 10:47:10 * @Description: bytedesk.com https://github.com/Bytedesk/bytedesk * Please be aware of the BSL license restrictions before installing Bytedesk IM – * selling, reselling, or hosting Bytedesk IM as a service is a breach of the terms and automatically terminates your rights under the license. @@ -107,16 +107,20 @@ public class ActionRestService extends BaseRestServiceWithExcel actionOptional = findByUid(uid); + if (actionOptional.isPresent()) { + ActionEntity action = actionOptional.get(); + action.setDeleted(true); + actionRepository.save(action); + } } @Override public void delete(ActionRequest entity) { - // TODO Auto-generated method stub - throw new UnsupportedOperationException("Unimplemented method 'delete'"); + deleteByUid(entity.getUid()); } + @Override public ActionEntity handleOptimisticLockingFailureException(ObjectOptimisticLockingFailureException e, ActionEntity entity) { // TODO Auto-generated method stub