Browse Source

复制激光场景等待锁

lyhzzz 1 năm trước cách đây
mục cha
commit
57e239e776

+ 1 - 0
src/main/java/com/fdkankan/manage_jp/vo/response/SceneVo.java

@@ -32,6 +32,7 @@ public class SceneVo {
     private String childName;
     private String childName;
 
 
     private Integer isUpgrade = 1;
     private Integer isUpgrade = 1;
+    private Integer location ;
     private Long cameraId ;
     private Long cameraId ;
 
 
     private Boolean isMain = true;
     private Boolean isMain = true;

+ 2 - 2
src/main/resources/mapper/manage_jp/SceneProMapper.xml

@@ -7,7 +7,7 @@
         SELECT * FROM(
         SELECT * FROM(
         select s.scene_name ,s.num,s.create_time,c.sn_code,s.space as sceneSize
         select s.scene_name ,s.num,s.create_time,c.sn_code,s.space as sceneSize
         ,u.user_name,s.view_count,s.status,s.pay_status,'v3' as scene_version ,s.web_site as webSite,thumb
         ,u.user_name,s.view_count,s.status,s.pay_status,'v3' as scene_version ,s.web_site as webSite,thumb
-        ,null as algorithmTime,c.child_name,s.camera_id,s.laser_title,co.company_name
+        ,null as algorithmTime,c.child_name,s.camera_id,s.laser_title,co.company_name,null as location
         from t_scene_pro s
         from t_scene_pro s
         <include refid="commonWhere"></include>
         <include refid="commonWhere"></include>
         <if test="param.sceneName != null and param.sceneName!='' ">
         <if test="param.sceneName != null and param.sceneName!='' ">
@@ -17,7 +17,7 @@
         UNION
         UNION
         select s.title as sceneName ,s.num,s.create_time,c.sn_code,e.space as sceneSize
         select s.title as sceneName ,s.num,s.create_time,c.sn_code,e.space as sceneSize
         ,u.user_name,e.view_count,s.scene_status as status,s.pay_status,'v4' as scene_version,e.web_site as webSite,thumb
         ,u.user_name,e.view_count,s.scene_status as status,s.pay_status,'v4' as scene_version,e.web_site as webSite,thumb
-        ,algorithm_time,c.child_name,s.camera_id,s.laser_title,co.company_name
+        ,algorithm_time,c.child_name,s.camera_id,s.laser_title,co.company_name,e.location
         from t_scene_plus s
         from t_scene_plus s
         left join t_scene_plus_ext e on s.id = e.plus_id
         left join t_scene_plus_ext e on s.id = e.plus_id
         <include refid="commonWhere"></include>
         <include refid="commonWhere"></include>