Merge branch 'master' into test6.9.3

@@ -11,7 +11,7 @@
   </sql>
   <select id="selectByphoneUid" resultMap="BaseResultMap" parameterType="java.lang.String" >
     select  <include refid="Base_Column_List" /> from phone_uid_camera
-    where phone_uid = #{phoneUid,jdbcType=VARCHAR}
+    where phone_uid = #{phoneUid,jdbcType=VARCHAR} limit 1
   </select>
 
   <insert id="insert" parameterType="com.yoho.order.model.PhoneUidCamera" >

@@ -107,8 +107,8 @@ public class UfoLiveController {
     }
 
     @RequestMapping(value = "/queryCurrentTime")
-    public ApiResponse queryCurrentTime(QNliveReq req) {
-        LOGGER.info("queryCurrentTime method in.");
+    public ApiResponse generateCurrentTime(QNliveReq req) {
+        LOGGER.info("generateCurrentTime method in.");
 
         Integer currentTime;
         try {

@@ -213,6 +213,8 @@ public class UfoLiveService  {
         Optional<Integer> phoneCamera = Optional.ofNullable(req.getPhoneUid()).map(phoneUidCameraService::selectByphoneUid).map(PhoneUidCameraBo::getCameraCode);
 
         if (phoneCamera.isPresent()) {   // 优先获取手机唯一标识对应的摄像头编号
+
+            req.setCameraCode(null == phoneCamera.get() ? req.getCameraCode() : Integer.valueOf(phoneCamera.get()));
             return phoneCamera.get();
         }