Skip to content

F
feo-jobs
Commit 09a99f3e authored by 吴泽佳's avatar 吴泽佳
Browse files
Options

优化代码 完成精业展业机构同步 逻辑

parent 89f22e25
Show whitespace changes
Inline Side-by-side
Showing with 826 additions and 454 deletions
src/main/java/com/tanpu/feo/feojob/dto/DepartmentEmployeeDTO.java
View file @ 09a99f3e
package com.tanpu.feo.feojob.dto;
//import com.caixiaoquan.faTools.web.dto.PageHelperDTO;
import com.tanpu.feo.feojob.web.dto.PageHelperDTO;
import com.tanpu.feo.feojob.dto.base.PageHelperDTO;
import lombok.AllArgsConstructor;
import lombok.Data;
import lombok.NoArgsConstructor;
import lombok.Builder;
import java.util.Date;
import io.swagger.annotations.ApiModelProperty;
/**
......
src/main/java/com/tanpu/feo/feojob/dto/JyzyTeamDto.java
View file @ 09a99f3e
package com.tanpu.feo.feojob.dto;
import com.tanpu.feo.feojob.entity.JyzyTeamEntity;
import com.tanpu.feo.feojob.entity.JyzyUserInfoEntity;
import com.tanpu.feo.feojob.entity.jyzy.JyzyTeamEntity;
import com.tanpu.feo.feojob.entity.jyzy.JyzyUserInfoEntity;
import lombok.Builder;
import lombok.Data;
......
src/main/java/com/tanpu/feo/feojob/web/dto/BaseDTO.java → src/main/java/com/tanpu/feo/feojob/dto/base/BaseDTO.java
View file @ 09a99f3e
package com.tanpu.feo.feojob.web.dto;
package com.tanpu.feo.feojob.dto.base;
import io.swagger.annotations.ApiModelProperty;
import lombok.AllArgsConstructor;
......
src/main/java/com/tanpu/feo/feojob/web/dto/PageHelperDTO.java → src/main/java/com/tanpu/feo/feojob/dto/base/PageHelperDTO.java
View file @ 09a99f3e
package com.tanpu.feo.feojob.web.dto;
package com.tanpu.feo.feojob.dto.base;
import com.github.pagehelper.Page;
import io.swagger.annotations.ApiModelProperty;
......
src/main/java/com/tanpu/feo/feojob/entity/DepartmentEmployeeEntity.java
View file @ 09a99f3e
package com.tanpu.feo.feojob.entity;
import java.util.Date;
import com.baomidou.mybatisplus.annotation.TableName;
import com.tanpu.feo.feojob.web.entity.BaseEntity;
import com.baomidou.mybatisplus.annotation.TableName;
import com.tanpu.feo.feojob.entity.base.BaseEntity;
import lombok.AllArgsConstructor;
import lombok.Data;
import lombok.NoArgsConstructor;
......
src/main/java/com/tanpu/feo/feojob/entity/DepartmentEntity.java
View file @ 09a99f3e
package com.tanpu.feo.feojob.entity;
import java.util.Date;
import com.baomidou.mybatisplus.annotation.TableName;
import com.tanpu.feo.feojob.web.entity.BaseEntity;
import com.tanpu.feo.feojob.entity.base.BaseEntity;
import lombok.AllArgsConstructor;
import lombok.Data;
import lombok.NoArgsConstructor;
......
src/main/java/com/tanpu/feo/feojob/entity/EmployeeEntity.java
View file @ 09a99f3e
package com.tanpu.feo.feojob.entity;
import java.util.Date;
import com.baomidou.mybatisplus.annotation.TableName;
import com.tanpu.feo.feojob.web.entity.BaseEntity;
import com.tanpu.feo.feojob.entity.base.BaseEntity;
import lombok.AllArgsConstructor;
import lombok.Data;
import lombok.NoArgsConstructor;
......@@ -45,4 +43,15 @@ public class EmployeeEntity extends BaseEntity {
public EmployeeEntity(String id) {
super.setId(id);
}
public EmployeeEntity(UserInfoEntity userInfoEntity) {
this.setEmployeeId(userInfoEntity.getId());
this.setName(userInfoEntity.getUiUsername());
this.setOrgId(userInfoEntity.getOrgId());
this.setPhone(userInfoEntity.getUiTelphone());
this.setMail(userInfoEntity.getUiEmailMp());
this.setLevel(-1);
this.setStatus("on");
this.setNumber(userInfoEntity.getStaffNo());
}
}
src/main/java/com/tanpu/feo/feojob/entity/EmployeeRoleEntity.java
View file @ 09a99f3e
package com.tanpu.feo.feojob.entity;
import com.baomidou.mybatisplus.annotation.TableName;
import com.tanpu.feo.feojob.web.entity.BaseEntity;
import com.tanpu.feo.feojob.entity.base.BaseEntity;
import lombok.AllArgsConstructor;
import lombok.Data;
import lombok.NoArgsConstructor;
......
src/main/java/com/tanpu/feo/feojob/entity/IfaAssetsEntity.java
View file @ 09a99f3e
package com.tanpu.feo.feojob.entity;
import java.math.BigDecimal;
import java.util.Date;
import com.baomidou.mybatisplus.annotation.TableName;
import com.tanpu.feo.feojob.web.entity.BaseEntity;
import com.tanpu.feo.feojob.entity.base.BaseEntity;
import lombok.AllArgsConstructor;
import lombok.Data;
import lombok.NoArgsConstructor;
......
src/main/java/com/tanpu/feo/feojob/entity/JyzyUserInfoEntity.java deleted 100644 → 0
View file @ 89f22e25
package com.tanpu.feo.feojob.entity;
import java.io.Serializable;
import java.util.Date;
import com.baomidou.mybatisplus.annotation.TableName;
import com.tanpu.feo.feojob.web.entity.BaseEntity;
import lombok.AllArgsConstructor;
import lombok.Data;
import lombok.NoArgsConstructor;
/**
* Entity
*
* @author zejia zj wu 2021年05月26日
* @version 1.0
*/
@Data
@AllArgsConstructor
@NoArgsConstructor
@TableName("user_info")
public class JyzyUserInfoEntity implements Serializable {
private static final long serialVersionUID = 1L;
/** 微信openId */
private String uiOpenid;
/** unionId */
private String uiUnionid;
/** 手机号 */
private String uiTelphone;
/** 昵称 */
private String uiNickname;
/** 头像 */
private String uiHeadimg;
/** 姓名 */
private String uiUsername;
/** 性别 0：男 1：女 */
private String uiSex;
/** 生日 */
private Date uiBirthday;
/** 个人介绍 */
private String uiIntroduction;
/** 名片样式 0：小名片 1：大名片 */
private String uiTypeMp;
/** 名片头像 */
private String uiHeadimgMp;
/** 名片姓名 */
private String uiUsernameMp;
/** 名片电话 */
private String uiTelphoneMp;
/** 手机 */
private String uiMobilephoneMp;
/** 名片公司名称 */
private String uiCompanyMp;
/** 名片公司地址 */
private String uiCompanyAddressMp;
/** 名片职位 */
private String uiPositionMp;
/** 行业 */
private String uiIndustryMp;
/** 名片邮箱 */
private String uiEmailMp;
/** 名片个人介绍 */
private String uiIntroductionMp;
/** 微信个人二维码名片 */
private String uiWechatQrcode;
/** 小程序二维码 */
private String uiWechatXcxQrcode;
/** 类型 0：app注册 1：平台添加 */
private String uiType;
/** 用户身份 0：普通用户 1：种子用户 2：超级用户 */
private String uiShenfen;
/** 认证状态 0:未认证 1:已认证 */
private Integer uiRzstatus;
/** 机构Id */
private String orgId;
/** 团队Id */
private String teamId;
/** 加入团队时间 */
private Date joinTime;
/** 员工工号 */
private String staffNo;
/** 合格投资者认证状态 */
private Integer investorCertifiedStatus;
/** 合格投资者认证时间 */
private Date investorCertifiedTime;
/** 对外合作权限 */
private String toPartner;
/** 等级 */
private String uiGrade;
/** 内容审核 */
private Integer contentReview;
/** 所获荣誉 */
private String uiHonor;
/** 海报扫码关注公众号引流人 */
private String uiHbUserid;
/** */
private String staffRegion;
/** */
private String branchName;
/** */
private String subBranchName;
/** */
private String branchNetworkName;
/** */
private String uiGradeName;
/** */
private String uiTargetGradeName;
/** */
private String uiSource;
/** 创建时间 */
private Date createtime;
/** 创建人 */
private String createby;
/** 修改时间 */
private Date updatetime;
/** 修改人 */
private String updateby;
/** 删除标识 */
private String deletetag;
/** 前端角色 */
private String frontRoles;
/** 名片检查 */
private Integer uiCheckStatus;
/** */
private String city;
/** */
private String province;
/** */
private String country;
/** */
private String uiInviter;
/** */
private String uiInviterPhone;
/** */
private Integer uiAge;
/** */
private String uiRegion;
/** */
private String uiWecaht;
/** */
private Date uiInviterTime;
/** 企业微信名称 */
private String uiWechatQy;
/** 企业微信联系方式的配置id */
private String uiCpConfigId;
/** 联系二维码的URL */
private String uiCpQrCode;
/** 自定义二维码 */
private String customQr;
/** ID */
private String id;
/** id 构造器*/
public JyzyUserInfoEntity(String id) {
setId(id);
}
}
src/main/java/com/tanpu/feo/feojob/entity/OrgEntity.java
View file @ 09a99f3e
......@@ -4,7 +4,7 @@ import java.util.Date;
import com.baomidou.mybatisplus.annotation.TableName;
import com.tanpu.feo.feojob.web.entity.BaseEntity;
import com.tanpu.feo.feojob.entity.base.BaseEntity;
import lombok.AllArgsConstructor;
import lombok.Data;
import lombok.NoArgsConstructor;
......
src/main/java/com/tanpu/feo/feojob/entity/OrgExtEntity.java
View file @ 09a99f3e
package com.tanpu.feo.feojob.entity;
import java.util.Date;
import com.baomidou.mybatisplus.annotation.TableName;
import com.tanpu.feo.feojob.web.entity.BaseEntity;
import com.baomidou.mybatisplus.annotation.TableName;
import com.tanpu.feo.feojob.entity.base.BaseEntity;
import lombok.AllArgsConstructor;
import lombok.Data;
import lombok.NoArgsConstructor;
......
src/main/java/com/tanpu/feo/feojob/entity/RoleEntity.java
View file @ 09a99f3e
package com.tanpu.feo.feojob.entity;
import java.util.Date;
import com.baomidou.mybatisplus.annotation.TableName;
import com.tanpu.feo.feojob.web.entity.BaseEntity;
import com.baomidou.mybatisplus.annotation.TableName;
import com.tanpu.feo.feojob.entity.base.BaseEntity;
import lombok.AllArgsConstructor;
import lombok.Data;
import lombok.NoArgsConstructor;
......
src/main/java/com/tanpu/feo/feojob/entity/UserInfoEntity.java
View file @ 09a99f3e
......@@ -4,13 +4,15 @@ import java.io.Serializable;
import java.util.Date;
import cn.hutool.crypto.digest.MD5;
import com.baomidou.mybatisplus.annotation.TableName;
import com.tanpu.feo.feojob.web.entity.BaseEntity;
import com.tanpu.feo.feojob.entity.jyzy.JyzyUserInfoEntity;
import lombok.AllArgsConstructor;
import lombok.Data;
import lombok.NoArgsConstructor;
import lombok.extern.slf4j.Slf4j;
/**
/**
* Entity
*
* @author zejia zj wu 2021年05月18日
......@@ -187,4 +189,149 @@ public class UserInfoEntity implements Serializable {
public UserInfoEntity(String id) {
this.setId(id);
}
public UserInfoEntity(JyzyUserInfoEntity jyzyUserInfo) {
this.id = jyzyUserInfo.getId();
this.uiOpenid = jyzyUserInfo.getUiOpenid();
this.uiUnionid = jyzyUserInfo.getUiUnionid();
this.uiTelphone = jyzyUserInfo.getUiTelphone();
this.uiNickname = jyzyUserInfo.getUiNickname();
this.uiHeadimg = jyzyUserInfo.getUiHeadimg();
this.uiUsername = jyzyUserInfo.getUiUsername();
this.uiSex = jyzyUserInfo.getUiSex();
this.uiBirthday = jyzyUserInfo.getUiBirthday();
this.uiIntroduction = jyzyUserInfo.getUiIntroduction();
this.uiTypeMp = jyzyUserInfo.getUiTypeMp();
this.uiHeadimgMp = jyzyUserInfo.getUiHeadimgMp();
this.uiUsernameMp = jyzyUserInfo.getUiUsernameMp();
this.uiTelphoneMp = jyzyUserInfo.getUiTelphoneMp();
this.uiMobilephoneMp = jyzyUserInfo.getUiMobilephoneMp();
this.uiCompanyMp = jyzyUserInfo.getUiCompanyMp();
this.uiCompanyAddressMp = jyzyUserInfo.getUiCompanyAddressMp();
this.uiPositionMp = jyzyUserInfo.getUiPositionMp();
this.uiEmailMp = jyzyUserInfo.getUiEmailMp();
this.uiIntroductionMp = jyzyUserInfo.getUiIntroductionMp();
this.uiWechatQrcode = jyzyUserInfo.getUiWechatQrcode();
this.uiType = jyzyUserInfo.getUiType();
this.uiShenfen = jyzyUserInfo.getUiShenfen();
this.uiRzstatus = jyzyUserInfo.getUiRzstatus();
this.teamId = jyzyUserInfo.getTeamId();
this.joinTime = jyzyUserInfo.getJoinTime();
this.staffNo = jyzyUserInfo.getStaffNo();
this.toPartner = jyzyUserInfo.getToPartner();
this.investorCertifiedStatus = jyzyUserInfo.getInvestorCertifiedStatus();
this.investorCertifiedTime = jyzyUserInfo.getInvestorCertifiedTime();
this.uiIndustryMp = jyzyUserInfo.getUiIndustryMp();
this.uiHonor = jyzyUserInfo.getUiHonor();
this.staffRegion = jyzyUserInfo.getStaffRegion();
this.branchName = jyzyUserInfo.getBranchName();
this.subBranchName = jyzyUserInfo.getSubBranchName();
this.uiGradeName = jyzyUserInfo.getUiGradeName();
this.uiHbUserid = jyzyUserInfo.getUiHbUserid();
this.uiTargetGradeName = jyzyUserInfo.getUiTargetGradeName();
this.uiCheckStatus = jyzyUserInfo.getUiCheckStatus();
this.contentReview = jyzyUserInfo.getContentReview();
this.frontRoles = jyzyUserInfo.getFrontRoles();
this.city = jyzyUserInfo.getCity();
this.province = jyzyUserInfo.getProvince();
this.country = jyzyUserInfo.getCountry();
}
public String getMD5() {
StringBuilder stringBuilder = new StringBuilder();
String s = stringBuilder
.append(this.id)
.append(this.uiOpenid)
.append(this.uiUnionid)
.append(this.uiTelphone)
.append(this.uiNickname)
.append(this.uiHeadimg)
.append(this.uiUsername)
.append(this.uiSex)
.append(this.uiBirthday)
.append(this.uiIntroduction)
.append(this.uiTypeMp)
.append(this.uiHeadimgMp)
.append(this.uiUsernameMp)
.append(this.uiTelphoneMp)
.append(this.uiMobilephoneMp)
.append(this.uiCompanyMp)
.append(this.uiCompanyAddressMp)
.append(this.uiPositionMp)
.append(this.uiEmailMp)
.append(this.uiIntroductionMp)
.append(this.uiWechatQrcode)
.append(this.uiType)
.append(this.uiShenfen)
.append(this.uiRzstatus)
.append(this.teamId)
.append(this.joinTime)
.append(this.staffNo)
.append(this.toPartner)
.append(this.investorCertifiedStatus)
.append(this.investorCertifiedTime)
.append(this.uiIndustryMp)
.append(this.uiHonor)
.append(this.staffRegion)
.append(this.branchName)
.append(this.subBranchName)
.append(this.uiGradeName)
.append(this.uiHbUserid)
.append(this.uiTargetGradeName)
.append(this.uiCheckStatus)
.append(this.contentReview)
.append(this.frontRoles)
.append(this.city)
.append(this.province)
.append(this.country).toString();
return MD5.create().digestHex(s);
}
public void update(JyzyUserInfoEntity jyzyUserInfo) {
this.id = jyzyUserInfo.getId();
this.uiOpenid = jyzyUserInfo.getUiOpenid();
this.uiUnionid = jyzyUserInfo.getUiUnionid();
this.uiTelphone = jyzyUserInfo.getUiTelphone();
this.uiNickname = jyzyUserInfo.getUiNickname();
this.uiHeadimg = jyzyUserInfo.getUiHeadimg();
this.uiUsername = jyzyUserInfo.getUiUsername();
this.uiSex = jyzyUserInfo.getUiSex();
this.uiBirthday = jyzyUserInfo.getUiBirthday();
this.uiIntroduction = jyzyUserInfo.getUiIntroduction();
this.uiTypeMp = jyzyUserInfo.getUiTypeMp();
this.uiHeadimgMp = jyzyUserInfo.getUiHeadimgMp();
this.uiUsernameMp = jyzyUserInfo.getUiUsernameMp();
this.uiTelphoneMp = jyzyUserInfo.getUiTelphoneMp();
this.uiMobilephoneMp = jyzyUserInfo.getUiMobilephoneMp();
this.uiCompanyMp = jyzyUserInfo.getUiCompanyMp();
this.uiCompanyAddressMp = jyzyUserInfo.getUiCompanyAddressMp();
this.uiPositionMp = jyzyUserInfo.getUiPositionMp();
this.uiEmailMp = jyzyUserInfo.getUiEmailMp();
this.uiIntroductionMp = jyzyUserInfo.getUiIntroductionMp();
this.uiWechatQrcode = jyzyUserInfo.getUiWechatQrcode();
this.uiType = jyzyUserInfo.getUiType();
this.uiShenfen = jyzyUserInfo.getUiShenfen();
this.uiRzstatus = jyzyUserInfo.getUiRzstatus();
this.teamId = jyzyUserInfo.getTeamId();
this.joinTime = jyzyUserInfo.getJoinTime();
this.staffNo = jyzyUserInfo.getStaffNo();
this.toPartner = jyzyUserInfo.getToPartner();
this.investorCertifiedStatus = jyzyUserInfo.getInvestorCertifiedStatus();
this.investorCertifiedTime = jyzyUserInfo.getInvestorCertifiedTime();
this.uiIndustryMp = jyzyUserInfo.getUiIndustryMp();
this.uiHonor = jyzyUserInfo.getUiHonor();
this.staffRegion = jyzyUserInfo.getStaffRegion();
this.branchName = jyzyUserInfo.getBranchName();
this.subBranchName = jyzyUserInfo.getSubBranchName();
this.uiGradeName = jyzyUserInfo.getUiGradeName();
this.uiHbUserid = jyzyUserInfo.getUiHbUserid();
this.uiTargetGradeName = jyzyUserInfo.getUiTargetGradeName();
this.uiCheckStatus = jyzyUserInfo.getUiCheckStatus();
this.contentReview = jyzyUserInfo.getContentReview();
this.frontRoles = jyzyUserInfo.getFrontRoles();
this.city = jyzyUserInfo.getCity();
this.province = jyzyUserInfo.getProvince();
this.country = jyzyUserInfo.getCountry();
}
}
src/main/java/com/tanpu/feo/feojob/web/entity/BaseEntity.java → src/main/java/com/tanpu/feo/feojob/entity/base/BaseEntity.java
View file @ 09a99f3e
package com.tanpu.feo.feojob.web.entity;
package com.tanpu.feo.feojob.entity.base;
import lombok.Data;
......
src/main/java/com/tanpu/feo/feojob/entity/JyzyOrgEntity.java → src/main/java/com/tanpu/feo/feojob/entity/jyzy/JyzyOrgEntity.java
View file @ 09a99f3e
package com.tanpu.feo.feojob.entity;
package com.tanpu.feo.feojob.entity.jyzy;
import java.io.Serializable;
import java.util.Date;
import com.baomidou.mybatisplus.annotation.TableName;
import com.tanpu.feo.feojob.web.entity.BaseEntity;
import lombok.AllArgsConstructor;
import lombok.Data;
import lombok.NoArgsConstructor;
import org.springframework.data.relational.core.mapping.Table;
/**
* Entity
......
src/main/java/com/tanpu/feo/feojob/entity/JyzyTeamEntity.java → src/main/java/com/tanpu/feo/feojob/entity/jyzy/JyzyTeamEntity.java
View file @ 09a99f3e
package com.tanpu.feo.feojob.entity;
package com.tanpu.feo.feojob.entity.jyzy;
import java.io.Serializable;
import java.util.Date;
import com.baomidou.mybatisplus.annotation.TableName;
import com.tanpu.feo.feojob.web.entity.BaseEntity;
import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Data;
import lombok.NoArgsConstructor;
......
src/main/java/com/tanpu/feo/feojob/entity/jyzy/JyzyUserInfoEntity.java 0 → 100644
View file @ 09a99f3e
package com.tanpu.feo.feojob.entity.jyzy;
import cn.hutool.crypto.digest.MD5;
import com.baomidou.mybatisplus.annotation.TableName;
import com.baomidou.mybatisplus.annotation.TableField;
import java.io.Serializable;
import java.util.Date;
import com.oracle.tools.packager.Log;
import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.extern.slf4j.Slf4j;
/**
* <p>
*
* </p>
*
* @author zejia zj wu
* @since 2021-05-28
*/
@Data
@EqualsAndHashCode(callSuper = false)
@TableName("user_info")
public class JyzyUserInfoEntity implements Serializable {
private static final long serialVersionUID = 1L;
/**
* 唯一主键
*/
private String id;
/**
* 微信openId
*/
private String uiOpenid;
/**
* 微信unionId
*/
@TableField("ui_unionId")
private String uiUnionid;
/**
* 手机号
*/
private String uiTelphone;
/**
* 昵称
*/
private String uiNickname;
/**
* 头像
*/
private String uiHeadimg;
/**
* 姓名
*/
private String uiUsername;
/**
* 性别 0：男 1：女
*/
private String uiSex;
/**
* 生日
*/
private Date uiBirthday;
/**
* 个人介绍
*/
private String uiIntroduction;
/**
* 名片样式 0：小名片 1：大名片
*/
private String uiTypeMp;
/**
* 名片头像
*/
private String uiHeadimgMp;
/**
* 名片姓名
*/
private String uiUsernameMp;
/**
* 名片电话
*/
private String uiTelphoneMp;
/**
* 手机
*/
private String uiMobilephoneMp;
/**
* 名片公司名称
*/
private String uiCompanyMp;
/**
* 名片公司地址
*/
private String uiCompanyAddressMp;
/**
* 名片职位
*/
private String uiPositionMp;
/**
* 名片邮箱
*/
private String uiEmailMp;
/**
* 名片个人介绍
*/
private String uiIntroductionMp;
/**
* 微信个人二维码名片
*/
private String uiWechatQrcode;
/**
* 用户名片小程序二维码
*/
private String uiWechatXcxQrcode;
/**
* 类型 0：app注册 1：平台添加
*/
private String uiType;
/**
* 用户身份 0:普通用户 1：团队长 2：游客
*/
private String uiShenfen;
/**
* 认证状态 0:未认证 1:已认证
*/
private Integer uiRzstatus;
/**
* 机构Id
*/
private String orgId;
/**
* 团队Id
*/
private String teamId;
/**
* 加入团队时间
*/
private Date joinTime;
/**
* 员工工号
*/
private String staffNo;
/**
* 对外合作权限
*/
private String toPartner;
/**
* 员工等级
*/
private String uiGrade;
/**
* 合格投资者认证状态
*/
private Integer investorCertifiedStatus;
/**
* 合格投资者认证时间
*/
private Date investorCertifiedTime;
/**
* 创建时间
*/
private Date createtime;
/**
* 创建人
*/
private String createby;
/**
* 修改时间
*/
private Date updatetime;
/**
* 修改人
*/
private String updateby;
/**
* 删除标识
*/
private String deletetag;
/**
* 行业
*/
private String uiIndustryMp;
/**
* 所获荣誉
*/
private String uiHonor;
/**
* 区域
*/
private String staffRegion;
/**
* 分行
*/
private String branchName;
/**
* 支行
*/
private String subBranchName;
/**
* 网点
*/
private String branchNetworkName;
/**
* 等级名称
*/
private String uiGradeName;
/**
* 海报扫码关注公众号引流人
*/
private String uiHbUserid;
/**
* 等级分组
*/
private String uiTargetGradeName;
/**
* 名片检查0: 未检查 1:已检查
*/
private Integer uiCheckStatus;
/**
* 内容审核
*/
private Integer contentReview;
/**
* 前端角色
*/
private String frontRoles;
/**
* 城市
*/
private String city;
/**
* 省份
*/
private String province;
/**
* 国家
*/
private String country;
/**
* 微信号
*/
private String uiWechatQy;
/**
* 企业微信联系方式的配置id
*/
private String uiCpConfigId;
/**
* 联系二维码的URL
*/
private String uiCpQrCode;
/**
* 开户二维码
*/
private String customQr;
public String getMD5() {
StringBuilder stringBuilder = new StringBuilder();
String s = stringBuilder
.append(this.id)
.append(this.uiOpenid)
.append(this.uiUnionid)
.append(this.uiTelphone)
.append(this.uiNickname)
.append(this.uiHeadimg)
.append(this.uiUsername)
.append(this.uiSex)
.append(this.uiBirthday)
.append(this.uiIntroduction)
.append(this.uiTypeMp)
.append(this.uiHeadimgMp)
.append(this.uiUsernameMp)
.append(this.uiTelphoneMp)
.append(this.uiMobilephoneMp)
.append(this.uiCompanyMp)
.append(this.uiCompanyAddressMp)
.append(this.uiPositionMp)
.append(this.uiEmailMp)
.append(this.uiIntroductionMp)
.append(this.uiWechatQrcode)
.append(this.uiType)
.append(this.uiShenfen)
.append(this.uiRzstatus)
.append(this.teamId)
.append(this.joinTime)
.append(this.staffNo)
.append(this.toPartner)
.append(this.investorCertifiedStatus)
.append(this.investorCertifiedTime)
.append(this.uiIndustryMp)
.append(this.uiHonor)
.append(this.staffRegion)
.append(this.branchName)
.append(this.subBranchName)
.append(this.uiGradeName)
.append(this.uiHbUserid)
.append(this.uiTargetGradeName)
.append(this.uiCheckStatus)
.append(this.contentReview)
.append(this.frontRoles)
.append(this.city)
.append(this.province)
.append(this.country).toString();
return MD5.create().digestHex(s);
}
}
src/main/java/com/tanpu/feo/feojob/mapper/DepartmentEmployeeMapper.java
View file @ 09a99f3e
......@@ -13,7 +13,5 @@ import org.springframework.stereotype.Repository;
*/
@Repository
public interface DepartmentEmployeeMapper extends BaseMapper<DepartmentEmployeeEntity> {
/*************************************************************
* Add code here if method of BaseService did not satify you
*************************************************************/
}
src/main/java/com/tanpu/feo/feojob/mapper/DepartmentMapper.java
View file @ 09a99f3e
......@@ -14,7 +14,4 @@ import org.springframework.stereotype.Repository;
*/
@Repository
public interface DepartmentMapper extends BaseMapper<DepartmentEntity> {
/*************************************************************
* Add code here if method of BaseService did not satify you
*************************************************************/
}
src/main/java/com/tanpu/feo/feojob/mapper/EmployeeMapper.java
View file @ 09a99f3e
......@@ -14,7 +14,4 @@ import org.springframework.stereotype.Repository;
*/
@Repository
public interface EmployeeMapper extends BaseMapper<EmployeeEntity> {
/*************************************************************
* Add code here if method of BaseService did not satify you
*************************************************************/
}
src/main/java/com/tanpu/feo/feojob/mapper/EmployeeRoleMapper.java
View file @ 09a99f3e
......@@ -14,7 +14,4 @@ import org.springframework.stereotype.Repository;
*/
@Repository
public interface EmployeeRoleMapper extends BaseMapper<EmployeeRoleEntity> {
/*************************************************************
* Add code here if method of BaseService did not satify you
*************************************************************/
}
src/main/java/com/tanpu/feo/feojob/mapper/IfaAssetsMapper.java
View file @ 09a99f3e
......@@ -14,7 +14,4 @@ import org.springframework.stereotype.Repository;
*/
@Repository
public interface IfaAssetsMapper extends BaseMapper<IfaAssetsEntity> {
/*************************************************************
* Add code here if method of BaseService did not satify you
*************************************************************/
}
src/main/java/com/tanpu/feo/feojob/mapper/OrgExtMapper.java
View file @ 09a99f3e
......@@ -14,7 +14,4 @@ import org.springframework.stereotype.Repository;
*/
@Repository
public interface OrgExtMapper extends BaseMapper<OrgExtEntity> {
/*************************************************************
* Add code here if method of BaseService did not satify you
*************************************************************/
}
src/main/java/com/tanpu/feo/feojob/mapper/OrgMapper.java
View file @ 09a99f3e
......@@ -14,7 +14,4 @@ import org.springframework.stereotype.Repository;
*/
@Repository
public interface OrgMapper extends BaseMapper<OrgEntity> {
/*************************************************************
* Add code here if method of BaseService did not satify you
*************************************************************/
}
src/main/java/com/tanpu/feo/feojob/mapper/RoleMapper.java
View file @ 09a99f3e
......@@ -14,7 +14,4 @@ import org.springframework.stereotype.Repository;
*/
@Repository
public interface RoleMapper extends BaseMapper<RoleEntity> {
/*************************************************************
* Add code here if method of BaseService did not satify you
*************************************************************/
}
src/main/java/com/tanpu/feo/feojob/mapper/UserInfoMapper.java
View file @ 09a99f3e
......@@ -14,7 +14,4 @@ import org.springframework.stereotype.Repository;
*/
@Repository
public interface UserInfoMapper extends BaseMapper<UserInfoEntity> {
/*************************************************************
* Add code here if method of BaseService did not satify you
*************************************************************/
}
src/main/java/com/tanpu/feo/feojob/mapper/jyzy/JyzyOrgMapper.java
View file @ 09a99f3e
package com.tanpu.feo.feojob.mapper.jyzy;
import com.baomidou.mybatisplus.annotation.InterceptorIgnore;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.tanpu.feo.feojob.entity.JyzyOrgEntity;
import com.tanpu.feo.feojob.entity.jyzy.JyzyOrgEntity;
import org.springframework.stereotype.Repository;
......@@ -15,7 +14,4 @@ import org.springframework.stereotype.Repository;
*/
@Repository
public interface JyzyOrgMapper extends BaseMapper<JyzyOrgEntity> {
/*************************************************************
* Add code here if method of BaseService did not satify you
*************************************************************/
}
src/main/java/com/tanpu/feo/feojob/mapper/jyzy/JyzyTeamMapper.java
View file @ 09a99f3e
......@@ -2,7 +2,7 @@ package com.tanpu.feo.feojob.mapper.jyzy;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.tanpu.feo.feojob.entity.JyzyTeamEntity;
import com.tanpu.feo.feojob.entity.jyzy.JyzyTeamEntity;
import org.springframework.stereotype.Repository;
......@@ -14,7 +14,4 @@ import org.springframework.stereotype.Repository;
*/
@Repository
public interface JyzyTeamMapper extends BaseMapper<JyzyTeamEntity> {
/*************************************************************
* Add code here if method of BaseService did not satify you
*************************************************************/
}
src/main/java/com/tanpu/feo/feojob/mapper/jyzy/JyzyUserInfoMapper.java
View file @ 09a99f3e
......@@ -2,7 +2,7 @@ package com.tanpu.feo.feojob.mapper.jyzy;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.tanpu.feo.feojob.entity.JyzyUserInfoEntity;
import com.tanpu.feo.feojob.entity.jyzy.JyzyUserInfoEntity;
import org.springframework.stereotype.Repository;
......@@ -14,7 +14,4 @@ import org.springframework.stereotype.Repository;
*/
@Repository
public interface JyzyUserInfoMapper extends BaseMapper<JyzyUserInfoEntity> {
/*************************************************************
* Add code here if method of BaseService did not satify you
*************************************************************/
}
src/main/java/com/tanpu/feo/feojob/service/DepartmentEmployeeService.java
View file @ 09a99f3e
......@@ -5,6 +5,7 @@ import java.util.List;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.tanpu.feo.feojob.dto.DepartmentEmployeeDTO;
import com.tanpu.feo.feojob.entity.DepartmentEmployeeEntity;
import com.tanpu.feo.feojob.mapper.DepartmentEmployeeMapper;
......@@ -23,7 +24,7 @@ import cn.hutool.core.bean.BeanUtil;
*/
@Service("departmentEmployeeService")
@Slf4j
public class DepartmentEmployeeService {
public class DepartmentEmployeeService extends ServiceImpl<DepartmentEmployeeMapper, DepartmentEmployeeEntity> {
@Autowired
private DepartmentEmployeeMapper departmentEmployeeMapper;
......
src/main/java/com/tanpu/feo/feojob/service/DepartmentService.java
View file @ 09a99f3e
package com.tanpu.feo.feojob.service;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.tanpu.feo.feojob.entity.DepartmentEntity;
import com.tanpu.feo.feojob.mapper.DepartmentMapper;
import lombok.extern.slf4j.Slf4j;
......@@ -17,7 +18,7 @@ import java.util.List;
*/
@Service("departmentService")
@Slf4j
public class DepartmentService {
public class DepartmentService extends ServiceImpl<DepartmentMapper, DepartmentEntity> {
@Autowired
private DepartmentMapper departmentMapper;
......
src/main/java/com/tanpu/feo/feojob/service/EmployeeRoleService.java
View file @ 09a99f3e
......@@ -4,6 +4,7 @@ import java.util.List;
import java.util.stream.Collectors;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
......@@ -19,7 +20,7 @@ import lombok.extern.slf4j.Slf4j;
*/
@Service("employeeRoleService")
@Slf4j
public class EmployeeRoleService {
public class EmployeeRoleService extends ServiceImpl<EmployeeRoleMapper, EmployeeRoleEntity> {
@Autowired
private EmployeeRoleMapper employeeRoleMapper;
......
src/main/java/com/tanpu/feo/feojob/service/EmployeeService.java
View file @ 09a99f3e
package com.tanpu.feo.feojob.service;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.tanpu.feo.feojob.entity.EmployeeEntity;
import com.tanpu.feo.feojob.mapper.EmployeeMapper;
import lombok.extern.slf4j.Slf4j;
......@@ -17,7 +18,7 @@ import java.util.List;
*/
@Service("employeeService")
@Slf4j
public class EmployeeService {
public class EmployeeService extends ServiceImpl<EmployeeMapper, EmployeeEntity> {
@Autowired
private EmployeeMapper employeeMapper;
......
src/main/java/com/tanpu/feo/feojob/service/OrgExtService.java
View file @ 09a99f3e
package com.tanpu.feo.feojob.service;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.tanpu.feo.feojob.entity.OrgExtEntity;
import com.tanpu.feo.feojob.mapper.OrgExtMapper;
import lombok.extern.slf4j.Slf4j;
......@@ -19,7 +20,7 @@ import java.util.List;
*/
@Service("orgExtService")
@Slf4j
public class OrgExtService {
public class OrgExtService extends ServiceImpl<OrgExtMapper, OrgExtEntity> {
@Autowired
private OrgExtMapper orgExtMapper;
......
src/main/java/com/tanpu/feo/feojob/service/OrgService.java
View file @ 09a99f3e
package com.tanpu.feo.feojob.service;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.tanpu.feo.feojob.entity.OrgEntity;
import com.tanpu.feo.feojob.mapper.OrgMapper;
import lombok.extern.slf4j.Slf4j;
......@@ -16,7 +17,7 @@ import org.springframework.stereotype.Service;
*/
@Service("orgService")
@Slf4j
public class OrgService {
public class OrgService extends ServiceImpl<OrgMapper, OrgEntity> {
@Autowired
private OrgMapper orgMapper;
......
src/main/java/com/tanpu/feo/feojob/service/OrgSyncByJyzyService.java
View file @ 09a99f3e
package com.tanpu.feo.feojob.service;
import cn.hutool.core.date.DateTime;
import cn.hutool.core.util.ObjectUtil;
import cn.hutool.core.util.StrUtil;
import cn.hutool.json.JSONUtil;
......@@ -9,15 +10,18 @@ import com.tanpu.feo.feojob.dto.OrgInfoDto;
import com.tanpu.feo.feojob.dto.OrgSyncDto;
import com.tanpu.feo.feojob.dto.WorkDataDto;
import com.tanpu.feo.feojob.entity.*;
import com.tanpu.feo.feojob.entity.jyzy.JyzyOrgEntity;
import com.tanpu.feo.feojob.entity.jyzy.JyzyTeamEntity;
import com.tanpu.feo.feojob.entity.jyzy.JyzyUserInfoEntity;
import com.tanpu.feo.feojob.service.jyzy.JyzyOrgService;
import com.tanpu.feo.feojob.service.jyzy.JyzyTeamService;
import com.tanpu.feo.feojob.service.jyzy.JyzyUserInfoService;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.StringUtils;
import org.springframework.stereotype.Service;
import javax.annotation.Resource;
import java.util.*;
import java.util.function.Function;
import java.util.stream.Collectors;
@Service
......@@ -62,9 +66,10 @@ public class OrgSyncByJyzyService {
WorkDataDto<EmployeeRoleEntity> workEmployeeRole = new WorkDataDto<>();
dataCompare(workUserInfo, workEmployee, workDepartment, workDepartmentEmployee, workEmployeeRole, jyzyTeamDtoList, orgInfoDto);
//4 数据操作
// orgSyncService.updateData(orgInfoDto.getOrgId(), workUserInfo, workEmployee, workDepartment, workDepartmentEmployee, workEmployeeRole);
orgSyncService.updateData(orgInfoDto.getOrgId(), workUserInfo, workEmployee, workDepartment, workDepartmentEmployee, workEmployeeRole);
} catch (Exception e) {
log.error("=========从 精业展业 同步 机构信息失败，原因--->{}", e.getMessage());
return ResultTemplate.fail(e.getMessage());
}
return ResultTemplate.success("同步成功");
......@@ -74,6 +79,9 @@ public class OrgSyncByJyzyService {
WorkDataDto<DepartmentEmployeeEntity> workDepartmentEmployee, WorkDataDto<EmployeeRoleEntity> workEmployeeRole,
List<JyzyTeamDto> jyzyTeamDtoList, OrgInfoDto orgInfoDto) {
log.info("======开始数据对比======");
try {
HashMap<String, JyzyUserInfoEntity> jyzyUserInfoHashMap = new HashMap<>();
jyzyTeamDtoList.forEach(jyzyTeamDto -> jyzyTeamDto.getJyzyUserInfos().forEach(jyzyUserInfo -> jyzyUserInfoHashMap.put(jyzyUserInfo.getId(), jyzyUserInfo)));
......@@ -92,8 +100,11 @@ public class OrgSyncByJyzyService {
return; // 跳过当前循环
}
// 更新
if (!jyzyUserInfo.getMD5().equals(userInfo.getMD5())) {
userInfo.updata(jyzyUserInfo);
if (!jyzyUserInfo.getMD5().equals(userInfo.getMD5()) || StrUtil.isBlank(userInfo.getUiWechatXcxQrcode())) {
userInfo.update(jyzyUserInfo);
if (StrUtil.isBlank(userInfo.getUiWechatXcxQrcode())) { //重新生成 小程序 球形码
userInfo.setUiWechatXcxQrcode(orgSyncService.createWechatXcxQrcode(userInfo.getId(), userInfo.getUiHeadimg()));
}
updateUserInfoList.add(userInfo);
}
jyzyUserInfoHashMap.remove(userInfo.getId());
......@@ -101,6 +112,11 @@ public class OrgSyncByJyzyService {
jyzyUserInfoHashMap.forEach((key, jyzyUserInfo) -> {
// 新增
UserInfoEntity userInfo = new UserInfoEntity(jyzyUserInfo);
userInfo.setOrgId(orgInfoDto.getOrgId());
userInfo.setLevel(2);
userInfo.setUiGrade("0");
userInfo.setUiRegisterTime(DateTime.now());
userInfo.setUiWechatXcxQrcode(orgSyncService.createWechatXcxQrcode(userInfo.getId(), userInfo.getUiHeadimg()));
insertUserInfoList.add(userInfo);
});
......@@ -121,12 +137,13 @@ public class OrgSyncByJyzyService {
// employee
EmployeeEntity employeeEntity = new EmployeeEntity(userInfoEntity);
employeeEntity.setOrgId(orgInfoDto.getOrgId());
employeeEntity.setBoundWechat(StrUtil.isNotBlank(userInfoEntity.getUiOpenid()) ? orgInfoDto.getOrgId() + "_" + userInfoEntity.getId() : null);
insertEmployeeList.add(employeeEntity);
// employee_role
EmployeeRoleEntity employeeRoleEntity = new EmployeeRoleEntity();
employeeRoleEntity.setEmployeeId(userInfoEntity.getId());
employeeRoleEntity.setRoleId(infoNoAdmin.get("1".equals(userInfoEntity.getUiShenfen()) ? "d" : "s"));
employeeRoleEntity.setRoleId(infoNoAdmin.get("1".equals(userInfoEntity.getUiShenfen()) ? "t" : "i"));
employeeRoleEntity.setOrgId(orgInfoDto.getOrgId());
insertEmployeeRoleList.add(employeeRoleEntity);
......@@ -146,19 +163,27 @@ public class OrgSyncByJyzyService {
Optional<EmployeeEntity> employeeEntityOptional = orgInfoDto.getEmployeeList().stream().filter(employee -> employee.getEmployeeId().equals(userInfoEntity.getId())).findFirst();
if (employeeEntityOptional.isPresent()) {
EmployeeEntity employeeEntity = employeeEntityOptional.get();
if (StrUtil.compare(employeeEntity.getName(), userInfoEntity.getUiUsername(), true) != 0
|| StrUtil.compare(employeeEntity.getPhone(), userInfoEntity.getUiTelphone(), true) != 0
|| StrUtil.compare(employeeEntity.getMail(), userInfoEntity.getUiEmailMp(), true) != 0
|| StrUtil.compare(employeeEntity.getNumber(), userInfoEntity.getStaffNo(), true) != 0) {
employeeEntity.setName(userInfoEntity.getUiUsername());
employeeEntity.setPhone(userInfoEntity.getUiTelphone());
employeeEntity.setMail(userInfoEntity.getUiEmailMp());
employeeEntity.setNumber(userInfoEntity.getStaffNo());
employeeEntity.setBoundWechat(StrUtil.isNotBlank(userInfoEntity.getUiOpenid()) ? orgInfoDto.getOrgId() + "_" + userInfoEntity.getUiUsername() : null);
updateEmployeeList.add(employeeEntity);
}
}
// employee_role
Optional<EmployeeRoleEntity> employeeRoleEntityOptional = orgInfoDto.getEmployeeRoleList().stream().filter(employeeRole -> employeeRole.getEmployeeId().equals(userInfoEntity.getId())).findFirst();
if (employeeRoleEntityOptional.isPresent()) {
EmployeeRoleEntity employeeRoleEntity = employeeRoleEntityOptional.get();
String role = "1".equals(userInfoEntity.getUiShenfen()) ? "d" : "s";
if (!infoNoAdmin.get(role).equals(employeeRoleEntity.getRoleId())) {
String role = "1".equals(userInfoEntity.getUiShenfen()) ? "t" : "i";
if (StrUtil.compare(infoNoAdmin.get(role), employeeRoleEntity.getRoleId(), true) != 0) {
employeeRoleEntity.setRoleId(infoNoAdmin.get(role));
updateEmployeeRoleList.add(employeeRoleEntity);
}
......@@ -169,7 +194,7 @@ public class OrgSyncByJyzyService {
Optional<DepartmentEmployeeEntity> departmentEmployeeEntityOptional = orgInfoDto.getDepartmentEmployeeList().stream().filter(departmentEmployee -> departmentEmployee.getEmployeeId().equals(userInfoEntity.getId())).findFirst();
if (departmentEmployeeEntityOptional.isPresent()) {
DepartmentEmployeeEntity departmentEmployeeEntity = departmentEmployeeEntityOptional.get();
if (!userInfoEntity.getTeamId().equals(departmentEmployeeEntity.getDepartmentId())) {
if (StrUtil.compare(userInfoEntity.getTeamId(), departmentEmployeeEntity.getDepartmentId(), true) != 0) {
departmentEmployeeEntity.setDepartmentId(userInfoEntity.getTeamId());
updateDepartmentEmployeeList.add(departmentEmployeeEntity);
}
......@@ -233,11 +258,17 @@ public class OrgSyncByJyzyService {
return;
}
// 更新
if (!departmentEntity.getDepartmentName().equals(jyzyTeamEntity.getTeamName()) || !departmentEntity.getParentDepartId().equals(jyzyTeamEntity.getPId())
|| !departmentEntity.getMembers().equals(jyzyTeamEntity.getTeamPersonNum())) {
int memberNums = 0;
Optional<JyzyTeamDto> jyzyTeamDtoOptional = jyzyTeamDtoList.stream().filter(jyzyTeamDto -> jyzyTeamDto.getJyzyTeam().getId().equals(departmentEntity.getDepartmentId())).findFirst();
if (jyzyTeamDtoOptional.isPresent()) {
memberNums = jyzyTeamDtoOptional.get().getJyzyUserInfos().size();
}
if (StrUtil.compare(departmentEntity.getDepartmentName(), jyzyTeamEntity.getTeamName(), true) != 0
|| StrUtil.compare(departmentEntity.getParentDepartId(), jyzyTeamEntity.getPId(), true) != 0
|| !departmentEntity.getMembers().equals(memberNums)) {
departmentEntity.setDepartmentName(jyzyTeamEntity.getTeamName());
departmentEntity.setParentDepartId(jyzyTeamEntity.getPId());
departmentEntity.setMembers(jyzyTeamEntity.getTeamPersonNum());
departmentEntity.setMembers(memberNums);
updateDepartmentList.add(departmentEntity);
}
jyzyTeamEntityMap.remove(departmentEntity.getDepartmentId());
......@@ -259,7 +290,9 @@ public class OrgSyncByJyzyService {
workDepartment.setInsertList(insertDepartmentList);
workDepartment.setUpdateList(updateDepartmentList);
workDepartment.setDeleteList(deleteDepartmentList);
} catch (Exception e) {
log.error("====== 数据对比失败，失败原因-->", e);
}
log.info("======结束数据对比======");
}
......@@ -313,15 +346,15 @@ public class OrgSyncByJyzyService {
if (ObjectUtil.isEmpty(jyzyOrg) || StrUtil.isBlank(jyzyOrg.getId())) {
throw new Exception("jyzyOrgCode 不存在");
}
// 2 根据 orgId 获取 团队信息
// 2 根据 orgId 获取 团队信息 (不包含虚拟组织)
List<JyzyTeamEntity> jyzyTeamList = jyzyTeamService.getTeamListByOrgId(jyzyOrg.getId());
// 3 根据 orgId 获取 用户信息
// 3 根据 orgId 获取 用户信息 (包含虚拟组织下面的用户)
List<JyzyUserInfoEntity> userInfoList = jyzyUserInfoService.getUserListByOrgId(jyzyOrg.getId());
// 4 整理数据 将用户安排到 组织下面
// 4 整理数据 将用户安排到 组织下面 (去除虚拟组织下的用户)
return jyzyTeamList.stream().map(jyzyTeam -> JyzyTeamDto.builder()
.jyzyTeam(jyzyTeam).jyzyUserInfos(
userInfoList.stream().filter(jyzyUserInfo -> jyzyUserInfo.getTeamId().equals(jyzyTeam.getId())).collect(Collectors.toList())
).build()).collect(Collectors.toList());
.jyzyTeam(jyzyTeam)
.jyzyUserInfos(userInfoList.stream().filter(jyzyUserInfo -> jyzyUserInfo.getTeamId().equals(jyzyTeam.getId())).collect(Collectors.toList()))
.build()).collect(Collectors.toList());
} catch (Exception e) {
log.error("=======从精业展业 数据库中 获取组织及用户 信息 方法出错-->{}======", e.getMessage());
throw new Exception("同步失败，-->" + e.getMessage());
......
src/main/java/com/tanpu/feo/feojob/service/OrgSyncByWxcpService.java
View file @ 09a99f3e
......@@ -16,15 +16,16 @@ import java.util.List;
@Slf4j
public class OrgSyncByWxcpService {
@Resource
private UserInfoMapper userInfoMapper;
private UserInfoService userInfoService;
@Resource
private DepartmentMapper departmentMapper;
private DepartmentEmployeeService departmentEmployeeService;
@Resource
private DepartmentEmployeeMapper departmentEmployeeMapper;
private EmployeeService employeeService;
@Resource
private EmployeeMapper employeeMapper;
private DepartmentService departmentService;
@Resource
private EmployeeRoleMapper employeeRoleMapper;
private EmployeeRoleService employeeRoleService;
@Transactional
public List<IfaAssetsEntity> execute(WorkDataDto<UserInfoEntity> workUserInfo, WorkDataDto<EmployeeEntity> workEmployee, WorkDataDto<DepartmentEntity> workDepartment,
......@@ -40,22 +41,24 @@ public class OrgSyncByWxcpService {
userInfoEntity.setUpdateby("SYS");
userInfoEntity.setUpdatetime(now);
userInfoEntity.setDeletetag("0");
userInfoMapper.insert(userInfoEntity);
}
userInfoService.saveBatch(workUserInfoInsertList);
List<UserInfoEntity> workUserInfoUpdateList = workUserInfo.getUpdateList();
for (UserInfoEntity userInfoEntity : workUserInfoUpdateList) {
userInfoEntity.setUpdateby("SYS");
userInfoEntity.setUpdatetime(now);
userInfoEntity.setDeletetag("0");
userInfoMapper.updateById(userInfoEntity);
}
userInfoService.updateBatchById(workUserInfoUpdateList);
List<UserInfoEntity> workUserInfoDeleteList = workUserInfo.getDeleteList();
for (UserInfoEntity userInfoEntity : workUserInfoDeleteList) {
userInfoEntity.setUpdateby("SYS");
userInfoEntity.setUpdatetime(now);
userInfoEntity.setDeletetag("1");
userInfoMapper.updateById(userInfoEntity);
}
userInfoService.updateBatchById(workUserInfoDeleteList);
//2
List<EmployeeEntity> workEmployeeInsertList = workEmployee.getInsertList();
......@@ -65,7 +68,6 @@ public class OrgSyncByWxcpService {
employeeEntity.setUpdateBy("SYS");
employeeEntity.setUpdateTime(now);
employeeEntity.setDeleteTag("0");
employeeMapper.insert(employeeEntity);
IfaAssetsEntity ifaAssetsEntity = new IfaAssetsEntity();
ifaAssetsEntity.setIfaId(employeeEntity.getEmployeeId());
ifaAssetsEntity.setId(employeeEntity.getEmployeeId());
......@@ -75,22 +77,25 @@ public class OrgSyncByWxcpService {
ifaAssetsEntity.setUpdateBy("SYS");
ifaAssetsEntity.setDeleteTag("0");
assetsArrayList.add(ifaAssetsEntity);
// ifaAssetsService.insertIfaAssets(ifaAssetsEntity);
}
employeeService.saveBatch(workEmployeeInsertList);
List<EmployeeEntity> workEmployeeDeleteList = workEmployee.getDeleteList();
for (EmployeeEntity employeeEntity : workEmployeeDeleteList) {
employeeEntity.setUpdateBy("SYS");
employeeEntity.setUpdateTime(now);
employeeEntity.setDeleteTag("1");
employeeMapper.updateById(employeeEntity);
}
employeeService.updateBatchById(workEmployeeDeleteList);
List<EmployeeEntity> workEmployeeUpdateList = workEmployee.getUpdateList();
for (EmployeeEntity employeeEntity : workEmployeeUpdateList) {
employeeEntity.setUpdateBy("SYS");
employeeEntity.setUpdateTime(now);
employeeEntity.setDeleteTag("0");
employeeMapper.updateById(employeeEntity);
}
employeeService.updateBatchById(workEmployeeUpdateList);
//3
List<DepartmentEntity> workDepartmentInsertList = workDepartment.getInsertList();
......@@ -100,22 +105,25 @@ public class OrgSyncByWxcpService {
departmentEntity.setUpdateBy("SYS");
departmentEntity.setUpdateTime(now);
departmentEntity.setDeleteTag("0");
departmentMapper.insert(departmentEntity);
}
departmentService.saveBatch(workDepartmentInsertList);
List<DepartmentEntity> workDepartmentDeleteList = workDepartment.getDeleteList();
for (DepartmentEntity departmentEntity : workDepartmentDeleteList) {
departmentEntity.setUpdateBy("SYS");
departmentEntity.setUpdateTime(now);
departmentEntity.setDeleteTag("1");
departmentMapper.updateById(departmentEntity);
}
departmentService.updateBatchById(workDepartmentDeleteList);
List<DepartmentEntity> workDepartmentUpdateList = workDepartment.getUpdateList();
for (DepartmentEntity departmentEntity : workDepartmentUpdateList) {
departmentEntity.setUpdateBy("SYS");
departmentEntity.setUpdateTime(now);
departmentEntity.setDeleteTag("0");
departmentMapper.updateById(departmentEntity);
}
departmentService.updateBatchById(workDepartmentUpdateList);
//4
List<DepartmentEmployeeEntity> workDepartmentEmployeeInsertList = workDepartmentEmployee.getInsertList();
for (DepartmentEmployeeEntity departmentEmployeeEntity : workDepartmentEmployeeInsertList) {
......@@ -124,22 +132,25 @@ public class OrgSyncByWxcpService {
departmentEmployeeEntity.setUpdateBy("SYS");
departmentEmployeeEntity.setUpdateTime(now);
departmentEmployeeEntity.setDeleteTag("0");
departmentEmployeeMapper.insert(departmentEmployeeEntity);
}
departmentEmployeeService.saveBatch(workDepartmentEmployeeInsertList);
List<DepartmentEmployeeEntity> workDepartmentEmployeeDeleteList = workDepartmentEmployee.getDeleteList();
for (DepartmentEmployeeEntity departmentEmployeeEntity : workDepartmentEmployeeDeleteList) {
departmentEmployeeEntity.setUpdateBy("SYS");
departmentEmployeeEntity.setUpdateTime(now);
departmentEmployeeEntity.setDeleteTag("1");
departmentEmployeeMapper.updateById(departmentEmployeeEntity);
}
departmentEmployeeService.updateBatchById(workDepartmentEmployeeDeleteList);
List<DepartmentEmployeeEntity> workDepartmentEmployeeUpdateList = workDepartmentEmployee.getUpdateList();
for (DepartmentEmployeeEntity departmentEmployeeEntity : workDepartmentEmployeeUpdateList) {
departmentEmployeeEntity.setUpdateBy("SYS");
departmentEmployeeEntity.setUpdateTime(now);
departmentEmployeeEntity.setDeleteTag("0");
departmentEmployeeMapper.updateById(departmentEmployeeEntity);
}
departmentEmployeeService.updateBatchById(workDepartmentEmployeeUpdateList);
//5
List<EmployeeRoleEntity> workEmployeeRoleInsertList = workEmployeeRole.getInsertList();
for (EmployeeRoleEntity employeeRoleEntity : workEmployeeRoleInsertList) {
......@@ -148,22 +159,24 @@ public class OrgSyncByWxcpService {
employeeRoleEntity.setUpdateBy("SYS");
employeeRoleEntity.setUpdateTime(now);
employeeRoleEntity.setDeleteTag("0");
employeeRoleMapper.insert(employeeRoleEntity);
}
employeeRoleService.saveBatch(workEmployeeRoleInsertList);
List<EmployeeRoleEntity> workEmployeeRoleDeleteList = workEmployeeRole.getDeleteList();
for (EmployeeRoleEntity employeeRoleEntity : workEmployeeRoleDeleteList) {
employeeRoleEntity.setUpdateBy("SYS");
employeeRoleEntity.setUpdateTime(now);
employeeRoleEntity.setDeleteTag("1");
employeeRoleMapper.updateById(employeeRoleEntity);
}
employeeRoleService.updateBatchById(workEmployeeRoleDeleteList);
List<EmployeeRoleEntity> workEmployeeRoleUpdateList = workEmployeeRole.getUpdateList();
for (EmployeeRoleEntity employeeRoleEntity : workEmployeeRoleUpdateList) {
employeeRoleEntity.setUpdateBy("SYS");
employeeRoleEntity.setUpdateTime(now);
employeeRoleEntity.setDeleteTag("0");
employeeRoleMapper.updateById(employeeRoleEntity);
}
employeeRoleService.updateBatchById(workEmployeeRoleUpdateList);
log.info("==========结束 执行数据修改==========");
return assetsArrayList;
}
......
src/main/java/com/tanpu/feo/feojob/service/OrgSyncService.java
View file @ 09a99f3e
......@@ -68,20 +68,23 @@ public class OrgSyncService {
}
public String createWechatXcxQrcode(String userId, String headImg) {
String url = null;
long startTime = System.currentTimeMillis();
try {
if (StrUtil.isBlank(headImg)) {
headImg = wxDefaultImg;
}
String res = restTemplate.getForObject(qrcodeurl + "?userId=" + userId + "&headimage=" + headImg + "&params=" + userId, String.class);
JSONObject jsonObject = JSONUtil.parseObj(res);
String url = null;
try {
String statusCode = (String) jsonObject.get("statusCode");
if ("0000".equals(statusCode)) {
url = (String) jsonObject.get("attributes");
}
} catch (Exception e) {
log.error("======用户：{} 生成小程序二维码失败: {}======", userId, e.getMessage());
log.error("======用户：{} 生成小程序球形码失败: {}======", userId, e.getMessage());
}
log.info("======用户：{} 生成小程序球形码成功 耗时: {}======", userId, System.currentTimeMillis() - startTime);
return url;
}
......
src/main/java/com/tanpu/feo/feojob/service/RoleService.java
View file @ 09a99f3e
package com.tanpu.feo.feojob.service;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.tanpu.feo.feojob.entity.RoleEntity;
import com.tanpu.feo.feojob.mapper.RoleMapper;
import lombok.extern.slf4j.Slf4j;
......@@ -19,7 +20,7 @@ import java.util.stream.Collectors;
*/
@Service("roleService")
@Slf4j
public class RoleService {
public class RoleService extends ServiceImpl<RoleMapper, RoleEntity> {
@Autowired
private RoleMapper roleMapper;
......
src/main/java/com/tanpu/feo/feojob/service/UserInfoService.java
View file @ 09a99f3e
package com.tanpu.feo.feojob.service;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.tanpu.feo.feojob.entity.UserInfoEntity;
import com.tanpu.feo.feojob.mapper.UserInfoMapper;
import lombok.extern.slf4j.Slf4j;
......@@ -17,7 +18,7 @@ import java.util.List;
*/
@Service("userInfoService")
@Slf4j
public class UserInfoService {
public class UserInfoService extends ServiceImpl<UserInfoMapper, UserInfoEntity> {
@Autowired
private UserInfoMapper userInfoMapper;
......
src/main/java/com/tanpu/feo/feojob/service/jyzy/JyzyOrgService.java
View file @ 09a99f3e
......@@ -3,7 +3,7 @@ package com.tanpu.feo.feojob.service.jyzy;
import com.baomidou.dynamic.datasource.annotation.DS;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.tanpu.feo.feojob.entity.JyzyOrgEntity;
import com.tanpu.feo.feojob.entity.jyzy.JyzyOrgEntity;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
......
src/main/java/com/tanpu/feo/feojob/service/jyzy/JyzyTeamService.java
View file @ 09a99f3e
......@@ -4,7 +4,7 @@ package com.tanpu.feo.feojob.service.jyzy;
import com.baomidou.dynamic.datasource.annotation.DS;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.tanpu.feo.feojob.entity.JyzyTeamEntity;
import com.tanpu.feo.feojob.entity.jyzy.JyzyTeamEntity;
import com.tanpu.feo.feojob.mapper.jyzy.JyzyTeamMapper;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
......
src/main/java/com/tanpu/feo/feojob/service/jyzy/JyzyUserInfoService.java
View file @ 09a99f3e
......@@ -4,7 +4,7 @@ package com.tanpu.feo.feojob.service.jyzy;
import com.baomidou.dynamic.datasource.annotation.DS;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.tanpu.feo.feojob.entity.JyzyUserInfoEntity;
import com.tanpu.feo.feojob.entity.jyzy.JyzyUserInfoEntity;
import com.tanpu.feo.feojob.mapper.jyzy.JyzyUserInfoMapper;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
......@@ -30,7 +30,8 @@ public class JyzyUserInfoService {
public List<JyzyUserInfoEntity> getUserListByOrgId(String orgId) {
LambdaQueryWrapper<JyzyUserInfoEntity> queryWrapper = Wrappers.lambdaQuery(JyzyUserInfoEntity.class)
.eq(JyzyUserInfoEntity::getOrgId, orgId)
.eq(JyzyUserInfoEntity::getDeletetag, "0").ne(JyzyUserInfoEntity::getUiShenfen, 2);
.eq(JyzyUserInfoEntity::getDeletetag, "0")
.ne(JyzyUserInfoEntity::getUiShenfen, 2);
return JyzyUserInfoMapper.selectList(queryWrapper);
}
}
src/main/resources/feojob/JyzyOrgMapper.xml
View file @ 09a99f3e
......@@ -5,7 +5,7 @@
<mapper namespace="com.tanpu.feo.feojob.mapper.JyzyOrgMapper">
<!-- Entity类的ResultMap -->
<resultMap type="com.tanpu.feo.feojob.entity.JyzyOrgEntity" id="orgResultMap">
<resultMap type="com.tanpu.feo.feojob.entity.jyzy.JyzyOrgEntity" id="orgResultMap">
<result property="id" column="id"/>
<result property="orgCode" column="org_code"/>
<result property="orgName" column="org_name"/>
......
src/main/resources/feojob/JyzyTeamMapper.xml
View file @ 09a99f3e
......@@ -5,7 +5,7 @@
<mapper namespace="com.tanpu.feo.feojob.mapper.JyzyTeamMapper">
<!-- Entity类的ResultMap -->
<resultMap type="com.tanpu.feo.feojob.entity.JyzyTeamEntity" id="teamResultMap">
<resultMap type="com.tanpu.feo.feojob.entity.jyzy.JyzyTeamEntity" id="teamResultMap">
<result property="id" column="id"/>
<result property="teamName" column="team_name"/>
<result property="pId" column="p_id"/>
......
src/main/resources/feojob/JyzyUserInfoMapper.xml
View file @ 09a99f3e
......@@ -5,7 +5,7 @@
<mapper namespace="com.tanpu.feo.feojob.mapper.JyzyUserInfoMapper">
<!-- Entity类的ResultMap -->
<resultMap type="com.tanpu.feo.feojob.entity.JyzyUserInfoEntity" id="userInfoResultMap">
<resultMap type="com.tanpu.feo.feojob.entity.jyzy.JyzyUserInfoEntity" id="userInfoResultMap">
<result property="id" column="id"/>
<result property="uiOpenid" column="ui_openid"/>
<result property="uiUnionid" column="ui_unionId"/>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment