合并

CODE/foreign-service/src/main/java/com/community/huiju/controller/FSController.java

@@ -24,10 +24,10 @@ public class FSController extends BaseController {
     @ApiImplicitParams({
             @ApiImplicitParam(dataTypeClass = String.class, paramType = "path", name = "carNo", value = "车牌号"),
             @ApiImplicitParam(dataTypeClass = Integer.class, paramType = "query", name = "communityId", value = "小区Id"),
-//            @ApiImplicitParam(dataTypeClass = String.class, paramType = "query", name = "appid", value = "appid"),
-//            @ApiImplicitParam(dataTypeClass = String.class, paramType = "query", name = "datetime", value = "时间戳"),
-//            @ApiImplicitParam(dataTypeClass = String.class, paramType = "query", name = "encrypt", value = "加密方式"),
-//            @ApiImplicitParam(dataTypeClass = String.class, paramType = "query", name = "sign", value = "签名"),
+            @ApiImplicitParam(dataTypeClass = String.class, paramType = "query", name = "appid", value = "appid"),
+            @ApiImplicitParam(dataTypeClass = String.class, paramType = "query", name = "datetime", value = "时间戳"),
+            @ApiImplicitParam(dataTypeClass = String.class, paramType = "query", name = "encrypt", value = "加密方式"),
+            @ApiImplicitParam(dataTypeClass = String.class, paramType = "query", name = "sign", value = "签名"),
     })
     public ResponseBean getParkInfoByCarNo(@PathVariable("carNo") String carNo,
                                            @RequestParam(value = "communityId") Integer communityId) {
@@ -41,10 +41,10 @@ public class FSController extends BaseController {
     @ApiImplicitParams({
             @ApiImplicitParam(dataTypeClass = String.class, paramType = "path", name = "carNo", value = "车牌号"),
             @ApiImplicitParam(dataTypeClass = Integer.class, paramType = "query", name = "communityId", value = "小区Id"),
-//            @ApiImplicitParam(dataTypeClass = String.class, paramType = "query", name = "appid", value = "appid"),
-//            @ApiImplicitParam(dataTypeClass = String.class, paramType = "query", name = "datetime", value = "时间戳"),
-//            @ApiImplicitParam(dataTypeClass = String.class, paramType = "query", name = "encrypt", value = "加密方式"),
-//            @ApiImplicitParam(dataTypeClass = String.class, paramType = "query", name = "sign", value = "签名"),
+            @ApiImplicitParam(dataTypeClass = String.class, paramType = "query", name = "appid", value = "appid"),
+            @ApiImplicitParam(dataTypeClass = String.class, paramType = "query", name = "datetime", value = "时间戳"),
+            @ApiImplicitParam(dataTypeClass = String.class, paramType = "query", name = "encrypt", value = "加密方式"),
+            @ApiImplicitParam(dataTypeClass = String.class, paramType = "query", name = "sign", value = "签名"),
     })
     public ResponseBean parkGetMonthCardInfoByCarNo(@PathVariable("carNo") String carNo,
                                                     @RequestParam(value = "communityId") Integer communityId) {
@@ -58,10 +58,10 @@ public class FSController extends BaseController {
     @ApiImplicitParams({
             @ApiImplicitParam(dataTypeClass = String.class, paramType = "path", name = "carNo", value = "车牌号"),
             @ApiImplicitParam(dataTypeClass = Integer.class, paramType = "query", name = "communityId", value = "小区Id"),
-//            @ApiImplicitParam(dataTypeClass = String.class, paramType = "query", name = "appid", value = "appid"),
-//            @ApiImplicitParam(dataTypeClass = String.class, paramType = "query", name = "datetime", value = "时间戳"),
-//            @ApiImplicitParam(dataTypeClass = String.class, paramType = "query", name = "encrypt", value = "加密方式"),
-//            @ApiImplicitParam(dataTypeClass = String.class, paramType = "query", name = "sign", value = "签名"),
+            @ApiImplicitParam(dataTypeClass = String.class, paramType = "query", name = "appid", value = "appid"),
+            @ApiImplicitParam(dataTypeClass = String.class, paramType = "query", name = "datetime", value = "时间戳"),
+            @ApiImplicitParam(dataTypeClass = String.class, paramType = "query", name = "encrypt", value = "加密方式"),
+            @ApiImplicitParam(dataTypeClass = String.class, paramType = "query", name = "sign", value = "签名"),
     })
     public ResponseBean parkGetTempCarPaymentInfoByCarNo(@PathVariable("carNo") String carNo,
                                                          @RequestParam(value = "communityId") Integer communityId) {

CODE/foreign-service/src/main/java/com/community/huiju/controller/TaFceController.java

@@ -32,10 +32,10 @@ public class TaFceController extends BaseController {
             @ApiImplicitParam(dataTypeClass = Integer.class, paramType = "form", name = "userId", value = "用户Id"),
             @ApiImplicitParam(dataTypeClass = Integer.class, paramType = "form", name = "userVerifyId", value = "房产审核Id"),
             @ApiImplicitParam(dataTypeClass = MultipartFile.class, paramType = "form", name = "uploadFile", value = "图片"),
-//            @ApiImplicitParam(dataTypeClass = String.class, paramType = "form", name = "appid", value = "appid"),
-//            @ApiImplicitParam(dataTypeClass = String.class, paramType = "form", name = "datetime", value = "时间戳"),
-//            @ApiImplicitParam(dataTypeClass = String.class, paramType = "form", name = "encrypt", value = "加密方式"),
-//            @ApiImplicitParam(dataTypeClass = String.class, paramType = "form", name = "sign", value = "签名"),
+            @ApiImplicitParam(dataTypeClass = String.class, paramType = "form", name = "appid", value = "appid"),
+            @ApiImplicitParam(dataTypeClass = String.class, paramType = "form", name = "datetime", value = "时间戳"),
+            @ApiImplicitParam(dataTypeClass = String.class, paramType = "form", name = "encrypt", value = "加密方式"),
+            @ApiImplicitParam(dataTypeClass = String.class, paramType = "form", name = "sign", value = "签名"),
     })
     public ResponseBean addFace(@RequestParam(value = "userId") Integer userId,
                                 @RequestParam(value = "userVerifyId") Integer userVerifyId,
@@ -54,10 +54,10 @@ public class TaFceController extends BaseController {
             @ApiImplicitParam(dataTypeClass = Integer.class, paramType = "form", name = "userId", value = "用户Id"),
             @ApiImplicitParam(dataTypeClass = Integer.class, paramType = "form", name = "userVerifyId", value = "房产审核Id"),
             @ApiImplicitParam(dataTypeClass = MultipartFile.class, paramType = "form", name = "uploadFile", value = "图片"),
-//            @ApiImplicitParam(dataTypeClass = String.class, paramType = "form", name = "appid", value = "appid"),
-//            @ApiImplicitParam(dataTypeClass = String.class, paramType = "form", name = "datetime", value = "时间戳"),
-//            @ApiImplicitParam(dataTypeClass = String.class, paramType = "form", name = "encrypt", value = "加密方式"),
-//            @ApiImplicitParam(dataTypeClass = String.class, paramType = "form", name = "sign", value = "签名"),
+            @ApiImplicitParam(dataTypeClass = String.class, paramType = "form", name = "appid", value = "appid"),
+            @ApiImplicitParam(dataTypeClass = String.class, paramType = "form", name = "datetime", value = "时间戳"),
+            @ApiImplicitParam(dataTypeClass = String.class, paramType = "form", name = "encrypt", value = "加密方式"),
+            @ApiImplicitParam(dataTypeClass = String.class, paramType = "form", name = "sign", value = "签名"),
     })
     public ResponseBean updateFace(@RequestParam(value = "userId") Integer userId,
                                 @RequestParam(value = "userVerifyId") Integer userVerifyId,
@@ -74,10 +74,10 @@ public class TaFceController extends BaseController {
     @ApiImplicitParams({
             @ApiImplicitParam(dataTypeClass = Integer.class, paramType = "form", name = "userId", value = "用户Id"),
             @ApiImplicitParam(dataTypeClass = Integer.class, paramType = "form", name = "userVerifyId", value = "房产审核Id"),
-//            @ApiImplicitParam(dataTypeClass = String.class, paramType = "form", name = "appid", value = "appid"),
-//            @ApiImplicitParam(dataTypeClass = String.class, paramType = "form", name = "datetime", value = "时间戳"),
-//            @ApiImplicitParam(dataTypeClass = String.class, paramType = "form", name = "encrypt", value = "加密方式"),
-//            @ApiImplicitParam(dataTypeClass = String.class, paramType = "form", name = "sign", value = "签名"),
+            @ApiImplicitParam(dataTypeClass = String.class, paramType = "form", name = "appid", value = "appid"),
+            @ApiImplicitParam(dataTypeClass = String.class, paramType = "form", name = "datetime", value = "时间戳"),
+            @ApiImplicitParam(dataTypeClass = String.class, paramType = "form", name = "encrypt", value = "加密方式"),
+            @ApiImplicitParam(dataTypeClass = String.class, paramType = "form", name = "sign", value = "签名"),
     })
     public ResponseBean deleteFace(@RequestParam(value = "userId") Integer userId,
                                    @RequestParam(value = "userVerifyId") Integer userVerifyId) {
@@ -94,10 +94,10 @@ public class TaFceController extends BaseController {
     @ApiImplicitParams({
             @ApiImplicitParam(dataTypeClass = Integer.class, paramType = "query", name = "userId", value = "用户Id"),
             @ApiImplicitParam(dataTypeClass = Integer.class, paramType = "query", name = "userVerifyId", value = "房产审核Id"),
-//            @ApiImplicitParam(dataTypeClass = String.class, paramType = "query", name = "appid", value = "appid"),
-//            @ApiImplicitParam(dataTypeClass = String.class, paramType = "query", name = "datetime", value = "时间戳"),
-//            @ApiImplicitParam(dataTypeClass = String.class, paramType = "query", name = "encrypt", value = "加密方式"),
-//            @ApiImplicitParam(dataTypeClass = String.class, paramType = "query", name = "sign", value = "签名"),
+            @ApiImplicitParam(dataTypeClass = String.class, paramType = "query", name = "appid", value = "appid"),
+            @ApiImplicitParam(dataTypeClass = String.class, paramType = "query", name = "datetime", value = "时间戳"),
+            @ApiImplicitParam(dataTypeClass = String.class, paramType = "query", name = "encrypt", value = "加密方式"),
+            @ApiImplicitParam(dataTypeClass = String.class, paramType = "query", name = "sign", value = "签名"),
     })
     public ResponseBean getTaFaceByUserId(@RequestParam(value = "userId") Integer userId,
                                    @RequestParam(value = "userVerifyId") Integer userVerifyId) {

CODE/foreign-service/src/main/java/com/community/huiju/controller/TaUserController.java

@@ -74,10 +74,10 @@ public class TaUserController extends BaseController {
     @ApiOperation(value = "根据用户ID查询", notes = "根据用户ID查询")
     @ApiImplicitParams({
             @ApiImplicitParam(dataTypeClass = Integer.class, paramType = "path", name = "userId", value = "用户id"),
-//            @ApiImplicitParam(dataTypeClass = String.class, paramType = "query", name = "appid", value = "appid"),
-//            @ApiImplicitParam(dataTypeClass = String.class, paramType = "query", name = "datetime", value = "时间戳"),
-//            @ApiImplicitParam(dataTypeClass = String.class, paramType = "query", name = "encrypt", value = "加密方式"),
-//            @ApiImplicitParam(dataTypeClass = String.class, paramType = "query", name = "sign", value = "签名"),
+            @ApiImplicitParam(dataTypeClass = String.class, paramType = "query", name = "appid", value = "appid"),
+            @ApiImplicitParam(dataTypeClass = String.class, paramType = "query", name = "datetime", value = "时间戳"),
+            @ApiImplicitParam(dataTypeClass = String.class, paramType = "query", name = "encrypt", value = "加密方式"),
+            @ApiImplicitParam(dataTypeClass = String.class, paramType = "query", name = "sign", value = "签名"),
     })
     public ResponseBean updateUser(@PathVariable(value = "userId") Integer userId){
         ResponseBean responseBean = iTaUserService.getTaUser(userId);

CODE/foreign-service/src/main/java/com/community/huiju/filter/SignFilter.java

@@ -29,7 +29,7 @@ import java.util.TreeMap;
  *
  * @author weiximei on 2019-05-17
  */
-//@Component
+@Component
 @Slf4j
 public class SignFilter implements Filter {
 

CODE/foreign-service/src/main/java/com/community/huiju/service/impl/HKServiceImpl.java

@@ -3,11 +3,10 @@ package com.community.huiju.service.impl;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.community.commom.constant.Constant;
-import com.community.commom.hk.HKOpenApi;
 import com.community.commom.mode.ResponseBean;
 import com.community.commom.uuid.IdGen;
+import com.community.commom.hk.HKOpenApi;
 import com.community.huiju.dao.*;
-import com.community.huiju.enums.ResponseErrorsMessages;
 import com.community.huiju.exception.WisdomException;
 import com.community.huiju.model.*;
 import com.community.huiju.service.IHKService;
@@ -15,6 +14,7 @@ import com.google.common.collect.Lists;
 import com.google.common.collect.Maps;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.collections.CollectionUtils;
+import org.apache.commons.lang.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -22,10 +22,7 @@ import org.springframework.transaction.annotation.Transactional;
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
 import java.time.LocalDate;
-import java.util.Arrays;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 import java.util.stream.Collectors;
 
 /**
@@ -53,6 +50,9 @@ public class HKServiceImpl implements IHKService {
     @Autowired
     private TaUserVerifyMapper taUserVerifyMapper;
 
+//    @Autowired
+//    private TaRemotelyDoorMapper taRemotelyDoorMapper;
+
     /**
      * 获取设备UUID
      * @param equipmentList
@@ -69,7 +69,7 @@ public class HKServiceImpl implements IHKService {
     }
 
     @Override
-    @Transactional(rollbackFor = Exception.class)
+    // @Transactional(rollbackFor = Exception.class)
     public ResponseBean pushPerson(String appUserId, Integer userVerifyId) {
         ResponseBean responseBean = new ResponseBean();
         TaUser user = taUserMapper.selectById(Integer.parseInt(appUserId));
@@ -93,15 +93,25 @@ public class HKServiceImpl implements IHKService {
             addUserAndOpenCard(responseBean, user, tpEquipmentTree);
         }
 
+        // 卡片操作
+        // 没有卡片就开卡
+        if (StringUtils.isBlank(user.getHkCardNo())) {
+
+            // 添加卡片
+            responseBean = addCards(user, tpEquipmentTree);
+
+            // 开卡
+            responseBean = openCard(user.getHkUserId(), Long.valueOf(user.getHkCardNo()), null,tpEquipmentTree);
+
+        }
+
+
 
         // 推送海康
 
         // 给用户添加 海康门禁权限
 
         List<TpEquipment> tpEquipments = tpEquipmentMapper.selectByCommunityIdAndUnitId(userVerify.getCommunityId(), userVerify.getUnitId(), 4);
-        if (CollectionUtils.isEmpty(tpEquipments)) {
-            throw new WisdomException(ResponseErrorsMessages.NOT_EQUIPMENT.getCode(), ResponseErrorsMessages.NOT_EQUIPMENT.getMsg());
-        }
         List<Map<String, Object>> equipmentUUID = getEquipmentUUID(tpEquipments);
         StringBuilder doorUuids = new StringBuilder();
         StringBuilder deviceUuids = new StringBuilder();
@@ -112,24 +122,28 @@ public class HKServiceImpl implements IHKService {
             deviceUuids.append(",");
         });
 
-        Map<String, Object> map = Maps.newHashMap();
-        map.put("personIds",String.valueOf(user.getHkUserId()));
-        map.put("doorUuids", doorUuids.substring(0, doorUuids.lastIndexOf(",")));
-        map.put("secret", tpEquipmentTree.getSecret());
-        map.put("appkey", tpEquipmentTree.getAppkey());
-        map.put("openapi_ip_port_http", tpEquipmentTree.getHttpServer());
-        HKOpenApi.addAuthoritiesByPersonIds(map);
+        if (org.apache.commons.lang3.StringUtils.isNotBlank(doorUuids)) {
+
+            Map<String, Object> map = Maps.newHashMap();
+            map.put("personIds",String.valueOf(user.getHkUserId()));
+            map.put("doorUuids", doorUuids.substring(0, doorUuids.lastIndexOf(",")));
+            map.put("secret", tpEquipmentTree.getSecret());
+            map.put("appkey", tpEquipmentTree.getAppkey());
+            map.put("openapi_ip_port_http", tpEquipmentTree.getHttpServer());
+            HKOpenApi.addAuthoritiesByPersonIds(map);
+
+            // 下发门禁权限
+            Map<String, Object> downloadAuthorityByPersonIdsMap = Maps.newHashMap();
+            downloadAuthorityByPersonIdsMap.put("personIds",String.valueOf(user.getHkUserId()));
+            downloadAuthorityByPersonIdsMap.put("doorUuids", doorUuids.substring(0, doorUuids.lastIndexOf(",")));
+            downloadAuthorityByPersonIdsMap.put("operateType",1);
+            downloadAuthorityByPersonIdsMap.put("includeFinger",1);
+            downloadAuthorityByPersonIdsMap.put("secret", tpEquipmentTree.getSecret());
+            downloadAuthorityByPersonIdsMap.put("appkey", tpEquipmentTree.getAppkey());
+            downloadAuthorityByPersonIdsMap.put("openapi_ip_port_http", tpEquipmentTree.getHttpServer());
+            HKOpenApi.downloadAuthorityByPersonIds(downloadAuthorityByPersonIdsMap);
 
-        // 下发门禁权限
-        Map<String, Object> downloadAuthorityByPersonIdsMap = Maps.newHashMap();
-        downloadAuthorityByPersonIdsMap.put("personIds",String.valueOf(user.getHkUserId()));
-        downloadAuthorityByPersonIdsMap.put("doorUuids", doorUuids.substring(0, doorUuids.lastIndexOf(",")));
-        downloadAuthorityByPersonIdsMap.put("operateType",1);
-        downloadAuthorityByPersonIdsMap.put("includeFinger",1);
-        downloadAuthorityByPersonIdsMap.put("secret", tpEquipmentTree.getSecret());
-        downloadAuthorityByPersonIdsMap.put("appkey", tpEquipmentTree.getAppkey());
-        downloadAuthorityByPersonIdsMap.put("openapi_ip_port_http", tpEquipmentTree.getHttpServer());
-        HKOpenApi.downloadAuthorityByPersonIds(downloadAuthorityByPersonIdsMap);
+        }
 
         //--------- 可视对讲 ----------
 
@@ -138,6 +152,7 @@ public class HKServiceImpl implements IHKService {
         addOutDoorAuthMap.put("personIds", Arrays.asList(user.getHkUserId()));
         addOutDoorAuthMap.put("secret", tpEquipmentTree.getSecret());
         addOutDoorAuthMap.put("appkey", tpEquipmentTree.getAppkey());
+        addOutDoorAuthMap.put("openapi_ip_port_http", tpEquipmentTree.getHttpServer());
 
         // 单元门口机
         List<TpEquipment> visualEquipments = tpEquipmentMapper.selectByCommunityIdAndUnitId(userVerify.getCommunityId(), userVerify.getUnitId(), 3);
@@ -168,7 +183,7 @@ public class HKServiceImpl implements IHKService {
 
     /**
      * 公共方法
-     * 添加人员, 开卡
+     * 添加人员
      *
      * @param response
      * @param user
@@ -179,15 +194,17 @@ public class HKServiceImpl implements IHKService {
         parDept.put("pageSize", 100);
         parDept.put("deptName", Constant.DEPT_RESIDENTS);
         parDept.put("openapi_ip_port_http", tpEquipmentTree.getHttpServer());
+        parDept.put("appkey", tpEquipmentTree.getAppkey());
+        parDept.put("secret", tpEquipmentTree.getSecret());
         // 部门UUID
-        String deptUuid = getDeptUUID(parDept);
+        //String deptUuid = getDeptUUID(parDept);
 
         // 添加人员
         Map<String, Object> parUser = Maps.newHashMap();
         parUser.put("personNo", user.getHkPersonNo());
         parUser.put("personName", user.getUserName());
         parUser.put("phoneNo", user.getLoginName());
-        parUser.put("deptUuid", deptUuid);
+        //parUser.put("deptUuid", deptUuid);
         parUser.put("secret", tpEquipmentTree.getSecret());
         parUser.put("appkey", tpEquipmentTree.getAppkey());
         parUser.put("openapi_ip_port_http", tpEquipmentTree.getHttpServer());
@@ -195,17 +212,13 @@ public class HKServiceImpl implements IHKService {
         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.selectById(user.getUserId());
-            tempUser.setHkUserId(personId);
-            tempUser.setHkCardNo(cardNo + "");
 
             user.setHkUserId(personId);
             // 存储海康人员ID
-            int row = taUserMapper.updateById(tempUser);
+            int row = taUserMapper.updateById(user);
             if (row > 0) {
                 response.addSuccess("操作成功!");
             } else {
@@ -213,10 +226,6 @@ public class HKServiceImpl implements IHKService {
                 throw new RuntimeException("数据库添加 家属/租客 人员失败!");
             }
 
-            // 开卡
-            List<String> cardAndPersonList = Lists.newArrayList();
-            cardAndPersonList.add(cardNo + "," + personId);
-            response = openCard(cardAndPersonList, null, tpEquipmentTree);
         } else {
             String errorMessage = String.valueOf(resultMap.get("errorMessage"));
             response.addError(errorMessage);
@@ -226,13 +235,46 @@ public class HKServiceImpl implements IHKService {
     }
 
     /**
-     * 批量开卡
+     * 添加卡片
+     * @return
+     */
+    public ResponseBean addCards(TaUser user, TpEquipmentTree tpEquipmentTree) {
+
+        ResponseBean response = new ResponseBean();
+
+        // 开卡 卡号
+        long cardNo = System.currentTimeMillis();
+
+        // 添加卡片
+        Map<String,Object> addCardsMap = new HashMap<>();
+        addCardsMap.put("secret", tpEquipmentTree.getSecret());
+        addCardsMap.put("appkey", tpEquipmentTree.getAppkey());
+        addCardsMap.put("openapi_ip_port_http", tpEquipmentTree.getHttpServer());
+        addCardsMap.put("startCardNo", cardNo);
+        addCardsMap.put("endCardNo", cardNo);
+        String addCardsJSON = HKOpenApi.addCards(addCardsMap);
+        JSONObject addCardsJsonObject = JSONObject.parseObject(addCardsJSON);
+        Integer addCardsResultCode = addCardsJsonObject.getInteger("errorCode");
+        if (0 != addCardsResultCode) {
+            response.addError("操作失败");
+            throw new RuntimeException(addCardsJsonObject.getString("errorMessage"));
+        }
+
+        // 卡片入库
+        user.setHkCardNo(cardNo + "");
+        taUserMapper.updateById(user);
+        return response;
+    }
+
+    /**
+     * 卡片开卡
      *
-     * @param cardIdAndHKUserID list.add("卡号,人员ID")
+     * @param personId 人员海康id
+     * @param cardNo 卡号
      * @param expirationTime    有效期为多少? 单位为 年
      * @return
      */
-    private ResponseBean openCard(List<String> cardIdAndHKUserID, Integer expirationTime, TpEquipmentTree tpEquipmentTree) {
+    private ResponseBean openCard(Integer personId, Long cardNo, Integer expirationTime, TpEquipmentTree tpEquipmentTree) {
         ResponseBean response = new ResponseBean();
 
         SimpleDateFormat formatter = new SimpleDateFormat("yyyy-MM-dd");
@@ -256,7 +298,8 @@ public class HKServiceImpl implements IHKService {
 
         // 开卡
         Map<String, Object> parOpenCard = Maps.newHashMap();
-        parOpenCard.put("cardAndPerson", cardIdAndHKUserID);
+        parOpenCard.put("personId", personId);
+        parOpenCard.put("cardNo", cardNo);
         parOpenCard.put("startTime", System.currentTimeMillis());
         parOpenCard.put("endTime", time);
         parOpenCard.put("secret", tpEquipmentTree.getSecret());
@@ -337,17 +380,17 @@ public class HKServiceImpl implements IHKService {
         // 单元门口机
         List<TpEquipment> tpEquipments = tpEquipmentMapper.selectByCommunityIdAndUnitId(userVerify.getCommunityId(), userVerify.getUnitId(), 3);
 
-         if (CollectionUtils.isEmpty(tpEquipments)) {
-             responseBean.addError("无设备信息!");
-             return responseBean;
-         }
+        if (CollectionUtils.isEmpty(tpEquipments)) {
+            responseBean.addError("无设备信息!");
+            return responseBean;
+        }
 
-         String str = "";
-         for (TpEquipment e : tpEquipments) {
-             TpConfiguration tpConfiguration = tpConfigurationMapper.selectById(e.getUuidId());
-             str += tpConfiguration.getConfigurationValue();
-             str += ",";
-         }
+        String str = "";
+        for (TpEquipment e : tpEquipments) {
+            TpConfiguration tpConfiguration = tpConfigurationMapper.selectById(e.getUuidId());
+            str += tpConfiguration.getConfigurationValue();
+            str += ",";
+        }
 
         // 查询设备编号
 
@@ -360,8 +403,17 @@ public class HKServiceImpl implements IHKService {
         JSONObject jsonObject = JSONObject.parseObject(data);
         int errorCode = jsonObject.getInteger("errorCode");
         if (errorCode == 0) {
-            responseBean.addSuccess("操作成功!");
-            return responseBean;
+//
+//            // 记录 远程开门次数
+//            TaRemotelyDoor taRemotelyDoor = new TaRemotelyDoor();
+//            taRemotelyDoor.setCommunityId(userVerify.getCommunityId());
+//            taRemotelyDoor.setTaUserVerifyId(userVerify.getUserId());
+//            taRemotelyDoor.setUnitId(userVerify.getUnitId());
+//            taRemotelyDoor.setCreateDate(new Date());
+//            taRemotelyDoorMapper.insertSelective(taRemotelyDoor);
+//
+//            responseBean.addSuccess("操作成功!");
+//            return responseBean;
         }
         responseBean.addError("操作失败!");
         return responseBean;

CODE/foreign-service/src/main/resources/application-dev.yml

@@ -4,4 +4,4 @@ spring:
       driver-class-name: com.mysql.jdbc.Driver
       username: root
       password: DQ@0lW##kBb2+-jPZC1s$Ma0h5$9W((q
-      url: jdbc:mysql://rm-uf6z3z6jq11x653d77o.mysql.rds.aliyuncs.com:3306/smart_community2.0?useUnicode=true&characterEncoding=UTF-8&allowMultiQueries=true
+      url: jdbc:mysql://rm-uf6z3z6jq11x653d77o.mysql.rds.aliyuncs.com:3306/smart_community2.2?useUnicode=true&characterEncoding=UTF-8&allowMultiQueries=true

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

@@ -80,12 +80,12 @@ public class MonitoringController extends BaseController {
     @RequestMapping(value = "/monitoring/hls/{communityId}",method = RequestMethod.GET)
     public ResponseBean getListHLS(@PathVariable("communityId") Integer communityId,
                                    @RequestParam(value = "pageNo",defaultValue = "1") Integer pageNo,
-                                   @RequestParam(value = "pageSize",defaultValue = "10") Integer pageSize,
+                                   @RequestParam(value = "pageSize",defaultValue = "100") Integer pageSize,
                                    HttpSession session) {
 
         ResponseBean responseBean = new ResponseBean();
         UserElement userElement = getUserElement(session);
-        responseBean = iMonitoringService.getHlsByCommunityId(userElement,communityId, pageNo, pageSize);
+        responseBean = iMonitoringService.getHlsByCommunityId(userElement,communityId, pageNo, 100);
         return responseBean;
     }
 

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

@@ -68,6 +68,11 @@ public class TaUserVerify {
      */
     private String verifyUrl;
 
+    /**
+     * 用户手机号
+     */
+    private String loginName;
+
     public Integer getId() {
         return id;
     }
@@ -251,4 +256,12 @@ public class TaUserVerify {
     public void setVerifyUrl(String verifyUrl) {
         this.verifyUrl = verifyUrl;
     }
+
+    public String getLoginName() {
+        return loginName;
+    }
+
+    public void setLoginName(String loginName) {
+        this.loginName = loginName;
+    }
 }

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

@@ -82,6 +82,11 @@ public class TpEquipment {
      */
     private String monitoringAddress;
 
+    /**
+     * 图片，比如： 监控封面图片
+     */
+    private String image;
+
     public Integer getId() {
         return id;
     }
@@ -257,4 +262,12 @@ public class TpEquipment {
     public void setUnitUuids(String unitUuids) {
         this.unitUuids = unitUuids;
     }
+
+    public String getImage() {
+        return image;
+    }
+
+    public void setImage(String image) {
+        this.image = image;
+    }
 }

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

@@ -16,6 +16,7 @@ import com.community.huiju.service.ImageServiceI;
 import com.google.common.collect.Maps;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.collections.CollectionUtils;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.HttpEntity;
 import org.springframework.http.HttpHeaders;
@@ -226,26 +227,30 @@ public class FaceServicelimpl implements FaceServiceI {
                 // 所有设备
                 // List<TpEquipment> tpEquipments = tpEquipmentMapper.selectByCommunityIdAndUnitId(communityId, unitId, 4);
                 List<TpEquipment> tpEquipments = tpEquipmentMapper.selectByCommunityIdAndUnitIdAndFace(communityId, unitId, 4);
-                if (CollectionUtils.isEmpty(tpEquipments)) {
-                    throw new WisdomException("未配置设备！");
+                if (CollectionUtils.isNotEmpty(tpEquipments)) {
+                    List<Map<String, Object>> equipmentUUID = getEquipmentUUID(tpEquipments);
+                    StringBuilder doorUuids = new StringBuilder();
+                    StringBuilder deviceUuids = new StringBuilder();
+                    equipmentUUID.forEach(e-> {
+                        doorUuids.append(e.get("doorUuid"));
+                        doorUuids.append(",");
+                        deviceUuids.append(e.get("deviceUuid"));
+                        deviceUuids.append(",");
+                    });
+                    if (StringUtils.isBlank(deviceUuids)) {
+                        responseBean.addError("系统未配置设备！");
+                        throw new WisdomException("系统未配置设备！");
+                    }
+                    Map<String,Object> map = Maps.newHashMap();
+                    map.put("appkey", tpEquipmentTree.getAppkey());
+                    map.put("opUserUuid", tpEquipmentTree.getOpUserUuid());
+                    map.put("personIds", String.valueOf(user.getHkUserId()));
+                    map.put("deviceUuids", deviceUuids.substring(0, deviceUuids.lastIndexOf(",")));
+                    map.put("type", 1);
+                    map.put("openapi_ip_port_http", tpEquipmentTree.getHttpServer());
+                    HKOpenApi.downloadFaceAndFingerInfos(map);
                 }
-                List<Map<String, Object>> equipmentUUID = getEquipmentUUID(tpEquipments);
-                StringBuilder doorUuids = new StringBuilder();
-                StringBuilder deviceUuids = new StringBuilder();
-                equipmentUUID.forEach(e-> {
-                    doorUuids.append(e.get("doorUuid"));
-                    doorUuids.append(",");
-                    deviceUuids.append(e.get("deviceUuid"));
-                    deviceUuids.append(",");
-                });
-                Map<String,Object> map = Maps.newHashMap();
-                map.put("appkey", tpEquipmentTree.getAppkey());
-                map.put("opUserUuid", tpEquipmentTree.getOpUserUuid());
-                map.put("personIds", String.valueOf(user.getHkUserId()));
-                map.put("deviceUuids", deviceUuids.substring(0, deviceUuids.lastIndexOf(",")));
-                map.put("type", 1);
-                map.put("openapi_ip_port_http", tpEquipmentTree.getHttpServer());
-                HKOpenApi.downloadFaceAndFingerInfos(map);
+
 
                 //可视对讲时 指定人员人脸权限下载
                 List<Integer> userIdList = new ArrayList<>();

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

@@ -69,7 +69,7 @@ public class HKServiceImpl implements IHKService {
     }
 
     @Override
-    @Transactional(rollbackFor = Exception.class)
+    // @Transactional(rollbackFor = Exception.class)
     public ResponseBean pushPerson(String appUserId, Integer userVerifyId) {
         ResponseBean responseBean = new ResponseBean();
         TaUser user = taUserMapper.selectByPrimaryKey(Integer.parseInt(appUserId));
@@ -93,6 +93,19 @@ public class HKServiceImpl implements IHKService {
             addUserAndOpenCard(responseBean, user, tpEquipmentTree);
         }
 
+        // 卡片操作
+        // 没有卡片就开卡
+        if (StringUtils.isBlank(user.getHkCardNo())) {
+
+            // 添加卡片
+            responseBean = addCards(user, tpEquipmentTree);
+
+            // 开卡
+            responseBean = openCard(user.getHkUserId(), Long.valueOf(user.getHkCardNo()), null,tpEquipmentTree);
+
+        }
+
+
 
         // 推送海康
 
@@ -109,24 +122,28 @@ public class HKServiceImpl implements IHKService {
             deviceUuids.append(",");
         });
 
-        Map<String, Object> map = Maps.newHashMap();
-        map.put("personIds",String.valueOf(user.getHkUserId()));
-        map.put("doorUuids", doorUuids.substring(0, doorUuids.lastIndexOf(",")));
-        map.put("secret", tpEquipmentTree.getSecret());
-        map.put("appkey", tpEquipmentTree.getAppkey());
-        map.put("openapi_ip_port_http", tpEquipmentTree.getHttpServer());
-        HKOpenApi.addAuthoritiesByPersonIds(map);
+        if (org.apache.commons.lang3.StringUtils.isNotBlank(doorUuids)) {
+
+            Map<String, Object> map = Maps.newHashMap();
+            map.put("personIds",String.valueOf(user.getHkUserId()));
+            map.put("doorUuids", doorUuids.substring(0, doorUuids.lastIndexOf(",")));
+            map.put("secret", tpEquipmentTree.getSecret());
+            map.put("appkey", tpEquipmentTree.getAppkey());
+            map.put("openapi_ip_port_http", tpEquipmentTree.getHttpServer());
+            HKOpenApi.addAuthoritiesByPersonIds(map);
+
+            // 下发门禁权限
+            Map<String, Object> downloadAuthorityByPersonIdsMap = Maps.newHashMap();
+            downloadAuthorityByPersonIdsMap.put("personIds",String.valueOf(user.getHkUserId()));
+            downloadAuthorityByPersonIdsMap.put("doorUuids", doorUuids.substring(0, doorUuids.lastIndexOf(",")));
+            downloadAuthorityByPersonIdsMap.put("operateType",1);
+            downloadAuthorityByPersonIdsMap.put("includeFinger",1);
+            downloadAuthorityByPersonIdsMap.put("secret", tpEquipmentTree.getSecret());
+            downloadAuthorityByPersonIdsMap.put("appkey", tpEquipmentTree.getAppkey());
+            downloadAuthorityByPersonIdsMap.put("openapi_ip_port_http", tpEquipmentTree.getHttpServer());
+            HKOpenApi.downloadAuthorityByPersonIds(downloadAuthorityByPersonIdsMap);
 
-        // 下发门禁权限
-        Map<String, Object> downloadAuthorityByPersonIdsMap = Maps.newHashMap();
-        downloadAuthorityByPersonIdsMap.put("personIds",String.valueOf(user.getHkUserId()));
-        downloadAuthorityByPersonIdsMap.put("doorUuids", doorUuids.substring(0, doorUuids.lastIndexOf(",")));
-        downloadAuthorityByPersonIdsMap.put("operateType",1);
-        downloadAuthorityByPersonIdsMap.put("includeFinger",1);
-        downloadAuthorityByPersonIdsMap.put("secret", tpEquipmentTree.getSecret());
-        downloadAuthorityByPersonIdsMap.put("appkey", tpEquipmentTree.getAppkey());
-        downloadAuthorityByPersonIdsMap.put("openapi_ip_port_http", tpEquipmentTree.getHttpServer());
-        HKOpenApi.downloadAuthorityByPersonIds(downloadAuthorityByPersonIdsMap);
+        }
 
         //--------- 可视对讲 ----------
 
@@ -135,6 +152,7 @@ public class HKServiceImpl implements IHKService {
         addOutDoorAuthMap.put("personIds", Arrays.asList(user.getHkUserId()));
         addOutDoorAuthMap.put("secret", tpEquipmentTree.getSecret());
         addOutDoorAuthMap.put("appkey", tpEquipmentTree.getAppkey());
+        addOutDoorAuthMap.put("openapi_ip_port_http", tpEquipmentTree.getHttpServer());
 
         // 单元门口机
         List<TpEquipment> visualEquipments = tpEquipmentMapper.selectByCommunityIdAndUnitId(userVerify.getCommunityId(), userVerify.getUnitId(), 3);
@@ -165,7 +183,7 @@ public class HKServiceImpl implements IHKService {
 
     /**
      * 公共方法
-     * 添加人员, 开卡
+     * 添加人员
      *
      * @param response
      * @param user
@@ -176,15 +194,17 @@ public class HKServiceImpl implements IHKService {
         parDept.put("pageSize", 100);
         parDept.put("deptName", Constant.DEPT_RESIDENTS);
         parDept.put("openapi_ip_port_http", tpEquipmentTree.getHttpServer());
+        parDept.put("appkey", tpEquipmentTree.getAppkey());
+        parDept.put("secret", tpEquipmentTree.getSecret());
         // 部门UUID
-        String deptUuid = getDeptUUID(parDept);
+        //String deptUuid = getDeptUUID(parDept);
 
         // 添加人员
         Map<String, Object> parUser = Maps.newHashMap();
         parUser.put("personNo", user.getHkPersonNo());
         parUser.put("personName", user.getUserName());
         parUser.put("phoneNo", user.getLoginName());
-        parUser.put("deptUuid", deptUuid);
+        //parUser.put("deptUuid", deptUuid);
         parUser.put("secret", tpEquipmentTree.getSecret());
         parUser.put("appkey", tpEquipmentTree.getAppkey());
         parUser.put("openapi_ip_port_http", tpEquipmentTree.getHttpServer());
@@ -192,17 +212,13 @@ public class HKServiceImpl implements IHKService {
         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);
+            int row = taUserMapper.updateByPrimaryKeySelective(user);
             if (row > 0) {
                 response.addSuccess("操作成功!");
             } else {
@@ -210,10 +226,6 @@ public class HKServiceImpl implements IHKService {
                 throw new RuntimeException("数据库添加 家属/租客 人员失败!");
             }
 
-            // 开卡
-            List<String> cardAndPersonList = Lists.newArrayList();
-            cardAndPersonList.add(cardNo + "," + personId);
-            response = openCard(cardAndPersonList, null, tpEquipmentTree);
         } else {
             String errorMessage = String.valueOf(resultMap.get("errorMessage"));
             response.addError(errorMessage);
@@ -223,13 +235,46 @@ public class HKServiceImpl implements IHKService {
     }
 
     /**
-     * 批量开卡
+     * 添加卡片
+     * @return
+     */
+    public ResponseBean addCards(TaUser user, TpEquipmentTree tpEquipmentTree) {
+
+        ResponseBean response = new ResponseBean();
+
+        // 开卡 卡号
+        long cardNo = System.currentTimeMillis();
+
+        // 添加卡片
+        Map<String,Object> addCardsMap = new HashMap<>();
+        addCardsMap.put("secret", tpEquipmentTree.getSecret());
+        addCardsMap.put("appkey", tpEquipmentTree.getAppkey());
+        addCardsMap.put("openapi_ip_port_http", tpEquipmentTree.getHttpServer());
+        addCardsMap.put("startCardNo", cardNo);
+        addCardsMap.put("endCardNo", cardNo);
+        String addCardsJSON = HKOpenApi.addCards(addCardsMap);
+        JSONObject addCardsJsonObject = JSONObject.parseObject(addCardsJSON);
+        Integer addCardsResultCode = addCardsJsonObject.getInteger("errorCode");
+        if (0 != addCardsResultCode) {
+            response.addError("操作失败");
+            throw new RuntimeException(addCardsJsonObject.getString("errorMessage"));
+        }
+
+        // 卡片入库
+        user.setHkCardNo(cardNo + "");
+        taUserMapper.updateByPrimaryKeySelective(user);
+        return response;
+    }
+
+    /**
+     * 卡片开卡
      *
-     * @param cardIdAndHKUserID list.add("卡号,人员ID")
+     * @param personId 人员海康id
+     * @param cardNo 卡号
      * @param expirationTime    有效期为多少? 单位为 年
      * @return
      */
-    private ResponseBean openCard(List<String> cardIdAndHKUserID, Integer expirationTime, TpEquipmentTree tpEquipmentTree) {
+    private ResponseBean openCard(Integer personId, Long cardNo, Integer expirationTime, TpEquipmentTree tpEquipmentTree) {
         ResponseBean response = new ResponseBean();
 
         SimpleDateFormat formatter = new SimpleDateFormat("yyyy-MM-dd");
@@ -253,7 +298,8 @@ public class HKServiceImpl implements IHKService {
 
         // 开卡
         Map<String, Object> parOpenCard = Maps.newHashMap();
-        parOpenCard.put("cardAndPerson", cardIdAndHKUserID);
+        parOpenCard.put("personId", personId);
+        parOpenCard.put("cardNo", cardNo);
         parOpenCard.put("startTime", System.currentTimeMillis());
         parOpenCard.put("endTime", time);
         parOpenCard.put("secret", tpEquipmentTree.getSecret());

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

@@ -1,6 +1,7 @@
 package com.community.huiju.service.impl;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
+import com.community.commom.constant.Constant;
 import com.community.commom.hk.Digests;
 import com.community.commom.hk.HttpClientSSLUtils;
 import com.community.commom.mode.ResponseBean;
@@ -75,6 +76,9 @@ public class MonitoringServiceImpl implements IMonitoringService {
     @Autowired
     private TaRemotelyMonitorMapper taRemotelyMonitorMapper;
 
+    @Autowired
+    private TdImagesMapper tdImagesMapper;
+
     @Override
     public ResponseBean getByCommunityId(UserElement userElement, Integer communityId,Integer pageNo, Integer pageSize) {
 
@@ -217,6 +221,13 @@ public class MonitoringServiceImpl implements IMonitoringService {
         // TODO 过滤 rtsp 的流地址，后面拆表后，就可以将改代码移除
         tpEquipments = tpEquipments.stream().filter(e-> e.getMonitoringUrl().contains("m3u8")).collect(Collectors.toList());
 
+        tpEquipments.forEach(e-> {
+            List<TdImages> tdImages = tdImagesMapper.selectImages(e.getId(), Constant.MONITORING);
+            if (CollectionUtils.isNotEmpty(tdImages)) {
+                e.setImage(tdImages.get(0).getImageUrl());
+            }
+        });
+
         Map<String, Object> map = Maps.newHashMap();
         map.put("pageNo", page.getPageNum());
         map.put("pageSize", page.getPageSize());
@@ -260,7 +271,7 @@ public class MonitoringServiceImpl implements IMonitoringService {
         TpConfiguration tpConfiguration = tpConfigurationMapper.selectByPrimaryKey(tpEquipment.getUuidId());
 
         // 判断视频流地址，是否过期
-        if (System.currentTimeMillis() >= Long.valueOf(tpEquipment.getUnitUuids())) {
+        if (StringUtils.isBlank(tpEquipment.getOpUserUuid()) || System.currentTimeMillis() >= Long.valueOf(tpEquipment.getUnitUuids())) {
             // 开始更新视频Token
             Map<String,Object> queryMap = new HashMap<>();
             queryMap.put("appKey", tpEquipment.getAppkey());

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

@@ -272,7 +272,7 @@ public class TaUserServiceImpl implements ITaUserService {
         taUserVO.setUserVerifyList(taUserVerifies);
         // 无关联房产
         if (null == taUserVerifies || taUserVerifies.size() == 0) {
-            response.addError(UserVerifyEnum.NO_AUDIT_REAL_ESTATE.getMsg(), taUserVO, loginCodePerproties.getLoginCode().get(UserVerifyEnum.NO_AUDIT_REAL_ESTATE.getCode()) + "&token=" + token);
+            response.addError(UserVerifyEnum.NO_AUDIT_REAL_ESTATE.getMsg(), taUserVO, loginCodePerproties.getLoginCode().get(UserVerifyEnum.NO_AUDIT_REAL_ESTATE.getCode()) + "&token=" + token + "&phone=" + currentUser.getLoginName());
             return response;
         }
 

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

@@ -95,6 +95,8 @@ public class TaUserVerifyServicelmpl implements TaUserVerifyServicel {
         taUserVerify.setRoleName(taSysRole.getRoleName());
         ToCommunities toCommunities = toCommunitiesMapper.selectByPrimaryKey(taUserVerify.getCommunityId());
         taUserVerify.setCommunityName(toCommunities.getCommunityName());
+        TaUser currentUser = taUserMapper.selectByPrimaryKey(taUserVerify.getUserId());
+        taUserVerify.setLoginName(currentUser.getLoginName());
         if ("2".equals(taUserVerify.getVerifyStatus()) || "1".equals(taUserVerify.getVerifyStatus())) {
 
             // 开始查询 业主

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

@@ -259,7 +259,7 @@ public class WxLoginServiceImpl implements WxLoginServiceI {
 		TaUserVO userVO = new TaUserVO();
 		BeanTools.copyProperties(user, userVO);
 		// 刚注册的用户，跳转到绑定房产页面
-		response.addError(UserVerifyEnum.NO_AUDIT_REAL_ESTATE.getMsg(), userVO, loginCodePerproties.getLoginCode().get(UserVerifyEnum.NO_AUDIT_REAL_ESTATE.getCode()) + "&token=" + request.getSession().getId());
+		response.addError(UserVerifyEnum.NO_AUDIT_REAL_ESTATE.getMsg(), userVO, loginCodePerproties.getLoginCode().get(UserVerifyEnum.NO_AUDIT_REAL_ESTATE.getCode()) + "&token=" + request.getSession().getId() + "&phone=" + user.getLoginName());
 
 		/**
 		 * 这里是因为 手机号注册 和 社交登录的手机号注册，公用的一个接口，所以有 openid 的时候，表示是微信那边的社交登录

CODE/smart-community/community-common/src/main/java/com/community/commom/constant/Constant.java

@@ -69,6 +69,9 @@ public class Constant {
     /** 社交/图片 租贷类型**/
     public static final String TRANSACTION = "transaction";
 
+    /** 监控封面 图片类型 **/
+    public static final String MONITORING = "monitoring";
+
     /** 社交二手租赁类型**/
     public static final String LEASE = "lease";
 
@@ -241,4 +244,6 @@ public class Constant {
 
     /** 缴费类型 车缴费 **/
     public static final String PAY_TYPE_CAR = "car";
+
+
 }

CODE/smart-community/community-common/src/main/java/com/community/commom/hk/HKConstant.java

@@ -142,7 +142,7 @@ public class HKConstant {
     /**
      * 批量开卡
      */
-    public static final String ITF_OPEN_CARD = "/openapi/service/base/person/batchOpenCards";
+    public static final String batchOpenCards = "/openapi/service/base/person/batchOpenCards";
 
     /**
      * 根据人员ID集获取人员
@@ -201,4 +201,19 @@ public class HKConstant {
      */
     public static final String GET_DOORS = "/openapi/service/acs/res/getDoors";
 
+
+    /**
+     * 添加卡片
+     */
+    public static final String ADD_CARDS = "/openapi/service/base/card/addCards";
+
+    /**
+     * 卡片开卡
+     */
+    public static final String OPEN_CARD = "/openapi/service/base/card/openCard";
+
+    /**
+     * 可是对讲，分页获取
+     */
+    public static final String GETDOORDEVICES = "/openapi/service/vis/res/getDoorDevices";
 }

CODE/smart-community/community-common/src/main/java/com/community/commom/hk/HKOpenApi.java

@@ -123,9 +123,9 @@ public class HKOpenApi {
      * 其中参数 cardAndPerson 形式为“卡号，人员ID”，开卡数量不得超过50个，若没有该卡号，则添加一张新卡进行绑定 List<String>
      * @return
      */
-    public static String openCard(Map<String,Object> map){
+    public static String batchOpenCards(Map<String,Object> map){
         Map<String,Object> parMap = Maps.newHashMap();
-        String url = (map.get("openapi_ip_port_http") == null ? HKConstant.OPENAPI_IP_PORT_HTTP : map.get("openapi_ip_port_http")) + HKConstant.ITF_OPEN_CARD;
+        String url = (map.get("openapi_ip_port_http") == null ? HKConstant.OPENAPI_IP_PORT_HTTP : map.get("openapi_ip_port_http")) + HKConstant.batchOpenCards;
         //设置APPKEY
         parMap.put("appkey", map.get("appkey") == null?HKConstant.APPKEY:map.get("appkey"));
         //设置时间参数
@@ -194,7 +194,7 @@ public class HKOpenApi {
         //设置时间参数
         parMap.put("time", System.currentTimeMillis());
         parMap.put("pageNo",1);
-        parMap.put("pageSize",10);
+        parMap.put("pageSize",100);
         parMap.put("opUserUuid", map.get("opUserUuid") == null ? HKConstant.OP_USER_UUID : map.get("opUserUuid"));
         String params =  JSON.toJSONString(parMap);
         log.info("分页获取门禁点信息请求参数：{}", params);
@@ -691,6 +691,47 @@ public class HKOpenApi {
 
     }
 
+
+    /**
+     * 可视对讲 分页获取门口机
+     *
+     * pageNo 当前页码
+     *
+     * pageSize 每页数据记录数 建议400以下，不超过1000
+     *
+     * opUserUuid 操作用户UUID 详见opUserUuid的获取
+     *
+     *
+     * @param map
+     * @return
+     */
+    public static String getDoorDevices(Map<String, Object> map){
+
+        String url = (map.get("openapi_ip_port_http") == null ? HKConstant.OPENAPI_IP_PORT_HTTP : map.get("openapi_ip_port_http")) + HKConstant.GETDOORDEVICES;
+        Map<String, Object> parMap = new HashMap<>();
+        parMap.put("appkey", map.get("appkey") == null?HKConstant.APPKEY:map.get("appkey"));
+        parMap.put("time", System.currentTimeMillis());
+        parMap.put("pageNo", map.get("pageNo"));
+        parMap.put("pageSize", map.get("pageSize"));
+        parMap.put("opUserUuid", map.get("opUserUuid") == null?HKConstant.OP_USER_UUID:map.get("opUserUuid"));
+
+        String params = JSON.toJSONString(parMap);
+        log.info("可视对讲 分页获取门口机 请求参数：{}",params);
+
+        String data = null;
+        try {
+            data = HttpClientSSLUtils.doPost(url + "?token=" + Digests.buildToken(url + "?" + params, params,map.get("secret") == null ? HKConstant.SECRET : String.valueOf(map.get("secret"))), params);
+            log.info("可视对讲 分页获取门口机 返回结果：{}",data);
+        } catch (Exception e) {
+            e.printStackTrace();
+            log.error("可视对讲 分页获取门口机 请求失败：{}",e);
+            throw new RuntimeException("可视对讲 分页获取门口机失败!");
+        }
+        return data;
+
+    }
+
+
     /**
      * 可视对讲 异步反控开门【V2.8.2】
      *
@@ -743,14 +784,15 @@ public class HKOpenApi {
         map.put("personIds", personIds);
         map.put("longNums", longNums);
         String param = JSON.toJSONString(map);
-        log.info("人脸下发请求参数:" + param);
+        log.info("可是对讲人脸请求地址：{}", url);
+        log.info("可视对讲人脸下发请求参数:" + param);
         String data = null;
         try {
             data = HttpClientSSLUtils.doPost(url + "?token=" + Digests.buildToken(url + "?" + param, param,secret == null ? HKConstant.SECRET : secret), param);
-            log.info("可视对讲人脸权限下发：{}", data);
+            log.info("可视对讲人脸下发：{}", data);
         } catch (Exception e) {
             e.printStackTrace();
-            log.error("可视对讲人脸权限下发错误：{}", e);
+            log.error("可视对讲人脸下发错误：{}", e);
             throw new RuntimeException("下发错误!");
         }
         return null;
@@ -951,28 +993,28 @@ public class HKOpenApi {
     }
 
     public static void main(String[] args) {
-        // getDefaultUserUuid();
-        //Map<String,Object> parMap = Maps.newHashMap();
-        //String url = "http://pingtai.vipgz1.idcfengye.com" + HKConstant.ITF_MONITORY_POINT;
-        ////设置APPKEY
-        //parMap.put("appkey", "d30396a0");
-        ////设置时间参数
-        //parMap.put("time", System.currentTimeMillis());
-        //parMap.put("pageNo","1");
-        //parMap.put("pageSize","100");
-        //parMap.put("opUserUuid","5b2eb534696b11e89c2e438f92627767");
-        //parMap.put("unitUuids","1048576");
-        //String params =  JSON.toJSONString(parMap);
-        //log.info("获取 监控列表 请求参数：{}", params);
-        //String data = null;
-        //try {
-        //    data = HttpClientSSLUtils.doPost(url + "?token=" + Digests.buildToken(url + "?" + params, params, "6a939cf0b2914004a2755e70c6c96e02"), params);
-        //    log.info("获取 监控列表 请求返回结果：{}",data);
-        //} catch (Exception e) {
-        //    e.printStackTrace();
-        //    log.error("获取监控列表失败!",e);
-        //    throw new RuntimeException("获取监控列表失败!");
-        //}
+//         getDefaultUserUuid();
+        Map<String,Object> parMap = Maps.newHashMap();
+        String url = "http://qsp80.ngrok.jcjyhn.com:8888" + HKConstant.ITF_MONITORY_POINT;
+        //设置APPKEY
+        parMap.put("appkey", "d30396a0");
+        //设置时间参数
+        parMap.put("time", System.currentTimeMillis());
+        parMap.put("pageNo","1");
+        parMap.put("pageSize","100");
+        parMap.put("opUserUuid","5b2eb534696b11e89c2e438f92627767");
+        parMap.put("unitUuids","1048576");
+        String params =  JSON.toJSONString(parMap);
+        log.info("获取 监控列表 请求参数：{}", params);
+        String data = null;
+        try {
+            data = HttpClientSSLUtils.doPost(url + "?token=" + Digests.buildToken(url + "?" + params, params, "6a939cf0b2914004a2755e70c6c96e02"), params);
+            log.info("获取 监控列表 请求返回结果：{}",data);
+        } catch (Exception e) {
+            e.printStackTrace();
+            log.error("获取监控列表失败!",e);
+            throw new RuntimeException("获取监控列表失败!");
+        }
         //getDoorsByRegionUuids();
     }
     /**
@@ -1093,4 +1135,87 @@ public class HKOpenApi {
         return data;
     }
 
+
+    /**
+     * 添加卡片
+     *
+     * 关键参数
+     * startCardNo 起始卡号 String 为数字字符串，起始卡号和结束卡号位数保持一致；新增一张卡片起始和结束卡号要保持一致
+     *
+     * endCardNo 结束卡号 String 为数字字符串，起始卡号和结束卡号位数保持一致；新增一张卡片起始和结束卡号要保持一致
+     *
+     *
+     *
+     * @return
+     */
+    public static String addCards(Map<String,Object> map){
+        Map<String,Object> parMap = Maps.newHashMap();
+        String url = (map.get("openapi_ip_port_http") == null ? HKConstant.OPENAPI_IP_PORT_HTTP : map.get("openapi_ip_port_http")) + HKConstant.ADD_CARDS;
+        //设置APPKEY
+        parMap.put("appkey", map.get("appkey") == null?HKConstant.APPKEY:map.get("appkey"));
+        //设置时间参数
+        parMap.put("time", System.currentTimeMillis());
+        parMap.put("opUserUuid",map.get("opUserUuid") == null?HKConstant.OP_USER_UUID:map.get("opUserUuid"));
+        parMap.put("startCardNo",map.get("startCardNo"));
+        parMap.put("endCardNo",map.get("endCardNo"));
+        String params =  JSON.toJSONString(parMap);
+        log.info("添加卡片 请求参数：{}", params);
+        String data = null;
+        try {
+            data = HttpClientSSLUtils.doPost(url + "?token=" + Digests.buildToken(url + "?" + params, params,map.get("secret") == null ? HKConstant.SECRET : String.valueOf(map.get("secret"))), params);
+            log.info("添加卡片 请求返回结果：{}",data);
+        } catch (Exception e) {
+            e.printStackTrace();
+            log.error("添加卡片失败!",e);
+            throw new RuntimeException("添加卡片失败!");
+        }
+
+        return data;
+    }
+
+
+    /**
+     * 卡片开卡
+     *
+     * personId 人员ID Integer 该字段可通过【分页获取人员】接口获得
+     *
+     * cardNo 卡号 String 该字段可通过【分页获取卡片】接口获得
+     *
+     * subSystems 子系统编码集合 String 以“，”分割，详见子系统编码
+     *
+     * startTime 开卡开始有效期 Long 单位：毫秒；开卡开始有效期和开卡截止有效期要同时存在
+     *
+     * endTime 开卡截止有效期 Long 单位：毫秒；开卡开始有效期和开卡截止有效期要同时存在
+     *
+     * @return
+     */
+    public static String openCard(Map<String,Object> map){
+        Map<String,Object> parMap = Maps.newHashMap();
+        String url = (map.get("openapi_ip_port_http") == null ? HKConstant.OPENAPI_IP_PORT_HTTP : map.get("openapi_ip_port_http")) + HKConstant.OPEN_CARD;
+        //设置APPKEY
+        parMap.put("appkey", map.get("appkey") == null?HKConstant.APPKEY:map.get("appkey"));
+        //设置时间参数
+        parMap.put("time", System.currentTimeMillis());
+        parMap.put("opUserUuid",map.get("opUserUuid") == null?HKConstant.OP_USER_UUID:map.get("opUserUuid"));
+        parMap.put("personId",map.get("personId"));
+        parMap.put("cardNo",map.get("cardNo"));
+        parMap.put("startTime",map.get("startTime"));
+        parMap.put("endTime",map.get("endTime"));
+        parMap.put("subSystems","1048576,3145728,2097152,9437184,25165824,10485760");
+        String params =  JSON.toJSONString(parMap);
+        log.info("卡片开卡 请求参数：{}", params);
+        String data = null;
+        try {
+            data = HttpClientSSLUtils.doPost(url + "?token=" + Digests.buildToken(url + "?" + params, params,map.get("secret") == null ? HKConstant.SECRET : String.valueOf(map.get("secret"))), params);
+            log.info("卡片开卡 请求返回结果：{}",data);
+        } catch (Exception e) {
+            e.printStackTrace();
+            log.error("卡片开卡失败!",e);
+            throw new RuntimeException("卡片开卡失败!");
+        }
+
+        return data;
+    }
+
+
 }

CODE/smart-community/zuul/src/main/java/com/community/huiju/ZuulApplication.java

@@ -57,11 +57,11 @@ public class ZuulApplication {
     /**
      * 文件上传临时路径
      */
-    //@Bean
-    //public MultipartConfigElement multipartConfigElement() {
-    //    MultipartConfigFactory factory = new MultipartConfigFactory();
-    //    factory.setLocation("/tmp/smart-community");
-    //    return factory.createMultipartConfig();
-    //}
+    @Bean
+    public MultipartConfigElement multipartConfigElement() {
+        MultipartConfigFactory factory = new MultipartConfigFactory();
+        factory.setLocation("/tmp/smart-community");
+        return factory.createMultipartConfig();
+    }
 
 }

VUECODE/smart-operate-manage/src/views/login/index.vue

@@ -33,7 +33,7 @@
               v-model="loginForm.password"
               name="password"
               type="text"
-              auto-complete="on"
+              auto-complete="off"
               placeholder="请输入验证码"
               @keyup.enter.native="handleLogin"
             />

VUECODE/smart-property-manage/src/views/building/audit/index.vue

@@ -2,11 +2,11 @@
   <div id="root">
     <el-form :inline="true" :model="formInline" class="demo-form-inline">
       <el-dialog
-        title="提示"
         :visible.sync="dialogVisible"
+        title="提示"
         width="30%">
         <span><el-radio v-model="formInline.remark" label="不认识的人的手机号">不认识的人的手机号</el-radio>
-              <el-radio v-model="formInline.remark" label="其他原因需要沟通">其他原因需要沟通</el-radio>
+          <el-radio v-model="formInline.remark" label="其他原因需要沟通">其他原因需要沟通</el-radio>
         </span>
         <span slot="footer" class="dialog-footer">
           <el-button @click="dialogVisible = false">取 消</el-button>
@@ -116,7 +116,8 @@ export default {
       },
       total: 0, // 总数
       tableData: [], // 数据体
-      dialogVisible: false
+      dialogVisible: false,
+      fullscreen: true // 是否开启菊花转
     }
   },
   mounted() {
@@ -160,20 +161,22 @@ export default {
       })
     },
     // 展示弹框
-    passTheAudit(verifyId, vstatus){
+    passTheAudit(verifyId, vstatus) {
       this.formInline.userVerifyId = verifyId
       this.formInline.verifyStatus = vstatus
       this.dialogVisible = true
     },
     // 提交
-    submitAudit(){    
+    submitAudit() {
       this.userVerifyAudit()
     },
 
-    userVerifyAudit(verifyId, vstatus,isA) {
-      if(isA=='1'){
-      this.formInline.userVerifyId = verifyId
-      this.formInline.verifyStatus = vstatus
+    userVerifyAudit(verifyId, vstatus, isA) {
+      this.fullscreen = true
+      const loading = this.$loading({ fullscreen: this.fullscreen, background: 'rgba(0, 0, 0, 0.8)' })
+      if (isA === 1) {
+        this.formInline.userVerifyId = verifyId
+        this.formInline.verifyStatus = vstatus
       }
       this.$store.dispatch('UserVerifyAudit', this.formInline).then((res) => {
         const resCode = res.code
@@ -183,11 +186,14 @@ export default {
             type: 'success'
           })
           this.dialogVisible = false
+          loading.close()
           this.getData()
           return
         }
+        loading.close()
         this.$message.error(res.message)
       }).catch(() => {
+        loading.close()
         console.log('UserVerifyAudit error')
       })
     },

VUECODE/smart-property-manage/src/views/building/info/index.vue

@@ -133,7 +133,8 @@ export default {
         remark: ''
       },
       total: 0, // 数据总数
-      dialogVisible: false
+      dialogVisible: false,
+      fullscreen: true
       
     }
   },
@@ -190,6 +191,8 @@ export default {
     },
     // 审核结果提交
     submit(){
+      this.fullscreen = true
+      const loading = this.$loading({ fullscreen: this.fullscreen, background: 'rgba(0, 0, 0, 0.8)' })
       this.$store.dispatch('VerifyinfoAdd', this.listQuery).then((res) => {
         const resCode = res.code
         if (resCode === '0') {
@@ -197,12 +200,15 @@ export default {
             message: res.message,
             type: 'success'
           })
+          loading.close()
           this.$router.push({ name: 'building-index' })
         }
         if (resCode === '1') {
+          loading.close()
           this.$message.error(res.message)
         }
       }).catch(() => {
+        loading.close()
         console.log('UserVerifyAudit error')
       })
     }