|
@@ -17,6 +17,7 @@ import com.mooctest.crowd.domain.model.FieldPO;
|
|
import com.mooctest.crowd.domain.repository.CrowdTestProjectRepo;
|
|
import com.mooctest.crowd.domain.repository.CrowdTestProjectRepo;
|
|
import com.mooctest.crowd.domain.repository.CrowdTestTaskRepo;
|
|
import com.mooctest.crowd.domain.repository.CrowdTestTaskRepo;
|
|
import com.mooctest.crowd.domain.repository.UserRepo;
|
|
import com.mooctest.crowd.domain.repository.UserRepo;
|
|
|
|
+import com.mooctest.crowd.domain.util.Converter;
|
|
import com.mooctest.crowd.site.command.CrowdTestTaskCommand;
|
|
import com.mooctest.crowd.site.command.CrowdTestTaskCommand;
|
|
import com.mooctest.crowd.site.configuration.DataCache;
|
|
import com.mooctest.crowd.site.configuration.DataCache;
|
|
import com.mooctest.crowd.site.constants.UploadType;
|
|
import com.mooctest.crowd.site.constants.UploadType;
|
|
@@ -360,7 +361,11 @@ public class CrowdTaskServiceImpl implements CrowdTaskService {
|
|
CrowdTestProject project = projectRepo.getByProjectCodeAndTaskCode(projectCode, taskCode);
|
|
CrowdTestProject project = projectRepo.getByProjectCodeAndTaskCode(projectCode, taskCode);
|
|
CrowdTestTask task = this.getTaskByProjectAndTaskCode(project, taskCode);
|
|
CrowdTestTask task = this.getTaskByProjectAndTaskCode(project, taskCode);
|
|
EndPoint endPoint = task.getEndPoint();
|
|
EndPoint endPoint = task.getEndPoint();
|
|
- return this.getForEntityReportUrl(userId, task, endPoint);
|
|
|
|
|
|
+ String reportUrl = this.getForEntityReportUrl(userId, task, endPoint);
|
|
|
|
+ // 更新数据库中的reportUrl
|
|
|
|
+ endPoint.setUrl(reportUrl);
|
|
|
|
+ endPointDao.save(Converter.convert(EndPointPO.class, endPoint));
|
|
|
|
+ return reportUrl;
|
|
}
|
|
}
|
|
|
|
|
|
@NotNull
|
|
@NotNull
|
|
@@ -375,7 +380,7 @@ public class CrowdTaskServiceImpl implements CrowdTaskService {
|
|
"&userId=" + String.valueOf(userId) + "&roleId=" + roleId + "&beginTime=" + String.valueOf(task.getCreateTime().getTime()) +
|
|
"&userId=" + String.valueOf(userId) + "&roleId=" + roleId + "&beginTime=" + String.valueOf(task.getCreateTime().getTime()) +
|
|
"&endTime=" + String.valueOf(task.getDeadTime().getTime());
|
|
"&endTime=" + String.valueOf(task.getDeadTime().getTime());
|
|
|
|
|
|
- log.info("调用众测服务接口,Get请求:" + url);
|
|
|
|
|
|
+ log.info("调用众测服务接口获取reportUrl,Get请求:" + url);
|
|
ResponseEntity<Map> responseEntity = restTemplate.getForEntity(url, Map.class);
|
|
ResponseEntity<Map> responseEntity = restTemplate.getForEntity(url, Map.class);
|
|
|
|
|
|
if (responseEntity.getStatusCode().equals(HttpStatus.OK)){
|
|
if (responseEntity.getStatusCode().equals(HttpStatus.OK)){
|