From a5ac0063b999bc7b6f59e867165d3cb05493794f Mon Sep 17 00:00:00 2001
From: "1437892690@qq.com" <1437892690@qq.com>
Date: Fri, 6 Sep 2024 17:31:51 +0800
Subject: [PATCH 1/3] =?UTF-8?q?[=E5=8A=9F=E8=83=BD]=20codedriver-suzhouban?=
 =?UTF-8?q?k=E6=A8=A1=E5=9D=97=E6=94=B9=E6=88=90neatlogic-suzhoubank?=
 =?UTF-8?q?=E6=A8=A1=E5=9D=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

关联 #[1238396461088768]codedriver-suzhoubank模块改成neatlogic-suzhoubank模块 http://192.168.0.96:8090/demo/rdm.html#/story-detail/939050947543040/939050947543042/1238396461088768
---
 .../module/process/dao/mapper/catalog/CatalogMapper.java     | 2 +-
 .../module/process/dao/mapper/catalog/CatalogMapper.xml      | 4 ++--
 .../module/process/dao/mapper/catalog/PriorityMapper.java    | 3 ++-
 .../neatlogic/module/process/dao/mapper/task/TaskMapper.java | 5 +++--
 .../neatlogic/module/process/service/ChannelServiceImpl.java | 3 ++-
 5 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/src/main/java/neatlogic/module/process/dao/mapper/catalog/CatalogMapper.java b/src/main/java/neatlogic/module/process/dao/mapper/catalog/CatalogMapper.java
