1

src/main/java/com/fdkankan/fusion/common/util/MyFileUtils.java

@@ -0,0 +1,11 @@
+package com.fdkankan.fusion.common.util;
+
+import java.io.File;
+
+public class MyFileUtils {
+
+    public static String replaceSeparator(String filePath){
+        return filePath.replace(File.separator,"/");
+    }
+
+}

src/main/java/com/fdkankan/fusion/down/CaseDownService.java

@@ -290,7 +290,7 @@ public class CaseDownService {
                         String oldPath = sceneInfoObj.getString("webBin");
                         String webBin = null;
                         if(StringUtils.isNotBlank(mapping)){
-                            webBin =newPath + mapping+ File.separator+ oldPath;
+                            webBin =newPath + mapping+ "/"+ oldPath;
                         }else {
                             webBin = newPath+ oldPath;
                         }

src/main/java/com/fdkankan/fusion/down/FusionDownService.java

@@ -267,7 +267,7 @@ public class FusionDownService {
                         String oldPath = sceneInfoObj.getString("webBin");
                         String webBin = null;
                         if(StringUtils.isNotBlank(mapping)){
-                            webBin =newPath + mapping+ File.separator+ oldPath;
+                            webBin =newPath + mapping+ "/"+ oldPath;
                         }else {
                             webBin = newPath+ oldPath;
                         }

src/main/java/com/fdkankan/fusion/entity/CaseOverview.java

@@ -65,10 +65,10 @@ public class CaseOverview implements Serializable {
     private Integer tbStatus;
 
     @TableField("create_time")
-    private Date createTime;
+    private String createTime;
 
     @TableField("update_time")
-    private Date updateTime;
+    private String updateTime;
 
     @TableField("kankan_cover")
     private String kankanCover;

src/main/java/com/fdkankan/fusion/entity/CaseTabulation.java

@@ -63,10 +63,10 @@ public class CaseTabulation implements Serializable {
     private Integer tbStatus;
 
     @TableField("create_time")
-    private Date createTime;
+    private String createTime;
 
     @TableField("update_time")
-    private Date updateTime;
+    private String updateTime;
 
     @TableField("overview_id")
     private Integer overviewId;

src/main/java/com/fdkankan/fusion/mq/consumer/OsgbToB3dmConsumer.java

@@ -71,7 +71,7 @@ public class OsgbToB3dmConsumer {
             }
             //String ossPath = sourcePath.replace(CacheUtil.settingEntity.getProfilePath(),"");
             //localToOssUtil.uploadOss(sourcePath,ossPath);
-            String url = CacheUtil.mapping + dir + File.separator +jsonFile.getName();
+            String url = MyFileUtils.replaceSeparator(CacheUtil.mapping + dir + File.separator +jsonFile.getName());
             HashMap<String,String> resultMap = ReadXmlUtil.getLatMap(file);
             if(resultMap != null && !resultMap.isEmpty()){
                 commonUploadService.updateByPath(uploadId,url,resultMap.get("wgs84"),resultMap.get("gcj02"),sourcePath);

src/main/java/com/fdkankan/fusion/service/impl/CommonUploadServiceImpl.java

@@ -8,10 +8,7 @@ import com.fdkankan.fusion.common.OssPath;
 import com.fdkankan.fusion.common.ResultCode;
 import com.fdkankan.fusion.common.ResultData;
 import com.fdkankan.fusion.common.enums.FileTypeEnum;
-import com.fdkankan.fusion.common.util.FileWriterUtil;
-import com.fdkankan.fusion.common.util.OBJToGLBUtil;
-import com.fdkankan.fusion.common.util.ShellUtil;
-import com.fdkankan.fusion.common.util.LocalToOssUtil;
+import com.fdkankan.fusion.common.util.*;
 import com.fdkankan.fusion.config.CacheUtil;
 import com.fdkankan.fusion.entity.CommonUpload;
 import com.fdkankan.fusion.entity.DictFile;
@@ -84,7 +81,7 @@ public class CommonUploadServiceImpl extends ServiceImpl<ICommonUploadMapper, Co
             }
             //localToOssUtil.uploadOss(tempFile.getPath(), ossPath);
             //String url = this.ossUrlPrefix + ossPath;
-            String url = CacheUtil.mapping + ossPath;
+            String url = MyFileUtils.replaceSeparator(CacheUtil.mapping + ossPath);
 
             FileTypeEnum fileTypeEnum = FileTypeEnum.getByType(extName.replace(".", ""));
             if(fileTypeEnum == null){
@@ -160,7 +157,7 @@ public class CommonUploadServiceImpl extends ServiceImpl<ICommonUploadMapper, Co
             throw new BusinessException(ResultCode.FILE_TYPE_ERROR2);
         }
         Integer status = StringUtils.isNotBlank(url) ?1:-1;
-        url = StringUtils.isNotBlank(url) ?CacheUtil.mapping + url:null;
+        url = StringUtils.isNotBlank(url) ? MyFileUtils.replaceSeparator(CacheUtil.mapping + url):null;
         CommonUpload commonUpload = commonUploadService.add(oldName,url, String.valueOf(getDirectorySize(unZipFile)),
                 null, fileTypeEnum, modelFileFormat,resultFormat,status,unZipFile.getPath(),dictId);
         if("osgb".equals(modelFileFormat)){

src/main/java/com/fdkankan/fusion/service/impl/ModelServiceImpl.java

@@ -275,7 +275,7 @@ public class ModelServiceImpl extends ServiceImpl<IModelMapper, Model> implement
                 if(localToOssUtil.existKey( scene.getWebPath() +meshPath +"/mesh.obj")){
                     Long size = localToOssUtil.getSizeCount( scene.getWebPath() +meshPath);
                     model.setModelSize(FileWriterUtil.setFileSize(size));
-                    model.setModelGlbUrl(JSONArray.toJSONString(Arrays.asList(scene.getMapping()+File.separator + meshPath+"/mesh.obj")));
+                    model.setModelGlbUrl(JSONArray.toJSONString(Arrays.asList(scene.getMapping()+"/" + meshPath+"/mesh.obj")));
                 }else {
                     List<String> objPaths = new ArrayList<>();
                     String meshPathjs =  String.format(FilePath.OBJ_OSS_PATH, num)+"/data/";
@@ -291,7 +291,7 @@ public class ModelServiceImpl extends ServiceImpl<IModelMapper, Model> implement
                         for (Object object : floors1) {
                             JSONObject jb = (JSONObject) object;
                             String string = jb.getString("objPath");
-                            objPaths.add(scene.getMapping()+File.separator +meshPathjs + string);
+                            objPaths.add(scene.getMapping()+"/" +meshPathjs + string);
                         }
                         model.setModelGlbUrl(JSONArray.toJSONString(objPaths));
                         Long size = localToOssUtil.getSize(scene.getWebPath() +meshPath);
@@ -404,13 +404,13 @@ public class ModelServiceImpl extends ServiceImpl<IModelMapper, Model> implement
                     localToOssUtil.uploadOss(localGlbPath,ossGlbPath);
                     if(ossGlbPath.contains("lod_")){
                         if(ossGlbPath.contains("lod_0")){
-                            ossGlbPaths.add(CacheUtil.mapping +File.separator +ossGlbPath);
+                            ossGlbPaths.add(CacheUtil.mapping +ossGlbPath);
                             modelSize +=  localToOssUtil.getSize(ossGlbPath);
                         }
                         continue;
                     }
                     modelSize +=  localToOssUtil.getSize(ossGlbPath);
-                    ossGlbPaths.add( CacheUtil.mapping +File.separator+ossGlbPath);
+                    ossGlbPaths.add( CacheUtil.mapping +ossGlbPath);
                 }
                 model.setModelSize(FileWriterUtil.setFileSize(modelSize));
                 FileUtil.del(objPath);

src/main/java/com/fdkankan/fusion/service/impl/UploadService.java

@@ -108,9 +108,9 @@ public class UploadService {
             String format = suffixName.replace(".", "");
             FileTypeEnum fileTypeEnum = FileTypeEnum.getByType(format);
 
-            commonUploadService.add(fileName.replace(suffixName, ""), CacheUtil.mapping + ossPath,
+            commonUploadService.add(fileName.replace(suffixName, ""), MyFileUtils.replaceSeparator(CacheUtil.mapping + ossPath),
                     String.valueOf(file.getSize()), uuid, fileTypeEnum, format,format,1,localFile.getPath(), null);
-            return CacheUtil.mapping + ossPath;
+            return MyFileUtils.replaceSeparator(CacheUtil.mapping + ossPath);
         }catch (Exception e){
             log.info("upload-error:{}",e);
             throw new BusinessException(ResultCode.UPLOAD_ERROR.code,ResultCode.UPLOAD_ERROR.msg);

src/main/java/com/fdkankan/fusion/task/InitService.java

@@ -7,6 +7,7 @@ import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.fdkankan.fusion.common.util.LocalToOssUtil;
+import com.fdkankan.fusion.common.util.MyFileUtils;
 import com.fdkankan.fusion.config.CacheUtil;
 import com.fdkankan.fusion.down.CaseDownService;
 import com.fdkankan.fusion.entity.*;
@@ -83,7 +84,7 @@ public class InitService {
             if(defaultIcon.isEmpty()){
                 hotIcon = new HotIcon();
                 hotIcon.setIconTitle("系统默认");
-                hotIcon.setIconUrl("profile"+ File.separator+"fusion" + File.separator +"default"+File.separator+"tag_icon_default.svg" );
+                hotIcon.setIconUrl(MyFileUtils.replaceSeparator("profile"+ File.separator+"fusion" + File.separator +"default"+File.separator+"tag_icon_default.svg" ));
                 hotIcon.setIsSystem(1);
                 hotIconService.save(hotIcon);
                 log.info("默认热点数据不存在新建,{}",hotIcon.getIconUrl());