From 52928d854ec463fed7a8530423073e965b24e2b3 Mon Sep 17 00:00:00 2001 From: gaoben Date: Fri, 27 May 2022 11:43:53 +0800 Subject: [PATCH] =?UTF-8?q?v4.0=20=E8=BD=A6=E8=BE=86=E5=9B=BE=E7=89=87id?= =?UTF-8?q?=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pom.xml | 8 ++ .../net/shapelight/common/utils/Constant.java | 4 + .../modules/app/utils/MonyunSmsUtils.java | 2 +- .../modules/job/task/XaImageTask.java | 5 +- .../modules/job/task/XaRecordTask.java | 7 +- .../main/resources/7478041_c.xitu3d.com.pfx | Bin 0 -> 4634 bytes .../java/net/{ => shapelight/cb}/MyTest.java | 99 +++++++++--------- 7 files changed, 71 insertions(+), 54 deletions(-) create mode 100644 shapelight-admin/src/main/resources/7478041_c.xitu3d.com.pfx rename shapelight-admin/src/test/java/net/{ => shapelight/cb}/MyTest.java (71%) diff --git a/pom.xml b/pom.xml index 31eac75..6f83046 100644 --- a/pom.xml +++ b/pom.xml @@ -254,6 +254,14 @@ thumbnailator 0.4.13 + + + + org.bouncycastle + bcprov-ext-jdk16 + 1.45 + + diff --git a/shapelight-admin/src/main/java/net/shapelight/common/utils/Constant.java b/shapelight-admin/src/main/java/net/shapelight/common/utils/Constant.java index 352f559..1475cc5 100644 --- a/shapelight-admin/src/main/java/net/shapelight/common/utils/Constant.java +++ b/shapelight-admin/src/main/java/net/shapelight/common/utils/Constant.java @@ -69,6 +69,10 @@ public class Constant { public static final int FACE_FAILURE_OK = 0; public static final int FACE_FAILURE_FAIL = 1; + public static final String CAR_ENTER_ID = "100"; + public static final String CAR_EXIT_ID = "200"; + + /** * 娱乐场所 2 * 机关企事 4 diff --git a/shapelight-admin/src/main/java/net/shapelight/modules/app/utils/MonyunSmsUtils.java b/shapelight-admin/src/main/java/net/shapelight/modules/app/utils/MonyunSmsUtils.java index c3c9a0f..16a1c67 100644 --- a/shapelight-admin/src/main/java/net/shapelight/modules/app/utils/MonyunSmsUtils.java +++ b/shapelight-admin/src/main/java/net/shapelight/modules/app/utils/MonyunSmsUtils.java @@ -43,7 +43,7 @@ public class MonyunSmsUtils { public static void main(String args[]){ - int res = sendSms("15829022214","123456"); + int res = sendSms("158290","123456"); log.debug("result:"+res); } } diff --git a/shapelight-admin/src/main/java/net/shapelight/modules/job/task/XaImageTask.java b/shapelight-admin/src/main/java/net/shapelight/modules/job/task/XaImageTask.java index b72c9c0..b2b112d 100644 --- a/shapelight-admin/src/main/java/net/shapelight/modules/job/task/XaImageTask.java +++ b/shapelight-admin/src/main/java/net/shapelight/modules/job/task/XaImageTask.java @@ -13,6 +13,7 @@ import java.util.*; import lombok.extern.slf4j.Slf4j; import net.shapelight.common.config.MinioConfig; +import net.shapelight.common.utils.Constant; import net.shapelight.common.utils.DateUtils; import net.shapelight.modules.job.task.ITask; import net.shapelight.modules.sys.entity.SysUserEntity; @@ -272,7 +273,7 @@ public class XaImageTask implements ITask { syncRecord.setLV_TCCBH(record.getParkCodeXa()); syncRecord.setLV_ZPSJ(DateUtils.format(record.getEnterTime(), "yyyyMMddHHmmss")); - syncRecord.setLV_JKBM(record.getRecordEnterId()+""); + syncRecord.setLV_JKBM(Constant.CAR_ENTER_ID+record.getRecordEnterId()+""); String base64Image = ""; InputStream inStream = null; @@ -423,7 +424,7 @@ public class XaImageTask implements ITask { syncRecord.setLV_TCCBH(record.getParkCodeXa()); syncRecord.setLV_ZPSJ(DateUtils.format(record.getExitTime(), "yyyyMMddHHmmss")); - syncRecord.setLV_CKBM(record.getRecordExitId()+""); + syncRecord.setLV_CKBM(Constant.CAR_EXIT_ID+record.getRecordExitId()+""); String base64Image = ""; InputStream inStream = null; diff --git a/shapelight-admin/src/main/java/net/shapelight/modules/job/task/XaRecordTask.java b/shapelight-admin/src/main/java/net/shapelight/modules/job/task/XaRecordTask.java index e626e9b..925d235 100644 --- a/shapelight-admin/src/main/java/net/shapelight/modules/job/task/XaRecordTask.java +++ b/shapelight-admin/src/main/java/net/shapelight/modules/job/task/XaRecordTask.java @@ -10,6 +10,7 @@ import java.util.Date; import java.util.List; import lombok.extern.slf4j.Slf4j; +import net.shapelight.common.utils.Constant; import net.shapelight.common.utils.DateUtils; import net.shapelight.modules.job.task.ITask; import net.shapelight.modules.sys.entity.SysUserEntity; @@ -216,7 +217,7 @@ public class XaRecordTask implements ITask { syncRecord.setLV_CPLX("02");//01 大型汽车号牌 2 小型汽车号牌 03 使馆汽车号牌 04 领馆汽车号牌 syncRecord.setLV_GCSJ(DateUtils.format(record.getEnterTime(), "yyyyMMddHHmmss")); syncRecord.setLV_GCLX("1");//1进场2出场 - syncRecord.setLV_JKBM(record.getRecordEnterId()+""); + syncRecord.setLV_JKBM(Constant.CAR_ENTER_ID+record.getRecordEnterId()+""); syncRecord.setLV_SBXT("10");//申报系统,默认10 syncRecord.setLV_KKSBBH(record.getChannalCodeXa()); syncRecord.setLV_PROCMODE("PMINSERT"); @@ -349,8 +350,8 @@ public class XaRecordTask implements ITask { syncRecord.setLV_CPHM(record.getPlateNumber()); syncRecord.setLV_CPLX("02");//01 大型汽车号牌 2 小型汽车号牌 03 使馆汽车号牌 04 领馆汽车号牌 syncRecord.setLV_GCSJ(DateUtils.format(record.getExitTime(), "yyyyMMddHHmmss")); - syncRecord.setLV_GCLX("1");//1进场2出场 - syncRecord.setLV_CKBM(record.getRecordExitId()+""); + syncRecord.setLV_GCLX("2");//1进场2出场 + syncRecord.setLV_CKBM(Constant.CAR_EXIT_ID+record.getRecordExitId()+""); syncRecord.setLV_SBXT("10");//申报系统,默认10 syncRecord.setLV_KKSBBH(record.getChannalCodeXa()); syncRecord.setLV_PROCMODE("PMINSERT"); diff --git a/shapelight-admin/src/main/resources/7478041_c.xitu3d.com.pfx b/shapelight-admin/src/main/resources/7478041_c.xitu3d.com.pfx new file mode 100644 index 0000000000000000000000000000000000000000..6876bd19df353831e707c5194870e0101a8bf0f5 GIT binary patch literal 4634 zcmY+HWl$7=)5bYC4mi5IkvRJ3R6x4B8zmG3q?@Bb>FyMeMoLObKuI}}?uMhgj@SRp z8}okH-I?dv-EaGwSw0vM87csc4@Ni%!h%F9Mc&{7FaU)x!d@VZuz-vBs5cq%Of6J+WBp5i!Bn_O2)akdhA+rHO znjY=Lny9Ei6d(*Z95!%=3QUtVn8-SYqbj(ojdH~OEF)!-qsPY1N{I~?m1jXqhU%t! z=^!ooA?B<{xSXlzKSex{Fy`Gbl-QdeRYDqq0=ne<{ct({-`upbT)!H!2ecBC5~HJ&3`rEMxGr5()fmf9{xtnP>*gOCSA{`_HVdc14AMjD+`s z7z5yzpQM6^ctU8fYu`5;Oyoejzwa;d#@B&@ax*6wObuimR4w5CI>&>5_&a`Z;o&E` zJ~wW~3o>7-d9w=9xw_ri9Wr5#(HFl3WW9O1cIw2mGZtjdtF;N$Kd6pB4E!Dxn4Of* zr0g-R!Te+vd1^S$8_fGY=`byDqOMI7>Wp6cGDxXYoNhM)4n`f zd|dbnjcG5o_=v7%x}do_25F`{BUIr8PogI;tgvR?oyy-KbPa@Q-A5Vsjdn6G51;l( zL|3zZU|w2Dz3RSS?Rrn(pa!U~Azp2jS^Xes7~i`_2#-D>V2x zb}IahDb@UwP)p2j?KNWPvniZ?wYvF5tN^3ZC#I`#b!%0AqKc{;U%1vj>Bd2Re9K`D8YNP_PM2lQy)LXMH8_#z(O0gbdt4>PKl1QX#R$gf&R=Mq8$5}TV-n68&+$tHBM0aOK^y!;lf{oR7^pq{Y)qd#s=H?y6Y)3K z<`W^8`YT)u6%L1_d?&BS;$_sU6F)i`E0>71KlJ3kXJ(A+xt`ow~Kl4_| zu-A7omG@<^#&hLZ{4(u`b%hEQ@hC7>BUw=Qm)V9?PMeFLk{36<<)fmIl13_wo?CWa zom=|WS2#R~5u#$u8$|{zB_odb*iDgA6U~s3bU3ZUp zdx^%goYb?+2}doIL17N0o=D{|7OyI5YQO+GHPrmBO4AqXa@=I8FCLFKsYcO6Ef zSk6P8US2i)Q~MXeQBU|1=2NCAuFOd15l8Lpm%hIPQGUNB!_ey82z_oHCbi&A);{Yz z_kVqobTR(RV&RLJx;^B*i@jbZRTXzCQ`|G1D$@Y4Yh?UtNJcGt#>wql=!n8_h*zQC zXG#PGKSqZer=nk~rK8GnCnz$YL|A+QfTsVhS&sD9(ko3#YVSskUz(5de@Tf&!jD4- zMzKbDkK*_*f8=BQKZ}%~1W2Uk==_F(UszB?OiT z1)%&Z{Qu_w{vTdJ|G_KSy>rmV&9wE;!2TfC${~qFes|pe;57t>eJe8@9-k-*_yF8A zYFP&Gtm{Kvs|si|j31se>VYPWHIr>+-G4NjfHF6eLG7dD0} znN7qhHDD*xa4Q`vJ&UyiZ4o7d@rxzyB81hK4jg8Rl5=(V_yH~}Qx1JY9*i;?mob1% zBUBgk(uWvQ#qJ2VH}JL)4a*59*NOBOskM_gHlv}Ii=?2cE{2>Iq!j`W2Gs%)Wf&=N_-xi8V?F3&iz7>)~?qJlh;(;ZV7Edxp-`Wp}2byuh3*zO<$$54M6CI%NJMkA>0h zjJ9XCy62OC#E4X=i;(bZ-58}ZO~MrM0y9EsKP0~wo6X3BT!5xY-H=C92dGR`*EA`{ zZm4W``9yAJh>%+d7KZP`K8K@d(rh7i6S@k_{RZnZLbZ!DzY4V z%qV)r&!%~WeX8CCZ;s{MM8zRpH_v_1Ms{oX^leSqfbs!l#b;(Wy+5()MW~^*zv7*? z{B4_jUV^%Zj41F*J}){7)8#gGtp>^4@@9FVbbJgBE6=>72j{y|Mxd%+xW7x9o@7at zPHU8AQ(*PF$d6#ae<5GFQa#muS$Ik0Xhx2-U29#8`-#W;xP@)5Jvx%9+&%TFSWG9& zeWqNn_`!D>MxB_`r`SN98HZ(Z%Y>s`iN2O1XbSZCu$xWt6GQtFuJ;^y_S<}|8XnHT zVY;qrUj@etd*$~xLt-4$d-vemRJ?l4C2zCs3M=!e9KbF)M$Wmj=VF&wU9n-ARZP6; z?IqP=%V~KEBt1;qaE}B_4e2Jpa~k}Wva6#BJA{h8L*SfJUr_#y2ofdx0)1<`9dn}1 z(p*;$L#j=fuy0ZZFgSa<>sd3yFIsp;!s>;QQhGP}JV7D3rFeTtYkaa`9EdJp`E_kS zrmf|6Lpx~kZYJLeZ`P*W`UaYXvUWErSHpfqeR$2U6cw>DMMFBe%VrH^Ao039ksyv4Ju?qb$E@m{QLzuljRD5dLqj`dz z_PNr+NoB~W$5p)`OLP4VCHA z&4A}g36{K-p7n5FW=JoE#$8WVu{nvA`k92m(SL)eLUpy-AcNg#d+AQJxIaK@WvslE zI7A#|eEW;2y_O?FJ>^RzFQc24Ty?ouckWMUu8f!BG;}ZgE8gq{v_EA;Y|`{fxQHQp z6Da~h58c;Z2@@Sl9gOlqA_hwO5>A7bEIzF)F26#1%bqiWo)64XrIhU<=f>50T662s z37Eg4vSJWdc{e(fI(sT15bWDP+vl&KW3S7j$-GuP3Q$>qtP&(7zODZ|QXmqWn*db5 zSk=MQzxyg;Xs(0JXVF6>ZprM$u^GbqxB_sebpC87u@Kc*a6B>_c42+zX7oMI2&dwX zTY}H$W1@5CcDOQ4VeS+J@2jEu6i!1X+mbK7&74uc81=8@iVB059~%M#heH4oG;Ojp zh&VZxUvu#bdHS1#RrLU-Q02BODZijx9Ai;oX_4bd31c=n?VlK z`hX0~NaObneUaK1dJPBF*C-GjI#224wc?Zs>gg|{Xpq)5(N-bW+-J3vFo&<{zh#}{ zwrba)lsO87V;g;T>COP(XYDmjLh%}2iubku4zg$4myd#;=gj$UTifMPZXbmHo@~Gv zgn!{FvQZRP;&j^)Woy@6Ei!=PoaUI$^IDV}TloS2BK-;n!Zun&kDGR%g+=o%nyH)I zA9hzVZ^NYfFA0B&92ROO8)(oYhKJeDG|zk-JP>oi7B2tlbEDx^yDB|}@;Qdby;HpXMzgkgE((eN z^OSiEUzE<=p25^ispx?1A-NdH^_}DlQzm&aE@i8&iyqUTB@M}b-|#;5mnP@&Ji@ni zYL2wR8_iwL8iJ5dq4X>ex752N-Tm!l)W~0Etw+E>g6HEb<;NTA zY8UnBdF^{ICOCdj_Bd=YLI+0Y2{p6-&0|Fn^u=DIvzT;Jf=r|e-JsmE_Jb{t%?LWK zybJQ$nC7uy02ktE=Xe^GF!Jp=x{_vlk=Y`a!E05Qxvec`mk9e$*a@9Z=Afh@Ndbuf&FySdECd%?-RMSOAOg*2CZ%Gfgc#W2U0uQIQ{5@4(G$i=N=F5nijcyzYycCEh23pGF1C6 z=-J?GY0k>2vHj{spUVwZHq;wrzY9q9rXq%}ZN51lEV9%;N27W%wSgB7{+^_T@rw}*WAs$=CMrDvln#GcFD!2h8LLYVUPsFn0DTM$N4A_KC1=e`9GrJW1+#bC*O;a=IN5BeI2abWkAqHMbTD%j_1_f+=71rek8!f*KI(VVl3heg zEuMY5DBr{0XB}77rEW+(=RauON?sIy_RF8W5A<|a;5$CXbL!2)l|nZ~euORYZG1(T zhshJUAm@=)3JEPtYjI1FRe_&Ak3m%KA%!ZeEAnTr@(!mz;+v7yHUKk9Y0ve(P9F+{ z-XIZXh_4Mrn0GC+xbTS=Uz{+T>6jF&m|q6hibHnK%P zq<@q`?4`_=yJYGdu|-7<4I|SUzb1XRurGIwrZ4L+4d9&=$|u-QY=wJ@m?m8HWRiivQqOhGnv?VMq z&quZ}Oo(JIPfd0MitgkY-O9+)NIASTJ{|J@_No7ITR@byeP^!8@c|rKq|Um&=Q0uaT6FVLlS+NqL`xG#CR9ICya$=ssaBH zf6D)&E?pxSTHY>JHAZswy27(o$ZwN5SzluXYcI;)x%@}tLk2NR2$q0UiJDkTd;PZn zRLGKvq^*0.5?"男":"女"; - idBuffer.append(sex+"\t"); - //3.手机号 - idBuffer.append(RandomValue.getTel()+"\t"); - //4.身份证号 - idBuffer.append(id); - idBuffer.append("\r\n"); - System.out.println(idBuffer.toString()); - } - - - FileWriter outWriter = null; - try { - outWriter = new FileWriter(idFile, true); - outWriter.write(idBuffer.toString()); - } catch (Exception e) { - e.printStackTrace(); - } finally { - try { - outWriter.flush(); - outWriter.close(); - } catch (IOException ex) { - ex.printStackTrace(); - } - } +// String baseDir = "D:\\facestore\\2020博士统考照片"; +// +// String idFile = baseDir+"\\id.txt"; +// File faceDir = new File(baseDir); +// File[] iamges = faceDir.listFiles(); +// File outFile = new File(idFile); +// if (!outFile.exists()) { +// try { +// outFile.createNewFile(); +// } catch (Exception e) { +// e.printStackTrace(); +// } +// +// } +// StringBuffer idBuffer = new StringBuffer(); +// for (File file : iamges) { +// String fileName = file.getName(); +// String id = fileName.substring(0, fileName.lastIndexOf(".")); +// +// //1.姓名 +// idBuffer.append(RandomValue.getChineseName()+"\t"); +// //2.性别 +// String sex=Math.random()>0.5?"男":"女"; +// idBuffer.append(sex+"\t"); +// //3.手机号 +// idBuffer.append(RandomValue.getTel()+"\t"); +// //4.身份证号 +// idBuffer.append(id); +// idBuffer.append("\r\n"); +// System.out.println(idBuffer.toString()); +// } +// +// +// FileWriter outWriter = null; +// try { +// outWriter = new FileWriter(idFile, true); +// outWriter.write(idBuffer.toString()); +// } catch (Exception e) { +// e.printStackTrace(); +// } finally { +// try { +// outWriter.flush(); +// outWriter.close(); +// } catch (IOException ex) { +// ex.printStackTrace(); +// } +// } //----------------------------- 随机生成姓名，性别，手机号 结束 --------------------------------------//