diff --git a/org-ccalm-main.yml b/org-ccalm-main.yml index 74cf477..f49dccd 100644 --- a/org-ccalm-main.yml +++ b/org-ccalm-main.yml @@ -10,8 +10,8 @@ spring: application: name: org-ccalm-main datasource: - #url: jdbc:postgresql://10.0.0.1:5432/CCALM?ApplicationName=org_ccalm_main&connectTimeout=10000&socketTimeout=30000 - url: jdbc:postgresql://ccalm.org:5432/CCALM?ApplicationName=org_ccalm_main&ssl=true&sslmode=require&connectTimeout=10000&socketTimeout=10000 + url: jdbc:postgresql://10.0.0.1:5432/CCALM?ApplicationName=org_ccalm_main&connectTimeout=10000&socketTimeout=30000 + #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 username: postgres password: 309A86FF65A78FB428F4E38DFE35F730 diff --git a/src/main/java/org/ccalm/main/GeoGSON.java b/src/main/java/org/ccalm/main/GeoGSON.java index 9005dd8..fda6ccf 100644 --- a/src/main/java/org/ccalm/main/GeoGSON.java +++ b/src/main/java/org/ccalm/main/GeoGSON.java @@ -268,18 +268,14 @@ public class GeoGSON implements ServletContextAware { try { String sql = """ SELECT - fl.id, - COALESCE(fl.eggs_capsules_density, fl.eggs_capsules_density_to)::double precision + COALESCE(fl.eggs_capsules_density_to, fl.eggs_capsules_density)::double precision / 2::double precision AS pods, - ST_AsGeoJSON(st_setsrid(st_makepoint(fl.lon_center, fl.lat_center), 4326)) AS geometry - FROM main.frmlocust fl - WHERE 1=1 - AND fl.lon_center IS NOT NULL - AND fl.lat_center IS NOT NULL - AND (:countryId IS NULL OR fl.country_id = :countryId) - AND (:regionId IS NULL OR fl.region_id = :regionId) - AND (:locustTypeId IS NULL OR fl.locust_type_id = :locustTypeId) - AND (:dateFrom IS NULL OR fl.date >= to_timestamp(:dateFrom)) - AND (:dateTo IS NULL OR fl.date <= to_timestamp(:dateTo)) + * + FROM main.get_frmlocust_pods_density( + :countryId, + :regionId, + :locustTypeId, + cast(to_timestamp(:dateFrom) as timestamp without time zone), + cast(to_timestamp(:dateTo) as timestamp without time zone) + ) """; MapSqlParameterSource params = new MapSqlParameterSource(); diff --git a/src/main/java/org/ccalm/main/Products.java b/src/main/java/org/ccalm/main/Products.java index 1e25062..f0504af 100644 --- a/src/main/java/org/ccalm/main/Products.java +++ b/src/main/java/org/ccalm/main/Products.java @@ -1015,7 +1015,10 @@ public class Products implements ServletContextAware { } //Получить плотность имаго за последние 5 лет - @RequestMapping(value = {"/get_density_imago", "/api/locust/v01/get_density_imago"},method = RequestMethod.POST, produces = "application/json;charset=UTF-8") + @RequestMapping( + value = {"/get_density_imago", "/api/locust/v01/get_density_imago"}, + method = {RequestMethod.POST, RequestMethod.GET}, + produces = "application/json;charset=UTF-8") @ResponseBody public ResponseEntity getDensityImago( @ModelAttribute User user, diff --git a/src/main/resources/static/resources/engine/index.js b/src/main/resources/static/resources/engine/index.js index a280f43..6181c65 100644 --- a/src/main/resources/static/resources/engine/index.js +++ b/src/main/resources/static/resources/engine/index.js @@ -526,7 +526,7 @@ class TCharFRMDensityImago this.m_win.setCenter(); this.m_win.loadBody("./resources/vue/density_imago.html?v=03","GET",null, ()=>{ - postJsonData("./get_density_imago?id="+id,null, + postJsonData("./api/locust/v01/get_density_imago?id="+id,null, (ok,data)=>{ if(ok){ if(data.error_code=='0') diff --git a/src/main/resources/static/resources/vue/density_imago.html b/src/main/resources/static/resources/vue/density_imago.html index e564507..4ba8dd4 100644 --- a/src/main/resources/static/resources/vue/density_imago.html +++ b/src/main/resources/static/resources/vue/density_imago.html @@ -9,12 +9,14 @@ trt('Year') trt('Average_density') + trt('Number_of_forms') {{ item.year }} {{ item.imago_density }} + {{ item.count }} diff --git a/src/main/resources/static/resources/vue/density_larval.html b/src/main/resources/static/resources/vue/density_larval.html index 99ce181..4150f04 100644 --- a/src/main/resources/static/resources/vue/density_larval.html +++ b/src/main/resources/static/resources/vue/density_larval.html @@ -9,12 +9,14 @@ trt('Year') trt('Average_density') + trt('Number_of_forms') {{ item.year }} {{ item.larva_density }} + {{ item.count }}