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

UZB Update

Browse Source
This commit is contained in:
Igor I
2025-07-14 11:58:43 +05:00
parent 3c44dac29e
commit d2c1f9c7da
3 changed files with 19 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
org-ccalm-main.yml
View File

@ -10,9 +10,9 @@ spring:
application: application:
name: org-ccalm-main name: org-ccalm-main
datasource: 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://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 username: postgres
password: 309A86FF65A78FB428F4E38DFE35F730 password: 309A86FF65A78FB428F4E38DFE35F730
driver-class-name: org.postgresql.Driver driver-class-name: org.postgresql.Driver

28
src/main/java/org/ccalm/main/AcceptJSON.java
View File

@ -1425,8 +1425,8 @@ public class AcceptJSON implements ServletContextAware {
} }
} }
if(lastDate==null) if(lastDate==null)
lastDate = LocalDate.parse("2025-03-03"); lastDate = LocalDate.parse("2025-02-11");
//lastDate = LocalDate.parse("2025-02-11"); //lastDate = LocalDate.parse("2025-03-03");
//lastDate = LocalDate.parse("2024-10-01"); //lastDate = LocalDate.parse("2024-10-01");
@ -1615,8 +1615,10 @@ public class AcceptJSON implements ServletContextAware {
result.bio_hectare = obj.optString("surveyed_area",null); result.bio_hectare = obj.optString("surveyed_area",null);
if (!obj.isNull("point")) { if (!obj.isNull("point")) {
result.lon_center = String.valueOf(obj.getJSONObject("point").getJSONArray("coordinates").getDouble(0)); //result.lon_center = String.valueOf(obj.getJSONObject("point").getJSONArray("coordinates").getDouble(0));
result.lat_center = String.valueOf(obj.getJSONObject("point").getJSONArray("coordinates").getDouble(1)); //result.lat_center = String.valueOf(obj.getJSONObject("point").getJSONArray("coordinates").getDouble(1));
result.lon_center = String.valueOf(obj.getJSONObject("point").getJSONArray("coordinates").getDouble(1));
result.lat_center = String.valueOf(obj.getJSONObject("point").getJSONArray("coordinates").getDouble(0));
} }
//Биотоп //Биотоп
@ -1769,11 +1771,10 @@ public class AcceptJSON implements ServletContextAware {
} }
} }
//Вид саранчи //Вид саранчи
if(!obj.isNull("subject_name") && !obj.optString("subject_name","").isBlank()) { if(!obj.isNull("subject_name") && !obj.optString("subject_name","").isBlank()) {
switch (obj.optString("subject_name",null).replace("'", "").trim()) { switch (obj.optString("subject_name",null).replace("'", "").trim()) {
case "CIT - Italian locust", "CIT - итальянский прус", "Итальянский прус", "Итальянский прус, Кузнечики": case "CIT - Italian locust", "CIT - итальянский прус", "Итальянский прус", "Итальянский прус, Кузнечики","Итальянский прус, Туранский прус":
result.locust_type_id = "1"; result.locust_type_id = "1";
result.locust_type_uid = "688e484b-babd-4a48-b318-be85e40682b0"; result.locust_type_uid = "688e484b-babd-4a48-b318-be85e40682b0";
break; break;
@ -1890,7 +1891,7 @@ public class AcceptJSON implements ServletContextAware {
result.larva_age_id="1"; result.larva_age_id="1";
result.larva_age_uid="30fa1f49-166e-4a17-9cd8-d611b36844f8"; result.larva_age_uid="30fa1f49-166e-4a17-9cd8-d611b36844f8";
break; break;
case "Transiens","Переходная": case "Transiens","Переходная","Фаза 2 ru":
result.larva_age_id="2"; result.larva_age_id="2";
result.larva_age_uid="a0146c08-17b4-4384-8764-b7541c106d10"; result.larva_age_uid="a0146c08-17b4-4384-8764-b7541c106d10";
break; break;
@ -1987,7 +1988,7 @@ public class AcceptJSON implements ServletContextAware {
result.imago_phase_id="4"; result.imago_phase_id="4";
result.imago_phase_uid="a1325ab8-15f5-406a-be8d-d6ba78b18d11"; result.imago_phase_uid="a1325ab8-15f5-406a-be8d-d6ba78b18d11";
break; break;
case "Transiens","Одиночная": case "Transiens","Одиночная","Фаза 2 ru":
result.imago_phase_id="5"; result.imago_phase_id="5";
result.imago_phase_uid="454ad32d-e513-4cda-90eb-e3fcac9bd41c"; result.imago_phase_uid="454ad32d-e513-4cda-90eb-e3fcac9bd41c";
break; break;
@ -2003,7 +2004,7 @@ public class AcceptJSON implements ServletContextAware {
//Adults (Имаго) //Adults (Имаго)
if(!obj.isNull("adults_fledging") && !obj.optString("adults_fledging","").isBlank()){ if(!obj.isNull("adults_fledging") && !obj.optString("adults_fledging","").isBlank()){
switch (obj.optString("adults_fledging",null).replace("'", "").trim()) { switch (obj.optString("adults_fledging",null).replace("'", "").trim()) {
case "Beginning","Начало": case "Beginning","Начало","Окрыление 2 ru":
result.imago_wing_id="7"; result.imago_wing_id="7";
result.imago_wing_uid="312bf2ac-dbdb-40be-b716-7f02f751a65e"; result.imago_wing_uid="312bf2ac-dbdb-40be-b716-7f02f751a65e";
break; break;
@ -2077,7 +2078,7 @@ public class AcceptJSON implements ServletContextAware {
result.swarm_maturity = obj.optString("swarms_maturity",null); // boolean, result.swarm_maturity = obj.optString("swarms_maturity",null); // boolean,
if(!obj.isNull("swarms_density") && !obj.optString("swarms_density","").isBlank()) { if(!obj.isNull("swarms_density") && !obj.optString("swarms_density","").isBlank()) {
switch (obj.optString("swarms_density",null).replace("'", "").trim()) { switch (obj.optString("swarms_density",null).replace("'", "").trim()) {
case "Low density", "Низкая": case "Low density", "Низкая", "Разреженная":
result.swarm_density_id = "1"; result.swarm_density_id = "1";
result.swarm_density_uid = "d64bdd10-bf56-43a7-96b5-b9d22f36c19a"; result.swarm_density_uid = "d64bdd10-bf56-43a7-96b5-b9d22f36c19a";
break; break;
@ -2085,7 +2086,7 @@ public class AcceptJSON implements ServletContextAware {
result.swarm_density_id = "2"; result.swarm_density_id = "2";
result.swarm_density_uid = "c0ec55a0-54fa-4df6-a683-a3690eafe464"; result.swarm_density_uid = "c0ec55a0-54fa-4df6-a683-a3690eafe464";
break; break;
case "High height", "Высокая": case "Large density", "Высокая", "Сильная":
result.swarm_density_id = "3"; result.swarm_density_id = "3";
result.swarm_density_uid = "accbb2e3-7b6e-4a7d-9b2b-2569b05c60ef"; result.swarm_density_uid = "accbb2e3-7b6e-4a7d-9b2b-2569b05c60ef";
break; break;
@ -2093,8 +2094,6 @@ public class AcceptJSON implements ServletContextAware {
throw new CustomException(200, 10000, "Not find swarms_density: (" + obj.optString("swarms_density",null)+")", null, true); throw new CustomException(200, 10000, "Not find swarms_density: (" + obj.optString("swarms_density",null)+")", null, true);
} }
} }
if(!obj.isNull("swarms_height") && !obj.optString("swarms_height","").isBlank()) {
result.swarm_size = obj.optString("swarms_size",null); // double precision, result.swarm_size = obj.optString("swarms_size",null); // double precision,
result.swarm_count = obj.optString("swarms_count",null); // double precision, result.swarm_count = obj.optString("swarms_count",null); // double precision,
@ -2125,7 +2124,4 @@ public class AcceptJSON implements ServletContextAware {
result.update(); result.update();
return result; return result;
} }
} }

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

@ -125,6 +125,7 @@ public class UpdateLocust {
imago_flying=:imago_flying, imago_flying=:imago_flying,
swarm_maturity=:swarm_maturity, swarm_maturity=:swarm_maturity,
swarm_density_id=:swarm_density_id, swarm_density_id=:swarm_density_id,
swarm_density_uid=main.strtouuid(:swarm_density_uid),
swarm_size=:swarm_size, swarm_size=:swarm_size,
swarm_count=:swarm_count, swarm_count=:swarm_count,
swarm_copulation=:swarm_copulation, swarm_copulation=:swarm_copulation,
@ -196,6 +197,7 @@ public class UpdateLocust {
imago_flying, imago_flying,
swarm_maturity, swarm_maturity,
swarm_density_id, swarm_density_id,
swarm_density_uid,
swarm_size, swarm_size,
swarm_count, swarm_count,
swarm_copulation, swarm_copulation,
@ -264,6 +266,7 @@ public class UpdateLocust {
:imago_flying, :imago_flying,
:swarm_maturity, :swarm_maturity,
:swarm_density_id, :swarm_density_id,
main.strtouuid(:swarm_density_uid),
:swarm_size, :swarm_size,
:swarm_count, :swarm_count,
:swarm_copulation, :swarm_copulation,
@ -398,6 +401,8 @@ public class UpdateLocust {
else parameters.addValue("swarm_maturity",false,Types.BOOLEAN); else parameters.addValue("swarm_maturity",false,Types.BOOLEAN);
} }
if(locust.swarm_density_id==null) parameters.addValue("swarm_density_id", null, Types.BIGINT); else parameters.addValue("swarm_density_id",Long.parseLong(locust.swarm_density_id), Types.BIGINT); if(locust.swarm_density_id==null) parameters.addValue("swarm_density_id", null, Types.BIGINT); else parameters.addValue("swarm_density_id",Long.parseLong(locust.swarm_density_id), Types.BIGINT);
if(locust.swarm_density_uid==null) parameters.addValue("swarm_density_uid", null, Types.VARCHAR); else parameters.addValue("swarm_density_uid",locust.swarm_density_uid, Types.VARCHAR);
if(locust.swarm_size==null) parameters.addValue("swarm_size", null, Types.DOUBLE); else parameters.addValue("swarm_size",Double.parseDouble(locust.swarm_size), Types.DOUBLE); if(locust.swarm_size==null) parameters.addValue("swarm_size", null, Types.DOUBLE); else parameters.addValue("swarm_size",Double.parseDouble(locust.swarm_size), Types.DOUBLE);
if(locust.swarm_count==null) parameters.addValue("swarm_count", null, Types.DOUBLE); else parameters.addValue("swarm_count",Double.parseDouble(locust.swarm_count), Types.DOUBLE); if(locust.swarm_count==null) parameters.addValue("swarm_count", null, Types.DOUBLE); else parameters.addValue("swarm_count",Double.parseDouble(locust.swarm_count), Types.DOUBLE);
if(locust.swarm_copulation==null) parameters.addValue("swarm_copulation", null, Types.BOOLEAN); if(locust.swarm_copulation==null) parameters.addValue("swarm_copulation", null, Types.BOOLEAN);