From 346dcdf75dd77fda2e4330eb17e1b1a5a5aeca93 Mon Sep 17 00:00:00 2001 From: liuy <37787198+LiuyCodes@users.noreply.github.com> Date: Fri, 23 May 2025 17:45:15 +0800 Subject: [PATCH] =?UTF-8?q?refactor(nifi):=20=E9=87=8D=E6=9E=84=20Oracle?= =?UTF-8?q?=20=E5=BA=94=E7=94=A8=E5=88=9B=E5=BB=BA=E9=80=BB=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit -重命名 CreateAppInstance 类为 CreateAppInstanceJoin，以更准确地反映其功能 - 新增 CreateAppInstanceResult 类用于封装创建结果 - 修改 INifiAppOperation接口，使用 CreateAppInstanceJoin 作为入参，返回 CreateAppInstanceResult 对象 - 优化 NifiAppOperationImpl 中的 createAppContext 方法，返回新创建的流程组 ID - 调整 INifiBaseOperation 接口文档，明确 mark 参数为可选 - 优化 NifiFilterUtil 中的 filterPortsByComments 方法，支持空 mark 参数 --- ...pInstance.java => CreateAppInstanceJoin.java} | 2 +- .../CreateAppInstanceResult.java | 16 ++++++++++++++++ .../nifiapi/operation/INifiAppOperation.java | 5 +++-- .../nifiapi/operation/INifiBaseOperation.java | 2 +- .../operation/impl/NifiAppOperationImpl.java | 9 +++++++-- .../hzya/frame/nifiapi/util/NifiFilterUtil.java | 8 ++++++-- 6 files changed, 34 insertions(+), 8 deletions(-) rename fw-nifi/src/main/java/com/hzya/frame/nifiapi/model/joincreateoracleapp/{CreateAppInstance.java => CreateAppInstanceJoin.java} (85%) create mode 100644 fw-nifi/src/main/java/com/hzya/frame/nifiapi/model/resultcreateoracleapp/CreateAppInstanceResult.java diff --git a/fw-nifi/src/main/java/com/hzya/frame/nifiapi/model/joincreateoracleapp/CreateAppInstance.java b/fw-nifi/src/main/java/com/hzya/frame/nifiapi/model/joincreateoracleapp/CreateAppInstanceJoin.java similarity index 85% rename from fw-nifi/src/main/java/com/hzya/frame/nifiapi/model/joincreateoracleapp/CreateAppInstance.java rename to fw-nifi/src/main/java/com/hzya/frame/nifiapi/model/joincreateoracleapp/CreateAppInstanceJoin.java index 9f3046a6..f1f10173 100644 --- a/fw-nifi/src/main/java/com/hzya/frame/nifiapi/model/joincreateoracleapp/CreateAppInstance.java +++ b/fw-nifi/src/main/java/com/hzya/frame/nifiapi/model/joincreateoracleapp/CreateAppInstanceJoin.java @@ -12,5 +12,5 @@ import lombok.Data; * @Filename：CreateOracleApp */ @Data -public class CreateAppInstance extends JoinBashModel { +public class CreateAppInstanceJoin extends JoinBashModel { } \ No newline at end of file diff --git a/fw-nifi/src/main/java/com/hzya/frame/nifiapi/model/resultcreateoracleapp/CreateAppInstanceResult.java b/fw-nifi/src/main/java/com/hzya/frame/nifiapi/model/resultcreateoracleapp/CreateAppInstanceResult.java new file mode 100644 index 00000000..b381c3ab --- /dev/null +++ b/fw-nifi/src/main/java/com/hzya/frame/nifiapi/model/resultcreateoracleapp/CreateAppInstanceResult.java @@ -0,0 +1,16 @@ +package com.hzya.frame.nifiapi.model.resultcreateoracleapp; + +import lombok.Data; + +/** + * @Author：liuyang + * @Package：com.hzya.frame.nifiapi.model.resultcreateoracleapp + * @Project：fw-nifi + * @name：CreateAppInstanceResult + * @Date：2025/5/23 15:16 + * @Filename：CreateAppInstanceResult + */ +@Data +public class CreateAppInstanceResult { + private String newProcessGroupId; +} diff --git a/fw-nifi/src/main/java/com/hzya/frame/nifiapi/operation/INifiAppOperation.java b/fw-nifi/src/main/java/com/hzya/frame/nifiapi/operation/INifiAppOperation.java index aa85b7ac..1efba8c4 100644 --- a/fw-nifi/src/main/java/com/hzya/frame/nifiapi/operation/INifiAppOperation.java +++ b/fw-nifi/src/main/java/com/hzya/frame/nifiapi/operation/INifiAppOperation.java @@ -1,6 +1,7 @@ package com.hzya.frame.nifiapi.operation; -import com.hzya.frame.nifiapi.model.joincreateoracleapp.CreateAppInstance; +import com.hzya.frame.nifiapi.model.joincreateoracleapp.CreateAppInstanceJoin; +import com.hzya.frame.nifiapi.model.resultcreateoracleapp.CreateAppInstanceResult; /** * NiFi应用实例化业务操作接口 @@ -25,7 +26,7 @@ public interface INifiAppOperation { * * @param createOracleApp 封装创建Oracle应用所需要的入参 */ - void createAppContext(CreateAppInstance createOracleApp) throws Exception; + CreateAppInstanceResult createAppContext(CreateAppInstanceJoin createOracleApp) throws Exception; /** * Mysql应用创建并实例化 diff --git a/fw-nifi/src/main/java/com/hzya/frame/nifiapi/operation/INifiBaseOperation.java b/fw-nifi/src/main/java/com/hzya/frame/nifiapi/operation/INifiBaseOperation.java index 47c7b5ed..3d56bf54 100644 --- a/fw-nifi/src/main/java/com/hzya/frame/nifiapi/operation/INifiBaseOperation.java +++ b/fw-nifi/src/main/java/com/hzya/frame/nifiapi/operation/INifiBaseOperation.java @@ -56,7 +56,7 @@ public interface INifiBaseOperation { * 查找带有接口关系标记的输入和输出，eg：接口关系标记:f5228bc8-0360-41eb-a640-9f4df953937c * * @param processGroupId 流程组id - * @param mark 接口修改标记字符串 + * @param mark 接口修改标记字符串，如果为null，则不进行过滤 */ PortFilterResult getNeedModifyControllerRelationshipByProcessGroup(String processGroupId, String mark) throws Exception; diff --git a/fw-nifi/src/main/java/com/hzya/frame/nifiapi/operation/impl/NifiAppOperationImpl.java b/fw-nifi/src/main/java/com/hzya/frame/nifiapi/operation/impl/NifiAppOperationImpl.java index 3b8c9126..b832793a 100644 --- a/fw-nifi/src/main/java/com/hzya/frame/nifiapi/operation/impl/NifiAppOperationImpl.java +++ b/fw-nifi/src/main/java/com/hzya/frame/nifiapi/operation/impl/NifiAppOperationImpl.java @@ -1,11 +1,12 @@ package com.hzya.frame.nifiapi.operation.impl; -import com.hzya.frame.nifiapi.model.joincreateoracleapp.CreateAppInstance; +import com.hzya.frame.nifiapi.model.joincreateoracleapp.CreateAppInstanceJoin; import com.hzya.frame.nifiapi.model.joincreparamcontext.CreateParamContextJoin; import com.hzya.frame.nifiapi.model.joinfindneedmodifycontroller.FindNeedModifyController; import com.hzya.frame.nifiapi.model.joingetallcontrollerservice.ControllerServices19; import com.hzya.frame.nifiapi.model.joingetcontroller.Component12; import com.hzya.frame.nifiapi.model.joingetcontroller.ControllerService12; +import com.hzya.frame.nifiapi.model.resultcreateoracleapp.CreateAppInstanceResult; import com.hzya.frame.nifiapi.operation.INifiBaseOperation; import com.hzya.frame.nifiapi.operation.INifiAppOperation; import com.hzya.frame.nifiapi.service.NifiApiService; @@ -38,7 +39,8 @@ public class NifiAppOperationImpl implements INifiAppOperation { private INifiBaseOperation baseOperation; @Override - public void createAppContext(CreateAppInstance createOracleApp) throws Exception { + public CreateAppInstanceResult createAppContext(CreateAppInstanceJoin createOracleApp) throws Exception { + CreateAppInstanceResult createAppInstanceResult = new CreateAppInstanceResult(); try { //1.实例化应用 String newProcessGroupId = null; @@ -74,9 +76,12 @@ public class NifiAppOperationImpl implements INifiAppOperation { findNeedModifyController.setProcessGroupId(newProcessGroupId); baseOperation.findNeedModifyControllerAndChangesOccur(findNeedModifyController, true, true); } + + createAppInstanceResult.setNewProcessGroupId(newProcessGroupId); } catch (Exception e) { throw new Exception(e); } + return createAppInstanceResult; } // @Override diff --git a/fw-nifi/src/main/java/com/hzya/frame/nifiapi/util/NifiFilterUtil.java b/fw-nifi/src/main/java/com/hzya/frame/nifiapi/util/NifiFilterUtil.java index f73a8e22..e682fd72 100644 --- a/fw-nifi/src/main/java/com/hzya/frame/nifiapi/util/NifiFilterUtil.java +++ b/fw-nifi/src/main/java/com/hzya/frame/nifiapi/util/NifiFilterUtil.java @@ -31,9 +31,13 @@ public class NifiFilterUtil { * @return 过滤后的端口列表 */ public List filterPortsByComments(List ports, String mark, String portType) { +// if (ports == null || mark == null) { +// logger.debug("未提供｛｝或标记，返回空列表", portType); +// return Collections.emptyList(); +// } + if (ports == null || mark == null) { - logger.debug("未提供｛｝或标记，返回空列表", portType); - return Collections.emptyList(); + return ports; } return ports.stream()