From 5d9fb90fb12f46b065c904b7039cfdce17d9b26e Mon Sep 17 00:00:00 2001 From: liuy <37787198+LiuyCodes@users.noreply.github.com> Date: Wed, 14 May 2025 18:27:58 +0800 Subject: [PATCH] =?UTF-8?q?refactor(fw-nifi):=E9=87=8D=E6=9E=84=20Nifi=20?= =?UTF-8?q?=E7=9B=B8=E5=85=B3=E4=BB=A3=E7=A0=81-=20=E6=9B=B4=E6=96=B0=20Ja?= =?UTF-8?q?ckson=20=E9=85=8D=E7=BD=AE=EF=BC=8C=E5=A2=9E=E5=8A=A0=E5=BF=BD?= =?UTF-8?q?=E7=95=A5=E6=9C=AA=E7=9F=A5=E5=B1=9E=E6=80=A7=E7=9A=84=E5=8A=9F?= =?UTF-8?q?=E8=83=BD=20-=20=E6=96=B0=E5=A2=9E=E5=A4=9A=E4=B8=AA=20Nifi=20?= =?UTF-8?q?=E6=A8=A1=E5=9E=8B=E7=B1=BB=EF=BC=8C=E5=8C=85=E6=8B=AC=20Breadc?= =?UTF-8?q?rumb2=E3=80=81Breadcrumb3=E3=80=81ParentBreadcrumb2=20=E5=92=8C?= =?UTF-8?q?=20Permissions2=20-=20=E4=BF=AE=E6=94=B9=E7=8E=B0=E6=9C=89?= =?UTF-8?q?=E6=A8=A1=E5=9E=8B=E7=B1=BB=EF=BC=8C=E5=A2=9E=E5=8A=A0=E6=96=B0?= =?UTF-8?q?=E5=AD=97=E6=AE=B5=E4=BB=A5=E9=80=82=E5=BA=94=20Nifi=20API=20?= =?UTF-8?q?=E5=8F=98=E6=9B=B4=20-=20=E8=B0=83=E6=95=B4=20NifiApiService=20?= =?UTF-8?q?=E4=B8=AD=E7=9A=84=20queryFlowProcessGroupsRoot=20=E6=96=B9?= =?UTF-8?q?=E6=B3=95=EF=BC=8C=E6=94=AF=E6=8C=81=E8=BF=94=E5=9B=9E=E4=B8=8D?= =?UTF-8?q?=E5=90=8C=E7=B1=BB=E5=9E=8B=E7=9A=84=E5=93=8D=E5=BA=94?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../hzya/frame/nifi/config/JacksonConfig.java | 10 ++++++--- .../frame/nifi/config/NifiServiceConfig.java | 2 ++ .../model/processgroupid/AllowableValue.java | 1 + .../model/processgroupid/Breadcrumb2.java | 11 ++++++++++ .../model/processgroupid/Breadcrumb3.java | 17 ++++++++++++++++ .../nifi/model/processgroupid/Component2.java | 1 + .../processgroupid/ParentBreadcrumb2.java | 19 ++++++++++++++++++ .../model/processgroupid/Permissions2.java | 17 ++++++++++++++++ .../processgroupid/ProcessGroupFlow.java | 2 +- .../nifi/model/processgroupid/Properties.java | 3 +++ .../processgrouproot/ProcessGroupFlow.java | 4 ++-- .../frame/nifi/service/NifiApiService.java | 9 ++++----- .../frame/nifi/config/JacksonConfig.class | Bin 766 -> 1063 bytes .../frame/nifi/config/NifiServiceConfig.class | Bin 1356 -> 1356 bytes .../processgrouproot/ProcessGroupFlow.class | Bin 4137 -> 3649 bytes .../frame/nifi/service/NifiApiService.class | Bin 1600 -> 1493 bytes 16 files changed, 85 insertions(+), 11 deletions(-) create mode 100644 fw-nifi/src/main/java/com/hzya/frame/nifi/model/processgroupid/Breadcrumb2.java create mode 100644 fw-nifi/src/main/java/com/hzya/frame/nifi/model/processgroupid/Breadcrumb3.java create mode 100644 fw-nifi/src/main/java/com/hzya/frame/nifi/model/processgroupid/ParentBreadcrumb2.java create mode 100644 fw-nifi/src/main/java/com/hzya/frame/nifi/model/processgroupid/Permissions2.java 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 c4261817498b6b8bd6c76c8c5c93db0a9dcc586e..8ef70327971d492e3ae0285d7613b48a058f610a 100644 GIT binary patch delta 418 zcmZ{g%TB^j6h-%KDSc28L~AW74;4uu#(|H4BNHJZlG30AbwY@#q{cvkIC0_!IBNP2 z;t(BRqKO~iM-fkpain*!v(LF_ultw?L#g;RdH)2kgPZ~hx`-tO9CTj{8A&YrZbihZ zh}28=k?}GVZ^X6}X~acjRAjNHVjUX{dG|W+MY$r+u2=F? zdvMpc8I1B_rP`{Qt%iAQ)|zI^s@JSi{j^d#Vc2(v>CL~B2MqFMuY2Wm0!$}QqxwIi z7w*%Rh73e{l)pGo7z$~`vpDTRrCyjSAb}ZDHShwWn5Bv#hB##+ZGuq9&0ax~27=;h=Jz!PJKX^EKtl4C}so{vjqT3x(`zT delta 69 zcmX@Zb%tw0Ix{2x_=NHHF#&3Zk-2w@n~T$|gban=_8% z=okIuj6XoW;Eax1X4G-e4>;o=;0Nf>5b-%@w`sCn$CjDQInQ}-`(Dqy>(MLG zECXUdOiA&fB+A)H_*98|CAo80GCsGHl#oJmvWQ8a?H{s|5o+{}zC?(co^Cp&YZK0* z>}cK#a*WNAQ#&c*rLSeDQTB&|6Eep7KO=q+HBVS+kw}@biL)3+*1`XX?@`d*)6UU3j=t{!ZvKT@Pt@)px?qyJZWJUwksH0 z#~_41VBri7TNpv!!Xbf11=@{*g=ewH!d`Jai%A7r!Z+LTR;4;Cs=Fy{bg(i@OEbO zTPgMoSKTLKkk|_F5QceDL@Bs-D}RsJHz8#sQkm6@P>zR{%}8ZdJwjOxD<>kA*)0*u zT39(5smv~mP}alBsYvC0eDq^7VK(=eNbm5-4~Rvld$TVAKi#4fqOJ;_qn@Vlkm2F^ zXp`}^niMV4Hu;1!c>pg&d8w||r0BM`$sN+w_uIt)FmXBB~rFVk(90HG$EtkL-rQZIW4Dm2wAp4Ah9Kq!$*b_n&@DGK%2RxTxktU!opSxCLj(BcS>_lJJS?S8wDBY2TH>cek1 z%8`%pw)hUmNQ?9IHI5UhIE~M6f=I&zKEX>wI;yyalSBqQxHv^*;&bk&i4ypN)?Ow` zVu`obI8h2e^X__u$il1i?HIC#`8RqD6dz!-feHRh=qxV1>Wl8 b9wC$CvV_ON?}yg$eiVa}DYzsX_RW6*{e`jP literal 4137 zcmbVOOK%%h6#mAUmz}ZWx=mZt0-*#*^S~`FlunvbTKa;dl%_2$?};;s-8y#aIOY8; zY}f!R5MqOn+D#=uqCorJ?EZtCcpjj z-H!lv;=L4ZgP(+rDOsjvDalfn<(w?%EmTt6XJn}gzb0r_mJ71fWto$uA=-Hh7gNZ= zxACIvFWGq6#w!9}wegyb*KNFE<4qB~W#MfNiSnd|+~_&)qF1PR)#<``qh78~4{PX{ zua`BXChER7S**{`Ola6OTCB|!O0T@^6{hOmj9;jhr^-LEzd%MTsp+1yjEmK%F{ z;l8b>`AY|Q9SvQh<*I*-xAyBNy@?7XxzSqDtDN@gWjTjJy-_O9X&70}y^aTwstbg7 zG^YKA++|(g*0@xfRG*S;rU{nvqG31r|2L%;eaX*j*s(e<;hnRzA8k*qh>o{s*O&_; z>+V|~n4~*9<~K^UNm{WU8h)M0G-(n<%an3I`hPOVYL94a*OQ_Od)EXtf&WlP(^-5dWN)kXNR2`KJqzZQ_ zachfZ18u7)sYp}msZ)VEIOLQf(jIFAMnoD=Bb^gcBhvJE!z-R2^JZ0xZ~&<}VHdsX zK}ik6DtU9Ipv%~DM;ZC?6Gz7mGBv~|+jPFtU^l9`^_#n^M;t`swfTC{KU9`p?vD20y)wWY^kJ)m+tK6T4q3L~P6xfX%fa1pyazoRhF8&V z(O+?J8V4K{u+71KLE8o0haC>b`TY(akmD{{p2Qgq8=_Nn|9rVJDK)Y#>bb8xIpW|Q zTw(?XdziBk4vWE_rK~CKyR5Fk9!Vb6*}lQ-qs z&r^ZB#@*=u7TVVY2@G&G10e>9oe&SQd^g>GBTcat}u0ZmF--rIc*b zX{^+xRDaWDuX4FBK5%oTE~Sy0F7H+@AC7lvt<s=2I=CF1M4UF4xI- z3dspcL@lJOnfiZlEM~O^S@F5-}vQWqS7$vgt5zdow5J`LtAIFGNSfJm> zi8}EE_Te~@gFiWPpCC%(FKogIq724)-%)g1_H|?|oV90F$eNi@o~@ zi$j->W!M$F8Lo^2L#jfuw0v?0)4*tE$zTkUrEnS?Qsu_aDn%SHi6eB8q@&B(;XV3@ zDyq%d;Sx*A&JJ9GHMD>=FNoZ6by4K?P-9D>1*)`bC>3i=8QFPbQI&B`r81i;R$gG$ z4YNoPyvgb2D} zED{zudb=p3nJu&>W>gxIt#ZZ?{ydmU&!qt)Ak!Uq0UUPxt*&y~?kp zy_kiZ2@^dkmQ4&|h<7DV&zo4mD#IGzk<#{2#oIeODOa1#&9jq>)8=+INVsvw%nIrI%< zMBGPAokqkRZuSkfSeH;^giDJ delta 633 zcmZWmO=}ZT6g}_FBr};#(q>G?rW#wVrs<>_jfqtYikrGIP#QN~PD?0iNa7?_6r}!z z@P33_3w|LeT?xAPM~IvL01?ld#vsV>-n;kQd(S=h&iAQ9xAyJ#$Ik%jxalB)QVI^1 z9F(zaBd}0$u!4&gE@`N0z&@yji|TN9t`eAy}kZmv)3C6 zY?kjm44;J6PT1Y8wuaGz?(W+1=uTdJm7ZEPeDy<=^4b3Xg}44m%B=~cTf=bYQ8Vn{ z54SsQDp5tbF_Xqs7gKO8)Lop!ta>4<$%cz-SXCM0w(a6NZU_|AOPRN#SW%#|MsD=e zSI>>3eLX86;As+C2JJL5e5dKHL-GTh;5|f8c?)?!Phy6*&H-DRm_-T&Wa;_G*Y`csf`#A>q-UC+kk~RRtq(|g);rjTu$r&n#lh4BS$WMmBc8?ATZmAilqC|Dv4{XQ z{&79j!f}JiP<0e>h9V?0<{6bZ%d8aSFDzO(m*Fn{Djm;VBp}JD@AH!lTmb$6_V8Fa