删除分组对应的场景删除

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

@@ -79,7 +79,7 @@ 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=VR720 dev \u56DB\u7EF4\u5168\u666F
+swagger.title=VR720 loc \u56DB\u7EF4\u5168\u666F
 swagger.description=VR720 \u56DB\u7EF4\u5168\u666F API\u6587\u6863
 swagger.version=1.0
 

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

@@ -55,8 +55,8 @@ public class SceneEntity extends BaseEntity implements Serializable {
     @ApiModelProperty(value = "someData")
     private String someData;
 
-    @ApiModelProperty(value = "初始场景，0：否， 1：是（排第一）")
-    private Integer isIndex;
+//    @ApiModelProperty(value = "初始场景，0：否， 1：是（排第一）")
+//    private Integer isIndex;
 
 
     @ApiModelProperty(value = "排序（序号小排前面）")

720yun_fd_manage/gis_domain/src/main/java/com/gis/domain/vo/ProSceneVo.java

@@ -1,6 +1,5 @@
 package com.gis.domain.vo;
 
-import com.gis.domain.entity.BaseEntity;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
@@ -11,7 +10,7 @@ import java.io.Serializable;
  */
 
 @Data
-public class ProSceneVo extends BaseEntity implements Serializable {
+public class ProSceneVo implements Serializable {
 
 
     private static final long serialVersionUID = 7905086816704543888L;
@@ -34,5 +33,8 @@ public class ProSceneVo extends BaseEntity implements Serializable {
     @ApiModelProperty(value = "该作品下的场景是否已使用")
     private Integer isUse = 0;
 
+    @ApiModelProperty(value = "创建时间")
+    private String createTime;
+
 
 }

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

@@ -5,6 +5,7 @@ import com.gis.domain.entity.CatalogEntity;
 import com.gis.domain.vo.CatalogSceneTree;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Select;
+import org.apache.ibatis.annotations.Update;
 import org.springframework.stereotype.Component;
 
 import java.util.List;
@@ -14,20 +15,18 @@ import java.util.List;
 @Mapper
 public interface CatalogMapper extends IBaseMapper<CatalogEntity, Long> {
 
-//    @Select("select * from tb_catalog where is_delete = 0 and user_id = #{userId}")
-//    List<CatalogEntity> findByUserId(String userId);
+
 
     @Select("select * from tb_catalog where is_delete = 0 and work_id = #{workId}")
     List<CatalogEntity> findByWorkId(Long workId);
 
-
-//    @Select("select a.id,a.parent_id,a.is_delete,b.id as scene_id ,b.scene_code, b.scene_title,b.catalog_id" +
-//            "from tb_catalog a LEFT JOIN tb_scene b on a.id = b.catalog_id and b.is_delete='0' WHERE a.is_delete = '0' and a.work_id = '5'")
-
     @Select("select a.id,a.parent_id,a.name,a.work_id,a.is_delete,b.id as scene_id ,b.scene_code, b.scene_title,b.catalog_id" +
             " from tb_catalog a LEFT JOIN tb_scene b on a.id = b.catalog_id and b.is_delete='0' WHERE a.is_delete = '0' and a.work_id = #{workId}")
-
-//    @Select("select a.*,b.*" +
-//            "from tb_catalog a LEFT JOIN tb_scene b on a.id = b.catalog_id and b.is_delete='0' WHERE a.is_delete = '0' and a.work_id = '5'")
     List<CatalogSceneTree> afindByWorkId(Long workId);
+
+    @Select("select * from tb_catalog where is_delete = 0 and parent_id = #{id}")
+    List<CatalogEntity> findByParentId(Long id);
+
+    @Update("UPDATE tb_catalog SET is_delete = 1 where is_delete = 0 and work_id = #{workId}")
+    void setDeleteByWorkId(Long workId);
 }

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

@@ -14,20 +14,12 @@ import java.util.List;
 @Mapper
 public interface SceneMapper extends IBaseMapper<SceneEntity, Long> {
 
-//    @SelectProvider(type = SceneProvider.class, method = "search")
-//    List<SceneEntity> search(ScenePageDto param);
-//
-//    @SelectProvider(type = SceneProvider.class, method = "searchByUserName")
-//    List<SceneEntity> searchByUserName(ScenePageDto param, String userName, String isShow);
+
 
     @Update("UPDATE tb_scene SET is_index=#{index}")
     void setIndex(Integer index);
 
-//    @Update("UPDATE tb_scene SET is_index=#{index} where user_id = #{userId}")
-//    void setIndexByUserId(Integer index, String userId);
 
-//    @Update("UPDATE tb_scene SET is_index=#{index} where work_id = #{workId}")
-//    void setIndexByWorkId(int index, Long workId);
 
     @Update("UPDATE tb_scene SET is_index=#{index} where id = #{id}")
     void setIndexById(Long id, Integer index);
@@ -81,9 +73,19 @@ public interface SceneMapper extends IBaseMapper<SceneEntity, Long> {
     @Select("select * from tb_scene where is_delete = 0 and catalog_id = #{catalogId}")
     List<SceneEntity> findByCatalogId(Long catalogId);
 
+
     @Select("select * from tb_scene where is_delete = 0 and work_id = #{workId}")
     List<SceneEntity> findByWorkId(Long workId);
 
     @Select("select scene_code from tb_scene where is_delete = 0 and work_id = #{workId} AND type = #{type}")
     List<String> strFindByWorkId(Long workId, String type);
+
+    @Update("UPDATE tb_scene SET catalog_id = #{newCatalogId} where is_delete = 0 and catalog_id = #{oldCatalogId}")
+    void setCatalogByCatalogId(Long newCatalogId, Long oldCatalogId);
+
+    @Update("UPDATE tb_scene SET is_delete = 1 where is_delete = 0 and catalog_id = #{id}")
+    void setDeleteByCatalogId(Long id);
+
+    @Update("UPDATE tb_scene SET is_delete = 1 where is_delete = 0 and work_id = #{workId}")
+    void setDeleteByWorkId(Long workId);
 }

720yun_fd_manage/gis_service/src/main/java/com/gis/service/CatalogService.java

@@ -19,4 +19,6 @@ public interface CatalogService extends IBaseService<CatalogEntity, Long> {
     Result listTree(Long workId);
 
     Result webListTree(Long workId);
+
+    Result remove(Long id);
 }

720yun_fd_manage/gis_service/src/main/java/com/gis/service/SceneService.java

@@ -17,7 +17,6 @@ public interface SceneService extends IBaseService<SceneEntity, Long> {
 
 
 
-//    Result search(ScenePageDto param);
 
     Result upload(MultipartFile file);
 
@@ -38,7 +37,6 @@ public interface SceneService extends IBaseService<SceneEntity, Long> {
 
     Result select4dkk(PageDto param, Long workId);
 
-    Result saveEntity(SceneDto param);
 
 
 
@@ -46,9 +44,9 @@ public interface SceneService extends IBaseService<SceneEntity, Long> {
 
     Result saves(List<SceneDto> param);
 
-    List<SceneEntity> findByWorkId(Long workId);
 
     List<String> strFindByWorkId(Long workId, String type);
 
     Result saveUseHots(UseHotsDto param);
+
 }

720yun_fd_manage/gis_service/src/main/java/com/gis/service/WorkService.java

@@ -13,16 +13,11 @@ import com.gis.domain.entity.WorkEntity;
 public interface WorkService extends IBaseService<WorkEntity, Long> {
 
 
-
-//    Result upload(MultipartFile file, String type);
-//
-//    List<WorkEntity> findByType(String userId, String type);
-//
-//    List<WorkEntity> findByStatusAndTypeAndUserId(int status, String type, String userId);
-
     Result search(PageDto param);
 
     Result<WorkEntity> entitySave(WorkDto param);
 
     Result<WorkEntity> entityAdd();
+
+    Result remove(Long id);
 }

720yun_fd_manage/gis_service/src/main/java/com/gis/service/impl/CatalogServiceImpl.java

@@ -36,6 +36,8 @@ public class CatalogServiceImpl extends IBaseServiceImpl<CatalogEntity, Long> im
 
 
 
+
+
     @Override
     public IBaseMapper<CatalogEntity, Long> getBaseMapper() {
         return this.entityMapper;
@@ -49,10 +51,15 @@ public class CatalogServiceImpl extends IBaseServiceImpl<CatalogEntity, Long> im
         if (id == null) {
             entity = new CatalogEntity();
             BeanUtils.copyProperties(param, entity);
-//            entity.setUserId(getUserNameForToken());
-//            entity.setWorkId(param.getWorkId());
             save(entity);
 
+            // 若场景二级分组，把父分组场景移动到二级分组
+            Long oldCatalogId = entity.getParentId();
+            if (oldCatalogId != null) {
+                sceneMapper.setCatalogByCatalogId(entity.getId(), oldCatalogId);
+            }
+
+
         } else {
             entity = findById(id);
             if (entity == null) {
@@ -70,7 +77,6 @@ public class CatalogServiceImpl extends IBaseServiceImpl<CatalogEntity, Long> im
 
     @Override
     public Result listTree(Long workId) {
-//        List<CatalogEntity> list = entityMapper.findByUserId(getUserNameForToken());
         List<CatalogEntity> list = entityMapper.findByWorkId(workId);
         CatalogTreeUtil treeUtil = new CatalogTreeUtil(list, sceneMapper);
         return Result.success(treeUtil.buildTree());
@@ -83,4 +89,38 @@ public class CatalogServiceImpl extends IBaseServiceImpl<CatalogEntity, Long> im
         SceneTreeUtil sceneTreeUtil = new SceneTreeUtil(list);
         return Result.success(sceneTreeUtil.buildTree());
     }
+
+    @Override
+    public Result remove(Long id) {
+
+        // 递归删除
+        this.delete(id);
+
+        return Result.success();
+    }
+
+    private void delete(Long id){
+        CatalogEntity entity = this.findById(id);
+        if (entity == null) {
+            return;
+        }
+
+        entity.setIsDelete(1);
+        entity.setUpdateTime(new Date());
+        this.update(entity);
+
+        // 删除分组，需要把对应的场景删除
+        sceneMapper.setDeleteByCatalogId(id);
+
+        List<CatalogEntity> parentList = entityMapper.findByParentId(id);
+        if (parentList.size() > 0) {
+            for (CatalogEntity catalogEntity : parentList) {
+                // 递归删除
+                delete(catalogEntity.getId());
+            }
+        }
+    }
+
+
+
 }

720yun_fd_manage/gis_service/src/main/java/com/gis/service/impl/SceneServiceImpl.java

@@ -46,11 +46,8 @@ public class SceneServiceImpl extends IBaseServiceImpl<SceneEntity, Long> implem
     @Autowired
     WorkService workService;
 
-    @Autowired
-    private CatalogMapper catalogMapper;
 
-    @Autowired
-    private CatalogService catalogService;
+
 
 
     @Autowired
@@ -97,12 +94,12 @@ public class SceneServiceImpl extends IBaseServiceImpl<SceneEntity, Long> implem
         try {
             HttpResponse httpResponse = HttpUtils.doPost(url, headers, reqParam);
             restResult = EntityUtils.toString(httpResponse.getEntity(), "UTF-8");
-            log.info("restResult: " + restResult);
+            log.debug("restResult: " + restResult);
 
-            // JSONObject.parse(restResult);
 
             reJson = JSONObject.parseObject(restResult);
             int code = reJson.getInteger("code");
+            log.info("resultCode: {}", code);
 
             if (code == 3004) {
                 String msg = reJson.getString("msg");
@@ -132,6 +129,7 @@ public class SceneServiceImpl extends IBaseServiceImpl<SceneEntity, Long> implem
                     pro.setSceneName(proJson.getString("sceneName"));
                     pro.setThumb(proJson.getString("thumb"));
                     pro.setStatus(proJson.getInteger("status"));
+                    pro.setCreateTime(proJson.getString("createTime"));
 
                     if (useScenes.contains(pro.getNum())) {
                         pro.setIsUse(1);
@@ -151,32 +149,6 @@ public class SceneServiceImpl extends IBaseServiceImpl<SceneEntity, Long> implem
     }
 
     @Override
-    public Result saveEntity(SceneDto param) {
-        Long id = param.getId();
-        SceneEntity entity = null;
-        if (id == null) {
-            entity = new SceneEntity();
-            BeanUtils.copyProperties(param, entity);
-
-            // 当没有分组时，创建默认分组
-            if (param.getCatalogId() == null) {
-                // 检查该用户是否存在默认分组
-                Long catalogId = getCatalogId(entity.getWorkId());
-                entity.setCatalogId(catalogId);
-            }
-            this.save(entity);
-        } else {
-            entity = findById(id);
-            BeanUtils.copyProperties(param, entity);
-            entity.setUpdateTime(new Date());
-            this.update(entity);
-
-        }
-        return Result.success(entity);
-    }
-
-
-    @Override
     public Result saves(List<SceneDto> params) {
         SceneEntity entity = null;
         for (SceneDto sceneDto : params) {
@@ -184,13 +156,6 @@ public class SceneServiceImpl extends IBaseServiceImpl<SceneEntity, Long> implem
             if (id == null) {
                 entity = new SceneEntity();
                 BeanUtils.copyProperties(sceneDto, entity);
-
-                // 当没有分组时，创建默认分组
-                if (sceneDto.getCatalogId() == null) {
-                    // 检查该用户是否存在默认分组
-                    Long catalogId = getCatalogId(entity.getWorkId());
-                    entity.setCatalogId(catalogId);
-                }
                 this.save(entity);
             } else {
                 entity = findById(id);
@@ -204,10 +169,7 @@ public class SceneServiceImpl extends IBaseServiceImpl<SceneEntity, Long> implem
         return Result.success();
     }
 
-    @Override
-    public List<SceneEntity> findByWorkId(Long workId) {
-        return entityMapper.findByWorkId(workId);
-    }
+
 
     @Override
     public List<String> strFindByWorkId(Long workId, String type) {
@@ -221,26 +183,7 @@ public class SceneServiceImpl extends IBaseServiceImpl<SceneEntity, Long> implem
     }
 
 
-    /**
-     * 检查用户是否存在默认分组
-     */
-    private Long getCatalogId(Long workId) {
-//        List<CatalogEntity> list = catalogMapper.findByUserId(userId);
-        List<CatalogEntity> list = catalogMapper.findByWorkId(workId);
-        CatalogEntity entity = null;
-        if (list.size() > 0) {
-            entity = list.get(0);
-        } else {
-            entity = new CatalogEntity();
-            entity.setName("全部场景");
-//            entity.setUserId(userId);
-            entity.setWorkId(workId);
-            catalogService.save(entity);
 
-        }
-        return entity.getId();
-
-    }
 
 
     @Override
@@ -471,13 +414,6 @@ public class SceneServiceImpl extends IBaseServiceImpl<SceneEntity, Long> implem
     }
 
 
-    @Test
-    public void pngToJpg() {
-//        String png = "C:\\Users\\Administrator\\Desktop\\33\\2_1.png";
-//        String jpg = "C:\\Users\\Administrator\\Desktop\\33\\png\\1.jpn";
-//        ImgUtil.convert();
-    }
-
 
     @Override
     public Result saveUseHots(UseHotsDto param) {
@@ -497,4 +433,6 @@ public class SceneServiceImpl extends IBaseServiceImpl<SceneEntity, Long> implem
     }
 
 
+
+
 }

720yun_fd_manage/gis_service/src/main/java/com/gis/service/impl/WorkServiceImpl.java

@@ -4,9 +4,13 @@ import com.gis.common.constant.ConfigConstant;
 import com.gis.common.util.*;
 import com.gis.domain.dto.PageDto;
 import com.gis.domain.dto.WorkDto;
+import com.gis.domain.entity.CatalogEntity;
 import com.gis.domain.entity.WorkEntity;
+import com.gis.mapper.CatalogMapper;
+import com.gis.mapper.SceneMapper;
 import com.gis.mapper.WorkMapper;
 import com.gis.mapper.IBaseMapper;
+import com.gis.service.CatalogService;
 import com.gis.service.WorkService;
 import com.github.pagehelper.PageInfo;
 import lombok.extern.slf4j.Slf4j;
@@ -37,6 +41,17 @@ public class WorkServiceImpl extends IBaseServiceImpl<WorkEntity, Long> implemen
     @Autowired
     QrCodeUtils qrCodeUtils;
 
+
+    @Autowired
+    private CatalogMapper catalogMapper;
+
+    @Autowired
+    CatalogService catalogService;
+
+    @Autowired
+    SceneMapper sceneMapper;
+
+
     @Override
     public IBaseMapper<WorkEntity, Long> getBaseMapper() {
         return this.entityMapper;
@@ -78,14 +93,37 @@ public class WorkServiceImpl extends IBaseServiceImpl<WorkEntity, Long> implemen
                  entity.setShare(url);
             }
 
-            // 设置为显示状态
-            entity.setStatus(1);
+            if (entity.getStatus() == 0) {
+                // 设置为显示状态
+                entity.setStatus(1);
+                // 创建默认场景
+                initCatalog(id);
+            }
+
             entity.setUpdateTime(new Date());
             this.update(entity);
         }
         return Result.success();
     }
 
+
+
+
+    /**
+     * 创建默认场景
+     * @param workId
+     */
+    private void initCatalog(Long workId) {
+        List<CatalogEntity> list = catalogMapper.findByWorkId(workId);
+        if (list.size() == 0) {
+            CatalogEntity  entity = new CatalogEntity();
+            entity.setName("全部场景");
+            entity.setWorkId(workId);
+            catalogService.save(entity);
+        }
+
+    }
+
     @Override
     public Result<WorkEntity> entityAdd() {
         WorkEntity entity = new WorkEntity();
@@ -94,5 +132,27 @@ public class WorkServiceImpl extends IBaseServiceImpl<WorkEntity, Long> implemen
         return Result.success(entity);
     }
 
+    @Override
+    public Result remove(Long id) {
+        WorkEntity entity = this.findById(id);
+        if (entity == null) {
+            return Result.success();
+        }
+        entity.setIsDelete(1);
+        entity.setUpdateTime(new Date());
+
+        // 分组、场景设置为删除
+        catalogMapper.setDeleteByWorkId(id);
+        sceneMapper.setDeleteByWorkId(id);
+
+
+
+        this.update(entity);
+
+
+
+        return Result.success();
+    }
+
 
 }

720yun_fd_manage/gis_web/src/main/java/com/gis/web/controller/CatalogController.java

@@ -41,14 +41,13 @@ public class CatalogController extends BaseController {
 
     /**
      * 测试，还没成功，感觉是数据结构没有定好
-     * @param workId
      * @return
      */
-    @ApiOperation(value = "test场景列表", position = 1)
-    @PostMapping("testListTree/{workId}")
-    public Result testListTree(@PathVariable Long workId) {
-        return catalogService.webListTree(workId);
-    }
+//    @ApiOperation(value = "test场景列表", position = 1)
+//    @PostMapping("testListTree/{workId}")
+//    public Result testListTree(@PathVariable Long workId) {
+//        return catalogService.webListTree(workId);
+//    }
 
 
     @ApiOperation(value = "新增/修改分组", position = 1)
@@ -71,14 +70,7 @@ public class CatalogController extends BaseController {
     @ApiOperation(value = "删除", position = 1)
     @GetMapping("remove/{id}")
     public Result remove( @PathVariable Long id) {
-        CatalogEntity entity = catalogService.findById(id);
-        if (entity == null) {
-            return Result.success();
-        }
-        entity.setIsDelete(1);
-        entity.setUpdateTime(new Date());
-        catalogService.update(entity);
-        return Result.success();
+        return catalogService.remove(id);
     }
 
 

720yun_fd_manage/gis_web/src/main/java/com/gis/web/controller/SceneController.java

@@ -4,8 +4,10 @@ package com.gis.web.controller;
 import com.gis.common.util.Result;
 import com.gis.domain.dto.*;
 import com.gis.domain.entity.SceneEntity;
+import com.gis.domain.entity.WorkEntity;
 import com.gis.service.FodderService;
 import com.gis.service.SceneService;
+import com.gis.service.WorkService;
 import com.gis.web.aop.WebControllerLog;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;
@@ -42,6 +44,9 @@ public class SceneController extends BaseController {
     @Autowired
     FodderService fodderService;
 
+    @Autowired
+    WorkService workService;
+
 
     @ApiOperation(value = "保存关联场景热点", position = 1, notes = "sceneCodes:场景关联的场景码")
     @PostMapping("save/useHots")
@@ -70,13 +75,6 @@ public class SceneController extends BaseController {
 
 
 
-    @ApiOperation(value = "场景新增/修改", position = 1)
-    @PostMapping("save")
-    public Result save(@RequestBody SceneDto param) {
-        return sceneService.saveEntity(param);
-    }
-
-
     @ApiOperation(value = "批量场景新增/修改", position = 1)
     @PostMapping("saves")
     public Result saves(@RequestBody List<SceneDto> param) {
@@ -109,18 +107,28 @@ public class SceneController extends BaseController {
         return sceneService.editSomeData(param);
     }
 
-    @ApiOperation(value = "设置初始场景", position = 3)
+    @ApiOperation(value = "初始场景-设置", position = 3)
     @PostMapping("setIndex/{id}/{workId}")
     public Result setIndex(@PathVariable Long id, @PathVariable Long workId) {
         return sceneService.setIndex(id, workId);
     }
 
-    @ApiOperation(value = "获取初始场景", position = 3)
+    @ApiOperation(value = "初始场景-获取", position = 3)
     @GetMapping("getIndex/{workId}")
     public Result getIndex(@PathVariable Long workId) {
         return sceneService.getIndex(workId);
     }
 
+    @ApiOperation(value = "初始场景-删除", position = 3)
+    @GetMapping("removeIndex/{workId}")
+    public Result removeIndex(@PathVariable Long workId) {
+        WorkEntity entity = workService.findById(workId);
+        entity.setSceneIndex(null);
+        entity.setUpdateTime(new Date());
+        workService.update(entity);
+        return Result.success();
+    }
+
 
     @WebControllerLog(description = "场景管理-保存初始画面")
     @ApiOperation("保存初始画面")
@@ -160,11 +168,22 @@ public class SceneController extends BaseController {
     public Result remove(@PathVariable Long id) {
         log.info("场景删除");
         SceneEntity entity = sceneService.findById(id);
+
+        Long workId = entity.getWorkId();
         entity.setIsDelete(1);
-        // 设置场景为0
-        entity.setIsIndex(0);
         entity.setUpdateTime(new Date());
         sceneService.update(entity);
+
+        // 检查此场景id是否为初始场景,如是：设置为null;
+        WorkEntity workEntity = workService.findById(workId);
+
+        if (workEntity != null  || workEntity.getSceneIndex().equals(id) ) {
+            workEntity.setSceneIndex(null);
+            workEntity.setUpdateTime(new Date());
+            workService.update(workEntity);
+        }
+
+
         return Result.success();
     }
 

720yun_fd_manage/gis_web/src/main/java/com/gis/web/controller/WorkController.java

@@ -71,17 +71,23 @@ public class WorkController extends BaseController {
         return workService.entitySave(param);
     }
 
+//    @ApiOperation(value = "删除", position = 1)
+//    @PostMapping("remove/{id}")
+//    public Result remove( @PathVariable Long id) {
+//        WorkEntity entity = workService.findById(id);
+//        if (entity == null) {
+//            return Result.success();
+//        }
+//        entity.setIsDelete(1);
+//        entity.setUpdateTime(new Date());
+//        workService.update(entity);
+//        return Result.success();
+//    }
+
     @ApiOperation(value = "删除", position = 1)
     @PostMapping("remove/{id}")
     public Result remove( @PathVariable Long id) {
-        WorkEntity entity = workService.findById(id);
-        if (entity == null) {
-            return Result.success();
-        }
-        entity.setIsDelete(1);
-        entity.setUpdateTime(new Date());
-        workService.update(entity);
-        return Result.success();
+        return workService.remove(id);
     }
 
 

720yun_fd_manage/remark-m.md

@@ -41,7 +41,7 @@
    
    
 # sit 是用的四维看看测试服务器  
-    web: http://test.4dkankan.com/panorama/edit.html?id=17#/base
+    web: https://test.4dkankan.com/panorama/material.html
     13112311178    11111111Aa
     doc: http://120.25.146.52:8001/doc.html