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

+

Browse Source
This commit is contained in:
igor
2025-02-21 21:19:59 +05:00
parent 92d8be6682
commit ff82f35c3a
3 changed files with 9 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
org_ccalm_main.yml
View File

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

11
pom.xml
View File

@ -5,7 +5,7 @@
<parent> <parent>
<groupId>org.springframework.boot</groupId> <groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-parent</artifactId> <artifactId>spring-boot-starter-parent</artifactId>
<version>3.3.3</version> <version>3.4.2</version>
<relativePath/> <!-- lookup parent from repository --> <relativePath/> <!-- lookup parent from repository -->
</parent> </parent>
<groupId>org.ccalm</groupId> <groupId>org.ccalm</groupId>
@ -34,18 +34,15 @@
<dependency> <dependency>
<groupId>org.springframework.boot</groupId> <groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-thymeleaf</artifactId> <artifactId>spring-boot-starter-thymeleaf</artifactId>
<version>3.3.3</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.springframework.boot</groupId> <groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-web</artifactId> <artifactId>spring-boot-starter-web</artifactId>
<version>3.3.3</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.springframework.boot</groupId> <groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-test</artifactId> <artifactId>spring-boot-starter-test</artifactId>
<scope>test</scope> <scope>test</scope>
<version>3.3.3</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>jakarta.servlet</groupId> <groupId>jakarta.servlet</groupId>
@ -93,15 +90,15 @@
<dependency> <dependency>
<groupId>org.gdal</groupId> <groupId>org.gdal</groupId>
<artifactId>gdal</artifactId> <artifactId>gdal</artifactId>
<version>2.4.0</version> <version>3.2.0</version>
</dependency> </dependency>
<!-- Для загрузки новой версии плагина --> <!-- Для загрузки новой версии плагина -->
<dependency> <!--dependency>
<groupId>org.apache.maven.plugins</groupId> <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-assembly-plugin</artifactId> <artifactId>maven-assembly-plugin</artifactId>
<version>3.7.1</version> <version>3.7.1</version>
</dependency> </dependency-->
<dependency> <dependency>
<groupId>io.jsonwebtoken</groupId> <groupId>io.jsonwebtoken</groupId>

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

@ -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 удалить 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 }else
if(pN.equals("frmlocustdel") && days>0 && country_id>0){ if(pN.equals("frmlocustdel") && days>0 && country_id>0){
Map<String, String> fields = TCTableTools.getTableSchema(conn, "main", "frmlocustdel"); Map<String, String> fields = TCTableTools.getTableSchema(conn, "main.frmlocustdel");
STools.delFromMapByValue(fields, "geometry"); //Исключаем поля с типом геометрия, SQLite в android их не понимает 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+" 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 удалить 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"; 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 }else
{ {
Map<String, String> fields = TCTableTools.getTableSchema(conn, "main", pN); Map<String, String> fields = TCTableTools.getTableSchema(conn, "main." + pN);
STools.delFromMapByValue(fields, "geometry"); //Исключаем поля с типом геометрия, SQLite в android их не понимает STools.delFromMapByValue(fields, "geometry"); //Исключаем поля с типом геометрия, SQLite в android их не понимает
sql = "select "+String.join(", ", fields.keySet())+" from main."+pN+" where seq>"+pS+" order by seq"; 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()]; ExistsType[] fb=new ExistsType[tbl.fields.size()];
Map<String, String> col = TCTableTools.getTableSchema(conn, "main", tbl.name); Map<String, String> col = TCTableTools.getTableSchema(conn, "main" + tbl.name);
for(int i=0;i<tbl.fields.size();i++) for(int i=0;i<tbl.fields.size();i++)
{ {
fb[i] = new ExistsType(); fb[i] = new ExistsType();