Merge branch 'branch-nt-2022-12-27' of https://git.flowbb.cn/RK-Dev/fqgz-server into branch-nt-2022-12-27

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

@@ -11,10 +11,7 @@ import me.zhengjie.application.admin.service.AdminOrderService;
 import me.zhengjie.application.admin.service.dto.CompareImageDto;
 import me.zhengjie.base.*;
 import me.zhengjie.base.file.FileHandleVo;
-import me.zhengjie.base.util.BeanCopyUtils;
-import me.zhengjie.base.util.FileUploadUtil;
-import me.zhengjie.base.util.JuheServiceUtil;
-import me.zhengjie.base.util.TencentServiceUtil;
+import me.zhengjie.base.util.*;
 import me.zhengjie.dao.mybatis.entity.FileInfoEntity;
 import me.zhengjie.dao.mybatis.entity.FaceCompareEntity;
 import me.zhengjie.domain.notary.impl.NotaryDomainImpl;

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/controller/vo/FaceCompareRsp.java

@@ -16,5 +16,6 @@ public class FaceCompareRsp {
     private String idCard;
     private String url;
     private Date createTime;
-    private String type;
+    private String orderId;
+    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 {
@@ -90,12 +90,14 @@ public class JuheServiceUtil {
                 if (! "成功".equals(reason)){
                     faceCompareEntity.setMessage(reason);
                     faceCompareEntity.setResult(0);
+                    faceCompareEntity.setOrderId(result.getString("orderid"));
                     return faceCompareEntity;
                 }
                 String res = result.getString("res");
                 if (!SUCCESS_CODE.equals(res)){
                     faceCompareEntity.setMessage(result.getString("message"));
                     faceCompareEntity.setResult(0);
+                    faceCompareEntity.setOrderId(result.getString("orderid"));
                     return faceCompareEntity;
                 }
                 String score = result.getString("score");
@@ -103,10 +105,12 @@ public class JuheServiceUtil {
                     faceCompareEntity.setScore(score);
                     faceCompareEntity.setMessage("比对分值小于75");
                     faceCompareEntity.setResult(0);
+                    faceCompareEntity.setOrderId(result.getString("orderid"));
                     return faceCompareEntity;
                 }
                 faceCompareEntity.setScore(score);
                 faceCompareEntity.setResult(1);
+                faceCompareEntity.setOrderId(result.getString("orderid"));
                 return faceCompareEntity;
             } else {
                 logger.error("响应状态码=" + postMethod.getStatusCode());
@@ -126,10 +130,10 @@ public class JuheServiceUtil {
 
     public static void main(String[] args) throws Exception {
         //String imgFile = "D:\\repository\\fqhz-server-nt-2022-12-27\\fqgz-server\\eladmin-system\\src\\main\\resources\\gxg.jpg";// 图片地址
-        String imgFile = "D:\\repository\\fqhz-server-nt-2022-12-27\\fqgz-server\\eladmin-system\\src\\main\\resources\\adh.jpg";
+        String imgFile = "";
         File file = new File(imgFile);
-        String realName = "xxx";// 姓名
-        String idCard = "xxxxxxxxxxx";// 身份证号
+        String realName = "";// 姓名
+        String idCard = "";// 身份证号
         FileInputStream fin = null;
         try {
             fin = new FileInputStream(file);

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

@@ -33,7 +33,10 @@ public class FaceCompareEntity {
     @TableField("file_id")
     private String fileId;
     @TableField("type")
-    private String type;
+    private Integer 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);