增加

    展示端 :场景自带目录

720yun_fd_manage/gis_application/src/main/resources/application-dev.properties

@@ -74,8 +74,8 @@ oss.domain=https://oss-xiaoan.oss-cn-shenzhen.aliyuncs.com/
 
 # swagger2 \u8BBE\u7F6E\u5168\u5C40\u5B57\u4F53\u683C\u5F0F\u4E3Autf-8
 swagger.package=com.gis.web.controller
-swagger.title=VR720 dev \u5168\u666F\u770B\u770B
-swagger.description=VR720 \u5168\u666F\u770B\u770B API\u6587\u6863
+swagger.title=\u5168\u666F\u770B\u770B dev 
+swagger.description=${swagger.title}
 swagger.version=1.0
 
 #log

720yun_fd_manage/gis_application/src/main/resources/application-loc.properties

@@ -36,8 +36,9 @@ spring.datasource.druid.stat-view-servlet.enabled=true
 
 # Redis\u6570\u636E\u5E93\u7D22\u5F15\uFF08\u9ED8\u8BA4\u4E3A0\uFF09
 spring.redis.database=0
-spring.redis.host=127.0.0.1
-#spring.redis.host=120.25.146.52
+#spring.redis.host=127.0.0.1
+spring.redis.host=120.25.146.52
+
 spring.redis.port=6379
 spring.redis.password=
 # \u8FDE\u63A5\u8D85\u65F6\u65F6\u95F4 \u5355\u4F4D ms\uFF08\u6BEB\u79D2\uFF09
@@ -84,8 +85,8 @@ oss.domain=http://ossxiaoan.4dage.com/
 
 # swagger2 \u8BBE\u7F6E\u5168\u5C40\u5B57\u4F53\u683C\u5F0F\u4E3Autf-8
 swagger.package=com.gis.web.controller
-swagger.title=\u56DB\u7EF4\u5168\u666F loc
-swagger.description=\u56DB\u7EF4\u5168\u666F loc API\u6587\u6863
+swagger.title=\u5168\u666F\u770B\u770B loc
+swagger.description=${swagger.title}
 swagger.version=1.0
 
 

720yun_fd_manage/gis_application/src/main/resources/application-sit.properties

@@ -81,7 +81,7 @@ oss.domain=https://oss-xiaoan.oss-cn-shenzhen.aliyuncs.com/
 # swagger2 \u8BBE\u7F6E\u5168\u5C40\u5B57\u4F53\u683C\u5F0F\u4E3Autf-8
 swagger.package=com.gis.web.controller
 swagger.title=\u5168\u666F\u770B\u770B sit
-swagger.description=\u5168\u666F\u770B\u770B sit API\u6587\u6863
+swagger.description=${swagger.title}
 swagger.version=1.0
 
 #log

720yun_fd_manage/gis_domain/src/main/java/com/gis/domain/entity/CatalogEntity.java

@@ -19,11 +19,8 @@ public class CatalogEntity extends BaseEntity implements Serializable {
     @ApiModelProperty(value = "名称")
     private String name;
 
-//    @ApiModelProperty(value = "创建人")
-//    private String userId;
-
     @ApiModelProperty(value = "作品Id")
-        private Long workId;
+    private Long workId;
 
     @ApiModelProperty(value = "排序（序号小排前面）")
     private Integer sort;

720yun_fd_manage/gis_mapper/src/main/java/com/gis/mapper/SceneMapper.java

@@ -57,4 +57,9 @@ public interface SceneMapper extends IBaseMapper<SceneEntity, Long> {
             "from tb_scene a left join tb_catalog b on b.id = a.catalog_id left join tb_catalog c on c.id = b.parent_id " +
             "where a.is_delete = 0 and a.id = #{sceneId}")
     CatalogSceneVo findVoById(Long sceneId);
+
+    @Select("select a.*, b.id as catalogId, b.name as catalogName, c.id as parentId, c.name as parentName " +
+            "from tb_scene a left join tb_catalog b on b.id = a.catalog_id left join tb_catalog c on c.id = b.parent_id " +
+            "where a.is_delete = 0 and a.catalog_id = #{catalogId}")
+    List<CatalogSceneVo> findVoByCatalogId(Long catalogId);
 }

720yun_fd_manage/gis_service/src/main/java/com/gis/tree/CatalogTree.java

@@ -2,6 +2,7 @@ package com.gis.tree;
 
 import com.alibaba.fastjson.annotation.JSONField;
 import com.gis.domain.entity.SceneEntity;
+import com.gis.domain.vo.CatalogSceneVo;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
@@ -38,7 +39,9 @@ public class CatalogTree implements Serializable {
     private List<CatalogTree> children = new ArrayList<>();
 
     /** 场景实体*/
-    private List<SceneEntity> scenes;
+//    private List<SceneEntity> scenes;
+    private List<CatalogSceneVo> scenes;
+
 
 //    @JSONField(serialize = false)
 //    private boolean checked = false;

720yun_fd_manage/gis_service/src/main/java/com/gis/tree/CatalogTreeUtil.java

@@ -3,6 +3,7 @@ package com.gis.tree;
 
 import com.gis.domain.entity.CatalogEntity;
 import com.gis.domain.entity.SceneEntity;
+import com.gis.domain.vo.CatalogSceneVo;
 import com.gis.mapper.SceneMapper;
 import com.gis.service.CatalogService;
 import com.gis.service.SceneService;
@@ -28,7 +29,9 @@ public class CatalogTreeUtil {
             Long id = n.getId();
             tree.setId(id);
             tree.setName(n.getName());
-            List<SceneEntity> sceneList = sceneMapper.findByCatalogId(id);
+//            List<SceneEntity> sceneList = sceneMapper.findByCatalogId(id);
+            List<CatalogSceneVo> sceneList = sceneMapper.findVoByCatalogId(id);
+
             tree.setScenes(sceneList);
 
             if (n.getParentId() != null) {

720yun_fd_manage/remark-m.md

@@ -57,9 +57,7 @@
     4. 添加场景，如果没有分组，设置一个默认分组
     5. 添加分组
     
-# 疑问
-    1. 原型: 创建场景时，默认给个分组，还是分组后才能创建场景    
-    
+