diff --git a/sql/dm_start.sql b/sql/dm_start.sql index ab8b02d..a1c361c 100644 --- a/sql/dm_start.sql +++ b/sql/dm_start.sql @@ -208,8 +208,8 @@ CREATE TABLE "FXKH_TXL"."QXWARNING" "PUBLISH_UNIT" VARCHAR(50), "CONTENT" VARCHAR(500), "WARNID" INTEGER, -"CTNM" VARCHAR(50), -"CNNM" VARCHAR(50), +"CTNM" VARCHAR(200), +"CNNM" VARCHAR(200), NOT CLUSTER PRIMARY KEY("ID")) STORAGE(ON "MAIN", CLUSTERBTR) ; COMMENT ON TABLE "FXKH_TXL"."QXWARNING" IS '气象预警表'; diff --git a/src/main/java/com/whdc/component/MyPostConstruct.java b/src/main/java/com/whdc/component/MyPostConstruct.java index d8ade5b..ad356f3 100644 --- a/src/main/java/com/whdc/component/MyPostConstruct.java +++ b/src/main/java/com/whdc/component/MyPostConstruct.java @@ -23,6 +23,7 @@ import org.springframework.stereotype.Component; import org.springframework.web.bind.annotation.GetMapping; import javax.annotation.PostConstruct; +import java.time.LocalDateTime; import java.util.Comparator; import java.util.List; import java.util.Set; @@ -41,6 +42,9 @@ public class MyPostConstruct { @PostConstruct public void initCache() { log.debug("加载缓存"); + + // 预警初始化 + QXWarningInit(); } @Autowired @@ -55,13 +59,28 @@ public class MyPostConstruct { sync(null,null); } + /** + * 预警初始化 + */ + private void QXWarningInit(){ + long count = service.count(); + if (count > 0){ + return; + } + + LocalDateTime now = LocalDateTime.now(); + sync(DateUtils.dateToStr(now.minusYears(1)),DateUtils.dateToStr(now)); + } + public void sync(String stm,String etm) { log.info("预警数据同步开始!!!"); ApiDto apiDto = new ApiDto(); if (StringUtils.isNotBlank(stm)){ + log.info("开始时间 " + stm); apiDto.setStartTime(stm); } if (StringUtils.isNotBlank(etm)){ + log.info("结束时间 " + etm); apiDto.setEndTime(etm); } diff --git a/src/main/java/com/whdc/utils/DateUtils.java b/src/main/java/com/whdc/utils/DateUtils.java index 2d9c58b..9a9f459 100644 --- a/src/main/java/com/whdc/utils/DateUtils.java +++ b/src/main/java/com/whdc/utils/DateUtils.java @@ -55,6 +55,13 @@ public class DateUtils { return sdfhms.get().format(date); } + public static String dateToStr(LocalDateTime date){ + return dateToStr(date,DATE_TIME_PATTERN); + } + public static String dateToStr(LocalDateTime date,String format){ + return date.format(DateTimeFormatter.ofPattern(format)); + } + public static Date dateToStr(String dateString){ try { return sdf_Str.get().parse(dateString); @@ -102,7 +109,8 @@ public class DateUtils { public static void main(String[] args) throws ParseException { - System.out.println(dateToISODate("2021-11-05T13:00:00Z")); +// System.out.println(dateToISODate("2021-11-05T13:00:00Z")); + System.out.println(dateToStr(LocalDateTime.now())); } } diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml index 99e0d3e..5a818da 100644 --- a/src/main/resources/application.yml +++ b/src/main/resources/application.yml @@ -10,12 +10,12 @@ spring: datasource: type: com.alibaba.druid.pool.DruidDataSource driver-class-name: dm.jdbc.driver.DmDriver -# url: jdbc:dm://local.gunshiiot.com:5236?schema=FXKH_TXL -# username: SYSDBA -# password: SYSDBA001 - url: jdbc:dm://10.42.6.247:5236?schema=FXKH_TXL - username: SHZH - password: Shzh_890 + url: jdbc:dm://local.gunshiiot.com:5236?schema=FXKH_TXL + username: SYSDBA + password: SYSDBA001 +# url: jdbc:dm://10.42.6.247:5236?schema=FXKH_TXL +# username: SHZH +# password: Shzh_890 druid: initialSize: 5 minIdle: 5