tijiao

simulation-resource-server/src/main/java/com/css/simulation/resource/server/app/impl/MultiSimulationProjectServiceImpl.java

@@ -25,6 +25,7 @@ import com.alibaba.fastjson.JSONObject;
 import com.css.simulation.resource.server.app.service.job_manage.MultiSimulationProjectService;
 import com.css.simulation.resource.server.infra.db.mysql.mapper.*;
 import com.css.simulation.resource.server.infra.util.PageUtil;
+import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
 import lombok.SneakyThrows;
 import lombok.extern.slf4j.Slf4j;
@@ -346,6 +347,7 @@ public class MultiSimulationProjectServiceImpl implements MultiSimulationProject
         }
         setPage(param.getPageNum(), param.getPageSize());
         List<MultiSimulationSceneVO> multiSimulationSceneVOS = simulationSceneMapper.selectSceneList(param);
+//        PageHelper.clearPage();
         if (!CollectionUtils.isEmpty(multiSimulationSceneVOS)) {
             for (MultiSimulationSceneVO scene : multiSimulationSceneVOS) {
                 String sceneId = scene.getSceneId();

simulation-resource-server/src/main/java/com/css/simulation/resource/server/app/impl/SimulationMapServiceImpl.java

@@ -97,6 +97,17 @@ public class SimulationMapServiceImpl implements SimulationMapService {
         if (Objects.isNull(simulationMapVO)){
             return new ResponseBodyVO<>(ResponseBodyVO.Response.CLIENT_FAILURE, "未找到有效的id");
         }
+        String mapPath = simulationMapVO.getMapPath();
+        ResponseBodyVO<String> publicUrl = fileDownService.getPublicUrl(mapPath);
+        if (publicUrl.isStatus()){
+            simulationMapVO.setMapPath(publicUrl.getInfo());
+        }
+        String mapOsgbPath = simulationMapVO.getMapOsgbPath();
+        ResponseBodyVO<String> osUrl = fileDownService.getPublicUrl(mapOsgbPath);
+        if (osUrl.isStatus()){
+            simulationMapVO.setMapOsgbPath(osUrl.getInfo());
+        }
+        
         SimulationMapPathParam simulationMapPathParam = new SimulationMapPathParam();
         simulationMapPathParam.setMapId(param.getMapId());
         List<SimulationMapPathVO> simulationMapPathPOS = mapPathMapper.selectSimulationMapPathList(simulationMapPathParam);
@@ -195,6 +206,9 @@ public class SimulationMapServiceImpl implements SimulationMapService {
         if (!response.isStatus()){
             return new ResponseBodyVO<>(ResponseBodyVO.Response.CLIENT_FAILURE, "上传失败");
         }
+        String previewUrl = response.getInfo();
+        String mapUrl = previewUrl.substring(previewUrl.indexOf("/" + DictConstants.MAP_DRIVER_FILE), previewUrl.indexOf("?"));
+
         String osgbFileName = fileOsgb.getOriginalFilename();
         if (osgbFileName == null){
             return new ResponseBodyVO<>(ResponseBodyVO.Response.CLIENT_FAILURE, "文件名为空，请检查！");
@@ -204,9 +218,11 @@ public class SimulationMapServiceImpl implements SimulationMapService {
         if (!responseOs.isStatus()){
             return new ResponseBodyVO<>(ResponseBodyVO.Response.CLIENT_FAILURE, "上传失败");
         }
-        String previewUrl = response.getInfo();
+        String osUrl = responseOs.getInfo();
+        String osMinioUrl = osUrl.substring(osUrl.indexOf("/" + DictConstants.MAP_DRIVER_FILE), osUrl.indexOf("?"));
+
         SimulationMapPO simulationMapPO = new SimulationMapPO();
-        simulationMapPO.setMapPath(previewUrl).setMapOsgbPath(responseOs.getInfo()).setMapName(param.getMapName()).setMapDescription(param.getMapDescription())
+        simulationMapPO.setMapPath(mapUrl).setMapOsgbPath(osMinioUrl).setMapName(param.getMapName()).setMapDescription(param.getMapDescription())
             .setMapJson(object.toJSONString()).setPathNum(param.getPathNum()).setMapCode("").setId(StringUtil.getRandomUUID());
         int i = mapMapper.addSimulationMap(simulationMapPO);
         if (i <= 0){

simulation-resource-server/src/main/java/com/css/simulation/resource/server/infra/feign/fallback/FileDownServiceFallback.java

@@ -25,6 +25,11 @@ public class FileDownServiceFallback implements FileDownService {
         return new ResponseBodyVO<>(ResponseBodyVO.Response.SERVER_FAILURE);
     }
 
+    @Override
+    public ResponseBodyVO<String> getPublicUrl(@RequestParam("objectName")String objectName) {
+        return new ResponseBodyVO<>(ResponseBodyVO.Response.SERVER_FAILURE);
+    }
+
     @Override
     public ResponseBodyVO<String> uploadLocalFile(@RequestParam("localFilePath") String localFilePath, @RequestParam("objectName") String objectName) {
         return new ResponseBodyVO<>(ResponseBodyVO.Response.SERVER_FAILURE);

simulation-resource-server/src/main/java/com/css/simulation/resource/server/infra/feign/service/FileDownService.java

@@ -28,6 +28,9 @@ public interface FileDownService {
     ResponseBodyVO<String> upload(@RequestPart("file") MultipartFile file,
                                   @RequestParam("objectName") String objectName);
 
+    @GetMapping(value = "/minio/getPublicUrl")
+    ResponseBodyVO<String> getPublicUrl(@RequestParam("objectName") String objectName);
+
     @GetMapping(value = "/minio/uploadLocalFile")
     ResponseBodyVO<String> uploadLocalFile(@RequestParam("localFilePath") String localFilePath,
                                            @RequestParam("objectName") String objectName);