2.0.01

ToWipf · Apr 7, 2023 · ca027f1 · ca027f1
1 parent 43b776e
commit ca027f1
Show file tree

Hide file tree

Showing 6 changed files with 24 additions and 19 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,9 +1,9 @@
 /target/
+/files/
 /angular-app/package-lock.json
 /angular-app/node_modules/
 /angular-app/dist/
 /angular-app/.angular/cache/
 /src/main/resources/META-INF/resources/app/
-*auth.db
-*jasmarty.db
+*.db
 *jasmarty.jar
diff --git a/angular-app/package.json b/angular-app/package.json
@@ -1,6 +1,6 @@
 {
   "name": "jasmarty-app",
-  "version": "2.0.00",
+  "version": "2.0.01",
   "scripts": {
     "ng": "ng",
     "start": "ng serve --host 0.0.0.0 --port 3000 --disable-host-check",

diff --git a/src/main/java/org/wipf/jasmarty/logic/base/MainHome.java b/src/main/java/org/wipf/jasmarty/logic/base/MainHome.java
@@ -40,7 +40,7 @@ public class MainHome {
 	ListeTypeService listeTypeDB;
 
 	private static final Logger LOGGER = Logger.getLogger("_MainHome_");
-	public static final String VERSION = "2.0.00";
+	public static final String VERSION = "2.0.01";
 
 	/**
 	 * Stop App

diff --git a/src/main/java/org/wipf/jasmarty/logic/base/WipfConfigVW.java b/src/main/java/org/wipf/jasmarty/logic/base/WipfConfigVW.java
@@ -1,6 +1,5 @@
 package org.wipf.jasmarty.logic.base;
 
-
 import java.util.List;
 import java.util.UUID;
 
@@ -47,6 +46,7 @@ public List<WipfConfig> getAll() {
 	 * @return
 	 * 
 	 */
+	@Transactional // TODO Warum ist das nötig? (Grafana)
 	public String getConfParamString(String sConfParam) {
 		WipfConfig wc = WipfConfig.findByKey(sConfParam).firstResult();
 		if (wc != null) {
@@ -60,6 +60,7 @@ public String getConfParamString(String sConfParam) {
 	 * @return
 	 * 
 	 */
+	@Transactional // TODO Warum ist das nötig? (punke)
 	public Integer getConfParamInteger(String sConfParam) {
 		try {
 			WipfConfig wc = WipfConfig.findByKey(sConfParam).firstResult();

diff --git a/src/main/java/org/wipf/jasmarty/logic/telegram/TAppGrafana.java b/src/main/java/org/wipf/jasmarty/logic/telegram/TAppGrafana.java
@@ -79,6 +79,7 @@ public String telegramMenuehHeizung(Telegram t) {
 			try {
 				return sendGrafanaPictureToTelegram(t.getChatID(), "ydVqZGkgk/heizung", sPanelId, sTeil2_Zeit);
 			} catch (Exception e) {
+				e.printStackTrace();
 				return "Fehler 112 " + e;
 			}
 		} else {
@@ -181,7 +182,7 @@ public String telegramMenueSolar(Telegram t) {
 			try {
 				return sendGrafanaPictureToTelegram(t.getChatID(), "8wFrHwb4k/ubersicht-solar", sPanelId, sTeil2_Zeit);
 			} catch (Exception e) {
-				return "Fehler 113 " + e;
+				return "Fehler 115 " + e;
 			}
 		} else {
 			return "Fehlerhafte Eingabe\nHilfe mit 'dev'";
@@ -211,15 +212,12 @@ private Boolean validateInput(String sTeil1_Was, String sTeil2_Zeit) {
 	 * @return
 	 * @throws IOException
 	 */
-	private String sendGrafanaPictureToTelegram(Long nChatId, String sDashboard, String sPanel, String sTime)
-			throws Exception {
+	private String sendGrafanaPictureToTelegram(Long nChatId, String sDashboard, String sPanel, String sTime) {
 
 //		http://192.168.2.11:3000/render/d-solo/ydVqZGkgk/heizung?orgId=1&panelId=3&from=now-7d&to=now
 		String sGrafanaHost = wipfConfig.getConfParamString("grafana_host");
-
 		String sFilename = "grafana_" + (nChatId + sDashboard + sPanel + sTime + ".png").replace('/', '-');
-		fileVw.saveFileToDisk(sGrafanaHost + "/render/d-solo/" + sDashboard + "?orgId=1&panelId=" + sPanel
-				+ "&from=now-" + sTime + "&to=now", sFilename);
+		fileVw.saveFileToDisk(sGrafanaHost + "/render/d-solo/" + sDashboard + "?orgId=1&panelId=" + sPanel + "&from=now-" + sTime + "&to=now", sFilename);
 
 		sendAndReceive.sendDocumentToTelegram(nChatId, sFilename);
 

diff --git a/src/main/java/org/wipf/jasmarty/logic/telegram/TSendAndReceive.java b/src/main/java/org/wipf/jasmarty/logic/telegram/TSendAndReceive.java
@@ -354,7 +354,7 @@ public String sendDocumentToTelegram(Telegram t) {
 	 * @return
 	 * @throws IOException
 	 */
-	public String sendDocumentToTelegram(Long nChatId, String sFilePath) throws Exception {
+	public String sendDocumentToTelegram(Long nChatId, String sFilePath) {
 		return sendFileToTelegram(nChatId, fileVw.getFile(sFilePath));
 	}
 
@@ -418,14 +418,20 @@ public void sendMsgToAdmin(String sMsg) {
 	 * @return
 	 * @throws Exception
 	 */
-	private String sendFileToTelegram(Long nChatId, File f) throws Exception {
-		MultipartUtility multipart = new MultipartUtility("https://api.telegram.org/" + getBotKeyFromCache() + "/sendDocument?chat_id=" + nChatId, "UTF-8");
-		// multipart.addFormField("param_name_1", "param_value");
-		multipart.addFilePart("document", f);
-		String response = multipart.finish();
+	private String sendFileToTelegram(Long nChatId, File f) {
 		LOGGER.info("upload File to " + nChatId + " / " + f.getPath());
-		JSONObject jo = new JSONObject(response);
-		return (jo.get("ok").toString());
+		try {
+			MultipartUtility multipart;
+			multipart = new MultipartUtility("https://api.telegram.org/" + getBotKeyFromCache() + "/sendDocument?chat_id=" + nChatId, "UTF-8");
+			// multipart.addFormField("param_name_1", "param_value");
+			multipart.addFilePart("document", f);
+			String response = multipart.finish();
+			JSONObject jo = new JSONObject(response);
+			return (jo.get("ok").toString());
+		} catch (IOException | WipfException e) {
+			e.printStackTrace();
+			return "Fehler 116 " + e;
+		}
 	}
 
 }