From e39495a062aecd088d516d646ca937340f01b364 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Tue, 23 Jun 2020 22:10:40 +0800 Subject: [PATCH 1/4] =?UTF-8?q?message=E3=80=81auth=E3=80=81resipartymembe?= =?UTF-8?q?r?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- epmet-auth/deploy/docker-compose-test.yml | 2 +- .../epmet-message-server/deploy/docker-compose-test.yml | 2 +- .../resi-partymember-server/deploy/docker-compose-test.yml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/epmet-auth/deploy/docker-compose-test.yml b/epmet-auth/deploy/docker-compose-test.yml index e177ec9944..20871fd0c7 100644 --- a/epmet-auth/deploy/docker-compose-test.yml +++ b/epmet-auth/deploy/docker-compose-test.yml @@ -2,7 +2,7 @@ version: "3.7" services: epmet-auth-server: container_name: epmet-auth-server-test - image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-release/epmet-auth:0.3.21 + image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-release/epmet-auth:0.3.22 ports: - "8081:8081" network_mode: host # 使用现有网络 diff --git a/epmet-module/epmet-message/epmet-message-server/deploy/docker-compose-test.yml b/epmet-module/epmet-message/epmet-message-server/deploy/docker-compose-test.yml index 104ba801e6..50d2127545 100644 --- a/epmet-module/epmet-message/epmet-message-server/deploy/docker-compose-test.yml +++ b/epmet-module/epmet-message/epmet-message-server/deploy/docker-compose-test.yml @@ -2,7 +2,7 @@ version: "3.7" services: epmet-message-server: container_name: epmet-message-server-test - image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-release/epmet-message-server:0.3.19 + image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-release/epmet-message-server:0.3.21 ports: - "8085:8085" network_mode: host # 使用现有网络 diff --git a/epmet-module/resi-partymember/resi-partymember-server/deploy/docker-compose-test.yml b/epmet-module/resi-partymember/resi-partymember-server/deploy/docker-compose-test.yml index 344f01b1f1..b8368d410e 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/deploy/docker-compose-test.yml +++ b/epmet-module/resi-partymember/resi-partymember-server/deploy/docker-compose-test.yml @@ -2,7 +2,7 @@ version: "3.7" services: resi-partymember-server: container_name: resi-partymember-server-test - image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-release/resi-partymember-server:0.3.51 + image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-release/resi-partymember-server:0.3.52 ports: - "8096:8096" network_mode: host # 使用现有网络 From 4686aafc9e032cf5b4dd928a21d441fe574ef2ce Mon Sep 17 00:00:00 2001 From: sunyuchao Date: Mon, 29 Jun 2020 10:42:47 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E5=9B=A0=E5=88=86=E5=B8=83=E5=BC=8F?= =?UTF-8?q?=E4=BA=8B=E5=8A=A1=E9=97=AE=E9=A2=98=EF=BC=8C=E8=AE=AE=E9=A2=98?= =?UTF-8?q?=E8=BD=AC=E9=A1=B9=E7=9B=AE=E6=8E=A5=E5=8F=A3=E6=B7=BB=E5=8A=A0?= =?UTF-8?q?=E6=95=B0=E6=8D=AE=E5=88=A4=E6=96=AD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../epmet/service/impl/IssueServiceImpl.java | 1 + .../com/epmet/constant/ProjectConstant.java | 5 +++++ .../main/java/com/epmet/dao/ProjectDao.java | 8 ++++++++ .../epmet/service/impl/ProjectServiceImpl.java | 11 +++++++++++ .../src/main/resources/mapper/ProjectDao.xml | 18 ++++++++++++++++++ 5 files changed, 43 insertions(+) diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueServiceImpl.java b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueServiceImpl.java index 4ba36d235d..2730d87941 100644 --- a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueServiceImpl.java +++ b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueServiceImpl.java @@ -504,6 +504,7 @@ public class IssueServiceImpl extends BaseServiceImpl imp //3:调用gov-project服务，新增项目各业务表初始数据 Result resultDTO = govProjectFeignClient.issueShiftProject(formDTO); if (!resultDTO.success() || null == resultDTO.getData()) { + logger.error(resultDTO.getInternalMsg()); throw new RenException(IssueConstant.GOV_PRJECT_EXCEPTION); } IssueProjectResultDTO issueProjectResultDTO = resultDTO.getData(); 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 a2d77e8446..fd8934060a 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 @@ -113,4 +113,9 @@ public interface ProjectConstant { * 获取项目节点数据失败 */ String SELECT_process_EXCEPTION = "获取项目节点数据失败"; + /** + * 议题转项目已存在项目数据，不能重复转 + * 议题转项目 项目服务数据入库成功，议题数据更新或发送消息失败导致议题数据可以回滚，项目服务数据不能回滚 + */ + String SAVE_PROJECT_EXCEPTION = "已存在项目数据，不能重复转项目"; } diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/dao/ProjectDao.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/dao/ProjectDao.java index 3b58c435b7..a45b46bb0a 100644 --- a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/dao/ProjectDao.java +++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/dao/ProjectDao.java @@ -103,4 +103,12 @@ public interface ProjectDao extends BaseDao { * @Description 获取客户下已结案项目列表，按结案时间倒序 **/ List selectClosedProjectList(LatestListFormDTO formDTO); + + /** + * @param projectDTO + * @return + * @Author sun + * @Description 根据客户Id、机关Id、议题Id查询项目数据是否存在 + **/ + List selectProjectList(ProjectDTO projectDTO); } \ No newline at end of file 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 29a964851f..4ec3eacda5 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 @@ -467,6 +467,17 @@ public class ProjectServiceImpl extends BaseServiceImpl staffList = formDTO.getStaffList(); IssueDTO issueDTO = formDTO.getIssueDTO(); + //0.因项目还未添加分布式事务，议题转项目，如果项目数据入库成功议题数据也修改成功但是消息发送失败时则议题数据可以回滚但项目服务的数据不能回滚 + //先根据客户Id机关Id议题Id查询项目表是否已存在，存在则说明之前转过切失败了，这样的数据不能再操作了，只能操作数据库，将项目表和项目进展表数据清除 + ProjectDTO projectDTO = new ProjectDTO(); + projectDTO.setCustomerId(issueDTO.getCustomerId()); + projectDTO.setAgencyId(issueDTO.getOrgId()); + projectDTO.setOrigin(ProjectConstant.ISSUE); + projectDTO.setOriginId(issueDTO.getId()); + List listProject = baseDao.selectProjectList(projectDTO); + if (null != listProject && listProject.size() > NumConstant.ZERO) { + throw new RenException(ProjectConstant.SAVE_PROJECT_EXCEPTION); + } //1:调用gov-org服务，获取所有勾选人员以及议题数据对应的组织信息、部门信息、网格信息用于对处理部门和ORG_ID_PATH字段的赋值使用 List agencyIdList = staffList.stream().map(TickStaffFormDTO::getAgencyId).collect(Collectors.toList()); agencyIdList.add(issueDTO.getOrgId()); 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 0dad21111b..548eb53128 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 @@ -165,4 +165,22 @@ ORDER BY p.created_time DESC + + \ No newline at end of file From d28a0813befa05fd3ae8f67a9ae7242f7fe56e79 Mon Sep 17 00:00:00 2001 From: sunyuchao Date: Mon, 29 Jun 2020 10:49:34 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E8=AE=AE=E9=A2=98=E3=80=81=E9=A1=B9?= =?UTF-8?q?=E7=9B=AE=E6=9C=8D=E5=8A=A1=E5=8D=87=E7=BA=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../gov-issue/gov-issue-server/deploy/docker-compose-dev.yml | 2 +- epmet-module/gov-issue/gov-issue-server/pom.xml | 2 +- .../gov-project-server/deploy/docker-compose-dev.yml | 2 +- epmet-module/gov-project/gov-project-server/pom.xml | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/epmet-module/gov-issue/gov-issue-server/deploy/docker-compose-dev.yml b/epmet-module/gov-issue/gov-issue-server/deploy/docker-compose-dev.yml index e5f9b0eb87..6dcdb4ec76 100644 --- a/epmet-module/gov-issue/gov-issue-server/deploy/docker-compose-dev.yml +++ b/epmet-module/gov-issue/gov-issue-server/deploy/docker-compose-dev.yml @@ -2,7 +2,7 @@ version: "3.7" services: gov-issue-server: container_name: gov-issue-server-dev - image: 192.168.1.130:10080/epmet-cloud-dev/gov-issue-server:0.3.44 + image: 192.168.1.130:10080/epmet-cloud-dev/gov-issue-server:0.3.45 ports: - "8101:8101" network_mode: host # 使用现有网络 diff --git a/epmet-module/gov-issue/gov-issue-server/pom.xml b/epmet-module/gov-issue/gov-issue-server/pom.xml index ad883bcc23..c0d4f4e42d 100644 --- a/epmet-module/gov-issue/gov-issue-server/pom.xml +++ b/epmet-module/gov-issue/gov-issue-server/pom.xml @@ -2,7 +2,7 @@ - 0.3.44 + 0.3.45 gov-issue com.epmet diff --git a/epmet-module/gov-project/gov-project-server/deploy/docker-compose-dev.yml b/epmet-module/gov-project/gov-project-server/deploy/docker-compose-dev.yml index 28f015a3c5..78ebd86001 100644 --- a/epmet-module/gov-project/gov-project-server/deploy/docker-compose-dev.yml +++ b/epmet-module/gov-project/gov-project-server/deploy/docker-compose-dev.yml @@ -2,7 +2,7 @@ version: "3.7" services: gov-project-server: container_name: gov-project-server-dev - image: 192.168.1.130:10080/epmet-cloud-dev/gov-project-server:0.3.29 + image: 192.168.1.130:10080/epmet-cloud-dev/gov-project-server:0.3.30 ports: - "8102:8102" network_mode: host # 使用现有网络 diff --git a/epmet-module/gov-project/gov-project-server/pom.xml b/epmet-module/gov-project/gov-project-server/pom.xml index a3db2f67a8..3b5472c3e1 100644 --- a/epmet-module/gov-project/gov-project-server/pom.xml +++ b/epmet-module/gov-project/gov-project-server/pom.xml @@ -2,7 +2,7 @@ - 0.3.29 + 0.3.30 gov-project com.epmet From 00ec8e0a0e3fae50534f2cc4af371eefcbd8754b Mon Sep 17 00:00:00 2001 From: wxz Date: Mon, 29 Jun 2020 10:59:54 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E7=89=88=E6=9C=AC=E5=8D=87=E7=BA=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../data-statistical-server/deploy/docker-compose-dev.yml | 2 +- epmet-module/data-statistical/data-statistical-server/pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/epmet-module/data-statistical/data-statistical-server/deploy/docker-compose-dev.yml b/epmet-module/data-statistical/data-statistical-server/deploy/docker-compose-dev.yml index 50cf60444e..95c949f0f6 100644 --- a/epmet-module/data-statistical/data-statistical-server/deploy/docker-compose-dev.yml +++ b/epmet-module/data-statistical/data-statistical-server/deploy/docker-compose-dev.yml @@ -2,7 +2,7 @@ version: "3.7" services: data-statistical-server: container_name: data-statistical-server-dev - image: 192.168.1.130:10080/epmet-cloud-dev/data-statistical-server:0.3.10 + image: 192.168.1.130:10080/epmet-cloud-dev/data-statistical-server:0.3.11 ports: - "8108:8108" network_mode: host # 使用现有网络 diff --git a/epmet-module/data-statistical/data-statistical-server/pom.xml b/epmet-module/data-statistical/data-statistical-server/pom.xml index 280b7e7c58..81d02ae79b 100644 --- a/epmet-module/data-statistical/data-statistical-server/pom.xml +++ b/epmet-module/data-statistical/data-statistical-server/pom.xml @@ -2,7 +2,7 @@ - 0.3.10 + 0.3.11 data-statistical com.epmet