修改 单元门和文案

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

@@ -59,15 +59,16 @@ public class HkController extends BaseController {
 		return responseBean;
 	}
 
-	@ApiOperation(value = "门口机开门", notes = "门口机开门")
+	@ApiOperation(value = "门口机(可视对讲)开门", notes = "门口机(可是对讲)开门")
 	@ApiImplicitParams({
-			@ApiImplicitParam(dataTypeClass = Integer.class, paramType = "header", name = "X-Auth-Token", value = "Token")
+			@ApiImplicitParam(dataTypeClass = Integer.class, paramType = "header", name = "X-Auth-Token", value = "Token"),
+			@ApiImplicitParam(dataTypeClass = Integer.class, paramType = "path", name = "id", value = "设备id"),
 	})
-	@RequestMapping(value = "/visual/syncControl", method = RequestMethod.POST)
-	public ResponseBean syncControl( HttpServletRequest request, HttpSession session){
+	@RequestMapping(value = "/visual/syncControl/{id}", method = RequestMethod.POST)
+	public ResponseBean syncControl(HttpServletRequest request, HttpSession session, @PathVariable("id") Integer equipmentId){
 		ResponseBean responseBean = new ResponseBean();
 		UserElement userElement = getUserElement(session);
-		responseBean = ihkService.syncControl(userElement.getUserVerifyId());
+		responseBean = ihkService.syncControl(userElement, equipmentId);
 		return responseBean;
 	}
 

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

@@ -66,8 +66,7 @@ public class VistorController extends BaseController {
         }
 
         UserElement userElement = (UserElement) session.getAttribute(Constant.APP_USER_SESSION);
-        Integer userId = userElement.getId();
-        responseBean = vistorServiceI.invateHis(communityId, userId);
+        responseBean = vistorServiceI.invateHis(userElement);
         return  responseBean;
     }
 

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

@@ -99,4 +99,15 @@ public interface TpEquipmentMapper {
     List<TpEquipment> selectByCommunityIdAndUnitIdAndFace(@Param("communityId") Integer communityId, @Param("unitId") Integer unitId, @Param("equipmentType") Integer equipmentType);
 
 
+    /**
+     * 根据小区更新 萤石云 token 和 token的有效期
+     *
+     * equipment_type 值为 5 表示门口机视频流
+     * @param communityId
+     * @param accessToken
+     * @param expireTime
+     * @return
+     */
+    @Select("update tp_equipment set op_user_uuid = #{accessToken} and unit_uuids = #{expireTime} where community_id = #{communityId} and equipment_type=5")
+    Integer updateYinShiYunByCommunityId(@Param("communityId") Integer communityId,@Param("accessToken") String accessToken, @Param("expireTime") String expireTime);
 }

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

@@ -2,6 +2,7 @@ package com.community.huiju.model;
 
 import java.util.Date;
 import java.util.List;