index e9d61b2fd..874df2365 100644
--- a/src/main/java/neatlogic/module/process/dao/mapper/catalog/CatalogMapper.java
+++ b/src/main/java/neatlogic/module/process/dao/mapper/catalog/CatalogMapper.java
@@ -111,7 +111,7 @@ public interface CatalogMapper extends ICatalogCrossoverMapper {
 
 	String getParentUuidByUuid(String uuid);
 
-//	List<CatalogVo> getCatalogByName(String name);
+	List<CatalogVo> getCatalogByName(String name);
 
 	List<CatalogVo> getCatalogListByUuidList(List<String> uuidList);
 
diff --git a/src/main/java/neatlogic/module/process/dao/mapper/catalog/CatalogMapper.xml b/src/main/java/neatlogic/module/process/dao/mapper/catalog/CatalogMapper.xml
index e2f3838aa..876e88861 100644
--- a/src/main/java/neatlogic/module/process/dao/mapper/catalog/CatalogMapper.xml
+++ b/src/main/java/neatlogic/module/process/dao/mapper/catalog/CatalogMapper.xml
@@ -323,7 +323,7 @@
 	<select id="getParentUuidByUuid" parameterType="java.lang.String" resultType="java.lang.String" useCache="false">
 		SELECT `parent_uuid` FROM `catalog` WHERE `uuid` = #{value}
 	</select>
-    <!--<select id="getCatalogByName" parameterType="java.lang.String" resultType="neatlogic.framework.process.dto.CatalogVo">
+    <select id="getCatalogByName" parameterType="java.lang.String" resultType="neatlogic.framework.process.dto.CatalogVo">
 		SELECT
 			`uuid`,
 			`name`,
@@ -337,7 +337,7 @@
 		FROM
 			`catalog`
 		where `name` = #{value}
-	</select>-->
+	</select>
 
 	<select id="getCatalogListByUuidList" parameterType="java.util.List" resultType="neatlogic.framework.process.dto.CatalogVo">
 		SELECT
diff --git a/src/main/java/neatlogic/module/process/dao/mapper/catalog/PriorityMapper.java b/src/main/java/neatlogic/module/process/dao/mapper/catalog/PriorityMapper.java
index 219160d2b..1e808951c 100644
--- a/src/main/java/neatlogic/module/process/dao/mapper/catalog/PriorityMapper.java
+++ b/src/main/java/neatlogic/module/process/dao/mapper/catalog/PriorityMapper.java
@@ -18,13 +18,14 @@
 package neatlogic.module.process.dao.mapper.catalog;
 
 import neatlogic.framework.common.dto.ValueTextVo;
+import neatlogic.framework.process.crossover.IPriorityCrossoverMapper;
 import neatlogic.framework.process.dto.PrioritySearchVo;
 import neatlogic.framework.process.dto.PriorityVo;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
 
-public interface PriorityMapper {
+public interface PriorityMapper extends IPriorityCrossoverMapper {
 
 	int searchPriorityCount(PriorityVo priorityVo);
 
diff --git a/src/main/java/neatlogic/module/process/dao/mapper/task/TaskMapper.java b/src/main/java/neatlogic/module/process/dao/mapper/task/TaskMapper.java
index cbafae1f3..995e5e782 100644
--- a/src/main/java/neatlogic/module/process/dao/mapper/task/TaskMapper.java
+++ b/src/main/java/neatlogic/module/process/dao/mapper/task/TaskMapper.java
@@ -15,10 +15,11 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.*/
 
 package neatlogic.module.process.dao.mapper.task;
 
+import com.alibaba.fastjson.JSONArray;
 import neatlogic.framework.common.dto.BasePageVo;
 import neatlogic.framework.common.dto.ValueTextVo;
+import neatlogic.framework.process.crossover.ITaskCrossoverMapper;
 import neatlogic.framework.process.dto.TaskConfigVo;
-import com.alibaba.fastjson.JSONArray;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
@@ -28,7 +29,7 @@ import java.util.Map;
  * @author lvzk
  * @since 2021/9/1 14:18
  **/
-public interface TaskMapper {
+public interface TaskMapper extends ITaskCrossoverMapper {
 
     int searchTaskConfigCount(TaskConfigVo taskConfigVo);
 
diff --git a/src/main/java/neatlogic/module/process/service/ChannelServiceImpl.java b/src/main/java/neatlogic/module/process/service/ChannelServiceImpl.java
index c40d53070..5656b71d9 100644
--- a/src/main/java/neatlogic/module/process/service/ChannelServiceImpl.java
+++ b/src/main/java/neatlogic/module/process/service/ChannelServiceImpl.java
@@ -22,6 +22,7 @@ import com.alibaba.fastjson.JSONObject;
 import neatlogic.framework.crossover.CrossoverServiceFactory;
 import neatlogic.framework.dto.AuthorityVo;
 import neatlogic.framework.process.constvalue.CatalogChannelAuthorityAction;
+import neatlogic.framework.process.crossover.IChannelCrossoverService;
 import neatlogic.framework.process.crossover.IProcessCrossoverMapper;
 import neatlogic.framework.process.dto.CatalogVo;
 import neatlogic.framework.process.dto.ChannelPriorityVo;
@@ -47,7 +48,7 @@ import java.util.List;
 import java.util.Objects;
 
 @Service
-public class ChannelServiceImpl implements ChannelService {
+public class ChannelServiceImpl implements ChannelService, IChannelCrossoverService {
 
     //private static final Logger logger = LoggerFactory.getLogger(ChannelServiceImpl.class);
 
-- 
Gitee


From 02822a2194bb21d374a66f47e44587dfcb3fdf2a Mon Sep 17 00:00:00 2001
From: "1437892690@qq.com" <1437892690@qq.com>
Date: Fri, 6 Sep 2024 18:20:58 +0800
Subject: [PATCH 2/3] =?UTF-8?q?[=E5=8A=9F=E8=83=BD]=20codedriver-suzhouban?=
 =?UTF-8?q?k=E6=A8=A1=E5=9D=97=E6=94=B9=E6=88=90neatlogic-suzhoubank?=
 =?UTF-8?q?=E6=A8=A1=E5=9D=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

关联 #[1238396461088768]codedriver-suzhoubank模块改成neatlogic-suzhoubank模块 http://192.168.0.96:8090/demo/rdm.html#/story-detail/939050947543040/939050947543042/1238396461088768
---
 .../module/process/api/processtask/ProcessTaskCompleteApi.java | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/main/java/neatlogic/module/process/api/processtask/ProcessTaskCompleteApi.java b/src/main/java/neatlogic/module/process/api/processtask/ProcessTaskCompleteApi.java
index 3d870994e..36a03a864 100644
--- a/src/main/java/neatlogic/module/process/api/processtask/ProcessTaskCompleteApi.java
+++ b/src/main/java/neatlogic/module/process/api/processtask/ProcessTaskCompleteApi.java
@@ -19,7 +19,6 @@ import com.alibaba.fastjson.JSONObject;
 import neatlogic.framework.auth.core.AuthAction;
 import neatlogic.framework.common.constvalue.ApiParamType;
 import neatlogic.framework.process.auth.PROCESS_BASE;
-import neatlogic.framework.process.crossover.IProcessTaskCompleteApiCrossoverService;
 import neatlogic.framework.restful.annotation.Description;
 import neatlogic.framework.restful.annotation.Input;
 import neatlogic.framework.restful.annotation.OperationType;
@@ -34,7 +33,7 @@ import javax.annotation.Resource;
 @Service
 @OperationType(type = OperationTypeEnum.UPDATE)
 @AuthAction(action = PROCESS_BASE.class)
-public class ProcessTaskCompleteApi extends PrivateApiComponentBase implements IProcessTaskCompleteApiCrossoverService {
+public class ProcessTaskCompleteApi extends PrivateApiComponentBase {
 
     @Resource
     private ProcessTaskService processTaskService;
-- 
Gitee


From 033ef131b4fb961ca99791a5a166612036233679 Mon Sep 17 00:00:00 2001
From: "1437892690@qq.com" <1437892690@qq.com>
Date: Mon, 9 Sep 2024 10:40:05 +0800
Subject: [PATCH 3/3] =?UTF-8?q?[=E5=8A=9F=E8=83=BD]=20codedriver-suzhouban?=
 =?UTF-8?q?k=E6=A8=A1=E5=9D=97=E6=94=B9=E6=88=90neatlogic-suzhoubank?=
 =?UTF-8?q?=E6=A8=A1=E5=9D=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

关联 #[1238396461088768]codedriver-suzhoubank模块改成neatlogic-suzhoubank模块 http://192.168.0.96:8090/demo/rdm.html#/story-detail/939050947543040/939050947543042/1238396461088768
---
 .../api/processtask/task/ProcessTaskStepTaskCompleteApi.java | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/src/main/java/neatlogic/module/process/api/processtask/task/ProcessTaskStepTaskCompleteApi.java b/src/main/java/neatlogic/module/process/api/processtask/task/ProcessTaskStepTaskCompleteApi.java
index 8b0ba3962..b56c45af6 100644
--- a/src/main/java/neatlogic/module/process/api/processtask/task/ProcessTaskStepTaskCompleteApi.java
+++ b/src/main/java/neatlogic/module/process/api/processtask/task/ProcessTaskStepTaskCompleteApi.java
@@ -15,15 +15,14 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.*/
 
 package neatlogic.module.process.api.processtask.task;
 
+import com.alibaba.fastjson.JSONObject;
 import neatlogic.framework.auth.core.AuthAction;
 import neatlogic.framework.common.constvalue.ApiParamType;
 import neatlogic.framework.process.auth.PROCESS_BASE;
-import neatlogic.framework.process.crossover.IProcessTaskStepTaskCompleteApiCrossoverService;
 import neatlogic.framework.restful.annotation.*;
 import neatlogic.framework.restful.constvalue.OperationTypeEnum;
 import neatlogic.framework.restful.core.privateapi.PrivateApiComponentBase;
 import neatlogic.module.process.service.ProcessTaskStepTaskService;
-import com.alibaba.fastjson.JSONObject;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
@@ -37,7 +36,7 @@ import javax.annotation.Resource;
 @Transactional
 @OperationType(type = OperationTypeEnum.OPERATE)
 @AuthAction(action = PROCESS_BASE.class)
-public class ProcessTaskStepTaskCompleteApi extends PrivateApiComponentBase implements IProcessTaskStepTaskCompleteApiCrossoverService {
+public class ProcessTaskStepTaskCompleteApi extends PrivateApiComponentBase {
     @Resource
     ProcessTaskStepTaskService processTaskStepTaskService;
 
-- 
Gitee