1

src/main/java/com/fdkankan/ucenter/config/WebAppConfig.java

@@ -33,7 +33,8 @@ public class WebAppConfig implements WebMvcConfigurer {
 						"/**/scene/**",
 						"/intercomMessage/**",
 						"/order/pay/**",
-						"/article/**"
+						"/article/**",
+						"/user/camera/**"
 				);
 
 		registry.addInterceptor(appInterceptor).addPathPatterns("/app/**")

src/main/java/com/fdkankan/ucenter/vo/response/CameraVo.java

@@ -54,5 +54,7 @@ public class CameraVo {
     /**"昵称", name = "nickName*/
     private String nickName;
 
+    private Integer own;
+
     private  ResponseUserIncrement responseUserIncrement;
 }

src/main/java/com/fdkankan/ucenter/vo/response/ResponseUserIncrement.java

@@ -24,16 +24,16 @@ public class ResponseUserIncrement extends RequestBase {
     /**
      * 生效时间
      */
-    private Date incrementStartTime;
+    private String incrementStartTime;
     /**
      * 结束时间
      */
-    private Date incrementEndTime;
+    private String incrementEndTime;
 
     /**
      * 创建时间
      */
-    private Date createTime;
+    private String createTime;
 
     private String snCode;
 

src/main/resources/mapper/ucenter/CameraSpaceMapper.xml

@@ -5,7 +5,8 @@
     <select id="getVoListByCameraId" resultType="com.fdkankan.ucenter.vo.response.CameraSpaceVo">
         select s.id, s.space_end_time, c.child_name, s.space from t_camera_space s
             LEFT JOIN t_camera c on s.camera_id = c.id
-            where s.rec_status = 'A' and s.space_type = 2 and s.camera_id = #{cameraId} and TIMESTAMPDIFF(MINUTE, NOW(), s.space_end_time) &gt; -1
+            where s.rec_status = 'A' and s.space_type = 2 and s.camera_id = #{cameraId}
+              and TIMESTAMPDIFF(MINUTE, NOW(), s.space_end_time) &gt; -1
             ORDER BY s.space_end_time
     </select>
     <select id="getVoListByCameraIds" resultType="com.fdkankan.ucenter.vo.response.CameraSpaceVo">