From 4c1fe2d890fa3babef04986187de0d61ed52f539 Mon Sep 17 00:00:00 2001 From: sunyuchao Date: Tue, 30 Nov 2021 14:56:47 +0800 Subject: [PATCH] =?UTF-8?q?=E7=BB=84=E7=BB=87=E3=80=81=E7=BD=91=E6=A0=BC?= =?UTF-8?q?=E3=80=81=E7=BD=91=E6=A0=BC=E5=91=98=E6=95=B0=E6=8D=AE=E4=B8=AD?= =?UTF-8?q?=E9=97=B4=E5=BA=93=E5=90=8C=E6=AD=A5=E7=A8=8B=E5=BA=8F=E8=B0=83?= =?UTF-8?q?=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/ExUserServiceImpl.java | 4 +-- .../controller/CustomerStaffController.java | 32 +++++++++++++++++-- .../impl/CustomerStaffServiceImpl.java | 18 ----------- 3 files changed, 31 insertions(+), 23 deletions(-) diff --git a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/ExUserServiceImpl.java b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/ExUserServiceImpl.java index a3fe1ecfc0..9d5f78e86e 100644 --- a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/ExUserServiceImpl.java +++ b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/ExUserServiceImpl.java @@ -85,10 +85,10 @@ public class ExUserServiceImpl extends BaseServiceImpl }); //3.更新数据，不能新增，市平台信息表中必填的 - if (!"add".equals(formDTO.getType())) { + if (!"staff_create".equals(formDTO.getType())) { baseDao.updateBatch(entityList); } - /*if ("add".equals(formDTO.getType())) { + /*if ("staff_create".equals(formDTO.getType())) { insertBatch(entityList); } else { baseDao.updateBatch(entityList); diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/CustomerStaffController.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/CustomerStaffController.java index f467d60712..0bcae218af 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/CustomerStaffController.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/CustomerStaffController.java @@ -17,6 +17,7 @@ package com.epmet.controller; +import com.epmet.commons.rocketmq.messages.OrgOrStaffMQMsg; import com.epmet.commons.tools.annotation.LoginUser; import com.epmet.commons.tools.annotation.RequirePermission; import com.epmet.commons.tools.enums.RequirePermissionEnum; @@ -36,6 +37,8 @@ import com.epmet.dto.*; import com.epmet.dto.form.*; import com.epmet.dto.result.*; import com.epmet.excel.CustomerStaffExcel; +import com.epmet.feign.EpmetMessageOpenFeignClient; +import com.epmet.send.SendMqMsgUtil; import com.epmet.service.CustomerStaffService; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; @@ -59,9 +62,10 @@ public class CustomerStaffController { @Autowired private CustomerStaffService customerStaffService; - @Autowired private LoginUserUtil loginUserUtil; + @Autowired + private EpmetMessageOpenFeignClient epmetMessageOpenFeignClient; @GetMapping("page") public Result> page(@RequestParam Map params) { @@ -214,7 +218,18 @@ public class CustomerStaffController { */ @PostMapping("addstaff") public Result addStaff(@RequestBody StaffSubmitFromDTO fromDTO){ - return customerStaffService.addStaff(fromDTO); + Result result = customerStaffService.addStaff(fromDTO); + + //2021-10-18 推送mq，数据同步到中介库 start + OrgOrStaffMQMsg mq = new OrgOrStaffMQMsg(); + mq.setCustomerId(fromDTO.getCustomerId()); + mq.setOrgId(result.getData().getUserId()); + mq.setOrgType("staff"); + mq.setType("staff_create"); + SendMqMsgUtil.build().openFeignClient(epmetMessageOpenFeignClient).sendOrgStaffMqMsg(mq); + //2021-10-18 end + + return result; } /** @@ -225,7 +240,18 @@ public class CustomerStaffController { */ @PostMapping("editstaff") public Result editStaff(@RequestBody StaffSubmitFromDTO fromDTO){ - return customerStaffService.editStaff(fromDTO); + Result result = customerStaffService.editStaff(fromDTO); + + //2021-10-18 推送mq，数据同步到中介库 start + OrgOrStaffMQMsg mq = new OrgOrStaffMQMsg(); + mq.setCustomerId(fromDTO.getCustomerId()); + mq.setOrgId(fromDTO.getStaffId()); + mq.setOrgType("staff"); + mq.setType("staff_change"); + SendMqMsgUtil.build().openFeignClient(epmetMessageOpenFeignClient).sendOrgStaffMqMsg(mq); + //2021-10-18 end + + return result; } /** diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/CustomerStaffServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/CustomerStaffServiceImpl.java index 6e0c14c1e4..039edc5e32 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/CustomerStaffServiceImpl.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/CustomerStaffServiceImpl.java @@ -348,15 +348,6 @@ public class CustomerStaffServiceImpl extends BaseServiceImpl().ok(ConvertUtils.sourceToTarget(staffEntity, CustomerStaffDTO.class)); } @@ -431,15 +422,6 @@ public class CustomerStaffServiceImpl extends BaseServiceImpl