From ad67d048b06d32d7b8b3a3bbdc0c866e51e3db43 Mon Sep 17 00:00:00 2001 From: "review512jwy@163.com" <“review512jwy@163.com”> Date: Wed, 17 Dec 2025 08:46:04 +0800 Subject: [PATCH] =?UTF-8?q?=E8=AE=BE=E5=A4=87=E5=A2=9E=E5=8A=A0=E5=8D=95?= =?UTF-8?q?=E4=BD=8D=E5=92=8C=E6=95=B0=E6=8D=AE=E6=98=A0=E5=B0=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../resources/config/language/msg/msg_cn.yml | 1 + .../resources/config/language/msg/msg_en.yml | 3 +- .../resources/config/language/msg/msg_jp.yml | 3 +- .../migration/V61__device_adapt_category.sql | 4 + .../resources/template/deviceInfo_zh.xlsx | Bin 11015 -> 11083 bytes .../resources/template/en/deviceInfo_en.xlsx | Bin 10873 -> 10927 bytes .../resources/template/jp/deviceInfo_jp.xlsx | Bin 11192 -> 11266 bytes .../business/dao/auto/DeviceInfoMapper.java | 24 +++ .../mappers/auto/DeviceInfoMapper.xml | 149 +++++++++++++++++- .../mappers/ex/DeviceInfoMapperExt.xml | 7 +- .../business/dto/device/DeviceAddParams.java | 6 + .../dto/device/DeviceUpdateParams.java | 6 + .../deviceinfo/DeviceInfoExcel.java | 6 + .../deviceinfo/DeviceInfoExcelCn.java | 6 + .../deviceinfo/DeviceInfoExcelEn.java | 6 + .../deviceinfo/DeviceInfoExcelJp.java | 6 + .../datacenter/business/model/DeviceInfo.java | 68 ++++++++ .../business/model/DeviceInfoExample.java | 70 ++++++++ .../business/vo/device/DeviceVO.java | 6 + .../service/impl/DeviceServiceImpl.java | 29 +++- .../datacenter/business/util/CommonUtil.java | 14 ++ 21 files changed, 401 insertions(+), 13 deletions(-) create mode 100644 data-center-business-controller/src/main/resources/db/migration/V61__device_adapt_category.sql diff --git a/data-center-business-common/src/main/resources/config/language/msg/msg_cn.yml b/data-center-business-common/src/main/resources/config/language/msg/msg_cn.yml index edc44ac..e3679f4 100644 --- a/data-center-business-common/src/main/resources/config/language/msg/msg_cn.yml +++ b/data-center-business-common/src/main/resources/config/language/msg/msg_cn.yml @@ -199,3 +199,4 @@ msgcn: levelReferencedByChildren: 已被下级层级绑定，请先解绑后再删除 levelRoleNameExist: 层级角色已存在 roleHasBinded: 角色已绑定用户，请先解绑再删除 + dataMappingFormatError: 数据映射格式错误 diff --git a/data-center-business-common/src/main/resources/config/language/msg/msg_en.yml b/data-center-business-common/src/main/resources/config/language/msg/msg_en.yml index 3c3f01e..2303bda 100644 --- a/data-center-business-common/src/main/resources/config/language/msg/msg_en.yml +++ b/data-center-business-common/src/main/resources/config/language/msg/msg_en.yml @@ -198,4 +198,5 @@ msgen: invalidParentLevel: Invalid parent level levelReferencedByChildren: It is bound by child levels. Please unbind them before deleting. levelRoleNameExist: The role already exists. - roleHasBinded: The role is assigned to users. Please unbind them before deleting. \ No newline at end of file + roleHasBinded: The role is assigned to users. Please unbind them before deleting. + dataMappingFormatError: Invalid data mapping format \ No newline at end of file diff --git a/data-center-business-common/src/main/resources/config/language/msg/msg_jp.yml b/data-center-business-common/src/main/resources/config/language/msg/msg_jp.yml index cd2225b..21bf390 100644 --- a/data-center-business-common/src/main/resources/config/language/msg/msg_jp.yml +++ b/data-center-business-common/src/main/resources/config/language/msg/msg_jp.yml @@ -198,4 +198,5 @@ msgjp: invalidParentLevel: 無効な上位階層です levelReferencedByChildren: 下位階層に紐づいています。削除する前に紐付けを解除してください。 levelRoleNameExist: 役割名が既に登録済み - roleHasBinded: 役割はユーザーにバインドされている ので、削除する前にバインドを解除してください \ No newline at end of file + roleHasBinded: 役割はユーザーにバインドされている ので、削除する前にバインドを解除してください + dataMappingFormatError: データマッピング形式が不正です \ No newline at end of file diff --git a/data-center-business-controller/src/main/resources/db/migration/V61__device_adapt_category.sql b/data-center-business-controller/src/main/resources/db/migration/V61__device_adapt_category.sql new file mode 100644 index 0000000..b90d53b --- /dev/null +++ b/data-center-business-controller/src/main/resources/db/migration/V61__device_adapt_category.sql @@ -0,0 +1,4 @@ +ALTER TABLE device_info ADD ( + `unit` varchar(45) DEFAULT NULL, + `data_mapping` json DEFAULT NULL COMMENT '数据映射关系，格式为：{"default":{"1":"漏水","2":"漏电","3":"起火"},"status":{"1":"开门","2":"关门"}}，默认只有default一个字段，预留多字段设计' +); \ No newline at end of file diff --git a/data-center-business-controller/src/main/resources/template/deviceInfo_zh.xlsx b/data-center-business-controller/src/main/resources/template/deviceInfo_zh.xlsx index 813faba74a51e25ff18d401f01d6f923694e0a8f..0a73421c70182770a35f768ded20084898a8ac96 100644 GIT binary patch delta 2340 zcmZ8jX*AT07oK5aXtIPXO^jtMV~KdtP&9E88L+(##xo%6pR?z!hV&%IxsbDrm>oEbQCrxpxxC_Ux{G=kN+f=Ivw z*n%{Pq3BxiAE@1rt^;MP^?WRe_06f}w{a|tJ0k4YN3E(cWZ%rzl6>Z}Dy(2NcFV-= zN>)RnWVEA6u@-SKIW`6(r4R0bXv6Z2_1r~<_p7W+6@08~=YmpXlOa{Zp>62SHt4*uCact5iJy_uT0yRoF1F&S=b?NZtLvacAFQZ zU08-d`+6(MM^ssli4ku(6+=o-In)|<+g25p9dPQoPk}d^C>gG0kw^HcwDho)gNn*H zzN|v9d-DO&48r9`Z;=z3r!Bc5q970m3QDp0Z2T$HeB}ff1d0PraZ8czQ>|@#G-1XZ zi|rKD4_!i@Kl^Q11wlzx03q?nnb6^Mk&43dihS+_w0ir*=!4l!b93WgS6tV+JtZay zxpDd!gisp0#$gg>*z7z7hrAnYsE=+kS}Ll;(=64xARDRp-_paR_`^o4oCPd+@01h5|x!hu1?LxFft=oqLP0c zt{6hs%J~>dzn6IU;G}mMuUaW(!S*<#bF8Jwk*bf7&HVcOX;pm;X?yk{sVAM>5@J^0 z8Y^pKzGl^r|D<1UR4I%Vw)KPADtefj((J8DbcAyt6UzK0dF&_~Qy2d^821%%f#U_5 zWlO;%>0y^yh4^Gs%=XuGWIgT?bcrqwrJiV3EKL#$UsXcNFaqh~T3+9BY!y}_XJ*R( zX<0DXaVyPcBHZk5rKXZvB7+4}MJ$$blB_)EL#&M*<Mqm8)U1WyI~&M4{n_P~o%n zGs7C$bZNowd~iNrLzsl4-JvJQFL-<>nYV8|IVK~5=9j1OQXOk!>t_*z<<3eAP~j^M zCf3CA-eI8v_nl6s=Pwj54QV>kZ&uVM39`CWj;X!MXp2!Vlqcc#gkWaNKTJ*4s%5og ze{36MXuX!U*Db+9t25APZ|7t+yKakVAumj(JwGW;2+WACd$N94-D|8GF;<^H+eCx+ z-qPgUWRwg}CLK-h{b0hN)joQ+6^0Y2)Z&x}`Znz|9OdhA8E-|`WvG_1&qn=Wt-qQz zZhq3^_mUJ{H{vF9Bt$#_;*EP7Sf2Oj^z41f1bFN2F<oqP{hsqv4>_UGdlFAG6+8)&(vpN#Gf7uoSN zSH&6lIi#Bjwc97AL=|Cl(zo7Y^+ZUcA9_u?wf9OH!Bgg8PN_b(W6g4e zzCWdL2Z0wc-Jzs6XU^r&mNv!@q34E*wz-x;61mv{xlj-D1s&lg^m#q=E^I!05qu;wIWY+C_UOb(b?S4U#=sRenMopQC^yr`pjc9l)hyR@kGt@sv<0%j(LDxQS524 zEK+p`v7PIl<9MZ5R&_tIb$6WDg&Q6S)Qvpm1V7|KOeiVfH5>M(vsNQvpZyXb>`b-D zg0AnX`1)4${mF*WLezCD)gvX#3kaLpm8=?-0xqkQ;G$?uklo}Bsb3IhuyBp8%$yNX;mGTEc{mC$&+rLKl*-wetR`= z7bOL(K}1@d`6~EH23|p6Q%SCc>i>r zpzF}ouZ^lGSx3IdH~bLRgs_7cs)hUjLfC*DbhCJZ;xlwJ#6Amu2(N&ZlD+8j$xNq% zPrZk3j2%B}mGA+9Oc`u}Pq>24B5RuMV~9pV>Sd!IQ=v{4p<={UuZ%XM8(!35PvZ4F zqq(-*Bpf_T=o#9=focHj3cDxg{a?1T@{HSV6K1Cvm>Ka)&aJJ0((g>E!gwfu&lwB6C#JHRb z^hSsE{CnGdl@j{v=(!-HP4T~x+2SiED-8Y#Tvs#(y8!))+Td%zPetI*-;t|i!1p&# z-z(XJs{u7-O>h-(R#_K30OTmE!~b8uT?s*85Ms9@M1haW#=A6W6*SlYa8=O-p9iv3 zjKSr=u!KGuz(WdsZjjQ F`wwq@Jcs}Q delta 2290 zcmVp4FUUvG;sok31%2B zfo`@Yq9s!BH8Q(VaRm?@LktN>qp?@>@Q>GkO7x!>DrLi&M5f4Wr)Attw%`kK?H=oB zZOni3yq4Fi7&gC$FM7wPRaG~V<*qoOFc6$_1yvhq#n<9n)Z%oS##!Q=@UG^XX zaZrTwx5ux~huQo6^!aJ}F`2*K%_c7a{%y4Ms?6dE5RQ#U7iCt;dHwLH-$kKMeBUK4 z*KhYpi`Ltekjpa1*8MW>VvsD;{7-DSp64(6jXojNYf|EG5LbY(%Dw$X!f#MZ0|XQR z000O8hfd-^WS4LDkzGr}FcgOG1^+|IeVUIon;C6~O*;@T z6r8&+X}T4fq%`Sti2vP;ImHWa^zv|C9-jA{boHwH=%7Z|S(5=0V-P7LZPS@u2A(%- zcmpEmYtz)dH7Wx~<-jVxzDgfQJE+lj%0&TTTn6^u4@-oc+$&wXIIKKw~~pn zWSBu(aRCV?1>`fnfcOSuT2Qg(x79m{hEte=$kaMizZ2WQI{0Njyf{DRJmFO(s&YOT zJfR6KNK%nRtQjd6OfZq6?`(=L4*w~%nO$t|pB_TVW|F>`y1v<}@rNA6j6y==@X?sg zSVDiZL8nulADMpukQ$S}1VIiILl1};1ONbl3jhEZ0F#d@8h^D`O>f*p7``L%AFL7T zDII%uv!Cp4Mf1_7kP;Cn=ZQVLJBsabXJ+Gs6DmT814k}ZZ%}bS;lv>l0)9+rO8*7# zj6Zh0-fk8lB5lSVKhN`i_?htx?wv=WbH=3NA|4`wJ>;<17XgnaL-g6F`**v@QJTg9 z4Mog`=z=M9Z-4aeJA+inQ#EBwJD?D&A)0EP^j%l^Qx;K$MZ#iuG8QtT8gAvpRf%LY zu%sw-8=lv8Bg$ixDfHzg8e%-=KHC-kEMl?FL?jEThWyo(C#q084>r;ZBu$~#BA2B673T>Q(mKUZu{+uL-SaR)0k0=`6Vm!U+_2!b7evY`H~3 zOwV=FG{tG6upj4HEHsF8T&8zsN{eWhYKle!`v#7rI~oKWx@ca#BiVR}J|O)gf?(bv zo^Y0`g=>5dxMhUJ z>mu5|HGj>KbOJV}vrzAd@N*vM=@9i$G53i`A2L3fYDlGtTSn9uAt=CqC*sD;$cgBA zmTAT&UEEy!Lym9zl8f8YOL`-x!LEJ`%v45ag##v*11H+%D(*H=tnx3he6Q3$kfd*hc(N{^Z4kh!Gc;d%Ua`<4s}myx;6jKD2z zBZa%nMIM**aPt;}kiu1DZV^}$w?-?RLFU#VExbBMH(P~veVhGeG>{^7U@wLanZ-J1 zm4C|@_J)L-PYCHl1X#faZnq4}0+NE+vynG&&tSXobHsg6G$iDd2vSAt)Dev;VmCuT z^Gl6p6|q-GY*!Kc^(d_>;z1qJt|A`R5uGaHppNKP5sxy&VlBNY;=?+EEH(9`6_BN_ z9{zzDVFK6LO`IL&H#{_d^<=S}&=oNDty$?mV3d{r=7653jDSwqF1G)6JJJxBj|%`R1GNZodEe&GQ#{YA?6nq&orV4IL})l76?aoOsWRAx zJPbSRSO{I*KqRAk%=9dA5}Gi1%pku2m%t}TNDgOGYrY{$gw&F9Z4M@x*uGUUnU-hg z(Lb|W3DXJ=TZtn8Kmh;%OacG^6abSUDHeZilFv#4K^VaALGQ54J;ypo#O``1f(`|d zJ;0)qF1WMX&TQ1x6h$!gP#yLpq#IO=Vi9WD%Q!Ro7HtIv>m29z`@Z@9@TuubtEgNc zmzXxzz-A%|6oj*O&ct~QoM!enwt+&ZfpbRD#z+HKh=8=dzNQjFl_(bz4HPJKb|8Nw z*#fc*lCT|wBXefEmO-PZn}@`4k&z<>gs4@7TghY!T84>%lC?cdqq-@ec-TDm(C!lG zDlv7H>Wj`u_#taGM9^0u)m8Yz{~Ygru&^qlgVGAEeJ$=^<8=O3o{al2e9DL@T}7XScwY%gMAb+77LS)DixD3 MD-{M_CIA2c05!x9J^%m! diff --git a/data-center-business-controller/src/main/resources/template/en/deviceInfo_en.xlsx b/data-center-business-controller/src/main/resources/template/en/deviceInfo_en.xlsx index cf79a62f13ef5a928d3a35d0d49dfb557e587696..025f49fac5118caf01b270615ed0888814028d73 100644 GIT binary patch delta 2277 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 delta 2281 zcmZ8jc{J1w7oHzu7`u!p8rx@P%#4inwMF(wWX+OF#4E-!c^O(J%2G3v;U`HMODI#s zP{L$MvL}peSwfUGWT`iN>if=lzw_Nc?z!ild(S=RdCqgUGR9FbsTKWHhErG=OCMg1e+Uw_$+spfp-`HL?D+tyDTM%~_DrhyW zdoL-LjQAcXrbjdTS7M|Zr#HS@E^St@X06yCr1%lAIOme9cU|I7M1MT*{91gR9!RNb z$O!B$Z%0}vh~5m_Uf*2%PPkZ?ZESMP1hv{Ay+0j-UodBW(2W(jK~8m5rYC_{*o}2* zcpY&3C@&NNfj|TxiS`qR{jx=>(G&mz5#@nEBzMz(p}xmSpk$`nXGefA2IQmp}0EYevNuywNz%l_LqpHoe`RTlThflm9SGt=EnVq zHP+vsbFBJ3KwyurxT-R-_pUdL`9~0$S7|1wm-|u&%WM6q9$QyyD{oCPeAFG)W(oM5 zgsqQ?9ld`41J1if@5!-&ib(D=vB?+a&xwXbwm5V#%^ESOp9-$JHGUN0f6MvQup>3- z9?iZm+!-!V9sL7tVpY8E4aQcc-eCJ>n0kf-a1`H^R_)bIn6KyYvgyh`!=wb~jJOuA zflHm_aJ|9iITMba$+Wf6M^_aV$ynMb7p`{1DaGQ+K2>QuLQ39J@XdpwI~8}mgBP=r zX086IwHej5gRJF5xh9&K+2q&mjJNJ)lycLD&ROzzDGj-#V>c+?Eu%lOtmV)XG?6`wAr`yio6|03cCn!8<}fR-m8UK%~K~< z-Y2&-Z(6g*kL5oyXp3O&y9pt$&o4GiXkLt#hetH0O=~iJC&)5odJM(nKQ8?2&wecJ zORLBYKN3$HlrtgFPanJzquZWe-RJd2n8K6b-nINb!*90QV1S);-Wr8ZP!B3nI-m1c zx5OUtz$XL&@896$$~qz^<9t}RJ~HNX#0H9ldy<+86&&r3^DfV+IYcx?$|IYkv6-eN zu10im2dcV`{FkT+Dmf=VJ!lfDNus{1_OSn8gX_Y47C#`4%bV3bb_x>C(>fAHY3MX( zhDeEP88Y$h_wn8K;&&Xip-Rek?w(`OY4%0AWR3QKaoZ}YM~kVY;o6b1HMt$z!V}O& z@-1?gN1-gy?{lY)B%Xl3?$pqdUQbV}+)EZUXMTDMq^H0V#>!MAU+poMx{SH(&L6Un zJ6OUgUdgL+!uSPc3YMo$gd!=K3vv!&I_rrYqlDVQ{Q?Cu!uUW1K0>|8%@=C^G^Lo+ z7M|{4S#QubL6GEayJEC9^g+GzW7h3y-hfLL(NDD#qs|#eB+$n`+bnJM$c^6q{(3oi z-5Aqp`n2t*HAiv)Cb*E}xM!0$fLuXwqK3}pGrBh9NDT&0tZ82Q zI5z+JeAKPkc*tXXZlo5Wo|-8{DbyK(bXWn`0&H#i_Tz6Q zv}d;>kWWpJwBWU&8gneh!)S+LyV_oGNa}T~$7?QZ5hI2^+9V?O=rFF$k~PrECltMZ zq1q^&H7g~jRf)=~T5#F!=awkwkhj&IH9MS^H@O`B^QV}8(Y@_t>z}950ypdM@#2f-r(zv7nt4I($@Dv(?&1o|6JAIp7*9RA~Z}-4om*Q(U0! z%5UT`8sy&tRnhjD&7@q9i6uH>MK?Gc;TgS@HcT7+(7X`a_3c^Z;-v@F&~kowuOOvj z;|oz{S3!Mu74(;|l7rPR{OLnF=jR+j3JeLj@N4~vsol1`8se5?d^Xl+zV$|sz~v5<;`-Wu zY)^OsR5(2xQR;Gto#{3cz(*;s9~U{vdU=G?ojG?XrcwE(42)ecMHgEMw-Sk-bE1yrVRK1N z>0#PB{x^KAfW@tZ56h)6L$675us{1w^nv_jbQOi!hH^J5?l0{yp3h7m^$ssH`1o*X zq6eO|z*;?LtiCpWBWRsHbNf-bNa1{^S3qi__54@AEz0zyO!-pC8RjE8#ZD|c{|8UG zl9Z?ffCn{Dhk*o;gwg_7U?B?p?{i>`Hjw>&qW8l*%^pY6LkT zc`70~Y@@S&*KHw38zu#dQweQUfJU8gcPHQ(<*9-bm1dw!1lqAAsVUFeXk<)Ae=*j4 z1PRkM>yTC)q$**?9@P+Mj9;@MV4si%PQWn148tYR&DKP;L<+t}W;ZIX0D@zPApvPL z_G%vf@fuKx{_{emY&et16q)U`jJwGed?BvgV;!xHd7jtudKJUw_wYsU__V6(MzY)$ z2NVW^Q?7uSRE1Z0;c8RF5a5kzf4RY!Y16aI9z-Axig5n+`1ScPd%vGPKTSU-^VhrC z@6aWAK2mpsp;y{A^Sj$5Je*gf40ssIL z0001FZ(~q$Z*X%jV|896oB7N{12q>&Hs|!~cP{DTdFY)zSGtoT1K2~r;eyGg6Wa_ttXFOf9BpdR z)V&lu0|&0bBEP&yZdsfOCvtJ*@@wjJZ8 zWYfTffdru$WRo^>aK}#^IPvCt^IK#i+0jmK)`!vR=IICg;IxD3nhd;@AuY=gg)XTQ z>SBZoH}R9mMKMC8Aas>1t5@KR$7BK=Q4hBCE4s0)y_xsplQt@kVsKmqQI)K!B?)Li zmnEY1DMqnh#CR4xVn2mn=_x#G{87k13tive*gBhunPTetX2aDFKY~KyV&d7MdL%%8 z@GmyO*@o6VoBG<=MY@}Mep2az9KC;Q58oRAj{`cbPyPmz5hNOurvyO>_eE5Vg9HEo zzmxFII*z+ z|NR;De8qM?-imL`aR9L@e^M?EB1yuBs%!o^)Z)x%6Jc1)F(cR3qimV2Oq`CjMpTe2 z2Y>UkxpxbQJqYfU+EiSG;VOrSSn&iwU<96TSZ?e^DnY1W649Ugf;j^$u-@y06*%E$ zuQR5QMOk`{lSx;97qv%a9o9p{BT524HP-|_9TA&Yf{dY6bWOIvDPw06cmzu&$sGbD zBen!xkUp_(Neo@|IJO}Tn2Ck-Tv;22O@DL3wK19Cxh?w4{)mpntgE+lwf2w&hlEaN z0$iyWHCIAfE1$c{Y@=rAY zN_7CZx~Ueb=x9~-){S;l*-@(Qg@1O;Xm1F2BDpj6I-CU>oElJhxvi`MN;VqU#XKwz zJJbex*jFSx+}uJfQ1W4Q(JOV#1#E0qjMxW8sibQO0%Z~X2mvjVAj(<9U>#A(A`aFO z)huEdA>cQ$Qp+OltRw1K#Nj%kkwqM>Bbr&ndl4cXZ7YkoyN*D)q~0rlqqp`kKxsSgl!6=yhCah zo4fFORNzIR?LVljk-@y|*9FnRw^=`FB^BmwPXN{o?wQ@AqDP{?*m9AFsdu z?A15l?)`oF{N+zyUj6pN^2v*M>7U>Kxcc+O^2yK9b41ZG6V8sAjeq2SjqCwL2H*dR zZ29!B<0;-$QiW>W;0Mi1(EjQNy8Q`lqzJy9~??Bda- zGn@9|19T742G!J`(kLbtHE^t^ePT?<2 z*o9r)V_a}dg}lQ?WD3KOMS7b2_3Hf#vv>*93Jym1FUZjW007Se000yKla47Ce|=NU zPTN2jyjS8Kti6L%4yCGWqpGM<4;|e_t5D^aGH1+VPdLVcDO zbzUk{JI@Q03b&|FW-^a-*LE1ua$bcAlT4~D73RFI&}a9+6tN8MScb3=>Ik1v{y=$( z@(aS6U)wNrVHx_J;IHTd!lxv<9gVi*!~i<}<$4?qyQ}@J!?3gCZ+?$+e+a7xHIzpv zuU^cIVqeaUVsYgH<*z#*sE^X6+%ddv50+Q@&5NMZK-op;A-s!w%+6=CgH~0kQXG8Q z2$vx~(r+GyCm#{^qf;s0)PUu;XyF>lljtFi0;u|}%akoB+X!cox`l9#&`5n6m1j>y z5p33OZ<>BJajgFnNBLEGR794E)clQ|+n*_gxc5gmKmdd-gs!rQUp}ZG2Ycti**e0= z20e`r4l9&^haLLedmq>5>5`M9$?6R8WNBt-QP^6rT^;Q1rF+fUF8#;o>W8%c0JAF= z4iN#hlR76r0uLjTd?zvjGb59*Cz1uPjw$eKlSe2z8-o2<%R>PG0E7Yn022TJ00000 z0096X0000plbk3(0jHDQC@=wAlMX310fLi7DJ>gD_bIczN;6O<0_|9m)Rbo(G%_Zme;8{% zf`sXYbx11?Qk5`ck7|fB#;@5BuusSiPQWn148tYR%~nLTKnlJ>W;ZIX0D@zPApvPL z_8K1k@fuKx{_{emtT~g&6q)U`h`Y`fycSpPv5r>8JkJ|>vx;H!d-$Svd|Fj?BU$c> z0}2DdDObQus=}+haJ4C72=Lmpf81cqwCUMp4*d1szH zGn21g#poTlHiMD{zySgtmrQko+!f&IapR}JGq#moJ1WTwaO4K8%ImBAUaN^~J8_gS#W6~L1+QlY^)Og^o0Xw-tu7o zitH3S*_rL*adNt4{s}*Ny|6=9fVVoPbseMFCrw6ujBw>=VV3wPMTk^{ZnAar4!r5q zOn@g_;a0z)TgN)sP9h2!z#s#u7CIu6cZnlz&$k}VH}a)Y~bly=UnTHrZ^FUGV``Hjvm=lAA|>I( z#RB{fr!)u^+qtt5pTltsu_}L-TpXs7oDbDj{PU>IS;)r1u$gD3uB}GdHrs_bJ$r>{ zO|m@9f6t=e77zyz+$nXbxJbfP4iT~7iR0LagV3=3%!{Q2p{7a1APNQZhFD;|-%ToT z#La%!p^!ycdX1BDPk$G6jx8P56T|~b;&5rM34D4&Tw)92K&$AQY=Kk8&Lr>vmMW4v z0Z2w{3pyhM;<}O;y69nMLmDu13(Iq5ZIm?4e-YOlGRBcB2F(4KI%3+>+qzo&fW`ZS zPNo7}sTy@%W07#FPwtT!aX~0O1Vc7+ffar=kIDwuH4mSs-lvSHWmK0xx@IT2$_y%! zRNczdVT?2Ny3yKLy_%`RsMH%qW9iep(RwXYhf%55wor#0C9%V()VHzT$kbuX)T=cE ze{CE)gqB!`F;lnN2HH4wIEE5+7?t(90oA;rSkNnp3XIAkGHOi-{{|%l2VkOwWP_(Q zwi-rl<2aG(5jjx=l`SGgs!QZV5g-FuuW?*;2U@g;b#p%<)e&;Cg(cMqXweF=i(coS zY5=s<0pRLtEzES!CMSeEvHD%kVhv7nf2fGu?h8Zt0RX2o!!cyw*6ojRu z?-zunbRQIii$td>N?+*dc6DIWKEN)8QQpcln?*h}b``c@QKX5B0Pd774TY{@*Jbgp zi~X}?M}|`tANWBe4oMi|3BY8be_(NsbH)pc>BZvyTc`uyO089IHo%m;c}6Zq{kI=R zOuTdb{M)O`%bl0Me184tyPa2`eR=ilhwHCCef9M>JAYk1fBEAVSHFHgfBYg_`un%v zul{&3fBaMWoKkenoU>~dBl%w=JBG;M`)`rWpZqz0@@)R}XS9<~t?fPjf3Nx9126C9 zUdlUOF-33<3!sjNm`^A)g-gcJ6BPsA20XpSC3C@oWEI{>r%b?|RXt7NuLFToy<)&? zam<)d4`501o)8fQT7Uz>Pv|GmF7VoCoWh@kqzij`z_{R;3VAC`$wmo_^fdo7)Bguh zO9KQH000080EbTEK;(S(v%U$!3JGFD$o#wk005Dbi4+}wT}vB56n!uFAC`I7O@&I4 z-IY=i`k+u6f54JV%|doIW+tL!`OFo!&qFqKzaY< z1NC9LlsAUA?f&XouXz!48Yr(3x(J(bkJ-1`Y`;}isuTxbHo{eim-L!P;pra2VbqoK zO$}K7h%Vefc^VDkIDo3(x=OhPWgFovQnwJ!5gMtZQF(S%6v0mI;jZad6K(yUILhzJ zBeG0Aq!!dqf`jwmYztxN4!nxLd$0rvc(4VJ-4Ahno-R2#njHQBPmX<>7KN<^yVd^Z zgLJPs+ok^)U41F*H?wsX4iN%tC6m!56_c7LDg?zM005I-DHfC7CmI6jB9r selectByExampleWithBLOBs(DeviceInfoExample example); + /** * This method was generated by MyBatis Generator. * This method corresponds to the database table device_info @@ -70,6 +78,14 @@ public interface DeviceInfoMapper { */ int updateByExampleSelective(@Param("record") DeviceInfo record, @Param("example") DeviceInfoExample example); + /** + * This method was generated by MyBatis Generator. + * This method corresponds to the database table device_info + * + * @mbg.generated + */ + int updateByExampleWithBLOBs(@Param("record") DeviceInfo record, @Param("example") DeviceInfoExample example); + /** * This method was generated by MyBatis Generator. * This method corresponds to the database table device_info @@ -86,6 +102,14 @@ public interface DeviceInfoMapper { */ int updateByPrimaryKeySelective(DeviceInfo record); + /** + * This method was generated by MyBatis Generator. + * This method corresponds to the database table device_info + * + * @mbg.generated + */ + int updateByPrimaryKeyWithBLOBs(DeviceInfo record); + /** * This method was generated by MyBatis Generator. * This method corresponds to the database table device_info diff --git a/data-center-business-dao/src/main/resources/mappers/auto/DeviceInfoMapper.xml b/data-center-business-dao/src/main/resources/mappers/auto/DeviceInfoMapper.xml index 6d8a5f0..06fb28f 100644 --- a/data-center-business-dao/src/main/resources/mappers/auto/DeviceInfoMapper.xml +++ b/data-center-business-dao/src/main/resources/mappers/auto/DeviceInfoMapper.xml @@ -30,6 +30,14 @@ + + + + + + data_mapping + + @@ -169,8 +207,8 @@ created_timestamp, updated_by, updated_timestamp, project_id, floor_id, monitoring_point_name, monitoring_point_category_id, data_provider_id, - gateway_info_id, alarm_level, retain_alert - ) + gateway_info_id, alarm_level, retain_alert, + unit, data_mapping) values (#{deviceId,jdbcType=VARCHAR}, #{deviceSn,jdbcType=VARCHAR}, #{typeId,jdbcType=INTEGER}, #{wsclientId,jdbcType=INTEGER}, #{spaceId,jdbcType=BIGINT}, #{deviceName,jdbcType=VARCHAR}, #{remark,jdbcType=VARCHAR}, #{buildingId,jdbcType=BIGINT}, #{assetId,jdbcType=BIGINT}, @@ -178,8 +216,8 @@ #{createdTimestamp,jdbcType=TIMESTAMP}, #{updatedBy,jdbcType=BIGINT}, #{updatedTimestamp,jdbcType=BIGINT}, #{projectId,jdbcType=BIGINT}, #{floorId,jdbcType=BIGINT}, #{monitoringPointName,jdbcType=VARCHAR}, #{monitoringPointCategoryId,jdbcType=BIGINT}, #{dataProviderId,jdbcType=BIGINT}, - #{gatewayInfoId,jdbcType=BIGINT}, #{alarmLevel,jdbcType=INTEGER}, #{retainAlert,jdbcType=INTEGER} - ) + #{gatewayInfoId,jdbcType=BIGINT}, #{alarmLevel,jdbcType=INTEGER}, #{retainAlert,jdbcType=INTEGER}, + #{unit,jdbcType=VARCHAR}, #{dataMapping,jdbcType=LONGVARCHAR}) + update device_info + set id = #{record.id,jdbcType=INTEGER}, + device_id = #{record.deviceId,jdbcType=VARCHAR}, + device_sn = #{record.deviceSn,jdbcType=VARCHAR}, + type_id = #{record.typeId,jdbcType=INTEGER}, + wsclient_id = #{record.wsclientId,jdbcType=INTEGER}, + space_id = #{record.spaceId,jdbcType=BIGINT}, + device_name = #{record.deviceName,jdbcType=VARCHAR}, + remark = #{record.remark,jdbcType=VARCHAR}, + building_id = #{record.buildingId,jdbcType=BIGINT}, + asset_id = #{record.assetId,jdbcType=BIGINT}, + flag = #{record.flag,jdbcType=INTEGER}, + company_id = #{record.companyId,jdbcType=BIGINT}, + created_by = #{record.createdBy,jdbcType=BIGINT}, + created_timestamp = #{record.createdTimestamp,jdbcType=TIMESTAMP}, + updated_by = #{record.updatedBy,jdbcType=BIGINT}, + updated_timestamp = #{record.updatedTimestamp,jdbcType=BIGINT}, + project_id = #{record.projectId,jdbcType=BIGINT}, + floor_id = #{record.floorId,jdbcType=BIGINT}, + monitoring_point_name = #{record.monitoringPointName,jdbcType=VARCHAR}, + monitoring_point_category_id = #{record.monitoringPointCategoryId,jdbcType=BIGINT}, + data_provider_id = #{record.dataProviderId,jdbcType=BIGINT}, + gateway_info_id = #{record.gatewayInfoId,jdbcType=BIGINT}, + alarm_level = #{record.alarmLevel,jdbcType=INTEGER}, + retain_alert = #{record.retainAlert,jdbcType=INTEGER}, + unit = #{record.unit,jdbcType=VARCHAR}, + data_mapping = #{record.dataMapping,jdbcType=LONGVARCHAR} + + + + + update device_info + set device_id = #{deviceId,jdbcType=VARCHAR}, + device_sn = #{deviceSn,jdbcType=VARCHAR}, + type_id = #{typeId,jdbcType=INTEGER}, + wsclient_id = #{wsclientId,jdbcType=INTEGER}, + space_id = #{spaceId,jdbcType=BIGINT}, + device_name = #{deviceName,jdbcType=VARCHAR}, + remark = #{remark,jdbcType=VARCHAR}, + building_id = #{buildingId,jdbcType=BIGINT}, + asset_id = #{assetId,jdbcType=BIGINT}, + flag = #{flag,jdbcType=INTEGER}, + company_id = #{companyId,jdbcType=BIGINT}, + created_by = #{createdBy,jdbcType=BIGINT}, + created_timestamp = #{createdTimestamp,jdbcType=TIMESTAMP}, + updated_by = #{updatedBy,jdbcType=BIGINT}, + updated_timestamp = #{updatedTimestamp,jdbcType=BIGINT}, + project_id = #{projectId,jdbcType=BIGINT}, + floor_id = #{floorId,jdbcType=BIGINT}, + monitoring_point_name = #{monitoringPointName,jdbcType=VARCHAR}, + monitoring_point_category_id = #{monitoringPointCategoryId,jdbcType=BIGINT}, + data_provider_id = #{dataProviderId,jdbcType=BIGINT}, + gateway_info_id = #{gatewayInfoId,jdbcType=BIGINT}, + alarm_level = #{alarmLevel,jdbcType=INTEGER}, + retain_alert = #{retainAlert,jdbcType=INTEGER}, + unit = #{unit,jdbcType=VARCHAR}, + data_mapping = #{dataMapping,jdbcType=LONGVARCHAR} + where id = #{id,jdbcType=INTEGER} +