item：新增人员删除同步

amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/java/com/yeejoin/amos/boot/module/common/api/enums/DataSyncTopicEnum.java

@@ -2,6 +2,7 @@ package com.yeejoin.amos.boot.module.common.api.enums;
 
 public enum DataSyncTopicEnum {
     EQM_PATROL_CREATED("user", "emq.user.created"),
+    ORG_USR_DEL("userDel", "user/sync/orgUsrDel"),
     ORG_USR("orgUsr", "user/sync/orgUsr");
 
     private String type;

amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/java/com/yeejoin/amos/boot/module/common/api/service/IDataSyncService.java

@@ -10,4 +10,6 @@ public interface IDataSyncService {
 
     void OrgUsrSyncDtoDataSync(Long id);
 
+    void OrgUsrSyncDtoDelDataSync(Long id);
+
 }

amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/resources/mapper/OrgUsrMapper.xml

@@ -1173,7 +1173,7 @@ LEFT JOIN (
         LEFT JOIN cb_firefighters_post cfp ON
         cfp.org_usr_id = u.sequence_nbr
         LEFT JOIN cb_firefighters cf ON
-        cf.org_usr_id = u.sequence_nbr
+        cf.org_usr_id = u.sequence_nbr AND cf.is_delete= 0
         LEFT JOIN cb_fire_team cft ON
         cft.sequence_nbr = cf.fire_team_id
         WHERE

amos-boot-module/amos-boot-module-biz/amos-boot-module-common-biz/src/main/java/com/yeejoin/amos/boot/module/common/biz/service/impl/DataSyncServiceImpl.java

@@ -47,15 +47,24 @@ public class DataSyncServiceImpl implements IDataSyncService {
                             emqKeeper.getMqttClient().publish(DataSyncTopicEnum.ORG_USR.getTopic(), JSONObject.toJSONString(x).getBytes(), RuleConfig.DEFAULT_QOS, false);
                         }
                     }
-                } else {
-                    //  同步删除人员信息
-                    OrgUsrSyncDto orgUsrSyncDto = new OrgUsrSyncDto();
-                    orgUsrSyncDto.setSequenceNbr(id);
-                    String message = buildSyncMessage(DataSyncTopicEnum.ORG_USR.getTopic(), orgUsrSyncDto);
-                    emqKeeper.getMqttClient().publish(DataSyncTopicEnum.EQM_PATROL_CREATED.getTopic(), message.getBytes(), RuleConfig.DEFAULT_QOS, false);
-                    if (orgUsrSyncSwitch) {
-                        emqKeeper.getMqttClient().publish(DataSyncTopicEnum.ORG_USR.getTopic(), JSONObject.toJSONString(orgUsrSyncDto).getBytes(), RuleConfig.DEFAULT_QOS, false);
-                    }
+                }
+            }
+        } catch (Exception e) {
+            log.error("站端与中心级人员数据【OrgUsrSyncDto】同步推送失败-----------" + e.getMessage());
+        }
+    }
+
+    @Override
+    public void OrgUsrSyncDtoDelDataSync(Long id) {
+        try {
+            if (id != null) {
+                //  同步删除人员信息
+                OrgUsrSyncDto orgUsrSyncDto = new OrgUsrSyncDto();
+                orgUsrSyncDto.setSequenceNbr(id);
+                String message = buildSyncMessage(DataSyncTopicEnum.ORG_USR_DEL.getTopic(), orgUsrSyncDto);
+                emqKeeper.getMqttClient().publish(DataSyncTopicEnum.EQM_PATROL_CREATED.getTopic(), message.getBytes(), RuleConfig.DEFAULT_QOS, false);
+                if (orgUsrSyncSwitch) {
+                    emqKeeper.getMqttClient().publish(DataSyncTopicEnum.ORG_USR_DEL.getTopic(), JSONObject.toJSONString(orgUsrSyncDto).getBytes(), RuleConfig.DEFAULT_QOS, false);
                 }
             }
         } catch (Exception e) {

amos-boot-module/amos-boot-module-biz/amos-boot-module-common-biz/src/main/java/com/yeejoin/amos/boot/module/common/biz/service/impl/OrgUsrServiceImpl.java

@@ -3340,7 +3340,7 @@ public class OrgUsrServiceImpl extends BaseService<OrgUsrDto, OrgUsr, OrgUsrMapp
 			@Override
 			public void afterCommit() {
 				// 事物提交后业务逻辑
-				dataSyncService.OrgUsrSyncDtoDataSync(id);
+				dataSyncService.OrgUsrSyncDtoDelDataSync(id);
 			}
 		});
 		return "0";