合并本地分支

CODE/smart-community/app-api/src/main/java/com/community/huiju/common/PicUtils.java

@@ -3,11 +3,16 @@ package com.community.huiju.common;
 import net.coobird.thumbnailator.Thumbnails;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+import org.springframework.util.StringUtils;
 import org.springframework.web.multipart.MultipartFile;
 
+import javax.imageio.ImageIO;
+import java.awt.image.BufferedImage;
 import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
+import java.io.File;
 import java.io.IOException;
+import java.math.BigDecimal;
 
 /**
  * 图片压缩Utils
@@ -77,16 +82,16 @@ public class PicUtils {
      * @param fileBytes
      * @return
      */
-/*    public static String getImgStr(byte [] fileBytes) {
+      public static String getImgStr(byte [] fileBytes) {
         return new String(org.apache.commons.codec.binary.Base64.encodeBase64(fileBytes));
-    }*/
+    }
 
     /**
      * 图片进行Base64位编码
      * @param imgFile
      * @return
      */
-    public static String getImgStr(MultipartFile imgFile){
+   /* public static String getImgStr(MultipartFile imgFile){
         byte[] data = null;
         try
         {
@@ -97,6 +102,13 @@ public class PicUtils {
             e.printStackTrace();
         }
         return new String(org.apache.commons.codec.binary.Base64.encodeBase64(data));
-    }
+    }*/
+}
+
+
+
+
+
+
+
 
-}

CODE/smart-community/app-api/src/main/java/com/community/huiju/common/hk/HKOpenApi.java

