人脸识别接口更新

sp-core/sp-base/src/main/java/com/pj/utils/ht/AESUtil.java

@@ -205,7 +205,7 @@ public class AESUtil {
     public static void main(String[] args) {
         // AES支持三种长度的密钥：128位、192位、256位。
         // 代码中这种就是128位的加密密钥，16字节 * 8位/字节 = 128位。
-        String random = RandomStringUtils.random(16, "abcdefghijklmnopqrstuvwxyz1234567890");
+        String random = "klfksd78974s1d4f";
         System.out.println("随机key:" + random);
         System.out.println();
 
@@ -215,7 +215,7 @@ public class AESUtil {
         System.out.println();
 
         System.out.println("---------解密---------");
-        String decrypt = decrypt(aesResult, random);
+        String decrypt = decryptCBC("zo5yvhKGlGI4DFIbdwOa2eDjupWkiKvfWDGdNIbpX3WbDq4LsUhnTYh6aLPdj+w4l6OmVzLEjgh2/FC8MVmkYqCT6MZ401A8I8h7JYNXr+Gh5kU3vUCNEdOdxC8PcOKQHzkLvKnAzW+o2WlQujcXeLgg9PLNnIauyUi2v97ATSn+YldMsljiFb8Xe+/pxZSNNlEkw0cR/HwY1od5GLLvafWWjliy8/ZomRsO9XWcXA6TEtbhV8uhxlXPyFCRLPM0kCq7e5UyXqUYb5A5bApTBRF2v6uPqBcuSDVtOSCywsh+VCr7g2pTTdIcVVi98BaXYgTkiWDGswixZBOngHxkuex4I1MvUiibU22gzL2TdhRtZzqhfRmbiAVcAK6ktqkqneNQYTq2UpDPDsTM9V8ciA==", random);
         System.out.println("aes解密结果:" + decrypt);
         System.out.println();
 

sp-service/level-two-server/src/main/java/com/pj/tb_orders/TbOrdersController.java

@@ -38,37 +38,7 @@ public class TbOrdersController {
     @Autowired
     TbOrdersService tbOrdersService;
 
-    /**
-     * 增
-     */
-    @RequestMapping("add")
-    @SaCheckPermission(TbOrders.PERMISSION_CODE_ADD)
-    public AjaxJson add(TbOrders t) {
-        tbOrdersService.add(t);
-        t = tbOrdersService.getById(SP.publicMapper.getPrimarykey());
-        return AjaxJson.getSuccessData(t);
-    }
-
-    /**
-     * 删
-     */
-    @RequestMapping("delete")
-    @SaCheckPermission(TbOrders.PERMISSION_CODE_DEL)
-    public AjaxJson delete(Long id) {
-        tbOrdersService.delete(id);
-        return AjaxJson.getSuccess();
-    }
 
-    /**
-     * 删 - 根据id列表
-     */
-    @RequestMapping("deleteByIds")
-    @SaCheckPermission(TbOrders.PERMISSION_CODE_DEL)
-    public AjaxJson deleteByIds() {
-        List<Long> ids = SoMap.getRequestSoMap().getListByComma("ids", long.class);
-        int line = SP.publicMapper.deleteByIds(TbOrders.TABLE_NAME, ids);
-        return AjaxJson.getByLine(line);
-    }
 
     @RequestMapping("addOrderByResale")
     @SaCheckPermission(TbOrders.PERMISSION_CODE_EDIT_PRICE)
@@ -113,7 +83,7 @@ public class TbOrdersController {
         orders.setCreateName(pcLoginUserInfo.getLoginName());
         orders.setCreateTime(new Date());
 
-        this.add(orders);
+        tbOrdersService.add(orders);
 
         //修改一级市场边民订单转售状态为已转售
         boolean b = FeignFactory.levelOneServerInterface.updateResaleStatus(id);

sp-service/level-two-server/src/main/java/com/pj/tb_purchaser/TbPurchaserService.java

@@ -117,12 +117,12 @@ public class TbPurchaserService extends ServiceImpl<TbPurchaserMapper, TbPurchas
     /**
      * 收购商认证
      */
-    boolean identification(PurchaserParam purchaser,Long appUserId,Long fkId) throws ParseException {
-        TbPurchaser tbPurchaser=new TbPurchaser();
+    boolean identification(PurchaserParam purchaser, Long appUserId, Long fkId) throws ParseException {
+        TbPurchaser tbPurchaser = new TbPurchaser();
         tbPurchaser.setCreateTime(new Date())
-                ;
-        if (fkId!=null){
-            tbPurchaser=getById(fkId);
+        ;
+        if (fkId != null) {
+            tbPurchaser = getById(fkId);
             tbPurchaser.setJudgeContent("再次提交审核");
 
         }
@@ -135,10 +135,11 @@ public class TbPurchaserService extends ServiceImpl<TbPurchaserMapper, TbPurchas
                 .setIdCard(purchaser.getIdCard()).setType(purchaser.getType())
                 .setBusinessLicense(purchaser.getBusinessLicense())
                 .setBankAccount(purchaser.getBankAccount());
-        if (fkId==null){
-            FeignFactory.adminInterface.bindFkId(appUserId,tbPurchaser.getId());
+        boolean result = this.saveOrUpdate(tbPurchaser);
+        if (fkId == null) {
+            return FeignFactory.adminInterface.bindFkId(appUserId, tbPurchaser.getId());
         }
-        return this.saveOrUpdate(tbPurchaser);
+        return result;
 
     }
 

sp-service/sp-admin/src/main/java/com/pj/project/app_user/AppUserApiController.java

@@ -65,8 +65,8 @@ public class AppUserApiController {
         AppUser user = appUserService.getById(StpAPPUserUtil.getAPPLoginInfo().getLoginId());
         if (user.getUserType() == 1) {
             PeopleDto peopleDto = FeignFactory.levelOneServerInterface.getRpcById(user.getFkId());
-            so.put("groupId",peopleDto.getGroupId());
-            so.put("groupName",peopleDto.getGroupName());
+            so.put("groupId", peopleDto.getGroupId());
+            so.put("groupName", peopleDto.getGroupName());
         }
         so.put("auth", user.getAuth());
         so.put("face", user.getFace());
@@ -82,6 +82,13 @@ public class AppUserApiController {
         return AjaxJson.getSuccess();
     }
 
+    @PostMapping("faceImg")
+    public AjaxJson faceImg(String img, Integer type) {
+        if (img == null || img.isEmpty()) return AjaxJson.getError("人脸信息为空!");
+        appUserService.authFace(StpAPPUserUtil.getAPPLoginInfo().getLoginId(), img, type);
+        return AjaxJson.getSuccess();
+    }
+
     @PostMapping("faceLogin")
     public AjaxJson faceLogin(@RequestPart MultipartFile file) {
         return appUserService.faceLogin(file);

sp-service/sp-admin/src/main/java/com/pj/project/app_user/AppUserService.java

@@ -153,6 +153,9 @@ public class AppUserService extends ServiceImpl<AppUserMapper, AppUser> implemen
      * @return
      */
     AppUserVo getSelfInfo() {
+        if (StpAPPUserUtil.getAPPLoginInfo().getFk() == null) {
+            return null;
+        }
         //查询当前人
         AppUser appUser = appUserMapper.selectById(StpAPPUserUtil.getAPPLoginInfo().getLoginId());
         if (appUser == null) throw new ServiceException("当前用户信息异常!");
@@ -675,11 +678,23 @@ public class AppUserService extends ServiceImpl<AppUserMapper, AppUser> implemen
         faceFactory.handler().createPersonByBase(faceId, appUser.getName(), img);
     }
 
-    public void authFace(Long loginId, String img) {
-        boolean isLive = faceFactory.handler().checkIsLive(img);
-        if (!isLive) {
-            log.error("人脸注册为非活体人脸:{}", loginId);
-            // throw new AjaxError("非活体人脸");
+    public void authFace(Long loginId, String img, Integer type) {
+        if (type == 2) {
+            List<String> faceId = faceFactory.handler().faceSearch(img);
+            if (faceId.isEmpty()) {
+                throw new AjaxError("人脸不匹配");
+            }
+            AppUser appUser = null;
+            for (String id : faceId) {
+                AppUser checkUser = findByFaceId(id);
+                if (checkUser != null) {
+                    appUser = checkUser;
+                }
+            }
+            if (appUser == null) {
+                throw new AjaxError("人员信息未找到");
+            }
+            return;
         }
         String faceId = RandomUtil.randomString(32);
         AppUser appUser = this.getById(loginId);
@@ -693,10 +708,7 @@ public class AppUserService extends ServiceImpl<AppUserMapper, AppUser> implemen
         String img;
         try (InputStream is = file.getInputStream()) {
             img = Base64.encode(is);
-            boolean isLive = faceFactory.handler().checkIsLive(img);
-            if (!isLive) {
-                // throw new AjaxError("非活体人脸");
-            }
+
         } catch (IOException e) {
             throw new AjaxError("识别失败");
         }