Merge branch 'develop' of http://git.ycjcjy.com/fuxingfan/smartCommunity into develop

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

CODE/smart-community/app-api/src/main/java/com/community/huiju/common/code/cache/AppkeyCache.java

@@ -1,12 +1,9 @@
 package com.community.huiju.common.code.cache;
-
 import com.community.commom.constant.Constant;
 import com.google.common.cache.CacheBuilder;
 import com.google.common.cache.CacheLoader;
 import com.google.common.cache.LoadingCache;
 import lombok.extern.slf4j.Slf4j;
-
-import java.util.concurrent.ExecutionException;
 import java.util.concurrent.TimeUnit;
 
 /**

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

@@ -113,4 +113,11 @@ public class HKConstant {
      * 批量开卡
      */
     public static final String ITF_OPEN_CARD = "/openapi/service/base/person/batchOpenCards";
+
+    /**
+     * 根据人员ID集获取人员
+     */
+    public static final String ITF_GET_USER_ID = "/openapi/service/base/person/getPersonInfosByIds";
+
+
 }

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

@@ -2,13 +2,13 @@ package com.community.huiju.common.hk;
 
 import com.alibaba.fastjson.JSON;
 import com.community.commom.hk.HttpClientSSLUtils;
+import com.community.huiju.common.PicUtils;
 import com.google.common.collect.Maps;
 import lombok.extern.slf4j.Slf4j;
-import net.coobird.thumbnailator.Thumbnails;
 import org.springframework.web.multipart.MultipartFile;
-import java.io.*;
 import com.community.commom.hk.Digests;
 
+import java.util.HashMap;
 import java.util.Map;
 
 /**
@@ -337,7 +337,68 @@ public class HKOpenApi {
         
         return data;
     }
+    
+    /**
+     * 修改人脸
+     * faceImg 图片
+     * personId人员ID
+     * personNo 人员编号
+     * personName 名称
+     *  * cardNo 卡号
+     * @return
+     */
+    public static String HKpersonGroupId(MultipartFile faceImg,Integer personId,Integer personNo,String personName,String cardNo) {
+        String img = PicUtils.getImgStr(faceImg);
+        String url = HKConstant.OPENAPI_IP_PORT_HTTP + HKConstant.ITF_UPDATE_USER;
+        Map<String, Object> map = new HashMap<String, Object>();
+        map.put("appkey", HKConstant.APPKEY);
+        map.put("time", System.currentTimeMillis());
+        map.put("token", HKConstant.SECRET);
+        map.put("opUserUuid", HKConstant.OP_USER_UUID);
+        map.put("personId", personId);
+        map.put("personNo", personNo);
+        map.put("personName", personName);
+        map.put("facePhoto", img);
+        map.put("cardNo", cardNo);
+        String params = JSON.toJSONString(map);
+        String data = null;
+        try {
+            data = HttpClientSSLUtils.doPost(url + "?token=" + Digests.buildToken(url + "?" + params, params, HKConstant.SECRET), params);
+            log.info("修改人员 请求返回结果：{}",data);
+        } catch (Exception e) {
+            e.printStackTrace();
+            log.info("修改人员 请求返回结果：{}",data);
+        }
+        return data;
+    }
 
+    /**
+     * 根据人员ID集获取人员
+     * @return
+     */
+    public static String getPersonInfosByIds(String personIds){
+        Map<String,Object> parMap = Maps.newHashMap();
+        String url = HKConstant.OPENAPI_IP_PORT_HTTP + HKConstant.ITF_GET_USER_ID;
+        //设置APPKEY
+        parMap.put("appkey", HKConstant.APPKEY);
+        //设置时间参数
+        parMap.put("time", System.currentTimeMillis());
+        parMap.put("opUserUuid",HKConstant.OP_USER_UUID);
+        parMap.put("personIds",personIds);
+        String params =  JSON.toJSONString(parMap);
+        log.info("根据人员ID集获取人员 请求参数：{}", params);
+        String data = null;
+        try {
+            data = HttpClientSSLUtils.doPost(url + "?token=" + Digests.buildToken(url + "?" + params, params, HKConstant.SECRET), params);
+            log.info("根据人员ID集获取人员 请求返回结果：{}",data);
+        } catch (Exception e) {
+            e.printStackTrace();
+            log.error("根据人员ID集获取人员获取失败!",e);
+        }
+
+        return data;
+    }
+    
     public static void main(String[] args) {
     }
 }

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

