议题抽取状态更新添加

epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/extract/result/IssueProcessInfoResultDTO.java

@@ -3,6 +3,7 @@ package com.epmet.dto.extract.result;
 import lombok.Data;
 
 import java.io.Serializable;
+import java.util.Date;
 
 /**
  * @Author zxc
@@ -42,4 +43,6 @@ public class IssueProcessInfoResultDTO implements Serializable {
      * 用户ID
      */
     private String userId;
+
+    private Date createTime;
 }

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/evaluationindex/extract/FactOriginIssueMainDailyDao.java

@@ -110,4 +110,14 @@ public interface FactOriginIssueMainDailyDao extends BaseDao<FactOriginIssueMain
      * @Date 2020/9/20 22:54
      **/
     Integer selectIssueTotalTwoMonth(@Param("list") List<String> topicIdList);
+
+    /**
+     * @Description  更新议题状态
+     * @param issueId
+     * @param status
+     * @author zxc
+     * @date 2020/9/23 5:08 下午
+     */
+    void updateIssueStatus(@Param("issueId")String issueId,@Param("status")String status);
+
 }

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/todata/impl/IssueExtractServiceImpl.java

@@ -1,6 +1,7 @@
 package com.epmet.service.evaluationindex.extract.todata.impl;
 
 import com.epmet.commons.dynamic.datasource.annotation.DataSource;
+import com.epmet.commons.tools.constant.NumConstant;
 import com.epmet.commons.tools.dto.form.TimeListResultDTO;
 import com.epmet.commons.tools.exception.RenException;
 import com.epmet.commons.tools.utils.ConvertUtils;
@@ -26,6 +27,7 @@ import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.CollectionUtils;
 
 import java.util.ArrayList;
+import java.util.Comparator;
 import java.util.List;
 import java.util.Map;
 import java.util.stream.Collectors;
@@ -165,6 +167,11 @@ public class IssueExtractServiceImpl implements IssueExtractService {
             log.warn("issueExtractMain issueExtractLog return empty,customerId:{},dateId:{}", customerId, dateId);
             return true;
         }
+        Map<String, List<IssueProcessInfoResultDTO>> groupByIssue = listResult.stream().collect(Collectors.groupingBy(IssueProcessInfoResultDTO::getIssueId));
+        groupByIssue.forEach((issueId,process) -> {
+            List<IssueProcessInfoResultDTO> descByCreateTime = process.stream().sorted(Comparator.comparing(IssueProcessInfoResultDTO::getCreateTime).reversed()).collect(Collectors.toList());
+            issueMainDailyDao.updateIssueStatus(issueId,descByCreateTime.get(NumConstant.ZERO).getActionCode());
+        });
         listResult.forEach(issueProcess -> {
             IssueLogDailyFormDTO issueLogDailyFormDTO = ConvertUtils.sourceToTarget(issueProcess, IssueLogDailyFormDTO.class);
             issueLogDailyFormDTO.setOperationUserId(issueProcess.getUserId());

epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/extract/FactOriginIssueMainDailyDao.xml

@@ -59,6 +59,13 @@
         </foreach>
     </insert>
 
+    <!-- 更新议题状态 -->
+    <update id="updateIssueStatus">
+        update fact_origin_issue_main_daily
+        set ISSUE_STATUS = #{status}
+        where id = #{issueId}
+    </update>
+
     <!-- 删除旧的记录 -->
     <delete id="deleteOldMainRecord">
         DELETE

epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/issue/StatsIssueDao.xml

@@ -209,7 +209,9 @@
     <select id="selectIssueInfo" resultType="com.epmet.dto.extract.result.IssueInfoResultDTO">
         SELECT
             ID AS issueId,
-            ISSUE_STATUS,
+            (case when RESOLVE_TYPE = 'resolved' then 'closed_resolved'
+                  when RESOLVE_TYPE = 'unresolved' then 'closed_unresolved'
+                  else ISSUE_STATUS end ) AS ISSUE_STATUS,
             SOURCE_ID AS topicId,
             CUSTOMER_ID,
             GRID_ID,
@@ -230,6 +232,7 @@
             i.CUSTOMER_ID AS customerId,
             ip.ISSUE_ID AS issueId,
             ip.CREATED_BY AS userId,
+            ip.created_time as createTime,
             (case when i.RESOLVE_TYPE = 'resolved' then 'closed_resolved'
               when i.RESOLVE_TYPE = 'unresolved' then 'closed_unresolved'
               else i.ISSUE_STATUS end ) AS actionCode