优化命名

hsweb-system/hsweb-system-workflow/hsweb-system-workflow-local/src/main/java/org/hswebframework/web/workflow/service/ActivityConfigurationService.java

@@ -1,12 +0,0 @@
-package org.hswebframework.web.workflow.service;
-
-import org.hswebframework.web.workflow.service.dto.ActivityConfiguration;
-import org.hswebframework.web.workflow.service.dto.ProcessConfiguration;
-
-public interface ActivityConfigurationService {
-
-    ActivityConfiguration getActivityConfiguration(String doingUser, String processDefineId, String activityId);
-
-    ProcessConfiguration getProcessConfiguration(String processDefineId);
-
-}

hsweb-system/hsweb-system-workflow/hsweb-system-workflow-local/src/main/java/org/hswebframework/web/workflow/service/config/ActivityConfiguration.java

@@ -0,0 +1,38 @@
+package org.hswebframework.web.workflow.service.config;
+
+import org.hswebframework.web.authorization.User;
+
+import java.util.List;
+
+/**
+ * @author zhouhao
+ * @since 3.0.0-RC
+ */
+public interface ActivityConfiguration {
+    /**
+     * 此任务需要提交的表单,如果返回值不为空,则说明此任务在完成的时候,需要一起提交表单数据
+     *
+     * @return 表单ID, 如果未设置返回null
+     * @see org.hswebframework.web.service.form.DynamicFormOperationService
+     * @see org.hswebframework.web.service.form.DynamicFormService
+     */
+    String getFormId();
+
+    /**
+     * 判断用户是否可以签收此任务
+     *
+     * @param userId 用户ID {@link User#getId()}
+     * @return 是否可以签收
+     * @see User
+     * @see org.hswebframework.web.authorization.Authentication
+     */
+    boolean canClaim(String userId);
+
+    /**
+     * 获取此任务的所有候选人信息
+     *
+     * @return 此任务的所有候选人信息 {@link CandidateInfo}
+     */
+    List<CandidateInfo> getCandidateInfo();
+
+}

hsweb-system/hsweb-system-workflow/hsweb-system-workflow-local/src/main/java/org/hswebframework/web/workflow/service/dto/ActivityCandidateInfo.java

@@ -1,16 +1,23 @@
-package org.hswebframework.web.workflow.service.dto;
+package org.hswebframework.web.workflow.service.config;
 
 import org.hswebframework.web.authorization.Authentication;
 import org.hswebframework.web.organizational.authorization.PersonnelAuthentication;
 
