diff --git a/org_ccalm_main.yml b/org_ccalm_main.yml index cadd1b7..64acc6c 100644 --- a/org_ccalm_main.yml +++ b/org_ccalm_main.yml @@ -10,7 +10,8 @@ spring: application: name: org.ccalm.main datasource: - url: jdbc:postgresql://91.201.214.156:5432/CCALM?ApplicationName=org_ccalm_main&ssl=true&sslmode=require&connectTimeout=10000&socketTimeout=10000 + #url: jdbc:postgresql://91.201.214.156:5432/CCALM?ApplicationName=org_ccalm_main&ssl=true&sslmode=require&connectTimeout=10000&socketTimeout=10000 + url: jdbc:postgresql://91.201.214.156:5432/CCALM?ApplicationName=org_ccalm_main username: postgres password: 309A86FF65A78FB428F4E38DFE35F730 driver-class-name: org.postgresql.Driver diff --git a/pom.xml b/pom.xml index 3f9ead9..3acb5b1 100644 --- a/pom.xml +++ b/pom.xml @@ -5,7 +5,7 @@ org.springframework.boot spring-boot-starter-parent - 3.3.3 + 3.4.2 org.ccalm @@ -34,18 +34,15 @@ org.springframework.boot spring-boot-starter-thymeleaf - 3.3.3 org.springframework.boot spring-boot-starter-web - 3.3.3 org.springframework.boot spring-boot-starter-test test - 3.3.3 jakarta.servlet @@ -93,15 +90,15 @@ org.gdal gdal - 2.4.0 + 3.2.0 - + io.jsonwebtoken diff --git a/src/main/java/org/ccalm/main/AcceptASDCController.java b/src/main/java/org/ccalm/main/AcceptASDCController.java index 2d2dc52..f3de8a7 100644 --- a/src/main/java/org/ccalm/main/AcceptASDCController.java +++ b/src/main/java/org/ccalm/main/AcceptASDCController.java @@ -2565,7 +2565,7 @@ public class AcceptASDCController implements ServletContextAware { sql = "select fldl.* from main.frmlocustdel_locations fldl join main.frmlocustdel fld on main.strtouuid(fld.uid)=main.strtouuid(fldl.frmlocustdel_uid) where fld.date>now()-interval '"+String.valueOf(days)+" days' and fld.country_id="+String.valueOf(country_id)+" and fldl.seq>"+pS+" order by fldl.seq"; //TODO удалить }else if(pN.equals("frmlocustdel") && days>0 && country_id>0){ - Map fields = TCTableTools.getTableSchema(conn, "main", "frmlocustdel"); + Map fields = TCTableTools.getTableSchema(conn, "main.frmlocustdel"); STools.delFromMapByValue(fields, "geometry"); //Исключаем поля с типом геометрия, SQLite в android их не понимает //sql = "select "+String.join(", ", fields.keySet())+" from main.frmlocustdel where date>now()-interval '"+String.valueOf(days)+" days' and country_id="+String.valueOf(country_id)+" and seq>"+pS+" and device_id!='"+device_id+"' order by seq"; sql = "select "+String.join(", ", fields.keySet())+" from main.frmlocustdel where date>now()-interval '"+String.valueOf(days)+" days' and country_id="+String.valueOf(country_id)+" and seq>"+pS+" order by seq"; //TODO удалить @@ -2575,7 +2575,7 @@ public class AcceptASDCController implements ServletContextAware { sql = "select t.* from main._translations t join main._translations_subsystems ts on ts.translation_id=t.id and ts.subsistem_id=2 where t.seq>"+pS+" order by seq"; }else { - Map fields = TCTableTools.getTableSchema(conn, "main", pN); + Map fields = TCTableTools.getTableSchema(conn, "main." + pN); STools.delFromMapByValue(fields, "geometry"); //Исключаем поля с типом геометрия, SQLite в android их не понимает sql = "select "+String.join(", ", fields.keySet())+" from main."+pN+" where seq>"+pS+" order by seq"; } @@ -2859,7 +2859,7 @@ public class AcceptASDCController implements ServletContextAware { //Проверка на существование полей в обеих таблицах ExistsType[] fb=new ExistsType[tbl.fields.size()]; - Map col = TCTableTools.getTableSchema(conn, "main", tbl.name); + Map col = TCTableTools.getTableSchema(conn, "main" + tbl.name); for(int i=0;i