From 3c2c87364b89de46d12e95abd5bdf8cbd2c6dbf6 Mon Sep 17 00:00:00 2001
From: baoshiwei <baoshiwei@shlanbao.cn>
Date: 星期三, 12 三月 2025 08:43:23 +0800
Subject: [PATCH] dev-init

---
 ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/WfDefinitionConfigServiceImpl.java |   58 ++++++++++++++++++++++++++++++++++++++++++++++++++++------
 1 files changed, 52 insertions(+), 6 deletions(-)

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..ab55ff8 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
@@ -1,5 +1,6 @@
 package org.dromara.workflow.service.impl;
 
+import cn.hutool.core.collection.CollUtil;
 import org.dromara.common.core.utils.MapstructUtils;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import lombok.RequiredArgsConstructor;
@@ -15,7 +16,7 @@
 import java.util.Collection;
 
 /**
- * 琛ㄥ崟閰嶇疆Service涓氬姟灞傚鐞�
+ * 娴佺▼瀹氫箟閰嶇疆Service涓氬姟灞傚鐞�
  *
  * @author may
  * @date 2024-03-18
@@ -27,7 +28,7 @@
     private final WfDefinitionConfigMapper baseMapper;
 
     /**
-     * 鏌ヨ琛ㄥ崟閰嶇疆
+     * 鏌ヨ娴佺▼瀹氫箟閰嶇疆
      */
     @Override
     public WfDefinitionConfigVo getByDefId(String definitionId) {
@@ -35,7 +36,50 @@
     }
 
     /**
-     * 鏌ヨ琛ㄥ崟閰嶇疆鍒楄〃
+     * 鏌ヨ娴佺▼瀹氫箟閰嶇疆
+     *
+     * @param tableName 琛ㄥ悕
+     * @return 缁撴灉
+     */
+    @Override
+    public WfDefinitionConfigVo getByTableNameLastVersion(String tableName) {
+        List<WfDefinitionConfigVo> wfDefinitionConfigVos = baseMapper.selectVoList(
+            new LambdaQueryWrapper<WfDefinitionConfig>().eq(WfDefinitionConfig::getTableName, tableName).orderByDesc(WfDefinitionConfig::getVersion));
+        if (CollUtil.isNotEmpty(wfDefinitionConfigVos)) {
+            return wfDefinitionConfigVos.get(0);
+        }
+        return null;
+    }
+
+    /**
+     * 鏌ヨ娴佺▼瀹氫箟閰嶇疆
+     *
+     * @param definitionId 娴佺▼瀹氫箟id
+     * @param tableName    琛ㄥ悕
+     * @return 缁撴灉
+     */
+    @Override
+    public WfDefinitionConfigVo getByDefIdAndTableName(String definitionId, String tableName) {
+        return baseMapper.selectVoOne(new LambdaQueryWrapper<WfDefinitionConfig>()
+            .eq(WfDefinitionConfig::getDefinitionId, definitionId)
+            .eq(WfDefinitionConfig::getTableName, tableName));
+    }
+
+    /**
+     * 鏌ヨ娴佺▼瀹氫箟閰嶇疆鎺掗櫎褰撳墠鏌ヨ鐨勬祦绋嬪畾涔�
+     *
+     * @param tableName    琛ㄥ悕
+     * @param definitionId 娴佺▼瀹氫箟id
+     */
+    @Override
+    public List<WfDefinitionConfigVo> getByTableNameNotDefId(String tableName, String definitionId) {
+        return baseMapper.selectVoList(new LambdaQueryWrapper<WfDefinitionConfig>()
+            .eq(WfDefinitionConfig::getTableName, tableName)
+            .ne(WfDefinitionConfig::getDefinitionId, definitionId));
+    }
+
+    /**
+     * 鏌ヨ娴佺▼瀹氫箟閰嶇疆鍒楄〃
      */
     @Override
     public List<WfDefinitionConfigVo> queryList(List<String> definitionIds) {
@@ -43,12 +87,14 @@
     }
 
     /**
-     * 鏂板琛ㄥ崟閰嶇疆
+     * 鏂板娴佺▼瀹氫箟閰嶇疆
      */
     @Override
     @Transactional(rollbackFor = Exception.class)
     public Boolean saveOrUpdate(WfDefinitionConfigBo bo) {
         WfDefinitionConfig add = MapstructUtils.convert(bo, WfDefinitionConfig.class);
+        baseMapper.delete(new LambdaQueryWrapper<WfDefinitionConfig>().eq(WfDefinitionConfig::getTableName, bo.getTableName()));
+        add.setTableName(add.getTableName().toLowerCase());
         boolean flag = baseMapper.insertOrUpdate(add);
         if (baseMapper.insertOrUpdate(add)) {
             bo.setId(add.getId());
@@ -57,11 +103,11 @@
     }
 
     /**
-     * 鎵归噺鍒犻櫎琛ㄥ崟閰嶇疆
+     * 鎵归噺鍒犻櫎娴佺▼瀹氫箟閰嶇疆
      */
     @Override
     public Boolean deleteByIds(Collection<Long> ids) {
-        return baseMapper.deleteBatchIds(ids) > 0;
+        return baseMapper.deleteByIds(ids) > 0;
     }
 
     @Override

--
Gitblit v1.9.3