设备器材导入

src/main/java/com/chinaitop/depot/device/controller/BasicEquipmentEquipmentPoolController.java

@@ -9,6 +9,7 @@ import java.util.Map;
 import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;
 
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.http.MediaType;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
@@ -42,6 +43,8 @@ public class BasicEquipmentEquipmentPoolController {
 	private BasicEquipmentEquipmentPoolService poolServivce;
 	@Resource
 	private ImportServiceImpl importService;
+	@Value("${web.upload-path}")
+	private String uploadPath;
 
 	/**
 	 * 查询数据列表
@@ -183,7 +186,7 @@ public class BasicEquipmentEquipmentPoolController {
         List<List<String>> list = new ArrayList<List<String>>();//该list为数据返回的list
         String errormsg = null;
         try {
-        	errormsg = importService.importFile(file, fileType, request, titleArr, emptyArr, list);
+        	errormsg = importService.importFile(uploadPath,file, fileType, request, titleArr, emptyArr, list);
         	
         	if (errormsg != null && !"".equals(errormsg)) {
         		return errormsg;

src/main/java/com/chinaitop/depot/device/service/impl/ImportServiceImpl.java

@@ -31,20 +31,20 @@ public class ImportServiceImpl {
 
 
 
-    public String importFile(MultipartFile file, String fileType, HttpServletRequest request,String[] titleArr,boolean[] emptyArr,List<List<String>> lists) throws Exception{
+    public String importFile(String uploadPath,MultipartFile file, String fileType, HttpServletRequest request,String[] titleArr,boolean[] emptyArr,List<List<String>> lists) throws Exception{
 
-        // 服务器路径
-        String rootPath = request.getSession().getServletContext().getRealPath("");
-        // 文件相对路径
-        String relativePath = "/upload/" + fileType;
-        //创建临时文件
-        createTemp(file,request,rootPath,relativePath);
-        //读取临时文件，并且返回错误信息
-        String fileAllpath = rootPath+relativePath+"/"+file.getOriginalFilename();
+    	// 服务器路径
+       //      String rootPath = request.getSession().getServletContext().getRealPath("");
+      // 文件相对路径
+      String relativePath = "/upload/" + fileType;
+      //创建临时文件
+      createTemp(file,request,uploadPath,relativePath);
+      //读取临时文件，并且返回错误信息
+      String fileAllpath = uploadPath+relativePath+"/"+file.getOriginalFilename();
 
-        String retVal = readExcelValue(fileAllpath,titleArr,emptyArr,lists);
+      String retVal = readExcelValue(fileAllpath,titleArr,emptyArr,lists);
 
-        return retVal;
+      return retVal;
     }
 
     /**