2 Incheckningar ffaa0e6f83 ... d2a0e2ec52

Upphovsman SHA1 Meddelande Datum
  wuweihao d2a0e2ec52 并发导致edit文件误删 1 år sedan
  wuweihao 7fad0b8266 并发导致edit文件误删 1 år sedan

+ 3 - 2
gis_service/src/main/java/com/gis/service/impl/SceneServiceImpl.java

@@ -198,8 +198,9 @@ public class SceneServiceImpl extends IBaseServiceImpl<SceneEntity, Long> implem
             log.info("文件上传到oss完成: {}", ossPath);
 
             // 2022-5-16 删除物理文件-直接删除edit目录
-            FileUtil.del(basePath);
-            log.info("删除路径:{}", basePath);
+            // 2024-07-19 并发时会导致刚上产在edit目录数据被误删,改为删除本次上传的文件地址
+            FileUtil.del(savePath);
+            log.info("删除路径:{}", savePath);
             return Result.success((Object) ossPath);
         } catch (QiniuException e) {
             log.error("上传七牛云失败");

+ 4 - 1
gis_web/src/main/java/com/gis/web/controller/SceneController.java

@@ -113,6 +113,7 @@ public class SceneController extends BaseController {
             sceneService.save(entity);
         }
 
+
         return Result.success(entity);
     }
 
@@ -136,8 +137,9 @@ public class SceneController extends BaseController {
 
 
 
-
     /**
+     *
+     *
      * 软删除
      */
     @ApiOperation("场景删除")
@@ -162,6 +164,7 @@ public class SceneController extends BaseController {
 
 
 
+
     @ApiOperation("场景详情")
     @GetMapping("detail/{id}")
     public Result detail(@PathVariable Long id) {