暂存

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

@@ -8,6 +8,8 @@ import com.community.huiju.common.PicUtils;
 import com.google.common.collect.Maps;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.web.multipart.MultipartFile;
+
+import java.io.IOException;
 import java.util.HashMap;
 import java.util.Map;
 
@@ -416,6 +418,14 @@ public class HKOpenApi {
      * @return
      */
     public static String HKpersonGroupId(MultipartFile faceImg,Integer personId,Integer personNo,String personName,String cardNo) {
+        byte [] fileByte = new byte[0];
+        try {
+            fileByte = faceImg.getBytes();
+        } catch (IOException e) {
+            e.printStackTrace();
+        }
+        PicUtils.compressPicForScale(fileByte,99L,"x");
+
         String img = PicUtils.getImgStr(faceImg);
         String url = HKConstant.OPENAPI_IP_PORT_HTTP + HKConstant.ITF_UPDATE_USER;
         Map<String, Object> map = new HashMap<String, Object>();

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

@@ -35,8 +35,8 @@ public class FaceController {
                             @RequestParam(required = false) Integer otherUserID){
         ResponseBean responseBean = new ResponseBean();
         UserElement userElement = (UserElement) session.getAttribute(Constant.APP_USER_SESSION);
-        Integer userId = otherUserID != null ? otherUserID : userElement.getId();
-        responseBean = faceServicel.addFace(userId ,uploadFile);
+        Integer userId = userElement.getId();
+        responseBean = faceServicel.addFace(userId ,uploadFile,otherUserID);
         return responseBean;
     }
 
@@ -52,8 +52,8 @@ public class FaceController {
                                ){
         ResponseBean responseBean = new ResponseBean();
         UserElement userElement = (UserElement) session.getAttribute(Constant.APP_USER_SESSION);
-        Integer userId = otherUserID != null ? otherUserID : userElement.getId();
-         responseBean = faceServicel.upDateFace(userId,uploadFile);
+        Integer userId = userElement.getId();
+         responseBean = faceServicel.upDateFace(userId,uploadFile,otherUserID);
         return responseBean;
     }
 
@@ -65,8 +65,8 @@ public class FaceController {
     @RequestMapping(value = "/getUserIdFace",method = RequestMethod.GET)
     public Object getTaFaceByUserId(HttpSession session, @RequestParam(required = false) Integer otherUserID){
         UserElement userElement = (UserElement) session.getAttribute(Constant.APP_USER_SESSION);
-        Integer userId = otherUserID != null ? otherUserID : userElement.getId();
-        ResponseBean responseBean = faceServicel.getTaFaceByUserId(userId );
+        Integer userId = userElement.getId();
+        ResponseBean responseBean = faceServicel.getTaFaceByUserId(userId,otherUserID);
         return responseBean;
     }
 

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

@@ -133,7 +133,7 @@ public class UserController extends BaseController {
             @ApiImplicitParam(paramType = "body",dataType = "String",name = "parameter",value = "userName(租客或者家属 姓名) " +
                     "phone(租客或者家属 手机号) " +
                     "gender(租客或者家属 性别 1男 2女) " +
-                    "type(1家属 0租客)"),
+                    "type(2租客 3家属)"),
             @ApiImplicitParam(paramType = "header",dataType = "String",name = "X-Auth-Token",value = "Token"),
     })
     @RequestMapping(value = "/user/addTenantsOrDependents",method = RequestMethod.POST)

CODE/smart-community/app-api/src/main/java/com/community/huiju/dao/TaUserMapper.java

@@ -2,6 +2,7 @@ package com.community.huiju.dao;
 
 import com.community.huiju.model.TaUser;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
 import java.util.Map;
@@ -47,4 +48,12 @@ public interface TaUserMapper {
      * @return
      */
     List<TaUser> selectUserListByParentId(Integer parentId);
+
+    /**
+     * 判断当前用户的关联关系
+     * @param userId
+     * @param otherUserID
+     * @return
+     */
+    TaUser selectTaFaceParentId(@Param("id") Integer userId, @Param("otherUserID")Integer otherUserID);
 }

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

@@ -7,22 +7,26 @@ import org.springframework.web.multipart.MultipartFile;
 public interface FaceServiceI {
     /**
      * 添加人脸
-     * @param userId
+     * @param userId 登入人ID
+     *  @param  uploadFile
+     *  @param otherUserID 关联家属或者租客ID
      * @return
      */
-    ResponseBean addFace(Integer userId ,MultipartFile uploadFile);
+    ResponseBean addFace(Integer userId ,MultipartFile uploadFile,Integer otherUserID);
 
     /**
      * 更新当前人脸
-     * @param userId
+     * @param userId 登入人ID
+     *  @param  uploadFile
+     *  @param otherUserID 关联家属或者租客ID
      * @return
      */
-    ResponseBean upDateFace(Integer userId , MultipartFile uploadFile);
+    ResponseBean upDateFace(Integer userId ,MultipartFile uploadFile,Integer otherUserID);
 
     /**
      * 当前登入人是否有人脸信息
      * @param userId
      * @return
      */
-    ResponseBean getTaFaceByUserId(Integer userId);
+    ResponseBean getTaFaceByUserId(Integer userId,Integer otherUserID);
 }

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

@@ -71,7 +71,7 @@ public interface ITaUserService {
      * @param phone
      * @param gender
      * @param currentUserId 当前用户(业主)
-     * @param type 1家属 0租客
+     * @param type 2租客 3家属
      * @return
      */
     ResponseBean addTenantsOrDependents(String userName, String phone, String gender,Integer currentUserId,Integer type);

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

@@ -39,13 +39,18 @@ public class FaceServicelimpl implements FaceServiceI {
     private ImageServiceI imageServiceI;
 
     @Override
-    public ResponseBean addFace(Integer userid, MultipartFile uploadFile) {
+    public ResponseBean addFace(Integer userid, MultipartFile uploadFile,Integer otherUserID) {
         String faceImg = null;
         try {
             faceImg = imageServiceI.getImageUrl(uploadFile);
         } catch (IOException e) {
             e.printStackTrace();
         }
+        ResponseBean responseBean = getTaFaceParentId(userid,otherUserID);
+        if ("1".equals(responseBean.getCode())){
+            responseBean.getMessage();
+            return responseBean;
+        }
         TaUser user = taUserMapper.selectByPrimaryKey(userid);
         ResponseBean response = new ResponseBean();
         TaFace taFace = new TaFace();
@@ -55,7 +60,6 @@ public class FaceServicelimpl implements FaceServiceI {
         taFace.setUpdateUser(userid);
         taFace.setCreateDate(new Date());
         taFace.setUpdateDate(new Date());
-        //已登陆，身份未知，状态未知
 
         //判断身份是否为业主且状态为已停用
         TaSysRole sysRole = taSysRoleMapper.findRoleByUserId(userid);
@@ -111,7 +115,7 @@ public class FaceServicelimpl implements FaceServiceI {
     }
 
     @Override
-    public ResponseBean upDateFace(Integer userId, MultipartFile uploadFile) {
+    public ResponseBean upDateFace(Integer userId, MultipartFile uploadFile,Integer otherUserID) {
         boolean isA = false;
         String faceImg = null;
         try {
@@ -119,11 +123,13 @@ public class FaceServicelimpl implements FaceServiceI {
         } catch (IOException e) {
             e.printStackTrace();
         }
+        ResponseBean responseBean=getTaFaceParentId(userId,otherUserID);
+        if ("1".equals(responseBean.getCode())){
+            responseBean.getMessage();
+            return responseBean;
+        }
         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);
@@ -187,8 +193,13 @@ public class FaceServicelimpl implements FaceServiceI {
 
 
     @Override
-    public ResponseBean getTaFaceByUserId(Integer userId) {
+    public ResponseBean getTaFaceByUserId(Integer userId,Integer otherUserID) {
         ResponseBean responseBean= new ResponseBean();
+         responseBean=getTaFaceParentId(userId,otherUserID);
+        if ("1".equals(responseBean.getCode())){
+            responseBean.getMessage();
+            return responseBean;
+        }
         TaFace face = taFaceMapper.getByUserId(userId);
          if (null!= face){
             responseBean.addSuccess(face);
@@ -199,5 +210,17 @@ public class FaceServicelimpl implements FaceServiceI {
 
     }
 
+    /**
+     *判断当前用户下的人员关系（家属，租客）
+     */
+    public ResponseBean getTaFaceParentId(Integer userId,Integer otherUserID){
+       ResponseBean  responseBean= new ResponseBean();
+        TaUser user = taUserMapper.selectTaFaceParentId(userId,otherUserID);
+        if (null == user){
+            responseBean.addError("您输入的家属或租户ID有误");
+            return responseBean;
+        }
+        return responseBean;
+    }
 
 }

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

@@ -202,6 +202,19 @@ public class TaUserServiceImpl implements ITaUserService {
         addUserRole(2,response,user);
 
 
+        // 推送海康
+        /**
+         * 1.获取部门(比如 住户)
+         * 2.根据部门编号推送 海康
+         */
+        addUserAndOpenCard(response,user);
+
+        // 给用户添加 海康门禁权限
+        HKOpenApi.addAuthoritiesByPersonIds(String.valueOf(user.getHkUserId()));
+
+        // 下发门禁权限
+        HKOpenApi.downloadAuthorityByDeviceUuids();
+
 
         TaUserVO taUserVO = new TaUserVO();
         BeanUtils.copyProperties(user,taUserVO);
@@ -347,6 +360,12 @@ public class TaUserServiceImpl implements ITaUserService {
             return response;
         }
 
+        int tempType = type;
+        if (tempType != 2 && type != 3) {
+            response.addError("对不起! 您只能添加家属或者租客!");
+            return response;
+        }
+
         Map<String,Object> parUserLogin = Maps.newHashMap();
         parUserLogin.put("loginName",phone);
         TaUser parUser = taUserMapper.selectByLoginName(parUserLogin);
@@ -379,7 +398,6 @@ public class TaUserServiceImpl implements ITaUserService {
             response.addError("添加失败!");
             return response;
         }
-
         // 用户添加到本地库
         addUserRole(type,response,user);
 

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

@@ -308,4 +308,15 @@
     from ta_user
     where parent_id = #{parentId}
   </select>
+
+  <select id="selectTaFaceParentId" parameterType="java.lang.Integer" resultMap="BaseResultMap" >
+    select
+    <include refid="Base_Column_List" />
+    from ta_user
+    where id = #{id,jdbcType=INTEGER}
+    <if test="otherUserID != null" >
+     and parent_id = #{otherUserID}
+    </if>
+
+  </select>
 </mapper>

CODE/smart-community/zuul/src/main/resources/bootstrap.yml

@@ -19,6 +19,10 @@ spring:
 #    username: root
 #    password: DQ@0lW##kBb2+-jPZC1s$Ma0h5$9W((q
 #    driver-class-name: com.mysql.jdbc.Driver
+  servlet:
+    multipart:
+      max-file-size: 10MB
+      max-request-size: 50MB
 eureka:
   client:
     service-url: