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

import from usbekistan

Browse Source
This commit is contained in:
igor
2025-03-28 07:45:54 +05:00
parent afd6abd9e3
commit 0de815893f
6 changed files with 206 additions and 156 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
org_ccalm_main.yml → org-ccalm-main.yml
View File

@ -1,5 +1,5 @@
server: server:
port: 8082 port: 8083
ssl: ssl:
enabled: true enabled: true
key-store: classpath:keystore.jks key-store: classpath:keystore.jks
@ -8,7 +8,7 @@ server:
spring: spring:
application: application:
name: org.ccalm.main name: org-ccalm-main
datasource: datasource:
#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

2
src/main/java/org/ccalm/main/AcceptASDCController.java
View File

@ -155,7 +155,7 @@ public class AcceptASDCController implements ServletContextAware {
// Чтение файла // Чтение файла
BufferedReader reader = new BufferedReader(new FileReader("O:\\temp\\Новая папка\\errors.log")); BufferedReader reader = new BufferedReader(new FileReader("O:\\temp\\Новая папка\\errors.log"));
StringBuilder content = new StringBuilder(); StringBuilder content = new StringBuilder(1024);
String line; String line;
while ((line = reader.readLine()) != null) { while ((line = reader.readLine()) != null) {
content.append(line); content.append(line);

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

@ -136,7 +136,7 @@ public class AcceptJSON implements ServletContextAware {
ex.printStackTrace(); ex.printStackTrace();
} }
StringBuilder sb = new StringBuilder(); StringBuilder sb = new StringBuilder(1024);
try try
{ {
String strURL="http://91.185.13.233:98/get_fito"; String strURL="http://91.185.13.233:98/get_fito";
@ -1422,8 +1422,9 @@ public class AcceptJSON implements ServletContextAware {
lastDate = LocalDate.parse(obj.getString("date")); lastDate = LocalDate.parse(obj.getString("date"));
} }
} }
if(lastDate==null) lastDate = LocalDate.parse("2024-10-01"); if(lastDate==null)
lastDate = LocalDate.parse("2025-02-11");
//lastDate = LocalDate.parse("2024-10-01");
//By number of day downloading data and write result of downloading to database, try or false, after repair need repeat download //By number of day downloading data and write result of downloading to database, try or false, after repair need repeat download
while(lastDate.isBefore(LocalDate.now().minusDays(3))){ while(lastDate.isBefore(LocalDate.now().minusDays(3))){
@ -2322,7 +2323,6 @@ public class AcceptJSON implements ServletContextAware {
} }
} }
} catch (CustomException e) { } catch (CustomException e) {
if(e.isSaveToLog()){ if(e.isSaveToLog()){
String uuid = UUID.randomUUID().toString(); String uuid = UUID.randomUUID().toString();
@ -2382,61 +2382,61 @@ public class AcceptJSON implements ServletContextAware {
result.country_id = "10"; //Uzbekistan result.country_id = "10"; //Uzbekistan
result.country_uid = "05592f5a-1c8b-4d87-a47f-67697cc12c49"; //Uzbekistan result.country_uid = "05592f5a-1c8b-4d87-a47f-67697cc12c49"; //Uzbekistan
if(!obj.isNull("region_name")) { if(!obj.isNull("region_name") && !obj.optString("region_name","").isBlank()) {
switch (obj.optString("region_name",null)) { switch (obj.optString("region_name",null).trim()) {
case "Sirdaryo viloyati": case "Sirdaryo viloyati", "Сырдарьинская область":
result.region_id = "31"; result.region_id = "31";
result.region_uid = "8f4f586f-6159-4fbf-a627-2c8d637abb5e"; result.region_uid = "8f4f586f-6159-4fbf-a627-2c8d637abb5e";
break; break;
case "Toshkent shahri": case "Toshkent shahri", "Город Ташкент":
result.region_id = "156"; result.region_id = "156";
result.region_uid = "1ed7b6f3-47a8-4128-ae0a-c160f5c3af08"; result.region_uid = "1ed7b6f3-47a8-4128-ae0a-c160f5c3af08";
break; break;
case "Toshkent viloyati": case "Toshkent viloyati", "Ташкентская область":
result.region_id = "157"; result.region_id = "157";
result.region_uid = "c8fccdc4-256a-4699-ab09-16c51351bf28"; result.region_uid = "c8fccdc4-256a-4699-ab09-16c51351bf28";
break; break;
case "Surxondaryo viloyati": case "Surxondaryo viloyati", "Сурхандарьинская область":
result.region_id = "30"; result.region_id = "30";
result.region_uid = "369c296d-5ff5-4570-88ad-0e94ccf9cb7c"; result.region_uid = "369c296d-5ff5-4570-88ad-0e94ccf9cb7c";
break; break;
case "Jizzax viloyati": case "Jizzax viloyati", "Джизакская область":
result.region_id = "25"; result.region_id = "25";
result.region_uid = "a7185680-7afc-47f1-954e-3d0f8b296592"; result.region_uid = "a7185680-7afc-47f1-954e-3d0f8b296592";
break; break;
case "Республики Каракалпакстан": case "Qoraqalpog‘iston Respublikasi", "Республики Каракалпакстан":
result.region_id = "22"; result.region_id = "22";
result.region_uid = "421ce759-b571-454e-b390-a73bee9b8b2c"; result.region_uid = "421ce759-b571-454e-b390-a73bee9b8b2c";
break; break;
case "Xorazm viloyati": case "Xorazm viloyati", "Хорезмская область":
result.region_id = "34"; result.region_id = "34";
result.region_uid = "8bc74ac4-ce06-4317-9982-b1492c72edb7"; result.region_uid = "8bc74ac4-ce06-4317-9982-b1492c72edb7";
break; break;
case "Andijon viloyati": case "Andijon viloyati", "Андижанская область":
result.region_id = "23"; result.region_id = "23";
result.region_uid = "a045faa8-eb12-40db-be30-be6e41e59bb2"; result.region_uid = "a045faa8-eb12-40db-be30-be6e41e59bb2";
break; break;
case "Fargʻona viloyati": case "Fargʻona viloyati", "Ферганская область":
result.region_id = "33"; result.region_id = "33";
result.region_uid = "e97ac81d-dab5-4496-9e0f-0c5508972539"; result.region_uid = "e97ac81d-dab5-4496-9e0f-0c5508972539";
break; break;
case "Namangan viloyati": case "Namangan viloyati", "Наманганская область":
result.region_id = "28"; result.region_id = "28";
result.region_uid = "e931af2e-0035-4149-b3b9-00895e4e1453"; result.region_uid = "e931af2e-0035-4149-b3b9-00895e4e1453";
break; break;
case "Buxoro viloyati": case "Buxoro viloyati", "Бухарская область":
result.region_id = "24"; result.region_id = "24";
result.region_uid = "0caf3854-48ad-40ed-9602-302c28b1a5b8"; result.region_uid = "0caf3854-48ad-40ed-9602-302c28b1a5b8";
break; break;
case "Navoiy viloyati": case "Navoiy viloyati", "Навоийская область":
result.region_id = "27"; result.region_id = "27";
result.region_uid = "ef244a76-8e7c-4e16-ad80-058b740fa6ca"; result.region_uid = "ef244a76-8e7c-4e16-ad80-058b740fa6ca";
break; break;
case "Qashqadaryo viloyati": case "Qashqadaryo viloyati","Кашкадарьинская область":
result.region_id = "158"; result.region_id = "158";
result.region_uid = "cf9a0a6e-18fa-41a0-bd9d-39c5fd1260c1"; result.region_uid = "cf9a0a6e-18fa-41a0-bd9d-39c5fd1260c1";
break; break;
case "Samarqand viloyati": case "Samarqand viloyati", "Самаркандская область":
result.region_id = "29"; result.region_id = "29";
result.region_uid = "2a6adb56-19a7-4f28-9a00-87559db91db9"; result.region_uid = "2a6adb56-19a7-4f28-9a00-87559db91db9";
break; break;
@ -2455,8 +2455,8 @@ public class AcceptJSON implements ServletContextAware {
} }
//Биотоп //Биотоп
if(!obj.isNull("biotope_type")) { if(!obj.isNull("biotope_type") && !obj.optString("biotope_type","").isBlank()) {
switch (obj.optString("biotope_type",null)) { switch (obj.optString("biotope_type",null).trim()) {
case "CIT степь","CIT steppe": case "CIT степь","CIT steppe":
result.bio_biotope_id = "1"; result.bio_biotope_id = "1";
result.bio_biotope_uid = "e6fa860a-ca2f-4cd7-8cfc-b97d86d2cd2d"; result.bio_biotope_uid = "e6fa860a-ca2f-4cd7-8cfc-b97d86d2cd2d";
@ -2517,35 +2517,35 @@ public class AcceptJSON implements ServletContextAware {
result.bio_biotope_id = "17"; result.bio_biotope_id = "17";
result.bio_biotope_uid = "c82f2609-b50a-4ca4-babc-ae3426f22b81"; result.bio_biotope_uid = "c82f2609-b50a-4ca4-babc-ae3426f22b81";
break; break;
case "Другое","Other locust": case "Other locust","Другое","DAL большая саксоулная горбатка в саксаулах","Другие саранчовые":
result.bio_biotope_id = "18"; result.bio_biotope_id = "18";
result.bio_biotope_uid = "e99a8868-2582-41e8-9c01-bef5fca8f0d1"; result.bio_biotope_uid = "e99a8868-2582-41e8-9c01-bef5fca8f0d1";
break; break;
default: default:
throw new CustomException(10000, "Not find biotopee: " + obj.optString("biotope_type",null), null, true); throw new CustomException(10000, "Not find biotope_type: " + obj.optString("biotope_type",null), null, true);
} }
} }
//растительность //растительность
if(!obj.isNull("vegetation")) { if(!obj.isNull("vegetation") && !obj.optString("vegetation","").isBlank()) {
switch (obj.optString("vegetation",null)) { switch (obj.optString("vegetation",null).trim()) {
case "Plant absent": case "Plant absent","Растения отсутствуют","Отсутствует":
result.bio_greenery_id = "8"; result.bio_greenery_id = "8";
result.bio_greenery_uid = "5621f2f2-56e8-486f-abc0-7eba996b6724"; result.bio_greenery_uid = "5621f2f2-56e8-486f-abc0-7eba996b6724";
break; break;
case "Plant dry": case "Plant dry", "Засохшие трава", "Высохшая трава":
result.bio_greenery_id = "7"; result.bio_greenery_id = "7";
result.bio_greenery_uid = "04ba0a4a-0557-490f-a08b-0db51a83cf7c"; result.bio_greenery_uid = "04ba0a4a-0557-490f-a08b-0db51a83cf7c";
break; break;
case "Желтеющая трава": //Plant drying case "Plant drying", "Желтеющая трава":
result.bio_greenery_id = "6"; result.bio_greenery_id = "6";
result.bio_greenery_uid = "99381409-ad1a-4ac8-95df-415ccb1334e1"; result.bio_greenery_uid = "99381409-ad1a-4ac8-95df-415ccb1334e1";
break; break;
case "Plant green": case "Plant green", "Свежая проросщая трава", "Зелёная трава":
result.bio_greenery_id = "5"; result.bio_greenery_id = "5";
result.bio_greenery_uid = "8fab82b8-8924-458d-b3f1-90a18ed75f9b"; result.bio_greenery_uid = "8fab82b8-8924-458d-b3f1-90a18ed75f9b";
break; break;
case "Plant greening": case "Plant greening", "Всходы зеленых трав":
result.bio_greenery_id = "4"; result.bio_greenery_id = "4";
result.bio_greenery_uid = "682993e1-3e5b-4aa0-9f11-c2a30a9c5908"; result.bio_greenery_uid = "682993e1-3e5b-4aa0-9f11-c2a30a9c5908";
break; break;
@ -2555,21 +2555,21 @@ public class AcceptJSON implements ServletContextAware {
} }
//Густота растительного покрова //Густота растительного покрова
if(!obj.isNull("vegetation_cover")) { if(!obj.isNull("vegetation_cover") && !obj.optString("vegetation_cover","").isBlank()) {
switch (obj.optString("vegetation_cover",null)) { switch (obj.optString("vegetation_cover",null).trim()) {
case "Sparse": //Sparse case "Sparse","Редкая": //Sparse
result.bio_greenery_cover_id = "8"; result.bio_greenery_cover_id = "8";
result.bio_greenery_cover_uid = "c70a145b-cfe4-4ad9-9ef8-814c9e3a1fac"; result.bio_greenery_cover_uid = "c70a145b-cfe4-4ad9-9ef8-814c9e3a1fac";
break; break;
case "Medium": //Medium case "Medium","Средняя": //Medium
result.bio_greenery_cover_id = "9"; result.bio_greenery_cover_id = "9";
result.bio_greenery_cover_uid = "d66bdde4-72a7-497f-b5e8-3174aebd7165"; result.bio_greenery_cover_uid = "d66bdde4-72a7-497f-b5e8-3174aebd7165";
break; break;
case "Густая": //Dense case "Dense","Густая": //Dense
result.bio_greenery_cover_id = "10"; result.bio_greenery_cover_id = "10";
result.bio_greenery_cover_uid = "4c12085b-4f42-4ba2-9236-465d5c5d0690"; result.bio_greenery_cover_uid = "4c12085b-4f42-4ba2-9236-465d5c5d0690";
break; break;
case "Absent": //Absent case "Absent","Отсутствует": //Absent
result.bio_greenery_cover_id = "0"; result.bio_greenery_cover_id = "0";
result.bio_greenery_cover_uid = "f712fe9a-2e42-44b9-b3dc-a7a1dc4767e8"; result.bio_greenery_cover_uid = "f712fe9a-2e42-44b9-b3dc-a7a1dc4767e8";
break; break;
@ -2579,22 +2579,37 @@ public class AcceptJSON implements ServletContextAware {
} }
result.bio_temperature = obj.optString("air_temperature",null); result.bio_temperature = obj.optString("air_temperature",null);
if(result.bio_temperature.isEmpty()) result.bio_temperature = null; if(result.bio_temperature!=null && result.bio_temperature.isEmpty()) result.bio_temperature = null;
result.bio_wind = obj.optString("wind_speed",null); result.bio_wind = obj.optString("wind_speed",null);
if(result.bio_wind.isEmpty()) result.bio_wind = null; if(result.bio_wind!=null && result.bio_wind.isEmpty()) result.bio_wind = null;
//Вид саранчи //Вид саранчи
if(!obj.isNull("subject_name")) { if(!obj.isNull("subject_name") && !obj.optString("subject_name","").isBlank()) {
switch (obj.optString("subject_name",null).replace("'", "")) { switch (obj.optString("subject_name",null).replace("'", "").trim()) {
case "Мароккская саранча": case "CIT - Italian locust", "CIT - итальянский прус", "Итальянский прус", "Итальянский прус, Кузнечики":
result.locust_type_id = "2";
break;
case "Итальянский прус":
result.locust_type_id = "1"; result.locust_type_id = "1";
result.locust_type_uid = "688e484b-babd-4a48-b318-be85e40682b0";
break; break;
case "Азиатская саранча": case "DMA - Moroccan locust", "DMA - мароккская саранча", "Мароккская саранча", "Мароккская саранча, Азиаткая саранча", "Мароккская саранча, Атбасарка", "Мароккская саранча, Туранский прус", "Мароккская саранча, Кузнечики":
result.locust_type_id = "2";
result.locust_type_uid = "8dd9e74f-d7ba-492a-8c75-7aed4f0847c6";
break;
case "LMI - Asian migratory locust", "LMI - азиатская перелетная саранча", "Азиаткая саранча":
result.locust_type_id = "3"; result.locust_type_id = "3";
result.locust_type_uid = "d61a5325-e8c7-497a-9cff-7ee4c4e1e37d";
break;
case "CIT & DMA", "Пустынная саранча, Мароккская саранча", "Итальянский прус, Мароккская саранча, Атбасарка, Кузнечики", "Итальянский прус, Мароккская саранча, Туранский прус", "Итальянский прус, Мароккская саранча, Кузнечики":
result.locust_type_id = "5";
result.locust_type_uid = "a85e8007-2303-4797-9f74-6cdc07da553f";
break;
case "CIT & LMI", "Пустынная саранча, Итальянский прус, Мароккская саранча", "Итальянский прус, Мароккская саранча":
result.locust_type_id = "6";
result.locust_type_uid = "4effd7bb-f19e-4a98-a724-691da12c163e";
break;
case "Other", "Другое", "Другие саранчовые", "Другие саранчовые, Пустынная саранча", "Другие саранчовые, Атбасарка, Кузнечики", "Большая саксаульная горбатка, Мароккская саранча", "Большая саксаульная горбатка, Туранский прус", "Другие саранчовые, Туранский прус", "Пустынная саранча, Итальянский прус", "Кузнечики", "Другие саранчовые, Атбасарка", "Другие саранчовые, Итальянский прус", "Другие саранчовые, Мароккская саранча", "Большая саксаульная горбатка", "Пустынная саранча", "Атбасарка", "Туранский прус", "Другие саранчовые, Большая саксаульная горбатка", "Другие саранчовые, Итальянский прус, Мароккская саранча", "Другие саранчовые, Кузнечики", "Другие саранчовые, Итальянский прус, Кузнечики", "Другие саранчовые, Мароккская саранча, Атбасарка", "Другие саранчовые, Мароккская саранча, Азиаткая саранча":
result.locust_type_id = "4";
result.locust_type_uid = "bf79cae1-1e01-4e7f-8ec1-deb06936a58e";
break; break;
default: default:
throw new CustomException(10000, "Not find subject_name: " + obj.optString("subject_name",null), null, true); throw new CustomException(10000, "Not find subject_name: " + obj.optString("subject_name",null), null, true);
@ -2609,25 +2624,25 @@ public class AcceptJSON implements ServletContextAware {
result.eggs_capsules_density_to = obj.optString("eggs_pods_density_to_m2",null); result.eggs_capsules_density_to = obj.optString("eggs_pods_density_to_m2",null);
result.eggs_capsules = obj.optString("eggs_average_number_egg_pod",null); result.eggs_capsules = obj.optString("eggs_average_number_egg_pod",null);
result.eggs_live = obj.optString("eggs_viable",null); result.eggs_live = obj.optString("eggs_viable",null);
if(!obj.isNull("eggs_natural_enemies")) { if(!obj.isNull("eggs_natural_enemies") && !obj.optString("eggs_natural_enemies","").isBlank()) {
switch (obj.optString("eggs_natural_enemies",null).replace("'", "")) { switch (obj.optString("eggs_natural_enemies",null).replace("'", "").trim()) {
case "not", "Нет": case "not", "Нет", "Нет, Грибные заболевание":
result.eggs_enemies_id = "5"; result.eggs_enemies_id = "5";
result.eggs_enemies_uid = "52580c53-3d13-4b93-b84e-fcf9cbd50e01"; result.eggs_enemies_uid = "52580c53-3d13-4b93-b84e-fcf9cbd50e01";
break; break;
case "Other", "Другое": case "Other", "Другое", "Другое, Нет", "Другое, Личинки мух, Личинки жуков", "Другое, Личинки мух", "Другое, Естественные враги 2 ru":
result.eggs_enemies_id = "4"; result.eggs_enemies_id = "4";
result.eggs_enemies_uid = "d13c793f-f65e-4a34-9307-940289cd4265"; result.eggs_enemies_uid = "d13c793f-f65e-4a34-9307-940289cd4265";
break; break;
case "Larvae of beetles", "Личинки жуков": case "Larvae of beetles", "Личинки жуков", "Другое, Личинки жуков", "Личинки жуков, Нет":
result.eggs_enemies_id = "3"; result.eggs_enemies_id = "3";
result.eggs_enemies_uid = "76cf72d8-8ac5-44de-98f3-a7221d2c7985"; result.eggs_enemies_uid = "76cf72d8-8ac5-44de-98f3-a7221d2c7985";
break; break;
case "Larvae of flies", "Личинки мух": case "Larvae of flies", "Личинки мух", "Личинки мух, Личинки жуков":
result.eggs_enemies_id = "2"; result.eggs_enemies_id = "2";
result.eggs_enemies_uid = "e2e573a3-9859-46f9-99e6-f97d7fc37ea2"; result.eggs_enemies_uid = "e2e573a3-9859-46f9-99e6-f97d7fc37ea2";
break; break;
case "Fungal diseases", "Грибные заболевания": case "Fungal diseases", "Грибные заболевания", "Грибные заболевание":
result.eggs_enemies_id = "1"; result.eggs_enemies_id = "1";
result.eggs_enemies_uid = "d0cf06f4-6e1f-4da2-b836-45dfdef5da98"; result.eggs_enemies_uid = "d0cf06f4-6e1f-4da2-b836-45dfdef5da98";
break; break;
@ -2637,9 +2652,9 @@ public class AcceptJSON implements ServletContextAware {
} }
result.larva_born = null; // not used result.larva_born = null; // not used
if(!obj.isNull("hoppers_hatching")){ if(!obj.isNull("hoppers_hatching") && !obj.optString("hoppers_hatching","").isBlank()){
switch (obj.optString("hoppers_hatching",null).replace("'", "")) { switch (obj.optString("hoppers_hatching",null).replace("'", "").trim().trim()) {
case "Beginning","Начало": case "Beginning", "Начало":
result.larva_born_id="1"; result.larva_born_id="1";
result.larva_born_uid="392db9f2-bfaa-44e0-8ca3-bb3cf1ff937a"; result.larva_born_uid="392db9f2-bfaa-44e0-8ca3-bb3cf1ff937a";
break; break;
@ -2653,8 +2668,8 @@ public class AcceptJSON implements ServletContextAware {
} }
//Hopper stages //Hopper stages
if(!obj.isNull("hoppers_stages")){ /*if(!obj.isNull("hoppers_appearance") && !obj.optString("hoppers_appearance","").isBlank()){
switch (obj.optString("hoppers_stages",null).replace("'", "")) { switch (obj.optString("hoppers_appearance",null).replace("'", "").trim()) {
case "Early","Младшие": case "Early","Младшие":
result.larva_age_id="1"; result.larva_age_id="1";
result.larva_age_uid="becdbc31-094e-48bb-aef0-93f88abff12d"; result.larva_age_uid="becdbc31-094e-48bb-aef0-93f88abff12d";
@ -2676,13 +2691,13 @@ public class AcceptJSON implements ServletContextAware {
result.larva_age_uid="5acd65b3-e32f-4984-83ad-dfba2b7f0205"; result.larva_age_uid="5acd65b3-e32f-4984-83ad-dfba2b7f0205";
break; break;
default: default:
throw new CustomException(10000, "Not find hoppers_hatching: " + obj.optString("hoppers_hatching",null),null,true); throw new CustomException(10000, "Not find hoppers_appearance: " + obj.optString("hoppers_appearance",null),null,true);
}
} }
}*/
//Appearance //Appearance
if(!obj.isNull("hoppers_appearance")){ if(!obj.isNull("hoppers_stages") && !obj.optString("hoppers_stages","").isBlank()){
switch (obj.optString("hoppers_appearance",null).replace("'", "")) { switch (obj.optString("hoppers_stages",null).replace("'", "").trim()) {
case "Solitary","Одиночная": case "Solitary","Одиночная":
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";
@ -2696,13 +2711,13 @@ public class AcceptJSON implements ServletContextAware {
result.larva_age_uid="683cdba3-2f4c-4e61-b667-936c524136b4"; result.larva_age_uid="683cdba3-2f4c-4e61-b667-936c524136b4";
break; break;
default: default:
throw new CustomException(10000, "Not find hoppers_hatching: " + obj.optString("hoppers_hatching",null),null,true); throw new CustomException(10000, "Not find hoppers_stages: " + obj.optString("hoppers_stages",null),null,true);
} }
} }
//Spatial distribution //Spatial distribution
if(!obj.isNull("hoppers_spatial_distribution")){ if(!obj.isNull("hoppers_spatial_distribution") && !obj.optString("hoppers_spatial_distribution","").isBlank()){
switch (obj.optString("hoppers_spatial_distribution",null).replace("'", "")) { switch (obj.optString("hoppers_spatial_distribution",null).replace("'", "").trim()) {
case "Isolated","Одиночные": case "Isolated","Одиночные":
result.larva_behavior_id="1"; result.larva_behavior_id="1";
result.larva_behavior_uid="64a7a8f5-b44d-4fd7-b78c-3c0837f57b99"; result.larva_behavior_uid="64a7a8f5-b44d-4fd7-b78c-3c0837f57b99";
@ -2726,9 +2741,9 @@ public class AcceptJSON implements ServletContextAware {
result.kuliguli_density_to = obj.optString("bands_density_to_m2",null); result.kuliguli_density_to = obj.optString("bands_density_to_m2",null);
result.kuliguli_size = obj.optString("bands_sizes_m2",null); result.kuliguli_size = obj.optString("bands_sizes_m2",null);
result.kuliguli_count = obj.optString("bands_number_in_ha",null); result.kuliguli_count = obj.optString("bands_number_in_ha",null);
if(!obj.isNull("bands_behaviour")){ if(!obj.isNull("bands_behaviour") && !obj.optString("bands_behaviour","").isBlank()){
switch (obj.optString("bands_behaviour",null).replace("'", "")) { switch (obj.optString("bands_behaviour",null).replace("'", "").trim()) {
case "Marching","Миграция": case "Marching","Миграция","Миргация":
result.kuliguli_action_id="1"; result.kuliguli_action_id="1";
result.kuliguli_action_uid="4399f28c-b1ed-44f6-8af5-351cd944d408"; result.kuliguli_action_uid="4399f28c-b1ed-44f6-8af5-351cd944d408";
break; break;
@ -2740,7 +2755,7 @@ public class AcceptJSON implements ServletContextAware {
result.kuliguli_action_id="3"; result.kuliguli_action_id="3";
result.kuliguli_action_uid="0fca9acd-9447-4653-9ca7-7dcac7cb495e"; result.kuliguli_action_uid="0fca9acd-9447-4653-9ca7-7dcac7cb495e";
break; break;
case "Stupor","Оцепенение": case "Stupor","Оцепенение","Оцепененине":
result.kuliguli_action_id="4"; result.kuliguli_action_id="4";
result.kuliguli_action_uid="63bb9eba-c4ad-4e2d-a1cd-ada1695abac5"; result.kuliguli_action_uid="63bb9eba-c4ad-4e2d-a1cd-ada1695abac5";
break; break;
@ -2752,8 +2767,8 @@ public class AcceptJSON implements ServletContextAware {
throw new CustomException(10000, "Not find bands_behaviour: " + obj.optString("bands_behaviour",null),null,true); throw new CustomException(10000, "Not find bands_behaviour: " + obj.optString("bands_behaviour",null),null,true);
} }
} }
if(!obj.isNull("bands_stages")){ /*if(!obj.isNull("bands_stages") && !obj.optString("bands_stages","").isBlank()){
switch (obj.optString("bands_stages",null).replace("'", "")) { switch (obj.optString("bands_stages",null).replace("'", "").trim()) {
case "Early","Младшие": case "Early","Младшие":
result.kuliguli_age_id="1"; result.kuliguli_age_id="1";
result.kuliguli_age_uid="becdbc31-094e-48bb-aef0-93f88abff12d"; result.kuliguli_age_uid="becdbc31-094e-48bb-aef0-93f88abff12d";
@ -2775,39 +2790,11 @@ public class AcceptJSON implements ServletContextAware {
result.kuliguli_age_uid="5acd65b3-e32f-4984-83ad-dfba2b7f0205"; result.kuliguli_age_uid="5acd65b3-e32f-4984-83ad-dfba2b7f0205";
break; break;
default: default:
throw new CustomException(10000, "Not find bands_behaviour: " + obj.optString("bands_behaviour",null),null,true); throw new CustomException(10000, "Not find bands_stages: " + obj.optString("bands_stages",null),null,true);
} }
} }*/
if(!obj.isNull("bands_stages") && !obj.optString("bands_stages","").isBlank()){ // Bands stages
//Adults (Имаго) switch (obj.optString("bands_stages",null).replace("'", "").trim()) {
if(!obj.isNull("adults_fledging")){
switch (obj.optString("adults_fledging",null).replace("'", "")) {
case "Beginning","Начало":
result.imago_wing_id="7";
result.imago_wing_uid="312bf2ac-dbdb-40be-b716-7f02f751a65e";
break;
case "Mass","Массовое":
result.imago_wing_id="6";
result.imago_wing_uid="97d5a02c-c3ed-4627-ae14-4f92d6eb2945";
break;
default:
throw new CustomException(10000, "Not find adults_fledging: " + obj.optString("adults_fledging",null),null,true);
}
}
if(!obj.isNull("adults_maturity")){ //Половозрелость (да, нет)
switch (obj.optString("adults_maturity",null).toLowerCase().replace("'", "")) {
case "yes","да":
result.imago_maturity="true";
break;
case "no","нет":
result.imago_maturity="false";
break;
default:
throw new CustomException(10000, "Not find adults_maturity: " + obj.optString("adults_maturity",null),null,true);
}
}
if(!obj.isNull("bands_stages")){ // Bands stages
switch (obj.optString("bands_stages",null).replace("'", "")) {
case "Solitary","Стадная": case "Solitary","Стадная":
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";
@ -2825,8 +2812,31 @@ public class AcceptJSON implements ServletContextAware {
} }
} }
if(!obj.isNull("adults_spatial_distribution")){ // Bands stages //Adults (Имаго)
switch (obj.optString("adults_spatial_distribution",null).replace("'", "")) { if(!obj.isNull("adults_fledging") && !obj.optString("adults_fledging","").isBlank()){
switch (obj.optString("adults_fledging",null).replace("'", "").trim()) {
case "Beginning","Начало":
result.imago_wing_id="7";
result.imago_wing_uid="312bf2ac-dbdb-40be-b716-7f02f751a65e";
break;
case "Mass","Массовое":
result.imago_wing_id="6";
result.imago_wing_uid="97d5a02c-c3ed-4627-ae14-4f92d6eb2945";
break;
default:
throw new CustomException(10000, "Not find adults_fledging: " + obj.optString("adults_fledging",null),null,true);
}
}
if(!obj.isNull("adults_maturity") && !obj.optString("adults_maturity","").isBlank()){ //Половозрелость (да, нет)
if(obj.getBoolean("adults_maturity"))
result.imago_maturity="true";
else
result.imago_maturity="false";
}
if(!obj.isNull("adults_spatial_distribution") && !obj.optString("adults_spatial_distribution","").isBlank()){ // Bands stages
switch (obj.optString("adults_spatial_distribution",null).replace("'", "").trim()) {
case "Isolated","Одиночные": case "Isolated","Одиночные":
result.imago_action_id="1"; result.imago_action_id="1";
result.imago_action_uid="c0b25ce8-7454-459a-9a54-b459eea1573a"; result.imago_action_uid="c0b25ce8-7454-459a-9a54-b459eea1573a";
@ -2845,55 +2855,34 @@ public class AcceptJSON implements ServletContextAware {
} }
result.imago_density = obj.optString("adults_density_m2",null); result.imago_density = obj.optString("adults_density_m2",null);
result.imago_density_ga = obj.optString("adults_density_ha",null); result.imago_density_ga = obj.optString("adults_density_ha",null);
if(!obj.isNull("adults_roosting")){ //Половозрелость (да, нет) if(!obj.isNull("adults_roosting") && !obj.optString("adults_roosting","").isBlank()){ //Половозрелость (да, нет)
switch (obj.optString("adults_roosting",null).toLowerCase().replace("'", "")) { if(obj.getBoolean("adults_roosting"))
case "yes","да":
result.imago_feeding="true"; result.imago_feeding="true";
break; else
case "no","нет":
result.imago_feeding="false"; result.imago_feeding="false";
break; }
default:
throw new CustomException(10000, "Not find adults_roosting: " + obj.optString("adults_roosting",null),null,true); if(!obj.isNull("adults_copulation") && !obj.optString("adults_copulation","").isBlank()){ // Спаривание
if(obj.getBoolean("adults_copulation")){
result.imago_copulation = "true";
}else{
result.imago_copulation = "false";
} }
} }
if(!obj.isNull("adults_copulation")){ // Спаривание if(!obj.isNull("adults_laying") && !obj.optString("adults_laying","").isBlank()){ // Яйцекладка
switch (obj.optString("adults_copulation",null).toLowerCase().replace("'", "")) { if(obj.getBoolean("adults_laying")){
case "yes","да":
result.imago_copulation = "true";
break;
case "no","нет":
result.imago_copulation = "false";
break;
default:
throw new CustomException(10000, "Not find adults_copulation: " + obj.optString("adults_copulation",null),null,true);
}
}
//result.imago_laying = obj.optString("adults_laying",null);
if(!obj.isNull("adults_laying")){ // Яйцекладка
switch (obj.optString("adults_laying",null).toLowerCase().replace("'", "")) {
case "yes","да":
result.imago_laying="true"; result.imago_laying="true";
break; }else{
case "no","нет":
result.imago_laying="false"; result.imago_laying="false";
break;
default:
throw new CustomException(10000, "Not find adults_laying: " + obj.optString("adults_laying",null),null,true);
} }
} }
//result.imago_flying = obj.optString("adults_flying",null);
if(!obj.isNull("adults_flying")){ // Полёты if(!obj.isNull("adults_flying") && !obj.optString("adults_flying","").isBlank()){ // Полёты
switch (obj.optString("adults_flying",null).toLowerCase().replace("'", "")) { if(obj.getBoolean("adults_flying")){
case "yes","да":
result.imago_flying="true"; result.imago_flying="true";
break; }else{
case "no","нет":
result.imago_flying="false"; result.imago_flying="false";
break;
default:
throw new CustomException(10000, "Not find adults_flying: " + obj.optString("adults_flying",null),null,true);
} }
} }
@ -2904,8 +2893,8 @@ public class AcceptJSON implements ServletContextAware {
//result.swarm_copulation = obj.optString("",null); // boolean, //result.swarm_copulation = obj.optString("",null); // boolean,
//result.swarm_laying = obj.optString("",null); // boolean, //result.swarm_laying = obj.optString("",null); // boolean,
result.swarm_flying_direction_id = obj.optString("swarms_flying_direction",null); // integer, result.swarm_flying_direction_id = obj.optString("swarms_flying_direction",null); // integer,
if(!obj.isNull("swarms_height")) { if(!obj.isNull("swarms_height") && !obj.optString("swarms_height","").isBlank()) {
switch (obj.optString("swarms_height",null).replace("'", "")) { switch (obj.optString("swarms_height",null).replace("'", "").trim()) {
case "Low height", "Низкая": case "Low height", "Низкая":
result.swarm_height_id = "1"; result.swarm_height_id = "1";
result.swarm_height_uid = "0d60a2d7-d732-4199-b966-bd72870a07cc"; result.swarm_height_uid = "0d60a2d7-d732-4199-b966-bd72870a07cc";

2
src/main/java/org/ccalm/main/QGIS.java
View File

@ -417,7 +417,7 @@ public class QGIS implements ServletContextAware {
public String fileToString(String fName) public String fileToString(String fName)
{ {
StringBuilder sb = new StringBuilder(); StringBuilder sb = new StringBuilder(1024);
try try
{ {
InputStream is = new FileInputStream(fName); InputStream is = new FileInputStream(fName);

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

@ -115,7 +115,7 @@ public class SendWarning {
String email = obj.getString("email"); String email = obj.getString("email");
if(email.equals("irigm@mail.ru") || email.equals("ivanov.i@istt.kz")){ //TODO для тестирования потом удалить if(email.equals("irigm@mail.ru") || email.equals("ivanov.i@istt.kz")){ //TODO для тестирования потом удалить
StringBuilder html = new StringBuilder(); StringBuilder html = new StringBuilder(1024);
html.append("<html>") html.append("<html>")
.append("<head>") .append("<head>")
.append("<style>") .append("<style>")

61
src/main/java/org/ccalm/main/models/FrmLocustModel.java
View File

@ -41,6 +41,7 @@ public class FrmLocustModel {
public String locust; //Вид саранчи public String locust; //Вид саранчи
//public String locust_id; //Вид саранчи //public String locust_id; //Вид саранчи
public String locust_type_id; //Locust species (Вид саранчи) public String locust_type_id; //Locust species (Вид саранчи)
public String locust_type_uid; //Locust species (Вид саранчи)
public String locust_populated; //Area infested (ha) public String locust_populated; //Area infested (ha)
public String bio_temperature; //air temperature public String bio_temperature; //air temperature
@ -61,6 +62,7 @@ public class FrmLocustModel {
public String description=""; public String description="";
//Hopper //Hopper
public String larva = null;
public String larva_born = null; //Hatching character varying(255) COLLATE pg_catalog."default" DEFAULT NULL::character varying, public String larva_born = null; //Hatching character varying(255) COLLATE pg_catalog."default" DEFAULT NULL::character varying,
public String larva_born_id = null; // integer, public String larva_born_id = null; // integer,
public String larva_born_uid = null; public String larva_born_uid = null;
@ -74,6 +76,7 @@ public class FrmLocustModel {
public String larva_density_to = null; //Hopper density to numeric, public String larva_density_to = null; //Hopper density to numeric,
//Eggs //Eggs
public String eggs = null; // For CheckBox
public String eggs_capsules_area = null; //Egg-bed (surface in ha) public String eggs_capsules_area = null; //Egg-bed (surface in ha)
public String eggs_capsules_density = null; //Плотность яиц public String eggs_capsules_density = null; //Плотность яиц
public String eggs_capsules_density_to = null; //Egg-pods (density) to public String eggs_capsules_density_to = null; //Egg-pods (density) to
@ -84,6 +87,7 @@ public class FrmLocustModel {
//public String eggs_enemies = null; //not using TODO delete field from database //public String eggs_enemies = null; //not using TODO delete field from database
//Bands (кулиги) //Bands (кулиги)
public String kuliguli = null;
public String kuliguli_density=null; //Плотность кулиг на м² public String kuliguli_density=null; //Плотность кулиг на м²
public String kuliguli_density_to = null; //плотность максимальная в кулиге public String kuliguli_density_to = null; //плотность максимальная в кулиге
public String kuliguli_size = null; // Размер кулиг public String kuliguli_size = null; // Размер кулиг
@ -94,6 +98,7 @@ public class FrmLocustModel {
public String kuliguli_age_uid = null; // Возраст личинок public String kuliguli_age_uid = null; // Возраст личинок
//Adults (Имаго) //Adults (Имаго)
public String imago = null;
public String imago_wing_id = null; public String imago_wing_id = null;
public String imago_wing_uid = null; public String imago_wing_uid = null;
public String imago_maturity = null; public String imago_maturity = null;
@ -137,6 +142,61 @@ public class FrmLocustModel {
public String test=null; public String test=null;
public void update(){ public void update(){
if(
larva_born != null ||
larva_born_id != null ||
larva_born_uid != null ||
larva_age_id != null ||
larva_age_uid != null ||
larva_painting_id != null ||
larva_behavior != null ||
larva_behavior_id != null ||
larva_behavior_uid != null ||
larva_density != null ||
larva_density_to != null
) larva = "true";
if(
eggs_capsules_area != null ||
eggs_capsules_density != null ||
eggs_capsules_density_to != null ||
eggs_capsules != null ||
eggs_live != null ||
eggs_enemies_id != null ||
eggs_enemies_uid != null
) eggs = "true";
//Bands (кулиги)
if(
kuliguli_density != null ||
kuliguli_density_to != null ||
kuliguli_size != null ||
kuliguli_count != null ||
kuliguli_action_id != null ||
kuliguli_action_uid != null ||
kuliguli_age_id != null ||
kuliguli_age_uid != null
) kuliguli = "true";
//Adults (Имаго)
if(
imago_wing_id != null ||
imago_wing_uid != null ||
imago_maturity != null ||
imago_phase_id != null ||
imago_phase_uid != null ||
imago_action != null ||
imago_action_id != null ||
imago_action_uid != null ||
imago_density != null ||
imago_density_ga != null ||
imago_feeding != null ||
imago_copulation != null ||
imago_laying != null ||
imago_flying != null
) imago = "true";
if( if(
swarm_maturity!=null || swarm_maturity!=null ||
swarm_density_id!=null || swarm_density_id!=null ||
@ -148,6 +208,7 @@ public class FrmLocustModel {
swarm_height_id!=null || swarm_height_id!=null ||
swarm_height_uid!=null swarm_height_uid!=null
) swarms = "true"; ) swarms = "true";
} }
} }