|
|
@@ -51,12 +51,6 @@ import es.uv.saic.domain.Datasource;
|
|
|
public class DataService {
|
|
|
|
|
|
@Autowired
|
|
|
- private IndicadorEnquestaService ies;
|
|
|
-
|
|
|
- @Autowired
|
|
|
- private EmailService ems;
|
|
|
-
|
|
|
- @Autowired
|
|
|
private DatasourceService dss;
|
|
|
|
|
|
@Value("${saic.url.domain}")
|
|
|
@@ -386,13 +380,13 @@ public class DataService {
|
|
|
return -1;
|
|
|
}
|
|
|
else {
|
|
|
- Integer i = this.ies.consolidateByEnquesta(enquesta);
|
|
|
+ Integer i = consolidateByEnquestaAux(enquesta);
|
|
|
deleteByEnquesta(enquesta);
|
|
|
return i;
|
|
|
}
|
|
|
}
|
|
|
|
|
|
- public Integer countByEnquesta(String enquesta) {
|
|
|
+ public Integer countByEnquesta(String enquesta) {
|
|
|
return countByEnquestaAux(enquesta);
|
|
|
}
|
|
|
|
|
|
@@ -777,4 +771,27 @@ public class DataService {
|
|
|
e.printStackTrace();
|
|
|
}
|
|
|
}
|
|
|
+
|
|
|
+ private Integer consolidateByEnquestaAux(String enquesta) {
|
|
|
+ URI uriObj = URI.create(uri + "/consolidateByEnquesta/" + enquesta);
|
|
|
+ try {
|
|
|
+ HttpClient httpClient = HttpClient.newHttpClient();
|
|
|
+ HttpRequest request = HttpRequest.newBuilder()
|
|
|
+ .uri(uriObj)
|
|
|
+ .GET()
|
|
|
+ .build();
|
|
|
+
|
|
|
+ HttpResponse<String> response = httpClient.send(request, HttpResponse.BodyHandlers.ofString());
|
|
|
+
|
|
|
+ if (response.statusCode() == HttpURLConnection.HTTP_OK) {
|
|
|
+ return Integer.parseInt(response.body());
|
|
|
+ } else {
|
|
|
+ System.err.println("Failed to find to consolidateByEnquesta. HTTP error code: " + response.statusCode());
|
|
|
+ }
|
|
|
+ } catch (Exception e) {
|
|
|
+ e.printStackTrace();
|
|
|
+ }
|
|
|
+
|
|
|
+ return 0;
|
|
|
+ }
|
|
|
}
|