Merge branch 'dev' of http://git.elinkit.com.cn:7070/r/epmet-cloud

epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/screen/form/ScreenCentralZoneDataFormDTO.java

@@ -29,4 +29,14 @@ public class ScreenCentralZoneDataFormDTO implements Serializable {
     private String endDate;
 
     private String projectId;
+
+    /**
+     * 首次的话 全量拉取
+     */
+    private Boolean isFirst;
+
+    /**
+     * 时间间隔天数 14 就是查询14天内的数据
+     */
+    private String internalDay;
 }

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

@@ -26,6 +26,7 @@ import com.epmet.dto.indexcollect.result.CpcIndexCommonDTO;
 import com.epmet.dto.pingyin.result.*;
 import com.epmet.dto.screen.ScreenProjectDataDTO;
 import com.epmet.dto.screen.form.ProjectSourceMapFormDTO;
+import com.epmet.dto.screen.form.ScreenCentralZoneDataFormDTO;
 import com.epmet.entity.evaluationindex.extract.*;
 import com.epmet.entity.evaluationindex.screen.ScreenDifficultyDataEntity;
 import org.apache.ibatis.annotations.Mapper;
@@ -400,13 +401,13 @@ public interface FactOriginProjectMainDailyDao extends BaseDao<FactOriginProject
 	/**
 	 * desc: 获取难点堵点项目数据
 	 *
-	 * @param customerId
+	 * @param param
-	 * @param dateId
+	 * @param param
 	 * @return java.util.List<com.epmet.entity.evaluationindex.extract.FactOriginProjectMainAndPeriodDTO>
 	 * @author LiuJanJun
 	 * @date 2021/4/12 1:35 下午
 	 */
-	List<FactOriginProjectMainAndPeriodDTO> getProjectForDiff(@Param("customerId") String customerId, @Param("offset") int offset, @Param("pageSize") int pageSize);
+	List<FactOriginProjectMainAndPeriodDTO> getProjectForDiff(@Param("param") ScreenCentralZoneDataFormDTO param, @Param("offset") int offset, @Param("pageSize") int pageSize);
 
 	/**
 	 * desc: 获取难点堵点项目数据耗时

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

@@ -525,7 +525,7 @@ public class FactOriginProjectMainDailyServiceImpl extends BaseServiceImpl<FactO
 
     @Override
     public List<FactOriginProjectMainAndPeriodDTO> getProjectAndPeriodForDiff(ScreenCentralZoneDataFormDTO param, int offset, int pageSize) {
-        return baseDao.getProjectForDiff(param.getCustomerId(),offset,pageSize);
+        return baseDao.getProjectForDiff(param,offset,pageSize);
     }
 
     @Override

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

@@ -155,6 +155,9 @@ public class ScreenGrassrootsGovernDataAbsorptionServiceImpl implements ScreenGr
 
     @Override
     public boolean difficultyDataExtract(ScreenCentralZoneDataFormDTO param) {
+        try {
+            //默认查询10天内的数据
+            param.setInternalDay(DateUtils.getBeforeNDay(NumConstant.TEN));
             //获取agency维度
             List<DimAgencyEntity> agencyList = dimAgencyService.getAgencyListByCustomerId(param.getCustomerId());
             Map<String, DimAgencyEntity> agencyMap = agencyList.stream().collect(Collectors.toMap(DimAgencyEntity::getId, o -> o, (o1, o2) -> o1));
@@ -180,7 +183,7 @@ public class ScreenGrassrootsGovernDataAbsorptionServiceImpl implements ScreenGr
             Map<String, ProjectDTO> bizProjectInfoMap = bizProjectInfoList.stream().collect(Collectors.toMap(ProjectDTO::getId, o -> o, (o1, o2) -> o1));
 
             int pageNo = NumConstant.ONE;
-        int pageSize = NumConstant.FIVE_HUNDRED;
+            int pageSize = NumConstant.ONE_THOUSAND;
             List<FactOriginProjectMainAndPeriodDTO> difficultyBaseList;
             do {
                 //1.根据客户Id 获取所有项目数据
@@ -257,13 +260,15 @@ public class ScreenGrassrootsGovernDataAbsorptionServiceImpl implements ScreenGr
                 }
                 log.info("========:" + JSON.toJSONString(diffList));
                 log.info("========:" + JSON.toJSONString(imgDataEntities));
-
                 screenDifficultyDataService.dataClean(param.getCustomerId(),diffList,imgDataEntities);
+                log.info("difficultyDataExtract excute pageNo:{}",pageNo);
             } while (!CollectionUtils.isEmpty(difficultyBaseList)&&difficultyBaseList.size()==pageSize);
 
-        //log.info("【大屏数据抽取-难点赌点执行完毕】 客户Id{} 难点赌点数据{}", param.getCustomerId(), JSON.toJSONString(diffList));
             //3.获取项目的最后操作记录
             return true;
+        } finally {
+            log.info("【大屏数据抽取-难点赌点执行完毕】 客户Id{}", param.getCustomerId());
+        }
     }
 
     /**

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

@@ -668,10 +668,19 @@
             m.id, m.date_id dateId, m.customer_id, m.issue_id, m.topic_id, m.grid_id,
             m.pid, m.pids, m.agency_id, m.project_status, m.is_resolved,
             m.topic_creator_id, m.is_party, m.is_overdue, m.finish_org_ids
+            <if test="param.isFirst == null or !param.isFirst">
+            , IFNULL(b.DATE_ID, DATE_FORMAT( now(), '%Y%m%d' )) as updateDate
+            </if>
         FROM fact_origin_project_main_daily m
+         <if test="param.isFirst == null or !param.isFirst">
+        LEFT JOIN fact_origin_project_log_daily b ON m.ID = b.PROJECT_ID AND b.ACTION_CODE = 'close'
+       </if>
         WHERE
-            m.CUSTOMER_ID = #{customerId}
+            m.CUSTOMER_ID = #{param.customerId}
             AND m.DEL_FLAG = '0'
+            <if test="param.isFirst == null or !param.isFirst">
+                HAVING updateDate>= #{param.internalDay}
+            </if>
             LIMIT #{offset} ,#{pageSize}
     </select>
     <select id="getProjectPeriodForDiff" resultType="com.epmet.entity.evaluationindex.extract.FactOriginProjectOrgPeriodDailyEntity">