fix(tcm):人员同步更新至es

amos-boot-system-tzs/amos-boot-module-common/amos-boot-module-common-biz/src/main/java/com/yeejoin/amos/boot/module/common/biz/refresh/listener/DataRefreshListener.java

@@ -74,7 +74,7 @@ public class DataRefreshListener {
         dataRefreshService.ifPresent(service -> service.doDispatch(event.getDataType(), messages));
     }
 
-    private List<TzsDataRefreshMessage> createMsg(DataRefreshEvent event) {
+    public List<TzsDataRefreshMessage> createMsg(DataRefreshEvent event) {
         List<TzsDataRefreshMessage> messages = event.getDataIds().stream().filter(Objects::nonNull).map(dataId -> {
             TzsDataRefreshMessage message = new TzsDataRefreshMessage();
             message.setDataId(dataId);

amos-boot-system-tzs/amos-boot-module-tcm/amos-boot-module-tcm-biz/src/main/java/com/yeejoin/amos/boot/module/tcm/biz/service/impl/TzsUserInfoServiceImpl.java

@@ -32,10 +32,12 @@ import com.yeejoin.amos.boot.biz.common.utils.RedisKey;
 import com.yeejoin.amos.boot.biz.common.utils.RedisUtils;
 import com.yeejoin.amos.boot.biz.common.utils.SnowflakeIdUtil;
 import com.yeejoin.amos.boot.module.common.api.dto.UserPermissionDto;
+import com.yeejoin.amos.boot.module.common.api.entity.TzsDataRefreshMessage;
 import com.yeejoin.amos.boot.module.common.api.enums.UnitDataSourceEnum;
 import com.yeejoin.amos.boot.module.common.api.enums.UserPostEnum;
 import com.yeejoin.amos.boot.module.common.biz.event.CommonPublisher;
 import com.yeejoin.amos.boot.module.common.biz.refresh.DataRefreshEvent;
+import com.yeejoin.amos.boot.module.common.biz.refresh.listener.DataRefreshListener;
 import com.yeejoin.amos.boot.module.common.biz.service.impl.TZSCommonServiceImpl;
 import com.yeejoin.amos.boot.module.tcm.api.dto.*;
 import com.yeejoin.amos.boot.module.tcm.api.entity.*;
@@ -50,6 +52,7 @@ import com.yeejoin.amos.boot.module.tcm.api.service.ITzsUserInfoService;
 import com.yeejoin.amos.boot.module.tcm.api.vo.SortVo;
 import com.yeejoin.amos.boot.module.tcm.api.vo.TzsUserInfoVo;
 import com.yeejoin.amos.boot.module.tcm.api.vo.UserInfoVo;
+import com.yeejoin.amos.boot.module.tcm.biz.refresh.handler.UserRefreshHandler;
 import com.yeejoin.amos.boot.module.tcm.flc.api.entity.RegUnitInfo;
 import com.yeejoin.amos.boot.module.tcm.flc.biz.service.impl.RegUnitInfoServiceImpl;
 import com.yeejoin.amos.component.feign.config.InnerInvokException;
@@ -150,7 +153,10 @@ public class TzsUserInfoServiceImpl extends BaseService<TzsUserInfoDto, TzsUserI
     private TzsUserPermissionServiceImpl tzsUserPermissionServiceImpl;
     @Autowired
     private EmqKeeper emqKeeper;
-
+    @Autowired
+    UserRefreshHandler userRefreshHandler;
+    @Autowired
+    DataRefreshListener dataRefreshListener;
     @Autowired
     private RegUnitInfoServiceImpl regUnitInfoService;
 
@@ -570,7 +576,9 @@ public class TzsUserInfoServiceImpl extends BaseService<TzsUserInfoDto, TzsUserI
                     bind2PermissionGroup(userIds, code);
                 }
                 tzsUserInfoMapper.updateById(tzsUserInfo);
-                publisher.publish(new DataRefreshEvent(this, Collections.singletonList(sequenceNbr), DataRefreshEvent.DataType.user.name(), DataRefreshEvent.Operation.UPDATE));
+                // 同步更新至es
+                List<TzsDataRefreshMessage> refreshListenerMsg = dataRefreshListener.createMsg(new DataRefreshEvent(this, Collections.singletonList(sequenceNbr), DataRefreshEvent.DataType.user.name(), DataRefreshEvent.Operation.UPDATE));
+                refreshListenerMsg.forEach(msg -> userRefreshHandler.doRefresh(msg));
             }
             return true;
         } catch (Exception e) {
@@ -1237,7 +1245,9 @@ public class TzsUserInfoServiceImpl extends BaseService<TzsUserInfoDto, TzsUserI
         tzsUserInfo = this.createWithModel(tzsUserInfo);
         // 保存资质
         tzsUserPermissionServiceImpl.savePermissionData(tzsUserInfo);
-        publisher.publish(new DataRefreshEvent(this, Collections.singletonList(tzsUserInfo.getSequenceNbr() + ""), DataRefreshEvent.DataType.user.name(), DataRefreshEvent.Operation.INSERT));
+        // 同步更新至es
+        List<TzsDataRefreshMessage> refreshListenerMsg = dataRefreshListener.createMsg(new DataRefreshEvent(this, Collections.singletonList(tzsUserInfo.getSequenceNbr() + ""), DataRefreshEvent.DataType.user.name(), DataRefreshEvent.Operation.INSERT));
+        refreshListenerMsg.forEach(msg -> userRefreshHandler.doRefresh(msg));
         return tzsUserInfo;
     }
 
@@ -1407,7 +1417,9 @@ public class TzsUserInfoServiceImpl extends BaseService<TzsUserInfoDto, TzsUserI
         this.updateWithModel(tzsUserInfoDto);
         // 更新人员信息同步平台
         syncNewPost(tzsUserInfoDto);
-        publisher.publish(new DataRefreshEvent(this, Collections.singletonList(tzsUserInfoDto.getSequenceNbr() + ""), DataRefreshEvent.DataType.user.name(), DataRefreshEvent.Operation.UPDATE));
+        // 同步更新至es
+        List<TzsDataRefreshMessage> refreshListenerMsg = dataRefreshListener.createMsg(new DataRefreshEvent(this, Collections.singletonList(tzsUserInfoDto.getSequenceNbr() + ""), DataRefreshEvent.DataType.user.name(), DataRefreshEvent.Operation.UPDATE));
+        refreshListenerMsg.forEach(msg -> userRefreshHandler.doRefresh(msg));
         return tzsUserInfoDto;
     }