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

Empty

Browse Source
This commit is contained in:
Igor I
2026-09-23 19:17:04 +05:00
parent fe4ca18541
commit 9d35ac5292
3 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pom.xml
+1 -1
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.4.2</version> <version>3.4.13</version>
<relativePath/> <!-- lookup parent from repository --> <relativePath/> <!-- lookup parent from repository -->
</parent> </parent>
<groupId>org.ccalm</groupId> <groupId>org.ccalm</groupId>
src/main/java/org/ccalm/weather/AirTemperature.java
+3 -3
View File
@@ -116,7 +116,7 @@ public class AirTemperature implements ServletContextAware {
//Example request: http://ccalm.org/AirTemperature?date=20210531 //Example request: http://ccalm.org/AirTemperature?date=20210531
//Example request: http://127.0.0.1:8080/AirTemperature?date=20210531 //Example request: http://127.0.0.1:8080/AirTemperature?date=20210531
if(date==null || date.equals("")) if(date==null || date.isEmpty()))
{ {
//Если день не задан то ищем максимальный день не старше 10 дней и прибавляем 1 день //Если день не задан то ищем максимальный день не старше 10 дней и прибавляем 1 день
String sql="select to_char(max(date)+'1 days'::interval, 'YYYYMMDD') from main.air_temperature_dates where hours=0 and date > now() - '10 days'::interval"; String sql="select to_char(max(date)+'1 days'::interval, 'YYYYMMDD') from main.air_temperature_dates where hours=0 and date > now() - '10 days'::interval";
@@ -132,7 +132,7 @@ public class AirTemperature implements ServletContextAware {
} }
} }
} }
if(date==null || date.equals("")) if(date==null || date.isEmpty())
{ {
DateFormat dateFormat = new SimpleDateFormat("yyyyMMdd"); DateFormat dateFormat = new SimpleDateFormat("yyyyMMdd");
date=dateFormat.format(new Date()); //Date like as "20170327". date=dateFormat.format(new Date()); //Date like as "20170327".
@@ -191,7 +191,7 @@ public class AirTemperature implements ServletContextAware {
StringBuffer answer2=new StringBuffer(strPos2); StringBuffer answer2=new StringBuffer(strPos2);
Tools.CutBeforeFirst(answer2,":"); Tools.CutBeforeFirst(answer2,":");
String posEnd = Tools.CutBeforeFirst(answer2,":"); String posEnd = Tools.CutBeforeFirst(answer2,":");
if(posEnd==null || posEnd.equals("")) posEnd=""; else if(posEnd==null || posEnd.isEmpty()) posEnd=""; else
{ {
posEnd=String.valueOf(Long.parseLong(posEnd)-1); posEnd=String.valueOf(Long.parseLong(posEnd)-1);
} }
src/main/java/org/ccalm/weather/SoilTmperature.java
+3 -3
View File
@@ -136,7 +136,7 @@ public class SoilTmperature implements ServletContextAware {
} catch (SQLException ex) { } catch (SQLException ex) {
logger.error("N3:"+ex.getMessage(),ex); logger.error("N3:"+ex.getMessage(),ex);
} }
if(date==null || date.equals("")) if(date==null || date.isEmpty())
{ {
//Если день не задан то ищем максимальный день не старше 10 дней и прибавляем 1 день //Если день не задан то ищем максимальный день не старше 10 дней и прибавляем 1 день
String sql="select to_char(max(date)+'1 days'::interval, 'YYYYMMDD') from main.soil_temperature_dates where hours=0 and date > now() - '10 days'::interval"; String sql="select to_char(max(date)+'1 days'::interval, 'YYYYMMDD') from main.soil_temperature_dates where hours=0 and date > now() - '10 days'::interval";
@@ -152,7 +152,7 @@ public class SoilTmperature implements ServletContextAware {
} }
} }
} }
if(date==null || date.equals("")) if(date==null || date.isEmpty())
{ {
DateFormat dateFormat = new SimpleDateFormat("yyyyMMdd"); DateFormat dateFormat = new SimpleDateFormat("yyyyMMdd");
date=dateFormat.format(new Date()); //Date like as "20170327". date=dateFormat.format(new Date()); //Date like as "20170327".
@@ -216,7 +216,7 @@ public class SoilTmperature implements ServletContextAware {
StringBuffer answer2=new StringBuffer(strPos2); StringBuffer answer2=new StringBuffer(strPos2);
Tools.CutBeforeFirst(answer2,":"); Tools.CutBeforeFirst(answer2,":");
String posEnd = Tools.CutBeforeFirst(answer2,":"); String posEnd = Tools.CutBeforeFirst(answer2,":");
if(posEnd==null || posEnd.equals("")) posEnd=""; else if(posEnd==null || posEnd.isEmpty()) posEnd=""; else
{ {
posEnd=String.valueOf(Long.parseLong(posEnd)-1); posEnd=String.valueOf(Long.parseLong(posEnd)-1);
} }