From 45071ddf18e4ce7c33cf73eddfcad18af4683ac6 Mon Sep 17 00:00:00 2001 From: zhaoqifeng Date: Mon, 26 Oct 2020 17:11:41 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E8=B6=85=E6=9C=9F?= =?UTF-8?q?=E6=BB=9E=E7=95=99=E6=8F=90=E9=86=92=E5=AE=9A=E6=97=B6=E4=BB=BB?= =?UTF-8?q?=E5=8A=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/epmet/task/ProjectSendMessageTask.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/epmet-module/epmet-job/epmet-job-server/src/main/java/com/epmet/task/ProjectSendMessageTask.java b/epmet-module/epmet-job/epmet-job-server/src/main/java/com/epmet/task/ProjectSendMessageTask.java index cc886fb908..d116882ee3 100644 --- a/epmet-module/epmet-job/epmet-job-server/src/main/java/com/epmet/task/ProjectSendMessageTask.java +++ b/epmet-module/epmet-job/epmet-job-server/src/main/java/com/epmet/task/ProjectSendMessageTask.java @@ -28,16 +28,16 @@ public class ProjectSendMessageTask implements ITask { */ @Override public void run(String params) { - logger.info("FactOriginExtractTask定时任务正在执行，参数为：{}", params); + logger.info("ProjectSendMessageTask定时任务正在执行，参数为：{}", params); ExtractOriginFormDTO formDTO = new ExtractOriginFormDTO(); if (StringUtils.isNotBlank(params)) { formDTO = JSON.parseObject(params, ExtractOriginFormDTO.class); } Result result = projectSendMessageService.projectSendMessage(formDTO); if (result.success()) { - logger.info("FactOriginExtractTask定时任务执行成功"); + logger.info("ProjectSendMessageTask定时任务执行成功"); } else { - logger.error("FactOriginExtractTask定时任务执行失败:" + result.getMsg()); + logger.error("ProjectSendMessageTask定时任务执行失败:" + result.getMsg()); } } } From 92e6ee41d4c08786c53e6471d60645e3bce2b2d9 Mon Sep 17 00:00:00 2001 From: wangchao Date: Tue, 27 Oct 2020 09:47:57 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E8=8A=82=E7=82=B9?= =?UTF-8?q?=E8=80=97=E6=97=B6=E6=95=B0=E6=8D=AE=E8=A1=A5=E9=BD=90=E6=8E=A5?= =?UTF-8?q?=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/ProjectServiceImpl.java | 59 ++++++++++++++----- .../src/main/resources/logback-spring.xml | 2 +- .../src/main/resources/mapper/ProjectDao.xml | 11 ++++ .../mapper/ProjectOrgRelationDao.xml | 6 +- .../main/resources/mapper/ProjectStaffDao.xml | 1 - 5 files changed, 61 insertions(+), 18 deletions(-) diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectServiceImpl.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectServiceImpl.java index 20977fc543..c07b789b8e 100644 --- a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectServiceImpl.java +++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectServiceImpl.java @@ -431,8 +431,13 @@ public class ProjectServiceImpl extends BaseServiceImpl responseList = projectProcessService.selectResponseTrace(projects); Map> sorted = responseList.stream().collect(Collectors.groupingBy(ProjectOrgRelationWhenResponseResultDTO::getProjectId)); + //跨级分组 skipLevelGrouping(projectMap,sorted); List calculatedData = new LinkedList<>(); projectMap.values().forEach(list -> {list.forEach(obj -> {calculatedData.add(obj);});}); @@ -1042,16 +1048,39 @@ public class ProjectServiceImpl extends BaseServiceImpl identities = totalContainer.stream().map(ProjectOrgRelationDTO::getProjectStaffId).distinct().collect(Collectors.toList()); ListUtils.partition(identities,NumConstant.ONE_THOUSAND).forEach(partition -> {relationDao.deleteBatch(partition);}); - List timeInterval = totalContainer.stream().map(relation -> { + /*List timeInterval = totalContainer.stream().map(relation -> { TimestampIntervalFormDTO interval = new TimestampIntervalFormDTO(); interval.setId(relation.getProjectStaffId()); interval.setLeft(relation.getInformedDate()); interval.setRight(relation.getHandledDate()); return interval; - }).collect(Collectors.toList()); + }).collect(Collectors.toList());*/ + + List handleTimeInterval = new LinkedList<>(); + + List responseTimeInterval = new LinkedList<>(); + totalContainer.forEach(local -> { + if(null != local.getHandledDate()){ + TimestampIntervalFormDTO handle = new TimestampIntervalFormDTO(); + handle.setId(local.getProjectStaffId()); + handle.setLeft(local.getInformedDate()); + handle.setRight(local.getHandledDate()); + handleTimeInterval.add(handle); + } + if(null != local.getFirstDealtDate()){ + TimestampIntervalFormDTO response = new TimestampIntervalFormDTO(); + response.setId(local.getProjectStaffId()); + response.setLeft(local.getInformedDate()); + response.setRight(local.getFirstDealtDate()); + responseTimeInterval.add(response); + } + }); + Map batchDelta_T = batchCalculateDelta_T(ProjectConstant.IMPRECISE_CALCULATION, - ProjectConstant.CALCULATION_TYPE_DEFAULT,timeInterval); + ProjectConstant.CALCULATION_TYPE_DEFAULT,handleTimeInterval); + + Map dataMap = totalContainer.stream().collect(Collectors.toMap(ProjectOrgRelationDTO::getProjectStaffId, Function.identity(), (key1, key2) -> key2)); @@ -1061,6 +1090,7 @@ public class ProjectServiceImpl extends BaseServiceImpl { if(null != v){ v.setTotalPeriod(batchDelta_T.get(k)); + if(v.getHandledDate() == v.getFirstDealtDate())v.setFirstReplyPeriod(batchDelta_T.get(k)); } }); List> partition = ListUtils.partition(totalContainer, NumConstant.ONE_HUNDRED); @@ -1212,11 +1242,14 @@ public class ProjectServiceImpl extends BaseServiceImpl dest, - ProjectOrgRelationWhenResponseResultDTO staffResponseTraceUnit){ + ProjectOrgRelationWhenResponseResultDTO staffResponseTraceUnit,int seq){ // 传递过来的dest是已经按照projectId分好组之后再按照staff分组的集合 // dest key->staff - for(int cursor = 0; cursor < dest.size(); cursor++){ - if(dest.get(cursor).getPeriodTillReplyFirstly() == null) continue; - dest.get(cursor).setPeriodTillReplyFirstly(staffResponseTraceUnit.getCreatedTime()); - } - + ProjectOrgPeriodResultDTO target = dest.get(seq); + if(null != target) target.setPeriodTillReplyFirstly(staffResponseTraceUnit.getCreatedTime()); } } \ No newline at end of file diff --git a/epmet-module/gov-project/gov-project-server/src/main/resources/logback-spring.xml b/epmet-module/gov-project/gov-project-server/src/main/resources/logback-spring.xml index 236abcb4e9..c4e23d9fe9 100644 --- a/epmet-module/gov-project/gov-project-server/src/main/resources/logback-spring.xml +++ b/epmet-module/gov-project/gov-project-server/src/main/resources/logback-spring.xml @@ -134,7 +134,7 @@ - + diff --git a/epmet-module/gov-project/gov-project-server/src/main/resources/mapper/ProjectDao.xml b/epmet-module/gov-project/gov-project-server/src/main/resources/mapper/ProjectDao.xml index 8979d90f57..baf33ff218 100644 --- a/epmet-module/gov-project/gov-project-server/src/main/resources/mapper/ProjectDao.xml +++ b/epmet-module/gov-project/gov-project-server/src/main/resources/mapper/ProjectDao.xml @@ -195,4 +195,15 @@ AND p.ID = #{id} AND ps.IS_HANDLE = 'unhandled' + + + \ No newline at end of file diff --git a/epmet-module/gov-project/gov-project-server/src/main/resources/mapper/ProjectOrgRelationDao.xml b/epmet-module/gov-project/gov-project-server/src/main/resources/mapper/ProjectOrgRelationDao.xml index 6cbb71d1ae..e07b0e9f54 100644 --- a/epmet-module/gov-project/gov-project-server/src/main/resources/mapper/ProjectOrgRelationDao.xml +++ b/epmet-module/gov-project/gov-project-server/src/main/resources/mapper/ProjectOrgRelationDao.xml @@ -110,6 +110,7 @@ ID, PROJECT_STAFF_ID, INFORMED_DATE, + HANDLED_DATE, CREATED_TIME, UPDATED_TIME, SOURCE_OPERATION, @@ -125,10 +126,11 @@ (SELECT REPLACE(UUID(),'-','') as id), #{item.projectStaffId}, #{item.informedDate}, + #{item.handledDate}, NOW(), NOW(), #{item.sourceOperation}, - #{item.OPERATION}, + #{item.operation}, #{item.totalPeriod}, #{item.firstDealtDate}, #{item.firstReplyPeriod}, @@ -140,7 +142,7 @@ - DELETE + DELETE FROM project_org_relation WHERE diff --git a/epmet-module/gov-project/gov-project-server/src/main/resources/mapper/ProjectStaffDao.xml b/epmet-module/gov-project/gov-project-server/src/main/resources/mapper/ProjectStaffDao.xml index ae9ebb16bb..18df0a762a 100644 --- a/epmet-module/gov-project/gov-project-server/src/main/resources/mapper/ProjectStaffDao.xml +++ b/epmet-module/gov-project/gov-project-server/src/main/resources/mapper/ProjectStaffDao.xml @@ -156,7 +156,6 @@ staff.GRID_ID, staff.STAFF_ID AS staffId, staff.ORG_ID_PATH, - IF(staff.IS_HANDLE='handle',timestampdiff(MINUTE , staff.CREATED_TIME , staff.UPDATED_TIME),0) AS TOTAL_PERIOD, staff.CREATED_TIME AS informedDate, IF(staff.IS_HANDLE='handle','resolved','unresolved') AS isResolved,