diff --git a/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/scheduled/GenerationScheduledTask.java b/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/scheduled/GenerationScheduledTask.java index ca2bf04..55963c4 100644 --- a/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/scheduled/GenerationScheduledTask.java +++ b/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/scheduled/GenerationScheduledTask.java @@ -63,10 +63,9 @@ public class GenerationScheduledTask { * @param param * @return */ - //@XxlJob(THIS_DAY_POWER_GENERATION) - @Scheduled(cron = "0/40 * * * * ? ") - public ReturnT thisDayPowerGeneration() { - String param = ""; + @XxlJob(THIS_DAY_POWER_GENERATION) + //@Scheduled(cron = "0/40 * * * * ? ") + public ReturnT thisDayPowerGeneration(String param) { if (Func.isBlank(param)) { param = DateUtil.format(new Date(), "yyyy-MM"); } @@ -79,10 +78,9 @@ public class GenerationScheduledTask { * @param param * @return */ - //@XxlJob(LOAD_THREE_YEAR_POWER_GENERATION) - @Scheduled(cron = "0/40 * * * * ? ") - public ReturnT loadThreeYearPowerGeneration() { - String param = ""; + @XxlJob(LOAD_THREE_YEAR_POWER_GENERATION) + //@Scheduled(cron = "0/40 * * * * ? ") + public ReturnT loadThreeYearPowerGeneration(String param) { if (Func.isBlank(param)) { param = DateUtil.format(new Date(), "yyyy-MM"); } diff --git a/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/scheduled/MonitorScheduledTask.java b/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/scheduled/MonitorScheduledTask.java index 3d6cb16..df48d92 100644 --- a/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/scheduled/MonitorScheduledTask.java +++ b/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/scheduled/MonitorScheduledTask.java @@ -29,10 +29,9 @@ public class MonitorScheduledTask { /** * realId刷新 */ - //@XxlJob(REAL_ID_DATA) - @Scheduled(cron = "0/40 * * * * ? ") - public ReturnT loadRealId() { - String param = ""; + @XxlJob(REAL_ID_DATA) + //@Scheduled(cron = "0/40 * * * * ? ") + public ReturnT loadRealId(String param) { if (Func.isBlank(param)) { param = DateUtil.format(new Date(), "yyyy-MM"); } @@ -44,10 +43,9 @@ public class MonitorScheduledTask { * 实时数据刷新 * @return ReturnT */ - //@XxlJob(REAL_TIME_DATA) - @Scheduled(cron = "0/40 * * * * ? ") - public ReturnT loadRealData() { - String param = ""; + @XxlJob(REAL_TIME_DATA) + //@Scheduled(cron = "0/40 * * * * ? ") + public ReturnT loadRealData(String param) { if (Func.isBlank(param)) { param = DateUtil.format(new Date(), "yyyy-MM"); } @@ -59,10 +57,9 @@ public class MonitorScheduledTask { * 站点在线状态同步 * @return ReturnT */ - //@XxlJob(REAL_TIME_DATA) - @Scheduled(cron = "0/40 * * * * ? ") - public ReturnT loadStationOnLine() { - String param = ""; + @XxlJob(REAL_TIME_DATA) + //@Scheduled(cron = "0/40 * * * * ? ") + public ReturnT loadStationOnLine(String param) { if (Func.isBlank(param)) { param = DateUtil.format(new Date(), "yyyy-MM"); } @@ -75,10 +72,9 @@ public class MonitorScheduledTask { * 集中监控数据处理 * @return ReturnT */ - //@XxlJob(CENTRALIZED_MONITORING) - @Scheduled(cron = "0/4 * * * * ? ") - public ReturnT loadMonitoring() { - String param = ""; + @XxlJob(CENTRALIZED_MONITORING) + //@Scheduled(cron = "0/4 * * * * ? ") + public ReturnT loadMonitoring(String param) { if (Func.isBlank(param)) { param = DateUtil.format(new Date(), "yyyy-MM"); } diff --git a/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/scheduled/RealTargetScheduledTask.java b/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/scheduled/RealTargetScheduledTask.java index 5aca754..10ed809 100644 --- a/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/scheduled/RealTargetScheduledTask.java +++ b/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/scheduled/RealTargetScheduledTask.java @@ -33,10 +33,9 @@ public class RealTargetScheduledTask { * @return * @throws Exception */ - //@XxlJob(LOAD_EM_INFO) - @Scheduled(cron = "0/40 * * * * ? ") - public ReturnT loadEmInfo() { - String param = ""; + @XxlJob(LOAD_EM_INFO) + //@Scheduled(cron = "0/40 * * * * ? ") + public ReturnT loadEmInfo(String param) { if (Func.isBlank(param)) { param = DateUtil.format(new Date(), "yyyy-MM"); } @@ -47,10 +46,9 @@ public class RealTargetScheduledTask { /** * 水电站-机组实时加载 */ - //@XxlJob(LOAD_HYDROPOWER_UNIT_REAL) - @Scheduled(cron = "0/5 * * * * ? ") - public ReturnT loadHydropowerReal() { - String param = ""; + @XxlJob(LOAD_HYDROPOWER_UNIT_REAL) + //@Scheduled(cron = "0/5 * * * * ? ") + public ReturnT loadHydropowerReal(String param) { if (Func.isBlank(param)) { param = DateUtil.format(new Date(), "yyyy-MM"); } @@ -61,10 +59,9 @@ public class RealTargetScheduledTask { /** * 水电站-机组指标加载 */ - //@XxlJob(LOAD_HYDROPOWER_UNIT_TARGET) - @Scheduled(cron = "0 0/3 * * * ? ") - public ReturnT loadHydropowerTarget() { - String param = ""; + @XxlJob(LOAD_HYDROPOWER_UNIT_TARGET) + //@Scheduled(cron = "0 0/3 * * * ? ") + public ReturnT loadHydropowerTarget(String param) { if (Func.isBlank(param)) { param = DateUtil.format(new Date(), "yyyy-MM"); } @@ -113,10 +110,9 @@ public class RealTargetScheduledTask { /** * 水利-站点水位数据 */ - //@XxlJob(LOAD_WATER_LEVEL) - @Scheduled(cron = "0 0/5 * * * ? ") - public ReturnT loadWaterLevel() { - String param = ""; + @XxlJob(LOAD_WATER_LEVEL) + //@Scheduled(cron = "0 0/5 * * * ? ") + public ReturnT loadWaterLevel(String param) { if (Func.isBlank(param)) { param = DateUtil.format(new Date(), "yyyy-MM"); } diff --git a/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/scheduled/ShowScheduledTask.java b/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/scheduled/ShowScheduledTask.java index 37deeb3..71fbb04 100644 --- a/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/scheduled/ShowScheduledTask.java +++ b/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/scheduled/ShowScheduledTask.java @@ -42,10 +42,9 @@ public class ShowScheduledTask { /** * 首页-区域班组数据 */ - // @XxlJob(REGIONAL_DUTY_INFO) - @Scheduled(cron = "0 0/5 * * * ? ") - public ReturnT loadRegionalDuty() { - String param = ""; + @XxlJob(REGIONAL_DUTY_INFO) + //@Scheduled(cron = "0 0/5 * * * ? ") + public ReturnT loadRegionalDuty(String param) { if (Func.isBlank(param)) { param = DateUtil.format(new Date(), "yyyy-MM-dd HH:mm:ss"); } diff --git a/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/scheduled/StartStopScheduledTask.java b/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/scheduled/StartStopScheduledTask.java index 235d214..05a9f26 100644 --- a/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/scheduled/StartStopScheduledTask.java +++ b/hzims-service/hzims-scheduled/src/main/java/com/hnac/hzims/scheduled/scheduled/StartStopScheduledTask.java @@ -30,10 +30,9 @@ public class StartStopScheduledTask { /** * 单日开停机记录 */ - //@XxlJob(THIS_DAY_START_STOP_RECORD) - @Scheduled(cron = "0/40 * * * * ? ") - public ReturnT thisDayStartStopRecord() { - String param = ""; + @XxlJob(THIS_DAY_START_STOP_RECORD) + //@Scheduled(cron = "0/40 * * * * ? ") + public ReturnT thisDayStartStopRecord(String param) { if (Func.isBlank(param)) { param = DateUtil.format(new Date(), "yyyy-MM"); } @@ -44,10 +43,9 @@ public class StartStopScheduledTask { /** * 设备开停机时间记录 */ - //@XxlJob(START_STOP_TIME_RECORD) - @Scheduled(cron = "0/40 * * * * ? ") - public ReturnT startStopTimeRecord() { - String param = ""; + @XxlJob(START_STOP_TIME_RECORD) + //@Scheduled(cron = "0/40 * * * * ? ") + public ReturnT startStopTimeRecord(String param) { if (Func.isBlank(param)) { param = DateUtil.format(new Date(), "yyyy-MM"); } diff --git a/hzims-service/pom.xml b/hzims-service/pom.xml index 3a7ae26..f094c6f 100644 --- a/hzims-service/pom.xml +++ b/hzims-service/pom.xml @@ -24,7 +24,7 @@ hzims-scheduled hzims-alarm hzims-basic - gglm-big-model +