diff --git a/fw-nifi/src/main/java/com/hzya/frame/nifi/config/JacksonConfig.java b/fw-nifi/src/main/java/com/hzya/frame/nifi/config/JacksonConfig.java index 5229efcb..a710a33b 100644 --- a/fw-nifi/src/main/java/com/hzya/frame/nifi/config/JacksonConfig.java +++ b/fw-nifi/src/main/java/com/hzya/frame/nifi/config/JacksonConfig.java @@ -1,10 +1,13 @@ package com.hzya.frame.nifi.config; +import com.fasterxml.jackson.databind.DeserializationFeature; import com.fasterxml.jackson.databind.ObjectMapper; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; /** + * jackson配置类 + * * @Author：liuyang * @Package：com.hzya.frame.nifi.config * @Project：fw-nifi @@ -14,12 +17,13 @@ import org.springframework.context.annotation.Configuration; */ @Configuration public class JacksonConfig { - @Bean public ObjectMapper objectMapper() { ObjectMapper objectMapper = new ObjectMapper(); - // 可根据需求自定义配置，例如： - objectMapper.findAndRegisterModules(); // 自动注册模块 + // 自动注册模块 + objectMapper.findAndRegisterModules(); + // 忽略 JSON 中存在但实体类中缺少的字段 + objectMapper.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false); return objectMapper; } } \ No newline at end of file diff --git a/fw-nifi/src/main/java/com/hzya/frame/nifi/config/NifiServiceConfig.java b/fw-nifi/src/main/java/com/hzya/frame/nifi/config/NifiServiceConfig.java index 1a4e1c63..263e0646 100644 --- a/fw-nifi/src/main/java/com/hzya/frame/nifi/config/NifiServiceConfig.java +++ b/fw-nifi/src/main/java/com/hzya/frame/nifi/config/NifiServiceConfig.java @@ -4,6 +4,8 @@ import org.springframework.beans.factory.annotation.Value; import org.springframework.context.annotation.Configuration; /** + * nifi service配置类 + * * @Author：liuyang * @Package：com.hzya.frame.nifi.config * @Project：fw-nifi diff --git a/fw-nifi/src/main/java/com/hzya/frame/nifi/model/processgroupid/AllowableValue.java b/fw-nifi/src/main/java/com/hzya/frame/nifi/model/processgroupid/AllowableValue.java index 57200351..9a1426db 100644 --- a/fw-nifi/src/main/java/com/hzya/frame/nifi/model/processgroupid/AllowableValue.java +++ b/fw-nifi/src/main/java/com/hzya/frame/nifi/model/processgroupid/AllowableValue.java @@ -6,4 +6,5 @@ import lombok.Data; public class AllowableValue { private String displayName; private String value; + private String description; } \ No newline at end of file diff --git a/fw-nifi/src/main/java/com/hzya/frame/nifi/model/processgroupid/Breadcrumb2.java b/fw-nifi/src/main/java/com/hzya/frame/nifi/model/processgroupid/Breadcrumb2.java new file mode 100644 index 00000000..32062442 --- /dev/null +++ b/fw-nifi/src/main/java/com/hzya/frame/nifi/model/processgroupid/Breadcrumb2.java @@ -0,0 +1,11 @@ +package com.hzya.frame.nifi.model.processgroupid; + +import lombok.Data; + +@Data +public class Breadcrumb2 { + private String id; + private Permissions2 permissions; + private Breadcrumb3 breadcrumb; + private ParentBreadcrumb2 parentBreadcrumb; +} \ No newline at end of file diff --git a/fw-nifi/src/main/java/com/hzya/frame/nifi/model/processgroupid/Breadcrumb3.java b/fw-nifi/src/main/java/com/hzya/frame/nifi/model/processgroupid/Breadcrumb3.java new file mode 100644 index 00000000..c71519ec --- /dev/null +++ b/fw-nifi/src/main/java/com/hzya/frame/nifi/model/processgroupid/Breadcrumb3.java @@ -0,0 +1,17 @@ +package com.hzya.frame.nifi.model.processgroupid; + +import lombok.Data; + +/** + * @Author：liuyang + * @Package：com.hzya.frame.nifi.model.processgroupid + * @Project：fw-nifi + * @name：Breadcrumb3 + * @Date：2025/5/14 17:57 + * @Filename：Breadcrumb3 + */ +@Data +public class Breadcrumb3 { + private String id; + private String name; +} diff --git a/fw-nifi/src/main/java/com/hzya/frame/nifi/model/processgroupid/Component2.java b/fw-nifi/src/main/java/com/hzya/frame/nifi/model/processgroupid/Component2.java index abbf14f6..684f1aa1 100644 --- a/fw-nifi/src/main/java/com/hzya/frame/nifi/model/processgroupid/Component2.java +++ b/fw-nifi/src/main/java/com/hzya/frame/nifi/model/processgroupid/Component2.java @@ -28,4 +28,5 @@ public class Component2 { private String inputRequirement; private String validationStatus; private String extensionMissing; + private Config config; } \ No newline at end of file diff --git a/fw-nifi/src/main/java/com/hzya/frame/nifi/model/processgroupid/ParentBreadcrumb2.java b/fw-nifi/src/main/java/com/hzya/frame/nifi/model/processgroupid/ParentBreadcrumb2.java new file mode 100644 index 00000000..6931edb9 --- /dev/null +++ b/fw-nifi/src/main/java/com/hzya/frame/nifi/model/processgroupid/ParentBreadcrumb2.java @@ -0,0 +1,19 @@ +package com.hzya.frame.nifi.model.processgroupid; + +import lombok.Data; + +/** + * @Author：liuyang + * @Package：com.hzya.frame.nifi.model.processgroupid + * @Project：fw-nifi + * @name：ParentBreadcrumb2 + * @Date：2025/5/14 17:58 + * @Filename：ParentBreadcrumb2 + */ +@Data +public class ParentBreadcrumb2 { + private String id; + private Permissions2 permissions; + private Breadcrumb3 breadcrumb; + private ParentBreadcrumb2 parentBreadcrumb; +} diff --git a/fw-nifi/src/main/java/com/hzya/frame/nifi/model/processgroupid/Permissions2.java b/fw-nifi/src/main/java/com/hzya/frame/nifi/model/processgroupid/Permissions2.java new file mode 100644 index 00000000..823db08a --- /dev/null +++ b/fw-nifi/src/main/java/com/hzya/frame/nifi/model/processgroupid/Permissions2.java @@ -0,0 +1,17 @@ +package com.hzya.frame.nifi.model.processgroupid; + +import lombok.Data; + +/** + * @Author：liuyang + * @Package：com.hzya.frame.nifi.model.processgroupid + * @Project：fw-nifi + * @name：Permissions2 + * @Date：2025/5/14 17:57 + * @Filename：Permissions2 + */ +@Data +public class Permissions2 { + private String canRead; + private String canWrite; +} diff --git a/fw-nifi/src/main/java/com/hzya/frame/nifi/model/processgroupid/ProcessGroupFlow.java b/fw-nifi/src/main/java/com/hzya/frame/nifi/model/processgroupid/ProcessGroupFlow.java index 8eaf9f5e..647bab13 100644 --- a/fw-nifi/src/main/java/com/hzya/frame/nifi/model/processgroupid/ProcessGroupFlow.java +++ b/fw-nifi/src/main/java/com/hzya/frame/nifi/model/processgroupid/ProcessGroupFlow.java @@ -8,7 +8,7 @@ public class ProcessGroupFlow { private String uri; private String parentGroupId; private ParameterContext parameterContext; - private Breadcrumb breadcrumb; + private Breadcrumb2 breadcrumb; private Flow flow; private String lastRefreshed; } \ No newline at end of file diff --git a/fw-nifi/src/main/java/com/hzya/frame/nifi/model/processgroupid/Properties.java b/fw-nifi/src/main/java/com/hzya/frame/nifi/model/processgroupid/Properties.java index 6ebbc446..bb1a8449 100644 --- a/fw-nifi/src/main/java/com/hzya/frame/nifi/model/processgroupid/Properties.java +++ b/fw-nifi/src/main/java/com/hzya/frame/nifi/model/processgroupid/Properties.java @@ -41,4 +41,7 @@ public class Properties { @JsonProperty("character-set") private String characterSet; + + @JsonProperty("Database Connection Pooling Service") + private String databaseConnectionPoolingService; } \ No newline at end of file diff --git a/fw-nifi/src/main/java/com/hzya/frame/nifi/model/processgrouproot/ProcessGroupFlow.java b/fw-nifi/src/main/java/com/hzya/frame/nifi/model/processgrouproot/ProcessGroupFlow.java index 61a39682..ab8bca7f 100644 --- a/fw-nifi/src/main/java/com/hzya/frame/nifi/model/processgrouproot/ProcessGroupFlow.java +++ b/fw-nifi/src/main/java/com/hzya/frame/nifi/model/processgrouproot/ProcessGroupFlow.java @@ -10,7 +10,7 @@ public class ProcessGroupFlow { private Flow flow; private String lastRefreshed; //查询单个流程组 - private String parentGroupId; +// private String parentGroupId; //查询单个流程组 - private ParameterContext parameterContext; +// private ParameterContext parameterContext; } \ No newline at end of file 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 1a79d26f..baa4f7c6 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 @@ -2,6 +2,7 @@ package com.hzya.frame.nifi.service; import cn.hutool.core.util.StrUtil; import com.hzya.frame.nifi.client.NifiClient; +import com.hzya.frame.nifi.model.processgroupid.ProcessGroupsId; import com.hzya.frame.nifi.model.processgrouproot.ProcessGroupsRoot; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -34,13 +35,11 @@ public class NifiApiService { /** * 查询全部流程组或指定流程组 */ - public ProcessGroupsRoot queryFlowProcessGroupsRoot(String flowGroupId) throws Exception { - ProcessGroupsRoot processGroupsRoot = null; + public Object queryFlowProcessGroupsRoot(String flowGroupId) throws Exception { if (flowGroupId != null) { - processGroupsRoot = client.get(StrUtil.format("/flow/process-groups/{}", flowGroupId), ProcessGroupsRoot.class); + return client.get(StrUtil.format("/flow/process-groups/{}", flowGroupId), ProcessGroupsId.class); } else { - processGroupsRoot = client.get("/flow/process-groups/root", ProcessGroupsRoot.class); + return client.get("/flow/process-groups/root", ProcessGroupsRoot.class); } - return processGroupsRoot; } } \ No newline at end of file diff --git a/fw-nifi/target/classes/com/hzya/frame/nifi/config/JacksonConfig.class b/fw-nifi/target/classes/com/hzya/frame/nifi/config/JacksonConfig.class index c4261817..8ef70327 100644 Binary files a/fw-nifi/target/classes/com/hzya/frame/nifi/config/JacksonConfig.class and b/fw-nifi/target/classes/com/hzya/frame/nifi/config/JacksonConfig.class differ diff --git a/fw-nifi/target/classes/com/hzya/frame/nifi/config/NifiServiceConfig.class b/fw-nifi/target/classes/com/hzya/frame/nifi/config/NifiServiceConfig.class index 339ca0c9..2bb7ccbd 100644 Binary files a/fw-nifi/target/classes/com/hzya/frame/nifi/config/NifiServiceConfig.class and b/fw-nifi/target/classes/com/hzya/frame/nifi/config/NifiServiceConfig.class differ diff --git a/fw-nifi/target/classes/com/hzya/frame/nifi/model/processgrouproot/ProcessGroupFlow.class b/fw-nifi/target/classes/com/hzya/frame/nifi/model/processgrouproot/ProcessGroupFlow.class index dd5de530..c6690891 100644 Binary files a/fw-nifi/target/classes/com/hzya/frame/nifi/model/processgrouproot/ProcessGroupFlow.class and b/fw-nifi/target/classes/com/hzya/frame/nifi/model/processgrouproot/ProcessGroupFlow.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 165d72db..b5d5e42f 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