wangli/workflow-engine
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

REQ-2752-删除管理员接口，返回删除记录数量

Browse Source
This commit is contained in:
yangqicheng 2024-10-14 11:40:17 +08:00
parent 47cc2d4bd0
commit f42da8ddfd
5 changed files with 21 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
workflow-engine-api/src/main/java/cn/axzo/workflow/client/feign/manage/ProcessAdminApi.java
View File

@ -64,7 +64,7 @@ public interface ProcessAdminApi {
*/
@DeleteMapping("/api/process/admin/delete")
@InvokeMode(SYNC)
CommonResponse<Void> deleteCommonProcessAdmin(@RequestParam Long id);
CommonResponse<Integer> deleteCommonProcessAdmin(@RequestParam Long id);
/**
* 根据条件删除管理员
@ -73,7 +73,7 @@ public interface ProcessAdminApi {
*/
@DeleteMapping("/api/process/admin/delete/criteria")
@InvokeMode(SYNC)
CommonResponse<Void> deleteProcessAdminCriteria(@RequestParam ProcessAdminDeleteDTO dto);
CommonResponse<Integer> deleteProcessAdminCriteria(@RequestParam ProcessAdminDeleteDTO dto);
/**
* 删除管理员
@ -82,5 +82,5 @@ public interface ProcessAdminApi {
*/
@DeleteMapping("/api/process/admin/batch/delete")
@InvokeMode(SYNC)
CommonResponse<Void> batchDeleteProcessAdmin(@RequestBody List<Long> ids);
CommonResponse<Integer> batchDeleteProcessAdmin(@RequestBody List<Long> ids);
}

4
workflow-engine-axzo-ext/src/main/java/cn/axzo/workflow/admin/service/ExtAxProcessAdminService.java
View File

@ -39,11 +39,11 @@ public interface ExtAxProcessAdminService {
* 根据条件删除管理员配置
* @param deleteDTO 删除条件
*/
void delete(ProcessAdminDeleteDTO deleteDTO);
Integer delete(ProcessAdminDeleteDTO deleteDTO);
/**
* 批量删除管理员
* @param ids 配置表id列表
*/
void deleteCommonAdminsByIds(List<Long> ids);
Integer deleteCommonAdminsByIds(List<Long> ids);
}

14
workflow-engine-axzo-ext/src/main/java/cn/axzo/workflow/admin/service/impl/ExtAxProcessAdminServiceImpl.java
View File

@ -53,24 +53,24 @@ public class ExtAxProcessAdminServiceImpl implements ExtAxProcessAdminService {
}
@Override
public void delete(ProcessAdminDeleteDTO deleteDTO) {
public Integer delete(ProcessAdminDeleteDTO deleteDTO) {
if (deleteDTO == null) {
return;
return 0;
}
extAxProcessAdminMapper.delete(getDeleteWrapper(deleteDTO));
return extAxProcessAdminMapper.delete(getDeleteWrapper(deleteDTO));
}
@Override
public void deleteCommonAdminsByIds(List<Long> ids) {
public Integer deleteCommonAdminsByIds(List<Long> ids) {
if (CollectionUtils.isEmpty(ids)) {
return;
return 0;
}
List<ExtAxProcessAdmin> extAxProcessAdmins = extAxProcessAdminMapper.selectBatchIds(ids);
if (CollectionUtils.isEmpty(extAxProcessAdmins)) {
return;
return 0;
}
validateDeleteCommonAdmins(extAxProcessAdmins);
extAxProcessAdminMapper.deleteBatchIds(ids);
return extAxProcessAdminMapper.deleteBatchIds(ids);
}
private void validateDeleteCommonAdmins(List<ExtAxProcessAdmin> extAxProcessAdmins) {

15
workflow-engine-server/src/main/java/cn/axzo/workflow/server/controller/web/manage/ProcessAdminController.java
View File

@ -101,25 +101,22 @@ public class ProcessAdminController implements ProcessAdminApi {
@DeleteMapping("/delete")
@Override
public CommonResponse<Void> deleteCommonProcessAdmin(@RequestParam Long id) {
extAxProcessAdminService.deleteCommonAdminsByIds(Collections.singletonList(id));
return CommonResponse.success();
public CommonResponse<Integer> deleteCommonProcessAdmin(@RequestParam Long id) {
return CommonResponse.success(extAxProcessAdminService.deleteCommonAdminsByIds(Collections.singletonList(id)));
}
@DeleteMapping("/delete/criteria")
@Override
public CommonResponse<Void> deleteProcessAdminCriteria(@RequestBody ProcessAdminDeleteDTO dto) {
extAxProcessAdminService.delete(dto);
return CommonResponse.success();
public CommonResponse<Integer> deleteProcessAdminCriteria(@RequestBody ProcessAdminDeleteDTO dto) {
return CommonResponse.success(extAxProcessAdminService.delete(dto));
}
@DeleteMapping("/batch/delete")
@Override
public CommonResponse<Void> batchDeleteProcessAdmin(@RequestBody List<Long> ids) {
public CommonResponse<Integer> batchDeleteProcessAdmin(@RequestBody List<Long> ids) {
if (CollectionUtils.isEmpty(ids)) {
return CommonResponse.success();
}
extAxProcessAdminService.deleteCommonAdminsByIds(ids);
return CommonResponse.success();
return CommonResponse.success(extAxProcessAdminService.deleteCommonAdminsByIds(ids));
}
}

6
workflow-engine-spring-boot-starter/src/main/java/cn/axzo/workflow/starter/api/WorkflowManageService.java
View File

@ -798,7 +798,7 @@ public interface WorkflowManageService {
*/
@DeleteMapping("/api/process/admin/delete")
@InvokeMode(SYNC)
Void deleteCommonProcessAdmin(@RequestParam Long id);
Integer deleteCommonProcessAdmin(@RequestParam Long id);
/**
* 根据条件删除管理员
@ -807,7 +807,7 @@ public interface WorkflowManageService {
*/
@DeleteMapping("/api/process/admin/delete/criteria")
@InvokeMode(SYNC)
Void deleteProcessAdminCriteria(@RequestParam ProcessAdminDeleteDTO dto);
Integer deleteProcessAdminCriteria(@RequestParam ProcessAdminDeleteDTO dto);
/**
* 删除管理员
@ -816,7 +816,7 @@ public interface WorkflowManageService {
*/
@DeleteMapping("/api/process/admin/batch/delete")
@InvokeMode(SYNC)
Void batchDeleteProcessAdmin(@RequestBody List<Long> ids);
Integer batchDeleteProcessAdmin(@RequestBody List<Long> ids);
/**
* 强制使用‘同步’模式调用该方法，请在调用真实方法前调用该方法