-public interface ActivityCandidateInfo {
+/**
+ * 候选人信息
+ */
+public interface CandidateInfo {
     /**
      * 候选人的用户授权信息
+     *
+     * @see Authentication
      */
     Authentication user();
 
     /**
      * 候选人的组织架构人员信息
+     *
+     * @see PersonnelAuthentication
      */
     PersonnelAuthentication person();
 }

hsweb-system/hsweb-system-workflow/hsweb-system-workflow-local/src/main/java/org/hswebframework/web/workflow/service/dto/ProcessConfiguration.java

@@ -1,4 +1,4 @@
-package org.hswebframework.web.workflow.service.dto;
+package org.hswebframework.web.workflow.service.config;
 
 
 import org.activiti.engine.repository.ProcessDefinition;

hsweb-system/hsweb-system-workflow/hsweb-system-workflow-local/src/main/java/org/hswebframework/web/workflow/service/config/ProcessConfigurationService.java

@@ -0,0 +1,10 @@
+package org.hswebframework.web.workflow.service.config;
+
+
+public interface ProcessConfigurationService {
+
+    ActivityConfiguration getActivityConfiguration(String doingUser, String processDefineId, String activityId);
+
+    ProcessConfiguration getProcessConfiguration(String processDefineId);
+
+}

hsweb-system/hsweb-system-workflow/hsweb-system-workflow-local/src/main/java/org/hswebframework/web/workflow/service/dto/ActivityConfiguration.java

@@ -1,16 +0,0 @@
-package org.hswebframework.web.workflow.service.dto;
-
-import java.util.List;
-
-/**
- * @author zhouhao
- * @since 3.0.0-RC
- */
-public interface ActivityConfiguration {
-    String getFormId();
-
-    boolean canClaim(String userId);
-
-    List<ActivityCandidateInfo> getCandidateInfo();
-
-}

hsweb-system/hsweb-system-workflow/hsweb-system-workflow-local/src/main/java/org/hswebframework/web/workflow/service/imp/BpmProcessServiceImpl.java

@@ -7,12 +7,9 @@ import org.activiti.engine.task.Task;
 import org.hswebframework.utils.StringUtils;
 import org.hswebframework.web.NotFoundException;
 import org.hswebframework.web.id.IDGenerator;
-import org.hswebframework.web.service.form.DynamicFormOperationService;
-import org.hswebframework.web.workflow.service.ActivityConfigurationService;
 import org.hswebframework.web.workflow.service.BpmProcessService;
 import org.hswebframework.web.workflow.service.BpmTaskService;
 import org.hswebframework.web.workflow.service.WorkFlowFormService;
-import org.hswebframework.web.workflow.service.dto.ActivityCandidateInfo;
 import org.hswebframework.web.workflow.service.request.SaveFormRequest;
 import org.hswebframework.web.workflow.service.request.StartProcessRequest;
 import org.slf4j.Logger;
@@ -22,10 +19,7 @@ import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
 import java.io.InputStream;
-import java.util.HashMap;
 import java.util.List;
-import java.util.Map;
-import java.util.Objects;
 import java.util.function.Consumer;
 
 /**

hsweb-system/hsweb-system-workflow/hsweb-system-workflow-local/src/main/java/org/hswebframework/web/workflow/service/imp/BpmTaskServiceImpl.java

@@ -16,12 +16,12 @@ import org.activiti.engine.task.Task;
 import org.hswebframework.utils.StringUtils;
 import org.hswebframework.web.BusinessException;
 import org.hswebframework.web.NotFoundException;
-import org.hswebframework.web.workflow.service.ActivityConfigurationService;
+import org.hswebframework.web.workflow.service.config.ProcessConfigurationService;
 import org.hswebframework.web.workflow.service.BpmActivityService;
 import org.hswebframework.web.workflow.service.BpmTaskService;
 import org.hswebframework.web.workflow.flowable.utils.JumpTaskCmd;
 import org.hswebframework.web.workflow.service.WorkFlowFormService;
-import org.hswebframework.web.workflow.service.dto.ActivityCandidateInfo;
+import org.hswebframework.web.workflow.service.config.CandidateInfo;
 import org.hswebframework.web.workflow.service.request.CompleteTaskRequest;
 import org.hswebframework.web.workflow.service.request.SaveFormRequest;
 import org.slf4j.Logger;
@@ -30,7 +30,6 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
-import javax.annotation.Resource;
 import java.util.*;
 
 
@@ -48,7 +47,7 @@ public class BpmTaskServiceImpl extends AbstractFlowableService implements BpmTa
     private BpmActivityService bpmActivityService;
 
     @Autowired
-    private ActivityConfigurationService activityConfigurationService;
+    private ProcessConfigurationService processConfigurationService;
 
     @Autowired
     private WorkFlowFormService workFlowFormService;
@@ -287,12 +286,12 @@ public class BpmTaskServiceImpl extends AbstractFlowableService implements BpmTa
         }
         if (task.getTaskDefinitionKey() != null) {
             //从配置中获取候选人
-            List<ActivityCandidateInfo> candidateInfoList = activityConfigurationService
+            List<CandidateInfo> candidateInfoList = processConfigurationService
                     .getActivityConfiguration(doingUserId
                             , task.getProcessDefinitionId()
                             , task.getTaskDefinitionKey())
                     .getCandidateInfo();
-            for (ActivityCandidateInfo candidateInfo : candidateInfoList) {
+            for (CandidateInfo candidateInfo : candidateInfoList) {
                 taskService.addCandidateUser(task.getId(), candidateInfo.user().getUser().getId());
             }
         } else {

hsweb-system/hsweb-system-workflow/hsweb-system-workflow-local/src/main/java/org/hswebframework/web/workflow/service/imp/ActivityConfigurationServiceImpl.java

@@ -1,10 +1,10 @@
 package org.hswebframework.web.workflow.service.imp;
 
 import org.activiti.engine.repository.ProcessDefinition;
-import org.hswebframework.web.workflow.service.ActivityConfigurationService;
-import org.hswebframework.web.workflow.service.dto.ActivityCandidateInfo;
-import org.hswebframework.web.workflow.service.dto.ActivityConfiguration;
-import org.hswebframework.web.workflow.service.dto.ProcessConfiguration;
+import org.hswebframework.web.workflow.service.config.ProcessConfigurationService;
+import org.hswebframework.web.workflow.service.config.CandidateInfo;
+import org.hswebframework.web.workflow.service.config.ActivityConfiguration;
+import org.hswebframework.web.workflow.service.config.ProcessConfiguration;
 import org.springframework.stereotype.Service;
 
 import java.util.Collections;
@@ -16,7 +16,7 @@ import java.util.List;
  * @since 3.0.0-RC
  */
 @Service
-public class ActivityConfigurationServiceImpl implements ActivityConfigurationService {
+public class ProcessConfigurationServiceImpl implements ProcessConfigurationService {
 
     static final EmptyActivityConfiguration emptyConfiguration = new EmptyActivityConfiguration();
 
@@ -45,7 +45,7 @@ public class ActivityConfigurationServiceImpl implements ActivityConfigurationSe
         }
 
         @Override
-        public List<ActivityCandidateInfo> getCandidateInfo() {
+        public List<CandidateInfo> getCandidateInfo() {
             return Collections.emptyList();
         }
 

hsweb-system/hsweb-system-workflow/hsweb-system-workflow-local/src/main/java/org/hswebframework/web/workflow/service/imp/WorkFlowFormServiceImpl.java

@@ -3,10 +3,10 @@ package org.hswebframework.web.workflow.service.imp;
 import org.activiti.engine.runtime.ProcessInstance;
 import org.activiti.engine.task.Task;
 import org.hswebframework.web.service.form.DynamicFormOperationService;
-import org.hswebframework.web.workflow.service.ActivityConfigurationService;
+import org.hswebframework.web.workflow.service.config.ProcessConfigurationService;
 import org.hswebframework.web.workflow.service.WorkFlowFormService;
-import org.hswebframework.web.workflow.service.dto.ActivityConfiguration;
-import org.hswebframework.web.workflow.service.dto.ProcessConfiguration;
+import org.hswebframework.web.workflow.service.config.ActivityConfiguration;
+import org.hswebframework.web.workflow.service.config.ProcessConfiguration;
 import org.hswebframework.web.workflow.service.request.SaveFormRequest;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -22,7 +22,7 @@ import java.util.Map;
 public class WorkFlowFormServiceImpl extends AbstractFlowableService implements WorkFlowFormService {
 
     @Autowired
-    private ActivityConfigurationService activityConfigurationService;
+    private ProcessConfigurationService processConfigurationService;
 
     @Autowired
     private DynamicFormOperationService dynamicFormOperationService;
@@ -31,7 +31,7 @@ public class WorkFlowFormServiceImpl extends AbstractFlowableService implements
     public void saveProcessForm(ProcessInstance instance, SaveFormRequest request) {
         request.tryValidate();
 
-        ProcessConfiguration configuration = activityConfigurationService
+        ProcessConfiguration configuration = processConfigurationService
                 .getProcessConfiguration(instance.getProcessDefinitionId());
 
         if (configuration == null || StringUtils.isEmpty(configuration.getFormId())) {
@@ -49,7 +49,7 @@ public class WorkFlowFormServiceImpl extends AbstractFlowableService implements
     public void saveTaskForm(Task task, SaveFormRequest request) {
         request.tryValidate();
 
-        ActivityConfiguration configuration = activityConfigurationService
+        ActivityConfiguration configuration = processConfigurationService
                 .getActivityConfiguration(request.getUserId()
                         , task.getProcessDefinitionId()
                         , task.getTaskDefinitionKey());

hsweb-system/hsweb-system-workflow/hsweb-system-workflow-local/src/main/java/org/hswebframework/web/workflow/web/FlowableProcessController.java

@@ -10,7 +10,6 @@ import org.activiti.engine.history.HistoricTaskInstanceQuery;
 import org.activiti.engine.repository.ProcessDefinition;
 import org.activiti.engine.runtime.ProcessInstance;
 import org.activiti.engine.runtime.ProcessInstanceQuery;
-import org.activiti.engine.task.Task;
 import org.activiti.engine.task.TaskQuery;
 import org.hswebframework.web.NotFoundException;
 import org.hswebframework.web.authorization.Authentication;
@@ -19,7 +18,7 @@ import org.hswebframework.web.authorization.annotation.Authorize;
 import org.hswebframework.web.commons.entity.PagerResult;
 import org.hswebframework.web.commons.entity.param.QueryParamEntity;
 import org.hswebframework.web.controller.message.ResponseMessage;
-import org.hswebframework.web.workflow.service.ActivityConfigurationService;
+import org.hswebframework.web.workflow.service.config.ProcessConfigurationService;
 import org.hswebframework.web.workflow.service.BpmProcessService;
 import org.hswebframework.web.workflow.service.BpmTaskService;
 import org.hswebframework.web.workflow.service.request.CompleteTaskRequest;
@@ -30,7 +29,6 @@ import org.hswebframework.web.workflow.web.response.TaskInfo;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
-import java.util.List;
 import java.util.Map;
 
 
@@ -57,7 +55,7 @@ public class FlowableProcessController {
     private RepositoryService repositoryService;
 
     @Autowired
-    private ActivityConfigurationService activityConfigurationService;
+    private ProcessConfigurationService processConfigurationService;
 
     @Autowired
     private TaskService taskService;
@@ -129,7 +127,7 @@ public class FlowableProcessController {
             throw new NotFoundException("流程[" + defineKey + "]不存在");
         }
         //判断权限
-        activityConfigurationService.getProcessConfiguration(definition.getId())
+        processConfigurationService.getProcessConfiguration(definition.getId())
                 .assertCanStartProcess(authentication.getUser().getId(), definition);
 
         String id = definition.getId();
@@ -160,7 +158,7 @@ public class FlowableProcessController {
             throw new NotFoundException("流程[" + defId + "]不存在");
         }
         //判断权限
-        activityConfigurationService.getProcessConfiguration(definition.getId())
+        processConfigurationService.getProcessConfiguration(definition.getId())
                 .assertCanStartProcess(authentication.getUser().getId(), definition);