完成 们口机视频流地址

CODE/foreign-service/src/main/java/com/community/huiju/foreign/ForeignServiceApplication.java → CODE/foreign-service/src/main/java/com/community/huiju/ForeignServiceApplication.java

@@ -1,4 +1,4 @@
-package com.community.huiju.foreign;
+package com.community.huiju;
 
 import com.alibaba.fastjson.serializer.SerializerFeature;
 import com.alibaba.fastjson.support.config.FastJsonConfig;

CODE/foreign-service/src/main/java/com/community/huiju/foreign/aop/LogAOP.java → CODE/foreign-service/src/main/java/com/community/huiju/aop/LogAOP.java

@@ -1,11 +1,11 @@
-package com.community.huiju.foreign.aop;
+package com.community.huiju.aop;
 
 import com.alibaba.fastjson.JSONObject;
 import com.community.commom.fushi.error.FuShiException;
-import com.community.huiju.foreign.log.LogAnnotation;
-import com.community.huiju.foreign.log.LogEnums;
-import com.community.huiju.foreign.log.LogFactory;
-import com.community.huiju.foreign.log.LogFileManager;
+import com.community.huiju.log.LogAnnotation;
+import com.community.huiju.log.LogEnums;
+import com.community.huiju.log.LogFactory;
+import com.community.huiju.log.LogFileManager;
 import lombok.extern.slf4j.Slf4j;
 import org.aspectj.lang.JoinPoint;
 import org.aspectj.lang.ProceedingJoinPoint;

CODE/foreign-service/src/main/java/com/community/huiju/common/base/BaseController.java

@@ -0,0 +1,4 @@
+package com.community.huiju.common.base;
+
+public class BaseController {
+}

CODE/foreign-service/src/main/java/com/community/huiju/common/base/ResponseBean.java

@@ -0,0 +1,73 @@
+package com.community.huiju.common.base;
+
+import java.io.Serializable;
+
+/**
+ * 接口统一状态返回BEAN.
+ */
+public class ResponseBean<T> implements Serializable {
+
+    private static final long serialVersionUID = 3593827217136880822L;
+
+    private Integer code = 0;
+
+    private String message = "成功";
+
+    private T data;
+
+    public ResponseBean() {
+    }
+
+    public void addError(Integer code, String message, T data) {
+        this.code = code;
+        this.message = message;
+        this.data = data;
+    }
+
+    public void addSuccess(String message) {
+        this.code = 0;
+        this.message = message;
+    }
+
+    public void addSuccess(Integer code, T data) {
+        this.code = code;
+        this.message = "成功";
+        this.data = data;
+    }
+
+    public void addSuccess(Integer code, String message, T data) {
+        this.code = code;
+        this.message = message;
+        this.data = data;
+    }
+
+    public void addSuccess(String message, T data) {
+        this.code = 0;
+        this.message = message;
+        this.data = data;
+    }
+
+    public void addSuccess(T data) {
+        this.code = 0;
+        this.message = "成功";
+        this.data = data;
+    }
+
+    public T getData() {
+        return this.data;
+    }
+
+    public Integer getCode() {
+        return this.code;
+    }
+
+    public String getMessage() {
+        return this.message;
+    }
+
+    @Override
+    public String toString() {
+        return "ResponseBaseBean [code=" + this.code + ", message=" + this.message + ", data=" + this.data + "]";
+    }
+
+}

CODE/foreign-service/src/main/java/com/community/huiju/foreign/common/perproties/DaSuProperties.java → CODE/foreign-service/src/main/java/com/community/huiju/common/perproties/DaSuProperties.java

@@ -1,4 +1,4 @@
-package com.community.huiju.foreign.common.perproties;
+package com.community.huiju.common.perproties;
 
 import lombok.AllArgsConstructor;
 import lombok.Data;

CODE/foreign-service/src/main/java/com/community/huiju/foreign/common/perproties/FuShiProperties.java → CODE/foreign-service/src/main/java/com/community/huiju/common/perproties/FuShiProperties.java

@@ -1,4 +1,4 @@
-package com.community.huiju.foreign.common.perproties;
+package com.community.huiju.common.perproties;
 
 import lombok.AllArgsConstructor;
 import lombok.Data;

