diff --git a/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/screen/form/ScreenProjectDataInfoFormDTO.java b/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/screen/form/ScreenProjectDataInfoFormDTO.java index 2365ec57f0..da4781f803 100644 --- a/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/screen/form/ScreenProjectDataInfoFormDTO.java +++ b/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/screen/form/ScreenProjectDataInfoFormDTO.java @@ -4,7 +4,6 @@ import lombok.Data; import java.io.Serializable; import java.math.BigDecimal; -import java.util.Date; /** * @description: @@ -67,6 +66,10 @@ public class ScreenProjectDataInfoFormDTO implements Serializable { /** * 事件级别 红色1级:已超期;黄色2级:即将超期;绿色3级:未超期 + * 2021-04-28平阴定义: + * 1:红色:为刚提交未做任何响应处理未结案的项目; + * 2:黄色: 至少做过一次响应处理答复但未结案的项目; + * 3:绿色:已经结案的项目。 */ private Integer projectLevel; diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/mq/ProjectChangedCustomListener.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/mq/ProjectChangedCustomListener.java index d8712f7162..952d7b4ba5 100644 --- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/mq/ProjectChangedCustomListener.java +++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/mq/ProjectChangedCustomListener.java @@ -89,6 +89,10 @@ public class ProjectChangedCustomListener implements MessageListenerConcurrently e.printStackTrace(); } if (aBoolean.isDone()){ + // 指标库,实时数据只更新:【screen_project_data】 + // 【screen_project_process_attachment】 + // 【screen_project_img_data】 + // 【screen_project_process】这四个表 SpringContextUtils.getBean(ScreenExtractService.class).extractPartData(customerId,dateId); } logger.info("consumer projectChanged msg success,{}",aBoolean); diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/toscreen/impl/ScreenExtractServiceImpl.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/toscreen/impl/ScreenExtractServiceImpl.java index ffa1936236..0697a46edd 100644 --- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/toscreen/impl/ScreenExtractServiceImpl.java +++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/toscreen/impl/ScreenExtractServiceImpl.java @@ -183,12 +183,7 @@ public class ScreenExtractServiceImpl implements ScreenExtractService { }catch (Exception e){ log.error("基层治理-难点赌点抽取到大屏失败,customerId为:"+customerId+"dateId为:"+dateId, e); } - extractPartData(customerId, dateId); - log.info("===== extractDaily method end ======"); - } - @Override - public void extractPartData(String customerId, String dateId) { ScreenCentralZoneDataFormDTO param = new ScreenCentralZoneDataFormDTO(); param.setCustomerId(customerId); param.setDateId(dateId); @@ -211,25 +206,37 @@ public class ScreenExtractServiceImpl implements ScreenExtractService { }catch (Exception e){ log.error("项目(事件)分析按组织_按天统计失败,customerId为:"+customerId+"dateId为:"+dateId, e); } - //项目分类打标签未上线,暂时屏蔽 - try{ - //大屏项目数据抽取_按天抽取 - screenProjectSettleService.extractScreenData(param); - }catch (Exception e){ - log.error("大屏项目数据抽取_按天抽取_按天统计失败,customerId为:"+customerId+"dateId为:"+dateId, e); - } + //按天统计:网格内各个分类下的项目总数 try{ projectCategoryGridDailyService.extractProjectCategoryData(customerId,dateId); }catch(Exception e){ log.error("按天统计:网格内各个分类下的项目总数,customerId为:"+customerId+"dateId为:"+dateId, e); } + // 按天统计:组织内各个分类下的项目总数 try{ projectCategoryOrgDailyService.extractProjectCategoryOrgData(customerId,dateId); }catch(Exception e){ log.error("按天统计:组织内各个分类下的项目总数,customerId为:"+customerId+"dateId为:"+dateId, e); } + + extractPartData(customerId, dateId); + log.info("===== extractDaily method end ======"); + } + + @Override + public void extractPartData(String customerId, String dateId) { + ScreenCentralZoneDataFormDTO param = new ScreenCentralZoneDataFormDTO(); + param.setCustomerId(customerId); + param.setDateId(dateId); + + try{ + //大屏项目数据抽取_按天抽取 + screenProjectSettleService.extractScreenData(param); + }catch (Exception e){ + log.error("大屏项目数据抽取_按天抽取_按天统计失败,customerId为:"+customerId+"dateId为:"+dateId, e); + } } /**