Revert "feat:屏蔽结果输出任务,修改数据库连接信息以及修改采集周期为每分钟采集一次"

This reverts commit 18dd09fae3a216b65be5ca64e0650c5d4aebfe57.

service-base/src/main/java/com/simuwang/base/common/enums/EmailCron.java

@@ -9,7 +9,7 @@ import java.util.stream.Stream;
  * Description: ${DESCRIPTION}
  */
 public enum EmailCron {
-    EVERY_HOUR(2, "0 0/1 * * * ?"), ONE_AM(1, "0 0 1 * * ?"), ONE_MINUTE(3, "0 0/1 * * * ?");
+    EVERY_HOUR(2, "0 0 0/1 * * ?"), ONE_AM(1, "0 0 1 * * ?"), ONE_MINUTE(3, "0 0/1 * * * ?");
 
     private final Integer text;
     private final String cron;

service-deploy/src/main/resources/application.yml

@@ -27,10 +27,10 @@ spring:
     data-daq:
       # 指定为HikariDataSource
       type: com.zaxxer.hikari.HikariDataSource
-      driver-class-name: com..mysql.jdbc.Driver
-      url: jdbc:oceanbase://192.168.0.112:3306/competition?serverTimezone=Asia/Shanghai&useLegacyDatetimeCode=false&useSSL=false&nullNamePatternMatchesAll=true&useUnicode=true&characterEncoding=UTF-8&allowPublicKeyRetrieval=true
-      username: mozuwen
-      password: mozuwen
+      driver-class-name: com.alipay.oceanbase.obproxy.mysql.jdbc.Driver
+      url: jdbc:oceanbase://192.168.1.28:2881/competition?serverTimezone=Asia/Shanghai&useLegacyDatetimeCode=false&useSSL=false&nullNamePatternMatchesAll=true&useUnicode=true&characterEncoding=UTF-8&allowPublicKeyRetrieval=true
+      username: root
+      password: Smppw@2024
       # hikari连接池配置 对应 HikariConfig 配置属性类
       hikari:
         pool-name: HikariCP-daq

service-manage/src/main/java/com/simuwang/manage/task/CompetitionTask.java

@@ -42,7 +42,7 @@ public class CompetitionTask {
      * 输出基金净值采集结果明细任务
      * 每周五 18:00 执行
      */
-    // @Scheduled(cron = "0 0 18 ? * 5")
+    @Scheduled(cron = "0 0 18 ? * 5")
     public void fundNavDataTask() {
         List<FundNavDataDTO> navDataDTOList = fundNavService.getFungNavData();
         if (CollUtil.isEmpty(navDataDTOList)) {
@@ -72,7 +72,7 @@ public class CompetitionTask {
      * 输出基金净值缺失明细任务
      * 每周五 18:00 执行
      */
-    // @Scheduled(cron = "0 0 18 ? * 5")
+    @Scheduled(cron = "0 0 18 ? * 5")
     public void navDeletionTask() {
         List<FundNavDeletionDTO> navDeletionDTOList = fundNavService.getFundNavDeletion();
         String filePath = competitionConfig.getDirectory() + "基金净值缺失明细_" + DateUtil.format(new Date(), DateConst.YYYYMMDD) + ".xlsx";
@@ -95,7 +95,7 @@ public class CompetitionTask {
         }
     }
 
-    //  @Scheduled(cron = "0/10 * * * * ?")
+    @Scheduled(cron = "0/10 * * * * ?")
     public void competitionResultTask() {
         Integer competitionId = competitionConfig.getId();
         List<? extends CompetitionBaseResultDTO> competitionResultDTOList = fundNavService.getCompetitionResult(competitionId);