CODE/foreign-service/src/main/java/com/community/huiju/foreign/config/FuShiConfig.java → CODE/foreign-service/src/main/java/com/community/huiju/config/FuShiConfig.java

@@ -1,8 +1,8 @@
-package com.community.huiju.foreign.config;
+package com.community.huiju.config;
 
 import com.community.commom.fushi.FuShiHttpClient;
 import com.community.commom.fushi.FuShiRequestAPI;
-import com.community.huiju.foreign.common.perproties.FuShiProperties;
+import com.community.huiju.common.perproties.FuShiProperties;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;

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

@@ -1,9 +1,9 @@
-package com.community.huiju.foreign.controller;
+package com.community.huiju.controller;
 
 import com.alibaba.fastjson.JSONObject;
 import com.community.commom.mode.ResponseBean;
-import com.community.huiju.foreign.common.base.BaseController;
-import com.community.huiju.foreign.service.IFuShiService;
+import com.community.huiju.common.base.BaseController;
+import com.community.huiju.service.IFuShiService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiImplicitParams;

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

@@ -0,0 +1,20 @@
+package com.community.huiju.controller;
+
+
+import com.community.huiju.common.base.BaseController;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * <p>
+ * 住户app端用户表 前端控制器
+ * </p>
+ *
+ * @author jobob
+ * @since 2019-05-15
+ */
+@RestController
+@RequestMapping("/")
+public class TaUserController extends BaseController {
+
+}

CODE/foreign-service/src/main/java/com/community/huiju/dao/TaUserMapper.java

@@ -0,0 +1,16 @@
+package com.community.huiju.dao;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.community.huiju.model.TaUser;
+
+/**
+ * <p>
+ * 住户app端用户表 Mapper 接口
+ * </p>
+ *
+ * @author jobob
+ * @since 2019-05-15
+ */
+public interface TaUserMapper extends BaseMapper<TaUser> {
+
+}

CODE/foreign-service/src/main/java/com/community/huiju/enums/ErroMessage.java

@@ -0,0 +1,11 @@
+package com.community.huiju.enums;
+
+/**
+ * 错误消息定义
+ * @author weiximei
+ */
+public enum ErroMessage {
+
+
+
+}

CODE/foreign-service/src/main/java/com/community/huiju/exception/ExceptionHandleAdice.java

@@ -0,0 +1,66 @@
+package com.community.huiju.exception;
+
+import com.community.commom.constant.Constant;
+import com.community.commom.mode.ResponseBean;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.validation.ObjectError;
+import org.springframework.web.bind.MethodArgumentNotValidException;
+import org.springframework.web.bind.annotation.ControllerAdvice;
+import org.springframework.web.bind.annotation.ExceptionHandler;
+import org.springframework.web.bind.annotation.ResponseBody;
+
+import java.util.List;
+
+/**
+ * 统一异常出口
+ * @author weiximei
+ */
+@ControllerAdvice
+@ResponseBody
+@Slf4j
+public class ExceptionHandleAdice {
+
+
+    @ExceptionHandler(Exception.class)
+    public ResponseBean handleException(Exception e){
+        log.error(e.getMessage(),e);
+        ResponseBean response = new ResponseBean();
+        response.addError(Constant.REQUEST_ERROR,"系统异常,请稍后重试!");
+        return response;
+    }
+
+    @ExceptionHandler(RuntimeException.class)
+    public ResponseBean handleException(RuntimeException e){
+        log.error(e.getMessage(),e);
+        ResponseBean response = new ResponseBean();
+        response.addError(e.getMessage());
+        return response;
+    }
+
+
+    @ExceptionHandler(WisdomException.class)
+    public ResponseBean handleException(WisdomException e) {
+        log.error(e.getMessage(),e);
+        ResponseBean response = new ResponseBean();
+        response.addError(e.getMessage());
+        return response;
+    }
+
+
+    @ExceptionHandler(MethodArgumentNotValidException.class)
+    public ResponseBean handlelllewgalParamException(MethodArgumentNotValidException e){
+        ResponseBean response = new ResponseBean();
+
+        List<ObjectError> errors  =e.getBindingResult().getAllErrors();
+        String message = "参数不合法";
+        if (errors.size() >0) {
+            message = errors.get(0).getDefaultMessage();
+        }
+
+        response.addError(message);
+
+        return response;
+    }
+
+
+}

