diff --git a/adc-da-sys/src/main/java/com/adc/da/sync/service/SyncIAMTimer.java b/adc-da-sys/src/main/java/com/adc/da/sync/service/SyncIAMTimer.java index 02da389..3adc464 100644 --- a/adc-da-sys/src/main/java/com/adc/da/sync/service/SyncIAMTimer.java +++ b/adc-da-sys/src/main/java/com/adc/da/sync/service/SyncIAMTimer.java @@ -1,5 +1,6 @@ package com.adc.da.sync.service; +import cn.hutool.core.date.DateUtil; import cn.hutool.core.util.IdUtil; import cn.hutool.http.HttpRequest; import com.adc.da.sync.service.dao.mysql.SyncIAMLogDao; @@ -17,6 +18,7 @@ import com.adc.da.sys.vo.iam.CmpOrgResult; import com.adc.da.sys.vo.iam.CmpUserResult; import com.adc.da.sys.vo.iam.OrgVoIAM; import com.adc.da.sys.vo.iam.UserVoIAM; +import com.adc.da.util.utils.DateUtils; import com.adc.da.util.utils.GsonUtil; import com.adc.da.util.utils.StringUtils; import com.auth0.jwt.JWT; @@ -46,7 +48,7 @@ public class SyncIAMTimer { @Value("${cmp.appSecret}") private String appSecret = "ee493505524d4f628e52058f4df3a4fb"; - private String xCustom = "Insight Library"; // 写死的 + private String xCustom = "TI062S-001"; // 写死的 /** * 组织机构增量同步接口地址 @@ -181,16 +183,18 @@ public class SyncIAMTimer { */ public OrgEO transOrgIAMVoToOrgEO(OrgVoIAM orgVoIAM) { OrgEO orgEO = new OrgEO(); -// orgEO.setId(orgVoIAM.getOrgCode()); -// orgEO.setOrgCode(orgVoIAM.getOrgCode()); -// orgEO.setOrgName(orgVoIAM.getOrgName()); -// orgEO.setOrgLevel(orgVoIAM.getOrgLevel()); -// orgEO.setSupOrgCode(orgVoIAM.getSupOrgCode()); -// orgEO.setOrgShortName(orgVoIAM.getOrgShortName()); -// orgEO.setAttribution(orgVoIAM.getAttribution()); -// orgEO.setBmdm14(orgVoIAM.getBmdm14()); -// orgEO.setStatus(orgVoIAM.getStatus()); -// orgEO.setUpdateTime(orgVoIAM.getUpdateTime()); + orgEO.setId(orgVoIAM.getDepartmentID()); + orgEO.setDepartmentCode(orgVoIAM.getDepartmentCode()); + orgEO.setShortName(orgVoIAM.getShortName()); + orgEO.setLongName(orgVoIAM.getLongName()); + orgEO.setParentID(orgVoIAM.getParentID()); + orgEO.setDepartmentPath(orgVoIAM.getDepartmentPath()); + orgEO.setBMDM14(orgVoIAM.getBMDM14()); + orgEO.setLeveL(orgVoIAM.getLeveL()); + orgEO.setDepth(orgVoIAM.getDepth()); + orgEO.setVcount(orgVoIAM.getVcount()); + orgEO.setAttribution(orgVoIAM.getAttribution()); + orgEO.setUpdateTime(DateUtil.formatDateTime(new Date())); return orgEO; }