fix

virgo.api/src/main/java/com/bosshand/virgo/api/operate/controller/OperateDeviceController.java

@@ -1,7 +1,6 @@
 package com.bosshand.virgo.api.operate.controller;
 
 import com.bosshand.virgo.api.model.Project;
-import com.bosshand.virgo.api.model.ProjectItemTarget;
 import com.bosshand.virgo.api.operate.model.*;
 import com.bosshand.virgo.api.operate.service.GodownService;
 import com.bosshand.virgo.api.operate.service.OperateDeviceService;
@@ -12,14 +11,16 @@ import com.bosshand.virgo.core.response.Response;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
-import org.apache.commons.lang.time.DateFormatUtils;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
 
 import javax.servlet.http.HttpServletResponse;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
 
 @RestController
 @RequestMapping("operateDevice")
@@ -81,6 +82,16 @@ public class OperateDeviceController {
         return Response.ok();
     }
 
+    @ApiOperation(value = "批量新增", notes = "批量新增")
+    @RequestMapping(value = "/batch", method = RequestMethod.POST)
+    public Response save(@RequestBody List<OperateDevice> list) {
+        if (list.size() > 0) {
+            operateDeviceService.batchSave(list);
+            return Response.ok();
+        }
+        return Response.fail(200000, "列表为空");
+    }
+
     @ApiOperation(value = "修改", notes = "修改")
     @RequestMapping(value = "", method = RequestMethod.PUT)
     public Response update(@RequestBody OperateDevice operateDevice) {
@@ -104,28 +115,11 @@ public class OperateDeviceController {
     /**
      *  导入
      */
-    @ApiOperation(value = "资产导入", notes = "资产导入")
-    @RequestMapping(value = "/import/{projectItemTargetId}/{operateDeviceLevelId}/{godownId}", method = RequestMethod.POST)
-    public Response importData(@ApiParam(name = "uploadFile", required = true) MultipartFile uploadFile, @PathVariable long projectItemTargetId, @PathVariable long operateDeviceLevelId, @PathVariable long godownId) throws Exception {
+    @ApiOperation(value = "资产导入-解析返回前端", notes = "资产导入-解析返回前端")
+    @RequestMapping(value = "/import", method = RequestMethod.POST)
+    public Response importData(@ApiParam(name = "uploadFile", required = true) MultipartFile uploadFile) throws Exception {
         List<OperateDeviceImportDto> list = ExcelUtils.readMultipartFile(uploadFile, OperateDeviceImportDto.class);
-        if (list.size() > 0) {
-            String date = DateFormatUtils.format(new Date(), "yyyy-MM-dd");
-            ProjectItemTarget target = projectItemTargetService.get(projectItemTargetId);
-            List<OperateDevice> operateDeviceList = new ArrayList<>();
-            for (OperateDeviceImportDto dto : list) {
-                OperateDevice operateDevice = new OperateDevice();
-                operateDevice.setProjectId(target.getProjectId());
-                operateDevice.setProjectItemId(target.getProjectItemId());
-                operateDevice.setProjectItemTargetId(projectItemTargetId);
-                operateDevice.setOperateDeviceLevelId(operateDeviceLevelId);
-                operateDevice.setGodownId(godownId);
-                operateDevice.setEntryTime(date);
-                BeanUtils.copyProperties(dto, operateDevice);
-                operateDeviceList.add(operateDevice);
-            }
-            operateDeviceService.batchSave(operateDeviceList);
-        }
-        return Response.ok();
+        return Response.ok(list);
     }
 
     /**

virgo.warpdrive/src/main/java/com/bosshand/warpdrive/controller/InstanceController.java

@@ -1,24 +1,19 @@
 package com.bosshand.warpdrive.controller;
 
-import java.util.Map;
-
-import com.bosshand.warpdrive.model.FlowMessageDto;
-import com.bosshand.warpdrive.model.ProjectFlow;
-import com.bosshand.warpdrive.model.ProjectFlowDto;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestHeader;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RestController;
-
 import com.bosshand.virgo.core.response.Response;
 import com.bosshand.virgo.exception.BadRequestException;
 import com.bosshand.virgo.exception.Constant;
+import com.bosshand.warpdrive.model.FlowMessageDto;
+import com.bosshand.warpdrive.model.ProjectFlow;
+import com.bosshand.warpdrive.model.ProjectFlowDto;
 import com.bosshand.warpdrive.service.ProjectFlowService;
-
 import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
 
 @RestController
 public class InstanceController {
@@ -124,6 +119,19 @@ public class InstanceController {
 	public Response create(@RequestBody ProjectFlowDto dto) {
 		return Response.ok(projectFlowService.create(projectFlowService.convertFromModel(dto)));
 	}
+
+	@RequestMapping(value = "/projectFlow/batch", method = RequestMethod.POST)
+	public Response batchCreate(@RequestBody List<ProjectFlowDto> list) {
+		if (list.size() > 0) {
+			List<ProjectFlow> flowList = new ArrayList<>();
+			for (ProjectFlowDto dto : list) {
+				ProjectFlow projectFlow = projectFlowService.create(projectFlowService.convertFromModel(dto));
+				flowList.add(projectFlow);
+			}
+			return Response.ok(flowList);
+		}
+		return Response.fail(200000, "列表为空");
+	}
 	
 	@RequestMapping(value="/projectFlow", method=RequestMethod.PUT)
 	public Response create(@RequestBody ProjectFlow projectFlow, @RequestHeader int userId) {