CODE/foreign-service/src/main/java/com/community/huiju/exception/WisdomException.java

@@ -0,0 +1,17 @@
+package com.community.huiju.exception;
+
+
+/**
+ * @author weiximei
+ */
+public class WisdomException extends RuntimeException {
+
+
+    public WisdomException(String msg, Throwable t) {
+        super(msg, t);
+    }
+
+    public WisdomException(String msg) {
+        super(msg);
+    }
+}

CODE/foreign-service/src/main/java/com/community/huiju/foreign/common/base/BaseController.java

@@ -1,4 +0,0 @@
-package com.community.huiju.foreign.common.base;
-
-public class BaseController {
-}

CODE/foreign-service/src/main/java/com/community/huiju/foreign/jwt/JwtUtil.java → CODE/foreign-service/src/main/java/com/community/huiju/jwt/JwtUtil.java

@@ -1,4 +1,4 @@
-package com.community.huiju.foreign.jwt;
+package com.community.huiju.jwt;
 
 
 import lombok.extern.slf4j.Slf4j;

CODE/foreign-service/src/main/java/com/community/huiju/foreign/log/LogAnnotation.java → CODE/foreign-service/src/main/java/com/community/huiju/log/LogAnnotation.java

@@ -1,4 +1,4 @@
-package com.community.huiju.foreign.log;
+package com.community.huiju.log;
 
 import java.lang.annotation.*;
 

CODE/foreign-service/src/main/java/com/community/huiju/foreign/log/LogEnums.java → CODE/foreign-service/src/main/java/com/community/huiju/log/LogEnums.java

@@ -1,4 +1,4 @@
-package com.community.huiju.foreign.log;
+package com.community.huiju.log;
 
 /**
  * 日志类型

CODE/foreign-service/src/main/java/com/community/huiju/foreign/log/LogFactory.java → CODE/foreign-service/src/main/java/com/community/huiju/log/LogFactory.java

@@ -1,4 +1,4 @@
-package com.community.huiju.foreign.log;
+package com.community.huiju.log;
 
 import java.io.File;
 import java.io.RandomAccessFile;

CODE/foreign-service/src/main/java/com/community/huiju/foreign/log/LogFileManager.java → CODE/foreign-service/src/main/java/com/community/huiju/log/LogFileManager.java

@@ -1,4 +1,4 @@
-package com.community.huiju.foreign.log;
+package com.community.huiju.log;
 
 import java.util.TimerTask;
 import java.util.concurrent.ScheduledThreadPoolExecutor;

CODE/foreign-service/src/main/java/com/community/huiju/model/TaUser.java

@@ -0,0 +1,153 @@
+package com.community.huiju.model;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+import java.time.LocalDateTime;
+
+/**
+ * <p>
+ * 住户app端用户表
+ * </p>
+ *
+ * @author jobob
+ * @since 2019-05-15
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@TableName("ta_user")
+public class TaUser implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @TableId(value = "id", type = IdType.AUTO)
+    private Integer userId;
+
+    /**
+     * 小区id
+     */
+    private Integer communityId;
+
+    /**
+     * 楼栋业主资料信息id
+     */
+    private Integer buildingOwnerInfoId;
+
+    /**
+     * 头像
+     */
+    private String headPortrait;
+
+    /**
+     * 用户姓名
+     */
+    private String userName;
+
+    /**
+     * 登录账号就是手机号确保唯一
+     */
+    private String loginName;
+
+    /**
+     * 登录密码
+     */
+    private String loginPassword;
+
+    /**
+     * 邮箱
+     */
+    private String email;
+
+    /**
+     * 性别 1：男   2：女 0: 未选择性别
+     */
+    private String gender;
+
+    /**
+     * 1 有效 0 无效(逻辑删除) 2 拉黑(运营端用)
+     */
+    private String status;
+
+    /**
+     * 备注
+     */
+    private String remark;
+
+    /**
+     * 上级目录id存在，表示是这个id下的租客或家属
+     */
+    private Integer parentId;
+
+    /**
+     * 接受协议状态  0 是未接受 1是已接受
+     */
+    private String acceptAgreementStatus;
+
+    /**
+     * 认证状态  0 是未认证    1是认证通过   2是已作废
+     */
+    private String verifyStatus;
+
+    /**
+     * 创建人
+     */
+    private Integer createUser;
+
+    /**
+     * 创建时间
+     */
+    private LocalDateTime createDate;
+
+    /**
+     * 更新人
+     */
+    private Integer updateUser;
+
+    /**
+     * 更新时间
+     */
+    private LocalDateTime updateDate;
+
+    /**
+     * 海康人员编号
+     */
+    private Long hkPersonNo;
+
+    /**
+     * 海康人员ID   personId
+     */
+    private Integer hkUserId;
+
+    /**
+     * 海康 卡片号码
+     */
+    private String hkCardNo;
+
+    /**
+     * (以房产为准，这个字段不维护)人脸状态  0 是未上传   1是已上传   register/unregister
+     */
+    private String faceStatus;
+
+    /**
+     * 微信openid
+     */
+    private String openid;
+
+    /**
+     * 身份证
+     */
+    private String idCard;
+
+    /**
+     * 微信昵称
+     */
+    private String nickname;
+
+
+}

