From f9e83b1f0e19346dadf1d5441b3f8648dd31fd5d Mon Sep 17 00:00:00 2001
From: igor <irigm@mail.ru>
Date: Tue, 12 Aug 2025 07:45:12 +0500
Subject: [PATCH] +lon lat send in warnings

---
 org-ccalm-main.yml                             | 4 ++--
 src/main/java/org/ccalm/main/SendWarning.java  | 5 +++++
 src/main/resources/templates/engine/index.html | 2 +-
 src/main/resources/templates/test.html         | 2 +-
 4 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/org-ccalm-main.yml b/org-ccalm-main.yml
index f73da5a..8b9683f 100644
--- a/org-ccalm-main.yml
+++ b/org-ccalm-main.yml
@@ -10,9 +10,9 @@ spring:
   application:
     name: org-ccalm-main
   datasource:
-    url: jdbc:postgresql://almaty.ccalm.org:5432/CCALM?ApplicationName=org_ccalm_main&ssl=true&sslmode=require&connectTimeout=10000&socketTimeout=10000
+    #url: jdbc:postgresql://almaty.ccalm.org:5432/CCALM?ApplicationName=org_ccalm_main&ssl=true&sslmode=require&connectTimeout=10000&socketTimeout=10000
     #url: jdbc:postgresql://ccalm.org:5432/CCALM?ApplicationName=org_ccalm_main&ssl=true&sslmode=require&connectTimeout=10000&socketTimeout=10000
-    #url: jdbc:postgresql://127.0.0.1:5432/CCALM?ApplicationName=org_ccalm_main&ssl=true&sslmode=require&connectTimeout=10000&socketTimeout=10000
+    url: jdbc:postgresql://127.0.0.1:5432/CCALM?ApplicationName=org_ccalm_main&ssl=true&sslmode=require&connectTimeout=10000&socketTimeout=10000
     username: postgres
     password: 309A86FF65A78FB428F4E38DFE35F730
     driver-class-name: org.postgresql.Driver
diff --git a/src/main/java/org/ccalm/main/SendWarning.java b/src/main/java/org/ccalm/main/SendWarning.java
index b8a76fb..a61ea8f 100644
--- a/src/main/java/org/ccalm/main/SendWarning.java
+++ b/src/main/java/org/ccalm/main/SendWarning.java
@@ -121,6 +121,7 @@ public class SendWarning {
             String sql = """ 
                     select
                         t.uid,
+                        t.name,
                         t.user_uid,
                         t.lat,
                         t.lon,
@@ -171,8 +172,10 @@ public class SendWarning {
                                 .append("<h2>").append(trt.trt(true,"Warning")).append("</h2>")
                                 .append("<p>").append(trt.trt(true,"The_air_temperature_has_exceeded_the_set_value")).append(": ").append(value).append("</p>")
                                 .append("<table>")
+                                .append("<tr><th>").append(trt.trt(true,"Name")).append("</th><td>").append(obj.getString("name")).append("</td></tr>")
                                 .append("<tr><th>").append(trt.trt(true,"Date")).append("</th><td>").append(tmp_air.getString("date")).append("</td></tr>")
                                 .append("<tr><th>").append(trt.trt(true,"Value")).append("</th><td>").append(tmp_air.getDouble("value")).append(" °C</td></tr>")
+                                //.append("<tr><th>").append(trt.trt(true,"Location")).append("</th><td><a href='https://www.google.com/maps?q=").append(tmp_air.getDouble("lat")).append(",").append(tmp_air.getDouble("lon")).append("' target='_blank'>").append(tmp_air.getDouble("lat")).append(", ").append(tmp_air.getDouble("lon")).append("</a></td></tr>")
                                 .append("</table>")
                                 .append(trt.trt(true,"To_resume_monitoring_please_set_the_warn_field_to_true"))
                                 .append("</div>") // Закрываем контейнер
@@ -228,8 +231,10 @@ public class SendWarning {
                                 .append("<h2>").append(trt.trt(true,"Warning")).append("</h2>")
                                 .append("<p>").append(trt.trt(true,"The_soil_temperature_has_exceeded_the_set_value")).append(": ").append(value).append("</p>")
                                 .append("<table>")
+                                .append("<tr><th>").append(trt.trt(true,"Name")).append("</th><td>").append(obj.getString("name")).append("</td></tr>")
                                 .append("<tr><th>").append(trt.trt(true,"Date")).append("</th><td>").append(tmp_soil.getString("date")).append("</td></tr>")
                                 .append("<tr><th>").append(trt.trt(true,"Value")).append("</th><td>").append(tmp_soil.getDouble("value")).append(" °C</td></tr>")
+                                //.append("<tr><th>").append(trt.trt(true,"Location")).append("</th><td><a href='https://www.google.com/maps?q=").append(tmp_air.getDouble("lat")).append(",").append(tmp_air.getDouble("lon")).append("' target='_blank'>").append(tmp_air.getDouble("lat")).append(", ").append(tmp_air.getDouble("lon")).append("</a></td></tr>")
                                 .append("</table>")
                                 .append(trt.trt(true,"To_resume_monitoring_please_set_the_warn_field_to_true"))
                                 .append("</div>") // Закрываем контейнер
diff --git a/src/main/resources/templates/engine/index.html b/src/main/resources/templates/engine/index.html
index be2a0af..9253cb9 100644
--- a/src/main/resources/templates/engine/index.html
+++ b/src/main/resources/templates/engine/index.html
@@ -40,7 +40,7 @@
 	<script type="text/javascript" src="../resources/metadata/tree/tree.js?v=16"></script>
 
 	<script type="text/javascript" src="../resources/engine/popup.js?v=16"></script>
-	<script type="text/javascript" src="../resources/engine/index.js?v=23"></script>
+	<script type="text/javascript" src="../resources/engine/index.js?v=24"></script>
 	<script type="text/javascript" src="../resources/engine/user.js?v=18"></script>
 
 <style>
diff --git a/src/main/resources/templates/test.html b/src/main/resources/templates/test.html
index f81a9be..c969d89 100644
--- a/src/main/resources/templates/test.html
+++ b/src/main/resources/templates/test.html
@@ -19,7 +19,7 @@
 	<link rel="stylesheet" href="./resources/engine/index.css?v=8">
 
 	<script type="text/javascript" src="./resources/engine/popup.js?v=04"></script>
-	<script type="text/javascript" src="./resources/index.js?v=02"></script>
+	<script type="text/javascript" src="./resources/index.js?v=03"></script>
 	
 	<link rel="stylesheet" href="./resources/engine/openlayers/ol.css" type="text/css">
 	<link rel="stylesheet" href="./resources/engine/openlayers/ol-ext.css" />