更新:

    添加VR模型重复添加问题

cms_pano_fcb/gis_domain/src/main/java/com/gis/domain/dto/SceneInitDto.java

@@ -31,6 +31,9 @@ public class SceneInitDto {
     @ApiModelProperty(value = "场景名称")
     private String sceneTitle;
 
+    @ApiModelProperty(value = "样版间名称")
+    private String roomName;
+
     @ApiModelProperty(value = "场景url")
     private String webSite;
 

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

@@ -24,7 +24,8 @@ public interface SceneInitMapper extends IBaseMapper<SceneInitEntity, String> {
     @Update("UPDATE tb_scene_init SET is_delete = 1 where is_delete = 0 AND house_id = #{houseId} AND scene_code = #{sceneCode}")
     void removeByHouseIdAndSceneCode(String houseId, String sceneCode);
 
-    @Select("select a.id, a.house_id, a.scene_code, b.icon as icon, b.type as type, b.scene_title as sceneTitle, b.web_site as webSite " +
+    @Select("select a.id, a.house_id, a.scene_code, b.icon as icon, b.type as type, b.scene_title as sceneTitle, " +
+            "b.web_site as webSite, b.room_name as roomName " +
             " from tb_scene_init a left join tb_scene b on a.scene_code = b.scene_code AND a.house_id = b.house_id " +
             " where a.is_delete = 0 and a.house_id = #{houseId} and b.is_delete = 0 order by a.create_time asc")
     List<SceneInitDto> voFindByHouseId(String houseId);

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

@@ -92,4 +92,7 @@ public interface SceneMapper extends IBaseMapper<SceneEntity, String> {
 
     @Select("select house_id, scene_title, is_index, scene_code, is_delete from tb_scene where is_delete = 0 and is_index=1")
     List<SceneEntity> findAllByIndex();
+
+    @Select("select * from tb_scene where is_delete = 0 and house_id = #{houseId} and room_id = #{roomId}")
+    List<SceneEntity> findByHouseIdAndRoomId(String houseId, String roomId);
 }

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

@@ -16,6 +16,7 @@ import org.springframework.stereotype.Service;
 import org.springframework.web.multipart.MultipartFile;
 
 import javax.transaction.Transactional;
+import javax.validation.constraints.NotBlank;
 import java.io.IOException;
 import java.util.Date;
 import java.util.List;
@@ -46,12 +47,18 @@ public class SceneInitServiceImpl extends IBaseServiceImpl<SceneInitEntity, Stri
         SceneInitEntity entity = null;
         String id = param.getId();
         if (id == null) {
-
-            List<SceneInitEntity> initEntityList = this.findByHouseId(param.getHouseId());
+            String houseId = param.getHouseId();
+            String sceneCode = param.getSceneCode();
+            List<SceneInitEntity> initEntityList = this.findByHouseId(houseId);
             if (initEntityList.size() > 3) {
                 return Result.failure("初始场景不能大于3个" );
             }
 
+            List<SceneInitEntity> initEntities = entityMapper.findByHouseIdAndSceneCode(houseId, sceneCode);
+            if (initEntities.size() > 0) {
+                return Result.failure("初始场景不能重复添加" );
+            }
+
             entity = new SceneInitEntity();
             BeanUtils.copyProperties(param, entity);
             entity.setId(RandomUtils.getUuid("init"));

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

@@ -755,6 +755,7 @@ public class SceneServiceImpl extends IBaseServiceImpl<SceneEntity, String> impl
 
         // 检查VR项目状态
         String houseId = param.getHouseId();
+        String roomId = param.getRoomId();
         Result resStatus =  getHouseStatus(houseId);
         if (resStatus != null) {
             return resStatus;
@@ -766,12 +767,18 @@ public class SceneServiceImpl extends IBaseServiceImpl<SceneEntity, String> impl
 //        List<SceneEntity> index = entityMapper.getIndex(param.getHouseId());
 
         if ( id == null) {
-             entity = entityMapper.findByVrModelIdAndHouseId(param.getVrModelId(), param.getHouseId());
+             entity = entityMapper.findByVrModelIdAndHouseId(param.getVrModelId(), houseId);
             if (entity != null){
                 log.error("VrModelId已存在");
                 return Result.failure(3001, "场景码已存在, 不能重复添加");
             }
 
+            // 一个VR项目不能有相同的户型
+            List<SceneEntity> sceneEntities = entityMapper.findByHouseIdAndRoomId(houseId, roomId);
+            if (sceneEntities.size() > 0) {
+                return Result.failure("户型已存在，不能重复添加");
+            }
+
             entity = new SceneEntity();
 
             @NotBlank(message = "场景码不能为空") String sceneCode = param.getSceneCode();

cms_pano_fcb/remark.md

@@ -149,6 +149,7 @@ sit:
    
    web: 
    https://vr-web01-uat.fcb.com.cn/evergrande/#/login
+   88888888888   Fcb20210225
     https://vr-web01-uat.fcb.com.cn/
     https://vr-mc01-uat.fcb.com.cn/
 # 720yun 需求
@@ -189,7 +190,14 @@ sit:
         
     20210304-1200
         全景园林添加VR模型， 需要更新数据库
-        保存VR项目日志               
+        保存VR项目日志   
+        
+     20210325-1600
+        更新sit 20210322内容
+        
+        初始场景旧数据导入   
+        vr-web01-uat.fcb.com.cn/fcb/pano/common/updateData            
+        vr-web01-uat.fcb.com.cn/fcb/pano/common/getData            
 
 # pro 更新日志
     20210228-1722