Эх сурвалжийг харах

通用接口,上传返回原始文件名

shiqian 4 жил өмнө
parent
commit
02f281c871

+ 10 - 0
boman-api/boman-domain/src/main/java/com.boman.domain/SysFile.java

@@ -29,6 +29,16 @@ public class SysFile
 
     private String absolutePath;
 
+    private String originalName;
+
+    public String getOriginalName() {
+        return originalName;
+    }
+
+    public void setOriginalName(String originalName) {
+        this.originalName = originalName;
+    }
+
     public String getAbsolutePath() {
         return absolutePath;
     }

+ 2 - 0
boman-modules/boman-file/src/main/java/com/boman/file/controller/SysFileController.java

@@ -45,9 +45,11 @@ public class SysFileController
             SysFile sysFile = new SysFile();
             String staticPath = urlList.get(0);
             String absolutePath = urlList.get(1);
+            String originalName = urlList.get(2);
             sysFile.setName(FileUtils.getName(staticPath));
             sysFile.setUrl(staticPath);
             sysFile.setAbsolutePath(absolutePath);
+            sysFile.setOriginalName(originalName);
 
             return R.ok(sysFile);
         }

+ 2 - 2
boman-modules/boman-file/src/main/java/com/boman/file/service/LocalSysFileServiceImpl.java

@@ -78,8 +78,8 @@ public class LocalSysFileServiceImpl implements ISysFileService
         String name = FileUploadUtils.upload(localFilePath, file);
         String absolutePath = localFilePath + "\\" + name;
         String staticUrl = domain + localFilePrefix + name;
-        LOGGER.info("上传静态路径路径为: {}, 绝对路径为: {}", staticUrl, absolutePath);
-        return Lists.newArrayList(staticUrl, absolutePath);
+        LOGGER.info("上传静态路径路径为: {}, 绝对路径为: {}, 原文件名称: {}", staticUrl, absolutePath, file.getOriginalFilename());
+        return Lists.newArrayList(staticUrl, absolutePath, file.getOriginalFilename());
     }
 
     /**

+ 23 - 3
boman-web-core/src/main/java/com/boman/web/core/controller/ObjController.java

@@ -1,8 +1,6 @@
 package com.boman.web.core.controller;
 
-import com.boman.domain.dto.AjaxResult;
-import com.boman.domain.dto.FormDataDto;
-import com.boman.domain.dto.PrimaryTableDto;
+import com.boman.domain.dto.*;
 import com.boman.web.core.service.TableServiceCmdService;
 import com.boman.web.core.service.common.ICommonService;
 import io.swagger.annotations.ApiOperation;
@@ -338,4 +336,26 @@ public class ObjController {
         return AjaxResult.success(commonService.getOneByMap(dto.getTable(), dto.getFixedData()));
     }
 
+    /**
+     * 功能描述: 根据表名更改commitData, 条件condition
+     *
+     * @param dto dto tableName commitData condition
+     * @return com.boman.domain.dto.AjaxResult
+     */
+    @PostMapping("/update")
+    public AjaxResult update(@RequestBody UpdateDto dto) {
+        return AjaxResult.success(commonService.update(dto));
+    }
+
+    /**
+     * 功能描述: 真的删除, 条件condition
+     *
+     * @param dto tableName condition
+     * @return com.boman.domain.dto.AjaxResult
+     */
+    @PostMapping("/delete")
+    public AjaxResult delete(@RequestBody DeleteDto dto) {
+        return AjaxResult.success(commonService.delete(dto));
+    }
+
 }

+ 1 - 1
boman-web-core/src/main/java/com/boman/web/core/mapper/StandardMapper.java

@@ -78,7 +78,7 @@ public interface StandardMapper {
      * @return int
      */
     @UpdateProvider(type = SqlProvider.class, method = "update")
-    Integer update(@Param("tableName") String tableName, @Param("packCommitData") JSONObject packCommitData
+    int update(@Param("tableName") String tableName, @Param("packCommitData") JSONObject packCommitData
             , @Param("packColCondition") JSONObject packColCondition);
 
 

+ 1 - 3
boman-web-core/src/main/java/com/boman/web/core/service/update/BaseUpdateServiceImpl.java

@@ -84,9 +84,7 @@ public class BaseUpdateServiceImpl implements IBaseUpdateService {
         JSONObject packColCondition = selectService.packColCondition(columns, condition);
         JSONObject packCommitData = selectService.packColCondition(columns, commitData);
 
-        Integer update = mapper.update(tableName, packCommitData, packColCondition);
-        return 1;
-
+        return mapper.update(tableName, packCommitData, packColCondition);
     }
 
     private JSONObject escapeByQueryType(List<GenTableColumn> columns, JSONObject commitData) {