igor/org.ccalm.main
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

+lon lat send in warnings

Browse Source
This commit is contained in:
igor
2025-08-12 07:45:12 +05:00
parent 8a28b58513
commit f9e83b1f0e
4 changed files with 9 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/main/java/org/ccalm/main/SendWarning.java
View File

@ -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>") // Закрываем контейнер

2
src/main/resources/templates/engine/index.html
View File

@ -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>

2
src/main/resources/templates/test.html
View File

@ -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" />