Sfoglia il codice sorgente

优化代码上传接口代码

韩帛霖 1 anno fa
parent
commit
73d15c755e

+ 3 - 18
ruoyi-admin/src/main/java/com/ruoyi/web/controller/dragForm/CommonController.java

@@ -36,7 +36,7 @@ public class CommonController extends BaseController {
     private ITableSqlService iTableSqlService;
 
     /**
-     * 查询
+     * 共通查询
      */
     @GetMapping("/selectList")
     public TableDataInfo selectList(CommonEntity commonEntity) {
@@ -44,23 +44,8 @@ public class CommonController extends BaseController {
         return getDataTable(commonService.selectList(commonEntity.getFormMap()));
     }
 
-
-    @GetMapping("/test")
-    public List<CommonEntity> test(@RequestParam String tableName) {
-        Map<String, Object> map = new HashMap<>();
-        map.put("tableName", tableName);
-        //  df_name
-        List<CommonEntity> commonEntities = commonService.selectList(map);
-        commonEntities.forEach(item -> {
-            System.out.println(item.getRetMap());
-        });
-
-
-        return commonEntities;
-    }
-
     /**
-     * 批量新增
+     * 共通批量新增
      */
     @PostMapping("/batchInsert")
     public AjaxResult batchInsert(@RequestBody Map<String, Object> map) {
@@ -68,7 +53,7 @@ public class CommonController extends BaseController {
     }
 
     /**
-     * 修改
+     * 共通修改sql
      */
     @PutMapping("/edit")
     public AjaxResult edit(@RequestBody Map<String, Object> map) {

+ 2 - 10
ruoyi-admin/src/main/java/com/ruoyi/web/controller/dragForm/CommonFileController.java

@@ -185,9 +185,6 @@ public class CommonFileController {
     @PostMapping(value = "/uploadData", headers = "content-type=multipart/form-data")
     public AjaxResult uploadDataFile(@RequestPart("file") MultipartFile file) throws Exception {
         Map<String, Object> map = new HashMap<>();
-
-        System.out.println(file.getOriginalFilename().substring(0, file.getOriginalFilename().indexOf(".")));
-
         map.put("tableName", file.getOriginalFilename().substring(0, file.getOriginalFilename().indexOf(".")));
         map.put("databaseType", SecurityUtils.getDatabaseType());
         map.put("databaseName", SecurityUtils.getDatabaseName());
@@ -211,24 +208,19 @@ public class CommonFileController {
                     // 新增       // 删除当前map中的k/v
                     item.put(listMap.get(0).get(mKey), item.remove(mKey));
                 });
-                System.out.println(listMap);
-                System.out.println("-----------------");
             });
             listMap.remove(0);
             Map<String, Object> endMap = new HashMap<>();
             endMap.put("tableName", "test");
             endMap.put("field", listMap);
-            commonService.batchInsert(endMap);
-            for (Map<String, String> data : listMap) {
-                log.info(JSON.toJSONString(data));
-            }
+            return success(commonService.batchInsert(endMap));
         } catch (Exception e) {
             return AjaxResult.error(e.getMessage());
         }
-        return null;
     }
 
 
+    // map类型转换
     public static List<Map<String, String>> convertList(List<Map<Integer, String>> inputList) {
         List<Map<String, String>> resultList = new ArrayList<>();
         for (Map<Integer, String> inputMap : inputList) {