From 363e10506e61652017ff2e7653edc084afba8ac5 Mon Sep 17 00:00:00 2001 From: zzs Date: Fri, 11 Oct 2024 11:49:15 +0800 Subject: [PATCH] feat:sync user --- .../ensign/crm/module/crm/job/UserSyncKingdeeTask.java | 8 +++++--- .../com/ensign/crm/module/crm/service/ProxyService.java | 5 +++++ .../module/system/service/user/AdminUserServiceImpl.java | 1 - 3 files changed, 10 insertions(+), 4 deletions(-) diff --git a/ensign-module-crm/ensign-module-crm-biz/src/main/java/com/ensign/crm/module/crm/job/UserSyncKingdeeTask.java b/ensign-module-crm/ensign-module-crm-biz/src/main/java/com/ensign/crm/module/crm/job/UserSyncKingdeeTask.java index 730a12b..642d1a5 100644 --- a/ensign-module-crm/ensign-module-crm-biz/src/main/java/com/ensign/crm/module/crm/job/UserSyncKingdeeTask.java +++ b/ensign-module-crm/ensign-module-crm-biz/src/main/java/com/ensign/crm/module/crm/job/UserSyncKingdeeTask.java @@ -4,6 +4,8 @@ import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.ensign.crm.framework.common.enums.CommonStatusEnum; +import com.ensign.crm.framework.common.enums.CrmUserTypeEnum; +import com.ensign.crm.framework.common.enums.UserTypeEnum; import com.ensign.crm.framework.quartz.core.handler.JobHandler; import com.ensign.crm.framework.tenant.core.aop.TenantIgnore; import com.ensign.crm.module.crm.exception.AllKingdeeException; @@ -46,9 +48,9 @@ public class UserSyncKingdeeTask implements JobHandler { @TenantIgnore public String execute(String param) throws Exception { LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); - queryWrapper.eq(AdminUserDO::getStatus, 0) - .eq(AdminUserDO::getIsSyncKingdee, 1) - .eq(AdminUserDO::getCrmUserType, 1); + queryWrapper.eq(AdminUserDO::getStatus, CommonStatusEnum.ENABLE.getStatus()) + .eq(AdminUserDO::getIsSyncKingdee, CommonStatusEnum.DISABLE.getStatus()) + .eq(AdminUserDO::getCrmUserType, CrmUserTypeEnum.DEALER.getValue()); List users = userMapper.selectList(queryWrapper); List errors = new ArrayList<>(); diff --git a/ensign-module-crm/ensign-module-crm-biz/src/main/java/com/ensign/crm/module/crm/service/ProxyService.java b/ensign-module-crm/ensign-module-crm-biz/src/main/java/com/ensign/crm/module/crm/service/ProxyService.java index 4ddd2c0..8846015 100644 --- a/ensign-module-crm/ensign-module-crm-biz/src/main/java/com/ensign/crm/module/crm/service/ProxyService.java +++ b/ensign-module-crm/ensign-module-crm-biz/src/main/java/com/ensign/crm/module/crm/service/ProxyService.java @@ -282,7 +282,12 @@ public class ProxyService { } if (request != null) { request.addHeader("access_token", initAccessToken()); + request.addHeader("Content-Type", "application/json; charset=utf-8"); log.info("Requesting: {}", request); + Header[] headers = request.getAllHeaders(); + for (Header hd : headers) { + log.info("header: {}", hd); + } } HttpResponse response = httpClient.execute(request); diff --git a/ensign-module-system/ensign-module-system-biz/src/main/java/com/ensign/crm/module/system/service/user/AdminUserServiceImpl.java b/ensign-module-system/ensign-module-system-biz/src/main/java/com/ensign/crm/module/system/service/user/AdminUserServiceImpl.java index c6f092c..43be9fa 100644 --- a/ensign-module-system/ensign-module-system-biz/src/main/java/com/ensign/crm/module/system/service/user/AdminUserServiceImpl.java +++ b/ensign-module-system/ensign-module-system-biz/src/main/java/com/ensign/crm/module/system/service/user/AdminUserServiceImpl.java @@ -102,7 +102,6 @@ public class AdminUserServiceImpl implements AdminUserService { // 2.1 插入用户 AdminUserDO user = BeanUtils.toBean(createReqVO, AdminUserDO.class); user.setStatus(CommonStatusEnum.ENABLE.getStatus()); // 默认开启 - user.setIsSyncKingdee(CommonStatusEnum.DISABLE.getStatus());//未同步 user.setPassword(encodePassword(createReqVO.getPassword())); // 加密密码 userMapper.insert(user); // 2.2 插入关联岗位