更新:

 返回初始场景返回管理后台需要缩略图

cms_pano_fcb/gis_application/src/main/resources/application-dev.properties

@@ -5,10 +5,13 @@ spring.cloud.nacos.discovery.server-addr=192.168.0.98:8848
 #DB
 spring.datasource.type=com.alibaba.druid.pool.DruidDataSource
 spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver
-spring.datasource.druid.url=jdbc:mysql://localhost:3306/${project.name}?serverTimezone=GMT%2B8&useUnicode=true&characterEncoding=utf8&characterSetResults=utf8
-spring.datasource.druid.username=root
-spring.datasource.druid.password=root
+#spring.datasource.druid.url=jdbc:mysql://localhost:3306/${project.name}?serverTimezone=GMT%2B8&useUnicode=true&characterEncoding=utf8&characterSetResults=utf8
+#spring.datasource.druid.username=root
+#spring.datasource.druid.password=root
 
+spring.datasource.druid.url=jdbc:mysql://8.135.98.231:3306/${project.name}?serverTimezone=GMT%2B8&useUnicode=true&characterEncoding=utf8&characterSetResults=utf8
+spring.datasource.druid.username=root
+spring.datasource.druid.password=4DAGE168!a
 
 # \u521D\u59CB\u8FDE\u63A5\u6570
 spring.datasource.druid.initial-size=5

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

@@ -18,4 +18,10 @@ public class SceneInitDto {
     @ApiModelProperty(value = "楼盘id")
     private String houseId;
 
+    @ApiModelProperty(value = "缩略图（管理后台用）")
+    private String icon;
+
+//    @ApiModelProperty(value = "场景id")
+//    private String sceneId;
+
 }

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

@@ -23,6 +23,9 @@ public class SceneInitEntity extends BaseEntity implements Serializable {
     @ApiModelProperty(value = "楼盘id")
     private String houseId;
 
+//    @ApiModelProperty(value = "楼盘id")
+//    private String sceneId;
+
 
 
 

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

@@ -1,6 +1,7 @@
 package com.gis.mapper;
 
 
+import com.gis.domain.dto.SceneInitDto;
 import com.gis.domain.entity.SceneInitEntity;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Select;
@@ -14,7 +15,7 @@ import java.util.List;
 @Mapper
 public interface SceneInitMapper extends IBaseMapper<SceneInitEntity, String> {
 
-    @Select("select * from tb_scene_init where is_delete = 0 and house_id = #{houseId}")
+    @Select("select * from tb_scene_init where a.is_delete = 0 and a.house_id = #{houseId} ")
     List<SceneInitEntity> findByHouseId(String houseId);
 
     @Update("UPDATE tb_scene_init SET is_delete = 1 where is_delete = 0 AND house_id = #{houseId}")
@@ -22,4 +23,7 @@ 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, b.icon as icon, a.scene_code from tb_scene_init a left join tb_scene b on a.scene_code = b.scene_code where a.is_delete = 0 and a.house_id = #{houseId} and b.is_delete = 0 ")
+    List<SceneInitDto> voFindByHouseId(String houseId);
 }

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

@@ -4,6 +4,7 @@ package com.gis.service;
 import com.gis.common.util.Result;
 import com.gis.domain.dto.SceneInitDto;
 import com.gis.domain.entity.SceneInitEntity;
+import org.springframework.web.multipart.MultipartFile;
 
 import java.util.List;
 
@@ -16,7 +17,11 @@ public interface SceneInitService extends IBaseService<SceneInitEntity, String>
 
     Result saveEntity(SceneInitDto param);
 
-    List<SceneInitEntity> findByHouseId(String houseId);
-
     void removeByHouseIdAndSceneCode(String houseId, String sceneCode);
+
+    Result uploadFixedName(MultipartFile file, String sceneCode);
+
+    List<SceneInitDto> voFindByHouseId(String houseId);
+
+    List<SceneInitEntity> findByHouseId(String houseId);
 }

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

@@ -68,5 +68,5 @@ public interface SceneService extends IBaseService<SceneEntity, String> {
 
     Result updateIcon(String sceneCode, String icon);
 
-    Result uploadFixedName(MultipartFile file, String sceneCode);
+
 }

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

@@ -1,5 +1,7 @@
 package com.gis.service.impl;
 
+import com.gis.common.util.AliyunOssUtil;
+import com.gis.common.util.FileUtils;
 import com.gis.common.util.RandomUtils;
 import com.gis.common.util.Result;
 import com.gis.domain.dto.SceneInitDto;
@@ -11,8 +13,10 @@ import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
+import org.springframework.web.multipart.MultipartFile;
 
 import javax.transaction.Transactional;
+import java.io.IOException;
 import java.util.Date;
 import java.util.List;
 
@@ -28,6 +32,9 @@ public class SceneInitServiceImpl extends IBaseServiceImpl<SceneInitEntity, Stri
     @Autowired
     private SceneInitMapper entityMapper;
 
+    @Autowired
+    AliyunOssUtil aliyunOssUtil;
+
     @Override
     public IBaseMapper<SceneInitEntity, String> getBaseMapper() {
         return this.entityMapper;
@@ -63,7 +70,35 @@ public class SceneInitServiceImpl extends IBaseServiceImpl<SceneInitEntity, Stri
     }
 
     @Override
