From 876c967e0771b68cbfcb0243bac6f6422468508f Mon Sep 17 00:00:00 2001 From: zhaoqifeng Date: Tue, 28 Dec 2021 14:19:52 +0800 Subject: [PATCH] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E5=AE=9E=E6=97=B6=E6=8A=BD?= =?UTF-8?q?=E5=8F=96=20=E6=B7=BB=E5=8A=A0=E5=8F=82=E6=95=B0projectId?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../epmet/dto/screen/form/ScreenCentralZoneDataFormDTO.java | 2 ++ .../extract/FactOriginProjectMainDailyDao.java | 2 +- .../main/java/com/epmet/dao/project/ProjectProcessDao.java | 3 ++- .../java/com/epmet/mq/ProjectChangedCustomListener.java | 2 +- .../extract/todata/FactOriginProjectMainDailyService.java | 2 +- .../todata/impl/FactOriginProjectMainDailyServiceImpl.java | 4 ++-- .../extract/toscreen/ScreenExtractService.java | 2 +- .../extract/toscreen/impl/ScreenExtractServiceImpl.java | 5 +++-- .../toscreen/impl/ScreenProjectSettleServiceImpl.java | 6 ++++-- .../com/epmet/service/project/ProjectProcessService.java | 2 +- .../service/project/impl/ProjectProcessServiceImpl.java | 4 ++-- .../extract/FactOriginProjectMainDailyDao.xml | 3 +++ .../mapper/evaluationindex/screen/ScreenProjectDataDao.xml | 3 +++ .../src/main/resources/mapper/project/ProjectProcessDao.xml | 3 +++ 14 files changed, 29 insertions(+), 14 deletions(-) diff --git a/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/screen/form/ScreenCentralZoneDataFormDTO.java b/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/screen/form/ScreenCentralZoneDataFormDTO.java index d655b8608a..5a5d0af839 100644 --- a/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/screen/form/ScreenCentralZoneDataFormDTO.java +++ b/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/screen/form/ScreenCentralZoneDataFormDTO.java @@ -27,4 +27,6 @@ public class ScreenCentralZoneDataFormDTO implements Serializable { private String startDate; private String endDate; + + private String projectId; } diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/evaluationindex/extract/FactOriginProjectMainDailyDao.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/evaluationindex/extract/FactOriginProjectMainDailyDao.java index 4b4338408c..01ab059698 100644 --- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/evaluationindex/extract/FactOriginProjectMainDailyDao.java +++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/evaluationindex/extract/FactOriginProjectMainDailyDao.java @@ -387,7 +387,7 @@ public interface FactOriginProjectMainDailyDao extends BaseDao initNewScreenProjectData(@Param("customerId")String customerId,@Param("dateId") String dateId,@Param("dataEndTime")String dataEndTime); + List initNewScreenProjectData(@Param("customerId")String customerId,@Param("dateId") String dateId,@Param("dataEndTime")String dataEndTime, @Param("projectId") String projectId); /** * desc: 获取难点堵点项目数据 diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/project/ProjectProcessDao.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/project/ProjectProcessDao.java index 68535efc4f..2c46c7d883 100644 --- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/project/ProjectProcessDao.java +++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/project/ProjectProcessDao.java @@ -182,7 +182,8 @@ public interface ProjectProcessDao extends BaseDao { * @author wangc * @date 2021.03.09 16:25 */ - List selectProjectProcessAndDirection(@Param("customerId") String customerId, @Param("dateId") String dateId, @Param("dataEndTime")String dataEndTime ); + List selectProjectProcessAndDirection(@Param("customerId") String customerId, @Param("dateId") String dateId, + @Param("dataEndTime")String dataEndTime, @Param("projectId") String projectId ); List selectProcessAttachment(@Param("list")List list); } 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 5b3c355827..a09e63861c 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 @@ -142,7 +142,7 @@ public class ProjectChangedCustomListener implements MessageListenerConcurrently // 【screen_project_process_attachment】 // 【screen_project_img_data】 // 【screen_project_process】这四个表 - SpringContextUtils.getBean(ScreenExtractService.class).extractPartData(customerId,dateId); + SpringContextUtils.getBean(ScreenExtractService.class).extractPartData(customerId, dateId, msgObj.getProjectId()); } 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/todata/FactOriginProjectMainDailyService.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/todata/FactOriginProjectMainDailyService.java index 92e175a510..515befcf9d 100644 --- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/todata/FactOriginProjectMainDailyService.java +++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/todata/FactOriginProjectMainDailyService.java @@ -369,7 +369,7 @@ public interface FactOriginProjectMainDailyService extends BaseService initNewScreenProjectData(String customerId,Integer rows ,String dateId); + List initNewScreenProjectData(String customerId,Integer rows ,String dateId, String projectId); void computerIfExceed(List list,Integer exceedLimit,Integer about2exceedLimit); diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/todata/impl/FactOriginProjectMainDailyServiceImpl.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/todata/impl/FactOriginProjectMainDailyServiceImpl.java index b60219a03f..1f1fcfe88a 100644 --- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/todata/impl/FactOriginProjectMainDailyServiceImpl.java +++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/todata/impl/FactOriginProjectMainDailyServiceImpl.java @@ -476,8 +476,8 @@ public class FactOriginProjectMainDailyServiceImpl extends BaseServiceImpl initNewScreenProjectData(String customerId,Integer rows , String dateId) { - List projects = baseDao.initNewScreenProjectData(customerId, rows <= NumConstant.ZERO ? "" : dateId, dateId); + public List initNewScreenProjectData(String customerId,Integer rows , String dateId, String projectId) { + List projects = baseDao.initNewScreenProjectData(customerId, rows <= NumConstant.ZERO ? "" : dateId, dateId, projectId); projects.forEach(project -> { if (ProjectConstant.CLOSED_CASE.equals(project.getProjectStatusCode())) { //绿灯事件-结案项目 diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/toscreen/ScreenExtractService.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/toscreen/ScreenExtractService.java index 0877c53129..e3a2ab5401 100644 --- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/toscreen/ScreenExtractService.java +++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/toscreen/ScreenExtractService.java @@ -34,6 +34,6 @@ public interface ScreenExtractService { * @author LiuJanJun * @date 2021/4/27 6:12 下午 */ - void extractPartData(String customerId, String dateId); + void extractPartData(String customerId, String dateId, String projectId); } 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 d84301a75b..a36e2c6577 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 @@ -333,7 +333,7 @@ public class ScreenExtractServiceImpl implements ScreenExtractService { } catch (Exception e) { log.error("网格员数据统计fact_grid_member_statistics_daily抽取失败，customerId为：" + customerId + "dateId为：" + dateId, e); } - extractPartData(customerId, dateId); + extractPartData(customerId, dateId, null); } finally { latch.countDown(); log.info("extractDaily 4 thread run end ========= dateId:{},customerId:{}", dateId, customerId); @@ -354,10 +354,11 @@ public class ScreenExtractServiceImpl implements ScreenExtractService { } @Override - public void extractPartData(String customerId, String dateId) { + public void extractPartData(String customerId, String dateId, String projectId) { ScreenCentralZoneDataFormDTO param = new ScreenCentralZoneDataFormDTO(); param.setCustomerId(customerId); param.setDateId(dateId); + param.setProjectId(projectId); try { //大屏项目数据抽取_按天抽取 diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/toscreen/impl/ScreenProjectSettleServiceImpl.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/toscreen/impl/ScreenProjectSettleServiceImpl.java index 6ad38758e4..d4a154acbd 100644 --- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/toscreen/impl/ScreenProjectSettleServiceImpl.java +++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/toscreen/impl/ScreenProjectSettleServiceImpl.java @@ -74,7 +74,7 @@ public class ScreenProjectSettleServiceImpl implements ScreenProjectSettleServic int rows = screenProjectDataService.checkIfExisted(param.getCustomerId()); List metaData = - originMainService.initNewScreenProjectData(param.getCustomerId(), rows , param.getDateId()); + originMainService.initNewScreenProjectData(param.getCustomerId(), rows , param.getDateId(), param.getProjectId()); if(!CollectionUtils.isEmpty(metaData)) { // 查询项目信息 @@ -135,6 +135,7 @@ public class ScreenProjectSettleServiceImpl implements ScreenProjectSettleServic ScreenProjectDataDTO orientCase = new ScreenProjectDataDTO(); orientCase.setCustomerId(param.getCustomerId()); + orientCase.setProjectId( param.getProjectId()); //待更新的数据 需要检测更新的字段为：①projectStatusCode ②closeCaseTime ③allCategoryName ④projectLevel List orientData = screenProjectDataService.getPending(orientCase,param.getDateId()); @@ -188,7 +189,8 @@ public class ScreenProjectSettleServiceImpl implements ScreenProjectSettleServic } // - List processes = processService.buildNewScreenProjectProcessData(param.getCustomerId(), param.getDateId(),!screenProjectProcessService.checkIfHistoricalDataExists(param.getCustomerId())); + List processes = processService.buildNewScreenProjectProcessData(param.getCustomerId(), param.getDateId(), + !screenProjectProcessService.checkIfHistoricalDataExists(param.getCustomerId()), param.getProjectId()); if(!CollectionUtils.isEmpty(processes)){ screenProjectProcessService.insertBatch(processes,param.getCustomerId(),param.getDateId()); List attachments = processService.buildProcessAttachmentData(processes.stream().map(ScreenProjectProcessDTO::getProcessId).distinct().collect(Collectors.toList())); diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/project/ProjectProcessService.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/project/ProjectProcessService.java index 5ed51e7274..37e18e3332 100644 --- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/project/ProjectProcessService.java +++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/project/ProjectProcessService.java @@ -162,7 +162,7 @@ public interface ProjectProcessService extends BaseService * @author wangc * @date 2021.03.09 14:49 */ - List buildNewScreenProjectProcessData(String customerId,String dateId,boolean ifRanged); + List buildNewScreenProjectProcessData(String customerId,String dateId,boolean ifRanged, String projectId); /** * @Description 构建节点附件数据 diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/project/impl/ProjectProcessServiceImpl.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/project/impl/ProjectProcessServiceImpl.java index ad4f3a7537..26410d073c 100644 --- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/project/impl/ProjectProcessServiceImpl.java +++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/project/impl/ProjectProcessServiceImpl.java @@ -183,8 +183,8 @@ public class ProjectProcessServiceImpl extends BaseServiceImpl buildNewScreenProjectProcessData(String customerId, String dateId, boolean ifRanged) { - List processes = baseDao.selectProjectProcessAndDirection(customerId, ifRanged ? null : dateId, dateId); + public List buildNewScreenProjectProcessData(String customerId, String dateId, boolean ifRanged, String projectId) { + List processes = baseDao.selectProjectProcessAndDirection(customerId, ifRanged ? null : dateId, dateId, projectId); if(CollectionUtils.isEmpty(processes)) return null; return processes.stream().map(target -> { List points = target.getPoints(); diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/extract/FactOriginProjectMainDailyDao.xml b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/extract/FactOriginProjectMainDailyDao.xml index 4ca4c5e447..60b6f10958 100644 --- a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/extract/FactOriginProjectMainDailyDao.xml +++ b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/extract/FactOriginProjectMainDailyDao.xml @@ -651,6 +651,9 @@ data.DEL_FLAG = '0' AND data.CUSTOMER_ID = #{customerId} + + AND data.ID = #{projectId} + AND data.DATE_ID = #{dateId} diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/screen/ScreenProjectDataDao.xml b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/screen/ScreenProjectDataDao.xml index 86980fbab1..7a192fa70d 100644 --- a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/screen/ScreenProjectDataDao.xml +++ b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/screen/ScreenProjectDataDao.xml @@ -76,6 +76,9 @@ and project_level = #{projectLevel} + + and project_id = #{projectId} + and data_end_time ]]> #{dataEndTime} diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/project/ProjectProcessDao.xml b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/project/ProjectProcessDao.xml index 32731326bf..fca822c242 100644 --- a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/project/ProjectProcessDao.xml +++ b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/project/ProjectProcessDao.xml @@ -404,6 +404,9 @@ left join `project_staff` staff on staff.PROCESS_ID = process.ID and staff.DEL_FLAG = '0' where process.del_flag = '0' and process.customer_id = #{customerId} + + AND process.project_id = #{projectId} + AND DATE_FORMAT(process.created_time, '%Y%m%d') = #{dateId}