QR/laws_chery_serve
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

修改iam同步

Browse Source
This commit is contained in:
梁琦涛
2024-08-06 10:19:14 +08:00
parent 134c9f38ca
commit 324e60f7bd
3 changed files with 44 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files
laws-modules-docking/src/main/java/com/jero/modules/docking/iam/client/TestClient.java
+30 -27
View File
@@ -46,10 +46,10 @@ public class TestClient {
// testClient.sendUserCreate(i); // testClient.sendUserCreate(i);
// } // }
// 创建用户接口测试 // 创建用户接口测试
// testClient.sendUserUpdate(); // 更新用户接口测试 testClient.sendUserUpdate(); // 更新用户接口测试
// testClient.sendUserDel(); // 更新用户接口测试 // testClient.sendUserDel(); // 更新用户接口测试
// testClient.sendOrgCreate(); // 组织创建接口测试 // testClient.sendOrgCreate(); // 组织创建接口测试
testClient.sendOrgUpdate(); // 组织修改接口测试 // testClient.sendOrgUpdate(); // 组织修改接口测试
// testClient.sendOrgDel(); // 组织删除接口测试 // testClient.sendOrgDel(); // 组织删除接口测试
// testClient.sendQueryAllUserIdsService(); // 查询所有用户ID接口测试 // testClient.sendQueryAllUserIdsService(); // 查询所有用户ID接口测试
// testClient.sendQueryAllOrgIdsService(); // 查询所有组织ID接口测试 // testClient.sendQueryAllOrgIdsService(); // 查询所有组织ID接口测试
@@ -107,8 +107,8 @@ public class TestClient {
IamCommonAcceptDto iamCommonAcceptDto = new IamCommonAcceptDto(); IamCommonAcceptDto iamCommonAcceptDto = new IamCommonAcceptDto();
iamCommonAcceptDto.setBimRequestId(UUIDUtils.randomUUID20()); iamCommonAcceptDto.setBimRequestId(UUIDUtils.randomUUID20());
iamCommonAcceptDto.setBimRemoteUser("srmsIam"); iamCommonAcceptDto.setBimRemoteUser("cgrsmsIam");
iamCommonAcceptDto.setBimRemotePwd("srmsIam2023"); iamCommonAcceptDto.setBimRemotePwd("cgrsmsIam2024");
StringBuilder sb = getStringBuilder(iamCommonAcceptDto); StringBuilder sb = getStringBuilder(iamCommonAcceptDto);
@@ -167,8 +167,8 @@ public class TestClient {
iamUserAcceptDto.setSrmsEmail("test@sinotruk.com"); iamUserAcceptDto.setSrmsEmail("test@sinotruk.com");
iamUserAcceptDto.setEmployeeNo("1111"); iamUserAcceptDto.setEmployeeNo("1111");
iamUserAcceptDto.setBimRequestId(UUIDUtils.randomUUID20()); iamUserAcceptDto.setBimRequestId(UUIDUtils.randomUUID20());
iamUserAcceptDto.setBimRemoteUser("srmsIam"); iamUserAcceptDto.setBimRemoteUser("cgrsmsIam");
iamUserAcceptDto.setBimRemotePwd("srmsIam2023"); iamUserAcceptDto.setBimRemotePwd("cgrsmsIam2024");
iamUserAcceptDto.setBirthday("2024-05-01"); iamUserAcceptDto.setBirthday("2024-05-01");
iamUserAcceptDto.setEntryTime("2024-06-01"); iamUserAcceptDto.setEntryTime("2024-06-01");
iamUserAcceptDto.setResignationTime("2024-07-01"); iamUserAcceptDto.setResignationTime("2024-07-01");
@@ -203,16 +203,18 @@ public class TestClient {
private void sendUserUpdate() throws JsonProcessingException { private void sendUserUpdate() throws JsonProcessingException {
// 封装 IamUserAcceptDto 为用户数据层 // 封装 IamUserAcceptDto 为用户数据层
IamUserAcceptDto iamUserAcceptDto = new IamUserAcceptDto(); IamUserAcceptDto iamUserAcceptDto = new IamUserAcceptDto();
iamUserAcceptDto.setBimUid("1820381905836400641"); // 数据库中取到的ID iamUserAcceptDto.setBimUid("1820380981034881025"); // 数据库中取到的ID
iamUserAcceptDto.setSrmsUsername("00234567");
iamUserAcceptDto.setSrmsRealname("测试用户1");
iamUserAcceptDto.setBirthday("2018-12-05 00:00:00"); iamUserAcceptDto.setBirthday("2018-12-05 00:00:00");
iamUserAcceptDto.setBirthday("2024-05-01"); iamUserAcceptDto.setBirthday("2024-05-01");
iamUserAcceptDto.setEntryTime("2024-06-01"); iamUserAcceptDto.setEntryTime("2024-06-01");
iamUserAcceptDto.setResignationTime("2024-07-01"); iamUserAcceptDto.setResignationTime("2024-07-01");
iamUserAcceptDto.setBimRequestId(UUIDUtils.randomUUID20()); iamUserAcceptDto.setBimRequestId(UUIDUtils.randomUUID20());
iamUserAcceptDto.setEmployeeNo("feishuid"); iamUserAcceptDto.setEmployeeNo("feishuid");
iamUserAcceptDto.setBimRemoteUser("srmsIam"); iamUserAcceptDto.setBimRemoteUser("cgrsmsIam");
iamUserAcceptDto.setBimRemotePwd("srmsIam2023"); iamUserAcceptDto.setBimRemotePwd("cgrsmsIam2024");
iamUserAcceptDto.set__ENABLE__(true); // iamUserAcceptDto.set__ENABLE__(true);
StringBuilder sb = getStringBuilder(iamUserAcceptDto); StringBuilder sb = getStringBuilder(iamUserAcceptDto);
@@ -226,8 +228,9 @@ public class TestClient {
//sm4加解密 //sm4加解密
Sm4Cipher sm4Cipher = new Sm4Cipher(); Sm4Cipher sm4Cipher = new Sm4Cipher();
String source = JSON.toJSONString(iamUserAcceptDto); String source = JSON.toJSONString(iamUserAcceptDto);
// String source = "{\"signature\":\"84ccbb05001d597091cbe9c2490079cf62f65d2746589a6ea1a297de81d8e6a4\",\"bimRequestId\":\"102b3296243344469270adf5905148b0\",\"bimRemotePwd\":\"cgrsmsIam2024\",\"__ENABLE__\":true,\"bimRemoteUser\":\"cgrsmsIam\",\"bimUid\":\"1820380981034881025\"}";
String target = sm4Cipher.encrypt(source, key); String target = sm4Cipher.encrypt(source, key);
// String target = "EfSRGBN6BazDJ62gjmZYZhLjFS00Z59e8F6ev0TozIvbOOukUUuGS/t8cY4nPbIfDtzAFQ3hZok/sbJOLM5+kVVrAmtMUCBvV1oBa/r29MmliX34EE0Fiv3A9Jn9UgPYa/ZjonB6s8FuMIOkeuOaaL/uIyTgJGo1FEtFOBJiuHfOhwi6KUMh2M8a2eICbzBqEZgI/eQaAHOHbg7Ucfkh4VaVrZ1EmzM2XMtr+0qPMsqqxVEPR9m4z0fKJJ8C/zrE3yaNvW9Y6mm/uuHalRzkTCbx6W/RDPkHon37y0OLbSsdV2Y21bvPUlmVETy8BIA2wG3E7+KOsgB3YQuXjSIWtv2z+NJ2XOP+W2DURDEiJcG7Qq5n5J7DIet1JAlBGiCY/vuqRBq1BdPViq70DqeJp9/ZQ0wJu21/SsY8cxw7aiaozBCW8AfyL9fVmdPSrW66jSkfmSuQnTaR59WnVZlfjhzJNzMmLIeDmBzInKUAkaxFEEj3NZbPBVLOEYCV1ZCW/dJx+9vbWBimbT4DDRAd2aaJljREYu46pfHAwg14bjPGmDNUUnW6883VpUQsZw1I1gIa0sg1z1XMU8h6J7L4Ss1401XOHEJSfgQEFFvTlGFo7rl2VLilFgSOCercNVjK7EoMaRTQ2BUDmqG7kuF+5WNSemmK8FOpFDXwtxABzMk=";
// 发送数据 // 发送数据
String url = "http://localhost:8188/laws-chery/sync/iam/chery/UserUpdateService"; String url = "http://localhost:8188/laws-chery/sync/iam/chery/UserUpdateService";
String response = HttpUtil.post(url, target); String response = HttpUtil.post(url, target);
@@ -245,8 +248,8 @@ public class TestClient {
IamUserAcceptDto iamUserAcceptDto = new IamUserAcceptDto(); IamUserAcceptDto iamUserAcceptDto = new IamUserAcceptDto();
iamUserAcceptDto.setBimUid("1819982931501633537"); // 数据库中取到的ID iamUserAcceptDto.setBimUid("1819982931501633537"); // 数据库中取到的ID
iamUserAcceptDto.setBimRequestId(UUIDUtils.randomUUID20()); iamUserAcceptDto.setBimRequestId(UUIDUtils.randomUUID20());
iamUserAcceptDto.setBimRemoteUser("srmsIam"); iamUserAcceptDto.setBimRemoteUser("cgrsmsIam");
iamUserAcceptDto.setBimRemotePwd("srmsIam2023"); iamUserAcceptDto.setBimRemotePwd("cgrsmsIam2024");
StringBuilder sb = getStringBuilder(iamUserAcceptDto); StringBuilder sb = getStringBuilder(iamUserAcceptDto);
@@ -286,8 +289,8 @@ public class TestClient {
iamOrgAcceptDto.setSrmsParentCode("D10000001"); iamOrgAcceptDto.setSrmsParentCode("D10000001");
iamOrgAcceptDto.setBimRequestId(UUIDUtils.randomUUID20()); iamOrgAcceptDto.setBimRequestId(UUIDUtils.randomUUID20());
iamOrgAcceptDto.setBimRemoteUser("srmsIam"); iamOrgAcceptDto.setBimRemoteUser("cgrsmsIam");
iamOrgAcceptDto.setBimRemotePwd("srmsIam2023"); iamOrgAcceptDto.setBimRemotePwd("cgrsmsIam2024");
StringBuilder sb = getStringBuilder(iamOrgAcceptDto); StringBuilder sb = getStringBuilder(iamOrgAcceptDto);
@@ -325,8 +328,8 @@ public class TestClient {
iamOrgAcceptDto.setSrmsParentCode("D10000001"); iamOrgAcceptDto.setSrmsParentCode("D10000001");
iamOrgAcceptDto.setBimRequestId(UUIDUtils.randomUUID20()); iamOrgAcceptDto.setBimRequestId(UUIDUtils.randomUUID20());
iamOrgAcceptDto.setBimRemoteUser("srmsIam"); iamOrgAcceptDto.setBimRemoteUser("cgrsmsIam");
iamOrgAcceptDto.setBimRemotePwd("srmsIam2023"); iamOrgAcceptDto.setBimRemotePwd("cgrsmsIam2024");
StringBuilder sb = getStringBuilder(iamOrgAcceptDto); StringBuilder sb = getStringBuilder(iamOrgAcceptDto);
@@ -359,8 +362,8 @@ public class TestClient {
iamOrgAcceptDto.setBimOrgId("D10000004"); iamOrgAcceptDto.setBimOrgId("D10000004");
iamOrgAcceptDto.setBimRequestId(UUIDUtils.randomUUID20()); iamOrgAcceptDto.setBimRequestId(UUIDUtils.randomUUID20());
iamOrgAcceptDto.setBimRemoteUser("srmsIam"); iamOrgAcceptDto.setBimRemoteUser("cgrsmsIam");
iamOrgAcceptDto.setBimRemotePwd("srmsIam2023"); iamOrgAcceptDto.setBimRemotePwd("cgrsmsIam2024");
StringBuilder sb = getStringBuilder(iamOrgAcceptDto); StringBuilder sb = getStringBuilder(iamOrgAcceptDto);
@@ -392,8 +395,8 @@ public class TestClient {
IamCommonAcceptDto iamCommonAcceptDto = new IamCommonAcceptDto(); IamCommonAcceptDto iamCommonAcceptDto = new IamCommonAcceptDto();
iamCommonAcceptDto.setBimRequestId(UUIDUtils.randomUUID20()); iamCommonAcceptDto.setBimRequestId(UUIDUtils.randomUUID20());
iamCommonAcceptDto.setBimRemoteUser("srmsIam"); iamCommonAcceptDto.setBimRemoteUser("cgrsmsIam");
iamCommonAcceptDto.setBimRemotePwd("srmsIam2023"); iamCommonAcceptDto.setBimRemotePwd("cgrsmsIam2024");
StringBuilder sb = getStringBuilder(iamCommonAcceptDto); StringBuilder sb = getStringBuilder(iamCommonAcceptDto);
@@ -422,8 +425,8 @@ public class TestClient {
IamCommonAcceptDto iamCommonAcceptDto = new IamCommonAcceptDto(); IamCommonAcceptDto iamCommonAcceptDto = new IamCommonAcceptDto();
iamCommonAcceptDto.setBimRequestId(UUIDUtils.randomUUID20()); iamCommonAcceptDto.setBimRequestId(UUIDUtils.randomUUID20());
iamCommonAcceptDto.setBimRemoteUser("srmsIam"); iamCommonAcceptDto.setBimRemoteUser("cgrsmsIam");
iamCommonAcceptDto.setBimRemotePwd("srmsIam2023"); iamCommonAcceptDto.setBimRemotePwd("cgrsmsIam2024");
StringBuilder sb = getStringBuilder(iamCommonAcceptDto); StringBuilder sb = getStringBuilder(iamCommonAcceptDto);
@@ -452,8 +455,8 @@ public class TestClient {
// 封装 IamUserAcceptDto 为用户数据层 // 封装 IamUserAcceptDto 为用户数据层
IamUserAcceptDto iamUserAcceptDto = new IamUserAcceptDto(); IamUserAcceptDto iamUserAcceptDto = new IamUserAcceptDto();
iamUserAcceptDto.setBimUid("1819982931501633537"); // 数据库中取到的ID iamUserAcceptDto.setBimUid("1819982931501633537"); // 数据库中取到的ID
iamUserAcceptDto.setBimRemoteUser("srmsIam"); iamUserAcceptDto.setBimRemoteUser("cgrsmsIam");
iamUserAcceptDto.setBimRemotePwd("srmsIam2023"); iamUserAcceptDto.setBimRemotePwd("cgrsmsIam2024");
StringBuilder sb = getStringBuilder(iamUserAcceptDto); StringBuilder sb = getStringBuilder(iamUserAcceptDto);
@@ -484,8 +487,8 @@ public class TestClient {
// 封装 IamUserAcceptDto 为用户数据层 // 封装 IamUserAcceptDto 为用户数据层
IamOrgAcceptDto iamOrgAcceptDto = new IamOrgAcceptDto(); IamOrgAcceptDto iamOrgAcceptDto = new IamOrgAcceptDto();
iamOrgAcceptDto.setBimOrgId("IA00102"); // 数据库中取到的ID iamOrgAcceptDto.setBimOrgId("IA00102"); // 数据库中取到的ID
iamOrgAcceptDto.setBimRemoteUser("srmsIam"); iamOrgAcceptDto.setBimRemoteUser("cgrsmsIam");
iamOrgAcceptDto.setBimRemotePwd("srmsIam2023"); iamOrgAcceptDto.setBimRemotePwd("cgrsmsIam2024");
StringBuilder sb = getStringBuilder(iamOrgAcceptDto); StringBuilder sb = getStringBuilder(iamOrgAcceptDto);
laws-modules-docking/src/main/java/com/jero/modules/docking/iam/controller/SyncIamByCheryController.java
+6
View File
@@ -32,6 +32,7 @@ import org.springframework.web.bind.annotation.RestController;
import javax.annotation.Resource; import javax.annotation.Resource;
import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletRequest;
import java.sql.SQLIntegrityConstraintViolationException;
import java.util.List; import java.util.List;
/** /**
@@ -104,6 +105,11 @@ public class SyncIamByCheryController {
String message = e.getMessage(); String message = e.getMessage();
iamUserCreateResponse.setMessage(message); iamUserCreateResponse.setMessage(message);
log.error(iamUserCreateResponse.getMessage()); log.error(iamUserCreateResponse.getMessage());
} catch (ServiceException e) {
iamUserCreateResponse.setResultCode(DockingConstant.IAM_ERROR_RESULT_CODE);
String message = e.getErrorMessage();
iamUserCreateResponse.setMessage(message);
log.error(iamUserCreateResponse.getMessage());
}catch (Exception e){ }catch (Exception e){
iamUserCreateResponse.setResultCode(DockingConstant.IAM_ERROR_RESULT_CODE); iamUserCreateResponse.setResultCode(DockingConstant.IAM_ERROR_RESULT_CODE);
iamUserCreateResponse.setMessage("操作失败" + e.getMessage()); iamUserCreateResponse.setMessage("操作失败" + e.getMessage());
laws-modules-docking/src/main/java/com/jero/modules/docking/iam/service/SyncIamService.java
+8
View File
@@ -4,6 +4,7 @@ import cn.hutool.core.text.CharSequenceUtil;
import cn.hutool.core.util.NumberUtil; import cn.hutool.core.util.NumberUtil;
import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONObject; import com.alibaba.fastjson.JSONObject;
import com.aliyun.oss.ServiceException;
import com.banboocloud.Codec.BamboocloudFacade; import com.banboocloud.Codec.BamboocloudFacade;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
@@ -308,6 +309,13 @@ public class SyncIamService {
this.sysUserService.update(querySysUser); this.sysUserService.update(querySysUser);
}else{ }else{
if (CharSequenceUtil.isNotEmpty(userAcceptDto.getSrmsUsername())){ if (CharSequenceUtil.isNotEmpty(userAcceptDto.getSrmsUsername())){
LambdaQueryWrapper<SysUser> querySysUser = new LambdaQueryWrapper<>();
querySysUser.eq(SysUser::getUsername, userAcceptDto.getSrmsUsername());
querySysUser.ne(SysUser::getId,userAcceptDto.getBimUid());
long count = sysUserService.count(querySysUser);
if (count > 0) {
throw new ServiceException("工号【" + userAcceptDto.getSrmsUsername() + "】已存在！");
}
sysUser.setUsername(userAcceptDto.getSrmsUsername()); sysUser.setUsername(userAcceptDto.getSrmsUsername());
} }