item：单位人员消息数据同步修改

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

@@ -1191,8 +1191,8 @@ LEFT JOIN (
                 cft.sequence_nbr = cf.fire_team_id
         WHERE
             u.is_delete = 0
-            <if test="sequenceNbr != null">
-                AND u.sequence_nbr = #{sequenceNbr}
+            <if test="id != null">
+                AND u.sequence_nbr = #{id}
             </if>
         GROUP BY
             u.sequence_nbr

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

@@ -41,7 +41,6 @@ public class DataSyncServiceImpl implements IDataSyncService {
                         emqKeeper.getMqttClient().publish(DataSyncTopicEnum.EQM_PATROL_CREATED.getTopic(), message.getBytes(), RuleConfig.DEFAULT_QOS, false);
                     }
                     emqKeeper.getMqttClient().publish(DataSyncTopicEnum.ORG_USR.getTopic(), JSONObject.toJSONString(list).getBytes(), RuleConfig.DEFAULT_QOS, false);
-                }
                 } else {
                     //  同步删除人员信息
                     OrgUsrSyncDto orgUsrSyncDto = new OrgUsrSyncDto();
@@ -50,6 +49,7 @@ public class DataSyncServiceImpl implements IDataSyncService {
                     emqKeeper.getMqttClient().publish(DataSyncTopicEnum.EQM_PATROL_CREATED.getTopic(), message.getBytes(), RuleConfig.DEFAULT_QOS, false);
                     emqKeeper.getMqttClient().publish(DataSyncTopicEnum.ORG_USR.getTopic(), JSONObject.toJSONString(orgUsrSyncDto).getBytes(), RuleConfig.DEFAULT_QOS, false);
                 }
+            }
         } catch (Exception e) {
             log.error("站端与中心级人员数据【OrgUsrSyncDto】同步推送失败-----------" + e.getMessage());
         }

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

 package com.yeejoin.amos.boot.module.common.biz.service.impl;
 
 import java.util.*;
-import java.util.stream.Collectors;
 
 import com.yeejoin.amos.boot.biz.common.dao.mapper.DataDictionaryMapper;
-import com.yeejoin.amos.boot.biz.common.utils.RedisKey;
 import com.yeejoin.amos.boot.module.common.api.dto.*;
 import com.yeejoin.amos.boot.module.common.api.entity.*;
 
 import com.yeejoin.amos.boot.module.common.api.mapper.OrgUsrMapper;
-import com.yeejoin.amos.component.feign.model.Page;
+import com.yeejoin.amos.boot.module.common.api.service.IDataSyncService;
 import com.yeejoin.amos.feign.privilege.Privilege;
 import com.yeejoin.amos.feign.privilege.model.AgencyUserModel;
-import com.yeejoin.amos.feign.privilege.model.RoleModel;
 import org.apache.commons.lang3.ObjectUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
+import org.springframework.transaction.support.TransactionSynchronization;
+import org.springframework.transaction.support.TransactionSynchronizationManager;
 import org.typroject.tyboot.core.foundation.utils.ValidationUtil;
 import org.typroject.tyboot.core.rdbms.annotation.Condition;
 import org.typroject.tyboot.core.rdbms.annotation.Operator;
@@ -35,7 +34,6 @@ import com.yeejoin.amos.boot.module.common.api.service.IFirefightersService;
 import com.yeejoin.amos.component.feign.model.FeignClientResult;
 import com.yeejoin.amos.feign.systemctl.Systemctl;
 import com.yeejoin.amos.feign.systemctl.model.RegionModel;
