lyhzzz 2 роки тому
батько
коміт
7df360e82a

+ 3 - 2
src/main/java/com/fdkankan/ucenter/config/WebAppConfig.java

@@ -23,6 +23,7 @@ public class WebAppConfig implements WebMvcConfigurer {
 	public void addInterceptors(InterceptorRegistry registry) {
 		registry.addInterceptor(ucenterInterceptor).addPathPatterns("/**")
 				.excludePathPatterns(
+						//"/user/virtualOrder/**",
 						"/**/sso/**",
 						"/app/**",
 						"/test/**",
@@ -30,12 +31,12 @@ public class WebAppConfig implements WebMvcConfigurer {
 						"/**/fusion/**",
 						"/goods/version/enabled",
 						"/**/scene/**",
-						"/intercomMessage/**",
-						"/user/virtualOrder/**"
+						"/intercomMessage/**"
 				);
 
 		registry.addInterceptor(appInterceptor).addPathPatterns("/app/**")
 				.excludePathPatterns(
+						//"/app/scene/getAppAllSceneByPage"
 						"/app/camera/uploadUserCameraInfo"
 				);
 		WebMvcConfigurer.super.addInterceptors(registry);

+ 10 - 6
src/main/resources/mapper/ucenter/ScenePlusMapper.xml

@@ -28,16 +28,13 @@
         ORDER BY create_time desc
 
     </select>
-    <select id="getCountByUserId" resultType="java.lang.Long">
-        select count(*) from t_scene_plus s left join t_camera_detail d on s.camera_id = d.camera_id
-        where s.rec_status = 'A'
-         and s.user_id = #{userId} and d.goods_id = #{cameraType}
-    </select>
-
 
     <sql id="sceneJoinCamera">
         LEFT JOIN t_camera c on p.camera_id = c.id
 		LEFT JOIN t_user u on p.user_id = u.id
+         <if test= 'param.cameraType != null' >
+          join `t_camera_detail` tcd on p.camera_id = tcd.camera_id and tcd.goods_id = #{param.cameraType}
+        </if>
     </sql>
 
     <sql id="commonWhere">
@@ -58,4 +55,11 @@
         </if>
     </sql>
 
+
+    <select id="getCountByUserId" resultType="java.lang.Long">
+        select count(*) from t_scene_plus s left join t_camera_detail d on s.camera_id = d.camera_id
+        where s.rec_status = 'A'
+          and s.user_id = #{userId} and d.goods_id = #{cameraType}
+    </select>
+
 </mapper>