+    public List<SceneInitDto> voFindByHouseId(String houseId) {
+        return entityMapper.voFindByHouseId(houseId);
+    }
+
+    @Override
     public void removeByHouseIdAndSceneCode(String houseId, String sceneCode) {
         entityMapper.removeByHouseIdAndSceneCode(houseId, sceneCode);
     }
+
+    @Override
+    public Result uploadFixedName(MultipartFile file, String sceneCode) {
+
+        // 检查非法文件上传
+        boolean checkFile = FileUtils.checkFile(file);
+        if (!checkFile) {
+            return Result.failure("上传文件格式有误, 请重新上传");
+        }
+
+        String ossPath = configConstant.ossBasePath + "image/thumb_"+sceneCode+".jpg";
+        try {
+            aliyunOssUtil.upload(file.getBytes(), ossPath);
+            Object ossUrl = configConstant.ossDomain + ossPath;
+            log.info("ossUrl: {}", ossUrl);
+            return Result.success(ossUrl);
+        } catch (IOException e) {
+            e.printStackTrace();
+        }
+        return Result.failure("上传失败");
+    }
+
+
 }

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

@@ -423,26 +423,7 @@ public class SceneServiceImpl extends IBaseServiceImpl<SceneEntity, String> impl
         return Result.success();
     }
 
-    @Override
-    public Result uploadFixedName(MultipartFile file, String sceneCode) {
-
-        // 检查非法文件上传
-        boolean checkFile = FileUtils.checkFile(file);
-        if (!checkFile) {
-            return Result.failure("上传文件格式有误, 请重新上传");
-        }
 
-        String ossPath = configConstant.ossBasePath + "image/thumb_"+sceneCode+".jpg";
-        try {
-            aliyunOssUtil.upload(file.getBytes(), ossPath);
-            Object ossUrl = configConstant.ossDomain + ossPath;
-            log.info("ossUrl: {}", ossUrl);
-            return Result.success(ossUrl);
-        } catch (IOException e) {
-            e.printStackTrace();
-        }
-        return Result.failure("上传失败");
-    }
 
     @Override
     public Result saveUseHots(UseHotsDto param) {

cms_pano_fcb/gis_web/src/main/java/com/gis/web/controller/SceneController.java

@@ -113,12 +113,12 @@ public class SceneController extends BaseController {
     }
 
 
-    @ApiOperation(value = "初始画面-上传", position = 2)
-    @PostMapping(value = "uploadIndexImg/{sceneCode}")
-    public Result uploadIndexImg(@RequestParam("file") MultipartFile file, @PathVariable String sceneCode) {
-        log.info("上传图片");
-        return sceneService.uploadFixedName(file, sceneCode);
-    }
+//    @ApiOperation(value = "初始画面-上传", position = 2)
+//    @PostMapping(value = "uploadIndexImg/{sceneCode}")
+//    public Result uploadIndexImg(@RequestParam("file") MultipartFile file, @PathVariable String sceneCode) {
+//        log.info("上传图片");
+//        return sceneService.uploadFixedName(file, sceneCode);
+//    }
 
     @WebControllerLog(description = "VR项目-编辑VR项目")
     @ApiOperation(value = "VR项目修改", position = 3, notes = "修改VR项目的基础信息")

cms_pano_fcb/gis_web/src/main/java/com/gis/web/controller/SceneInitController.java

@@ -14,6 +14,7 @@ import lombok.extern.log4j.Log4j2;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
 
 import java.util.List;
 
@@ -21,6 +22,7 @@ import java.util.List;
 /**
  * Created by owen on 2020/2/18 0018 12:17
  */
+@Slf4j
 @Api(tags = "初始场景管理")
 @RestController
 @RequestMapping("fcb/pano/init")
@@ -40,8 +42,15 @@ public class SceneInitController extends BaseController {
     @ApiOperation(value = "列表")
     @GetMapping("list/{houseId}")
     public Result list(@PathVariable String houseId) {
-        List<SceneInitEntity> list = sceneInitService.findByHouseId(houseId);
+        List<SceneInitDto> list = sceneInitService.voFindByHouseId(houseId);
         return Result.success(list);
     }
 
+    @ApiOperation(value = "初始画面-上传", position = 2)
+    @PostMapping(value = "uploadIndexImg/{sceneCode}")
+    public Result uploadIndexImg(@RequestParam("file") MultipartFile file, @PathVariable String sceneCode) {
+        log.info("上传图片");
+        return sceneInitService.uploadFixedName(file, sceneCode);
+    }
+
 }

cms_pano_fcb/remark.md

@@ -166,7 +166,12 @@ sit:
     5. 预览是H5打开的首页（H5调用免token的list接口去匹配那个是初始场景，H5可以获取很多数据）
     6. 先保存VR项目，才能添加场景
     7. 
-    
+
+# uat 更新日志
+    20210322
+        新增：初始画面-上传接口，作用封面图统一
+        新增：初始场景管理模块，提供管理后台初始场景列表  （新的是三个初始场景，是否需要兼容旧数据？？）
+           
     
 # uat 更新日志
     20210301-1700