更新:

   已使用场景数据显示处理

cms_pano_fcb/gis_domain/src/main/java/com/gis/domain/entity/SceneEntity.java

@@ -57,8 +57,7 @@ public class SceneEntity extends BaseEntity implements Serializable {
     @ApiModelProperty(value = "someData")
     private String someData;
 
-    @ApiModelProperty(value = "初始场景，0：否， 1：是（排第一）")
-    private Integer isIndex;
+
 
     @ApiModelProperty(value = "样版间名称")
     private String roomName;
@@ -87,5 +86,9 @@ public class SceneEntity extends BaseEntity implements Serializable {
     @ApiModelProperty(value =  "模型在全景园林显示byType=garden")
     private String byType;
 
+    @Transient
+    @ApiModelProperty(value = "初始场景是否已使用，0：否， 1：是")
+    private Integer isUseIndex = 0;
+
 
 }

cms_pano_fcb/gis_mapper/src/main/java/com/gis/mapper/SceneMapper.java

@@ -20,9 +20,6 @@ public interface SceneMapper extends IBaseMapper<SceneEntity, String> {
     @SelectProvider(type = SceneProvider.class, method = "search")
     List<SceneEntity> search(ScenePageDto param);
 
-//    @SelectProvider(type = SceneProvider.class, method = "searchUnion")
-//    List<SceneEntity> searchUnion(ScenePageDto param);
-
     @SelectProvider(type = SceneProvider.class, method = "searchUnion")
     List<SceneEntity> searchUnion(ScenePageDto param);
 

cms_pano_fcb/gis_mapper/src/main/java/com/gis/mapper/provider/SceneProvider.java

@@ -54,53 +54,6 @@ public class SceneProvider {
     }
 
 
-    public String searchUnion2(ScenePageDto param){
-        // type=building、garden ，查scene_title
-        StringBuffer sql = new StringBuffer("select * from tb_scene where is_delete = 0 and (type='building' or type='garden')");
-
-        String houseId = param.getHouseId();
-        if(!StringUtils.isAllBlank(houseId)){
-            sql.append(" and house_id = '").append(houseId).append("'");
-        }
-
-        String status = param.getStatus();
-        // 传3 过来，会把审核：4、未审核：3的都传给前端
-        if(StringUtils.isNotBlank(status)){
-            sql.append(" and status >= '").append(status).append("'");
-        }
-
-        String searchKey = param.getSearchKey();
-        if(!StringUtils.isAllBlank(searchKey)){
-            sql.append(" and (");
-            sql.append(" scene_title like '%").append(searchKey).append("%'");
-//            sql.append(" or room_name like '%").append(searchKey).append("%'");
-            sql.append( ")");
-        }
-
-        // UNION
-        // type=house ，查询room_name
-        sql.append(" UNION select * from tb_scene where is_delete = 0 and type='house'");
-        if(!StringUtils.isAllBlank(houseId)){
-            sql.append(" and house_id = '").append(houseId).append("'");
-        }
-
-        if(StringUtils.isNotBlank(status)){
-            sql.append(" and status >= '").append(status).append("'");
-        }
-
-        if(!StringUtils.isAllBlank(searchKey)){
-            sql.append(" and (");
-            sql.append(" room_name like '%").append(searchKey).append("%'");
-            sql.append( ")");
-        }
-
-
-        sql.append(" order by sort asc, create_time asc");
-
-        log.info("sql: {}", sql.toString());
-        return sql.toString();
-    }
-
     /**
      * 根据不同类型模糊查询不同字段
      * @param param
@@ -125,7 +78,6 @@ public class SceneProvider {
         if(!StringUtils.isAllBlank(searchKey)){
             sql.append(" and (");
             sql.append(" scene_title like '%").append(searchKey).append("%'");
-//            sql.append(" or room_name like '%").append(searchKey).append("%'");
             sql.append( ")");
         }
 

cms_pano_fcb/gis_service/src/main/java/com/gis/service/SceneInitService.java

@@ -24,4 +24,6 @@ public interface SceneInitService extends IBaseService<SceneInitEntity, String>
     List<SceneInitDto> voFindByHouseId(String houseId);
 
     List<SceneInitEntity> findByHouseId(String houseId);
+
+    List<SceneInitEntity> findByHouseIdAndSceneCode(String houseId, String sceneCode);
 }

cms_pano_fcb/gis_service/src/main/java/com/gis/service/impl/SceneInitServiceImpl.java

@@ -83,6 +83,11 @@ public class SceneInitServiceImpl extends IBaseServiceImpl<SceneInitEntity, Stri
     }
 
     @Override
+    public List<SceneInitEntity> findByHouseIdAndSceneCode(String houseId, String sceneCode) {
+        return entityMapper.findByHouseIdAndSceneCode(houseId, sceneCode);
+    }
+
+    @Override
     public List<SceneInitDto> voFindByHouseId(String houseId) {
         return entityMapper.voFindByHouseId(houseId);
     }

cms_pano_fcb/gis_service/src/main/java/com/gis/service/impl/SceneServiceImpl.java

@@ -305,8 +305,8 @@ public class SceneServiceImpl extends IBaseServiceImpl<SceneEntity, String> impl
         startPage(param);
         List<SceneEntity> search = entityMapper.searchUnion(param);
         PageInfo<SceneEntity> page = new PageInfo<>(search);
-        log.info("page size: " + page.getSize());
-        log.info("page total: " + page.getTotal());
+//        log.info("page size: " + page.getSize());
+//        log.info("page total: " + page.getTotal());
 
         // 特殊处理，需要把byType=garden的类型修改为type=garden
         List<SceneEntity> list = page.getList();
@@ -317,9 +317,17 @@ public class SceneServiceImpl extends IBaseServiceImpl<SceneEntity, String> impl
         if (!list.isEmpty()) {
             for (SceneEntity sceneEntity: list) {
                 String byType = sceneEntity.getByType();
+                String sceneCode = sceneEntity.getSceneCode();
+                String houseId = sceneEntity.getHouseId();
                 if (byType.equals("garden")) {
                     sceneEntity.setType("garden");
                 }
+
+                // 2020.04.02检查初始场景是否使用
+                List<SceneInitEntity> initEntities = sceneInitService.findByHouseIdAndSceneCode(houseId, sceneCode);
+                if (initEntities.size() > 0) {
+                    sceneEntity.setIsUseIndex(1);
+                }
                 resultList.add(sceneEntity);
             }
         }
@@ -334,6 +342,8 @@ public class SceneServiceImpl extends IBaseServiceImpl<SceneEntity, String> impl
         return result;
     }
 
+
+
     @Override
     public Result saveGardenVrModel(GardenVrModelDto param) {
         String id = param.getId();