Browse Source

修改定时任务可以通过页面传参

dev_shibei_match
wangchao 5 years ago
parent
commit
95de02eb92
  1. 1
      epmet-gateway/pom.xml
  2. 5
      epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/feign/DataStatisticalOpenFeignClient.java
  3. 4
      epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/feign/impl/DataStatisticalOpenFeignClientFallBack.java
  4. 16
      epmet-module/epmet-job/epmet-job-server/src/main/java/com/epmet/service/impl/StatsTopicServiceImpl.java
  5. 15
      epmet-module/epmet-job/epmet-job-server/src/main/java/com/epmet/service/impl/StatsUserServiceImpl.java

1
epmet-gateway/pom.xml

@ -120,6 +120,7 @@
<gateway.routes.epmet-activiti-server.uri>lb://epmet-activiti-server</gateway.routes.epmet-activiti-server.uri> <gateway.routes.epmet-activiti-server.uri>lb://epmet-activiti-server</gateway.routes.epmet-activiti-server.uri>
<!-- 7、定时任务服务 --> <!-- 7、定时任务服务 -->
<gateway.routes.epmet-job-server.uri>lb://epmet-job-server</gateway.routes.epmet-job-server.uri> <gateway.routes.epmet-job-server.uri>lb://epmet-job-server</gateway.routes.epmet-job-server.uri>
<!-- <gateway.routes.epmet-job-server.uri>http://localhost:8084</gateway.routes.epmet-job-server.uri>-->
<!-- 8、用户模块 --> <!-- 8、用户模块 -->
<!-- <gateway.routes.epmet-user-server.uri>http://localhost:8087</gateway.routes.epmet-user-server.uri>--> <!-- <gateway.routes.epmet-user-server.uri>http://localhost:8087</gateway.routes.epmet-user-server.uri>-->
<gateway.routes.epmet-user-server.uri>lb://epmet-user-server</gateway.routes.epmet-user-server.uri> <gateway.routes.epmet-user-server.uri>lb://epmet-user-server</gateway.routes.epmet-user-server.uri>

5
epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/feign/DataStatisticalOpenFeignClient.java

@ -16,6 +16,7 @@ import java.util.Date;
* @date: 2020/6/22 17:39 * @date: 2020/6/22 17:39
* @author: jianjun liu * @author: jianjun liu
*/ */
//url="http://localhost:8108"
@FeignClient(name = ServiceConstant.DATA_STATISTICAL_SERVER, fallback = DataStatisticalOpenFeignClientFallBack.class) @FeignClient(name = ServiceConstant.DATA_STATISTICAL_SERVER, fallback = DataStatisticalOpenFeignClientFallBack.class)
public interface DataStatisticalOpenFeignClient { public interface DataStatisticalOpenFeignClient {
@ -147,7 +148,7 @@ public interface DataStatisticalOpenFeignClient {
* @date 2020.06.29 09:26 * @date 2020.06.29 09:26
**/ **/
@PostMapping("/data/stats/statsuser/execute") @PostMapping("/data/stats/statsuser/execute")
Result execUserStatistical(@RequestParam(value = "date",required = false) Date date); Result execUserStatistical(@RequestParam(value = "date",required = false) String date);
/** /**
* @Description 执行话题统计 * @Description 执行话题统计
@ -157,6 +158,6 @@ public interface DataStatisticalOpenFeignClient {
* @date 2020.06.29 09:27 * @date 2020.06.29 09:27
**/ **/
@PostMapping("/data/stats/statstopic/execute") @PostMapping("/data/stats/statstopic/execute")
Result execTopicStatistical(@RequestParam(value = "date",required = false) Date date); Result execTopicStatistical(@RequestParam(value = "date",required = false) String date);
} }

4
epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/feign/impl/DataStatisticalOpenFeignClientFallBack.java

@ -149,7 +149,7 @@ public class DataStatisticalOpenFeignClientFallBack implements DataStatisticalOp
* @date 2020.06.29 09:26 * @date 2020.06.29 09:26
**/ **/
@Override @Override
public Result execUserStatistical(Date date) { public Result execUserStatistical(String date) {
return ModuleUtils.feignConError(ServiceConstant.DATA_STATISTICAL_SERVER, "execUserStatistical",date); return ModuleUtils.feignConError(ServiceConstant.DATA_STATISTICAL_SERVER, "execUserStatistical",date);
} }
@ -161,7 +161,7 @@ public class DataStatisticalOpenFeignClientFallBack implements DataStatisticalOp
* @date 2020.06.29 09:27 * @date 2020.06.29 09:27
**/ **/
@Override @Override
public Result execTopicStatistical(Date date) { public Result execTopicStatistical(String date) {
return ModuleUtils.feignConError(ServiceConstant.DATA_STATISTICAL_SERVER, "execTopicStatistical",date); return ModuleUtils.feignConError(ServiceConstant.DATA_STATISTICAL_SERVER, "execTopicStatistical",date);
} }
} }

16
epmet-module/epmet-job/epmet-job-server/src/main/java/com/epmet/service/impl/StatsTopicServiceImpl.java

@ -3,14 +3,12 @@ package com.epmet.service.impl;
import com.epmet.commons.tools.utils.Result; import com.epmet.commons.tools.utils.Result;
import com.epmet.feign.DataStatisticalOpenFeignClient; import com.epmet.feign.DataStatisticalOpenFeignClient;
import com.epmet.service.StatsTopicService; import com.epmet.service.StatsTopicService;
import org.apache.commons.lang3.StringUtils;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import java.text.SimpleDateFormat;
import java.util.Date;
/** /**
* @Description * @Description
@ -28,15 +26,7 @@ public class StatsTopicServiceImpl implements StatsTopicService {
@Override @Override
public Result execTopicStatistical(String date) { public Result execTopicStatistical(String date) {
Date dateParam = null;
if(StringUtils.isNotBlank(date)){ return dataStatisticalOpenFeignClient.execTopicStatistical(date);
SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd");
try {
dateParam = format.parse(date);
}catch (Exception e){
logger.error(String.format("执行话题统计时,日期格式转换异常,param:%s,e:%s"),date,e.getMessage());
}
}
return dataStatisticalOpenFeignClient.execTopicStatistical(dateParam);
} }
} }

15
epmet-module/epmet-job/epmet-job-server/src/main/java/com/epmet/service/impl/StatsUserServiceImpl.java

@ -3,14 +3,12 @@ package com.epmet.service.impl;
import com.epmet.commons.tools.utils.Result; import com.epmet.commons.tools.utils.Result;
import com.epmet.feign.DataStatisticalOpenFeignClient; import com.epmet.feign.DataStatisticalOpenFeignClient;
import com.epmet.service.StatsUserService; import com.epmet.service.StatsUserService;
import org.apache.commons.lang3.StringUtils;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import java.text.SimpleDateFormat;
import java.util.Date;
/** /**
* @Description * @Description
@ -28,15 +26,6 @@ public class StatsUserServiceImpl implements StatsUserService {
@Override @Override
public Result execUserStatistical(String date) { public Result execUserStatistical(String date) {
Date dateParam = null; return dataStatisticalOpenFeignClient.execUserStatistical(date);
if(StringUtils.isNotBlank(date)){
SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd");
try {
dateParam = format.parse(date);
}catch (Exception e){
logger.error(String.format("执行用户统计时,日期格式转换异常,param:%s,e:%s"),date,e.getMessage());
}
}
return dataStatisticalOpenFeignClient.execUserStatistical(dateParam);
} }
} }

Loading…
Cancel
Save