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 0000000..6876bd1
Binary files /dev/null and b/shapelight-admin/src/main/resources/7478041_c.xitu3d.com.pfx differ
diff --git a/shapelight-admin/src/test/java/net/MyTest.java b/shapelight-admin/src/test/java/net/shapelight/cb/MyTest.java
similarity index 71%
rename from shapelight-admin/src/test/java/net/MyTest.java
rename to shapelight-admin/src/test/java/net/shapelight/cb/MyTest.java
index e9f1ee6..a283a3a 100644
--- a/shapelight-admin/src/test/java/net/MyTest.java
+++ b/shapelight-admin/src/test/java/net/shapelight/cb/MyTest.java
@@ -1,4 +1,4 @@
-package net;
+package net.shapelight.cb;
import gb.RandomValue;
@@ -55,6 +55,9 @@ public class MyTest {
public static void main(String args[]) {
+ String s = 100+""+2+"";
+ System.out.println(s);
+
//----------------------------- 重命名文件开始 --------------------------------------//
// String baseDir = "D:\\facestore\\cface\\f10_2000";
// File faceDir = new File(baseDir);
@@ -74,53 +77,53 @@ public class MyTest {
// String baseDir = "D:\\facestore\\cface\\f10_2000";
// String idFile = "D:\\facestore\\cface\\f1_100\\id.txt";
- 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();
- }
- }
+// 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();
+// }
+// }
//----------------------------- 随机生成姓名，性别，手机号 结束 --------------------------------------//