处理中间表数据不一致问题

amos-boot-system-jxiop/amos-boot-module-jxiop-api/src/main/java/com/yeejoin/amos/boot/module/jxiop/api/dto/PersonAccountFedDto.java

+package com.yeejoin.amos.boot.module.jxiop.api.dto;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.yeejoin.amos.boot.biz.common.dto.BaseDto;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.util.Date;
+
+/**
+ * 人员基本信息
+ *
+ * @author system_generator
+ * @date 2023-04-20
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@ApiModel(value = "PersonAccountDto", description = "人员基本信息")
+public class PersonAccountFedDto extends BaseDto {
+
+    private static final long serialVersionUID = 1L;
+
+
+    @ApiModelProperty(value = "平台user_id")
+    private String puserId;
+
+    @ApiModelProperty(value = "平台账号名称")
+    private String accountName;
+
+    @ApiModelProperty(value = "用户角色")
+    private String roles;
+
+    @ApiModelProperty(value = "密码")
+    private String password;
+
+    @ApiModelProperty(value = "二次密码")
+    private String secondaryPassword;
+
+    @ApiModelProperty(value = "业务密码")
+    private String businessPassword;
+
+    @ApiModelProperty(value = "部门id")
+    private Long departmentId;
+
+    @ApiModelProperty(value = "部门名称")
+    private String projectDepartmentName;
+
+    @ApiModelProperty(value = "所属场站id")
+    private Long projectId;
+
+    @ApiModelProperty(value = "工作所在地key")
+    private String workPlaceKey;
+
+    @ApiModelProperty(value = "进入本单位工作时间")
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    private Date stationWorkTime;
+
+    @ApiModelProperty(value = "姓名")
+    private String name;
+
+    @ApiModelProperty(value = "工号")
+    private String jobNumber;
+
+
+    private String departmentName;
+
+    private String projectName;
+
+    @ApiModelProperty(value = "证件类型(0-身份证)")
+    private String idType;
+
+    @ApiModelProperty(value = "证件编号")
+    private String idNumber;
+    /**
+     * 应用
+     */
+    @ApiModelProperty(value = "应用")
+    private String application;
+
+
+    @ApiModelProperty(value = "生产用户类型")
+    private String scUserType;
+
+    @ApiModelProperty(value = "生产用户分类")
+    private String scUserCategory;
+    private Long personId;
+}

amos-boot-system-jxiop/amos-boot-module-jxiop-api/src/main/java/com/yeejoin/amos/boot/module/jxiop/api/entity/PersonAccountFed.java

+package com.yeejoin.amos.boot.module.jxiop.api.entity;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.extension.handlers.FastjsonTypeHandler;
+import com.yeejoin.amos.boot.biz.common.entity.BaseEntity;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.util.List;
+
+/**
+ * 人员基本信息
+ *
+ * @author system_generator
+ * @date 2023-04-20
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@Accessors(chain = true)
+@TableName(value = "person_account" ,autoResultMap = true)
+public class PersonAccountFed extends BaseEntity {
+
+    private static final long serialVersionUID = 1L;
+
+
+    /**
+     * 平台user_id
+     */
+	@TableField("puser_id")
+    private String puserId;
+
+    /**
+     * 平台账号名称
+     */
+	@TableField("account_name")
+    private String accountName;
+
+    /**
+     * 用户角色
+     */
+	@TableField(value="roles", typeHandler = FastjsonTypeHandler.class)
+    private List<String> roles;
+
+
+    /**
+     * 人员信息id
+     */
+    @TableField("person_id")
+    private Long personId;
+
+
+    /**
+     * 应用
+     */
+    @TableField(value="application", typeHandler = FastjsonTypeHandler.class)
+    private List<String> application;
+
+    @TableField("password")
+    private String  password;
+    @TableField("secondary_password")
+    private String  secondaryPassword;
+    /**
+     * 业务密码
+     */
+    @TableField("business_password")
+    private String  businessPassword;
+
+
+    /**
+     * 生产用户类型
+     */
+	@TableField("sc_user_type")
+    private String scUserType;
+
+    /**
+     * 生产用户分类
+     */
+	@TableField("sc_user_category")
+    private String scUserCategory;
+
+    /**
+     *所属场站
+     */
+    @TableField("project_id")
+    private Long projectId;
+
+    @TableField("project_name")
+    private String projectName;
+
+    /**
+     * 部门班组
+     */
+    @TableField("department_id")
+    private Long departmentId;
+    @TableField("project_department_name")
+    private String projectDepartmentName;
+
+    /**
+     * 姓名
+     */
+    @TableField("name")
+    private String name;
+    /**
+     * 工号
+     */
+    @TableField("job_number")
+    private String jobNumber;
+
+    /**
+     * 证件类型(0-身份证)
+     */
+    @TableField("ID_type")
+    private String idType;
+
+    /**
+     * 证件编号
+     */
+    @TableField("ID_number")
+    private String idNumber;
+    @TableField(exist = false)
+    private String phoneNum;
+
+}

