郭超 4 éve
szülő
commit
d2f0a03972

+ 14 - 0
src/main/java/edu/nju/controller/DataController.java

@@ -50,5 +50,19 @@ public class DataController {
     public List<BugDetail> saveBugDetailFromFile(@RequestParam("zipFile") MultipartFile zipFile, @RequestParam("jsonFile") MultipartFile jsonFile, String originalCaseId, String cpSerialNum) {
         return fileService.importBugInfo(zipFile,jsonFile,originalCaseId,cpSerialNum);
     }
+
+    /**
+     * bug数据导入
+     * @param zipFile
+     * @param jsonFile
+     * @param originalCaseId 与目前系统哪个case对应
+     * @param cpSerialNum 来自哪个cp
+     * @return
+     */
+    @RequestMapping(value = "/inputFromOSS")
+    @ResponseBody
+    public List<BugDetail> saveBugDetailFromOss(@RequestParam("zipFile") MultipartFile zipFile, @RequestParam("jsonFile") MultipartFile jsonFile, String originalCaseId, String cpSerialNum) {
+        return fileService.importBugInfo(zipFile,jsonFile,originalCaseId,cpSerialNum);
+    }
 }
 

+ 0 - 1
src/main/java/edu/nju/service/OssFileService.java

@@ -202,7 +202,6 @@ public class OssFileService implements FileService {
 	public List<BugDetail> saveBugDetail(MultipartFile sourceZipFile, MultipartFile sourceJsonFile, String originalCaseId, String cpSerialNum) {
 		try {
 			//读取文件流并保存在本地
-
 			String zipFilePath= localPrefix +"/xinchuangdata/input/imageZip/"+originalCaseId+"/"+cpSerialNum+"/"+originalCaseId+".zip";
 			File zipFile=new File(zipFilePath);
 			if(!zipFile.getParentFile().exists()) { zipFile.getParentFile().mkdirs(); }