Browse Source

提交 修复人员权限创建

weiximei 6 years ago
parent
commit
e1910a4f55

+ 2
- 5
CODE/smart-community/app-api/src/main/java/com/community/huiju/service/IHKService.java View File

@@ -2,10 +2,7 @@ package com.community.huiju.service;
2 2
 
3 3
 import com.community.commom.mode.ResponseBean;
4 4
 import com.community.commom.session.UserElement;
5
-import com.community.huiju.model.TaUserHk;
6
-import com.community.huiju.model.TaUserVerify;
7
-import com.community.huiju.model.TpEquipmentTree;
8
-import com.community.huiju.model.TpUnitHkSetting;
5
+import com.community.huiju.model.*;
9 6
 
10 7
 /**
11 8
  * 海康 业务
@@ -45,5 +42,5 @@ public interface IHKService {
45 42
      * 下发 可视对讲 权限
46 43
      * @return
47 44
      */
48
-    ResponseBean visualIntercomPermissions(TpUnitHkSetting unitHkSetting, TpEquipmentTree tpEquipmentTree, TaUserHk taUserHk, TaUserVerify userVerify);
45
+    ResponseBean visualIntercomPermissions(TpUnitHkSetting unitHkSetting, TpEquipmentTree tpEquipmentTree, TaUserHk taUserHk, TaUserVerify userVerify, TaUser user);
49 46
 }

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

@@ -247,7 +247,7 @@ public class FaceServicelimpl implements FaceServiceI {
247 247
 
248 248
                 // 下发卡权限
249 249
                 // 下发可是对讲卡权限
250
-                ihkService.visualIntercomPermissions(unitHkSetting, tpEquipmentTree, taUserHk, userVerify);
250
+                ihkService.visualIntercomPermissions(unitHkSetting, tpEquipmentTree, taUserHk, userVerify, user);
251 251
 
252 252
                 if (isA) {
253 253
                     taFaceMapper.insertSelective(taFace);

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

@@ -473,7 +473,7 @@ public class HKServiceImpl implements IHKService {
473 473
     }
474 474
 
475 475
     @Override
476
-    public ResponseBean visualIntercomPermissions(TpUnitHkSetting unitHkSetting, TpEquipmentTree tpEquipmentTree, TaUserHk taUserHk, TaUserVerify userVerify) {
476
+    public ResponseBean visualIntercomPermissions(TpUnitHkSetting unitHkSetting, TpEquipmentTree tpEquipmentTree, TaUserHk taUserHk, TaUserVerify userVerify, TaUser user) {
477 477
 
478 478
         ResponseBean responseBean = new ResponseBean();
479 479
 
@@ -495,8 +495,8 @@ public class HKServiceImpl implements IHKService {
495 495
         //--------- 可视对讲 ----------
496 496
 
497 497
         Map<String,Object> addOutDoorAuthMap = Maps.newHashMap();
498
-        // app用户权限勿动
499
-        addOutDoorAuthMap.put("authName", unitHkSetting.getPermissionId());
498
+        // app用户权限勿动 unitHkSetting.getPermissionId()
499
+        addOutDoorAuthMap.put("authName", user.getUserName()+userVerify.getId());
500 500
         addOutDoorAuthMap.put("personIds", Arrays.asList(taUserHk.getHkUserId()));
501 501
         addOutDoorAuthMap.put("secret", tpEquipmentTree.getSecret());
502 502
         addOutDoorAuthMap.put("appkey", tpEquipmentTree.getAppkey());