话题暂存v0.1

epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/topic/TopicOriginInfoDTO.java

@@ -0,0 +1,19 @@
+package com.epmet.dto.topic;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * 原始话题相关信息
+ *
+ * @author yinzuomei@elink-cn.com
+ * @date 2020/9/15 18:01
+ */
+@Data
+public class TopicOriginInfoDTO implements Serializable {
+    private static final long serialVersionUID = -182136873047614269L;
+
+
+
+}

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/controller/FactOriginController.java

@@ -1,7 +1,7 @@
 package com.epmet.controller;
 
 import com.epmet.commons.tools.utils.Result;
-import com.epmet.service.topic.TopicService;
+import com.epmet.service.evaluationindex.extract.FactOriginTopicMainDailyService;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.PostMapping;
@@ -20,7 +20,7 @@ import org.springframework.web.bind.annotation.RestController;
 public class FactOriginController {
 
     @Autowired
-    private TopicService topicService;
+    private FactOriginTopicMainDailyService factOriginTopicMainDailyService;
 
     /**
      * @param customerId yyyyMMdd
@@ -33,9 +33,12 @@ public class FactOriginController {
     @PostMapping("topic")
     public Result topicDataCleaning(String customerId, String dateId) {
         if (StringUtils.isNotBlank(customerId) && StringUtils.isNotBlank(dateId)) {
-            topicService.topicDataCleaning(customerId, dateId);
+            factOriginTopicMainDailyService.topicCleaning(customerId,dateId);
+            factOriginTopicMainDailyService.topicCommentCleaning(customerId,dateId);
         }
         return new Result();
     }
 
+
+
 }

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/topic/TopicDao.java

@@ -7,6 +7,7 @@ package com.epmet.dao.topic;
  * @since v1.0.0 2020-05-11
  */
 
+import com.epmet.dto.topic.TopicOriginInfoDTO;
 import com.epmet.dto.topic.result.ResiGroupTopicResultDTO;
 import com.epmet.dto.topic.result.ResiTopicOperationResultDTO;
 import org.apache.ibatis.annotations.Mapper;
@@ -56,4 +57,14 @@ public interface TopicDao {
      * @date 2020.06.22 11:07
      **/
     List<ResiTopicOperationResultDTO> selectTopicOperationRecordBetweenTimeRange(@Param("startDate")Date startDate, @Param("endDate")Date endDate);
+
+    /**
+     * @return java.util.List<com.epmet.dto.topic.TopicOriginInfoDTO>
+     * @param customerId
+     * @param dateId yyyyMMdd
+     * @author yinzuomei
+     * @description  根据日期查询resi_topic_operation，返回所有对话体的操作记录
+     * @Date 2020/9/15 18:14
+     **/
+    List<TopicOriginInfoDTO> selectTopicOriginInfo(@Param("customerId")String customerId, @Param("dateId")String dateId);
 }

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/FactOriginTopicMainDailyService.java

@@ -18,8 +18,11 @@
 package com.epmet.service.evaluationindex.extract;
 
 import com.epmet.commons.mybatis.service.BaseService;
+import com.epmet.dto.topic.TopicOriginInfoDTO;
 import com.epmet.entity.evaluationindex.extract.FactOriginTopicMainDailyEntity;
 
+import java.util.List;
+
 
 /**
  * 话题主表_日统计
@@ -29,4 +32,24 @@ import com.epmet.entity.evaluationindex.extract.FactOriginTopicMainDailyEntity;
  */
 public interface FactOriginTopicMainDailyService extends BaseService<FactOriginTopicMainDailyEntity> {
 
+    /**
+     * @return void
+     * @param customerId 客户id
+     * @param dateId yyyyMMdd
+     * @author yinzuomei 数据采集：话题本身
+     * @description fact_origin_topic_log_daily    话题明细_日统计  fact_origin_topic_main_daily	话题主表_日统计
+     * @Date 2020/9/15 13:40
+     **/
+    Boolean topicCleaning(String customerId, String dateId);
+
+    /**
+     * @return java.lang.Boolean
+     * @param customerId 客户id
+     * @param dateId yyyyMMdd
+     * @author yinzuomei
+     * @description   数据采集：话题的评论
+     * @Date 2020/9/15 17:56
+     **/
+    Boolean topicCommentCleaning(String customerId, String dateId);
+
 }

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

@@ -19,9 +19,17 @@ package com.epmet.service.evaluationindex.extract.impl;
 
 import com.epmet.commons.mybatis.service.impl.BaseServiceImpl;
 import com.epmet.dao.evaluationindex.extract.FactOriginTopicMainDailyDao;
+import com.epmet.dto.topic.TopicOriginInfoDTO;
 import com.epmet.entity.evaluationindex.extract.FactOriginTopicMainDailyEntity;
 import com.epmet.service.evaluationindex.extract.FactOriginTopicMainDailyService;
+import com.epmet.service.topic.TopicService;
+import lombok.extern.slf4j.Slf4j;
+import net.bytebuddy.asm.Advice;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
+import org.springframework.util.CollectionUtils;
+
+import java.util.List;
 
 
 /**
@@ -30,8 +38,45 @@ import org.springframework.stereotype.Service;
  * @author generator generator@elink-cn.com
  * @since v1.0.0 2020-09-15
  */
+@Slf4j
 @Service
 public class FactOriginTopicMainDailyServiceImpl extends BaseServiceImpl<FactOriginTopicMainDailyDao, FactOriginTopicMainDailyEntity> implements FactOriginTopicMainDailyService {
+    @Autowired
+    private TopicService topicService;
+
+
+    /**
+     * @param customerId 客户id
+     * @param dateId     yyyyMMdd
+     * @return void
+     * @author yinzuomei 数据采集：话题本身
+     * @description fact_origin_topic_log_daily    话题明细_日统计  fact_origin_topic_main_daily	话题主表_日统计
+     * @Date 2020/9/15 13:40
+     **/
+    @Override
+    public Boolean topicCleaning(String customerId, String dateId) {
+        //TODO
+        List<TopicOriginInfoDTO> topicOriginInfoList = topicService.queryTopicOriginInfoList(customerId, dateId);
+        if (CollectionUtils.isEmpty(topicOriginInfoList)) {
+            log.info(String.format("customerId%s,dateId%s,doesn't have any topic operation record",customerId,dateId));
+            return true;
+        }
+
+        return true;
+    }
 
+    /**
+     * @param customerId 客户id
+     * @param dateId     yyyyMMdd
+     * @return java.lang.Boolean
+     * @author yinzuomei
+     * @description 数据采集：话题的评论
+     * @Date 2020/9/15 17:56
+     **/
+    @Override
+    public Boolean topicCommentCleaning(String customerId, String dateId) {
+        //TODO
+        return true;
+    }
 
 }

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/topic/TopicService.java

@@ -3,6 +3,7 @@ package com.epmet.service.topic;
 import com.epmet.dto.AgencySubTreeDto;
 import com.epmet.dto.stats.DimTopicStatusDTO;
 import com.epmet.dto.stats.topic.result.TopicStatisticalData;
+import com.epmet.dto.topic.TopicOriginInfoDTO;
 import com.epmet.util.DimIdGenerator;
 
 import java.util.Date;
@@ -26,12 +27,12 @@ public interface TopicService {
     TopicStatisticalData compute(List<AgencySubTreeDto> agencies, Date targetDate, DimIdGenerator.DimIdBean timeDimension, String customerId, List<DimTopicStatusDTO> statusDimension);
 
     /**
-     * @return void
-     * @param customerId 客户id
+     * @return java.util.List<com.epmet.dto.topic.TopicOriginInfoDTO>
+     * @param customerId
      * @param dateId yyyyMMdd
      * @author yinzuomei
-     * @description fact_origin_topic_log_daily    话题明细_日统计  fact_origin_topic_main_daily	话题主表_日统计
-     * @Date 2020/9/15 13:40
+     * @description 根据日期查询resi_topic_operation，返回所有对话体的操作记录
+     * @Date 2020/9/15 18:12
      **/
-    void topicDataCleaning(String customerId, String dateId);
+    List<TopicOriginInfoDTO> queryTopicOriginInfoList(String customerId, String dateId);
 }

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/topic/impl/TopicServiceImpl.java

@@ -10,6 +10,7 @@ import com.epmet.dto.stats.topic.*;
 import com.epmet.dto.stats.topic.result.GridTopicData;
 import com.epmet.dto.stats.topic.result.GroupTopicData;
 import com.epmet.dto.stats.topic.result.TopicStatisticalData;
+import com.epmet.dto.topic.TopicOriginInfoDTO;
 import com.epmet.dto.topic.result.ResiGroupTopicResultDTO;
 import com.epmet.dto.topic.result.ResiTopicOperationResultDTO;
 import com.epmet.dto.topic.result.ResiTopicResultDTO;
@@ -94,6 +95,7 @@ public class TopicServiceImpl implements TopicService {
 
     }
 
+
     /**
      * @Description 初始化机关-所有下级网格Map
      * @param pid - 固定一个机关Id
@@ -1251,17 +1253,17 @@ public class TopicServiceImpl implements TopicService {
 
     }
 
-
     /**
-     * @param customerId 客户id
-     * @param dateId     yyyyMMdd
-     * @return void
+     * @return java.util.List<com.epmet.dto.topic.TopicOriginInfoDTO>
+     * @param customerId
+     * @param dateId
      * @author yinzuomei
-     * @description fact_origin_topic_log_daily    话题明细_日统计  fact_origin_topic_main_daily	话题主表_日统计
-     * @Date 2020/9/15 13:40
+     * @description 根据日期查询resi_topic_operation，返回所有对话体的操作记录
+     * @Date 2020/9/15 18:13
      **/
+    @DataSource(DataSourceConstant.RESI_GROUP)
     @Override
-    public void topicDataCleaning(String customerId, String dateId) {
-        //TODO
+    public List<TopicOriginInfoDTO> queryTopicOriginInfoList(String customerId, String dateId) {
+        return topicDao.selectTopicOriginInfo(customerId,dateId);
     }
 }

epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/topic/TopicDao.xml

@@ -129,4 +129,28 @@
         order by TOPIC_ID
     </select>
 
+    <!--  根据日期查询resi_topic_operation，返回所有对话体的操作记录  -->
+    <select id="selectTopicOriginInfo" parameterType="map" resultType="com.epmet.dto.topic.TopicOriginInfoDTO">
+        SELECT
+            rto.TOPIC_ID,
+            rto.OPERATION_TYPE,
+            rto.CREATED_BY as  OPERATE_USER_ID,
+            DATE_FORMAT(rto.CREATED_TIME,'%Y%m%d') as DATE_ID,
+            DATE_FORMAT(rto.CREATED_TIME,'%Y%m') as MONTH_ID,
+            DATE_FORMAT(rto.CREATED_TIME,'%Y') as YEAR_ID,
+            rto.CREATED_TIME AS ORIGINAL_BUSINESS_TIME,
+            rt.GROUP_ID,
+            rt.STATUS as TOPIC_STATUS,
+            RT.CLOSED_STATUS,
+            rg.GRID_ID,
+            RG.CUSTOMER_ID
+        FROM
+            resi_topic_operation rto
+            LEFT JOIN resi_topic rt ON ( rto.TOPIC_ID = rt.id AND rt.DEL_FLAG = '0' )
+            LEFT JOIN RESI_GROUP RG ON(RT.GROUP_ID=RG.ID AND RG.DEL_FLAG='0')
+        WHERE
+            rto.DEL_FLAG = '0'
+            AND DATE_FORMAT(rto.CREATED_TIME,'%Y%m%d')=#{dateId}
+            AND RG.CUSTOMER_ID=#{customerId}
+    </select>
 </mapper>