CODE/foreign-service/src/main/java/com/community/huiju/foreign/service/IFuShiService.java → CODE/foreign-service/src/main/java/com/community/huiju/service/IFuShiService.java

@@ -1,4 +1,4 @@
-package com.community.huiju.foreign.service;
+package com.community.huiju.service;
 
 import com.community.commom.mode.ResponseBean;
 

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

@@ -0,0 +1,27 @@
+package com.community.huiju.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.community.huiju.common.base.ResponseBean;
+import com.community.huiju.model.TaUser;
+
+/**
+ * <p>
+ * 住户app端用户表 服务类
+ * </p>
+ *
+ * @author jobob
+ * @since 2019-05-15
+ */
+public interface ITaUserService extends IService<TaUser> {
+
+    /**
+     * 添加用户
+     * @param userName
+     * @param idCard
+     * @param gender
+     * @return
+     */
+    ResponseBean addTaUser(String userName, String idCard, String gender, String phone);
+
+
+}

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

@@ -1,13 +1,13 @@
-package com.community.huiju.foreign.service.impl;
+package com.community.huiju.service.impl;
 
 import com.alibaba.fastjson.JSONObject;
 import com.community.commom.fushi.FuShiRequestAPI;
 import com.community.commom.mode.ResponseBean;
 import com.community.commom.uuid.IdGen;
-import com.community.huiju.foreign.common.perproties.FuShiProperties;
-import com.community.huiju.foreign.log.LogAnnotation;
-import com.community.huiju.foreign.log.LogEnums;
-import com.community.huiju.foreign.service.IFuShiService;
+import com.community.huiju.common.perproties.FuShiProperties;
+import com.community.huiju.log.LogAnnotation;
+import com.community.huiju.log.LogEnums;
+import com.community.huiju.service.IFuShiService;
 import com.google.common.collect.Maps;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;

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

@@ -0,0 +1,36 @@
+package com.community.huiju.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.community.huiju.common.base.ResponseBean;
+import com.community.huiju.model.TaUser;
+import com.community.huiju.dao.TaUserMapper;
+import com.community.huiju.service.ITaUserService;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 住户app端用户表 服务实现类
+ * </p>
+ *
+ * @author jobob
+ * @since 2019-05-15
+ */
+@Service
+public class TaUserServiceImpl extends ServiceImpl<TaUserMapper, TaUser> implements ITaUserService {
+
+    @Override
+    public ResponseBean addTaUser(String userName, String idCard, String gender, String phone) {
+        ResponseBean responseBean = new ResponseBean();
+        TaUser taUser = new TaUser();
+        taUser.setUserName(userName);
+        taUser.setIdCard(idCard);
+        taUser.setLoginName(phone);
+
+        boolean saveBool = this.save(taUser);
+        if (saveBool) {
+            responseBean.addSuccess(taUser);
+        }
+
+        return responseBean;
+    }
+}

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

