From 05e79800c78447819156085f21bc8f5f266ef2de Mon Sep 17 00:00:00 2001 From: weidong Date: Sun, 4 Feb 2024 14:36:58 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E9=A6=96=E9=A1=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../beidou/controller/IndexController.java | 1 + .../resources/static/images/loc1_orange.png | Bin 0 -> 577 bytes .../main/resources/static/images/loc1_red.png | Bin 0 -> 461 bytes .../main/resources/static/images/loc_blue.png | Bin 232 -> 0 bytes .../resources/static/images/loc_green.png | Bin 938 -> 528 bytes .../resources/static/images/loc_orange.png | Bin 0 -> 528 bytes .../main/resources/static/images/loc_red.png | Bin 231 -> 448 bytes .../templates/page/device_overview.html | 56 +++++++++++++----- 8 files changed, 41 insertions(+), 16 deletions(-) create mode 100644 sec-beidou/src/main/resources/static/images/loc1_orange.png create mode 100644 sec-beidou/src/main/resources/static/images/loc1_red.png delete mode 100644 sec-beidou/src/main/resources/static/images/loc_blue.png create mode 100644 sec-beidou/src/main/resources/static/images/loc_orange.png diff --git a/sec-beidou/src/main/java/com/imdroid/beidou/controller/IndexController.java b/sec-beidou/src/main/java/com/imdroid/beidou/controller/IndexController.java index 2d5646ad..a675da19 100644 --- a/sec-beidou/src/main/java/com/imdroid/beidou/controller/IndexController.java +++ b/sec-beidou/src/main/java/com/imdroid/beidou/controller/IndexController.java @@ -52,6 +52,7 @@ public class IndexController extends BasicController{ statusQueryWrapper.ne("tenantid", tenantId); statusQueryWrapper.isNotNull("latitude"); statusQueryWrapper.isNotNull("longitude"); + statusQueryWrapper.orderByAsc("warning"); deviceList = statusMapper.selectList(statusQueryWrapper); statusQueryWrapper = new QueryWrapper<>(); diff --git a/sec-beidou/src/main/resources/static/images/loc1_orange.png b/sec-beidou/src/main/resources/static/images/loc1_orange.png new file mode 100644 index 0000000000000000000000000000000000000000..e70a5a157b29fb6512f383c0f970c9d0bfb91d98 GIT binary patch literal 577 zcmV-H0>1r;P)%xKL7v$^GQTOR7i=fm)&*3AQ*;UvOv2*bpq`KrW^E{o9YCn8^j5!6VzUm zYu!LMNG7OmpcBwT0E02`5zTv!H-bET|H!12ASKu{fH8p7*;)WNfXjkD00@Hwn*zuH zi~?sI0c-#)!R4VFNHBHtHGr3x+d5i+%RCMw*b>0JBfwQzxtPn7A0(Kv;^P5`)eS6h zAX!fkn3!(dFSJF14NMk2^#ro|1eYol7mIQNa;^dmyn;&xU~@tV%MetWs$GrPHYWCY8u#9Bt$G)JMoQlx1V@c zRZ^XjW>0EpZe~&lGA7Qb46(hgAcou4)Ku+e?bghELhWm)erG}I*5ARKYn4tm`dsB| z4=z(&%_G4McT7}DZ?@>&I*JQ?y!LKqsX<(>jcfW+=AP5+3|UW*Rr48k4brBr9)uj* z!qC?1@&{emI=^l~dehX5@2*<-UatO^YJ6>3ZNa5?TKmU@&cdHaNJ%tR;_Z#fvK`R{ z&gQXr_u#X7Cz6AN#DR2jq@LuM#r|!HvB(Eg5EaKL#ep*+%PPxAl^jzCf P00000NkvXXu0mjff_weY literal 0 HcmV?d00001 diff --git a/sec-beidou/src/main/resources/static/images/loc1_red.png b/sec-beidou/src/main/resources/static/images/loc1_red.png new file mode 100644 index 0000000000000000000000000000000000000000..a19d0e8d412402c46c3fcc5fed7e68afb81527bf GIT binary patch literal 461 zcmV;;0W$uHP)%xKL7v$e@R3^R7i=vmTi%QFbsxYP=JF&0uHWHkgyVvfP|BPgq6^9z&XG{ zZpz2Bd!$LaFxQ#GDyKs^eL=#HuKTmz~uc|Wb zDQ4?Z3euWGh1ft5#x;km?8P9y6U~q^&?~G6LPYolhAi6k_kV^m00000NkvXXu0mjf D_5a29 literal 0 HcmV?d00001 diff --git a/sec-beidou/src/main/resources/static/images/loc_blue.png b/sec-beidou/src/main/resources/static/images/loc_blue.png deleted file mode 100644 index 791c8bf376adabab83153a2c81552921375eda5c..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 232 zcmeAS@N?(olHy`uVBq!ia0vp^AhrMp8<5nmf9C+CI14-?iy0WWg+Q3`(%rg0K*3p_ zE{-7@6W2}*%xKL7v$!bwCyR7i>KmhDl(KoExCW%v&rNC#jA!3v}ULj}ePlB+=N06V}A zVg*74Vg*VC>ulT%m&@hIhyK!?VJ6(ivmeR6cf`yH85vptSOS>pP!3?nDSrm{HG#=c z3?Kt=;h8=H*aAqJ9Mr&MXsVl{U@9jEOHO$g1S?chowtAn;Ui~J))6W;(G2|&lc5=a zw~kQT)|~Rj7x8KUR4lRo*x=jS{O zby1lF#9zi|`YiBU0Iy^yFEbe_G_^K81Gocl$tim^T02i#eGTAAvx5dz92kVGc!)Hm zmFlvup0Y0UIn#L&`Wqd(8mkUOnp#YTHZI(Xu*p`|^+7~Gmx#rifTX6Sl`llbYg(&8 z$WLJ6(B50zhzi-%w=A_TQ|V)JI7q3!YwX-M#X*^tJcllbqRo<#fVP!W1i%+R_`z}~ SQYdu*00001^@s61^WE=00009a7bBm001r{ z001r{0eGc9b^rhaTuDShRA_FRaML zfTKc0U+XhoXf89k^eyZK3(z94$$j-EGnx35ed-vLH50j5`4p^#Z2?q?ffuequE;K0 z09DFFE+$n4tg!gu_gG{WRd$D}$U2)Pf`*vC{b5BecqMx70G6tPWQ(lVR1!%;1j`$C z+9532f^`9ljY*TG^cwPx?5G78myF}Z1Z%9-Eyx5rxF^_~l?k@dZa$_=u$y~=4cfg& z(uWr;QjLAbu*TN44X|}w7N?B6FB`1a&OMU$GL!z1MPXyVX+goeF6wAM%TcwqsudPS z#LsA0W>s!YeR8mEWI(0d<-i=vc2@pN>x#pUiZg`3p_HkKZ+vGjnAr3Y** zJz!($0UJx78izpk1O4T=!5*pfoQPgzCWDVmQ8{kC7fvQ&npDAaHz^cw z4^3|a-NVpWhZ+(Uzz1zmorHHA5)9<>80mvy(zDo%T-&tDE48RRD7-2N)1$zYxG=nw z@yyY+OI#TAU{P--hpw zh|=m>{nY_EMW3CSSY###C;Ld`V(oYnZd+Pu8XuV=f@7?Vrh%pFRc3OnU%xKL7v$!bwCyR7i>Kmd#PZKorM+%W#Jdqyw;mUvu+%L{O-twFGE8yBrY6DJNves4L!oPT+-Iar5 zy8-TxguaFUa6V$R^VS?@+p-?m1$(8E|M|Hgx}gY#_T#cybTCo}=dPA8Z6fsh8^ouX zrMe-u={{&P@R9Zp{*z#TqE}isH*uih`)>v^j+Xrzzc~J8DM_6T(;QAn%xKL7v$a!Eu%R7i>KmhEwaFbsxYu|OFi80wZJuk3ct| z8?b?T!geBqZCWV#)9OxliIE?F>XnI^ku{)m{!D% zd6+APwGqr_vwA!$^Zvnq227MK3`Gz~)Pcx=h(R=gs7*jGv&`DK0Yq2#VtSa%uJ=Uh zHjD2@>B$s{H$E$4P)Xk|5SJzRq2I033_Zx;!RFo|!EwFta@u6R_X=KXai84G;_$ps zX(gORpV*fD5x|SudZ}Mh1Et*ykTy9yae0f#q3OPFVD9yP>80#(+0xptB7At;Ya~xC qnTh-kUN;N-bSsjT-JHBy1Mmf;5lN90%=5_r0000?@qm_2r{p0R!^RjQ=o%XKa<^Ct>Yhty{6Nkn{D6C b9P1b@R&U_XYfzd7bR>hPtDnm{r-UW|TFz79 diff --git a/sec-beidou/src/main/resources/templates/page/device_overview.html b/sec-beidou/src/main/resources/templates/page/device_overview.html index 9b36344c..a9c42f05 100644 --- a/sec-beidou/src/main/resources/templates/page/device_overview.html +++ b/sec-beidou/src/main/resources/templates/page/device_overview.html @@ -90,11 +90,16 @@ [# th:each="device : ${deviceList}"] {deviceid:[[${device.deviceid}]], latitude:[[${device.latitude}]], - longitude:[[${device.longitude}]]}, + longitude:[[${device.longitude}]], + warning:[[${device.warning}]]}, [/] ]; + let batch_id = 0; + var convertor = new BMapGL.Convertor(); + var loc_green = new BMapGL.Icon("../images/loc1_green.png", new BMapGL.Size(18, 24)); var loc_red = new BMapGL.Icon("../images/loc1_red.png", new BMapGL.Size(18, 24)); + var loc_orange = new BMapGL.Icon("../images/loc1_orange.png", new BMapGL.Size(18, 24)); //console.log(deviceList); for(var i=0; i { + timer(); + }, 500); } } - let batch_id = 0; - var convertor = new BMapGL.Convertor(); - //每秒转换10个坐标，否则会受百度并发限制 function timer() { var pointArr = []; @@ -136,16 +167,9 @@ convertor.translate(pointArr, 1, 5, translateCallback); - batch_id+=10; - // 函数内定时器的回调函数会继续调用 timer() - if(batch_id { - timer(); - }, 500); - } } // 启动函数 - timer() + timer(); }