diff --git a/fw-nifi/src/main/java/com/hzya/frame/nifi/client/NifiClient.java b/fw-nifi/src/main/java/com/hzya/frame/nifi/client/NifiClient.java index 9fd0b7fb..9b09872b 100644 --- a/fw-nifi/src/main/java/com/hzya/frame/nifi/client/NifiClient.java +++ b/fw-nifi/src/main/java/com/hzya/frame/nifi/client/NifiClient.java @@ -1,5 +1,6 @@ package com.hzya.frame.nifi.client; +import cn.hutool.core.util.StrUtil; import com.fasterxml.jackson.databind.ObjectMapper; import com.hzya.frame.nifi.config.NifiServiceConfig; import okhttp3.*; @@ -157,7 +158,7 @@ public class NifiClient { String responseBody = response.body().string(); logger.info("响应体:" + responseBody); if (!response.isSuccessful()) { - throw new IOException("意外的响应码: " + responseBody); + throw new IOException(StrUtil.format("意外的响应码: {}", responseBody)); } return objectMapper.readValue(responseBody, responseType); } diff --git a/fw-nifi/src/main/java/com/hzya/frame/nifi/model/joinupdateprocessor/Revision17.java b/fw-nifi/src/main/java/com/hzya/frame/nifi/model/joinupdateprocessor/Revision17.java new file mode 100644 index 00000000..384d1ccc --- /dev/null +++ b/fw-nifi/src/main/java/com/hzya/frame/nifi/model/joinupdateprocessor/Revision17.java @@ -0,0 +1,16 @@ +package com.hzya.frame.nifi.model.joinupdateprocessor; + +import lombok.Data; + +/** + * @Author:liuyang + * @Package:com.hzya.frame.nifi.model.joinupdateprocessor + * @Project:fw-nifi + * @name:Revision17 + * @Date:2025/5/19 11:26 + * @Filename:Revision17 + */ +@Data +public class Revision17 { + private String version; +} diff --git a/fw-nifi/src/main/java/com/hzya/frame/nifi/model/joinupdateprocessor/RunStatusOrStop17.java b/fw-nifi/src/main/java/com/hzya/frame/nifi/model/joinupdateprocessor/RunStatusOrStop17.java new file mode 100644 index 00000000..cdefd927 --- /dev/null +++ b/fw-nifi/src/main/java/com/hzya/frame/nifi/model/joinupdateprocessor/RunStatusOrStop17.java @@ -0,0 +1,17 @@ +package com.hzya.frame.nifi.model.joinupdateprocessor; + +import lombok.Data; + +/** + * @Author:liuyang + * @Package:com.hzya.frame.nifi.model.joinupdateprocessor + * @Project:fw-nifi + * @name:RunStatusOrStop + * @Date:2025/5/19 11:25 + * @Filename:RunStatusOrStop + */ +@Data +public class RunStatusOrStop17 { + private String state; + private Revision17 revision; +} diff --git a/fw-nifi/src/main/java/com/hzya/frame/nifi/model/resultprocessorsinfo/Component16.java b/fw-nifi/src/main/java/com/hzya/frame/nifi/model/resultprocessorsinfo/Component16.java new file mode 100644 index 00000000..4e75e98d --- /dev/null +++ b/fw-nifi/src/main/java/com/hzya/frame/nifi/model/resultprocessorsinfo/Component16.java @@ -0,0 +1,21 @@ +package com.hzya.frame.nifi.model.resultprocessorsinfo; + +import lombok.Data; + +/** + * @Author:liuyang + * @Package:com.hzya.frame.nifi.model.resultprocessorsinfo + * @Project:fw-nifi + * @name:Component16 + * @Date:2025/5/19 10:05 + * @Filename:Component16 + */ +@Data +public class Component16 { + private String id; + private String parentGroupId; + private String name; + private String type; + private String state; + private Config16 config; +} diff --git a/fw-nifi/src/main/java/com/hzya/frame/nifi/model/resultprocessorsinfo/Config16.java b/fw-nifi/src/main/java/com/hzya/frame/nifi/model/resultprocessorsinfo/Config16.java new file mode 100644 index 00000000..a3819377 --- /dev/null +++ b/fw-nifi/src/main/java/com/hzya/frame/nifi/model/resultprocessorsinfo/Config16.java @@ -0,0 +1,31 @@ +package com.hzya.frame.nifi.model.resultprocessorsinfo; + +import lombok.Data; + +import java.util.Map; + +/** + * @Author:liuyang + * @Package:com.hzya.frame.nifi.model.resultprocessorsinfo + * @Project:fw-nifi + * @name:Config16 + * @Date:2025/5/19 10:06 + * @Filename:Config16 + */ +@Data +public class Config16 { + private Map properties; + private String schedulingPeriod; + private String schedulingStrategy; + private String executionNodel; + private String penaltyDuration; + private String yieldDuration; + private String bulletinLevel; + private String runDurationMillis; + private String concurrentlySchedulableTaskCount; + private String comments; + private String lossTolerant; + private String retryCount; + private String backoffMechanism; + private String maxBackoffPeriod; +} diff --git a/fw-nifi/src/main/java/com/hzya/frame/nifi/model/resultprocessorsinfo/ProcessorsInfo16.java b/fw-nifi/src/main/java/com/hzya/frame/nifi/model/resultprocessorsinfo/ProcessorsInfo16.java new file mode 100644 index 00000000..62fbc248 --- /dev/null +++ b/fw-nifi/src/main/java/com/hzya/frame/nifi/model/resultprocessorsinfo/ProcessorsInfo16.java @@ -0,0 +1,18 @@ +package com.hzya.frame.nifi.model.resultprocessorsinfo; + +import lombok.Data; + +/** + * @Author:liuyang + * @Package:com.hzya.frame.nifi.model.resultprocessorsinfo + * @Project:fw-nifi + * @name:ProcessorsInfo + * @Date:2025/5/19 10:03 + * @Filename:ProcessorsInfo + */ +@Data +public class ProcessorsInfo16 { + private String id; + private Component16 component; + private Revision16 revision; +} diff --git a/fw-nifi/src/main/java/com/hzya/frame/nifi/model/resultprocessorsinfo/Revision16.java b/fw-nifi/src/main/java/com/hzya/frame/nifi/model/resultprocessorsinfo/Revision16.java new file mode 100644 index 00000000..b6b3bb88 --- /dev/null +++ b/fw-nifi/src/main/java/com/hzya/frame/nifi/model/resultprocessorsinfo/Revision16.java @@ -0,0 +1,16 @@ +package com.hzya.frame.nifi.model.resultprocessorsinfo; + +import lombok.Data; + +/** + * @Author:liuyang + * @Package:com.hzya.frame.nifi.model.resultprocessorsinfo + * @Project:fw-nifi + * @name:Revision16 + * @Date:2025/5/19 10:04 + * @Filename:Revision16 + */ +@Data +public class Revision16 { + private String version; +} diff --git a/fw-nifi/src/main/java/com/hzya/frame/nifi/service/NifiApiService.java b/fw-nifi/src/main/java/com/hzya/frame/nifi/service/NifiApiService.java index 628077fb..7d321a3f 100644 --- a/fw-nifi/src/main/java/com/hzya/frame/nifi/service/NifiApiService.java +++ b/fw-nifi/src/main/java/com/hzya/frame/nifi/service/NifiApiService.java @@ -11,6 +11,7 @@ import com.hzya.frame.nifi.model.joinprocessgroups.ProcessGroupsJoin; import com.hzya.frame.nifi.model.joinsnippetinstance.SnippetInstanceJoin; import com.hzya.frame.nifi.model.joinsnippets.SnippetsJoin; import com.hzya.frame.nifi.model.joinstartorstopprocessgroup.StartOrStopProcessGroupsInfoJoin10; +import com.hzya.frame.nifi.model.joinupdateprocessor.RunStatusOrStop17; import com.hzya.frame.nifi.model.nifitemplates.NifiTemplates; import com.hzya.frame.nifi.model.processgroupid.ProcessGroupsId; import com.hzya.frame.nifi.model.processgrouproot.ProcessGroupsRoot; @@ -21,6 +22,7 @@ import com.hzya.frame.nifi.model.resultcreatetemplate.NewNifiTemplatete14; import com.hzya.frame.nifi.model.resultparametercontexts.ParameterContextsResult; import com.hzya.frame.nifi.model.resultprocessgroups.ProcessgroupsResult; import com.hzya.frame.nifi.model.resultprocessgroupsinfo.ProcessGroupsInfoResult9; +import com.hzya.frame.nifi.model.resultprocessorsinfo.ProcessorsInfo16; import com.hzya.frame.nifi.model.resultsnippets.SnippetResult13; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -212,4 +214,32 @@ public class NifiApiService { public CreateProcess16 createProcessor(String groupId, CreateProcessorJoin15 createProcessorJoin15) throws Exception { return client.post(StrUtil.format("/process-groups/{}/processors", groupId), createProcessorJoin15, CreateProcess16.class); } + + /** + * 查询处理器详情 + */ + public ProcessorsInfo16 getProcessor(String processId) throws Exception { + return client.get(StrUtil.format("/processors/{}", processId), ProcessorsInfo16.class); + } + + /** + * 更新处理器参数,如果处理器正在运行则无法更新 + */ + public ProcessorsInfo16 updateProcessor(String processId, ProcessorsInfo16 processorsInfo16) throws Exception { + return client.put(StrUtil.format("/processors/{}", processId), processorsInfo16, ProcessorsInfo16.class); + } + + /** + * 启用/停止处理器 + */ + public ProcessorsInfo16 runStatusOrStop(String processId, RunStatusOrStop17 runStatusOrStop17) throws Exception { + return client.put(StrUtil.format("/processors/{}/run-status", processId), runStatusOrStop17, ProcessorsInfo16.class); + } + + /** + * 删除处理器详情,如果处理器正在运行则无法删除 + */ + public ProcessorsInfo16 deleteProcessor(String processId, Map queryParams) throws Exception { + return client.delete(StrUtil.format("/processors/{}", processId), queryParams, ProcessorsInfo16.class); + } } \ No newline at end of file diff --git a/fw-nifi/target/classes/com/hzya/frame/nifi/client/NifiClient.class b/fw-nifi/target/classes/com/hzya/frame/nifi/client/NifiClient.class index 61e1ebf0..8efeb1d2 100644 Binary files a/fw-nifi/target/classes/com/hzya/frame/nifi/client/NifiClient.class and b/fw-nifi/target/classes/com/hzya/frame/nifi/client/NifiClient.class differ diff --git a/fw-nifi/target/classes/com/hzya/frame/nifi/service/NifiApiService.class b/fw-nifi/target/classes/com/hzya/frame/nifi/service/NifiApiService.class index dca855a5..4ede8588 100644 Binary files a/fw-nifi/target/classes/com/hzya/frame/nifi/service/NifiApiService.class and b/fw-nifi/target/classes/com/hzya/frame/nifi/service/NifiApiService.class differ