大场景数据需要放到data目录下

gis_service/src/main/java/com/gis/service/AgeService.java

@@ -10,5 +10,5 @@ import org.springframework.web.multipart.MultipartFile;
 public interface AgeService  {
 
 
-    Result uploadAge(MultipartFile file);
+    Result uploadAge(MultipartFile file, String name);
 }

gis_service/src/main/java/com/gis/service/aop/WebLogAspect.java

@@ -40,7 +40,7 @@ public class WebLogAspect {
         // 记录下请求内容
         log.warn("start:{}, uuid:{}" , request.getRequestURI(), startTime);
         log.info("request Method : {}, IP : {}" , request.getMethod() , request.getRemoteAddr());
-
+        log.info("request Args : {}", Arrays.toString(joinPoint.getArgs()));
         // 获取token
         String token = request.getHeader("token");
         if (StringUtils.isBlank(token)) {

gis_service/src/main/java/com/gis/service/impl/AgeServiceImpl.java

@@ -38,7 +38,7 @@ public class AgeServiceImpl implements AgeService {
     ConfigConstant configConstant;
 
     @Override
-    public Result uploadAge(MultipartFile file) {
+    public Result uploadAge(MultipartFile file, String name) {
 
 
         String sceneCode = getSceneCode(file);
@@ -48,6 +48,7 @@ public class AgeServiceImpl implements AgeService {
         if (dbEntity == null) {
             //创建父级
             dbEntity = new SceneEntity();
+            dbEntity.setSceneTitle(name);
             dbEntity.setSceneCode(sceneCode);
             dbEntity.setVersion(1);
             sceneService.save(dbEntity);
@@ -70,10 +71,11 @@ public class AgeServiceImpl implements AgeService {
         VisionToVisionModelData(ageBaseSceneCodePath);
         createSomeDataJaon(ageBaseSceneCodePath, newSceneCode);
         createData2Js(ageBaseSceneCodePath);
-        String scenePath = configConstant.serverBasePath + "/" + newSceneCode;
+        String scenePath = configConstant.serverBasePath + "/data/" + newSceneCode;
         moveFile(ageBaseSceneCodePath, scenePath);
 
         SceneEntity sceneEntity = new SceneEntity();
+        sceneEntity.setSceneTitle(name);
         sceneEntity.setSceneCode(newSceneCode);
         sceneEntity.setPath("/data/" + newSceneCode);
         Long parentId = dbEntity.getId();

gis_service/src/main/java/com/gis/service/tree/SceneTreeUtil.java

@@ -19,6 +19,8 @@ public class SceneTreeUtil {
             treeGrid.setId(n.getId());
             treeGrid.setSceneTitle(n.getSceneTitle());
             treeGrid.setSceneCode(n.getSceneCode());
+            treeGrid.setCreateTime(n.getCreateTime());
+            treeGrid.setUpdateTime(n.getUpdateTime());
 
 //            if (n.getAuthority() != null){
 //                treeGrid.setAuthority(n.getAuthority());

gis_service/src/main/java/com/gis/service/tree/vo/SceneTree.java

@@ -1,8 +1,10 @@
 package com.gis.service.tree.vo;
 
 import com.alibaba.fastjson.annotation.JSONField;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import java.util.Date;
 import java.util.List;
 
 
@@ -20,6 +22,10 @@ public class SceneTree {
 
     private Long parentId;
 
+    private Date createTime;
+
+    private Date updateTime;
+
 
     @JSONField(serialize = false)
     private boolean checked = false;

gis_web/src/main/java/com/gis/web/controller/AgeController.java

@@ -23,9 +23,9 @@ public class AgeController {
 
     @ApiOperation(value = "上传四维看看完整数据", notes = "必须安指定结构上传，否则上传失败， 场景码(重复加一)")
     @PostMapping("uploadAge")
-    public Result uploadAge(MultipartFile file){
+    public Result uploadAge(MultipartFile file, String name){
 
-        return ageService.uploadAge(file);
+        return ageService.uploadAge(file, name);
 
     }
 }