新增人脸核身 照片对比搜索条件 新增订单id数据

eladmin-system/src/main/java/me/zhengjie/application/admin/controller/vo/FaceCompareReq.java

@@ -8,4 +8,5 @@ public class FaceCompareReq extends BaseRequest {
     private String idCard;
     private String name;
     private Integer result;
+    private Integer type;
 }

eladmin-system/src/main/java/me/zhengjie/application/admin/service/impl/AdminOrderServiceImpl.java

@@ -395,6 +395,7 @@ public class AdminOrderServiceImpl implements AdminOrderService {
         Integer result = req.getResult();
         String idCard = req.getIdCard();
         String name = req.getName();
+        Integer type = req.getType();
         if (!ObjectUtils.isEmpty(result)){
             qw.eq("result",result);
         }
@@ -404,6 +405,9 @@ public class AdminOrderServiceImpl implements AdminOrderService {
         if (org.apache.commons.lang3.StringUtils.isNotBlank(name)){
             qw.like( "name",name);
         }
+        if (ObjectUtils.isNotEmpty(type)){
+            qw.eq("type",type);
+        }
         String format = DateFormatUtils.format(new Date());
         qw.between("create_time",format+" 00:00:00",format+" 23:59:59");
         qw.orderByDesc("create_time");

eladmin-system/src/main/java/me/zhengjie/base/util/FileUploadUtil.java

@@ -138,7 +138,6 @@ public class FileUploadUtil {
 				}
 			}
 
-
 			uploadFile(imagePath, contentType, b);
 			// FileUtils.writeByteArrayToFile(fullPath, b);
 			return imagePath;

eladmin-system/src/main/java/me/zhengjie/base/util/JuheServiceUtil.java

@@ -68,7 +68,7 @@ public class JuheServiceUtil {
     public static FaceCompareEntity URLPost(String idCard, String realName, String base64,FaceCompareEntity faceCompareEntity) {
         faceCompareEntity.setName(realName);
         faceCompareEntity.setIdCard(idCard);
-        faceCompareEntity.setType("人脸核身");
+        faceCompareEntity.setType("1");
         String response = EMPTY;
         PostMethod postMethod = null;
         try {
@@ -87,6 +87,8 @@ public class JuheServiceUtil {
                 //设置结果 可能成功也可能失败
                 String reason = jsonObj.getString("reason");
                 JSONObject result = jsonObj.getJSONObject("result");;
+                faceCompareEntity.setOrderId(result.getString("orderid"));
+
                 if (! "成功".equals(reason)){
                     faceCompareEntity.setMessage(reason);
                     faceCompareEntity.setResult(0);

eladmin-system/src/main/java/me/zhengjie/dao/mybatis/entity/FaceCompareEntity.java

@@ -34,6 +34,9 @@ public class FaceCompareEntity {
     private String fileId;
     @TableField("type")
     private String type;
+
+    @TableField("order_id")
+    private String orderId;
     @TableField(value = "create_time",fill = FieldFill.INSERT)
     private Date createTime;
 

eladmin-system/src/main/java/me/zhengjie/domain/notary/impl/NotaryDomainImpl.java

@@ -609,7 +609,7 @@ public class NotaryDomainImpl implements NotaryDomain {
 
         FileInfoEntity fileInfo = uploadFaceFile(s);
         faceCompareEntity.setFileId(fileInfo.getId()+"");
-        faceCompareEntity.setType("照片对比");
+        faceCompareEntity.setType("0");
         if (score > 0.8) {
             log.info("人脸照片比对通过");
             faceCompareEntity.setResult(1);