@@ -11,12 +11,12 @@ spring:
 
 
 mybatis-plus:
-  type-aliases-package: com.community.huiju.foreign.model
+  type-aliases-package: com.community.huiju.model
   mapper-locations: classpath:mapper/*.xml
 # 打印sql
 logging:
   level:
-    com.community.huiju.foreign.dao: debug
+    com.community.huiju.dao: debug
 
 # 大苏
 da-su:

CODE/foreign-service/src/main/resources/log4j.properties

@@ -0,0 +1,31 @@
+log4j.rootLogger=info,A1,R
+log4j.appender.A1=org.apache.log4j.ConsoleAppender
+log4j.appender.A1.Target=System.out
+log4j.appender.A1.layout=org.apache.log4j.PatternLayout
+log4j.appender.A1.layout.ConversionPattern=%-5p%x [%t] %d - %c %m%n  
+
+log4j.appender.R=org.apache.log4j.DailyRollingFileAppender
+log4j.appender.R.File=../logs/resold_admin_.log
+log4j.appender.R.layout=org.apache.log4j.PatternLayout
+log4j.appender.R.Append = true
+log4j.appender.R.ImmediateFlush = true
+log4j.appender.R.DatePattern = '.' yyyy - MM - dd '.txt'
+log4j.appender.R.layout.ConversionPattern=%-5p%x [%t] %d -%c %m%n
+
+#log4j.logger.com.ibatis=DEBUG
+log4j.logger.org.springframework.transaction.support.TransactionSynchronizationManager = INFO
+log4j.logger.java.sql.Connection=DEBUG
+log4j.logger.java.sql.Statement=DEBUG
+log4j.logger.java.sql.PreparedStatement=DEBUG
+
+###############Log4j 4 SQL Output start################# #DEBUG
+log4j.logger.com.**.dao=INFO
+log4j.logger.com.springframework=DEBUG
+log4j.logger.com.ibatis=DEBUG  
+log4j.logger.com.ibatis.common.jdbc.SimpleDataSource=DEBUG  
+log4j.logger.com.ibatis.common.jdbc.ScriptRunner=DEBUG  
+log4j.logger.com.ibatis.sqlmap.engine.impl.SqlMapClientDelegate=DEBUG
+log4j.logger.java.sql.ResultSet=DEBUG
+log4j.logger.org.apache.ibatis.logging.commons.JakartaCommonsLoggingImpl=DEBUG
+log4j.logger.java.sql=DEBUG,CONSOLE 
+###############Log4j 4 SQL Output end###################

CODE/foreign-service/src/test/java/com/community/huiju/foreign/ForeignServiceApplicationTests.java → CODE/foreign-service/src/test/java/com/community/huiju/ForeignServiceApplicationTests.java

@@ -1,4 +1,4 @@
-package com.community.huiju.foreign;
+package com.community.huiju;
 
 import org.junit.Test;
 import org.junit.runner.RunWith;

CODE/smart-community/app-api/src/main/java/com/community/huiju/common/perproties/YinShiProperties.java

@@ -0,0 +1,24 @@
+package com.community.huiju.common.perproties;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+import org.springframework.boot.context.properties.ConfigurationProperties;
+import org.springframework.stereotype.Component;
+
+/**
+ * 萤石 开放平台
+ */
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+@ConfigurationProperties(prefix = "ying-shi")
+@Component
+public class YinShiProperties {
+
+    /**
+     * 获取视频流 token 地址
+     */
+    public String videoTokenUrl;
+
+}

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

@@ -84,7 +84,7 @@ public class MonitoringController extends BaseController {
     }
 
 
-    @ApiOperation(value = "获取可是对讲数据 HLS",notes = "获取可是对讲数据")
+    @ApiOperation(value = "获取门口机视频地址",notes = "获取门口机视频地址")
     @ApiImplicitParams({
             @ApiImplicitParam(paramType = "header",dataType = "String",name = "X-Auth-Token",value = "Token"),
     })

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

