1

src/main/java/com/fdkankan/fusion/service/impl/SceneService.java

@@ -99,6 +99,9 @@ public class SceneService implements ISceneService {
         List<String> collect = list.stream().map(CaseNumEntity::getNum).collect(Collectors.toList());
         Page<SceneVo> voPage = new Page<>(param.getPageNum(),param.getPageSize());
         for (SceneVo record : voPage.getRecords()) {
+            if(record.getSceneType().equals("4dkankan")){
+                record.setStatus(setLaserStatus(record.getStatus(),record.getPayStatus()));
+            }
             record.setType(toFusionType(setSceneType(record.getSceneSource(),record.getSceneType())));
             if(collect.contains(record.getName())){
                 record.setInFusion(true);
@@ -134,6 +137,7 @@ public class SceneService implements ISceneService {
         return 0;
     }
 
+
     private Integer toFusionType(Integer type) {
         switch (type){
             case 5 :return 4;

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

@@ -64,7 +64,7 @@
         left join t_user u on s.user_id = u.id
         left join t_camera c on s.camera_id = c.id
         WHERE s.rec_status = 'A' and
-        ( s.scene_source in (4,5,57) and e.is_obj = 1 or s.scene_source not in (4,5,57) )
+        ( s.scene_source in (4,5) and e.is_obj = 1 or s.scene_source not in (4,5,57) )
 
         <if test="param.sceneName != null and param.sceneName!='' ">
             and s.title like concat ('%',#{param.sceneName},'%')
@@ -100,7 +100,7 @@
         s.pay_status,'v4' as scene_version,s.web_site,s.init_pic as thumb,s.algorithm_time,s.user_id,s.scene_source ,null as is_obj
         from fdkk_laser.t_scene s
         left join t_user u on s.user_id = u.id
-        WHERE s.deleted = 0 and s.status !=-1 and s.scene_source in (4,5,57)
+        WHERE s.deleted = 0 and s.status !=-1 and s.scene_source in (4,5)
 
         <if test="param.sceneName != null and param.sceneName!='' ">
             and s.title like concat ('%',#{param.sceneName},'%')