Merge remote-tracking branch 'origin/dev_data_stats' into dev_data_stats

epmet-gateway/pom.xml

@@ -120,6 +120,7 @@
                 <gateway.routes.epmet-activiti-server.uri>lb://epmet-activiti-server</gateway.routes.epmet-activiti-server.uri>
                 <!--  7、定时任务服务  -->
                 <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、用户模块              -->
 <!--                <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>
@@ -180,7 +181,7 @@
 <!--                <gateway.routes.data-report-server.uri>http://localhost:8109</gateway.routes.data-report-server.uri>-->
                 <!-- 29、统计服务 -->
                 <gateway.routes.data-statistical-server.uri>lb://data-statistical-server</gateway.routes.data-statistical-server.uri>
-<!--                <gateway.routes.data-statistical-server.uri>http://localhost:8108</gateway.routes.data-statistical-server.uri>-->
+           <!--     <gateway.routes.data-statistical-server.uri>http://localhost:8108</gateway.routes.data-statistical-server.uri>-->
             </properties>
         </profile>
         <profile>

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);
 
 }

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);
     }
 }

epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/project/ProjectDao.xml

@@ -27,7 +27,7 @@
           AND ORIGIN = 'issue'
           AND STATUS = 'closed'
           AND CUSTOMER_ID = #{customerId}
-          AND UPDATED_TIME <![CDATA[ <= ]]> #{date}
+          AND DATE_FORMAT(UPDATED_TIME, '%Y-%m-%d') <![CDATA[ <= ]]> #{date}
         GROUP BY
             AGENCY_ID, CLOSED_STATUS
     </select>
@@ -44,7 +44,7 @@
           AND ORIGIN = 'issue'
           AND STATUS = 'closed'
           AND CUSTOMER_ID = #{customerId}
-          AND UPDATED_TIME = #{date}
+          AND DATE_FORMAT(UPDATED_TIME, '%Y-%m-%d') = #{date}
         GROUP BY
             AGENCY_ID, CLOSED_STATUS
     </select>
@@ -60,7 +60,7 @@
           AND ORIGIN = 'issue'
           AND STATUS = 'closed'
           AND CUSTOMER_ID = #{customerId}
-          AND UPDATED_TIME <![CDATA[ <= ]]> #{date}
+          AND DATE_FORMAT(UPDATED_TIME, '%Y-%m-%d') <![CDATA[ <= ]]> #{date}
     </select>
     <select id="selectGridClosedProjectInc" resultType="com.epmet.dto.project.ProjectGridDTO">
         SELECT
@@ -74,7 +74,7 @@
           AND ORIGIN = 'issue'
           AND STATUS = 'closed'
           AND CUSTOMER_ID = #{customerId}
-          AND UPDATED_TIME = #{date}
+          AND DATE_FORMAT(UPDATED_TIME, '%Y-%m-%d') = #{date}
     </select>
 
 </mapper>

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);
     }
 }

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);
     }
 }