合并分支

CODE/smart-community/app-api/src/main/java/com/community/huiju/controller/FaceController.java

@@ -41,7 +41,7 @@ public class FaceController {
     @ApiImplicitParams({
             @ApiImplicitParam(paramType = "header",dataType = "String",name = "X-Auth-Token",value = "Token")
     })
-    @RequestMapping(value = "/upDateFace",method = RequestMethod.PUT)
+    @RequestMapping(value = "/upDateFace",method = RequestMethod.POST)
     public Object upDateTaFace(HttpSession session,
                                @ApiParam(value = "file" ,required = true) MultipartFile uploadFile
                                ){

CODE/smart-community/app-api/src/main/java/com/community/huiju/service/impl/FaceServicelimpl.java

@@ -1,4 +1,5 @@
 package com.community.huiju.service.impl;
+
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.community.commom.ailiyun.AESDecode;
@@ -41,14 +42,14 @@ public class FaceServicelimpl implements FaceServiceI {
     private ImageServiceI imageServiceI;
 
     @Override
-    public ResponseBean addFace(Integer userid,MultipartFile uploadFile) {
+    public ResponseBean addFace(Integer userid, MultipartFile uploadFile) {
         String faceImg = null;
         try {
-            faceImg=imageServiceI.getImageUrl(uploadFile);
+            faceImg = imageServiceI.getImageUrl(uploadFile);
         } catch (IOException e) {
             e.printStackTrace();
         }
-        TaUser user=taUserMapper.selectByPrimaryKey(userid);
+        TaUser user = taUserMapper.selectByPrimaryKey(userid);
         ResponseBean response = new ResponseBean();
         TaFace taFace = new TaFace();
         taFace.setCommunityId(user.getCommunityId());
@@ -80,69 +81,69 @@ public class FaceServicelimpl implements FaceServiceI {
         //查询当前用户是否有人脸记录
         TaFace User = taFaceMapper.getByUserId(userid);
         if (null == User) {
-            boolean isA=true;
+            boolean isA = true;
             if (Constant.OWNER.equals(sysRole.getRoleName()) && "1".equals(taUser.getVerifyStatus())) {
-                ResponseBean resps=  checKout(faceImg,taFace,isA,uploadFile,userid);
+                ResponseBean resps = checKout(faceImg, taFace, isA, uploadFile, userid);
                 if (resps.getCode().equals("0")) {
                     taUser.setFaceStatus("1");
                     taUserMapper.updateByPrimaryKeySelective(taUser);
                     resps.addSuccess("图片录入成功");
-                }else {
+                } else {
                     resps.addError(resps.getMessage());
                 }
                 return resps;
             }
             //家属或者租客，已认证
             if (Constant.RELATION.equals(sysRole.getRoleName()) || Constant.TENANT.equals(sysRole.getDescription()) && "1".equals(taUser.getVerifyStatus())) {
-                ResponseBean resps=  checKout(faceImg,taFace,isA,uploadFile,userid);
+                ResponseBean resps = checKout(faceImg, taFace, isA, uploadFile, userid);
                 if (resps.getCode().equals("0")) {
                     taUser.setFaceStatus("1");
                     taUserMapper.updateByPrimaryKeySelective(taUser);
                     resps.addSuccess("图片录入成功");
-                }else {
+                } else {
                     resps.addError(resps.getMessage());
                 }
                 return resps;
             }
         }
+        response.addError("您的信息已存在");
         return response;
     }
 
     @Override
-    public ResponseBean upDateFace(Integer userId,MultipartFile uploadFile) {
-        boolean isA=false;
+    public ResponseBean upDateFace(Integer userId, MultipartFile uploadFile) {
+        boolean isA = false;
         String faceImg = null;
         try {
-            faceImg=imageServiceI.getImageUrl(uploadFile);
+            faceImg = imageServiceI.getImageUrl(uploadFile);
         } catch (IOException e) {
             e.printStackTrace();
         }
-        TaUser user=taUserMapper.selectByPrimaryKey(userId);
+        TaUser user = taUserMapper.selectByPrimaryKey(userId);
 
         TaFace taFace = new TaFace();
         taFace.setCommunityId(user.getCommunityId());
         taFace.setTaUserId(userId);
         taFace.setUpdateUser(userId);
         taFace.setUpdateDate(new Date());
-        ResponseBean resps= checKout(faceImg,taFace,isA,uploadFile,userId);
+        ResponseBean resps = checKout(faceImg, taFace, isA, uploadFile, userId);
         if (resps.getCode().equals("0")) {
 
 
             resps.addSuccess("图片修改成功");
-        }else {
+        } else {
             resps.addError(resps.getMessage());
         }
         return resps;
     }
-    
+
     /**
      * 人脸录入验证
      */
-    public ResponseBean checKout(String faceImg, TaFace taFace, boolean isA,MultipartFile uploadFile,Integer userId) {
+    public ResponseBean checKout(String faceImg, TaFace taFace, boolean isA, MultipartFile uploadFile, Integer userId) {
         ResponseBean responseBean = new ResponseBean();
-        Integer status=1;
-        TaUser user=taUserMapper.selectByPrimaryKey(userId);
-        if (user.getHkUserId()== null){
+        TaUser user = taUserMapper.selectByPrimaryKey(userId);
+        if (user.getHkUserId() == null) {
             responseBean.addError("人员Id不存在，无法录入");
             return responseBean;
         }
@@ -150,39 +151,38 @@ public class FaceServicelimpl implements FaceServiceI {
         AESDecode aesd = new AESDecode();
         String body = "{\"type\": \"0\", \"image_url\":\"" + faceImg + "\"}";
         try {
-             responseBean = aesd.send(body);
+            responseBean = aesd.send(body);
             JSONObject jsonObject = JSONObject.parseObject(responseBean.getMessage());
             Integer type = (Integer) jsonObject.get("errno");
-            Integer faceNum= (Integer) jsonObject.get("face_num");
+            Integer faceNum = (Integer) jsonObject.get("face_num");
 
             /*boolean isA为true进行添加，为false进行修改*/
-            if (0==type && 1==faceNum && isA) {
+            if (0 == type && 1 == faceNum && isA) {
 
                     /*推送海康*/
-                HKOpenApi.HKpersonGroupId( uploadFile, user.getHkUserId(), user.getId(), user.getUserName(),user.getHkCardNo());
+                HKOpenApi.HKpersonGroupId(uploadFile, user.getHkUserId(), user.getId(), user.getUserName(), user.getHkCardNo());
 
                 taFace.setFaceImg(faceImg);
                 taFaceMapper.insertSelective(taFace);
                 responseBean.addSuccess("操作成功");
-                HKOpenApi.downloadFaceAndFingerInfos( String .valueOf(user.getHkUserId()));
+                HKOpenApi.downloadFaceAndFingerInfos(String.valueOf(user.getHkUserId()));
                 return responseBean;
-            }else if (0==type && 1==faceNum && isA==false){
+            } else if (0 == type && 1 == faceNum && isA == false) {
 
-                HKOpenApi.HKpersonGroupId( uploadFile, user.getHkUserId(), user.getId(), user.getUserName(),user.getHkCardNo());
+                HKOpenApi.HKpersonGroupId(uploadFile, user.getHkUserId(), user.getId(), user.getUserName(), user.getHkCardNo());
 
                 taFace.setFaceImg(faceImg);
                 taFaceMapper.updateByPrimaryKeySelective(taFace);
                 responseBean.addSuccess("操作成功");
-                HKOpenApi.downloadFaceAndFingerInfos( String .valueOf(user.getHkUserId()));
+                HKOpenApi.downloadFaceAndFingerInfos(String.valueOf(user.getHkUserId()));
                 return responseBean;
             }
         } catch (Exception e) {
             e.printStackTrace();
         }
+        responseBean.addError("请录入正确图片");
         return responseBean;
     }
 
 
-
-
 }