Quellcode durchsuchen

导入bug数据

xujiawei vor 4 Jahren
Ursprung
Commit
0b0f9e728e

+ 2 - 8
src/main/java/edu/nju/controller/DataController.java

@@ -32,16 +32,10 @@ public class DataController {
     }
 
 
-    /**
-     * 根据oss文件保存原始bug报告数据
-     * @param filePath
-     * @param originalCaseId
-     * @return
-     */
     @RequestMapping(value = "/inputFromOSS")
     @ResponseBody
-    public List<BugDetail> saveBugDetailFromOss(String filePath,String originalCaseId) {
-        return dataService.saveBugDetailFromOss(filePath,originalCaseId);
+    public List<BugDetail> saveBugDetailFromOss(String jsonFilePath,String originalCaseId,String cpSerialNum) {
+        return dataService.saveBugDetailFromOss(jsonFilePath,originalCaseId,cpSerialNum);
     }
 
 

+ 16 - 7
src/main/java/edu/nju/service/DataService.java

@@ -29,6 +29,8 @@ import java.util.zip.ZipOutputStream;
 @Service
 public class DataService {
     private static final int BUFFER_SIZE = 2 * 1024;
+
+    private static final String imageUrlPrefix="https://mooctest-site.oss-cn-shanghai.aliyuncs.com/xinchuang/image/";
     @Autowired
     ExamDao examDao;
 
@@ -56,12 +58,8 @@ public class DataService {
     @Autowired
     BugDetailDao bugDetailDao;
 
-    //    @Value("${cpSerialNum}")
     private String cpSerialNum = "cp_ent_dev";
 
-    private static final String bucketName = "mooctest-share";
-
-
     /**
      * 根据caseId获取对应bug信息
      *
@@ -173,10 +171,10 @@ public class DataService {
         return bugDetailList;
     }
 
-    public List<BugDetail> saveBugDetailFromOss(String filePath, String originalCaseId) {
+    public List<BugDetail> saveBugDetailFromOss(String jsonFilePath, String originalCaseId,String cpSerialNum) {
         try {
-            //从oss下载文件
-            URL url = new URL(filePath);
+            //从oss下载json文件
+            URL url = new URL(jsonFilePath);
             URLConnection urlConnection = url.openConnection();
             HttpURLConnection httpURLConnection = (HttpURLConnection) urlConnection;
             httpURLConnection.setConnectTimeout(1000 * 5);
@@ -194,6 +192,17 @@ public class DataService {
             List<BugDetail> bugDetailList = JSON.parseArray(json, BugDetail.class);
             for (BugDetail bugDetail : bugDetailList) {
                 bugDetail.setOriginalCaseId(originalCaseId);
+                //修改图片文件路径为oss路径
+                String imageUrl=bugDetail.getImgUrl();
+                String[] imageUrlArray=imageUrl.split(",");
+                StringBuilder stringBuilder=new StringBuilder();
+                for(String imageUrlStr:imageUrlArray){
+                    String[] filePath=imageUrlStr.split("/");
+                    String fileName=filePath[filePath.length-1];
+                    String newImageUrl=imageUrlPrefix+originalCaseId+"/"+cpSerialNum+"/"+fileName;
+                    stringBuilder.append(newImageUrl).append(",");
+                }
+                bugDetail.setImgUrl(stringBuilder.toString());
                 bugDetailDao.save(bugDetail);
             }
             return bugDetailList;