diff --git a/radar-admin/pom.xml b/radar-admin/pom.xml
index d39a64e..0d9e430 100644
--- a/radar-admin/pom.xml
+++ b/radar-admin/pom.xml
@@ -44,6 +44,11 @@
junit
junit
+
+ commons-io
+ commons-io
+ 2.6
+
diff --git a/radar-admin/src/main/java/com/pgmmers/radar/controller/DataListApiController.java b/radar-admin/src/main/java/com/pgmmers/radar/controller/DataListApiController.java
index ebefafb..f6dfa1c 100644
--- a/radar-admin/src/main/java/com/pgmmers/radar/controller/DataListApiController.java
+++ b/radar-admin/src/main/java/com/pgmmers/radar/controller/DataListApiController.java
@@ -1,19 +1,30 @@
package com.pgmmers.radar.controller;
-
import com.pgmmers.radar.dal.bean.DataListQuery;
import com.pgmmers.radar.service.common.CommonResult;
import com.pgmmers.radar.service.model.DataListsService;
+import com.pgmmers.radar.util.ExcelImportUtil;
+import com.pgmmers.radar.util.ExportExcelInfo;
import com.pgmmers.radar.vo.model.DataListsVO;
import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiParam;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
@RestController
@RequestMapping("/services/v1/datalist")
@Api(value = "DataListsApi", description = "黑白名单列表接口相关操作", tags = {"数据列表API"})
public class DataListApiController {
+ public static Logger logger = LoggerFactory.getLogger(DataListApiController.class);
+
@Autowired
private DataListsService dataListsService;
@@ -49,4 +60,47 @@ public class DataListApiController {
return dataListsService.delete(id);
}
+ /**
+ *
+ * 批量导入黑/白名单管理
+ * @param file 文件
+ * @param modelId 模型ID
+ * @return
+ * @author xushuai
+ */
+ @PostMapping(value = "/batchImportData")
+ public CommonResult batchImportData(@ApiParam(value = "file detail") @RequestPart("file") MultipartFile file, @RequestParam(value = "modelId", required = true)Long modelId) {
+ CommonResult result = new CommonResult();
+ result.setSuccess(false);
+ String fileName = file.getOriginalFilename();
+ if (fileName != null && !(fileName.contains(".xls") || fileName.contains(".xlsx"))) {
+ result.setMsg("传入的件格式有误!");
+ return result;
+ }
+ ExportExcelInfo info = getImportMeta();
+ List