guochao 5 rokov pred
rodič
commit
92b4c2ae34

+ 2 - 3
.idea/workspace.xml

@@ -3,8 +3,7 @@
   <component name="ChangeListManager">
     <list default="true" id="c25ee83f-38b8-4a56-8a1f-62ecc8d6cec2" name="Default Changelist" comment="">
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/cn/iselab/mooctest/site/domainObject/ReportTaskStatus.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/cn/iselab/mooctest/site/domainObject/ReportTaskStatus.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/cn/iselab/mooctest/site/service/impl/AutoReportProductServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/cn/iselab/mooctest/site/service/impl/AutoReportProductServiceImpl.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/cn/iselab/mooctest/site/web/ctrl/HandleReportController.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/cn/iselab/mooctest/site/web/ctrl/HandleReportController.java" afterDir="false" />
     </list>
     <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
     <option name="SHOW_DIALOG" value="false" />
@@ -130,7 +129,7 @@
       <workItem from="1576044658914" duration="312000" />
       <workItem from="1576141062434" duration="3358000" />
       <workItem from="1576166157531" duration="106000" />
-      <workItem from="1576220216208" duration="37000" />
+      <workItem from="1576220216208" duration="403000" />
     </task>
     <servers />
   </component>

+ 6 - 9
src/main/java/cn/iselab/mooctest/site/web/ctrl/HandleReportController.java

@@ -82,14 +82,13 @@ public class HandleReportController {
      * @return
      */
     @ResponseBody
-    @RequestMapping(value = "/api/report/generate/order/{orderId}/owner/{ownerId}/reportType/{reportType}", method = RequestMethod.POST)
+    @RequestMapping(value = "/api/report/generate/order/{orderId}/owner/{ownerId}/reportType/static-scan-report", method = RequestMethod.POST)
     public Map handleStaticScanReport(@PathVariable(value = "orderId") Long orderId,
                             @PathVariable(value = "ownerId") Long ownerId,
-                            @PathVariable(value = "reportType") String reportType,
                             @RequestBody StaticScanReportDataVO staticScanReportDataVO) {
 
         log.info(staticScanReportDataVO.toString());
-        return generate(orderId, ownerId, staticScanReportDataVO, reportType);
+        return generate(orderId, ownerId, staticScanReportDataVO, "static-scan-report");
     }
 
     /**
@@ -100,14 +99,13 @@ public class HandleReportController {
      * @return
      */
     @ResponseBody
-    @RequestMapping(value = "/api/report/generate/web/order/{orderId}/owner/{ownerId}/reportType/{reportType}", method = RequestMethod.POST)
+    @RequestMapping(value = "/api/report/generate/order/{orderId}/owner/{ownerId}/reportType/web-auto-test-report", method = RequestMethod.POST)
     public Map handleWebReport(@PathVariable(value = "orderId") Long orderId,
                             @PathVariable(value = "ownerId") Long ownerId,
-                            @PathVariable(value = "reportType") String reportType,
                             @RequestBody WebData webData) {
 
         log.info(webData.toString());
-        return generate(orderId, ownerId, webData, reportType);
+        return generate(orderId, ownerId, webData, "web-auto-test-report");
     }
 
     /**
@@ -118,14 +116,13 @@ public class HandleReportController {
      * @return
      */
     @ResponseBody
-    @RequestMapping(value = "/api/report/generate/app/order/{orderId}/owner/{ownerId}/reportType/{reportType}", method = RequestMethod.POST)
+    @RequestMapping(value = "/api/report/generate/order/{orderId}/owner/{ownerId}/reportType/app-auto-test-report", method = RequestMethod.POST)
     public Map handleAppAutoTestReport(@PathVariable(value = "orderId") Long orderId,
                             @PathVariable(value = "ownerId") Long ownerId,
-                            @PathVariable(value = "reportType") String reportType,
                             @RequestBody AppAutoTestReportVO appAutoTestReportVO) {
 
         log.info(appAutoTestReportVO.toString());
-        return generate(orderId, ownerId, appAutoTestReportVO, reportType);
+        return generate(orderId, ownerId, appAutoTestReportVO, "app-auto-test-report");
     }
 
     private Map<String, Object> generate(Long orderId, Long ownerId, ReportDataVO reportDataVO, String reportType){