amos-boot-system-jxiop/amos-boot-module-jxiop-api/src/main/java/com/yeejoin/amos/boot/module/jxiop/api/mapper/PersonAccountFedMapper.java

+package com.yeejoin.amos.boot.module.jxiop.api.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.yeejoin.amos.boot.module.jxiop.api.entity.PersonAccount;
+import com.yeejoin.amos.boot.module.jxiop.api.entity.PersonAccountFed;
+
+/**
+ * 人员基本信息 Mapper 接口
+ *
+ * @author system_generator
+ * @date 2023-04-20
+ */
+public interface PersonAccountFedMapper extends BaseMapper<PersonAccountFed> {
+
+}

amos-boot-system-jxiop/amos-boot-module-jxiop-api/src/main/java/com/yeejoin/amos/boot/module/jxiop/api/service/IPersonAccountFedService.java

+package com.yeejoin.amos.boot.module.jxiop.api.service;
+
+
+/**
+ * 人员基本信息接口类
+ *
+ * @author system_generator
+ * @date 2023-04-20
+ */
+public interface IPersonAccountFedService {
+
+}

amos-boot-system-jxiop/amos-boot-module-jxiop-api/src/main/resources/mapper/PersonAccountFedMapper.xml

+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.yeejoin.amos.boot.module.jxiop.api.mapper.PersonAccountFedMapper">
+
+</mapper>

amos-boot-system-jxiop/amos-boot-module-jxiop-biz/src/main/java/com/yeejoin/amos/boot/module/jxiop/biz/service/impl/PersonAccountFedServiceImpl.java

+package com.yeejoin.amos.boot.module.jxiop.biz.service.impl;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.yeejoin.amos.boot.module.jxiop.api.dto.PersonAccountDto;
+import com.yeejoin.amos.boot.module.jxiop.api.dto.PersonAccountFedDto;
+import com.yeejoin.amos.boot.module.jxiop.api.entity.PersonAccount;
+import com.yeejoin.amos.boot.module.jxiop.api.entity.PersonAccountFed;
+import com.yeejoin.amos.boot.module.jxiop.api.mapper.PersonAccountFedMapper;
+import com.yeejoin.amos.boot.module.jxiop.api.mapper.PersonAccountMapper;
+import com.yeejoin.amos.boot.module.jxiop.api.service.IPersonAccountService;
+import org.springframework.stereotype.Service;
+import org.typroject.tyboot.core.rdbms.service.BaseService;
+
+import java.util.List;
+
+/**
+ * 人员基本信息服务实现类
+ *
+ * @author system_generator
+ * @date 2023-04-20
+ */
+@Service
+public class PersonAccountFedServiceImpl extends BaseService<PersonAccountFedDto, PersonAccountFed, PersonAccountFedMapper> implements IPersonAccountService {
+
+}
\ No newline at end of file

amos-boot-system-jxiop/amos-boot-module-jxiop-biz/src/main/java/com/yeejoin/amos/boot/module/jxiop/biz/service/impl/PersonBasicServiceImpl.java

@@ -6,6 +6,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.yeejoin.amos.boot.module.jxiop.api.dto.*;
 import com.yeejoin.amos.boot.module.jxiop.api.entity.PersonBasic;
 import com.yeejoin.amos.boot.module.jxiop.api.entity.*;
+import com.yeejoin.amos.boot.module.jxiop.api.mapper.PersonAccountFedMapper;
 import com.yeejoin.amos.boot.module.jxiop.api.mapper.PersonBasicMapper;
 import com.yeejoin.amos.boot.module.jxiop.api.service.IPersonBasicService;
 import com.yeejoin.amos.boot.module.jxiop.biz.activemq.QuerueProduce;
