diff --git a/epmet-module/epmet-common-service/common-service-client/src/main/java/com/epmet/feign/EpmetCommonServiceOpenFeignClient.java b/epmet-module/epmet-common-service/common-service-client/src/main/java/com/epmet/feign/EpmetCommonServiceOpenFeignClient.java index 9ddd2d710d..f5ef9b507c 100644 --- a/epmet-module/epmet-common-service/common-service-client/src/main/java/com/epmet/feign/EpmetCommonServiceOpenFeignClient.java +++ b/epmet-module/epmet-common-service/common-service-client/src/main/java/com/epmet/feign/EpmetCommonServiceOpenFeignClient.java @@ -7,6 +7,7 @@ import com.epmet.dto.result.*; import com.epmet.feign.fallback.EpmetCommonServiceOpenFeignClientFallbackFactory; import org.springframework.cloud.openfeign.FeignClient; import org.springframework.http.MediaType; +import org.springframework.web.bind.annotation.PathVariable; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; @@ -140,4 +141,12 @@ public interface EpmetCommonServiceOpenFeignClient { */ @RequestMapping("/commonservice/import-task/finish") Result finishImportTask(@RequestBody ImportTaskCommonFormDTO input); + + /** + * desc:初始化工作日 + * @param dimDateId + * @return + */ + @RequestMapping("/commonservice/holiday/initWorkDay/{day}") + Result workDayInit(@PathVariable("day") String dimDateId); } diff --git a/epmet-module/epmet-common-service/common-service-client/src/main/java/com/epmet/feign/fallback/EpmetCommonServiceOpenFeignClientFallback.java b/epmet-module/epmet-common-service/common-service-client/src/main/java/com/epmet/feign/fallback/EpmetCommonServiceOpenFeignClientFallback.java index c3c62d64da..21f7fe531a 100644 --- a/epmet-module/epmet-common-service/common-service-client/src/main/java/com/epmet/feign/fallback/EpmetCommonServiceOpenFeignClientFallback.java +++ b/epmet-module/epmet-common-service/common-service-client/src/main/java/com/epmet/feign/fallback/EpmetCommonServiceOpenFeignClientFallback.java @@ -3,20 +3,9 @@ package com.epmet.feign.fallback; import com.epmet.commons.tools.constant.ServiceConstant; import com.epmet.commons.tools.utils.ModuleUtils; import com.epmet.commons.tools.utils.Result; -import com.epmet.dto.form.CostDayFormDTO; -import com.epmet.dto.form.ExternalAppAuthFormDTO; -import com.epmet.dto.form.GetJwtAccessTokenFormDTO; -import com.epmet.dto.form.WorkDayFormDTO; -import com.epmet.dto.result.AppIdInfoResultDTO; -import com.epmet.dto.form.WorkMinuteFormDTO; -import com.epmet.dto.result.CostDayResultDTO; -import com.epmet.dto.result.AppIdInfoResultDTO; -import com.epmet.dto.result.ExternalAppAuthResultDTO; -import com.epmet.dto.result.WorkDayResultDTO; import com.epmet.dto.form.*; import com.epmet.dto.result.*; import com.epmet.feign.EpmetCommonServiceOpenFeignClient; -import org.springframework.stereotype.Component; import java.util.List; import java.util.Map; @@ -121,4 +110,9 @@ public class EpmetCommonServiceOpenFeignClientFallback implements EpmetCommonSer public Result finishImportTask(ImportTaskCommonFormDTO input) { return ModuleUtils.feignConError(ServiceConstant.EPMET_COMMON_SERVICE, "finishImportTask", input); } + + @Override + public Result workDayInit(String dimDateId) { + return ModuleUtils.feignConError(ServiceConstant.EPMET_COMMON_SERVICE, "workDayInit", dimDateId); + } } diff --git a/epmet-module/epmet-common-service/common-service-server/src/main/java/com/epmet/task/WorkDayScheduleTask.java b/epmet-module/epmet-common-service/common-service-server/src/main/java/com/epmet/task/WorkDayScheduleTask.java index b26ab24cb7..053128ef6e 100644 --- a/epmet-module/epmet-common-service/common-service-server/src/main/java/com/epmet/task/WorkDayScheduleTask.java +++ b/epmet-module/epmet-common-service/common-service-server/src/main/java/com/epmet/task/WorkDayScheduleTask.java @@ -1,10 +1,10 @@ package com.epmet.task; import com.epmet.service.ShowApiService; +import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.annotation.Configuration; import org.springframework.scheduling.annotation.EnableScheduling; -import org.springframework.scheduling.annotation.Scheduled; import java.text.SimpleDateFormat; import java.time.LocalDateTime; @@ -15,19 +15,21 @@ import java.util.Date; * @Author yinzuomei * @Date 2020/5/12 0:01 */ +@Slf4j @Configuration //1.主要用于标记配置类，兼备Component的效果。 -@EnableScheduling // 2.开启定时任务 +@EnableScheduling// 2.开启定时任务 +@Deprecated //由job统一调度 public class WorkDayScheduleTask { @Autowired private ShowApiService showApiService; //每天晚上00:00:01执行{秒数} {分钟} {小时} {日期} {月份} {星期} {年份(可为空)} - @Scheduled(cron = "1 0 0 * * ?") + //@Scheduled(cron = "1 0 0 * * ?") private void configureTasks() { Date nowDate = new Date(); SimpleDateFormat format = new SimpleDateFormat("yyyyMMdd"); showApiService.initWorkDay(format.format(nowDate)); - System.err.println("执行静态定时任务时间: " + LocalDateTime.now()); + log.info("执行静态定时任务时间: " + LocalDateTime.now()); } } diff --git a/epmet-module/epmet-common-service/common-service-server/src/main/java/com/epmet/utils/ShowApiUtil.java b/epmet-module/epmet-common-service/common-service-server/src/main/java/com/epmet/utils/ShowApiUtil.java index 8afe9cf590..f836b31ceb 100644 --- a/epmet-module/epmet-common-service/common-service-server/src/main/java/com/epmet/utils/ShowApiUtil.java +++ b/epmet-module/epmet-common-service/common-service-server/src/main/java/com/epmet/utils/ShowApiUtil.java @@ -97,8 +97,9 @@ public class ShowApiUtil { } public static void main(String[] args) { try { -// queryHolidayV2020("20200503"); - holidayList("2020"); + DayDetailResultDTO dayDetailResultDTO = queryHolidayV2020("20220407"); + System.out.println(dayDetailResultDTO); + //holidayList("2020"); } catch (Exception e) { e.printStackTrace(); } diff --git a/epmet-module/epmet-job/epmet-job-server/pom.xml b/epmet-module/epmet-job/epmet-job-server/pom.xml index 80377c1fba..a44e5f1a46 100644 --- a/epmet-module/epmet-job/epmet-job-server/pom.xml +++ b/epmet-module/epmet-job/epmet-job-server/pom.xml @@ -108,6 +108,12 @@ 2.0.0 compile + + com.epmet + common-service-client + 2.0.0 + compile + diff --git a/epmet-module/epmet-job/epmet-job-server/src/main/java/com/epmet/service/WorkDayInitService.java b/epmet-module/epmet-job/epmet-job-server/src/main/java/com/epmet/service/WorkDayInitService.java new file mode 100644 index 0000000000..4e1f8c3ad7 --- /dev/null +++ b/epmet-module/epmet-job/epmet-job-server/src/main/java/com/epmet/service/WorkDayInitService.java @@ -0,0 +1,17 @@ +package com.epmet.service; + +import com.epmet.commons.tools.utils.Result; + +/** + * @author zhaoqifeng + * @dscription + * @date 2020/12/29 17:45 + */ +public interface WorkDayInitService { + /** + * desc:初始化工作日 日历 + * @param dimDateId + * @return + */ + Result workDayInit(String dimDateId); +} diff --git a/epmet-module/epmet-job/epmet-job-server/src/main/java/com/epmet/service/impl/WorkDayInitServiceImpl.java b/epmet-module/epmet-job/epmet-job-server/src/main/java/com/epmet/service/impl/WorkDayInitServiceImpl.java new file mode 100644 index 0000000000..dd5846d680 --- /dev/null +++ b/epmet-module/epmet-job/epmet-job-server/src/main/java/com/epmet/service/impl/WorkDayInitServiceImpl.java @@ -0,0 +1,24 @@ +package com.epmet.service.impl; + +import com.epmet.commons.tools.utils.Result; +import com.epmet.feign.EpmetCommonServiceOpenFeignClient; +import com.epmet.service.WorkDayInitService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +/** + * @author zhaoqifeng + * @dscription + * @date 2020/12/29 17:46 + */ +@Service +public class WorkDayInitServiceImpl implements WorkDayInitService { + + @Autowired + private EpmetCommonServiceOpenFeignClient epmetCommonServiceOpenFeignClient; + + @Override + public Result workDayInit(String dimDateId) { + return epmetCommonServiceOpenFeignClient.workDayInit(dimDateId); + } +} diff --git a/epmet-module/epmet-job/epmet-job-server/src/main/java/com/epmet/task/WorkDayInitTask.java b/epmet-module/epmet-job/epmet-job-server/src/main/java/com/epmet/task/WorkDayInitTask.java new file mode 100644 index 0000000000..45f2a8de7f --- /dev/null +++ b/epmet-module/epmet-job/epmet-job-server/src/main/java/com/epmet/task/WorkDayInitTask.java @@ -0,0 +1,39 @@ +package com.epmet.task; + +import com.epmet.commons.tools.utils.DateUtils; +import com.epmet.commons.tools.utils.Result; +import com.epmet.service.WorkDayInitService; +import lombok.extern.slf4j.Slf4j; +import org.apache.commons.lang3.StringUtils; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Component; + +import java.util.Date; + +/** + * desc:工作日日历定时任务 + * @author zhaoqifeng + * @dscription + * @date 2020/12/29 17:43 + */ +@Slf4j +@Component("workDayInitTask") +public class WorkDayInitTask implements ITask { + + @Autowired + private WorkDayInitService workDayInitService; + + @Override + public void run(String params) { + log.info("WorkDayInitTask定时任务正在执行，参数为：{}", params); + if (StringUtils.isBlank(params)){ + params = DateUtils.format(new Date(),DateUtils.DATE_PATTERN_YYYYMMDD); + } + Result result = workDayInitService.workDayInit(params); + if (result.success()) { + log.info("{}定时任务执行成功,{}", getClass().getSimpleName(),params); + } else { + log.error("{}定时任务执行失败:{},param:{}" ,getClass().getSimpleName(), result.getMsg(), params); + } + } +}