-import org.typroject.tyboot.core.restful.utils.ResponseHelper;
 
 /**
  * 消防队员 服务实现类
@@ -62,6 +60,8 @@ public class FirefightersServiceImpl extends BaseService<FirefightersDto, Firefi
 	@Autowired
 	private OrgUsrMapper orgUsrMapper;
 
+	@Autowired
+	private IDataSyncService dataSyncService;
 
 	@Override
 	public List<FirefightersZhDto> getFirefighters(int pageNum, int pageSize, FirefightersDto par) {
@@ -257,6 +257,14 @@ public class FirefightersServiceImpl extends BaseService<FirefightersDto, Firefi
 			// 更新紧急联系人
 			ifirefightersContactsService.updateById(peopleInfoDto.getFirefightersContacts());
 		}
+		//  巡检站端与中心级数据同步
+		TransactionSynchronizationManager.registerSynchronization(new TransactionSynchronization() {
+			@Override
+			public void afterCommit() {
+				// 事物提交后业务逻辑
+				dataSyncService.OrgUsrSyncDtoDataSync(id);
+			}
+		});
 		return peopleInfoDto;
 	}
 

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

@@ -3003,14 +3003,14 @@ public class OrgUsrServiceImpl extends BaseService<OrgUsrDto, OrgUsr, OrgUsrMapp
 
 		// 2.保存cb_dynamic_form_instance表 人员基本信息
 		OrgUsrDto orgUsrDto = saveDynamicformInstance(orgUsr, peopleInfoDto.getFirefighters());
-
-		if (!ObjectUtils.isEmpty(orgUsrDto.getSequenceNbr())) {
-			peopleInfoDto.getFirefightersContacts().setOrgUsrId(orgUsrDto.getSequenceNbr().toString());
-			peopleInfoDto.getFirefighters().setOrgUsrId(orgUsrDto.getSequenceNbr().toString());
-			peopleInfoDto.getPostEduDtoObj().getFirefightersWorkexperience().setOrgUsrId(orgUsrDto.getSequenceNbr().toString());
-			peopleInfoDto.getPostEduDtoObj().getFirefightersEducation().setOrgUsrId(orgUsrDto.getSequenceNbr().toString());
-			peopleInfoDto.getPostEduDtoObj().getFirefightersPost().setOrgUsrId(orgUsrDto.getSequenceNbr().toString());
-			peopleInfoDto.getFirefighters().setSequenceNbr(orgUsrDto.getSequenceNbr().toString());
+		Long sequenceNbr = orgUsrDto.getSequenceNbr();
+		if (!ObjectUtils.isEmpty(sequenceNbr)) {
+			peopleInfoDto.getFirefightersContacts().setOrgUsrId(sequenceNbr.toString());
+			peopleInfoDto.getFirefighters().setOrgUsrId(sequenceNbr.toString());
+			peopleInfoDto.getPostEduDtoObj().getFirefightersWorkexperience().setOrgUsrId(sequenceNbr.toString());
+			peopleInfoDto.getPostEduDtoObj().getFirefightersEducation().setOrgUsrId(sequenceNbr.toString());
+			peopleInfoDto.getPostEduDtoObj().getFirefightersPost().setOrgUsrId(sequenceNbr.toString());
+			peopleInfoDto.getFirefighters().setSequenceNbr(sequenceNbr.toString());
 		}
 
 		if (peopleInfoDto.getFirefighters() != null && "1601".equals(peopleInfoDto.getFirefighters().getPeopleType())) {
@@ -3021,13 +3021,13 @@ public class OrgUsrServiceImpl extends BaseService<OrgUsrDto, OrgUsr, OrgUsrMapp
 			saveFirefightersContacts(peopleInfoDto);
 		}
 		// 4.保存岗位信息
-		saveFirefightersPost(peopleInfoDto.getPostEduDtoObj(), orgUsrDto.getSequenceNbr());
+		saveFirefightersPost(peopleInfoDto.getPostEduDtoObj(), sequenceNbr);
 		//  巡检站端与中心级数据同步
 		TransactionSynchronizationManager.registerSynchronization(new TransactionSynchronization() {
 			@Override
 			public void afterCommit() {
 				// 事物提交后业务逻辑
-				dataSyncService.OrgUsrSyncDtoDataSync(orgUsr.getSequenceNbr());
+				dataSyncService.OrgUsrSyncDtoDataSync(sequenceNbr);
 			}
 		});
 		return peopleInfoDto;

amos-boot-module/amos-boot-module-biz/amos-boot-module-jcs-biz/src/main/java/com/yeejoin/amos/boot/module/jcs/biz/controller/FirefightersController.java

@@ -5,14 +5,11 @@ import java.util.*;
 import javax.servlet.http.HttpServletRequest;
 
 import com.alibaba.fastjson.JSONObject;
-import com.yeejoin.amos.boot.module.common.api.service.IDataSyncService;
 import org.apache.commons.lang.StringUtils;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.transaction.annotation.Transactional;
-import org.springframework.transaction.support.TransactionSynchronization;
-import org.springframework.transaction.support.TransactionSynchronizationManager;
 import org.springframework.util.ObjectUtils;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PathVariable;
@@ -109,9 +106,6 @@ public class FirefightersController extends BaseController {
     @Autowired
     DataDictionaryServiceImpl dataDictionaryService;
 
-    @Autowired
-    private IDataSyncService dataSyncService;
-
     @Value("${redis.cache.failure.time}")
     private long time;
     @Autowired
@@ -495,14 +489,6 @@ public class FirefightersController extends BaseController {
                     iFirefightersService.saveFirefightersByUser(firefighters);
                 }
             }
-            //  巡检站端与中心级数据同步
-            TransactionSynchronizationManager.registerSynchronization(new TransactionSynchronization() {
-                @Override
-                public void afterCommit() {
-                    // 事物提交后业务逻辑
-                    dataSyncService.OrgUsrSyncDtoDataSync(id);
-                }
-            });
             return ResponseHelper.buildResponse(iFirefightersService.updatePeopleById(firefighters, id));
         } catch (Exception e) {
             throw new RuntimeException("系统异常");