From ab8c73679213f62a5fea265e0248a6856e201c45 Mon Sep 17 00:00:00 2001 From: guoshengxiong <1923636941@qq.com> Date: Fri, 29 Aug 2025 15:29:18 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E6=89=AC=E5=B0=98=E5=A2=9E=E5=8A=A0?= =?UTF-8?q?=E8=92=B8=E5=8F=91=E9=87=8F=E6=96=87=E6=A1=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../static/document/智慧工地对外接口.md | 48 ++++++++++--------- 1 file changed, 25 insertions(+), 23 deletions(-) diff --git a/src/main/resources/static/document/智慧工地对外接口.md b/src/main/resources/static/document/智慧工地对外接口.md index f0c365da6..f1d54f1d4 100644 --- a/src/main/resources/static/document/智慧工地对外接口.md +++ b/src/main/resources/static/document/智慧工地对外接口.md @@ -14,29 +14,31 @@ **请求参数:** -| 参数名称 | 说明 | 参数类型 | 是否必须 | 类型 | -| -------------------- | ---------------------- | -------- | -------- | ------ | -| deviceId | 设备Id | body | true | string | -| humidity | 湿度 | body | false | float | -| humidityAlarmType | 湿度是否报警,0否,1是 | body | false | int32 | -| noise | 噪音 | body | false | float | -| noiseAlarmType | 噪音是否报警,0否,1是 | body | false | int32 | -| plateHumidity | 板载湿度 | body | false | float | -| plateTemperature | 板载温度 | body | false | float | -| pm10 | 扬尘 | body | false | float | -| pm10AlarmType | pm10是否报警,0否,1是 | body | false | int32 | -| pm25 | pm25 | body | false | float | -| pm25AlarmType | PM25是否报警,0否,1是 | body | false | int32 | -| pressure | 大气压 | body | false | float | -| temperature | 温度 | body | false | float | -| temperatureAlarmType | 温度是否报警,0否,1是 | body | false | int32 | -| tsp | tsp测试值 | body | false | float | -| tspAlarmType | tsp是否报警,0否,1是 | body | false | int32 | -| voltage | 电压 | body | false | float | -| windSpeedAlarmType | 风速是否报警,0否,1是 | body | false | int32 | -| winddirection | 风向 | body | false | string | -| winddirectionName | 风向名称 | body | false | string | -| windspeed | 风速 | body | false | float | +| 参数名称 | 说明 | 参数类型 | 是否必须 | 类型 | +| ------------------------ | ------------------------ | -------- | -------- | ------ | +| deviceId | 设备Id | body | true | string | +| humidity | 湿度 | body | false | float | +| humidityAlarmType | 湿度是否报警,0否,1是 | body | false | int32 | +| noise | 噪音 | body | false | float | +| noiseAlarmType | 噪音是否报警,0否,1是 | body | false | int32 | +| plateHumidity | 板载湿度 | body | false | float | +| plateTemperature | 板载温度 | body | false | float | +| pm10 | 扬尘 | body | false | float | +| pm10AlarmType | pm10是否报警,0否,1是 | body | false | int32 | +| pm25 | pm25 | body | false | float | +| pm25AlarmType | PM25是否报警,0否,1是 | body | false | int32 | +| pressure | 大气压 | body | false | float | +| temperature | 温度 | body | false | float | +| temperatureAlarmType | 温度是否报警,0否,1是 | body | false | int32 | +| tsp | tsp测试值 | body | false | float | +| tspAlarmType | tsp是否报警,0否,1是 | body | false | int32 | +| voltage | 电压 | body | false | float | +| windSpeedAlarmType | 风速是否报警,0否,1是 | body | false | int32 | +| winddirection | 风向 | body | false | string | +| winddirectionName | 风向名称 | body | false | string | +| windspeed | 风速 | body | false | float | +| evaporationRate | 蒸发量 | body | false | float | +| evaporationRateAlarmType | 蒸发量是否报警,0否,1是 | body | false | int32 | From 24b469a92bb79c7e9aa15b78b5411386bd8f252f Mon Sep 17 00:00:00 2001 From: guoshengxiong <1923636941@qq.com> Date: Tue, 2 Sep 2025 10:48:41 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E8=80=83=E5=8B=A4=E6=9C=88=E6=8A=A5-?= =?UTF-8?q?=E6=8C=89=E5=8D=95=E4=BD=8D=EF=BC=8C=E6=9C=80=E5=A4=9A=E5=AF=BC?= =?UTF-8?q?=E5=87=BA41=E5=A4=A9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ...DailyAttendanceStatisticsV2Controller.java | 2 +- .../考勤月报-按单位-出勤人数与考勤报表.xlsx | Bin 12337 -> 12595 bytes 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/com/zhgd/xmgl/modules/worker/controller/WorkerDailyAttendanceStatisticsV2Controller.java b/src/main/java/com/zhgd/xmgl/modules/worker/controller/WorkerDailyAttendanceStatisticsV2Controller.java index 14bb74594..87ae72d36 100644 --- a/src/main/java/com/zhgd/xmgl/modules/worker/controller/WorkerDailyAttendanceStatisticsV2Controller.java +++ b/src/main/java/com/zhgd/xmgl/modules/worker/controller/WorkerDailyAttendanceStatisticsV2Controller.java @@ -1085,7 +1085,7 @@ public class WorkerDailyAttendanceStatisticsV2Controller { TemplateExportParams params = new TemplateExportParams(templateUrl, true); params.setColForEach(true); params.setSheetName(sheetNames.toArray(new String[]{})); - for (int i = 10 + dateTimes.size(); i < 10 + 31; i++) { + for (int i = 10 + dateTimes.size(); i < 10 + 41; i++) { delColIndexes.add(i); } try (Workbook workbook = ExcelExportUtil.exportExcel(root, params);) { diff --git a/src/main/resources/excel/workerDailyAttendanceStatisticsV2/考勤月报-按单位-出勤人数与考勤报表.xlsx b/src/main/resources/excel/workerDailyAttendanceStatisticsV2/考勤月报-按单位-出勤人数与考勤报表.xlsx index 4946d76ef941cdea1c82d3fbcc60d86bb2bc08dd..225fc03fb1cda64a326fa7f3b32131e08e6e081d 100644 GIT binary patch delta 4638 zcmZvgc{mho+s0?C*&^Fx-zQ6hvG4mj2E#MHCqU@0whCwMJDMlu{FcGF? zSJ|?wCMJ8?Kfd=nzUMo>_r3o(kKb|L=l$P(+}Cy8uP&2(YMOzJqDoz8XIwi_1al8N zVABQR>i(7R%ON}zSMTv@FlwEXEg?OD?;X+_bt6641M7c7oJ_J3@6zJF%{CI%5aqa* zzuUI^QOj)pM>DwSF9%(sZ^G>?31%6hxl$fW^9K}-L1zLY@8$@#9%NE4C{JcqA<7eZ zrz$F$u7(e0f}nQM4EV4I|%8$T<+DrX{eKX#zU$dkTu6r&mWzSn&jg_wL;AJ&5=$An!YUN;md zEMG6EN%!8||KlBZeX@$WT>FNPIj1`TQ5{dPDSH+*$)~OLIZs6_can$S)wZzd&5jgv zSUuFpYo_h1kl&V!z)HBXFi zjdIT9`Y|{BBDb&1V{daajQJFBSn2oCGwXIBNr}E5$O^pRhH|C{0Jd0gGzJL_GPDrF z8&~}LIR3yh1d3z2=fom2{xrBUDmIENQxQ*Cy&KgY$IK(4>A$+?FsnDy6l+*dYQ^-c zE!Yac1LmZAUT2%6rE~{`tqo=UYAMw7y>=&E!0)w$;Vns#Y2w#*q)U#$y0qlm_%n>Z zha6LeNnkNiXl4@>_IEt!3AhJCXE;ut2T5z=?W0jm^#-KyBL0fh*;fr+kD*vgnWsbY zviJNGAXsnU_U09j4b6#&gYugyoqSsppCX)nzPL5t?2mNtdSsaqUT{XOq-iWib0yqc zF~@MzpUdC;r3mR6BAWgV%%7(6@$Yr1$zV3Ak}QOCu6yoOMjDLIl}-l}k)AT!#rV+- z4DnE0V%3KP)nyY1F8>HsbH*(k(qha5anKjxof@9qc-aXdaO^ITj> z_>{PA{R6Rjq_UHJ$xlWwl?qaY==aM=2oC;6MPo3C zL2$McXh2*kyPmX^rj%jVd94gm2YXEaX61S=|If(x;9 zOwYGbL0Uldyn?idYPrG{J>RLyjOhm|2*G{HD_>Q3ozEXPlpA9#N+r!c`}YoN2&qQi zPh!7RD!EXNFz)|`iR*QXWVew1;w!yC=dbl8({Mb^QMlAtC6IbI&5;N7LO{bVD$NmB zYG||{xF6uScQ@kdQ@C-=KwR3>B;j`zEFyBY!~XrRi)s>EFE*YVLI4%}XEUgS%lOGAF*HbfUE}sD=GITjnYOSu9|go3Jt0ZS z)qiEqAwN&rOi{Tz?;+;tcQeK%6&tg&8Ele*m;_%obuG3$E;BbtvQn583vJI_i%9D@ z7gPw@VJRy)j9(U-v`^R`n>h4D9x^(>=oxqc0KgeQvi-dA8miFw3KIbEP#ORbIB{>H zm2ZTG2Swlx7}zkXN;iYi_X{S&=e4<#el-Nn+}St;g!||{#oB6cg&P(}d=of#kv{*` zLkJ1pUdzHd{aSI_%jZm|e^x%K7yESFcNR&d?UkEt^CtQDH*IAj*~! zt8Ar87d}w*@Tm6Y3XbSMq!0?-c#%&t=Rp6Zk%JlGbv;|Ef0SdO;~4G`fog9LI%grT zcheePU`@lL{Fr_{$jI{V3+@uK$>BAyPi~ZmxEtpsz){3-90Y_`X zJo~V&BnE8}mY~aIX*U21zj*>9_A*(<&6tJXDS;7xnGAA^XW{ovU@W*yKJV7SQeam+f=urOmlyXxmbp~CZq0Q;NN1@MiZI%71!*md= z%`Uq)tEj420PGeDIs?{GhcTfj+3w+Jd{I8=8Hz%14-dg#%m?M6D7o(8!T70sPy>qc z&^k^KA+GN!76Uha#)v8U zAwMkjZ5D>SBdV22d?0kdoNplJXqTZ`*^xC*+vUdtuTUhVCF|G)Qq%o(d}NSr;eFP< z%ELUCrfr~NRqhRoSxiRu17*5z8Fw3F$kr(>d4<^Ec^aRzB+XNed!EK|0$){6K=c$& z9r_b6Jau?ZA=E~Hp2l`UZ6}rzpj2{)uCvtYfRV{MOMsm{TP#dKK*qpF1!8-v>&oTF zTPc(dhaWt7cgVxCn)IDz@K{s_X6yL?JHc?9U^4Q|Pz}8|>c?bXyw^AQ15qrfA4^s1 z^fQh{0XQlK*q;DTLh6qV)iRh)Lc{TUeGWnn#e%lG zh7}QI^}3$0<;a}9R3a1hofVX7_E`=p(rf~qA5^sAPNq3vwIj2zT~C-#A_mp67KLtG zcS&8Penp`3Z)U+^KluDo?Eu<#8FZt&C3Y|AM)ynX`shXvOYBzYMvqJE*y+vVAKTLT z7@zSGlwiFp@d${SKVcyW?z@kxCHYT9=v2f`Me0<}pNhg=*d9CAUvJB*B~|ajE}5av zs^dZ9sD>@eq2%bh9CU0;k}G~TCg5C)=}XP2 z{`$o5ysALAR~m!DnF zeO00^w^vcgd@cE77L}Z8abKcVYwEn_zXNZ2u0qSfpKsWzh=Cp+!+u!Bk^$JFK*&ev1DCP8t|c@^fV)mUXXukU@i-Tddjp4}7IZI1f#ME|lePqi-N9A1_)((<8Ze)6vkDchL^_fPq~ z*#)nsofHX51AIBeO<5C^=A32?+yBnD)ON6p^YM<$AOEGWJbYQ_@dK?5}}?c z9({IG+4&o*=e<1fMmvjpBPPT=w5UA=CkuU6n1t;&!aPGNFEq|Iyd6OQK2OvW`@%UX z!M-<5ZqNF90a@Zv-%S`rzdf;JeRlMB3S|HafiR ziGozW#kh)=IFKytE$7%K-%JLg4js%q1#Ehg7XBQ4BSzdDnf~yBI)cqT`hNNM${$x} z2jaq?l36s?b>d;zbj2Q}@j%}>I_vrkAc$v7`E{!~)kC~W|8CtQeQIWunzGoZh>dx< z-5*U;-&-lnRXT6)-7np+&da&osxqa=aQgxJ^)5z=Lnujda^`&;JOs^Quc>6JdNkB)>6Ty}f z1D9wJvUAy4q^fD?QVoQ+;FbgJl*xghpA>s#tHz1a0xn&h)fHqwdgYmE%15sx%=S{~ zPfR7#er#jj^IKctNZQs09Iq|*OBow$_S{(Ij<+cb4+`SV&$A5i7UQY*rjsvWozOEW zl=c735M2EDkcSsw!otN1G!b;j0b2Y=f#d+q1pkxdI53roFj4w39<_A^_Bx1-AL0a^ z<=nXnHs)0)-F096lC?VVIEtCC?kwkMqAhRHgreTds|zOd%O-ym4-%5y*SBYCUV1Lv z=_N|WJC6S5$0roIOIO9dT$+hF8l7yqlBURzEcgkzsFl}!7Fz|a8>H}Sj{jYNCJ@ks zhiF0}nox{x(j3Q_rU{90w3*XGh9qp&xp+9b&FNK#9^0xzcsTl<64l0LZ8fwJ|Bij? z+G-sAwux#Zv;T%5j{Y){{%_*wUtW)98dl3zb|YxJTy48V`#k;w3&%t8|I@XypR}#i z@I*TmIshOHhZZ<5I2~*=QZ}yHSaS*Q(Q*qLpc;^5hkDx=iNL)Okd<)FXM0=0k#=ErjxgSj_rMXRyY>8c~n^7{b`3Mx8g}Hjcc0>Ke)K*bugJnLqvQX{gT7%%SDmS+6Te>~vZRV&kHUeqz~{yM5*TY~uLSth*LyMrgY!u$Shi}H zhR=$lx`Nb@AyEO|j(S2n2 z%i%)7*#G%EVN!GgLU2e$V_-V2ND)H!RUX%`s6of5fD@M&0Xx8ebi9CnMv{MCd%%CY zr?mhGkT_9gKAfGBF4}r|uS0M_oT;)N t@FgxzSyJSmPlkVuJO9MKFyMd?KHQ)(pYZ>miT(*)!9p%D4T4XN{{nt5g4_TA delta 4346 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