From e577970e3edc974ddd2c44eb06c4acfb7b7ea971 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9B=B9=E7=A3=8A?= <45566618@qq.com> Date: Mon, 21 Apr 2025 16:08:05 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9C=BA=E6=9E=84=E7=AE=A1=E7=90=86=E5=A2=9E?= =?UTF-8?q?=E5=8A=A0TpLink=E7=94=A8=E6=88=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/TumsConfigServiceImpl.java | 121 ++++++++++-------- 1 file changed, 69 insertions(+), 52 deletions(-) diff --git a/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tplink/common/service/impl/TumsConfigServiceImpl.java b/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tplink/common/service/impl/TumsConfigServiceImpl.java index 594893c..f025379 100644 --- a/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tplink/common/service/impl/TumsConfigServiceImpl.java +++ b/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tplink/common/service/impl/TumsConfigServiceImpl.java @@ -47,63 +47,80 @@ public class TumsConfigServiceImpl extends ServiceImpl saveUser(TumsConfig tumsConfig){ - TumsConfig entity = baseMapper.getByCode(tumsConfig.getOrgCode()); if(entity!=null){ - 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")){ -// StringBuffer sbp = new StringBuffer(); -// sbp.append("{"); -// sbp.append("\"userId\"").append(":").append("\"").append(tumsConfig.getTumsUserId()).append("\","); -// sbp.append("\"password\"").append(":").append("\"").append(tumsConfig.getTumsPassword()).append("\""); -// sbp.append("}"); -// String jsonResponsep = tumsApi.changePassword(sbp.toString()); -// JSONObject jsonObjectp = new JSONObject(jsonResponsep); -// String errorCodep = jsonObjectp.getStr("error_code"); -// if(errorCodep.equals("0")){ - Map map = new HashMap<>(); - if(tumsConfig.getTumsUrl()!=null&&!tumsConfig.getTumsUrl().equals("")){ - map.put("tumsUrl",tumsConfig.getTumsUrl()); + String errorMsg = ""; + Map map = new HashMap<>(); + if(!entity.getTumsPassword().equals(tumsConfig.getTumsPassword())){ + //调用修改密码接口 + StringBuffer sbp = new StringBuffer(); + sbp.append("{"); + sbp.append("\"userId\"").append(":").append("\"").append(tumsConfig.getTumsUserId()).append("\","); + sbp.append("\"oldPassword\"").append(":").append("\"").append(entity.getTumsPassword()).append("\","); + sbp.append("\"newPassword\"").append(":").append("\"").append(tumsConfig.getTumsPassword()).append("\""); + sbp.append("}"); + String jsonResponsep = tumsApi.changePassword(sbp.toString()); + JSONObject jsonObjectp = new JSONObject(jsonResponsep); + String errorCodep = jsonObjectp.getStr("error_code"); + if(errorCodep.equals("0")){ + map.put("tumsPassword",tumsConfig.getTumsPassword()); + }else{ + if(errorCodep.equals("-82400")){ + errorMsg = "修改密码：密码格式错误！"; + }else{ + errorMsg = "修改密码："+jsonObjectp.getStr("msg"); } - 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.getFtpPort()!=null&&!tumsConfig.getFtpPort().equals("")){ - map.put("ftpPort",tumsConfig.getFtpPort()); - } - if(tumsConfig.getFtpUsername()!=null&&!tumsConfig.getFtpUsername().equals("")){ - map.put("ftpUsername",tumsConfig.getFtpUsername()); - } - if(tumsConfig.getFtpPassword()!=null&&!tumsConfig.getFtpPassword().equals("")){ - map.put("ftpPassword",tumsConfig.getFtpPassword()); - } - if(tumsConfig.getFtpUploadpath()!=null&&!tumsConfig.getFtpUploadpath().equals("")){ - map.put("ftpUploadpath",tumsConfig.getFtpUploadpath()); - } - if(tumsConfig.getOrgCode()!=null&&!tumsConfig.getOrgCode().equals("")){ - map.put("orgCode",tumsConfig.getOrgCode()); - } - baseMapper.updateUser(map); - return Result.OK("编辑用户成功！"); -// }else{ -// if(errorCodep.equals("-82400")){ -// return Result.error("密码格式错误"); -// }else{ -// return Result.error(jsonObject.getStr("msg")); -// } -// } + } + } + if(tumsConfig.getTumsUrl()!=null&&!tumsConfig.getTumsUrl().equals("")){ + map.put("tumsUrl",tumsConfig.getTumsUrl()); + } + if(tumsConfig.getTumsProjectId()!=null&&!tumsConfig.getTumsProjectId().equals("")){ + map.put("tumsProjectId",tumsConfig.getTumsProjectId()); + } + if(tumsConfig.getFtpIp()!=null&&!tumsConfig.getFtpIp().equals("")){ + map.put("ftpIp",tumsConfig.getFtpIp()); + } + if(tumsConfig.getFtpPort()!=null&&!tumsConfig.getFtpPort().equals("")){ + map.put("ftpPort",tumsConfig.getFtpPort()); + } + if(tumsConfig.getFtpUsername()!=null&&!tumsConfig.getFtpUsername().equals("")){ + map.put("ftpUsername",tumsConfig.getFtpUsername()); + } + if(tumsConfig.getFtpPassword()!=null&&!tumsConfig.getFtpPassword().equals("")){ + map.put("ftpPassword",tumsConfig.getFtpPassword()); + } + if(tumsConfig.getFtpUploadpath()!=null&&!tumsConfig.getFtpUploadpath().equals("")){ + map.put("ftpUploadpath",tumsConfig.getFtpUploadpath()); + } + if(tumsConfig.getOrgCode()!=null&&!tumsConfig.getOrgCode().equals("")){ + map.put("orgCode",tumsConfig.getOrgCode()); + } + baseMapper.updateUser(map); + if(!errorMsg.equals("")){ + return Result.error(errorMsg); }else{ - return Result.error(jsonObject.getStr("msg")); + return Result.OK("编辑用户成功！"); } }else { StringBuffer sb = new StringBuffer();