|
@@ -82,14 +82,13 @@ public class HandleReportController {
|
|
* @return
|
|
* @return
|
|
*/
|
|
*/
|
|
@ResponseBody
|
|
@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,
|
|
public Map handleStaticScanReport(@PathVariable(value = "orderId") Long orderId,
|
|
@PathVariable(value = "ownerId") Long ownerId,
|
|
@PathVariable(value = "ownerId") Long ownerId,
|
|
- @PathVariable(value = "reportType") String reportType,
|
|
|
|
@RequestBody StaticScanReportDataVO staticScanReportDataVO) {
|
|
@RequestBody StaticScanReportDataVO staticScanReportDataVO) {
|
|
|
|
|
|
log.info(staticScanReportDataVO.toString());
|
|
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
|
|
* @return
|
|
*/
|
|
*/
|
|
@ResponseBody
|
|
@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,
|
|
public Map handleWebReport(@PathVariable(value = "orderId") Long orderId,
|
|
@PathVariable(value = "ownerId") Long ownerId,
|
|
@PathVariable(value = "ownerId") Long ownerId,
|
|
- @PathVariable(value = "reportType") String reportType,
|
|
|
|
@RequestBody WebData webData) {
|
|
@RequestBody WebData webData) {
|
|
|
|
|
|
log.info(webData.toString());
|
|
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
|
|
* @return
|
|
*/
|
|
*/
|
|
@ResponseBody
|
|
@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,
|
|
public Map handleAppAutoTestReport(@PathVariable(value = "orderId") Long orderId,
|
|
@PathVariable(value = "ownerId") Long ownerId,
|
|
@PathVariable(value = "ownerId") Long ownerId,
|
|
- @PathVariable(value = "reportType") String reportType,
|
|
|
|
@RequestBody AppAutoTestReportVO appAutoTestReportVO) {
|
|
@RequestBody AppAutoTestReportVO appAutoTestReportVO) {
|
|
|
|
|
|
log.info(appAutoTestReportVO.toString());
|
|
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){
|
|
private Map<String, Object> generate(Long orderId, Long ownerId, ReportDataVO reportDataVO, String reportType){
|