This commit is contained in:
1378012178@qq.com 2025-04-21 17:07:39 +08:00
commit 96c0d4a944
1 changed files with 69 additions and 52 deletions

View File

@ -47,63 +47,80 @@ public class TumsConfigServiceImpl extends ServiceImpl<TumsConfigMapper, TumsCon
@Override @Override
public Result<String> saveUser(TumsConfig tumsConfig){ public Result<String> saveUser(TumsConfig tumsConfig){
TumsConfig entity = baseMapper.getByCode(tumsConfig.getOrgCode()); TumsConfig entity = baseMapper.getByCode(tumsConfig.getOrgCode());
if(entity!=null){ if(entity!=null){
StringBuffer sb = new StringBuffer(); String errorMsg = "";
sb.append("{"); Map<String, String> map = new HashMap<>();
sb.append("\"userId\"").append(":").append("\"").append(tumsConfig.getTumsUserId()).append("\","); if(!entity.getTumsPassword().equals(tumsConfig.getTumsPassword())){
sb.append("\"roleList\"").append(":[").append(tumsConfig.getTumsRoleId()).append("]"); //调用修改密码接口
sb.append("}"); StringBuffer sbp = new StringBuffer();
String jsonResponse = tumsApi.editUser(sb.toString()); sbp.append("{");
JSONObject jsonObject = new JSONObject(jsonResponse); sbp.append("\"userId\"").append(":").append("\"").append(tumsConfig.getTumsUserId()).append("\",");
String errorCode = jsonObject.getStr("error_code"); sbp.append("\"oldPassword\"").append(":").append("\"").append(entity.getTumsPassword()).append("\",");
if(errorCode.equals("0")){ sbp.append("\"newPassword\"").append(":").append("\"").append(tumsConfig.getTumsPassword()).append("\"");
// StringBuffer sbp = new StringBuffer(); sbp.append("}");
// sbp.append("{"); String jsonResponsep = tumsApi.changePassword(sbp.toString());
// sbp.append("\"userId\"").append(":").append("\"").append(tumsConfig.getTumsUserId()).append("\","); JSONObject jsonObjectp = new JSONObject(jsonResponsep);
// sbp.append("\"password\"").append(":").append("\"").append(tumsConfig.getTumsPassword()).append("\""); String errorCodep = jsonObjectp.getStr("error_code");
// sbp.append("}"); if(errorCodep.equals("0")){
// String jsonResponsep = tumsApi.changePassword(sbp.toString()); map.put("tumsPassword",tumsConfig.getTumsPassword());
// JSONObject jsonObjectp = new JSONObject(jsonResponsep); }else{
// String errorCodep = jsonObjectp.getStr("error_code"); if(errorCodep.equals("-82400")){
// if(errorCodep.equals("0")){ errorMsg = "修改密码:密码格式错误!";
Map<String, String> map = new HashMap<>(); }else{
if(tumsConfig.getTumsUrl()!=null&&!tumsConfig.getTumsUrl().equals("")){ errorMsg = "修改密码:"+jsonObjectp.getStr("msg");
map.put("tumsUrl",tumsConfig.getTumsUrl());
} }
if(tumsConfig.getTumsProjectId()!=null&&!tumsConfig.getTumsProjectId().equals("")){ }
map.put("tumsProjectId",tumsConfig.getTumsProjectId()); }
if(!entity.getTumsRoleId().equals(tumsConfig.getTumsRoleId())){
//调用修改角色接口
StringBuffer sb = new StringBuffer();
sb.append("{");
sb.append("\"userId\"").append(":").append("\"").append(tumsConfig.getTumsUserId()).append("\",");
sb.append("\"roleList\"").append(":[").append(tumsConfig.getTumsRoleId()).append("]");
sb.append("}");
String jsonResponse = tumsApi.editUser(sb.toString());
JSONObject jsonObject = new JSONObject(jsonResponse);
String errorCode = jsonObject.getStr("error_code");
if(errorCode.equals("0")){
map.put("tumsRoleId",tumsConfig.getTumsRoleId());
}else{
if(!errorMsg.equals("")){
errorMsg = errorMsg + "\n" + "修改角色:"+jsonObject.getStr("msg");
}else{
errorMsg = "修改角色:"+jsonObject.getStr("msg");
} }
if(tumsConfig.getFtpIp()!=null&&!tumsConfig.getFtpIp().equals("")){ }
map.put("ftpIp",tumsConfig.getFtpIp()); }
} if(tumsConfig.getTumsUrl()!=null&&!tumsConfig.getTumsUrl().equals("")){
if(tumsConfig.getFtpPort()!=null&&!tumsConfig.getFtpPort().equals("")){ map.put("tumsUrl",tumsConfig.getTumsUrl());
map.put("ftpPort",tumsConfig.getFtpPort()); }
} if(tumsConfig.getTumsProjectId()!=null&&!tumsConfig.getTumsProjectId().equals("")){
if(tumsConfig.getFtpUsername()!=null&&!tumsConfig.getFtpUsername().equals("")){ map.put("tumsProjectId",tumsConfig.getTumsProjectId());
map.put("ftpUsername",tumsConfig.getFtpUsername()); }
} if(tumsConfig.getFtpIp()!=null&&!tumsConfig.getFtpIp().equals("")){
if(tumsConfig.getFtpPassword()!=null&&!tumsConfig.getFtpPassword().equals("")){ map.put("ftpIp",tumsConfig.getFtpIp());
map.put("ftpPassword",tumsConfig.getFtpPassword()); }
} if(tumsConfig.getFtpPort()!=null&&!tumsConfig.getFtpPort().equals("")){
if(tumsConfig.getFtpUploadpath()!=null&&!tumsConfig.getFtpUploadpath().equals("")){ map.put("ftpPort",tumsConfig.getFtpPort());
map.put("ftpUploadpath",tumsConfig.getFtpUploadpath()); }
} if(tumsConfig.getFtpUsername()!=null&&!tumsConfig.getFtpUsername().equals("")){
if(tumsConfig.getOrgCode()!=null&&!tumsConfig.getOrgCode().equals("")){ map.put("ftpUsername",tumsConfig.getFtpUsername());
map.put("orgCode",tumsConfig.getOrgCode()); }
} if(tumsConfig.getFtpPassword()!=null&&!tumsConfig.getFtpPassword().equals("")){
baseMapper.updateUser(map); map.put("ftpPassword",tumsConfig.getFtpPassword());
return Result.OK("编辑用户成功!"); }
// }else{ if(tumsConfig.getFtpUploadpath()!=null&&!tumsConfig.getFtpUploadpath().equals("")){
// if(errorCodep.equals("-82400")){ map.put("ftpUploadpath",tumsConfig.getFtpUploadpath());
// return Result.error("密码格式错误"); }
// }else{ if(tumsConfig.getOrgCode()!=null&&!tumsConfig.getOrgCode().equals("")){
// return Result.error(jsonObject.getStr("msg")); map.put("orgCode",tumsConfig.getOrgCode());
// } }
// } baseMapper.updateUser(map);
if(!errorMsg.equals("")){
return Result.error(errorMsg);
}else{ }else{
return Result.error(jsonObject.getStr("msg")); return Result.OK("编辑用户成功!");
} }
}else { }else {
StringBuffer sb = new StringBuffer(); StringBuffer sb = new StringBuffer();