组织、网格、人员新增、修改出发点添加推送MQ事件逻辑

epmet-commons/epmet-commons-rocketmq/src/main/java/com/epmet/commons/rocketmq/messages/OrgOrStaffMQMsg.java

@@ -12,7 +12,6 @@ import java.util.List;
  * @author sun
  */
 @Data
-@AllArgsConstructor
 public class OrgOrStaffMQMsg implements Serializable {
 
     //客户Id
@@ -21,7 +20,7 @@ public class OrgOrStaffMQMsg implements Serializable {
     private String orgId;
     //数据类型【组织:agency 网格:grid 人员:staff】
     private String orgType;
-    //操作类型【新增:add 修改删除:edit】
+    //操作类型【组织新增:agency_create 组织变更:agency_change  网格新增:grid_create 网格变更:grid_change  人员新增:staff_create 人员变更:staff_change】
     private String type;
 
 

epmet-gateway/pom.xml

@@ -223,6 +223,9 @@
                 <!-- 35、多数据源服务 -->
                 <gateway.routes.data-aggregator-server.url>lb://data-aggregator-server</gateway.routes.data-aggregator-server.url>
 <!--                <gateway.routes.data-aggregator-server.url>http://127.0.0.1:8114</gateway.routes.data-aggregator-server.url>-->
+                <!-- 36、中间库服务 -->
+                 <gateway.routes.open-data-worker-server.url>lb://open-data-worker-server</gateway.routes.open-data-worker-server.url>
+                <!--<gateway.routes.open-data-worker-server.url>http://127.0.0.1:8117</gateway.routes.open-data-worker-server.url>-->
 
                 <!--宣传服务-->
                 <gateway.routes.epmet-openapi-adv-server.url>lb://epmet-openapi-adv-server</gateway.routes.epmet-openapi-adv-server.url>
@@ -361,6 +364,10 @@
                 <gateway.routes.data-aggregator-server.url>lb://data-aggregator-server</gateway.routes.data-aggregator-server.url>
 <!--                <gateway.routes.data-aggregator-server.url>http://127.0.0.1:8114</gateway.routes.data-aggregator-server.url>-->
 
+                <!-- 36、中间库服务 -->
+               <!-- <gateway.routes.open-data-worker-server.url>lb://open-data-worker-server</gateway.routes.open-data-worker-server.url>-->
+                <gateway.routes.open-data-worker-server.url>http://127.0.0.1:8117</gateway.routes.open-data-worker-server.url>
+
                 <!--宣传服务-->
                 <gateway.routes.epmet-openapi-adv-server.url>lb://epmet-openapi-adv-server</gateway.routes.epmet-openapi-adv-server.url>
                 <!--<gateway.routes.epmet-openapi-adv-server.url>http://localhost:8115</gateway.routes.epmet-openapi-adv-server.url>-->
@@ -469,6 +476,8 @@
                 <gateway.routes.data-aggregator-server.url>lb://data-aggregator-server</gateway.routes.data-aggregator-server.url>
                 <!--问卷服务-->
                 <gateway.routes.tduck-api.url>lb://tduck-api</gateway.routes.tduck-api.url>
+                <!-- 36、中间库服务 -->
+                 <gateway.routes.open-data-worker-server.url>lb://open-data-worker-server</gateway.routes.open-data-worker-server.url>
 
                 <!--宣传服务-->
                 <gateway.routes.epmet-openapi-adv-server.url>lb://epmet-openapi-adv-server</gateway.routes.epmet-openapi-adv-server.url>
@@ -570,6 +579,8 @@
                 <gateway.routes.epmet-ext-server.url>lb://epmet-ext-server</gateway.routes.epmet-ext-server.url>
                 <!-- 35、多数据源服务 -->
                 <gateway.routes.data-aggregator-server.url>lb://data-aggregator-server</gateway.routes.data-aggregator-server.url>
+                <!-- 36、中间库服务 -->
+                 <gateway.routes.open-data-worker-server.url>lb://open-data-worker-server</gateway.routes.open-data-worker-server.url>
 
                 <!--宣传服务-->
                 <gateway.routes.epmet-openapi-adv-server.url>lb://epmet-openapi-adv-server</gateway.routes.epmet-openapi-adv-server.url>

epmet-gateway/src/main/resources/bootstrap.yml

@@ -350,6 +350,16 @@ spring:
           filters:
             - StripPrefix=1
             - CpAuth=true
+        #政府工作端议题管理
+        - id: open-data-worker-server
+          uri: @gateway.routes.gov-issue-server.uri@
+          order: 38
+          predicates:
+            - Path=${server.servlet.context-path}/opendata/**
+          filters:
+            - StripPrefix=1
+            - CpAuth=true
+
     nacos:
       discovery:
         server-addr: @nacos.server-addr@

epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/user/result/GridUserInfoDTO.java

@@ -149,4 +149,34 @@ public class GridUserInfoDTO implements Serializable {
 	 */
 	private String isMediator;
 
+	/**
+	 * 删除标识 0.未删除 1.已删除
+	 */
+	private Integer delFlag;
+
+	/**
+	 * 乐观锁
+	 */
+	private Integer revision;
+
+	/**
+	 * 创建人
+	 */
+	private String createdBy;
+
+	/**
+	 * 创建时间
+	 */
+	private Date createdTime;
+
+	/**
+	 * 更新人
+	 */
+	private String updatedBy;
+
+	/**
+	 * 更新时间
+	 */
+	private Date updatedTime;
+
 }

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/impl/DataReportingServiceImpl.java

@@ -124,6 +124,11 @@ public class DataReportingServiceImpl implements DataReportingService {
 				st.setIsVillageLeader("Y");
 				st.setIsPoliceAssistant("N");
 				st.setIsMediator("Y");
+				st.setDelFlag(dto.getDelFlag());
+				st.setCreatedBy(dto.getCreatedBy());
+				st.setCreatedTime(dto.getCreatedTime());
+				st.setUpdatedBy(dto.getUpdatedBy());
+				st.setUpdatedTime(dto.getUpdatedTime());
 			}
 		});
 

epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/DeleteGridFormDTO.java

@@ -27,4 +27,9 @@ public class DeleteGridFormDTO implements Serializable {
      * userId
      */
     private String userId;
+
+    /**
+     * 客户Id
+     */
+    private String customerId;
 }

epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/EditGridFormDTO.java

@@ -40,4 +40,7 @@ public class EditGridFormDTO implements Serializable {
      */
     private String manageDistrict;
 
+    //客户Id
+    private String customerId;
+
 }

epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/RemoveAgencyFormDTO.java

@@ -38,5 +38,9 @@ public class RemoveAgencyFormDTO implements Serializable {
      */
     @NotBlank(message = "机关组织ID不能为空")
     private String agencyId;
+    /**
+     * 客户Id
+     */
+    private String customerId;
 
 }

epmet-module/gov-org/gov-org-server/pom.xml

@@ -107,6 +107,12 @@
             <version>2.0.0</version>
             <scope>compile</scope>
         </dependency>
+        <dependency>
+            <groupId>com.epmet</groupId>
+            <artifactId>epmet-message-client</artifactId>
+            <version>2.0.0</version>
+            <scope>compile</scope>
+        </dependency>
     </dependencies>
 
     <build>

epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/AgencyController.java

@@ -141,6 +141,7 @@ public class AgencyController {
     @RequirePermission(requirePermission = RequirePermissionEnum.ORG_SUBAGENCY_DELETE)
     public Result removeAgency(@LoginUser TokenDto tokenDTO, @RequestBody RemoveAgencyFormDTO formDTO) {
         ValidatorUtils.validateEntity(formDTO);
+        formDTO.setCustomerId(tokenDTO.getCustomerId());
         return agencyService.removeAgency(formDTO);
     }
 

epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/GridController.java

@@ -58,6 +58,7 @@ public class GridController {
     @RequirePermission(requirePermission = RequirePermissionEnum.ORG_GRID_UPDATE)
     public Result editGrid(@LoginUser TokenDto tokenDto, @RequestBody EditGridFormDTO editGridFormDTO){
         ValidatorUtils.validateEntity(editGridFormDTO, EditGridFormDTO.EditGrid.class);
+        editGridFormDTO.setCustomerId(tokenDto.getCustomerId());
         return customerGridService.editGrid(tokenDto,editGridFormDTO);
 
     }
@@ -68,6 +69,7 @@ public class GridController {
     @PostMapping("deletegrid")
     @RequirePermission(requirePermission = RequirePermissionEnum.ORG_GRID_DELETE)
     public Result deleteGrid(@LoginUser TokenDto tokenDto, @RequestBody DeleteGridFormDTO deleteGridFormDTO){
+        deleteGridFormDTO.setCustomerId(tokenDto.getCustomerId());
         return customerGridService.deleteGrid(tokenDto,deleteGridFormDTO);
     }
 

epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/AgencyServiceImpl.java

@@ -18,6 +18,7 @@
 package com.epmet.service.impl;
 
 import com.alibaba.fastjson.JSON;
+import com.epmet.commons.rocketmq.messages.OrgOrStaffMQMsg;
 import com.epmet.commons.tools.constant.NumConstant;
 import com.epmet.commons.tools.constant.StrConstant;
 import com.epmet.commons.tools.exception.EpmetErrorCode;
@@ -35,8 +36,10 @@ import com.epmet.dto.form.*;
 import com.epmet.dto.result.*;
 import com.epmet.entity.CustomerAgencyEntity;
 import com.epmet.feign.EpmetCommonServiceOpenFeignClient;
+import com.epmet.feign.EpmetMessageOpenFeignClient;
 import com.epmet.feign.EpmetUserOpenFeignClient;
 import com.epmet.redis.CustomerAgencyRedis;
+import com.epmet.send.SendMqMsgUtil;
 import com.epmet.service.AgencyService;
 import com.epmet.service.CustomerAgencyService;
 import com.epmet.service.CustomerOrgParameterService;
@@ -80,6 +83,8 @@ public class AgencyServiceImpl implements AgencyService {
     private CustomerOrgParameterService customerOrgParameterService;
     @Autowired
     private EpmetCommonServiceOpenFeignClient epmetCommonServiceOpenFeignClient;
+    @Autowired
+    private EpmetMessageOpenFeignClient epmetMessageOpenFeignClient;
 
 
     /**
@@ -176,6 +181,16 @@ public class AgencyServiceImpl implements AgencyService {
 
         //5.redis缓存
         customerAgencyRedis.delete(formDTO.getAgencyId());
+
+        //2021-10-18 推送mq，数据同步到中介库 start【中介库只放了组织的名称、级别，所以涉及批量修改pname的操作不涉及同步中间库】
+        OrgOrStaffMQMsg mq = new OrgOrStaffMQMsg();
+        mq.setCustomerId(originalEntity.getCustomerId());
+        mq.setOrgId(formDTO.getAgencyId());
+        mq.setOrgType("agency");
+        mq.setType("agency_change");
+        SendMqMsgUtil.build().openFeignClient(epmetMessageOpenFeignClient).sendOrgStaffMqMsg(mq);
+        //2021-10-18  end
+
         return result;
     }
 
@@ -215,6 +230,16 @@ public class AgencyServiceImpl implements AgencyService {
             log.error(CustomerAgencyConstant.DEL_EXCEPTION);
             throw new RenException(CustomerAgencyConstant.DEL_EXCEPTION);
         }
+
+        //2021-10-18 推送mq，数据同步到中介库 start
+        OrgOrStaffMQMsg mq = new OrgOrStaffMQMsg();
+        mq.setCustomerId(formDTO.getCustomerId());
+        mq.setOrgId(formDTO.getAgencyId());
+        mq.setOrgType("agency");
+        mq.setType("agency_change");
+        SendMqMsgUtil.build().openFeignClient(epmetMessageOpenFeignClient).sendOrgStaffMqMsg(mq);
+        //2021-10-18  end
+
         return result;
     }
 
@@ -370,6 +395,16 @@ public class AgencyServiceImpl implements AgencyService {
         entity.setTotalUser(0);
         entity.setCustomerId(form.getCustomerId());
         customerAgencyDao.insert(entity);
+
+        //2021-10-18 推送mq，数据同步到中介库 start
+        OrgOrStaffMQMsg mq = new OrgOrStaffMQMsg();
+        mq.setCustomerId(form.getCustomerId());
+        mq.setOrgId(entity.getId());
+        mq.setOrgType("agency");
+        mq.setType("agency_create");
+        SendMqMsgUtil.build().openFeignClient(epmetMessageOpenFeignClient).sendOrgStaffMqMsg(mq);
+        //2021-10-18  end
+
         return entity.getId();
     }
 
@@ -430,6 +465,15 @@ public class AgencyServiceImpl implements AgencyService {
             throw new RenException(EpmetErrorCode.OPER_ADD_CUSTOMER_MANAGER_ERROR.getCode(), staffResult.getMsg());
         }
 
+        //2021-10-18 推送mq，数据同步到中介库 start
+        OrgOrStaffMQMsg mq = new OrgOrStaffMQMsg();
+        mq.setCustomerId(agencyDTO.getCustomerId());
+        mq.setOrgId(entity.getId());
+        mq.setOrgType("agency");
+        mq.setType("agency_create");
+        SendMqMsgUtil.build().openFeignClient(epmetMessageOpenFeignClient).sendOrgStaffMqMsg(mq);
+        //2021-10-18  end
+
     }
 
     /**
@@ -474,6 +518,15 @@ public class AgencyServiceImpl implements AgencyService {
         //3:返回新组织Id
         resultDTO.setAgencyId(insertEntity.getId());
         resultDTO.setAreaCode(insertEntity.getAreaCode());
+
+        //2021-10-18 推送mq，数据同步到中介库 start
+        OrgOrStaffMQMsg mq = new OrgOrStaffMQMsg();
+        mq.setCustomerId(parent.getCustomerId());
+        mq.setOrgId(insertEntity.getId());
+        mq.setOrgType("agency");
+        mq.setType("agency_create");
+        SendMqMsgUtil.build().openFeignClient(epmetMessageOpenFeignClient).sendOrgStaffMqMsg(mq);
+        //2021-10-18  end
         return resultDTO;
     }
 

epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerGridServiceImpl.java

@@ -21,6 +21,7 @@ import cn.hutool.core.bean.BeanUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.epmet.commons.mybatis.service.impl.BaseServiceImpl;
+import com.epmet.commons.rocketmq.messages.OrgOrStaffMQMsg;
 import com.epmet.commons.tools.constant.FieldConstant;
 import com.epmet.commons.tools.constant.NumConstant;
 import com.epmet.commons.tools.constant.StrConstant;
@@ -41,8 +42,10 @@ import com.epmet.dto.form.*;
 import com.epmet.dto.result.*;
 import com.epmet.entity.CustomerAgencyEntity;
 import com.epmet.entity.CustomerGridEntity;
+import com.epmet.feign.EpmetMessageOpenFeignClient;
 import com.epmet.feign.EpmetUserFeignClient;
 import com.epmet.feign.OperCrmOpenFeignClient;
+import com.epmet.send.SendMqMsgUtil;
 import com.epmet.service.CustomerAgencyService;
 import com.epmet.service.CustomerGridService;
 import com.epmet.util.ModuleConstant;
@@ -79,9 +82,10 @@ public class CustomerGridServiceImpl extends BaseServiceImpl<CustomerGridDao, Cu
     private OperCrmOpenFeignClient operCrmOpenFeignClient;
     @Autowired
     private CustomerGridDao customerGridDao;
-
     @Autowired
     private RedisUtils redisUtils;
+    @Autowired
+    private EpmetMessageOpenFeignClient epmetMessageOpenFeignClient;
 
     @Override
     public PageData<CustomerGridDTO> page(Map<String, Object> params) {
@@ -270,6 +274,16 @@ public class CustomerGridServiceImpl extends BaseServiceImpl<CustomerGridDao, Cu
         baseDao.insert(customerGridEntity);
         AddGridResultDTO resultDTO = new AddGridResultDTO();
         resultDTO.setGridId(customerGridEntity.getId());
+
+        //2021-10-18 推送mq，数据同步到中介库 start
+        OrgOrStaffMQMsg mq = new OrgOrStaffMQMsg();
+        mq.setCustomerId(customerAgencyDTO.getCustomerId());
+        mq.setOrgId(customerGridEntity.getId());
+        mq.setOrgType("grid");
+        mq.setType("grid_create");
+        SendMqMsgUtil.build().openFeignClient(epmetMessageOpenFeignClient).sendOrgStaffMqMsg(mq);
+        //2021-10-18  end
+
         return new Result<AddGridResultDTO>().ok(resultDTO);
     }
 
@@ -291,6 +305,16 @@ public class CustomerGridServiceImpl extends BaseServiceImpl<CustomerGridDao, Cu
         customerGridDTO.setUpdatedBy(tokenDto.getUserId());
         customerGridDTO.setId(editGridFormDTO.getGridId());
         baseDao.editGrid(customerGridDTO);
+
+        //2021-10-18 推送mq，数据同步到中介库 start
+        OrgOrStaffMQMsg mq = new OrgOrStaffMQMsg();
+        mq.setCustomerId(editGridFormDTO.getCustomerId());
+        mq.setOrgId(editGridFormDTO.getGridId());
+        mq.setOrgType("grid");
+        mq.setType("grid_change");
+        SendMqMsgUtil.build().openFeignClient(epmetMessageOpenFeignClient).sendOrgStaffMqMsg(mq);
+        //2021-10-18  end
+
         return new Result();
     }
 
@@ -310,6 +334,14 @@ public class CustomerGridServiceImpl extends BaseServiceImpl<CustomerGridDao, Cu
                 return new Result().error(EpmetErrorCode.NOT_DEL_GRID.getCode());
             }
         }
+        //2021-10-18 推送mq，数据同步到中介库 start
+        OrgOrStaffMQMsg mq = new OrgOrStaffMQMsg();
+        mq.setCustomerId(deleteGridFormDTO.getCustomerId());
+        mq.setOrgId(deleteGridFormDTO.getGridId());
+        mq.setOrgType("grid");
+        mq.setType("grid_change");
+        SendMqMsgUtil.build().openFeignClient(epmetMessageOpenFeignClient).sendOrgStaffMqMsg(mq);
+        //2021-10-18  end
         return new Result();
     }
 

epmet-module/open-data-worker/open-data-worker-client/src/main/java/com/epmet/opendata/dto/form/GridBaseInfoFormDTO.java

@@ -24,10 +24,6 @@ public class GridBaseInfoFormDTO implements Serializable {
      * 网格Id
      */
     private List<String> orgIdList;
-    /**
-     * 数据类型【组织:agency 网格:grid】
-     */
-    private String orgType;
     /**
      * 操作类型【新增:add 修改删除:edit】
      */

epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/mq/listener/OpenDataOrgChangeEventListener.java

@@ -2,6 +2,7 @@ package com.epmet.opendata.mq.listener;
 
 import com.alibaba.fastjson.JSON;
 import com.epmet.commons.rocketmq.constants.MQUserPropertys;
+import com.epmet.commons.rocketmq.messages.OrgOrStaffMQMsg;
 import com.epmet.commons.tools.distributedlock.DistributedLock;
 import com.epmet.commons.tools.exception.ExceptionUtils;
 import com.epmet.commons.tools.exception.RenException;
@@ -19,6 +20,7 @@ import org.redisson.api.RLock;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import java.util.ArrayList;
 import java.util.List;
 import java.util.concurrent.TimeUnit;
 
@@ -58,19 +60,24 @@ public class OpenDataOrgChangeEventListener implements MessageListenerConcurrent
         String pendingMsgLabel = messageExt.getUserProperty(MQUserPropertys.BLOCKED_MSG_LABEL);
 
         logger.info("【开放数据事件监听器】-组织信息变更-收到消息内容:{},操作:{}", msg, tags);
-        GridBaseInfoFormDTO obj = JSON.parseObject(msg, GridBaseInfoFormDTO.class);
+        OrgOrStaffMQMsg obj = JSON.parseObject(msg, OrgOrStaffMQMsg.class);
 
         DistributedLock distributedLock = null;
         RLock lock = null;
         try {
             distributedLock = SpringContextUtils.getBean(DistributedLock.class);
-            lock = distributedLock.getLock(String.format("lock:open_data_org:%s", obj.getOrgIdList()),
+            lock = distributedLock.getLock(String.format("lock:open_data_org:%s", obj.getOrgId()),
                     30L, 30L, TimeUnit.SECONDS);
 
+            GridBaseInfoFormDTO dto = new GridBaseInfoFormDTO();
+            dto.setCustomerId(obj.getCustomerId());
+            dto.setType(obj.getType());
+            List<String> orgIdList = new ArrayList<>();
+            orgIdList.add(obj.getOrgId());
             if ("agency".equals(obj.getOrgType())) {
-                SpringContextUtils.getBean(BaseGridInfoService.class).getAgencyBaseInfo(obj);
+                SpringContextUtils.getBean(BaseGridInfoService.class).getAgencyBaseInfo(dto);
             } else {
-                SpringContextUtils.getBean(BaseGridInfoService.class).getGridBaseInfo(obj);
+                SpringContextUtils.getBean(BaseGridInfoService.class).getGridBaseInfo(dto);
             }
         } catch (RenException e) {
             // 如果是我们手动抛出的异常，说明在业务可控范围内。目前不需要MQ重试

epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/mq/listener/OpenDataStaffChangeEventListener.java

@@ -2,6 +2,7 @@ package com.epmet.opendata.mq.listener;
 
 import com.epmet.commons.rocketmq.constants.MQUserPropertys;
 import com.alibaba.fastjson.JSON;
+import com.epmet.commons.rocketmq.messages.OrgOrStaffMQMsg;
 import com.epmet.commons.tools.distributedlock.DistributedLock;
 import com.epmet.commons.tools.exception.ExceptionUtils;
 import com.epmet.commons.tools.exception.RenException;
@@ -20,6 +21,7 @@ import org.redisson.api.RLock;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import java.util.ArrayList;
 import java.util.List;
 import java.util.concurrent.TimeUnit;
 
@@ -63,15 +65,21 @@ public class OpenDataStaffChangeEventListener implements MessageListenerConcurre
         //messageExt.propert
 
         logger.info("【开放数据事件监听器】-工作人员信息变更-收到消息内容:{}, 操作:{}, blockedMsgLabel:{}", msg, tags, pendingMsgLabel);
-        StaffBaseInfoFormDTO obj = JSON.parseObject(msg, StaffBaseInfoFormDTO.class);
+        OrgOrStaffMQMsg obj = JSON.parseObject(msg, OrgOrStaffMQMsg.class);
 
         DistributedLock distributedLock = null;
         RLock lock = null;
         try {
             distributedLock = SpringContextUtils.getBean(DistributedLock.class);
-            lock = distributedLock.getLock(String.format("lock:open_data_staff:%s", obj.getStaffIdList()),
+            lock = distributedLock.getLock(String.format("lock:open_data_staff:%s", obj.getOrgId()),
                     30L, 30L, TimeUnit.SECONDS);
-            SpringContextUtils.getBean(BaseGridUserService.class).getStaffBaseInfo(obj);
+
+            StaffBaseInfoFormDTO dto = new StaffBaseInfoFormDTO();
+            dto.setCustomerId(obj.getCustomerId());
+            dto.setType(obj.getType());
+            List<String> staffIdList = new ArrayList<>();
+            staffIdList.add(obj.getOrgId());
+            SpringContextUtils.getBean(BaseGridUserService.class).getStaffBaseInfo(dto);
         } catch (RenException e) {
             // 如果是我们手动抛出的异常，说明在业务可控范围内。目前不需要MQ重试
             logger.error("【开放数据事件监听器】-工作人员信息变更-初始化客户组织失败:".concat(ExceptionUtils.getErrorStackTrace(e)));

epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/BaseGridInfoServiceImpl.java

@@ -72,6 +72,9 @@ public class BaseGridInfoServiceImpl extends BaseServiceImpl<BaseGridInfoDao, Ba
             else if("street".equals(ag.getLevel())){ level = "04"; }
             entity.setGridLevel(level);
             entity.setGridType("01");
+            entity.setDelFlag(ag.getDelFlag().toString());
+            entity.setUpdatedBy(ag.getUpdatedBy());
+            entity.setUpdatedTime(ag.getUpdatedTime());
             entityList.add(entity);
         });
         if("add".equals(formDTO.getType())){

epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/CustomerStaffServiceImpl.java

@@ -22,6 +22,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.epmet.commons.mybatis.entity.DataScope;
 import com.epmet.commons.mybatis.service.impl.BaseServiceImpl;
+import com.epmet.commons.rocketmq.messages.OrgOrStaffMQMsg;
 import com.epmet.commons.tools.constant.FieldConstant;
 import com.epmet.commons.tools.constant.NumConstant;
 import com.epmet.commons.tools.constant.ServiceConstant;
@@ -49,8 +50,10 @@ import com.epmet.entity.GovStaffRoleEntity;
 import com.epmet.entity.StaffRoleEntity;
 import com.epmet.entity.UserEntity;
 import com.epmet.feign.AuthFeignClient;
+import com.epmet.feign.EpmetMessageOpenFeignClient;
 import com.epmet.feign.GovOrgOpenFeignClient;
 import com.epmet.feign.OperCrmOpenFeignClient;
+import com.epmet.send.SendMqMsgUtil;
 import com.epmet.service.CustomerStaffService;
 import com.epmet.service.GovStaffRoleService;
 import com.epmet.service.StaffRoleService;
@@ -99,6 +102,8 @@ public class CustomerStaffServiceImpl extends BaseServiceImpl<CustomerStaffDao,
 	private GovStaffRoleDao govStaffRoleDao;
     @Autowired
     private OperCrmOpenFeignClient operCrmOpenFeignClient;
+    @Autowired
+    private EpmetMessageOpenFeignClient epmetMessageOpenFeignClient;
 
 	@Override
 	public PageData<CustomerStaffDTO> page(Map<String, Object> params) {
@@ -342,6 +347,16 @@ public class CustomerStaffServiceImpl extends BaseServiceImpl<CustomerStaffDao,
 		});
 		dto.setRoles(m);
 		CustomerStaffRedis.delStaffInfoFormCache(dto.getCustomerId(), dto.getStaffId());
+
+		//2021-10-18 推送mq，数据同步到中介库 start
+		OrgOrStaffMQMsg mq = new OrgOrStaffMQMsg();
+		mq.setCustomerId(fromDTO.getCustomerId());
+		mq.setOrgId(userEntity.getId());
+		mq.setOrgType("staff");
+		mq.setType("staff_create");
+		SendMqMsgUtil.build().openFeignClient(epmetMessageOpenFeignClient).sendOrgStaffMqMsg(mq);
+		//2021-10-18  end
+
 		return new Result<CustomerStaffDTO>().ok(ConvertUtils.sourceToTarget(staffEntity, CustomerStaffDTO.class));
 	}
 
@@ -415,6 +430,16 @@ public class CustomerStaffServiceImpl extends BaseServiceImpl<CustomerStaffDao,
 		});
 		dto.setRoles(m);
 		CustomerStaffRedis.delStaffInfoFormCache(dto.getCustomerId(), dto.getStaffId());
+
+		//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 new Result();
 	}