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("
").append(trt.trt(true,"The_air_temperature_has_exceeded_the_set_value")).append(": ").append(value).append("
") .append("| ").append(trt.trt(true,"Name")).append(" | ").append(obj.getString("name")).append(" |
|---|---|
| ").append(trt.trt(true,"Date")).append(" | ").append(tmp_air.getString("date")).append(" |
| ").append(trt.trt(true,"Value")).append(" | ").append(tmp_air.getDouble("value")).append(" °C |
| ").append(trt.trt(true,"Location")).append(" | ").append(tmp_air.getDouble("lat")).append(", ").append(tmp_air.getDouble("lon")).append(" |
").append(trt.trt(true,"The_soil_temperature_has_exceeded_the_set_value")).append(": ").append(value).append("
") .append("| ").append(trt.trt(true,"Name")).append(" | ").append(obj.getString("name")).append(" |
|---|---|
| ").append(trt.trt(true,"Date")).append(" | ").append(tmp_soil.getString("date")).append(" |
| ").append(trt.trt(true,"Value")).append(" | ").append(tmp_soil.getDouble("value")).append(" °C |
| ").append(trt.trt(true,"Location")).append(" | ").append(tmp_air.getDouble("lat")).append(", ").append(tmp_air.getDouble("lon")).append(" |