@@ -1,6 +1,8 @@
 package com.community.huiju.controller;
 
+import com.community.commom.mode.ResponseBean;
 import com.community.huiju.service.ImageServiceI;
+import com.google.common.collect.Maps;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
@@ -11,6 +13,8 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 import org.springframework.web.multipart.MultipartFile;
 
+import java.util.Map;
+
 /**
  * @author weichaochao
  * @Title: ImageController
@@ -28,9 +32,12 @@ public class ImageController {
 
     @ApiOperation(value = "图片上传以及获取url", notes = "图片上传以及获取url")
     @PostMapping(value = "/uploadimage", consumes = "multipart/*", headers = "content-type=multipart/form-data")
-    public String uploadImgAndGetUrl(@ApiParam(value = "file" ,required = true) MultipartFile uploadFile) throws Exception {
-
+    public ResponseBean uploadImgAndGetUrl(@ApiParam(value = "file" ,required = true) MultipartFile uploadFile) throws Exception {
+        ResponseBean responseBean = new ResponseBean();
+        Map<String,Object> map = Maps.newHashMap();
         String url = imageService.getImageUrl(uploadFile);
-        return url;
+        map.put("url",url);
+        responseBean.addSuccess(map);
+        return responseBean;
     }
 }

CODE/smart-community/app-api/src/main/java/com/community/huiju/model/TaUser.java

@@ -42,6 +42,9 @@ public class TaUser {
     // 海康UserId
     private Integer hkUserId;
 
+    // 海康 卡片号
+    private String hkCardNo;
+
     public Integer getId() {
         return id;
     }
@@ -193,4 +196,12 @@ public class TaUser {
     public void setHkUserId(Integer hkUserId) {
         this.hkUserId = hkUserId;
     }
+
+    public String getHkCardNo() {
+        return hkCardNo;
+    }
+
+    public void setHkCardNo(String hkCardNo) {
+        this.hkCardNo = hkCardNo;
+    }
 }

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;
 import com.community.commom.constant.Constant;
@@ -19,6 +20,8 @@ import org.springframework.web.multipart.MultipartFile;
 
 import java.io.IOException;
 import java.util.Date;
+import java.util.HashMap;
+import java.util.Map;
 
 @Service("faceServicel")
 @Transactional
@@ -111,7 +114,7 @@ public class FaceServicelimpl implements FaceServiceI {
             e.printStackTrace();
         }
         TaUser user=taUserMapper.selectByPrimaryKey(userId);
-        ResponseBean responseBean = new ResponseBean();
+
         TaFace taFace = new TaFace();
         taFace.setCommunityId(user.getCommunityId());
         taFace.setTaUserId(userId);
@@ -121,11 +124,11 @@ public class FaceServicelimpl implements FaceServiceI {
         if (resps.getCode().equals("0")) {
 
 
-            responseBean.addSuccess("图片修改成功");
+            resps.addSuccess("图片修改成功");
         }else {
-            responseBean.addError(resps.getMessage());
+            resps.addError(resps.getMessage());
         }
-        return responseBean;
+        return resps;
     }
     
     /**
@@ -139,6 +142,7 @@ public class FaceServicelimpl implements FaceServiceI {
             responseBean.addError("人员Id不存在，无法录入");
             return responseBean;
         }
+
         AESDecode aesd = new AESDecode();
         String body = "{\"type\": \"0\", \"image_url\":\"" + faceImg + "\"}";
         try {
@@ -151,16 +155,16 @@ public class FaceServicelimpl implements FaceServiceI {
             if (0==type && 1==faceNum && isA) {
 
                     /*推送海康*/
-                String code=HKOpenApi.HKpersonGroupId( uploadFile, user.getHkUserId(), user.getId(), user.getUserName());
+                HKOpenApi.HKpersonGroupId( uploadFile, user.getHkUserId(), user.getId(), user.getUserName(),user.getHkCardNo());
 
-                    taFace.setFaceImg(faceImg);
-                    taFaceMapper.insertSelective(taFace);
-                    responseBean.addSuccess("操作成功");
+                taFace.setFaceImg(faceImg);
+                taFaceMapper.insertSelective(taFace);
+                responseBean.addSuccess("操作成功");
                 HKOpenApi.downloadFaceAndFingerInfos( String .valueOf(user.getHkUserId()));
