From 924cdc65ddca09d2da848bfe48d9aa520a1f4920 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Thu, 29 Apr 2021 09:50:00 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E5=8A=A0=E4=B8=AA=E8=BF=94=E5=8F=82?= =?UTF-8?q?=EF=BC=8C=E6=96=B9=E4=BE=BF=E7=9C=8B=E6=95=B0=E6=8D=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dto/result/ScreenProjectDistributionResultDTO.java | 8 ++++++++ .../main/resources/mapper/screen/ScreenProjectDataDao.xml | 4 +++- 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/epmet-module/data-report/data-report-client/src/main/java/com/epmet/evaluationindex/screen/dto/result/ScreenProjectDistributionResultDTO.java b/epmet-module/data-report/data-report-client/src/main/java/com/epmet/evaluationindex/screen/dto/result/ScreenProjectDistributionResultDTO.java index 839870a4ab..ec2c9e5219 100644 --- a/epmet-module/data-report/data-report-client/src/main/java/com/epmet/evaluationindex/screen/dto/result/ScreenProjectDistributionResultDTO.java +++ b/epmet-module/data-report/data-report-client/src/main/java/com/epmet/evaluationindex/screen/dto/result/ScreenProjectDistributionResultDTO.java @@ -1,8 +1,10 @@ package com.epmet.evaluationindex.screen.dto.result; +import com.fasterxml.jackson.annotation.JsonFormat; import lombok.Data; import java.io.Serializable; +import java.util.Date; /** * @description: @@ -29,4 +31,10 @@ public class ScreenProjectDistributionResultDTO implements Serializable { */ private String longitude; private String latitude; + + + private String customerId; + + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + private Date projectCreateTime; } diff --git a/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenProjectDataDao.xml b/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenProjectDataDao.xml index 2bb8be6086..7369a2a36c 100644 --- a/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenProjectDataDao.xml +++ b/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenProjectDataDao.xml @@ -10,7 +10,9 @@ project_level AS level, project_id AS id, longitude AS longitude, - latitude AS latitude + latitude AS latitude, + PROJECT_CREATE_TIME AS projectCreateTime, + CUSTOMER_ID AS customerId FROM screen_project_data WHERE From 29e6fffd414d7b71918a36aad692321b1d86f4e9 Mon Sep 17 00:00:00 2001 From: zhaoqifeng Date: Thu, 29 Apr 2021 10:18:29 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E5=AE=9E=E6=97=B6?= =?UTF-8?q?=E7=BB=9F=E8=AE=A1=E6=B6=88=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../rocketmq/messages/ProjectChangedMQMsg.java | 4 ++++ .../java/com/epmet/constant/ProjectConstant.java | 6 ++++++ .../service/impl/ProjectProcessServiceImpl.java | 8 +++++--- .../com/epmet/service/impl/ProjectServiceImpl.java | 14 +++++++------- .../service/impl/ProjectTraceServiceImpl.java | 9 +++++++++ 5 files changed, 31 insertions(+), 10 deletions(-) diff --git a/epmet-commons/epmet-commons-rocketmq/src/main/java/com/epmet/commons/rocketmq/messages/ProjectChangedMQMsg.java b/epmet-commons/epmet-commons-rocketmq/src/main/java/com/epmet/commons/rocketmq/messages/ProjectChangedMQMsg.java index 075b3c8ce7..d93871bd55 100644 --- a/epmet-commons/epmet-commons-rocketmq/src/main/java/com/epmet/commons/rocketmq/messages/ProjectChangedMQMsg.java +++ b/epmet-commons/epmet-commons-rocketmq/src/main/java/com/epmet/commons/rocketmq/messages/ProjectChangedMQMsg.java @@ -14,4 +14,8 @@ import java.io.Serializable; public class ProjectChangedMQMsg implements Serializable { private String customerId; + /** + * 操作类型 议题转项目issue_shift_project, 处理：response, 结案close，退回return，部门流转transfer，立项created + */ + private String operation; } diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/constant/ProjectConstant.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/constant/ProjectConstant.java index b5259e9677..71402799e8 100644 --- a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/constant/ProjectConstant.java +++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/constant/ProjectConstant.java @@ -31,6 +31,12 @@ public interface ProjectConstant { */ String UNRESOLVED = "unresolved"; + + /** + * 处理-退回 + */ + String OPERATION_ISSUE_SHIFT_PROJECT = "issue_shift_project"; + /** * 处理-结案 */ diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectProcessServiceImpl.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectProcessServiceImpl.java index 2046de6106..ff85abe02b 100644 --- a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectProcessServiceImpl.java +++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectProcessServiceImpl.java @@ -387,7 +387,7 @@ public class ProjectProcessServiceImpl extends BaseServiceImpl selectPlatFormIds(String projectId) { List platFormIds = baseDao.selectPlatFormIds(projectId); - if (CollectionUtils.isEmpty(platFormIds))return new ArrayList<>(); + if (CollectionUtils.isEmpty(platFormIds)) { + return new ArrayList<>(); + } return platFormIds; } 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 bee3979312..30b1db9641 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 @@ -547,7 +547,7 @@ public class ProjectServiceImpl extends BaseServiceImpl implements ProjectTraceS logger.error("项目吹哨，发送手机短信失败" + JSON.toJSONString(result)); } + //项目实时统计消息 + ProjectChangedMQMsg mqMsg = new ProjectChangedMQMsg(projectEntity.getCustomerId(), ProjectConstant.OPERATION_CREATED); + boolean msgResult = SendMqMsgUtil.build().openFeignClient(epmetMessageOpenFeignClient).sendProjectChangedMqMsg(mqMsg); + if (!msgResult) { + log.error("项目实时统计消息发送失败"); + } + } /**