@@ -1,12 +1,16 @@
 package com.community.huiju.service.impl;
 import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONObject;
 import com.community.commom.hk.Digests;
 import com.community.commom.hk.HttpClientSSLUtils;
 import com.community.commom.mode.ResponseBean;
 import com.community.commom.hk.HKConstant;
 import com.community.commom.hk.HKOpenApi;
 import com.community.commom.session.UserElement;
+import com.community.huiju.common.perproties.YinShiProperties;
+import com.community.huiju.common.welcome.OkHttpRequestUtils;
 import com.community.huiju.dao.*;
+import com.community.huiju.exception.WisdomException;
 import com.community.huiju.model.*;
 import com.community.huiju.service.IMonitoringService;
 import com.github.pagehelper.Page;
@@ -17,6 +21,9 @@ import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.time.Instant;
+import java.time.LocalDateTime;
+import java.time.ZoneId;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -53,6 +60,9 @@ public class MonitoringServiceImpl implements IMonitoringService {
     @Autowired
     private TpLevelMapper tpLevelMapper;
 
+    @Autowired
+    private YinShiProperties yinShiProperties;
+
     @Override
     public ResponseBean getByCommunityId(Integer communityId,Integer pageNo, Integer pageSize) {
 
@@ -174,14 +184,49 @@ public class MonitoringServiceImpl implements IMonitoringService {
 
         TpUnit tpUnit = tpUnitMapper.selectByPrimaryKey(userElement.getUnitId());
 
+        /**
+         * tp_equipment 表
+         *      op_user_uuid 是监控的Token,
+         *      unit_uuids 是token的有效时间
+         *      appkey 是视频流的appKey
+         *      secret 是视频流的appSecret
+         *
+         * tp_configuration 表
+         *      key 视频高清地址
+         *      configuration_value 视频流畅地址
+         *
+         */
+
+        List<TpEquipment> tpEquipments = tpEquipmentMapper.selectByCommunityIdAndUnitId(userElement.getCommunityId(), userElement.getUnitId(), 5);
+        TpEquipment tpEquipment = tpEquipments.get(0);
+        TpConfiguration tpConfiguration = tpConfigurationMapper.selectByPrimaryKey(tpEquipment.getUuidId());
+
+        // 判断视频流地址，是否过期
+        if (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.doGet(yinShiProperties.getVideoTokenUrl(), queryMap);
+                JSONObject jsonObject = JSONObject.parseObject(result);
+                tpEquipment.setOpUserUuid(jsonObject.getString("accessToken"));
+                tpEquipment.setUnitUuids(String.valueOf(jsonObject.getLong("expireTime")));
+                tpEquipmentMapper.updateByPrimaryKeySelective(tpEquipment);
+            } catch (Exception e) {
+                throw new WisdomException("获取视频Token失败！");
+            }
+
+        }
 
-        List<TpEquipment> tpEquipments = tpEquipmentMapper.selectByCommunityIdAndUnitId(userElement.getCommunityId(), userElement.getUnitId(), 3);
-        TpConfiguration tpConfiguration = tpConfigurationMapper.selectByPrimaryKey(tpEquipments.get(0).getUuidId());
 
         Map<String,Object> map = new HashMap<>();
-        map.put("url", tpConfiguration.getKey());
+        // 流程视频流地址
+        map.put("url", tpConfiguration.getConfigurationValue());
+        // 高清视频流地址
+        map.put("url_high", tpConfiguration.getKey());
         map.put("address", tpUnit.getPhaseName() + tpUnit.getBuildingName() + tpUnit.getName());
-        map.put("token", "sssss");
+        map.put("token", tpEquipment.getOpUserUuid());
         responseBean.addSuccess(map);
         return responseBean;
     }

CODE/smart-community/app-api/src/main/resources/application.yml

@@ -88,3 +88,6 @@ fu-shi:
     xGP2TC4KxH2tAn0=
   parking-code: 19000100250504 # 停车场编码
 
+#萤石开放平台
+ying-shi:
+  video-token-url: https://open.ys7.com/api/lapp/token/get