话题原始数据抽取添加pids:改为网格的pids

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

@@ -19,7 +19,6 @@ package com.epmet.dao.evaluationindex.extract;
 
 import com.epmet.commons.mybatis.dao.BaseDao;
 import com.epmet.dto.extract.result.CreateTopicCountResultDTO;
-import com.epmet.dto.topic.TopicOriginInfoDTO;
 import com.epmet.entity.evaluationindex.extract.FactOriginTopicMainDailyEntity;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
@@ -102,10 +101,9 @@ public interface FactOriginTopicMainDailyDao extends BaseDao<FactOriginTopicMain
 
     /**
      * @return void
-     * @param list
      * @author yinzuomei
      * @description 更新话题主表的TOPIC_STATUS  , CLOSED_STATUS
      * @Date 2020/9/23 17:59
      **/
-    void updateFactOriginTopicMain(@Param("list") List<TopicOriginInfoDTO> list);
+    void updateFactOriginTopicMain(@Param("topicId")String topicId,@Param("topicStatus")String topicStatus,@Param("closedStatus")String closedStatus);
 }

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

@@ -108,10 +108,10 @@ public class FactOriginTopicMainDailyServiceImpl extends BaseServiceImpl<FactOri
      * @Date 2020/9/23 17:47
      **/
     private void updateFactOriginTopicMain(List<TopicOriginInfoDTO> updateTopicOriginInfoList) {
-        //批量更新
+        updateTopicOriginInfoList.forEach(topicOriginInfoDTO -> {
-        List<List<TopicOriginInfoDTO>> partition = ListUtils.partition(updateTopicOriginInfoList, IndexCalConstant.INSERT_SIZE);
+            baseDao.updateFactOriginTopicMain(topicOriginInfoDTO.getTopicId(),
-        partition.forEach(list -> {
+                    topicOriginInfoDTO.getTopicStatus(),
-            baseDao.updateFactOriginTopicMain(list);
+                    topicOriginInfoDTO.getClosedStatus());
         });
     }
 

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

@@ -135,12 +135,10 @@
     </select>
 
     <update id="updateFactOriginTopicMain" parameterType="map">
-        <foreach collection="list" item="item" index="index" open="" close="" separator=";">
             update fact_origin_topic_main_daily
-              set   TOPIC_STATUS=#{item.topicStatus},
+              set   TOPIC_STATUS=#{topicStatus},
-                    CLOSED_STATUS=#{item.closedStatus},
+                    CLOSED_STATUS=#{closedStatus},
                     UPDATED_TIME=NOW()
-            where id = ${item.topicId}
+            where id = #{topicId}
-        </foreach>
     </update>
 </mapper>

epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/org/CustomerGridDao.xml

@@ -75,10 +75,7 @@
             cg.PID as AGENCY_ID,
             ca.PID AS PID,
             CG.CUSTOMER_ID,
-            (case ca.PIDS WHEN CA.PIDS IS NULL  THEN 0
+            cg.PIDS as PIDS
-            when length(CA.PIDS) <1 then 0
-            ELSE CA.PIDS
-            END ) as PIDS
         FROM
             customer_grid cg
             LEFT JOIN customer_agency ca ON ( cg.PID = CA.ID )