@@ -62,8 +63,8 @@ public class PersonBasicServiceImpl extends BaseService<PersonBasicDto, PersonBa
 
     private String UPDATE="UPDATE";
     private String INSERT="INSERT";
-
-
+    @Autowired
+    PersonAccountFedMapper personAccountFedMapper;
     /**
      * 分页查询
      */
@@ -129,9 +130,9 @@ public class PersonBasicServiceImpl extends BaseService<PersonBasicDto, PersonBa
         }
         usd.setOrgRoleSeqs(map);
         //密码
-        usd.setPassword(DesUtil.encode(personAccount.getPassword(), secretKey));
+        usd.setPassword(personAccount.getPassword());
         //二次密码
-        usd.setRePassword(DesUtil.encode(personAccount.getSecondaryPassword(), secretKey));
+        usd.setRePassword(personAccount.getSecondaryPassword());
         //用户名
         usd.setRealName(personAccount.getName());
         //账号
@@ -165,11 +166,12 @@ public class PersonBasicServiceImpl extends BaseService<PersonBasicDto, PersonBa
         }
         personAccount.setPuserId(agencyUserModel.getUserId());
         personAccount.setProjectName(companyModel.getCompanyName());
-        personAccount.setPassword(DesUtil.encode(personAccount.getPassword(), secretKey));
-        personAccount.setSecondaryPassword(DesUtil.encode(personAccount.getSecondaryPassword(), secretKey));
         this.personBasicMapper.updateById(personBasic);
         this.personAccountService.updateById(personAccount);
 
+        PersonAccountFed personAccountFed = new PersonAccountFed();
+        BeanUtils.copyProperties(personAccount, personAccountFed);
+        personAccountFedMapper.insert(personAccountFed);
 
         Map<String, Object> data=new HashMap<>();
         data.put("SEQUENCE_NBR",agencyUserModel.getSequenceNbr());
@@ -227,9 +229,9 @@ public class PersonBasicServiceImpl extends BaseService<PersonBasicDto, PersonBa
         }
         usd.setOrgRoleSeqs(map);
         //密码
-        usd.setPassword(DesUtil.encode(personAccount.getPassword(), secretKey));
+        usd.setPassword(personAccount.getPassword());
         //二次密码
-        usd.setRePassword(DesUtil.encode(personAccount.getSecondaryPassword(), secretKey));
+        usd.setRePassword(personAccount.getSecondaryPassword());
         //用户名
         usd.setRealName(personAccount.getName());
         //账号
@@ -264,11 +266,13 @@ public class PersonBasicServiceImpl extends BaseService<PersonBasicDto, PersonBa
             personBasic.setNativePlace(JSON.toJSONString(personUser.getNativePlace()));
         }
         personAccount.setProjectName(companyModel.getCompanyName());
-        personAccount.setPassword(DesUtil.encode(personAccount.getPassword(), secretKey));
-        personAccount.setSecondaryPassword(DesUtil.encode(personAccount.getSecondaryPassword(), secretKey));
         this.personBasicMapper.updateById(personBasic);
         personAccountService.updateById(personAccount);
 
+        PersonAccountFed personAccountFed = new PersonAccountFed();
+        BeanUtils.copyProperties(personAccount, personAccountFed);
+        personAccountFedMapper.updateById(personAccountFed);
+
         Map<String, Object> data=new HashMap<>();
         data.put("SEQUENCE_NBR",agencyUserModel.getSequenceNbr());
         ProduceMsg produceMsg=  new ProduceMsg(data, UPDATE,agencyUserModel.getUserId());
@@ -332,6 +336,11 @@ public class PersonBasicServiceImpl extends BaseService<PersonBasicDto, PersonBa
         int deleteResult = personBasicMapper.deleteList(ids);
         this.deleuser(String.join(",", userid));
         this.deleteLoginInfo(String.join(",", loginId));
+
+        QueryWrapper<PersonAccountFed> wrapper1 = new QueryWrapper();
+        wrapper1.in("person_id",ids);
+        personAccountFedMapper.delete(wrapper1);
+
         return deleteResult;
     }