From 343de424ab52d06c058c9da9dd6ae6f5ffc8ffb6 Mon Sep 17 00:00:00 2001
From: gssong <1742057357@qq.com>
Date: 星期日, 31 三月 2024 15:51:21 +0800
Subject: [PATCH] update 调整流程定义配置注释
---
ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/mapper/WfDefinitionConfigMapper.java | 2 +-
ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/WfDefinitionConfigServiceImpl.java | 10 +++++-----
ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/IWfDefinitionConfigService.java | 8 ++++----
ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/WfDefinitionConfig.java | 2 +-
ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/bo/WfDefinitionConfigBo.java | 2 +-
ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/vo/WfDefinitionConfigVo.java | 2 +-
ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/vo/ProcessDefinitionVo.java | 2 +-
ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/vo/TaskVo.java | 2 +-
ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/ActProcessDefinitionServiceImpl.java | 2 +-
ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/utils/WorkflowUtils.java | 6 +++---
ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/controller/WfDefinitionConfigController.java | 12 ++++++------
ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/vo/ProcessInstanceVo.java | 2 +-
12 files changed, 26 insertions(+), 26 deletions(-)
diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/controller/WfDefinitionConfigController.java b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/controller/WfDefinitionConfigController.java
index d3388d4..67e2ec4 100644
--- a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/controller/WfDefinitionConfigController.java
+++ b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/controller/WfDefinitionConfigController.java
@@ -17,7 +17,7 @@
import org.dromara.workflow.service.IWfDefinitionConfigService;
/**
- * 琛ㄥ崟閰嶇疆
+ * 娴佺▼瀹氫箟閰嶇疆
*
* @author may
* @date 2024-03-18
@@ -32,7 +32,7 @@
/**
- * 鑾峰彇琛ㄥ崟閰嶇疆璇︾粏淇℃伅
+ * 鑾峰彇娴佺▼瀹氫箟閰嶇疆璇︾粏淇℃伅
*
* @param definitionId 涓婚敭
*/
@@ -43,9 +43,9 @@
}
/**
- * 鏂板琛ㄥ崟閰嶇疆
+ * 鏂板娴佺▼瀹氫箟閰嶇疆
*/
- @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 @@
}
/**
- * 鍒犻櫎琛ㄥ崟閰嶇疆
+ * 鍒犻櫎娴佺▼瀹氫箟閰嶇疆
*
* @param ids 涓婚敭涓�
*/
- @Log(title = "琛ㄥ崟閰嶇疆", businessType = BusinessType.DELETE)
+ @Log(title = "娴佺▼瀹氫箟閰嶇疆", businessType = BusinessType.DELETE)
@DeleteMapping("/{ids}")
public R<Void> remove(@NotEmpty(message = "涓婚敭涓嶈兘涓虹┖")
@PathVariable Long[] ids) {
diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/WfDefinitionConfig.java b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/WfDefinitionConfig.java
index b80da0e..0a6a653 100644
--- a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/WfDefinitionConfig.java
+++ b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/WfDefinitionConfig.java
@@ -8,7 +8,7 @@
import java.io.Serial;
/**
- * 琛ㄥ崟閰嶇疆瀵硅薄 wf_form_definition
+ * 娴佺▼瀹氫箟閰嶇疆瀵硅薄 wf_definition_config
*
* @author may
* @date 2024-03-18
diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/bo/WfDefinitionConfigBo.java b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/bo/WfDefinitionConfigBo.java
index 80e7191..c0a14d1 100644
--- a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/bo/WfDefinitionConfigBo.java
+++ b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/bo/WfDefinitionConfigBo.java
@@ -10,7 +10,7 @@
import jakarta.validation.constraints.*;
/**
- * 琛ㄥ崟閰嶇疆涓氬姟瀵硅薄 wf_form_definition
+ * 娴佺▼瀹氫箟閰嶇疆涓氬姟瀵硅薄 wf_form_definition
*
* @author may
* @date 2024-03-18
diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/vo/ProcessDefinitionVo.java b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/vo/ProcessDefinitionVo.java
index cd8ea2a..034adbb 100644
--- a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/vo/ProcessDefinitionVo.java
+++ b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/vo/ProcessDefinitionVo.java
@@ -63,7 +63,7 @@
private Date deploymentTime;
/**
- * 琛ㄥ崟閰嶇疆
+ * 娴佺▼瀹氫箟閰嶇疆
*/
private WfDefinitionConfigVo wfDefinitionConfigVo;
diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/vo/ProcessInstanceVo.java b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/vo/ProcessInstanceVo.java
index 34eb970..305b523 100644
--- a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/vo/ProcessInstanceVo.java
+++ b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/vo/ProcessInstanceVo.java
@@ -94,7 +94,7 @@
private List<TaskVo> taskVoList;
/**
- * 琛ㄥ崟閰嶇疆
+ * 娴佺▼瀹氫箟閰嶇疆
*/
private WfDefinitionConfigVo wfDefinitionConfigVo;
}
diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/vo/TaskVo.java b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/vo/TaskVo.java
index cafff89..fa03008 100644
--- a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/vo/TaskVo.java
+++ b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/vo/TaskVo.java
@@ -157,7 +157,7 @@
private String businessKey;
/**
- * 琛ㄥ崟閰嶇疆
+ * 娴佺▼瀹氫箟閰嶇疆
*/
private WfDefinitionConfigVo wfDefinitionConfigVo;
diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/vo/WfDefinitionConfigVo.java b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/vo/WfDefinitionConfigVo.java
index a7c96f3..00919f8 100644
--- a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/vo/WfDefinitionConfigVo.java
+++ b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/vo/WfDefinitionConfigVo.java
@@ -11,7 +11,7 @@
/**
- * 琛ㄥ崟閰嶇疆瑙嗗浘瀵硅薄 wf_form_definition
+ * 娴佺▼瀹氫箟閰嶇疆瑙嗗浘瀵硅薄 wf_definition_config
*
* @author may
* @date 2024-03-18
diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/mapper/WfDefinitionConfigMapper.java b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/mapper/WfDefinitionConfigMapper.java
index 95e0b87..ee20882 100644
--- a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/mapper/WfDefinitionConfigMapper.java
+++ b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/mapper/WfDefinitionConfigMapper.java
@@ -5,7 +5,7 @@
import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
/**
- * 琛ㄥ崟閰嶇疆Mapper鎺ュ彛
+ * 娴佺▼瀹氫箟閰嶇疆Mapper鎺ュ彛
*
* @author may
* @date 2024-03-18
diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/IWfDefinitionConfigService.java b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/IWfDefinitionConfigService.java
index b9216a5..a80340f 100644
--- a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/IWfDefinitionConfigService.java
+++ b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/IWfDefinitionConfigService.java
@@ -7,7 +7,7 @@
import java.util.List;
/**
- * 琛ㄥ崟閰嶇疆Service鎺ュ彛
+ * 娴佺▼瀹氫箟閰嶇疆Service鎺ュ彛
*
* @author may
* @date 2024-03-18
@@ -15,7 +15,7 @@
public interface IWfDefinitionConfigService {
/**
- * 鏌ヨ琛ㄥ崟閰嶇疆
+ * 鏌ヨ娴佺▼瀹氫箟閰嶇疆
*
* @param definitionId 娴佺▼瀹氫箟id
* @return 缁撴灉
@@ -23,7 +23,7 @@
WfDefinitionConfigVo getByDefId(String definitionId);
/**
- * 鏌ヨ琛ㄥ崟閰嶇疆鍒楄〃
+ * 鏌ヨ娴佺▼瀹氫箟閰嶇疆鍒楄〃
*
* @param definitionIds 娴佺▼瀹氫箟id
* @return 缁撴灉
@@ -32,7 +32,7 @@
/**
- * 鏂板琛ㄥ崟閰嶇疆
+ * 鏂板娴佺▼瀹氫箟閰嶇疆
*
* @param bo 鍙傛暟
* @return 缁撴灉
diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/ActProcessDefinitionServiceImpl.java b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/ActProcessDefinitionServiceImpl.java
index 3ec2c47..b8b882e 100644
--- a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/ActProcessDefinitionServiceImpl.java
+++ b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/ActProcessDefinitionServiceImpl.java
@@ -199,7 +199,7 @@
}
//鍒犻櫎娴佺▼瀹氫箟
repositoryService.deleteDeployment(deploymentId);
- //鍒犻櫎琛ㄥ崟閰嶇疆
+ //鍒犻櫎娴佺▼瀹氫箟閰嶇疆
iWfDefinitionConfigService.deleteByDefIds(Collections.singletonList(processDefinitionId));
//鍒犻櫎鑺傜偣閰嶇疆
iWfNodeConfigService.deleteByDefIds(Collections.singletonList(processDefinitionId));
diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/WfDefinitionConfigServiceImpl.java b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/WfDefinitionConfigServiceImpl.java
index 5127d66..d69f6ec 100644
--- a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/WfDefinitionConfigServiceImpl.java
+++ b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/WfDefinitionConfigServiceImpl.java
@@ -15,7 +15,7 @@
import java.util.Collection;
/**
- * 琛ㄥ崟閰嶇疆Service涓氬姟灞傚鐞�
+ * 娴佺▼瀹氫箟閰嶇疆Service涓氬姟灞傚鐞�
*
* @author may
* @date 2024-03-18
@@ -27,7 +27,7 @@
private final WfDefinitionConfigMapper baseMapper;
/**
- * 鏌ヨ琛ㄥ崟閰嶇疆
+ * 鏌ヨ娴佺▼瀹氫箟閰嶇疆
*/
@Override
public WfDefinitionConfigVo getByDefId(String definitionId) {
@@ -35,7 +35,7 @@
}
/**
- * 鏌ヨ琛ㄥ崟閰嶇疆鍒楄〃
+ * 鏌ヨ娴佺▼瀹氫箟閰嶇疆鍒楄〃
*/
@Override
public List<WfDefinitionConfigVo> queryList(List<String> definitionIds) {
@@ -43,7 +43,7 @@
}
/**
- * 鏂板琛ㄥ崟閰嶇疆
+ * 鏂板娴佺▼瀹氫箟閰嶇疆
*/
@Override
@Transactional(rollbackFor = Exception.class)
@@ -57,7 +57,7 @@
}
/**
- * 鎵归噺鍒犻櫎琛ㄥ崟閰嶇疆
+ * 鎵归噺鍒犻櫎娴佺▼瀹氫箟閰嶇疆
*/
@Override
public Boolean deleteByIds(Collection<Long> ids) {
diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/utils/WorkflowUtils.java b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/utils/WorkflowUtils.java
index 328e02f..3d867f0 100644
--- a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/utils/WorkflowUtils.java
+++ b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/utils/WorkflowUtils.java
@@ -55,7 +55,7 @@
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 @@
}
/**
- * 璁剧疆娴佺▼琛ㄥ崟閰嶇疆
+ * 璁剧疆娴佺▼娴佺▼瀹氫箟閰嶇疆
*
* @param obj 涓氬姟瀵硅薄
* @param idList 娴佺▼瀹氫箟id
@@ -303,7 +303,7 @@
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);
--
Gitblit v1.9.3