@@ -387,7 +387,6 @@ public class HKOpenApi {
      * @return
      */
     public static String HKpersonGroupId(MultipartFile faceImg,Integer personNo,String personName){
-        String  img= PicUtils.getImgStr(faceImg);
         String url = HKConstant.OPENAPI_IP_PORT_HTTP + HKConstant.ITF_ADD_USER;
         Map<String, Object> map = new HashMap<String, Object>();
         map.put("appkey", HKConstant.APPKEY);
@@ -396,7 +395,6 @@ public class HKOpenApi {
         map.put("opUserUuid",HKConstant.OP_USER_UUID);
         map.put("personNo",personNo);
         map.put("personName",personName);
-        map.put("facePhoto",img);
         String params =  JSON.toJSONString(map);
         String data = null;
         try {
@@ -424,9 +422,9 @@ public class HKOpenApi {
         } catch (IOException e) {
             e.printStackTrace();
         }
-        PicUtils.compressPicForScale(fileByte,99L,"x");
+        byte[] imgs=PicUtils.compressPicForScale(fileByte,99L,"x");
 
-        String img = PicUtils.getImgStr(faceImg);
+        String img = PicUtils.getImgStr(imgs);
         String url = HKConstant.OPENAPI_IP_PORT_HTTP + HKConstant.ITF_UPDATE_USER;
         Map<String, Object> map = new HashMap<String, Object>();
         map.put("appkey", HKConstant.APPKEY);

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

@@ -164,9 +164,8 @@ public class TicketController extends BaseController {
     @ApiOperation(value = "物业，门卫，领导电话", notes = "物业，门卫，领导电话")
     @RequestMapping(value = "/allTpAnnouncementTel", method = RequestMethod.GET)
     public ResponseBean getTpAnnouncementTel() {
-        ResponseBean responseBean = new ResponseBean();
-        responseBean = agreementServicel.getTpAnnouncementTel();
-        return responseBean;
+        ResponseBean agreement = agreementServicel.getTpAnnouncementTel();
+        return agreement;
     }
 
     @ApiOperation(value = "修改 报修/投诉/联系单", notes = "修改 报修/投诉/联系单")

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

@@ -39,73 +39,29 @@ public class FaceServicelimpl implements FaceServiceI {
     private ImageServiceI imageServiceI;
 
     @Override
+    @Transactional(rollbackFor = Exception.class)
     public ResponseBean addFace(Integer userid, MultipartFile uploadFile,Integer otherUserID) {
-        String faceImg = null;
-        try {
-            faceImg = imageServiceI.getImageUrl(uploadFile);
-        } catch (IOException e) {
-            e.printStackTrace();
-        }
+        String faceImg =img(uploadFile);
+        /**判断是业主，还是结束或租客*/
         ResponseBean responseBean = getTaFaceParentId(userid,otherUserID);
         if ("1".equals(responseBean.getCode())){
             responseBean.getMessage();
             return responseBean;
         }
-        Integer id = otherUserID == null?userid:otherUserID;
-        TaUser user = taUserMapper.selectByPrimaryKey(id);
-        ResponseBean response = new ResponseBean();
-        TaFace taFace = new TaFace();
-        taFace.setCommunityId(user.getCommunityId());
-        taFace.setTaUserId(userid);
-        taFace.setCreateUser(userid);
-        taFace.setUpdateUser(id);
-        taFace.setCreateDate(new Date());
-        taFace.setUpdateDate(new Date());
-        //判断身份是否为业主且状态为已停用
-        TaSysRole sysRole = taSysRoleMapper.findRoleByUserId(userid);
-        TaUser taUser = taUserMapper.selectByPrimaryKey(userid);
-        if (null!=taUser && null!=sysRole
-                && Constant.INVALID.equals(taUser.getStatus())&& Constant.OWNER.equals(sysRole.getRoleName())) {
-            response.addError("9996", "您的身份已停用，请联系物业");
-            return response;
-        }
-        //身份为家属租客，状态为已停用
-        if (null!=taUser && null!=sysRole){
-                if (Constant.INVALID.equals(taUser.getStatus()) && (Constant.RELATION.equals(sysRole.getRoleName())) || Constant.TENANT.equals(sysRole.getRoleName())){
-                response.addError("9996", "您的身份已停用，请联系物业");
-                return response;
-            }
-        }
-        //查询当前用户是否有人脸记录
-        TaFace User = taFaceMapper.getByUserId(userid);
-        if (null == User) {
-            boolean isA = true;
-            if (Constant.OWNER.equals(sysRole.getRoleName()) && "1".equals(taUser.getVerifyStatus())) {
-                ResponseBean resps = checKout(faceImg, taFace, isA, uploadFile, userid);
-                if (resps.getCode().equals("0")) {
-                    taUser.setFaceStatus("1");
-                    taUserMapper.updateByPrimaryKeySelective(taUser);
-                    resps.addSuccess("图片录入成功");
-                } 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);
-                if (resps.getCode().equals("0")) {
-                    taUser.setFaceStatus("1");
-                    taUserMapper.updateByPrimaryKeySelective(taUser);
-                    resps.addSuccess("图片录入成功");
-                } else {
-                    resps.addError(resps.getMessage());
-                }
-                return resps;
-            }
-        }
-        response.addError("您的信息已存在");
-        return response;
+            Integer id = otherUserID == null?userid:otherUserID;
+            TaUser user = taUserMapper.selectByPrimaryKey(id);
+            TaFace taFace = new TaFace();
+            taFace.setFaceImg(faceImg);
+            taFace.setCommunityId(user.getCommunityId());
+            taFace.setTaUserId(id);
+            taFace.setCreateUser(userid);
+            taFace.setUpdateUser(id);
+            taFace.setCreateDate(new Date());
+            taFace.setUpdateDate(new Date());
+
+        /*验证身份*/
+        responseBean=addVerify( id,  uploadFile, otherUserID, faceImg, taFace) ;
+        return responseBean;
     }
 
     /**
@@ -116,21 +72,25 @@ public class FaceServicelimpl implements FaceServiceI {
      * @return
      */
     @Override
+    @Transactional(rollbackFor = Exception.class)
     public ResponseBean upDateFace(Integer userId, MultipartFile uploadFile,Integer otherUserID) {
         boolean isA = false;
-        String faceImg = null;
-        try {
-            faceImg = imageServiceI.getImageUrl(uploadFile);
-        } catch (IOException e) {
-            e.printStackTrace();
-        }
+        String faceImg =img(uploadFile);
         ResponseBean responseBean=getTaFaceParentId(userId,otherUserID);
         if ("1".equals(responseBean.getCode())){
                 responseBean.getMessage();
                 return responseBean;
-        }
+             }
             Integer id = otherUserID == null?userId:otherUserID;
+            //当前修改的id否存在
+             TaFace User = taFaceMapper.getByUserId(id);
+             if (null == User){
+                 responseBean.addError("您的信息不存在，请录入人脸");
+                 return responseBean;
+             }
             TaFace taFace = new TaFace();
+            taFace.setTaUserId(id);
+            taFace.setFaceImg(faceImg);
             taFace.setUpdateUser(userId);
             taFace.setUpdateDate(new Date());
             ResponseBean resps = checKout(faceImg, taFace, isA, uploadFile, id);
@@ -142,6 +102,9 @@ public class FaceServicelimpl implements FaceServiceI {
         return resps;
     }
 
+    /**
+     *验证图片是否为人脸，推送海康
+     */
     public ResponseBean checKout(String faceImg, TaFace taFace, boolean isA, MultipartFile uploadFile, Integer userId) {
         ResponseBean responseBean = new ResponseBean();
         TaUser user = taUserMapper.selectByPrimaryKey(userId);
@@ -157,31 +120,39 @@ public class FaceServicelimpl implements FaceServiceI {
                 JSONObject jsonObject = JSONObject.parseObject(responseBean.getMessage());
                 Integer type = (Integer) jsonObject.get("errno");
                 Integer faceNum = (Integer) jsonObject.get("face_num");
-            /*boolean isA为true进行添加，为false进行修改*/
+
+             /*推送海康*/
+            String data=HKOpenApi.HKpersonGroupId(uploadFile, user.getHkUserId(), user.getId(), user.getUserName(), user.getHkCardNo());
+              /*boolean isA为true进行添加，为false进行修改*/
             if (0 == type && 1 == faceNum && isA) {
-                /*推送海康*/
-                HKOpenApi.HKpersonGroupId(uploadFile, user.getHkUserId(), user.getId(), user.getUserName(), user.getHkCardNo());
-                taFace.setFaceImg(faceImg);
+                if (null == data){
+                    throw new RuntimeException("海康人脸推送失敗！");
+                }
                 taFaceMapper.insertSelective(taFace);
                 responseBean.addSuccess("操作成功");
+
                 HKOpenApi.downloadFaceAndFingerInfos(String.valueOf(user.getHkUserId()));
-                return responseBean;
-            } else if (0 == type && 1 == faceNum && isA == false) {
-                HKOpenApi.HKpersonGroupId(uploadFile, user.getHkUserId(), user.getId(), user.getUserName(), user.getHkCardNo());
-                taFace.setFaceImg(faceImg);
-                taFaceMapper.updateByPrimaryKeySelective(taFace);
-                responseBean.addSuccess("操作成功");
+            } else if (isA == false){
+                    if (null == data) {
+                        throw new RuntimeException("海康人脸推送失敗！");
+                    }
+                    taFaceMapper.updateByPrimaryKeySelective(taFace);
+                    responseBean.addSuccess("操作成功");
                 HKOpenApi.downloadFaceAndFingerInfos(String.valueOf(user.getHkUserId()));
-                return responseBean;
+                } else {
+                responseBean.addError("请录入正确图片");
             }
         } catch (Exception e) {
             e.printStackTrace();
+            log.error("海康人脸推送失敗！ {}",e);
+            throw new RuntimeException("海康人脸推送失敗！");
         }
-        responseBean.addError("请录入正确图片");
         return responseBean;
     }
 
-
+    /**
+     *获得用户，租客，家属，其中一种身份的信息
+     */
     @Override
     public ResponseBean getTaFaceByUserId(Integer userId,Integer otherUserID) {
         ResponseBean responseBean= new ResponseBean();
@@ -214,4 +185,71 @@ public class FaceServicelimpl implements FaceServiceI {
         return responseBean;
     }
 
+    /**
+     * 得到当前图片
+     */
+    private String img(MultipartFile uploadFile){
+        String faceImg = null;
+        try {
+            faceImg = imageServiceI.getImageUrl(uploadFile);
+        } catch (IOException e) {
+            e.printStackTrace();
+        }
+        return faceImg;
+    }
+
+    /**
+     *各种身份校验
+     */
+    public ResponseBean addVerify(Integer userid, MultipartFile uploadFile,Integer otherUserID,String faceImg,TaFace taFace) {
+        ResponseBean response = new ResponseBean();
+        TaSysRole sysRole = taSysRoleMapper.findRoleByUserId(userid);
+        TaUser taUser = taUserMapper.selectByPrimaryKey(userid);
+        if (null!=taUser && null!=sysRole
+                && Constant.INVALID.equals(taUser.getStatus())&& Constant.OWNER.equals(sysRole.getRoleName())) {
+            response.addError("9996", "您的身份已停用，请联系物业");
+            return response;
+        }
+        //身份为家属租客，状态为已停用
+        if (null!=taUser && null!=sysRole){
+            if (Constant.INVALID.equals(taUser.getStatus()) && (Constant.RELATION.equals(sysRole.getRoleName())) || Constant.TENANT.equals(sysRole.getRoleName())){
+                response.addError("9996", "您的身份已停用，请联系物业");
+                return response;
+            }
+        }
+        //查询当前用户是否有人脸记录
+        TaFace User = taFaceMapper.getByUserId(userid);
+        if (null == User) {
+            boolean isA = true;
+            if (Constant.OWNER.equals(sysRole.getRoleName()) && "1".equals(taUser.getVerifyStatus())) {
+                ResponseBean resps = checKout(faceImg, taFace, isA, uploadFile, userid);
+                if (resps.getCode().equals("0")) {
+                    taUser.setFaceStatus("1");
+                    taUserMapper.updateByPrimaryKeySelective(taUser);
+                    resps.addSuccess("图片录入成功");
+                } 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);
+                if (resps.getCode().equals("0")) {
+                    taUser.setFaceStatus("1");
+                    taUserMapper.updateByPrimaryKeySelective(taUser);
+                    resps.addSuccess("图片录入成功");
+                } else {
+                    resps.addError(resps.getMessage());
+                }
+                return resps;
+            }
+        }
+        response.addError("您的信息已存在");
+        return response;
+    }
+
+
 }
+
+

CODE/smart-community/app-api/src/main/resources/mapper/TaUserMapper.xml

@@ -313,9 +313,9 @@
     select
     <include refid="Base_Column_List" />
     from ta_user
-    where id = #{id,jdbcType=INTEGER}
+    where id = #{otherUserID,jdbcType=INTEGER}
     <if test="otherUserID != null" >
-     and parent_id = #{otherUserID}
+     and parent_id = #{id}
     </if>
 
   </select>