From 757acef98231fb7b5923befbe0498924874ebd32 Mon Sep 17 00:00:00 2001
From: ulrich
Date: Wed, 21 Apr 2021 05:57:43 +0000
Subject: [PATCH] Geraete-Liste mit Status fertig
---
src/de/uhilger/mediaz/api/StorageHandler.java | 69 ++++++++++++++++++----------------
1 files changed, 37 insertions(+), 32 deletions(-)
diff --git a/src/de/uhilger/mediaz/api/StorageHandler.java b/src/de/uhilger/mediaz/api/StorageHandler.java
index 62dc218..f55e8e0 100644
--- a/src/de/uhilger/mediaz/api/StorageHandler.java
+++ b/src/de/uhilger/mediaz/api/StorageHandler.java
@@ -27,6 +27,7 @@
import de.uhilger.mediaz.entity.Geraet;
import static de.uhilger.mediaz.store.FileStorage.ST_ABLAGEORT;
import static de.uhilger.mediaz.store.FileStorage.ST_GERAET;
+import de.uhilger.mediaz.store.Storage;
import java.io.BufferedReader;
import java.io.IOException;
import java.io.InputStream;
@@ -110,40 +111,10 @@
String type = elems[elems.length - 2];
logger.fine(type);
if(type.equalsIgnoreCase(ST_GERAET)) {
- list = fs.listObjects(type);
- List<Geraet> newList = new ArrayList();
- Iterator<Entity> i = list.iterator();
- while(i.hasNext()) {
- Entity entity = i.next();
- if(entity instanceof Geraet) {
- Geraet g = (Geraet) entity;
- String statusurl = g.getStatusUrl();
- logger.info(statusurl);
-
- HttpRequest request = HttpRequest.newBuilder()
- .uri(URI.create(statusurl))
- .build();
- HttpClient client = HttpClient.newBuilder()
- .version(Version.HTTP_1_1)
- .followRedirects(Redirect.NORMAL)
- .connectTimeout(Duration.ofSeconds(20))
- //.proxy(ProxySelector.of(new InetSocketAddress("proxy.example.com", 80)))
- //.authenticator(Authenticator.getDefault())
- .build();
- HttpResponse<String> response = client.send(request, BodyHandlers.ofString());
- logger.finer(Integer.toString(response.statusCode()));
- logger.finer(response.body());
- // {"ison":false,"has_timer":false,"overpower":false}
- String[] parts = response.body().split(",")[0].split(":");
- logger.finer("ison: " + parts[1]);
- g.setStatus(parts[1]);
- newList.add(g);
- }
- }
- //list = newList;
+ list = collectDeviceStatus(fs, type);
Gson gson = new Gson();
Object o = gson.fromJson(bodyLesen(e), fs.typeFromName(type).getType());
- return gson.toJson(newList);
+ return gson.toJson(list);
} else {
list = fs.list(type);
}
@@ -182,4 +153,38 @@
public boolean delete(HttpExchange e) {
return loeschen(e);
}
+
+ private List collectDeviceStatus(Storage fs, String type) throws IOException, InterruptedException {
+ List list = fs.listObjects(type);
+ List<Geraet> newList = new ArrayList();
+ Iterator<Entity> i = list.iterator();
+ while (i.hasNext()) {
+ Entity entity = i.next();
+ if (entity instanceof Geraet) {
+ Geraet g = (Geraet) entity;
+ String statusurl = g.getStatusUrl();
+ logger.info(statusurl);
+
+ HttpRequest request = HttpRequest.newBuilder()
+ .uri(URI.create(statusurl))
+ .build();
+ HttpClient client = HttpClient.newBuilder()
+ .version(Version.HTTP_1_1)
+ .followRedirects(Redirect.NORMAL)
+ .connectTimeout(Duration.ofSeconds(20))
+ //.proxy(ProxySelector.of(new InetSocketAddress("proxy.example.com", 80)))
+ //.authenticator(Authenticator.getDefault())
+ .build();
+ HttpResponse<String> response = client.send(request, BodyHandlers.ofString());
+ logger.finer(Integer.toString(response.statusCode()));
+ logger.finer(response.body());
+ // {"ison":false,"has_timer":false,"overpower":false}
+ String[] parts = response.body().split(",")[0].split(":");
+ logger.finer("ison: " + parts[1]);
+ g.setStatus(parts[1]);
+ newList.add(g);
+ }
+ }
+ return newList;
+ }
}
--
Gitblit v1.9.3