diff --git a/epmet-gateway/pom.xml b/epmet-gateway/pom.xml
index 354c47f3ea..2d4f57c3b7 100644
--- a/epmet-gateway/pom.xml
+++ b/epmet-gateway/pom.xml
@@ -120,6 +120,7 @@
lb://epmet-activiti-server
lb://epmet-job-server
+
lb://epmet-user-server
@@ -180,7 +181,7 @@
lb://data-statistical-server
-
+
diff --git a/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/feign/DataStatisticalOpenFeignClient.java b/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/feign/DataStatisticalOpenFeignClient.java
index 832ae37701..dffd25d035 100644
--- a/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/feign/DataStatisticalOpenFeignClient.java
+++ b/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
* @author: jianjun liu
*/
+//url="http://localhost:8108"
@FeignClient(name = ServiceConstant.DATA_STATISTICAL_SERVER, fallback = DataStatisticalOpenFeignClientFallBack.class)
public interface DataStatisticalOpenFeignClient {
@@ -147,7 +148,7 @@ public interface DataStatisticalOpenFeignClient {
* @date 2020.06.29 09:26
**/
@PostMapping("/data/stats/statsuser/execute")
- Result execUserStatistical(@RequestParam(value = "date",required = false) Date date);
+ Result execUserStatistical(@RequestParam(value = "date",required = false) String date);
/**
* @Description 执行话题统计
@@ -157,6 +158,6 @@ public interface DataStatisticalOpenFeignClient {
* @date 2020.06.29 09:27
**/
@PostMapping("/data/stats/statstopic/execute")
- Result execTopicStatistical(@RequestParam(value = "date",required = false) Date date);
+ Result execTopicStatistical(@RequestParam(value = "date",required = false) String date);
}
diff --git a/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/feign/impl/DataStatisticalOpenFeignClientFallBack.java b/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/feign/impl/DataStatisticalOpenFeignClientFallBack.java
index 4c0a00d154..a15b468fdc 100644
--- a/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/feign/impl/DataStatisticalOpenFeignClientFallBack.java
+++ b/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
**/
@Override
- public Result execUserStatistical(Date date) {
+ public Result execUserStatistical(String 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
**/
@Override
- public Result execTopicStatistical(Date date) {
+ public Result execTopicStatistical(String date) {
return ModuleUtils.feignConError(ServiceConstant.DATA_STATISTICAL_SERVER, "execTopicStatistical",date);
}
}
diff --git a/epmet-module/epmet-job/epmet-job-server/src/main/java/com/epmet/service/impl/StatsTopicServiceImpl.java b/epmet-module/epmet-job/epmet-job-server/src/main/java/com/epmet/service/impl/StatsTopicServiceImpl.java
index b99a8f9d4c..cefabfbdc7 100644
--- a/epmet-module/epmet-job/epmet-job-server/src/main/java/com/epmet/service/impl/StatsTopicServiceImpl.java
+++ b/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.feign.DataStatisticalOpenFeignClient;
import com.epmet.service.StatsTopicService;
-import org.apache.commons.lang3.StringUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
-import java.text.SimpleDateFormat;
-import java.util.Date;
+
/**
* @Description
@@ -28,15 +26,7 @@ public class StatsTopicServiceImpl implements StatsTopicService {
@Override
public Result execTopicStatistical(String date) {
- Date dateParam = null;
- 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.execTopicStatistical(dateParam);
+
+ return dataStatisticalOpenFeignClient.execTopicStatistical(date);
}
}
diff --git a/epmet-module/epmet-job/epmet-job-server/src/main/java/com/epmet/service/impl/StatsUserServiceImpl.java b/epmet-module/epmet-job/epmet-job-server/src/main/java/com/epmet/service/impl/StatsUserServiceImpl.java
index a50c619f0b..3082f91779 100644
--- a/epmet-module/epmet-job/epmet-job-server/src/main/java/com/epmet/service/impl/StatsUserServiceImpl.java
+++ b/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.feign.DataStatisticalOpenFeignClient;
import com.epmet.service.StatsUserService;
-import org.apache.commons.lang3.StringUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
-import java.text.SimpleDateFormat;
-import java.util.Date;
+
/**
* @Description
@@ -28,15 +26,6 @@ public class StatsUserServiceImpl implements StatsUserService {
@Override
public Result execUserStatistical(String date) {
- Date dateParam = null;
- 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);
+ return dataStatisticalOpenFeignClient.execUserStatistical(date);
}
}