From f4fb0df3e901975667298ed4d12f62ef1b1ffa07 Mon Sep 17 00:00:00 2001 From: fei550 <1420031550@qq.com> Date: Fri, 27 Dec 2024 15:34:00 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=8E=B7=E5=8F=96=E5=AE=89?= =?UTF-8?q?=E5=85=A8=E7=BB=9F=E8=AE=A1=E6=95=B0=E6=8D=AE=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .vs/SGGL_SeDin_New/v17/.wsuo | Bin 71680 -> 71680 bytes .vs/SGGL_SeDin_New/v17/DocumentLayout.json | 4 ++++ .../DataSync/CNCECServerController.cs | 5 +++-- 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/.vs/SGGL_SeDin_New/v17/.wsuo b/.vs/SGGL_SeDin_New/v17/.wsuo index f619c8e51db83e10cc195d92181ef74659a5facb..c277452a97c1ed62adc9b942efcd7c49822ada1a 100644 GIT binary patch delta 3086 zcmc&$ZA@EL7{2GyLR(tsMqy>Z#z*;(wQx)MC~V3_U>}V26Dn*t=t>K0z&6`X#SohP zT67w??+>#-I@yegOD1wPCd(4L%^zknN;J_#|IA-T6BmAzM2rsKQ+k07_Mt9%;JxRZ z=Y7vP?{m(3-qXm8EHWdTbdW6{I&)a%WXQsryM7?05N0RHC@kRD4dEoWf@K(H2@5z2 z44Q82B-`+VMFT{(y-9~Hs-{JYZ3W6Uluan9D48gCQCE|w^RQNiB)X*cpC?nKd zrfSKg3sT3ab99a^D0=X!N+F_>!5NiNO)aRHQ3Fv`pHc$$qgh6o17QiFbw{G_S%cHV zhyK)d<%k4MdG|mxAp4(P5Yl3#4HnXD8ivNl$_`<`l6??PpCFauLi(3P!x&Ia&lw5E z<5^vc9U6_a2)Y)v9BV0pXuy+U2!LoGI5blAwqtOn!*LE>N4@A{4+!_@DMRXV6u}J zilc&y7b+%{zOJuSXo#_R=BO2-6=nJ(UZ2-j?X&uP)#J~a+#L-Z{=MS$0$(`@Uytdv zuRBL9GvA4sSNe>H4U@-C2qn$*WW-R3on7{>WOaFid^>h>VX^F%T92*jH7bZb z)qby6)07Feomjh`CLHui=C=3%nkgl{{5kA!8~aJ0k9B_1f&YP@#klrHewN;RaIEY_-TlELkH2?o z?$&bdSbw(~_r;USV_X&~Zg=Aq&&L?XE6cI6_KX^DWxRVmK4rID?XP{V{!$jMbvHg>m7IS!cOZ$hLX*8wZSlArbmi7&w*$`FtARK0vo@YQ zM6GTL`uwB)L!$$QGF>pKjklM2tcH>NI??Y1(!OlDe(a~guGCX z6W*K3W?c~i87}n29fe3o6y^Z!+~~-YK1)mZHH?i!=o2^b@YE=7>Ze4oN0GKoM{VkA7y%x zt)F=jx&B?I-;n9ISlD#b0R5Lg-TBW6GhiPoj5BT?dKw}hEIp|gVEVjl`lAML{mhBn z#W@1=SNp`i_s=eEP=60wvR*PY&u*Yt9`Ri NL&`tt(~|Qke*t%#P2B(h delta 3430 zcmd5;UrbY181Jbq)_Q?jS_J<9YC*<&^|rmWElzh4M5YCbMUaR>|N38 z2KSpGdst%7?8R(hUbkgtSvvG#Q8RhiT;}%R!xG>8my(QS(|zaK3$;#V$>R1k-#z#I z&UeoF{@*4>G>H+-fRE@tZJDp0HPRkCQPci2se-t=kL-bQe6~V-hF_;usZ@`UV6fPd z+kumuCVU|2foMus{fSFPoXtfpMV^J6hn$c65Z7koXhY6LW{~MohV*ELfUaP$hk;hD zVX)i4vuT{lyo&EuS2~smH z-HPIw#?ZqRQjAgN3-FSe$ked;$kb3Xj>UXbQKw=LCo!A$`PQ|G<7e6We6xGM=ge! z#|L$0P8+3?FtP9o)S7LOD)BLVdatsd%!7C-`c#*N=ga`pvVp#(;n61PI@v=VB4CAIIxMXUCfkk0$BW^IkMEN>Mb_p=BDTY;svi77va%8$94#`OY}xA=`B5@o?6&^)TI7RcFjiSqRNLj>w5FxO zzqYG=Q^Tg3rcVF5b>7bUo#HDyz}WkDo4(}4>NlxZwl$Ic;=4J#qWJ)hj^|VKu8QR)tDNN~WPdv-bTG`Do;aQ(6_wh`_$u5Xj z`=2tMbU=J%^HWx9WvgMLpjk&RrbL}V)5!Eh8kr~4$kjZ}Qdol4Jg*d{eGo0l=N+_U z1JsprFj)$V8+0_2CyiMS@x@pTnBepjuQaiECK0D4WVkF>sXgN~NExsfm822n4v5V` zG`n{^(e5Uztv*3S>!r+s6Ryx1Ln}#Xj*#rAho81rs|f+~4o*71F^|lnt&|`u^nP*2 zH>die*O&bw-P{tLLDoP`*Xs8b}6Blbk)LYldj|+!$ZBzDOOM3uFi>L?sJlS_k|1pzZ1K#YHM&K$RR-k8V9Rom(SSv5gd6*+ zAh~ak$sIL~J{&Fap8YWV$xz8%k5@Hz5rqA1RWVf@yPr>WK($}B3wN)=a;F8qQchHw zND4u6Keq~f_}HPUvR(oI`jwz8{Sa6p9$PfbyPRwwm5MX(i&CT+GfQNNEJz>_vhaz@o*ygqe10WsXX49mjsvtql!6lG* z>zQ#LKFFQ_bsK?g=Z0a$?KRSxk*{X}H)er-r*x9_&iCZs4CR01|KWRT8UkN-2<~ET z%OQwzPA(eYLu?=z;?S`{H|q&=7!jw7bJ!iusGax7HSk0T^CY3?jJi6**($ru<_y?a zkIQCfd8aGLV#r-=I2d%^ z@8s$)RvXADfq`o|knAfO`rL@MHaaN4Skee1=Zr%OjD&{^2Rp@g^ldhMp7LWz9e9s+z=$4sS;PUmO;t}0Yr OqjF;2zv_|ip7|G;9nVhy diff --git a/.vs/SGGL_SeDin_New/v17/DocumentLayout.json b/.vs/SGGL_SeDin_New/v17/DocumentLayout.json index 2bf4a7d0..8157d0f2 100644 --- a/.vs/SGGL_SeDin_New/v17/DocumentLayout.json +++ b/.vs/SGGL_SeDin_New/v17/DocumentLayout.json @@ -66,6 +66,10 @@ { "$type": "Bookmark", "Name": "ST:0:0:{aa2115a1-9712-457b-9047-dbb71ca2cdd2}" + }, + { + "$type": "Bookmark", + "Name": "ST:0:0:{5726b0e3-1012-5233-81f9-d1fad48e7a56}" } ] } diff --git a/SGGL/WebAPI/Controllers/DataSync/CNCECServerController.cs b/SGGL/WebAPI/Controllers/DataSync/CNCECServerController.cs index 4be7dfcb..324f3f5d 100644 --- a/SGGL/WebAPI/Controllers/DataSync/CNCECServerController.cs +++ b/SGGL/WebAPI/Controllers/DataSync/CNCECServerController.cs @@ -3,6 +3,7 @@ using Model; using System; using System.Collections.Generic; using System.Linq; +using System.Threading.Tasks; using System.Web; using System.Web.Http; using System.Web.Mvc; @@ -119,7 +120,7 @@ namespace WebAPI.Controllers /// 获取安全统计数据 /// /// - public Model.ReturnData PostGetHSSEData() + public async Task PostGetHSSEData() { var returnData = new Model.ReturnData(); returnData.type = "HSSE"; @@ -131,7 +132,7 @@ namespace WebAPI.Controllers { try { - returnData.data = HSSEData_HSSEService.GetTodayHSSEData_HSSE().Result; + returnData.data = await HSSEData_HSSEService.GetTodayHSSEData_HSSE(); } catch (Exception ex)