Merge remote-tracking branch 'origin/develop' into release_temp

epmet-module/epmet-job/epmet-job-server/pom.xml

@@ -96,6 +96,12 @@
             <version>2.0.0</version>
             <scope>compile</scope>
         </dependency>
+        <dependency>
+            <groupId>com.epmet</groupId>
+            <artifactId>gov-issue-client</artifactId>
+            <version>2.0.0</version>
+            <scope>compile</scope>
+        </dependency>
     </dependencies>
 
     <build>

epmet-module/epmet-job/epmet-job-server/src/main/java/com/epmet/feign/GovIssueFeignClient.java

@@ -2,6 +2,7 @@ package com.epmet.feign;
 
 import com.epmet.commons.tools.constant.ServiceConstant;
 import com.epmet.commons.tools.utils.Result;
+import com.epmet.dto.form.DailyStatisticalVoteJob;
 import com.epmet.feign.impl.GovIssueFeignClientFallBack;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.web.bind.annotation.PostMapping;
@@ -22,7 +23,7 @@ public interface GovIssueFeignClient {
      * @date 2020.05.20 15:39
      **/
     @PostMapping(value = "gov/issue/issuevotestatisticaldaily/dailystatisticalvotejob")
-    Result dailyStatisticalVoteJob();
+    Result dailyStatisticalVoteJob(DailyStatisticalVoteJob form);
 
     /**
      * @Description 将所有表决中的投票数从缓存同步到数据库，要进行数据对比，若数据一致无需更新

epmet-module/epmet-job/epmet-job-server/src/main/java/com/epmet/feign/impl/GovIssueFeignClientFallBack.java

@@ -3,6 +3,7 @@ package com.epmet.feign.impl;
 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.DailyStatisticalVoteJob;
 import com.epmet.feign.GovIssueFeignClient;
 import org.springframework.stereotype.Component;
 
@@ -15,8 +16,8 @@ import org.springframework.stereotype.Component;
 @Component
 public class GovIssueFeignClientFallBack implements GovIssueFeignClient {
     @Override
-    public Result dailyStatisticalVoteJob() {
+    public Result dailyStatisticalVoteJob(DailyStatisticalVoteJob form) {
-        return ModuleUtils.feignConError(ServiceConstant.GOV_ISSUE_SERVER, "dailyStatisticalVoteJob");
+        return ModuleUtils.feignConError(ServiceConstant.GOV_ISSUE_SERVER, "dailyStatisticalVoteJob",form);
     }
 
     @Override

epmet-module/epmet-job/epmet-job-server/src/main/java/com/epmet/service/IssueVotingDailyStatisticalTaskService.java

@@ -2,6 +2,7 @@ package com.epmet.service;
 
 
 import com.epmet.commons.tools.utils.Result;
+import com.epmet.dto.form.DailyStatisticalVoteJob;
 
 /**
  * @Description 生成议题表决日统计数定时任务
@@ -10,6 +11,6 @@ import com.epmet.commons.tools.utils.Result;
  */
 public interface IssueVotingDailyStatisticalTaskService {
 
-    Result issueVotingDailyStatistical();
+    Result issueVotingDailyStatistical(DailyStatisticalVoteJob form);
 
 }

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

@@ -1,6 +1,7 @@
 package com.epmet.service.impl;
 
 import com.epmet.commons.tools.utils.Result;
+import com.epmet.dto.form.DailyStatisticalVoteJob;
 import com.epmet.feign.GovIssueFeignClient;
 import com.epmet.service.IssueVotingDailyStatisticalTaskService;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -18,7 +19,7 @@ public class IssueVotingDailyStatisticalTaskServiceImpl implements IssueVotingDa
     private GovIssueFeignClient govIssueFeignClient;
 
     @Override
-    public Result issueVotingDailyStatistical() {
+    public Result issueVotingDailyStatistical(DailyStatisticalVoteJob form) {
-        return govIssueFeignClient.dailyStatisticalVoteJob();
+        return govIssueFeignClient.dailyStatisticalVoteJob(form);
     }
 }

epmet-module/epmet-job/epmet-job-server/src/main/java/com/epmet/task/DailyStatisticalVoteTask.java

@@ -1,7 +1,10 @@
 package com.epmet.task;
 
+import com.alibaba.fastjson.JSON;
 import com.epmet.commons.tools.utils.Result;
+import com.epmet.dto.form.DailyStatisticalVoteJob;
 import com.epmet.service.IssueVotingDailyStatisticalTaskService;
+import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -24,7 +27,11 @@ public class DailyStatisticalVoteTask implements ITask{
     @Override
     public void run(String params) {
         logger.debug("dailyStatisticalVoteTask定时任务正在执行，参数为：{}", params);
-        Result result=issueVotingDailyStatisticalTaskService.issueVotingDailyStatistical();
+        DailyStatisticalVoteJob form = new DailyStatisticalVoteJob();
+        if (StringUtils.isNotBlank(params)) {
+            form = JSON.parseObject(params, DailyStatisticalVoteJob.class);
+        }
+        Result result=issueVotingDailyStatisticalTaskService.issueVotingDailyStatistical(form);
         if(result.success()){
             logger.debug("dailyStatisticalVoteTask定时任务正在执行定时任务执行成功");
         }else{

epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/result/DailyStatisticalVoteJobResultDTO.java

@@ -4,6 +4,7 @@ import com.epmet.commons.tools.constant.NumConstant;
 import lombok.Data;
 
 import java.io.Serializable;
+import java.util.Date;
 
 /**
  * @Author zxc
@@ -20,7 +21,7 @@ public class DailyStatisticalVoteJobResultDTO implements Serializable {
     /**
      * 统计日期
      */
-    private String statisticalDate;
+    private Date statisticalDate;
 
     /**
      * 到该日的总赞成数

epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/controller/IssueVoteStatisticalDailyController.java

@@ -100,7 +100,7 @@ public class IssueVoteStatisticalDailyController {
      * @date 2020.05.20 15:39
     **/
     @PostMapping(value = "dailystatisticalvotejob")
-    public Result dailyStatisticalVoteJob(DailyStatisticalVoteJob form){
+    public Result dailyStatisticalVoteJob(@RequestBody DailyStatisticalVoteJob form){
 //        issueVoteStatisticalDailyService.countVotingDailyStatistic();
         issueVoteStatisticalDailyService.countVotingDailyStatisticNew(form);
         return new Result();

epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueVoteStatisticalServiceImpl.java

@@ -219,6 +219,12 @@ public class IssueVoteStatisticalServiceImpl extends BaseServiceImpl<IssueVoteSt
                 DateUtils.format(new Date(),DATE_PATTERN) :
                 DateUtils.format(issueEntity.getVotingDeadline(),DATE_PATTERN);
         List<PolyLineDTO> polyLine = getPolyLine(startDate, endDate);
+        String today = LocalDate.now().toString();
+        if (today.equals(endDate)){
+            PolyLineDTO polyLineDTO = issueVoteDetailDao.polyLineData(issueId.getIssueId(), endDate);
+            polyLine.get(polyLine.size() - NumConstant.ONE).setSupportIncrement(polyLineDTO.getSupportIncrement());
+            polyLine.get(polyLine.size() - NumConstant.ONE).setOppositionIncrement(polyLineDTO.getOppositionIncrement());
+        }
         if (CollectionUtils.isEmpty(polyLineDTOS)){
             votingTrendResultDTO.setPolyLine(polyLine);
             return votingTrendResultDTO;
@@ -231,12 +237,6 @@ public class IssueVoteStatisticalServiceImpl extends BaseServiceImpl<IssueVoteSt
                 }
             });
         });
-        String today = LocalDate.now().toString();
-        if (today.equals(endDate)){
-            PolyLineDTO polyLineDTO = issueVoteDetailDao.polyLineData(issueId.getIssueId(), endDate);
-            polyLine.get(polyLine.size() - NumConstant.ONE).setSupportIncrement(polyLineDTO.getSupportIncrement());
-            polyLine.get(polyLine.size() - NumConstant.ONE).setOppositionIncrement(polyLineDTO.getOppositionIncrement());
-        }
         //今天刚转项目或刚刚关闭，当天数据DB没有，直接从缓存拿
         /*if (polyLineDTOS.size() == NumConstant.ZERO && date.equals(LocalDate.now().toString())) {
             polyLineDTO.setSupportIncrement(voteRedisFormDTO.getSupportAmount());

epmet-module/gov-issue/gov-issue-server/src/main/resources/mapper/IssueVoteDetailDao.xml

@@ -199,7 +199,7 @@
             COUNT(CASE WHEN vd.ATTITUDE = 'opposition' THEN 1 END) AS oppositionIncrement,
             COUNT(CASE WHEN vd.ATTITUDE = 'support' THEN 1 END) AS supportCount,
             COUNT(CASE WHEN vd.ATTITUDE = 'support' THEN 1 END) AS supportIncrement,
-            #{dateId} AS statisticalDate
+            str_to_date(#{dateId},'%Y-%m-%d') AS statisticalDate
         FROM issue_vote_detail vd
         WHERE vd.DEL_FLAG = '0'
           AND vd.CUSTOMER_ID = #{customerId}