Commit af788e36ce19aa7fb7c54ea22b3d155c8b766403
1 parent
fc2d30cf
bpm:code review
Showing
6 changed files
with
5 additions
and
31 deletions
yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/task/vo/task/BpmTaskAddSignReqVO.java
| @@ -6,6 +6,7 @@ import lombok.Data; | @@ -6,6 +6,7 @@ import lombok.Data; | ||
| 6 | import javax.validation.constraints.NotEmpty; | 6 | import javax.validation.constraints.NotEmpty; |
| 7 | import java.util.Set; | 7 | import java.util.Set; |
| 8 | 8 | ||
| 9 | +// TODO @海洋:类名,应该是 create 哈 | ||
| 9 | @Schema(description = "管理后台 - 加签流程任务的 Request VO") | 10 | @Schema(description = "管理后台 - 加签流程任务的 Request VO") |
| 10 | @Data | 11 | @Data |
| 11 | public class BpmTaskAddSignReqVO { | 12 | public class BpmTaskAddSignReqVO { |
| @@ -26,4 +27,4 @@ public class BpmTaskAddSignReqVO { | @@ -26,4 +27,4 @@ public class BpmTaskAddSignReqVO { | ||
| 26 | @NotEmpty(message = "加签原因不能为空") | 27 | @NotEmpty(message = "加签原因不能为空") |
| 27 | private String reason; | 28 | private String reason; |
| 28 | 29 | ||
| 29 | -} | ||
| 30 | \ No newline at end of file | 30 | \ No newline at end of file |
| 31 | +} |
yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/task/vo/task/BpmTaskSubSignReqVO.java
| @@ -5,6 +5,7 @@ import lombok.Data; | @@ -5,6 +5,7 @@ import lombok.Data; | ||
| 5 | 5 | ||
| 6 | import javax.validation.constraints.NotEmpty; | 6 | import javax.validation.constraints.NotEmpty; |
| 7 | 7 | ||
| 8 | +// TODO @海洋:类名,应该是 delete 哈 | ||
| 8 | @Schema(description = "管理后台 - 减签流程任务的 Request VO") | 9 | @Schema(description = "管理后台 - 减签流程任务的 Request VO") |
| 9 | @Data | 10 | @Data |
| 10 | public class BpmTaskSubSignReqVO { | 11 | public class BpmTaskSubSignReqVO { |
yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/dal/mysql/task/BpmTaskExtMapper.java
| @@ -21,13 +21,13 @@ public interface BpmTaskExtMapper extends BaseMapperX<BpmTaskExtDO> { | @@ -21,13 +21,13 @@ public interface BpmTaskExtMapper extends BaseMapperX<BpmTaskExtDO> { | ||
| 21 | return selectList(BpmTaskExtDO::getTaskId, taskIds); | 21 | return selectList(BpmTaskExtDO::getTaskId, taskIds); |
| 22 | } | 22 | } |
| 23 | 23 | ||
| 24 | + // TODO @海:BpmProcessInstanceResultEnum.CAN_SUB_SIGN_STATUS_LIST) 应该作为条件,mapper 不要有业务 | ||
| 24 | default List<BpmTaskExtDO> selectProcessListByTaskIds(Collection<String> taskIds) { | 25 | default List<BpmTaskExtDO> selectProcessListByTaskIds(Collection<String> taskIds) { |
| 25 | return selectList(new LambdaQueryWrapperX<BpmTaskExtDO>() | 26 | return selectList(new LambdaQueryWrapperX<BpmTaskExtDO>() |
| 26 | .in(BpmTaskExtDO::getTaskId, taskIds) | 27 | .in(BpmTaskExtDO::getTaskId, taskIds) |
| 27 | .in(BpmTaskExtDO::getResult, BpmProcessInstanceResultEnum.CAN_SUB_SIGN_STATUS_LIST)); | 28 | .in(BpmTaskExtDO::getResult, BpmProcessInstanceResultEnum.CAN_SUB_SIGN_STATUS_LIST)); |
| 28 | } | 29 | } |
| 29 | 30 | ||
| 30 | - | ||
| 31 | default BpmTaskExtDO selectByTaskId(String taskId) { | 31 | default BpmTaskExtDO selectByTaskId(String taskId) { |
| 32 | return selectOne(BpmTaskExtDO::getTaskId, taskId); | 32 | return selectOne(BpmTaskExtDO::getTaskId, taskId); |
| 33 | } | 33 | } |
yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/framework/bpm/config/BpmSecurityConfiguration.java deleted
| 1 | -package cn.iocoder.yudao.module.bpm.framework.bpm.config; | ||
| 2 | - | ||
| 3 | -import cn.iocoder.yudao.framework.security.config.AuthorizeRequestsCustomizer; | ||
| 4 | -import org.springframework.context.annotation.Bean; | ||
| 5 | -import org.springframework.context.annotation.Configuration; | ||
| 6 | -import org.springframework.security.config.annotation.web.builders.HttpSecurity; | ||
| 7 | -import org.springframework.security.config.annotation.web.configurers.ExpressionUrlAuthorizationConfigurer; | ||
| 8 | - | ||
| 9 | -/** | ||
| 10 | - * @author kemengkai | ||
| 11 | - * @create 2022-05-07 08:15 | ||
| 12 | - */ | ||
| 13 | -@Configuration("bpmSecurityConfiguration") | ||
| 14 | -public class BpmSecurityConfiguration { | ||
| 15 | - | ||
| 16 | - @Bean("bpmAuthorizeRequestsCustomizer") | ||
| 17 | - public AuthorizeRequestsCustomizer authorizeRequestsCustomizer() { | ||
| 18 | - return new AuthorizeRequestsCustomizer() { | ||
| 19 | - | ||
| 20 | - @Override | ||
| 21 | - public void customize(ExpressionUrlAuthorizationConfigurer<HttpSecurity>.ExpressionInterceptUrlRegistry registry) { | ||
| 22 | - // 任务回退接口 | ||
| 23 | - registry.antMatchers(buildAdminApi("/bpm/task/back")).permitAll(); | ||
| 24 | - } | ||
| 25 | - | ||
| 26 | - }; | ||
| 27 | - } | ||
| 28 | -} |
yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/service/definition/BpmModelService.java
yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/service/definition/BpmModelServiceImpl.java
| @@ -288,5 +288,4 @@ public class BpmModelServiceImpl implements BpmModelService { | @@ -288,5 +288,4 @@ public class BpmModelServiceImpl implements BpmModelService { | ||
| 288 | processDefinitionService.updateProcessDefinitionState(oldDefinition.getId(), SuspensionState.SUSPENDED.getStateCode()); | 288 | processDefinitionService.updateProcessDefinitionState(oldDefinition.getId(), SuspensionState.SUSPENDED.getStateCode()); |
| 289 | } | 289 | } |
| 290 | 290 | ||
| 291 | - | ||
| 292 | } | 291 | } |