+import java.util.Map;
 
 public class TaVisitor {
     private Integer id;
@@ -36,6 +37,11 @@ public class TaVisitor {
 
     private List<String> carLicense;
 
+    /**
+     * 单元门集合
+     */
+    private List<Map<String, Object>> unitList;
+
     public Integer getId() {
         return id;
     }
@@ -164,4 +170,11 @@ public class TaVisitor {
         this.carLicense = carLicense;
     }
 
+    public List<Map<String, Object>> getUnitList() {
+        return unitList;
+    }
+
+    public void setUnitList(List<Map<String, Object>> unitList) {
+        this.unitList = unitList;
+    }
 }

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

@@ -27,6 +27,11 @@ public class TpConfiguration {
 
     private String deviceuuid;
 
+    /**
+     * 单元门展示名字
+     */
+    private String displayName;
+
     public Integer getId() {
         return id;
     }
@@ -122,4 +127,12 @@ public class TpConfiguration {
     public void setDeviceuuid(String deviceuuid) {
         this.deviceuuid = deviceuuid == null ? null : deviceuuid.trim();
     }
+
+    public String getDisplayName() {
+        return displayName;
+    }
+
+    public void setDisplayName(String displayName) {
+        this.displayName = displayName;
+    }
 }

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

@@ -1,6 +1,7 @@
 package com.community.huiju.service;
 
 import com.community.commom.mode.ResponseBean;
+import com.community.commom.session.UserElement;
 
 /**
  * 海康 业务
@@ -22,11 +23,11 @@ public interface IHKService {
     ResponseBean downloadAuthorityByDeviceUuids();
 
     /**
-     * 异步反控开门 (远程开门)
+     * 异步反控开门 (远程开门(可视对讲，门口机))
      *
-     * @param userVerifyId 审核ID
+     * @param equipmentId 可视对讲设备id
      * @return
      */
-    ResponseBean syncControl(Integer userVerifyId);
+    ResponseBean syncControl(UserElement userElement, Integer equipmentId);
 
 }

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

@@ -23,11 +23,10 @@ public interface TaVistorServiceI {
 
     /**
      * 访客邀请记录
-     * @param communityId
-     * @param userId
+     * @param userElement
      * @return
      */
-    ResponseBean invateHis(Integer communityId, Integer userId);
+    ResponseBean invateHis(UserElement userElement);
 
     /**
      * 查询 邀请访客车辆 是否开启

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

@@ -4,6 +4,7 @@ import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.community.commom.constant.Constant;
 import com.community.commom.mode.ResponseBean;
+import com.community.commom.session.UserElement;
 import com.community.commom.uuid.IdGen;
 import com.community.commom.hk.HKOpenApi;
 import com.community.huiju.dao.*;
@@ -209,7 +210,7 @@ public class HKServiceImpl implements IHKService {
         parUser.put("appkey", tpEquipmentTree.getAppkey());
         parUser.put("openapi_ip_port_http", tpEquipmentTree.getHttpServer());
         Map<String, Object> resultMap = JSONObject.parseObject(HKOpenApi.addUser(parUser), HashMap.class);
-        int errorCode = (int) resultMap.get("errorCode");
+        Integer errorCode = (Integer) resultMap.get("errorCode");
         if (errorCode == 0) {
             Map<String, Object> resultDataMap = (Map<String, Object>) resultMap.get("data");
 
@@ -369,33 +370,35 @@ public class HKServiceImpl implements IHKService {
     }
 
     @Override
-    public ResponseBean syncControl(Integer userVerifyId) {
+    public ResponseBean syncControl(UserElement userElement, Integer equipmentId) {
         // TODO 暂时只支持开单元门
 
         ResponseBean responseBean = new ResponseBean();
 
-        // 查询当前的房产
-        TaUserVerify userVerify = taUserVerifyMapper.selectByPrimaryKey(userVerifyId);
-        TpEquipmentTree tpEquipmentTree = tpEquipmentTreeMapper.selectByCommunityId(userVerify.getCommunityId());
         // 单元门口机
-        List<TpEquipment> tpEquipments = tpEquipmentMapper.selectByCommunityIdAndUnitId(userVerify.getCommunityId(), userVerify.getUnitId(), 3);
+        TpEquipment tpEquipment = tpEquipmentMapper.selectByPrimaryKey(equipmentId);
+        TpEquipmentTree tpEquipmentTree = tpEquipmentTreeMapper.selectByCommunityId(userElement.getCommunityId());
+        TaUserVerify userVerify = taUserVerifyMapper.selectByPrimaryKey(userElement.getId());
 
-         if (CollectionUtils.isEmpty(tpEquipments)) {
+        if (null == tpEquipment) {
              responseBean.addError("无设备信息!");
              return responseBean;
          }
 
-         String str = "";
-         for (TpEquipment e : tpEquipments) {
-             TpConfiguration tpConfiguration = tpConfigurationMapper.selectByPrimaryKey(e.getUuidId());
-             str += tpConfiguration.getConfigurationValue();
-             str += ",";
+         if ("3".equals(tpEquipment.getEquipmentType())) {
+             responseBean.addError("不是单元门设备!");
+             return responseBean;
          }
 
+         String str = "";
+
+         // uuid_id 是可是对讲设备
+         TpConfiguration tpConfiguration = tpConfigurationMapper.selectByPrimaryKey(tpEquipment.getUuidId());
+
         // 查询设备编号
 
         Map<String,Object> parMap = com.beust.jcommander.internal.Maps.newHashMap();
-        parMap.put("longNums", str);
+        parMap.put("longNums", tpConfiguration.getConfigurationValue());
         parMap.put("openapi_ip_port_http", tpEquipmentTree.getHttpServer());
         parMap.put("secret", tpEquipmentTree.getSecret());
         parMap.put("appkey", tpEquipmentTree.getAppkey());

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

@@ -250,6 +250,8 @@ public class MonitoringServiceImpl implements IMonitoringService {
 
         /**
          * tp_equipment 表
+         *      url_id 是可视对讲视频流id配置
+         *      uuid_id 是可视对讲视设备
          *      op_user_uuid 是监控的Token,
          *      unit_uuids 是token的有效时间
          *      appkey 是视频流的appKey
@@ -261,42 +263,52 @@ public class MonitoringServiceImpl implements IMonitoringService {
          *
          */
 
-        List<TpEquipment> tpEquipments = tpEquipmentMapper.selectByCommunityIdAndUnitId(userElement.getCommunityId(), userElement.getUnitId(), 5);
+        List<TpEquipment> tpEquipments = tpEquipmentMapper.selectByCommunityIdAndUnitId(userElement.getCommunityId(), userElement.getUnitId(), 3);
         if (CollectionUtils.isEmpty(tpEquipments)) {
             String address = toCommunities.getCommunityName() + tpUnit.getPhaseName() + tpUnit.getBuildingName() + tpUnit.getName();
             responseBean.addError("系统未配置单元门口机设备!", address, null);
             return responseBean;
         }
-        TpEquipment tpEquipment = tpEquipments.get(0);
-        TpConfiguration tpConfiguration = tpConfigurationMapper.selectByPrimaryKey(tpEquipment.getUuidId());
-
-        // 判断视频流地址，是否过期
-        if (StringUtils.isBlank(tpEquipment.getOpUserUuid()) || System.currentTimeMillis() >= Long.valueOf(tpEquipment.getUnitUuids())) {
-            // 开始更新视频Token
-            Map<String,Object> queryMap = new HashMap<>();
-            queryMap.put("appKey", tpEquipment.getAppkey());
-            queryMap.put("appSecret", tpEquipment.getSecret());
-            try {
-                String result = OkHttpRequestUtils.doPost(yinShiProperties.getVideoTokenUrl(), queryMap);
-                JSONObject jsonObject = JSONObject.parseObject(result).getJSONObject("data");
-                tpEquipment.setOpUserUuid(jsonObject.getString("accessToken"));
-                tpEquipment.setUnitUuids(String.valueOf(jsonObject.getLong("expireTime")));
-                tpEquipmentMapper.updateByPrimaryKeySelective(tpEquipment);
-            } catch (Exception e) {
-                throw new WisdomException("获取视频Token失败！");
+
+        List<Map<String,Object>> resultMap = tpEquipments.stream().map(e -> {
+            // 获取视频地址
+            TpConfiguration tpConfiguration = tpConfigurationMapper.selectByPrimaryKey(e.getUrlId());
+            // 判断视频流地址，是否过期
+            if (StringUtils.isBlank(e.getOpUserUuid()) || System.currentTimeMillis() >= Long.valueOf(e.getUnitUuids())) {
+                // 开始更新视频Token
+                Map<String,Object> queryMap = new HashMap<>();
+                queryMap.put("appKey", e.getAppkey());
+                queryMap.put("appSecret", e.getSecret());
+                try {
+                    String result = OkHttpRequestUtils.doPost(yinShiProperties.getVideoTokenUrl(), queryMap);
+                    JSONObject jsonObject = JSONObject.parseObject(result).getJSONObject("data");
+                    String accessToken = jsonObject.getString("accessToken");
+                    String expireTime = String.valueOf(jsonObject.getLong("expireTime"));
+                    // 根据小区更新所有的门口机的萤石云 token, token有效期
+                    tpEquipmentMapper.updateYinShiYunByCommunityId(userElement.getCommunityId(), accessToken, expireTime);
+                } catch (Exception exception) {
+                    throw new WisdomException("获取视频Token失败！");
+                }
+
             }
 
-        }
+            Map<String,Object> map = new HashMap<>();
+            map.put("equipmentsId", e.getId());
+            // 流程视频流地址
+            map.put("url", tpConfiguration.getConfigurationValue());
+            // 高清视频流地址
+            map.put("url_high", tpConfiguration.getKey());
+            map.put("address", toCommunities.getCommunityName() + tpUnit.getPhaseName() + tpUnit.getBuildingName() + tpUnit.getName());
+            // 门口机位置(可视对讲) ,例如：东门
+            map.put("displayName", tpConfiguration.getDisplayName());
+            map.put("token", e.getOpUserUuid());
+
+            return map;
+
+        }).collect(Collectors.toList());
 
 
-        Map<String,Object> map = new HashMap<>();
-        // 流程视频流地址
-        map.put("url", tpConfiguration.getConfigurationValue());
-        // 高清视频流地址
-        map.put("url_high", tpConfiguration.getKey());
-        map.put("address", toCommunities.getCommunityName() + tpUnit.getPhaseName() + tpUnit.getBuildingName() + tpUnit.getName());
-        map.put("token", tpEquipment.getOpUserUuid());
-        responseBean.addSuccess(map);
+        responseBean.addSuccess(resultMap);
 
         // 记录 单元门监控查看
         TaRemotelyMonitor taRemotelyMonitor = new TaRemotelyMonitor();

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

@@ -17,6 +17,7 @@ import org.springframework.transaction.annotation.Transactional;
 import java.util.Date;
 import java.util.List;
 import java.util.Map;
+import java.util.stream.Collectors;
 
 /**
  * @author weichaochao
@@ -43,6 +44,10 @@ public class TaVistorServiceImpl implements TaVistorServiceI {
     @Autowired
     private TaVisitorLicenseSettingMapper taVisitorLicenseSettingMapper;
 
+    @Autowired
+    private TpUnitMapper tpUnitMapper;
+
+
     @Override
     @Transactional(rollbackFor = Exception.class)
     public ResponseBean insertTaVistor(TaVisitor taVisitor, UserElement userElement) {
@@ -79,20 +84,31 @@ public class TaVistorServiceImpl implements TaVistorServiceI {
         }
 
         // 推送海康
-        temporaryRegister(userElement.getId(),taVisitor, userElement.getCommunityId(), response);
+        temporaryRegister(userElement.getId(),taVisitor, userElement.getCommunityId(), response, userElement);
 
         return response;
     }
 
     @Override
-    public ResponseBean invateHis(Integer communityId, Integer userId) {
+    public ResponseBean invateHis(UserElement userElement) {
         ResponseBean responseBean = new ResponseBean();
-        List<TaVisitor> taVisitors = taVisitorMapper.findAllVistors(communityId, userId);
+        List<TaVisitor> taVisitors = taVisitorMapper.findAllVistors(userElement.getCommunityId(), userElement.getId());
+
+        // 查询出所有的单元门
+        List<TpUnit> unitList = tpUnitMapper.selectByAddress(userElement.getCommunityId(), userElement.getPhaseId(), userElement.getBuildingId());
+        List<Map<String, Object>> unitMapList = unitList.stream().map(e -> {
+            Map<String, Object> unitMap = Maps.newHashMap();
+            unitMap.put("id", e.getId());
+            unitMap.put("unit", e.getPhaseName() + e.getBuildingName() + e.getName());
+
+            return unitMap;
+        }).collect(Collectors.toList());
 
         for (TaVisitor taVisitor : taVisitors){
             if (Constant.EFFECTIVE.equals(taVisitor.getDrivingStatus())){
                 List<String> taVisitorLicenses = taVisitorLicenseMapper.findTaVistorLicenseById(taVisitor.getId());
                 taVisitor.setCarLicense(taVisitorLicenses);
+                taVisitor.setUnitList(unitMapList);
             }
         }
         responseBean.addSuccess(taVisitors);
@@ -106,7 +122,17 @@ public class TaVistorServiceImpl implements TaVistorServiceI {
      * @param userId 被访人ID
      * @param visitor
      */
-    private void temporaryRegister(Integer userId,TaVisitor visitor, Integer communityId ,ResponseBean response){
+    private void temporaryRegister(Integer userId,TaVisitor visitor, Integer communityId ,ResponseBean response, UserElement userElement){
+        // 查询出所有的单元门
+        List<TpUnit> unitList = tpUnitMapper.selectByAddress(communityId, userElement.getPhaseId(), userElement.getBuildingId());
+        List<Map<String, Object>> unitMapList = unitList.stream().map(e -> {
+            Map<String, Object> unitMap = Maps.newHashMap();
+            unitMap.put("id", e.getId());
+            unitMap.put("unit", e.getPhaseName() + e.getBuildingName() + e.getName());
+
+            return unitMap;
+        }).collect(Collectors.toList());
+
 
         // 获取设备树，里面有 opUserId
         TpEquipmentTree tpEquipmentTree = tpEquipmentTreeMapper.selectByCommunityId(communityId);
@@ -127,6 +153,7 @@ public class TaVistorServiceImpl implements TaVistorServiceI {
             map.put("visitorEndTime",visitor.getVisitorEndTime());
             map.put("drivingStatus",visitor.getDrivingStatus());
             map.put("payEntity",visitor.getPayEntity());
+            map.put("unitMapList", unitMapList);
 
             // 把访问码存入
             visitor.setVisitorCode(visitorCode);

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

@@ -14,10 +14,11 @@
     <result column="community_id" property="communityId" jdbcType="INTEGER" />
     <result column="doorUuid" property="dooruuid" jdbcType="VARCHAR" />
     <result column="deviceUuid" property="deviceuuid" jdbcType="VARCHAR" />
+    <result column="display_name" property="displayName"/>
   </resultMap>
   <sql id="Base_Column_List" >
     id, `key`, configuration_name, configuration_type, configuration_value, create_tiem,
-    create_user, update_time, update_user, community_id, doorUuid, deviceUuid
+    create_user, update_time, update_user, community_id, doorUuid, deviceUuid, display_name
   </sql>
   <select id="selectByPrimaryKey" resultMap="BaseResultMap" parameterType="java.lang.Integer" >
     select