-                    return responseBean;
+                return responseBean;
             }else if (0==type && 1==faceNum && isA==false){
 
-                String code=HKOpenApi.HKpersonGroupId( uploadFile, user.getHkUserId(), user.getId(), user.getUserName());
+                HKOpenApi.HKpersonGroupId( uploadFile, user.getHkUserId(), user.getId(), user.getUserName(),user.getHkCardNo());
 
                 taFace.setFaceImg(faceImg);
                 taFaceMapper.updateByPrimaryKeySelective(taFace);

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

@@ -324,7 +324,7 @@ public class TaUserServiceImpl implements ITaUserService {
 
         TaUser taUser = taUserMapper.selectByPrimaryKey(currentUserId);
         if (null == taUser) {
-            response.addError("此用户不存在!");
+            response.addError("当前用户不存在!");
             return response;
         }
         if (taUser.getVerifyStatus().equals("0") || taUser.getVerifyStatus().equals("2")) {
@@ -338,6 +338,14 @@ public class TaUserServiceImpl implements ITaUserService {
             return response;
         }
 
+        Map<String,Object> parUserLogin = Maps.newHashMap();
+        parUserLogin.put("loginName",phone);
+        TaUser parUser = taUserMapper.selectByLoginName(parUserLogin);
+        if (null != parUser) {
+            response.addError("手机号 "+phone + " 已存在!");
+            return response;
+        }
+
         TaUser user = new TaUser();
         user.setUserName(userName);
         user.setLoginName(phone);
@@ -410,10 +418,14 @@ public class TaUserServiceImpl implements ITaUserService {
         int errorCode = (int) resultMap.get("errorCode");
         if (errorCode == 0) {
             Map<String,Object> resultDataMap = (Map<String, Object>) resultMap.get("data");
+            // 开卡 卡号
+            long cardNo = System.currentTimeMillis();
             // 海康人员ID
             Integer personId = (Integer) resultDataMap.get("personId");
             TaUser tempUser = taUserMapper.selectByPrimaryKey(user.getId());
             tempUser.setHkUserId(personId);
+            tempUser.setHkCardNo(cardNo+"");
+
             user.setHkUserId(personId);
             // 存储海康人员ID
             int row = taUserMapper.updateByPrimaryKeySelective(tempUser);
@@ -426,7 +438,7 @@ public class TaUserServiceImpl implements ITaUserService {
 
             // 开卡
             List<String> cardAndPersonList = Lists.newArrayList();
-            cardAndPersonList.add(System.currentTimeMillis() + "," + personId);
+            cardAndPersonList.add(cardNo + "," + personId);
             response = openCard(cardAndPersonList,null);
         }else {
             String errorMessage = String.valueOf(resultMap.get("errorMessage"));

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

@@ -21,11 +21,12 @@
     <result column="update_user" property="updateUser" jdbcType="INTEGER" />
     <result column="update_date" property="updateDate" jdbcType="TIMESTAMP" />
     <result column="hk_user_id" property="hkUserId" javaType="INTEGER" />
+    <result column="hk_card_no" property="hkCardNo" />
   </resultMap>
   <sql id="Base_Column_List" >
     id, community_id, building_owner_info_id, head_portrait, user_name, login_name, login_password, 
     email, gender, status, remark, parent_id, accept_agreement_status, verify_status,
-    create_user, create_date, update_user, update_date,hk_user_id
+    create_user, create_date, update_user, update_date,hk_user_id,hk_card_no
   </sql>
   <select id="selectByPrimaryKey" resultMap="BaseResultMap" parameterType="java.lang.Integer" >
     select
@@ -43,7 +44,7 @@
       login_password, email, gender,
       status, remark, parent_id,
       accept_agreement_status, verify_status, create_user,
-      create_date, update_user, update_date, hk_user_id
+      create_date, update_user, update_date, hk_user_id,hk_card_no
       )
     values (#{id,jdbcType=INTEGER}, #{communityId,jdbcType=INTEGER}, #{buildingOwnerInfoId,jdbcType=INTEGER},
       #{headPortrait,jdbcType=VARCHAR}, #{userName,jdbcType=VARCHAR}, #{loginName,jdbcType=VARCHAR},
@@ -51,7 +52,7 @@
       #{status,jdbcType=CHAR}, #{remark,jdbcType=VARCHAR}, #{parentId,jdbcType=INTEGER},
       #{acceptAgreementStatus,jdbcType=CHAR}, #{verifyStatus,jdbcType=CHAR}, #{createUser,jdbcType=INTEGER},
       #{createDate,jdbcType=TIMESTAMP}, #{updateUser,jdbcType=INTEGER}, #{updateDate,jdbcType=TIMESTAMP},
-      #{hkUserId,jdbcType=INTEGER}
+      #{hkUserId,jdbcType=INTEGER},#{hkCardNo,jdbcType=VARCHAR}
       )
   </insert>
   <insert id="insertSelective" useGeneratedKeys="true" keyProperty="id" parameterType="com.community.huiju.model.TaUser" >
@@ -114,6 +115,9 @@
       <if test="hkUserId != null">
         hk_user_id,
       </if>
+      <if test="hkCardNo != null">
+        hk_card_no,
+      </if>
     </trim>
     <trim prefix="values (" suffix=")" suffixOverrides="," >
       <if test="id != null" >
@@ -173,6 +177,9 @@
       <if test="hkUserId != null">
         #{hkUserId,jdbcType=INTEGER},
       </if>
+      <if test="hkCardNo != null">
+        #{hkCardNo,jdbcType=VARCHAR},
+      </if>
     </trim>
   </insert>
   <update id="updateByPrimaryKeySelective" parameterType="com.community.huiju.model.TaUser" >
@@ -232,6 +239,9 @@
       <if test="hkUserId != null">
         hk_user_id = #{hkUserId,jdbcType=INTEGER},
       </if>
+      <if test="hkCardNo">
+        hk_card_no = #{hkCardNo,jdbcType=VARCHAR},
+      </if>
     </set>
     where id = #{id,jdbcType=INTEGER}
   </update>
@@ -254,7 +264,8 @@
       create_date = #{createDate,jdbcType=TIMESTAMP},
       update_user = #{updateUser,jdbcType=INTEGER},
       update_date = #{updateDate,jdbcType=TIMESTAMP},
-      hk_user_id = #{hkUserId,jdbcType=INTEGER}
+      hk_user_id = #{hkUserId,jdbcType=INTEGER},
+      hk_card_no = #{hkCardNo,jdbcType=VARCHAR}
     where id = #{id,jdbcType=INTEGER}
   </update>
 

VUECODE/smart-operate-manage/src/store/getters.js

@@ -4,6 +4,7 @@ const getters = {
   token: state => state.user.token,
   avatar: state => state.user.avatar,
   name: state => state.user.name,
-  roles: state => state.user.roles
+  roles: state => state.user.roles,
+  userData: state => state.user.userData
 }
 export default getters

VUECODE/smart-operate-manage/src/store/modules/user.js

@@ -6,7 +6,8 @@ const user = {
     token: getToken(),
     name: '',
     avatar: '',
-    roles: []
+    roles: [],
+    userData: []
   },
 
   mutations: {
@@ -21,6 +22,9 @@ const user = {
     },
     SET_ROLES: (state, roles) => {
       state.roles = roles
+    },
+    SET_USER_DATA: (state, userData) => {
+      state.userData = userData
     }
   },
 
@@ -52,6 +56,7 @@ const user = {
           }
           commit('SET_NAME', data.userName)
           commit('SET_AVATAR', data.loginName)
+          commit('SET_USER_DATA', data)
           resolve(response)
         }).catch(error => {
           reject(error)

VUECODE/smart-operate-manage/src/views/layout/components/Navbar.vue

@@ -4,17 +4,18 @@
     <breadcrumb />
     <el-dropdown class="avatar-container" trigger="click">
       <div class="avatar-wrapper">
-        <img :src="avatar+'?imageView2/1/w/80/h/80'" class="user-avatar">
+        <span>{{ userData.userName }}</span>
+        <img :src="userData.headPortrait" class="user-avatar">
         <i class="el-icon-caret-bottom"/>
       </div>
       <el-dropdown-menu slot="dropdown" class="user-dropdown">
         <router-link class="inlineBlock" to="/">
           <el-dropdown-item>
-            Home
+            首页
           </el-dropdown-item>
         </router-link>
         <el-dropdown-item divided>
-          <span style="display:block;" @click="logout">LogOut</span>
+          <span style="display:block;" @click="logout">注销</span>
         </el-dropdown-item>
       </el-dropdown-menu>
     </el-dropdown>
@@ -34,7 +35,8 @@ export default {
   computed: {
     ...mapGetters([
       'sidebar',
-      'avatar'
+      'avatar',
+      'userData'
     ])
   },
   methods: {