1

src/main/java/com/fdkankan/manage/vo/response/SceneVo.java

@@ -49,4 +49,6 @@ public class SceneVo {
     private Integer location;
 
     private Integer mixture = 0; // 0否 1是
+
+    private Integer sceneSource;
 }

src/main/resources/mapper/manage/SceneProMapper.xml

@@ -24,7 +24,7 @@
         SELECT * FROM(
         select s.scene_name ,s.num,s.create_time,s.space as sceneSize
         ,s.view_count,s.status,s.pay_status,'v3' as scene_version ,s.web_site , s.thumb
-        ,null as algorithmTime,data_source,s.shoot_count,s.gps,s.user_id,s.camera_id
+        ,null as algorithmTime,data_source,s.shoot_count,s.gps,s.user_id,s.camera_id,s.scene_source
         from t_scene_pro s
         <include refid="commonWhere"></include>
         <if test="param.sceneName != null and param.sceneName!='' ">
@@ -34,7 +34,7 @@
         UNION ALL
         select s.title as sceneName ,s.num,s.create_time,e.space as sceneSize
         ,e.view_count,s.scene_status as status,s.pay_status,'v4' as scene_version,e.web_site,e.thumb
-        ,algorithm_time,data_source,e.shoot_count,e.gps,s.user_id,s.camera_id
+        ,algorithm_time,data_source,e.shoot_count,e.gps,s.user_id,s.camera_id,s.scene_source
         from t_scene_plus s
         left join t_scene_plus_ext e on s.id = e.plus_id
         <include refid="commonWhere"></include>
@@ -86,8 +86,8 @@
         <if test="param.type !=null and param.type == 7">
             and s.scene_source = 5 and is_obj = 1
         </if>
-        <if test="param.type !=null and param.type == 360">
-            and s.scene_source = 360
+        <if test="param.type !=null and param.type == 36">
+            and s.scene_source = 36
         </if>
         <if test="param.num !=null and param.num !='' ">
             and s.num like concat ('%',#{param.num},'%')