修改人脸对比结果

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

@@ -10,9 +10,13 @@ import me.zhengjie.application.admin.controller.vo.*;
 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.TencentServiceUtil;
-import me.zhengjie.dao.mybatis.entity.ThirdPartyInterfaceEntity;
+import me.zhengjie.dao.mybatis.entity.FileInfoEntity;
+import me.zhengjie.dao.mybatis.entity.FaceCompareEntity;
+import me.zhengjie.domain.notary.impl.NotaryDomainImpl;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
@@ -40,6 +44,7 @@ import java.util.List;
 public class AdminOrderController {
 
 	private final AdminOrderService adminOrderService;
+	private final NotaryDomainImpl notaryDomain;
 
 	/**
 	 * 公证订单 查询
@@ -251,8 +256,26 @@ public class AdminOrderController {
 	}
 
 	@RequestMapping("/getFaceCompareList")
-	public AppBaseResponse<List<ThirdPartyInterfaceEntity>> getFaceCompareList(@RequestBody FaceCompareReq thirdPartyReq){
+	public AppBaseResponse<List<FaceCompareEntity>> getFaceCompareList(@RequestBody FaceCompareReq thirdPartyReq){
 		return adminOrderService.getThird(thirdPartyReq);
 	}
 
+	@AnonymousPostMapping("upload")
+	public ResultCode upload(@RequestBody me.zhengjie.application.bank.controller.vo.CompareImageVo compareImageVo){
+		FileHandleVo fileHandleVo =  new FileHandleVo();
+		String base64 = compareImageVo.getBase64();
+		String filePath = FileUploadUtil.saveFaceImage(base64);
+
+
+		fileHandleVo.setFilePath(filePath);
+		fileHandleVo.setContentType("image/jpeg");
+		try {
+			fileHandleVo.setInputStream(FileUploadUtil.getInputStream(filePath));
+		} catch (Exception e) {
+			throw new RuntimeException(e);
+		}
+		FileInfoEntity fileInfo = notaryDomain.uploadFaceFile(fileHandleVo);
+		return ResultCode.SUCCESS;
+	}
+
 }

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

@@ -76,7 +76,7 @@ public interface AdminOrderService {
      */
     AppBaseResponse faceCompare(CompareImageDto compareImageDto);
 
-    AppBaseResponse<List<ThirdPartyInterfaceEntity>> getThird(FaceCompareReq thirdPartyReq);
+    AppBaseResponse<List<FaceCompareEntity>> getThird(FaceCompareReq thirdPartyReq);
 //
 //    /**
 //     * 查询全部

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

@@ -21,7 +21,7 @@ import me.zhengjie.base.util.StatusEnum.NotaryStatusEnum;
 import me.zhengjie.dao.mybatis.ContractOrderRepository;
 import me.zhengjie.dao.mybatis.ModelRepository;
 import me.zhengjie.dao.mybatis.OrderFileRepository;
-import me.zhengjie.dao.mybatis.ThirdPartyInterfaceRepository;
+import me.zhengjie.dao.mybatis.FaceCompareRepository;
 import me.zhengjie.dao.mybatis.entity.*;
 import me.zhengjie.dao.mybatis.mapper.*;
 import me.zhengjie.domain.img.CompareImageDomain;
@@ -44,7 +44,6 @@ import org.springframework.util.StringUtils;
 import javax.servlet.http.HttpServletResponse;
 import java.io.IOException;
 import java.text.ParseException;
-import java.text.SimpleDateFormat;
 import java.time.LocalDateTime;
 import java.util.*;
 import java.util.stream.Collectors;
@@ -117,7 +116,7 @@ public class AdminOrderServiceImpl implements AdminOrderService {
     @Autowired
     private DictDetailService dictDetailService;
     @Autowired
-    private ThirdPartyInterfaceRepository thirdPartyInterfaceRepository;
+    private FaceCompareRepository thirdPartyInterfaceRepository;
 
 
     @Override
@@ -390,8 +389,8 @@ public class AdminOrderServiceImpl implements AdminOrderService {
     @Override
     public AppBaseResponse getThird(FaceCompareReq req) {
         AppBaseResponse<List<FaceCompareRsp>> response = new AppBaseResponse<>();
-        IPage<ThirdPartyInterfaceEntity> page = new Page<>(req.getIndex(), req.getSize());
-        QueryWrapper<ThirdPartyInterfaceEntity> qw = new QueryWrapper<>();
+        IPage<FaceCompareEntity> page = new Page<>(req.getIndex(), req.getSize());
+        QueryWrapper<FaceCompareEntity> qw = new QueryWrapper<>();
         Integer result = req.getResult();
         String idCard = req.getIdCard();
         String name = req.getName();

eladmin-system/src/main/java/me/zhengjie/application/bank/controller/BankNotarizeController.java

@@ -10,7 +10,6 @@ import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
-import me.zhengjie.annotation.rest.AnonymousGetMapping;
 import me.zhengjie.annotation.rest.AnonymousPostMapping;
 import me.zhengjie.application.admin.service.SmsTemplateService;
 import me.zhengjie.application.bank.BaseController;
@@ -26,15 +25,13 @@ import me.zhengjie.base.util.BeanCopyUtils;
 import me.zhengjie.base.util.FileUploadUtil;
 import me.zhengjie.base.util.UUIDGenerator;
 import me.zhengjie.base.util.tencent.h5face.SdkTest;
-import me.zhengjie.dao.mybatis.ContractOrderRepository;
 import me.zhengjie.dao.mybatis.OrderFileRepository;
-import me.zhengjie.dao.mybatis.ThirdPartyInterfaceRepository;
+import me.zhengjie.dao.mybatis.FaceCompareRepository;
 import me.zhengjie.dao.mybatis.entity.OrderFileEntity;
-import me.zhengjie.dao.mybatis.entity.ThirdPartyInterfaceEntity;
+import me.zhengjie.dao.mybatis.entity.FaceCompareEntity;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.data.redis.core.RedisTemplate;
 import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
@@ -53,7 +50,7 @@ public class BankNotarizeController extends BaseController {
 	private final BankNotarizeService bankNotarizeService;
 	private final TencentHumanFaceVerify faceVerify;
 	private final SmsTemplateService smsTemplateService;
-	private final ThirdPartyInterfaceRepository thirdPartyInterfaceRepository;
+	private final FaceCompareRepository thirdPartyInterfaceRepository;
 	private final RedisTemplate<String, String> redisTemplate;
 
 	/**
@@ -244,9 +241,9 @@ public class BankNotarizeController extends BaseController {
 			return result;
 		}
 		//判断传入的当事人 是否做过人脸核身
-		QueryWrapper<ThirdPartyInterfaceEntity> thirdPartyInterfaceEntityQueryWrapper = new QueryWrapper<>();
+		QueryWrapper<FaceCompareEntity> thirdPartyInterfaceEntityQueryWrapper = new QueryWrapper<>();
 		thirdPartyInterfaceEntityQueryWrapper.eq("business_no",businessNo).eq("name",userName).eq("id_card",idCard).eq("type","face_compare");
-		List<ThirdPartyInterfaceEntity> list = thirdPartyInterfaceRepository.getList(thirdPartyInterfaceEntityQueryWrapper);
+		List<FaceCompareEntity> list = thirdPartyInterfaceRepository.getList(thirdPartyInterfaceEntityQueryWrapper);
 		if (CollectionUtil.isEmpty(list)){
 			return ResponseDTO.error(ResultCode.RESULT_DATA_NONE);
 		}

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

@@ -10,9 +10,8 @@ import java.io.IOException;
 import java.util.Base64;
 import java.util.HashMap;
 import java.util.Map;
-import java.util.Set;
 
-import me.zhengjie.dao.mybatis.entity.ThirdPartyInterfaceEntity;
+import me.zhengjie.dao.mybatis.entity.FaceCompareEntity;
 import org.apache.commons.httpclient.HttpClient;
 import org.apache.commons.httpclient.HttpException;
 import org.apache.commons.httpclient.HttpStatus;
@@ -64,9 +63,8 @@ public class JuheServiceUtil {
      * @param params 业务参数
      * @return String response
      */
-    public static ThirdPartyInterfaceEntity URLPost(String idCard, String realName, String base64) {
-        ThirdPartyInterfaceEntity thirdPartyInterfaceEntity = new ThirdPartyInterfaceEntity();
-        thirdPartyInterfaceEntity.setType("face_compare");
+    public static FaceCompareEntity URLPost(String idCard, String realName, String base64) {
+        FaceCompareEntity thirdPartyInterfaceEntity = new FaceCompareEntity();
         thirdPartyInterfaceEntity.setName(realName);
         thirdPartyInterfaceEntity.setIdCard(idCard);
         String response = EMPTY;
@@ -142,7 +140,7 @@ public class JuheServiceUtil {
             params.put("realname", realName);
             params.put("image", base64);
             params.put("key", KEY_CODE);
-            ThirdPartyInterfaceEntity thirdPartyInterfaceEntity = JuheServiceUtil.URLPost(idCard,realName,base64);
+            FaceCompareEntity thirdPartyInterfaceEntity = JuheServiceUtil.URLPost(idCard,realName,base64);
             System.out.println(thirdPartyInterfaceEntity);
         } catch (Exception e) {
             e.printStackTrace();

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

@@ -1,6 +1,5 @@
 package me.zhengjie.dao.mybatis;
 
-import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import lombok.RequiredArgsConstructor;
@@ -8,9 +7,9 @@ import me.zhengjie.application.admin.controller.vo.FaceCompareRsp;
 import me.zhengjie.base.util.BeanCopyUtils;
 import me.zhengjie.base.util.FileUploadUtil;
 import me.zhengjie.dao.mybatis.entity.FileInfoEntity;
-import me.zhengjie.dao.mybatis.entity.ThirdPartyInterfaceEntity;
+import me.zhengjie.dao.mybatis.entity.FaceCompareEntity;
 import me.zhengjie.dao.mybatis.mapper.FileInfoMapper;
-import me.zhengjie.dao.mybatis.mapper.ThirdPartyInterfaceMapper;
+import me.zhengjie.dao.mybatis.mapper.FaceCompareMapper;
 import org.springframework.stereotype.Component;
 
 import java.util.ArrayList;
@@ -19,18 +18,18 @@ import java.util.List;
 
 @RequiredArgsConstructor
 @Component
-public class ThirdPartyInterfaceRepository {
-    private final ThirdPartyInterfaceMapper thirdPartyInterfaceMapper;
+public class FaceCompareRepository {
+    private final FaceCompareMapper thirdPartyInterfaceMapper;
     private final FileInfoMapper fileInfoMapper;
-    public void insert(ThirdPartyInterfaceEntity thirdPartyInterfaceEntity){
+    public void insert(FaceCompareEntity thirdPartyInterfaceEntity){
         thirdPartyInterfaceEntity.setCreateTime(new Date());
         thirdPartyInterfaceMapper.insert(thirdPartyInterfaceEntity);
     }
 
-    public List<FaceCompareRsp> page(IPage<ThirdPartyInterfaceEntity> page, QueryWrapper<ThirdPartyInterfaceEntity> qw) {
-        IPage<ThirdPartyInterfaceEntity> thirdPartyInterfaceEntityIPage = thirdPartyInterfaceMapper.selectPage(page,qw);
+    public List<FaceCompareRsp> page(IPage<FaceCompareEntity> page, QueryWrapper<FaceCompareEntity> qw) {
+        IPage<FaceCompareEntity> thirdPartyInterfaceEntityIPage = thirdPartyInterfaceMapper.selectPage(page,qw);
         List<FaceCompareRsp> faceCompareRspList = new ArrayList<>();
-        for (ThirdPartyInterfaceEntity thirdPartyInterfaceEntity:thirdPartyInterfaceEntityIPage.getRecords()){
+        for (FaceCompareEntity thirdPartyInterfaceEntity:thirdPartyInterfaceEntityIPage.getRecords()){
             FaceCompareRsp faceCompareRsp = BeanCopyUtils.convertObj(thirdPartyInterfaceEntity, FaceCompareRsp.class);
             String fileId = thirdPartyInterfaceEntity.getFileId();
             FileInfoEntity fileInfoEntity = fileInfoMapper.selectById(fileId);
@@ -51,11 +50,11 @@ public class ThirdPartyInterfaceRepository {
         return url;
     }
 
-    public ThirdPartyInterfaceEntity getOne(QueryWrapper<ThirdPartyInterfaceEntity> thirdPartyInterfaceEntityQueryWrapper) {
+    public FaceCompareEntity getOne(QueryWrapper<FaceCompareEntity> thirdPartyInterfaceEntityQueryWrapper) {
         return thirdPartyInterfaceMapper.selectOne(thirdPartyInterfaceEntityQueryWrapper);
     }
 
-    public List<ThirdPartyInterfaceEntity> getList(QueryWrapper<ThirdPartyInterfaceEntity> thirdPartyInterfaceEntityQueryWrapper) {
+    public List<FaceCompareEntity> getList(QueryWrapper<FaceCompareEntity> thirdPartyInterfaceEntityQueryWrapper) {
         return thirdPartyInterfaceMapper.selectList(thirdPartyInterfaceEntityQueryWrapper);
     }
 }

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

@@ -12,8 +12,8 @@ import java.util.Date;
 @AllArgsConstructor
 @NoArgsConstructor
 @Builder
-@TableName("third_party_interface")
-public class ThirdPartyInterfaceEntity {
+@TableName("face_compare")
+public class FaceCompareEntity {
     @TableId(value = "id",type = IdType.AUTO)
     private Long id;
     @TableField("business_no")
@@ -30,8 +30,6 @@ public class ThirdPartyInterfaceEntity {
     private String name;
     @TableField("id_card")
     private String idCard;
-    @TableField("type")
-    private String type;
     @TableField("file_id")
     private String fileId;
     @TableField(value = "create_time",fill = FieldFill.INSERT)

eladmin-system/src/main/java/me/zhengjie/dao/mybatis/mapper/ThirdPartyInterfaceMapper.java

@@ -1,12 +1,8 @@
 package me.zhengjie.dao.mybatis.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import me.zhengjie.dao.mybatis.entity.BankEntity;
-import me.zhengjie.dao.mybatis.entity.ThirdPartyInterfaceEntity;
+import me.zhengjie.dao.mybatis.entity.FaceCompareEntity;
 import org.apache.ibatis.annotations.Mapper;
-import org.apache.ibatis.annotations.Param;
-
-import java.util.List;
 
 /**
  * <p>
@@ -17,7 +13,7 @@ import java.util.List;
  * @since 2022-03-28
  */
 @Mapper
-public interface ThirdPartyInterfaceMapper extends BaseMapper<ThirdPartyInterfaceEntity> {
+public interface FaceCompareMapper extends BaseMapper<FaceCompareEntity> {
 
 
 }

eladmin-system/src/main/resources/mapper/ThirdPartyInterfaceMapper.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="me.zhengjie.dao.mybatis.mapper.ThirdPartyInterfaceMapper">
+<mapper namespace="me.zhengjie.dao.mybatis.mapper.FaceCompareMapper">
 
 </mapper>