From ac3a28fe2dd2188e4076aa91604e0a4d34ae0ce2 Mon Sep 17 00:00:00 2001 From: XMnhwj_BackTechnologyDevelopment <3512363680@qq.com> Date: Tue, 26 Mar 2024 14:05:34 +0800 Subject: [PATCH] =?UTF-8?q?2024-03-25=2014:05:40=20=E5=AE=8C=E6=88=90?= =?UTF-8?q?=E6=A8=A1=E5=9E=8B=E6=B5=8B=E8=AF=95=E6=8E=A5=E5=8F=A3-?= =?UTF-8?q?=E8=83=BD=E6=BA=90=E6=B6=88=E8=80=97=E6=B5=8B=E7=AE=97=E5=BC=80?= =?UTF-8?q?=E5=8F=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../lib/dntd-common-1.0-SNAPSHOT.jar | Bin 16165 -> 17049 bytes .../lib/dntd-model-metalkiln-1.0-SNAPSHOT.jar | Bin 4697 -> 4728 bytes psdc-business/lib/dntd-tool-1.0-SNAPSHOT.jar | Bin 38146 -> 34313 bytes .../com/psdc/entity/SysDeviceHeatScene.java | 7 ++-- .../com/psdc/mapper/SysModelParamMapper.java | 31 ++++++++++++++++++ .../psdc/service/ISysModelParamService.java | 19 +++++++++++ .../impl/SysModelParamServiceImpl.java | 29 ++++++++++++++++ .../model/impl/BuildHeatingServiceImpl.java | 6 ++-- .../model/BuildHeatingController.java | 25 +++++++++++--- 9 files changed, 107 insertions(+), 10 deletions(-) create mode 100644 psdc-business/src/main/java/com/psdc/mapper/SysModelParamMapper.java create mode 100644 psdc-business/src/main/java/com/psdc/service/ISysModelParamService.java create mode 100644 psdc-business/src/main/java/com/psdc/service/impl/SysModelParamServiceImpl.java diff --git a/psdc-business/lib/dntd-common-1.0-SNAPSHOT.jar b/psdc-business/lib/dntd-common-1.0-SNAPSHOT.jar index cdf6f6c791f2ff355a9810ce2ee59a54f72da5b6..dea73ef721de6ce0653ad919f280665ddefbcc91 100644 GIT binary patch delta 2580 zcmaJ@2{@E{7oQnRVyqd1QDn*3hB2d=!61Bpsu-KF|C7&i|bAJOA^(?>YbT7GKJa2MgL*aB=g4 z*q1grB3)3C3(W%TZ7viGCS}R0I58ys- zA(lYadiK$#fC~ib=LI@>_fb;p#{74Y#9ewq_3JUo?maPh?kTYxUHDYJvw3oiu{p9b z*oR*7Ht>}7!?Z=3=T)EYVAygDNl|ek{Q}eeak^2vQ}I_l^YTsZd0mYE$IA!G)${r$ zW-D5UCN8FKU0C0MMFXpQ6T}VdKbb*qOqp^kyW``Z*>Zn!fSTpnexihnpGNOGV2}`u zuVxxURojx7w{kTfo79R%mN9Fb#e9y)9WNV&#c;(VMy)hRVNgtiDfPs8XzP9j5eDMg z>s&aWSI_W;$RX4_$YQM9JAp4t%_m%53|TqSdG6oN_H}%bwtfvg?TkAE>4?AO!pN+b zMqSdt`8pxGXKJc4mno_yAp!4?sCk*Vs(-LW>-b_Crj85x277I|0MV||;HPdco9XN_4y%rU8o9P7WBa7neg125XG^;1ZFD=b%e$Kmi zb!+n*%dWB7>M_2NUlI_{cF8HO&+ zecZdi{5Gy&)TSr#BjjezfNC$Y!O*H8agu4KOa|HVz1z+**A|8 zsDEvi4kUbBK?@*ZO&E=d&xH*`Gt5y^HECYm%9Qf;!)R44Q~vCvz)tI0j7E;o!^=k^v8@zBve-HBJI9-?3Rdp0aJm;fsf}+ zGP2N8qz_oq3pCFCTqRz!kaJ@x!!q1lLN`-p(vJSJv?!~EcSXhQSf2>7W7%_#XxS&a zwA*c?aAO5Oqnhoy5n_>Sd8Vz{w5p_$4qL|ZI9p+N6qg*}cCpHbss6I!}02n+l039{QeGJhe@76JlI z17LL+>s;WcSOs`^`q{Vzxt&G1`?&=N#~-r|7_<@JMAgZWU&?TK>Si`s&GDuruiYA< zc6;pnw}n;<-1}~Av=4P>z^0;=;y!~_t_|DnU=+-+sWU6sKj6WF-Xx*)`*|n>HA2BR1C^N^NHt zCLNi(|7I_ENv!|3Rv*Y>g!X(mLo5(2h0iydDb@?^z{G^K4#4_P4E)w^Kek&h>zVD- z#mSM*Q^jVJUz_U}mV!gd;ul^SG4H;*L96&ZF(G*Y#56qc1_D4w?vITqr-`_dO+D^*hFIx;ht>+xxZbaUU1xqVYCM)D2bFr$}6Ay zv~_l;U$t}Vyo=s<5uG*T+GVis;d|&sQ5li*^q~ zkzUiDqDoh~A<-@wDwrm*bi-Yar7b-kpFL7D!gUXg`Y~>1+np7PDsDWKQ&1y~4i4!U zRT`|IpE27EKdMsxP}$$)(JmaFuI#U*VLeVexDfD$;ixv5wnq0ZF83=oHx^iuy4hrU zu%2?SCNHaDy|YOZrYi7!&}(0f$~pLo_`yLl1)bvbC^|{fOgTkHboN4=XucTyQgkA} zg5%&}6Q804u1rx4pCYr|Azp#0+NLXy5==8c4%Jf%^T5VnQlb zJT+8t+7of8U?mh7x5O>x|=NQBgmoSBIt(^*LD?5)qJfES(4kM6|`!|M%RS zA1m_TNFd=K3lY%P790oMBktyu$N(#ZDGo^AFZF-<3P16~*#sqkY@iBhW{WC7rGc>A gKg#q6hyAet0?QEt2pjSVAwUQan)TL>>asol3tTb%BLDyZ delta 1691 zcmbQ)%DA+SH^7^jg^K|Mc6OIdJ6(+iP#hCtP8V_w}hT|LDj#d6Gkex%?m5 zrjPzBil=#bYh)Isor~G`GwobS{hymR*)Oz5>NmX*E4bS&=aF~k!y~mS+kywv#OuCr zzWDyY?A?yS>)q8m^b_h2a0@o)@f2E~X_n)tIH7v5$6(4*ALXL~;;~cXPXrwcGR>T& z)0Mf>tE%Ck>55mYOwT;vDL)fjal}J|XWxod+LLEKS(J3{WVci#Q=qb5_UBD2KULq0 zNL#xiv+Y^N9S^V0t!sMcPg82!w?yx_h~>f=A&ZhCH-0kR%=7kPvev9M`t{zMr>%T- znprm8m#2s8ikx+bv($X4TG8;JX<09x6tB~aJh##%YUiruM%Pw`4QnSJu( zR!+;*?+OnlHgNP#J!mU&{nO?T=cFW!*Y&L2<5^#5Z7UPvBCBU$GVlJ@hT}?ZhQ|UX zFKNuGS!KI&@=opwrAL~_T(2w$J7R28pUyGuMTkSl5f(McS$)^+<@esUui0I=V_)%? zkFVcfe_#K$*7DbfXV3He4ovCDJR`99kWG^0-Jr>*I7ObzBxguZUb)icgprf?s(Bn! zla4#5yTlw(T@;^{E3t~Zb(vWB)E%X#O8$r))fJ6vC|fNcaq)@C!qAINH?pogIGmip zA)a6FGO_#K`fW>^y97OaJa6-xPx=?X=JB6g>&=p>QjUgK+P#1M+`o9o@tj*hD;h3a z?9I6xvWP)aCoxSR=+Cm3Q^LFM)igHe&W|?ion8}pvi0;AU5-oJo2E_C=g;)Jlqvsm z&GOkUlP2oCzr%K0hc`uB?(k_rF)T)x{Uhar?A=!m|e}$rsavF{M}+6>+8&*?K01@RtU|y>BwCq(3XjP%tn9)3TUL-Ffydey%y+W31k-ia z4q*DAHAG#Vwe(~;8&$BFn~g7esj<+;K_29wD5kKBzZn@Aey}hw*nr9_C|J_SJjvD@ ztlQ64nkj;3GNY~L2n!jtFPLrh!))Ss&{`J}xm*j`2lX{J}&lP?&mOm?yt0vl)1QJwsoiGhKQoq<6Q z#kgsDK!pZ60p5&EBFvyN8k{O3^jz-rTn7e3D9{b4_TM#}e8Isq7UW1IgBbYX907*^ z|9=`YF!;KLIO=-(x#{O7mZj$DBWwWI0w|irQ8cTWOinPDo?Pq51@=ytqcl^r2{3V} vPCnzP#WV-R)YPxY%|Vz5aWiUaf*T18vr;pl9&0`+1}TQyzz{Go2T1||RY8(s diff --git a/psdc-business/lib/dntd-model-metalkiln-1.0-SNAPSHOT.jar b/psdc-business/lib/dntd-model-metalkiln-1.0-SNAPSHOT.jar index 71452b5f2f53adb14b41df91f5c6a9d84eccf357..f7d366a9ccb81340c1261f7cfdb5371f759e298e 100644 GIT binary patch delta 3095 zcmZvec{CJm7so^Pu@0jlTa7h46(vPu-_2m`A=@-$A0d;Bb!LdMZ`s#WlBG!5hN+k= z*~uOXgORD9>Q(2w=Y7w6-us;Ue9yh--sk!L`I&;yAzW6bOeZ-`{0V=ch&(s#6xLQ4$M+D1Jxnged+CglL|$Kt425xuy3tKN;fuBQOMWGaJheo8o+IpC6nMB59HBY9?kKtV?t?N zT=vpbg-7kM#YdZrndS;H++nR;bDld$aay^6<>gp}+r+hesJ-DOZdq1LmaollRJp%F zHtqb3x`U~y!R6=pkIuxax`Dt=T}6w%kD@_m1vFM?Ml`G92nO^L`9*)M9q$@n>>W>f!#+X7}lA|BAaJ)epkMWQ7X( znld9W)fpfaNOZAHRvorfrRrcaCF?x<3;~vS7`?FO(@pF8R+n8A-J;%#?-Oh?GvD#= zEP-Y=fj^=qfKzxc?v<+8^6U|){YPj{z6mhz0^vE*v3Jv0&JW}2UM^40=@oq&=;{9z zEYe`O`0^d;X-jUE+QKyivEHMnBHN|&_dVfOtff-eC|YOu0hO8Et-_TYNYgv|{u_U^ zV(eNBxA_NX5@rE{Kk=9pBlGyVYFE7?tmo%fR;{NCSQjj!>U@agO&oY^;CU8-DNILp zmf&K{E&%@0hf#vrddgdtyhy!g8uvKhM%$)#prwdR*at>WDe(dIuH5wV%bOrVYtu+a zxhHd?f~V*>%pau&z{#5%17Q!-2QulqmAsv1X)<~P19Xn!%w1b;{eFUJ@Vf|MH{x!X zcF$8(zEy1_na%To!38=7UD`M*PEt>QH`sexo^=W^MA84vrD)RvuV$O9)iF_}QL6MsfKf-Jgw; zb&}f78>76;Lodf)U8L~;I!NOw?)-IclP<^kih#EwZD%`b zom4F@o3VMn%=0 zrab{Ri-Zs>x>Yui3Qh_8CLW<)IJ3Gz=G7#%X=H6d&s<5AgWz@l-pY*$v%nmx+)4Kv zdQq*KCxeFYm%pvQQj9FCx0GrM#~4a8>C|@1nH68rorLmnTu4YTMxzyFCdTIaJauy1 zztbpJiicyQ#Oz10p387Fhy8>N^UY^+=_WR5?g4g7cLAKv`!}(+sCw4|+l)*P&iyWL zSY8d6M)urojQ=2r>v;kC!}j2;Y87ZFKy?{_>z}%0QFs>EAPuA_XQ$g>LYNmr{fpdU z+1HO$C8jlqR-qx5;b>%J>s`}uR$@7c!E@iT##(E|R{{O`213od)TI@!eqD9kSDI%; zAo{GxU=cpe-E}DV%sIwO-UaOAhGRJ|8}_4%`k#L8-pPS^RfP27V_Kp{9L_zFv5aSUWa%(|W$^5D>t$vt0D1A+J(>h|J)WR`S_%3nMMt+jJXPsiBuo~`SKR8~I zL9T&=EK|d($|;?z0WccWW)MDeU#WT?dcO>*>^nRk96Xi3Ti<{&Q3IE!m8=B`6^HnU zA1EX%mPh7iHvojphZ5s`dmX9b?05|1!zA>!b);J452WS&D^Msyz8?)o_CS?bw}1oL zFN`$tD)&_O>UV$TTjCs<&3oyd-^HuVT(hOkwKGqoZc#NN-*tptr>aMvI2_BmlPDp$ z5Ogv>`W>q^Vgn-reNaq_#Kiw@Azh1qz4EPGR)I6(@H~s=b%%wu5bd9@s;$NxFv5HD z&#qPOK)eB^Z715boOZX+T^N7}Woy-Z7I&#Ja3w&Y?g?7DXmGWv+vJBRG#UL#LND>v z*Gbcfv8zS~5%G&TvA@wFpcJbVu&g0i{^_YK-#4e#Iyf-?xwx&|#G>3ZF@-mhdtbSF zgHD-JbrkxT5C$Pm^m{W>f4&7SFm&c&fKNV48W*XNS6euOhXy zNLCpwCpo3G6viUDUcvkRP0yrm2s3s=Q>j{u=W)qF@OETZGqLS!^Ep37gC<*Qk$yZ@ ziQT@j2_b`V&q;JSVzhg0#2b$D-H}8@1vQHfGhX#qvcAdLqu#R!%WYoPFpTqp?-I*cqh%KEjMHSZn_WKn(662mJr7n@?T!~R~p_r9dU z3JRAW-5-b%W!^Xm;wj5dI*TqN6(c+>tq}2(Bib0%xi!aZWe{1go(y!l74k7PNwHaG z)1dcl+vMKqMw3sz-l#4!VG&u2bIC7r_e#?}I>ip)_FT}5)()sjS?U19ww?=o9=agX;|snJ=Km3yDQHpIM+!!da8*!FhR$I zVONZ$=hdamE80xRJ0v!85yWp_#(<7arPlXSnmi;sl=PiBL zWADQD^AsmGfaRe6XO52WJ3m$OEWdY_UCVUNOljzfo9jr6z>aq7mBkm1o77HOIJrrm zwz_qTpQL9s3ze>cWS!Kyw@_`6QFtg3<&BZi#-{t#HQn2UhoC45E z*0O!~8wkY(wcafpr#Mm8jZ!DG_?t5{{0`@3JgO^UsV)XopXitMH-?4t=yBOts5YY)BrJjoHFtFO`Zr>Htozqp^w9uWy9l~HOwJ`25*2>ND z-%S4|UA8}@i>RO1wG}v~UjE}0I!@z&n_(fL!FP!3oQh1x1H@AR`M;_UQ2V1zk$}^T zY=3aLQ5^h%Sj_DV{5D8odWI9gn+XCG9+@dN00;s^E*_V^TmC#6e@L2G!E^NwN)y+3 z&i@Zf%ko~6|9?h~z5I=e*m=(XvX#aw^7r8eUJ(WvBAHk0Z?$<`!HK4P!bAx^z~7EC zp9n+pamRsS^!QdLj`0Ei<9de=#8|^kG~-huj&pN^tW23%{`|#peAXFHoQUN4Q~e8* CPsNG= delta 3073 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 YaS8-x$~g7!Q5BAPrV}SzxsTuf7XU!8mH+?% diff --git a/psdc-business/lib/dntd-tool-1.0-SNAPSHOT.jar b/psdc-business/lib/dntd-tool-1.0-SNAPSHOT.jar index 857592c5ac7365f186dff48995660b85eb42f7fa..999fd5bd23719bc2a29ffba0d844c9bd04554330 100644 GIT binary patch delta 5304 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 delta 9012 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 BLMH$K diff --git a/psdc-business/src/main/java/com/psdc/entity/SysDeviceHeatScene.java b/psdc-business/src/main/java/com/psdc/entity/SysDeviceHeatScene.java index af12ccc..626fb02 100644 --- a/psdc-business/src/main/java/com/psdc/entity/SysDeviceHeatScene.java +++ b/psdc-business/src/main/java/com/psdc/entity/SysDeviceHeatScene.java @@ -4,11 +4,15 @@ import lombok.AllArgsConstructor; import lombok.Data; import lombok.NoArgsConstructor; +/** + * @author zgdky + */ + @Data @AllArgsConstructor @NoArgsConstructor public class SysDeviceHeatScene { - // 设备id + // 设备Id private String id; /** 设备类型 */ private String devType ; @@ -47,5 +51,4 @@ public class SysDeviceHeatScene { /** 备注 */ private String remark ; - } diff --git a/psdc-business/src/main/java/com/psdc/mapper/SysModelParamMapper.java b/psdc-business/src/main/java/com/psdc/mapper/SysModelParamMapper.java new file mode 100644 index 0000000..1e7155a --- /dev/null +++ b/psdc-business/src/main/java/com/psdc/mapper/SysModelParamMapper.java @@ -0,0 +1,31 @@ +package com.psdc.mapper; + +import com.dky.utils.entity.SysModelParam; +import org.apache.ibatis.annotations.*; +import org.apache.ibatis.mapping.FetchType; + +import java.util.List; + + +/** + * @author 小镇做题家 + * @Date：2024/1/22 16:58 + * @Version 1.0 + */ +@Mapper +public interface SysModelParamMapper{ + + /** + * 查询所有 + * @return + */ + @Select("Select * From sys_model_param") + @Results(id="accountMap",value = { + @Result(id = true,column = "id",property = "id"), + @Result(column = "param_name",property = "paramName"), + @Result(column = "param_value",property = "paramValue"), + @Result(column = "param_model",property = "paramModel") + }) + List findAll(); + +} \ No newline at end of file diff --git a/psdc-business/src/main/java/com/psdc/service/ISysModelParamService.java b/psdc-business/src/main/java/com/psdc/service/ISysModelParamService.java new file mode 100644 index 0000000..cd63f4a --- /dev/null +++ b/psdc-business/src/main/java/com/psdc/service/ISysModelParamService.java @@ -0,0 +1,19 @@ +package com.psdc.service; + +import com.dky.utils.entity.SysModelParam; + +import java.util.List; + +/** + * @Author：戴仕崑 + * @Project：psdc + * @Filename：I + * @Slogan 致敬大师，致敬未来的你 + * @Date：2024/3/26 11:12 + * @Version 1.0 + */ +public interface ISysModelParamService { + + List findAll(); + +} diff --git a/psdc-business/src/main/java/com/psdc/service/impl/SysModelParamServiceImpl.java b/psdc-business/src/main/java/com/psdc/service/impl/SysModelParamServiceImpl.java new file mode 100644 index 0000000..b4c9284 --- /dev/null +++ b/psdc-business/src/main/java/com/psdc/service/impl/SysModelParamServiceImpl.java @@ -0,0 +1,29 @@ +package com.psdc.service.impl; + +import com.dky.utils.entity.SysModelParam; +import com.psdc.mapper.SysModelParamMapper; +import com.psdc.service.ISysModelParamService; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; +import java.util.List; + +/** + * @Author：戴仕崑 + * @Project：psdc + * @Filename：SysModelParamServiceImpl + * @Slogan 致敬大师，致敬未来的你 + * @Date：2024/3/26 11:12 + * @Version 1.0 + */ +@Service +public class SysModelParamServiceImpl implements ISysModelParamService { + + @Resource + SysModelParamMapper sysModelParamMapper; + + @Override + public List findAll() { + return sysModelParamMapper.findAll(); + } +} diff --git a/psdc-business/src/main/java/com/psdc/service/model/impl/BuildHeatingServiceImpl.java b/psdc-business/src/main/java/com/psdc/service/model/impl/BuildHeatingServiceImpl.java index e657cd1..b754049 100644 --- a/psdc-business/src/main/java/com/psdc/service/model/impl/BuildHeatingServiceImpl.java +++ b/psdc-business/src/main/java/com/psdc/service/model/impl/BuildHeatingServiceImpl.java @@ -38,7 +38,7 @@ public class BuildHeatingServiceImpl implements IBuildHeatingService { // 创建JSONObject对象用于承接模型方法输出结果。 JSONObject jsonObject = null; try{ - // 构建JSONObject对象 + // 构建JSONObject对象存放产品库设备列表 JSONObject list = new JSONObject(); // 查询得到设备列表 List sysDeviceHeatScenes = deviceHeatSceneMapper.selAllDevices(); @@ -46,8 +46,8 @@ public class BuildHeatingServiceImpl implements IBuildHeatingService { list.put("devSpecList", sysDeviceHeatScenes); // 将这个JSONObject对象list作为入参调用ModelTool的create方法实现产品库初始化。 ModelTool modelTool = ModelTool.create(list); - // 调用ModelTool的唯一入口函数exeModel2Report，将场景参数param和密钥key作为入参传进去，得到输出结果电能替代报告。 - jsonObject = modelTool.exeModel2Report(param, key,mapList); + // 调用ModelTool的唯一入口函数exeModel2Report，将参数param、key、mapList作为入参传进去，得到输出结果电能替代报告。 + jsonObject = modelTool.exeModel2Report(param, key, mapList); } catch (Exception e){ e.printStackTrace(); diff --git a/psdc-web/src/main/java/com/psdc/controller/model/BuildHeatingController.java b/psdc-web/src/main/java/com/psdc/controller/model/BuildHeatingController.java index dc62aba..40a80e6 100644 --- a/psdc-web/src/main/java/com/psdc/controller/model/BuildHeatingController.java +++ b/psdc-web/src/main/java/com/psdc/controller/model/BuildHeatingController.java @@ -3,6 +3,7 @@ package com.psdc.controller.model; import cn.hutool.json.JSONObject; import com.psdc.core.domain.AjaxResult; import com.psdc.enums.DeviceSubType; +import com.psdc.service.ISysModelParamService; import com.psdc.service.model.IBuildHeatingService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; @@ -13,12 +14,11 @@ import java.util.List; import java.util.Map; /** - * @Author：戴仕崑 - * @Project：psdc - * @Filename：BuildHeatingController + * @author 小镇做题家 + * @Project：Scmy * @Slogan 致敬大师，致敬未来的你 - * @Date：2024/2/2 8:55 - * @Version 1.0 + * date：2024/2/2 8:55 + * @version 1.0 */ @RestController @RequestMapping("/system/model") @@ -27,6 +27,9 @@ public class BuildHeatingController { @Autowired IBuildHeatingService buildHeatingService; + @Autowired + ISysModelParamService sysModelParamService; + @PostMapping("/getReport") public AjaxResult getGenerateKey(@RequestBody Map requestBody) { HashMap param = (HashMap) requestBody.get("param"); @@ -45,6 +48,13 @@ public class BuildHeatingController { return ajax; } + @GetMapping("/selAllParams") + public AjaxResult selAllParams(){ + AjaxResult ajax = AjaxResult.success(); + ajax.put("data", sysModelParamService.findAll()); + return ajax; + } + @PostMapping("/selByCoed") public AjaxResult queryByType(@RequestParam(value="typeCoed") String typeCode) { AjaxResult ajax = AjaxResult.success(); @@ -70,6 +80,11 @@ public class BuildHeatingController { list4.add(DeviceSubType.Material_Kiln.getDesc()); ajax.put("data", buildHeatingService.selDevicesBySubType(list4)); return ajax; + case "0105" : + List list5 = new ArrayList<>(); + list5.add(DeviceSubType.Metal_Kiln.getDesc()); + ajax.put("data", buildHeatingService.selDevicesBySubType(list5)); + return ajax; default: ajax.put("data", buildHeatingService.selAllDevices()); return ajax;