Explorar el Código

update 调整流程定义配置注释

gssong hace 1 año
padre
commit
343de424ab

+ 6 - 6
ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/controller/WfDefinitionConfigController.java

@@ -17,7 +17,7 @@ import org.dromara.workflow.domain.vo.WfDefinitionConfigVo;
 import org.dromara.workflow.service.IWfDefinitionConfigService;
 
 /**
- * 表单配置
+ * 流程定义配置
  *
  * @author may
  * @date 2024-03-18
@@ -32,7 +32,7 @@ public class WfDefinitionConfigController extends BaseController {
 
 
     /**
-     * 获取表单配置详细信息
+     * 获取流程定义配置详细信息
      *
      * @param definitionId 主键
      */
@@ -43,9 +43,9 @@ public class WfDefinitionConfigController extends BaseController {
     }
 
     /**
-     * 新增表单配置
+     * 新增流程定义配置
      */
-    @Log(title = "表单配置", businessType = BusinessType.INSERT)
+    @Log(title = "流程定义配置", businessType = BusinessType.INSERT)
     @RepeatSubmit()
     @PostMapping("/saveOrUpdate")
     public R<Void> saveOrUpdate(@Validated(AddGroup.class) @RequestBody WfDefinitionConfigBo bo) {
@@ -53,11 +53,11 @@ public class WfDefinitionConfigController extends BaseController {
     }
 
     /**
-     * 删除表单配置
+     * 删除流程定义配置
      *
      * @param ids 主键串
      */
-    @Log(title = "表单配置", businessType = BusinessType.DELETE)
+    @Log(title = "流程定义配置", businessType = BusinessType.DELETE)
     @DeleteMapping("/{ids}")
     public R<Void> remove(@NotEmpty(message = "主键不能为空")
                           @PathVariable Long[] ids) {

+ 1 - 1
ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/WfDefinitionConfig.java

@@ -8,7 +8,7 @@ import lombok.EqualsAndHashCode;
 import java.io.Serial;
 
 /**
- * 表单配置对象 wf_form_definition
+ * 流程定义配置对象 wf_definition_config
  *
  * @author may
  * @date 2024-03-18

+ 1 - 1
ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/bo/WfDefinitionConfigBo.java

@@ -10,7 +10,7 @@ import lombok.EqualsAndHashCode;
 import jakarta.validation.constraints.*;
 
 /**
- * 表单配置业务对象 wf_form_definition
+ * 流程定义配置业务对象 wf_form_definition
  *
  * @author may
  * @date 2024-03-18

+ 1 - 1
ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/vo/ProcessDefinitionVo.java

@@ -63,7 +63,7 @@ public class ProcessDefinitionVo implements Serializable {
     private Date deploymentTime;
 
     /**
-     * 表单配置
+     * 流程定义配置
      */
     private WfDefinitionConfigVo wfDefinitionConfigVo;
 

+ 1 - 1
ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/vo/ProcessInstanceVo.java

@@ -94,7 +94,7 @@ public class ProcessInstanceVo implements Serializable {
     private List<TaskVo> taskVoList;
 
     /**
-     * 表单配置
+     * 流程定义配置
      */
     private WfDefinitionConfigVo wfDefinitionConfigVo;
 }

+ 1 - 1
ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/vo/TaskVo.java

@@ -157,7 +157,7 @@ public class TaskVo implements Serializable {
     private String businessKey;
 
     /**
-     * 表单配置
+     * 流程定义配置
      */
     private WfDefinitionConfigVo wfDefinitionConfigVo;
 

+ 1 - 1
ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/vo/WfDefinitionConfigVo.java

@@ -11,7 +11,7 @@ import java.io.Serializable;
 
 
 /**
- * 表单配置视图对象 wf_form_definition
+ * 流程定义配置视图对象 wf_definition_config
  *
  * @author may
  * @date 2024-03-18

+ 1 - 1
ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/mapper/WfDefinitionConfigMapper.java

@@ -5,7 +5,7 @@ import org.dromara.workflow.domain.vo.WfDefinitionConfigVo;
 import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
 
 /**
- * 表单配置Mapper接口
+ * 流程定义配置Mapper接口
  *
  * @author may
  * @date 2024-03-18

+ 4 - 4
ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/IWfDefinitionConfigService.java

@@ -7,7 +7,7 @@ import java.util.Collection;
 import java.util.List;
 
 /**
- * 表单配置Service接口
+ * 流程定义配置Service接口
  *
  * @author may
  * @date 2024-03-18
@@ -15,7 +15,7 @@ import java.util.List;
 public interface IWfDefinitionConfigService {
 
     /**
-     * 查询表单配置
+     * 查询流程定义配置
      *
      * @param definitionId 流程定义id
      * @return 结果
@@ -23,7 +23,7 @@ public interface IWfDefinitionConfigService {
     WfDefinitionConfigVo getByDefId(String definitionId);
 
     /**
-     * 查询表单配置列表
+     * 查询流程定义配置列表
      *
      * @param definitionIds 流程定义id
      * @return 结果
@@ -32,7 +32,7 @@ public interface IWfDefinitionConfigService {
 
 
     /**
-     * 新增表单配置
+     * 新增流程定义配置
      *
      * @param bo 参数
      * @return 结果

+ 1 - 1
ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/ActProcessDefinitionServiceImpl.java

@@ -199,7 +199,7 @@ public class ActProcessDefinitionServiceImpl implements IActProcessDefinitionSer
             }
             //删除流程定义
             repositoryService.deleteDeployment(deploymentId);
-            //删除表单配置
+            //删除流程定义配置
             iWfDefinitionConfigService.deleteByDefIds(Collections.singletonList(processDefinitionId));
             //删除节点配置
             iWfNodeConfigService.deleteByDefIds(Collections.singletonList(processDefinitionId));

+ 5 - 5
ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/WfDefinitionConfigServiceImpl.java

@@ -15,7 +15,7 @@ import java.util.List;
 import java.util.Collection;
 
 /**
- * 表单配置Service业务层处理
+ * 流程定义配置Service业务层处理
  *
  * @author may
  * @date 2024-03-18
@@ -27,7 +27,7 @@ public class WfDefinitionConfigServiceImpl implements IWfDefinitionConfigService
     private final WfDefinitionConfigMapper baseMapper;
 
     /**
-     * 查询表单配置
+     * 查询流程定义配置
      */
     @Override
     public WfDefinitionConfigVo getByDefId(String definitionId) {
@@ -35,7 +35,7 @@ public class WfDefinitionConfigServiceImpl implements IWfDefinitionConfigService
     }
 
     /**
-     * 查询表单配置列表
+     * 查询流程定义配置列表
      */
     @Override
     public List<WfDefinitionConfigVo> queryList(List<String> definitionIds) {
@@ -43,7 +43,7 @@ public class WfDefinitionConfigServiceImpl implements IWfDefinitionConfigService
     }
 
     /**
-     * 新增表单配置
+     * 新增流程定义配置
      */
     @Override
     @Transactional(rollbackFor = Exception.class)
@@ -57,7 +57,7 @@ public class WfDefinitionConfigServiceImpl implements IWfDefinitionConfigService
     }
 
     /**
-     * 批量删除表单配置
+     * 批量删除流程定义配置
      */
     @Override
     public Boolean deleteByIds(Collection<Long> ids) {

+ 3 - 3
ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/utils/WorkflowUtils.java

@@ -55,7 +55,7 @@ public class WorkflowUtils {
     private static final IWorkflowUserService WORKFLOW_USER_SERVICE = SpringUtils.getBean(IWorkflowUserService.class);
     private static final IActHiProcinstService ACT_HI_PROCINST_SERVICE = SpringUtils.getBean(IActHiProcinstService.class);
     private static final ActHiTaskinstMapper ACT_HI_TASKINST_MAPPER = SpringUtils.getBean(ActHiTaskinstMapper.class);
-    private static final IWfDefinitionConfigService I_WF_FORM_DEFINITION_SERVICE = SpringUtils.getBean(IWfDefinitionConfigService.class);
+    private static final IWfDefinitionConfigService I_WF_DEFINITION_CONFIG_SERVICE = SpringUtils.getBean(IWfDefinitionConfigService.class);
     private static final IWfFormManageService I_WF_FORM_MANAGE_SERVICE = SpringUtils.getBean(IWfFormManageService.class);
 
     /**
@@ -293,7 +293,7 @@ public class WorkflowUtils {
     }
 
     /**
-     * 设置流程表单配置
+     * 设置流程流程定义配置
      *
      * @param obj       业务对象
      * @param idList    流程定义id
@@ -303,7 +303,7 @@ public class WorkflowUtils {
         if (CollUtil.isEmpty(idList) || obj == null) {
             return;
         }
-        List<WfDefinitionConfigVo> wfDefinitionConfigVoList = I_WF_FORM_DEFINITION_SERVICE.queryList(idList);
+        List<WfDefinitionConfigVo> wfDefinitionConfigVoList = I_WF_DEFINITION_CONFIG_SERVICE.queryList(idList);
         if (CollUtil.isNotEmpty(wfDefinitionConfigVoList)) {
             List<Long> formIds = StreamUtils.toList(wfDefinitionConfigVoList, WfDefinitionConfigVo::getFormId);
             List<WfFormManageVo> wfFormManageVos = I_WF_FORM_MANAGE_SERVICE.queryByIds(formIds);