1

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

@@ -36,7 +36,7 @@ public class WebAppConfig implements WebMvcConfigurer {
 
 		registry.addInterceptor(appInterceptor).addPathPatterns("/app/**")
 				.excludePathPatterns(
-						//"/app/scene/getAppAllSceneByPage"
+						"/app/scene/getAppAllSceneByPage",
 						"/app/camera/uploadUserCameraInfo"
 				);
 		WebMvcConfigurer.super.addInterceptors(registry);

src/main/java/com/fdkankan/ucenter/mapper/ISceneProMapper.java

@@ -5,7 +5,6 @@ import com.fdkankan.ucenter.entity.ScenePro;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.fdkankan.ucenter.vo.request.AppSceneParam;
 import com.fdkankan.ucenter.vo.request.SceneParam;
-import com.fdkankan.ucenter.vo.response.AppSceneVo;
 import com.fdkankan.ucenter.vo.response.GroupByCount;
 import com.fdkankan.ucenter.vo.response.SceneVo;
 import org.apache.ibatis.annotations.Mapper;

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

@@ -8,8 +8,6 @@ public class AppSceneVo {
     private Long id;
     private Long cameraId;
     private String childName;
-    private Long cooperationUserId;
-    private String cooperationUserName;         //协作者
     private Integer isFolder;                   //0 场景，1文件夹
     private String num;
     private String sceneName;
@@ -34,6 +32,7 @@ public class AppSceneVo {
     private Long userId;
 
     private String dataSource;
+    private Integer sceneType;
 
     public String getCreateTime() {
         return DateUserUtil.getDayTime(createTime);

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

@@ -4,8 +4,8 @@
 
     <select id="pageList" resultType="com.fdkankan.ucenter.vo.response.AppSceneVo">
         SELECT p.id ,null as name ,0 as isFolder,null as type,null as parentId ,p.create_time,num,scene_name,scene_dec,
-        p.status,pay_status,thumb,web_site,0 as is_upgrade,sn_code,view_count,u.user_name as cooperationUserName ,u.id as cooperationUserId,
-         p.camera_id,p.user_id ,p.data_source
+        p.status,pay_status,thumb,web_site,0 as is_upgrade,view_count,
+         p.camera_id,p.user_id ,p.data_source,p.scene_type
         FROM t_scene_pro p
         <include refid="sceneJoinCamera"></include>
         WHERE is_upgrade = 0 and  p.rec_status = 'A'   AND ( p.status = 1 OR p.status = -2) AND p.scene_type != 99
@@ -15,8 +15,8 @@
         </if>
         UNION
         SELECT p.id as id ,null as name ,0 as isFolder,null as type,null as parentId,p.create_time ,num,title as scene_name,description as scene_dec,
-        scene_status as status,pay_status,thumb,web_site,1 as is_upgrade,sn_code,view_count,u.user_name as cooperationUserName,u.id as cooperationUserId,
-        p.camera_id,p.user_id,e.data_source
+        scene_status as status,pay_status,thumb,web_site,1 as is_upgrade,view_count,
+        p.camera_id,p.user_id,e.data_source,p.scene_type
         FROM t_scene_plus p
         LEFT JOIN t_scene_plus_ext e on p.id = e.plus_id
         <include refid="sceneJoinCamera"></include>
@@ -30,8 +30,6 @@
     </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>
@@ -53,6 +51,9 @@
         <if test= 'param.userId != null or param.cooperationNums != null or param.cameraId != null'>
             )
         </if>
+        <if test="param.sceneType !=null and param.sceneType !=''">
+            and  p.scene_type  = #{param.sceneType}
+        </if>
     </sql>