From 8612e574f074381368ed3b4107d5b7c684508ad7 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 14:53:15 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E6=9C=BA=E6=9E=84=E7=AE=A1=E7=90=86?= =?UTF-8?q?=E5=A2=9E=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/CameraInfoServiceImpl.java | 10 +- .../common/controller/TpLinkController.java | 24 ++- .../tplink/common/entity/TumsConfig.java | 13 ++ .../common/mapper/TumsConfigMapper.java | 5 + .../common/mapper/xml/TumsConfigMapper.xml | 134 ++++++++++++++++ .../common/service/ITumsConfigService.java | 3 + .../service/impl/TumsConfigServiceImpl.java | 144 ++++++++++++++++++ .../com/nu/modules/tplink/enums/ApiEnum.java | 3 + .../tplink/project/entity/ProjectInfo.java | 2 +- .../tplink/region/entity/RegionInfo.java | 4 +- .../com/nu/modules/tplink/utils/TumsApi.java | 51 ++++++- .../controller/SysDepartController.java | 16 ++ 12 files changed, 395 insertions(+), 14 deletions(-) diff --git a/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tplink/camera/service/impl/CameraInfoServiceImpl.java b/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tplink/camera/service/impl/CameraInfoServiceImpl.java index 6dbd07f..d0f2804 100644 --- a/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tplink/camera/service/impl/CameraInfoServiceImpl.java +++ b/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tplink/camera/service/impl/CameraInfoServiceImpl.java @@ -6,7 +6,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.fasterxml.jackson.databind.ObjectMapper; import com.nu.modules.tplink.common.entity.TumsConfig; -import com.nu.modules.tplink.common.service.ITumsConfigService; +import com.nu.modules.tplink.common.mapper.TumsConfigMapper; import org.apache.commons.compress.utils.Lists; import org.apache.shiro.SecurityUtils; import org.jeecg.common.api.vo.Result; @@ -42,7 +42,7 @@ public class CameraInfoServiceImpl extends ServiceImpl chnList = (List)chnMap.get("data"); if(chnList!=null&&chnList.size()>0){ LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal(); - TumsConfig tumsConfig = tumsConfigService.getByCode(sysUser.getOrgCode()); + TumsConfig tumsConfig = tumsConfigMapper.getByCode(sysUser.getOrgCode()); for(int j=0;j playbackMap = getPlaybackUrl(chn,1); @@ -2014,7 +2014,7 @@ public class CameraInfoServiceImpl extends ServiceImpl getUser(TumsConfig tumsConfig) { + return tumsConfigService.getUser(tumsConfig); + } + + /** + * 添加和编辑图门系统用户 + * @return + */ + @PostMapping(value = "/saveUser") + public Result saveUser(@RequestBody TumsConfig tumsConfig) { + return tumsConfigService.saveUser(tumsConfig); + } + } diff --git a/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tplink/common/entity/TumsConfig.java b/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tplink/common/entity/TumsConfig.java index d75fe1c..929f3de 100644 --- a/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tplink/common/entity/TumsConfig.java +++ b/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tplink/common/entity/TumsConfig.java @@ -1,7 +1,11 @@ package com.nu.modules.tplink.common.entity; +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.experimental.Accessors; @@ -21,9 +25,18 @@ import java.io.Serializable; @ApiModel(value="nu_iot_tplink_tums_base", description="护理单元-物联管理-TPLINK图门系统配置信息") public class TumsConfig implements Serializable { private static final long serialVersionUID = 1L; + /**ID*/ + @TableId(type = IdType.AUTO) + @ApiModelProperty(value = "ID") + private Integer id; private String tumsUrl; //获取图门系统地址 + private String tumsProjectId; //图门系统登录项目ID + @TableField(exist = false) + private String tumsProjectName; //图门系统登录项目ID + private String tumsUserId; // 图门系统登录用户ID private String tumsUsername; // 获取图门系统用户 private String tumsPassword; //获取图门系统密码 + private String tumsRoleId; //图门系统角色ID private String ftpIp; //回放视频转FTP上传IP private String ftpPort; //回放视频转FTP上传端口 private String ftpUsername; //回放视频转FTP上传用户 diff --git a/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tplink/common/mapper/TumsConfigMapper.java b/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tplink/common/mapper/TumsConfigMapper.java index 9eace62..3a8620d 100644 --- a/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tplink/common/mapper/TumsConfigMapper.java +++ b/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tplink/common/mapper/TumsConfigMapper.java @@ -4,6 +4,8 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.nu.modules.tplink.common.entity.TumsConfig; import org.apache.ibatis.annotations.Mapper; +import java.util.Map; + /** * @Description: 护理单元-物联管理-错误码 * @Author: jeecg-boot @@ -14,4 +16,7 @@ import org.apache.ibatis.annotations.Mapper; @Mapper public interface TumsConfigMapper extends BaseMapper { TumsConfig getByCode(String orgCode); + TumsConfig findProjectByCodeOrId(TumsConfig tumsConfig); + void addUser(Map map); + void updateUser(Map map); } diff --git a/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tplink/common/mapper/xml/TumsConfigMapper.xml b/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tplink/common/mapper/xml/TumsConfigMapper.xml index 6168032..6ba6303 100644 --- a/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tplink/common/mapper/xml/TumsConfigMapper.xml +++ b/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tplink/common/mapper/xml/TumsConfigMapper.xml @@ -6,8 +6,11 @@ select id, tums_url as tumsUrl, + tums_project_id as tumsProjectId, + tums_userId as tumsUserId, tums_username as tumsUsername, tums_password as tumsPassword, + tums_roleId as tumsRoleId, ftp_ip as ftpIp, ftp_port as ftpPort, ftp_username as ftpUsername, @@ -27,4 +30,135 @@ limit 1 + + + + insert into nu_iot_tplink_tums_base( + + tums_url, + + + tums_project_id, + + + tums_userId, + + + tums_username, + + + tums_password, + + + tums_roleId, + + + ftp_ip, + + + ftp_port, + + + ftp_username, + + + ftp_password, + + + ftp_uploadpath, + + org_code + ) + values( + + #{tumsUrl}, + + + #{tumsProjectId}, + + + #{tumsUserId}, + + + #{tumsUsername}, + + + #{tumsPassword}, + + + #{tumsRoleId}, + + + #{ftpIp}, + + + #{ftpPort}, + + + #{ftpUsername}, + + + #{ftpPassword}, + + + #{ftpUploadpath}, + + #{orgCode} + ) + + + + update nu_iot_tplink_tums_base + set + + tums_url = #{tumsUrl}, + + + tums_project_id = #{tumsProjectId}, + + + tums_userId = #{tumsUserId}, + + + tums_username = #{tumsUsername}, + + + tums_password = #{tumsPassword}, + + + tums_roleId = #{tumsRoleId}, + + + ftp_ip = #{ftpIp}, + + + ftp_port = #{ftpPort}, + + + ftp_username = #{ftpUsername}, + + + ftp_password = #{ftpPassword}, + + + ftp_uploadpath = #{ftpUploadpath}, + + org_code = #{orgCode} + where org_code = #{orgCode} + + \ No newline at end of file diff --git a/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tplink/common/service/ITumsConfigService.java b/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tplink/common/service/ITumsConfigService.java index bc8119d..e1db723 100644 --- a/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tplink/common/service/ITumsConfigService.java +++ b/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tplink/common/service/ITumsConfigService.java @@ -2,6 +2,7 @@ package com.nu.modules.tplink.common.service; import com.baomidou.mybatisplus.extension.service.IService; import com.nu.modules.tplink.common.entity.TumsConfig; +import org.jeecg.common.api.vo.Result; /** * @Description: 护理单元-物联管理-图门系统配置 @@ -11,4 +12,6 @@ import com.nu.modules.tplink.common.entity.TumsConfig; */ public interface ITumsConfigService extends IService { TumsConfig getByCode(String orgCode); + Result getUser(TumsConfig tumsConfig); + Result saveUser(TumsConfig tumsConfig); } 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 ef3eb81..3bb166e 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 @@ -1,11 +1,23 @@ package com.nu.modules.tplink.common.service.impl; +import cn.hutool.json.JSONObject; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.nu.modules.tplink.common.entity.TumsConfig; import com.nu.modules.tplink.common.mapper.TumsConfigMapper; import com.nu.modules.tplink.common.service.ITumsConfigService; +import com.nu.modules.tplink.utils.RsaDecryptUtils; +import com.nu.modules.tplink.utils.TumsApi; +import com.tplink.ignite.libs.developersdk.utils.RsaUtils; +import com.tplink.ignite.libs.developersdk.vo.EncryptKeyForLoginResponseVO; +import me.zhyd.oauth.log.Log; +import org.jeecg.common.api.vo.Result; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import java.util.HashMap; +import java.util.Map; +import java.util.Objects; + /** * @Description: 护理单元-物联管理-图门系统配置 * @Author: caolei @@ -15,9 +27,141 @@ import org.springframework.stereotype.Service; @Service public class TumsConfigServiceImpl extends ServiceImpl implements ITumsConfigService { + @Autowired + private TumsApi tumsApi; + @Override public TumsConfig getByCode(String orgCode){ return baseMapper.getByCode(orgCode); } + @Override + public Result getUser(TumsConfig tumsConfig){ + TumsConfig entity = baseMapper.getByCode(tumsConfig.getOrgCode()); + if(entity == null){ + entity = new TumsConfig(); + entity.setOrgCode(tumsConfig.getOrgCode()); + } + TumsConfig project = baseMapper.findProjectByCodeOrId(entity); + if(project!=null){ + entity.setTumsProjectId(project.getTumsProjectId()); + entity.setTumsProjectName(project.getTumsProjectName()); + } + return Result.OK(entity); + } + + @Override + public Result 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("\"password\"").append(":").append("\"").append(tumsConfig.getTumsPassword()).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()); + } + 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); + return Result.OK("编辑用户成功！"); +// }else{ +// if(errorCodep.equals("-82400")){ +// return Result.error("密码格式错误"); +// }else{ +// return Result.error(jsonObject.getStr("msg")); +// } +// } + }else{ + return Result.error(jsonObject.getStr("msg")); + } + }else { + StringBuffer sb = new StringBuffer(); + sb.append("{"); + sb.append("\"projectId\"").append(":").append("\"").append(tumsConfig.getTumsProjectId()).append("\","); + sb.append("\"username\"").append(":").append("\"").append(tumsConfig.getTumsUsername()).append("\","); + sb.append("\"password\"").append(":").append("\"").append(tumsConfig.getTumsPassword()).append("\","); + sb.append("\"roleList\"").append(":[").append(tumsConfig.getTumsRoleId()).append("]"); + sb.append("}"); + String jsonResponse = tumsApi.addUser(sb.toString()); + JSONObject jsonObject = new JSONObject(jsonResponse); + String errorCode = jsonObject.getStr("error_code"); + if(errorCode.equals("0")){ + JSONObject result = (JSONObject)jsonObject.get("result"); + Map map = new HashMap<>(); + map.put("tumsUserId",result.getStr("userId")); + map.put("tumsUsername",result.getStr("username")); + map.put("tumsPassword",tumsConfig.getTumsPassword()); + map.put("tumsRoleId",tumsConfig.getTumsRoleId()); + 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.addUser(map); + return Result.OK("添加用户成功！"); + }else{ + if(errorCode.equals("-82400")){ + return Result.error("密码格式错误"); + }else{ + return Result.error(jsonObject.getStr("msg")); + } + } + } + } } diff --git a/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tplink/enums/ApiEnum.java b/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tplink/enums/ApiEnum.java index 3ec8a4c..309c99f 100644 --- a/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tplink/enums/ApiEnum.java +++ b/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tplink/enums/ApiEnum.java @@ -21,6 +21,9 @@ public enum ApiEnum { GET_ENCRYPT_KEY_FOR_LOGIN("/tums/account/v1/getEncryptKeyForLogin","获取登录公钥"), LOGIN("/tums/account/v2/login","登录"), LOGOUT("/tums/account/v1/logout","注销"), + ADD_USER("/tums/account/v2/customCreateAccount","添加自定义用户"), + EDIT_USER("/tums/account/v2/editUser","编辑用户"), + CHANGE_PASSWORD("/tums/account/v2/changePassword","修改密码"), SET_CURRENT_PROJECT("/tums/resource/v2/setCurrentProject","设置当前项目"), GET_ALL_PROJECT_INFO("/tums/resource/v2/getAllProjectInfo","获取所有项目信息"), ADD_PROJECT("/tums/resource/v2/addProject","添加项目信息"), diff --git a/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tplink/project/entity/ProjectInfo.java b/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tplink/project/entity/ProjectInfo.java index 2f9be9d..49bf57f 100644 --- a/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tplink/project/entity/ProjectInfo.java +++ b/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tplink/project/entity/ProjectInfo.java @@ -47,7 +47,7 @@ public class ProjectInfo implements Serializable { /**机构ID*/ @Excel(name = "机构ID", width = 15) @ApiModelProperty(value = "机构ID") - @Dict(dicCode = "id" , dictTable = "nu_admin_institution_area" , dicText = "inst_name") + @Dict(dicCode = "id" , dictTable = "sys_depart" , dicText = "depart_name") private String institutionId; /**创建时间戳，单位秒*/ @ApiModelProperty(value = "创建时间戳，单位秒") diff --git a/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tplink/region/entity/RegionInfo.java b/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tplink/region/entity/RegionInfo.java index f87abd7..aa8f246 100644 --- a/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tplink/region/entity/RegionInfo.java +++ b/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tplink/region/entity/RegionInfo.java @@ -44,11 +44,11 @@ public class RegionInfo implements Serializable { /**机构ID*/ @Excel(name = "区域ID", width = 15) @ApiModelProperty(value = "区域ID") - @Dict(dicCode = "id" , dictTable = "nu_admin_institution_area" , dicText = "inst_name") + @Dict(dicCode = "id" , dictTable = "sys_depart" , dicText = "depart_name") private String areaId; @Excel(name = "机构ID", width = 15) @ApiModelProperty(value = "机构ID") - @Dict(dicCode = "id" , dictTable = "nu_admin_institution_area" , dicText = "inst_name") + @Dict(dicCode = "id" , dictTable = "sys_depart" , dicText = "depart_name") private String institutionId; /**分组层级*/ @Excel(name = "分组层级", width = 15) diff --git a/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tplink/utils/TumsApi.java b/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tplink/utils/TumsApi.java index 1e3d43d..551e2a4 100644 --- a/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tplink/utils/TumsApi.java +++ b/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tplink/utils/TumsApi.java @@ -1,7 +1,7 @@ package com.nu.modules.tplink.utils; import com.nu.modules.tplink.common.entity.TumsConfig; -import com.nu.modules.tplink.common.service.ITumsConfigService; +import com.nu.modules.tplink.common.mapper.TumsConfigMapper; import com.tplink.ignite.libs.developersdk.api.TumsClient; import com.tplink.ignite.libs.developersdk.vo.ResultVO; import lombok.extern.slf4j.Slf4j; @@ -18,8 +18,9 @@ public class TumsApi { TumsClient tumsClient; TumsConfig tumsConfig; + @Autowired - private ITumsConfigService tumsConfigService; + private TumsConfigMapper tumsConfigMapper; /** * 创建tumsClient @@ -44,10 +45,15 @@ public class TumsApi { private void initTumsConfig(){ if(tumsConfig==null){ LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal(); - tumsConfig = tumsConfigService.getByCode(sysUser.getOrgCode()); + tumsConfig = tumsConfigMapper.getByCode(sysUser.getOrgCode()); } } + public String getRsaKey(){ + login(); + return tumsClient.getRsaKey(); + } + /** * 登录 * @return @@ -84,6 +90,45 @@ public class TumsApi { } } + /** + * 添加自定义用户 + * @param jsonRequest + * @return + */ + public String addUser(String jsonRequest){ + this.createTumsClient(); + log.info("addUser:request:{}",jsonRequest); + String jsonResponse = tumsClient.requestEncryptedApi(jsonRequest, ApiEnum.ADD_USER.getValue()); + log.info("addUser:response:{}",jsonResponse); + return jsonResponse; + } + + /** + * 编辑用户 + * @param jsonRequest + * @return + */ + public String editUser(String jsonRequest){ + this.createTumsClient(); + log.info("editUser:request:{}",jsonRequest); + String jsonResponse = tumsClient.requestEncryptedApi(jsonRequest, ApiEnum.EDIT_USER.getValue()); + log.info("editUser:response:{}",jsonResponse); + return jsonResponse; + } + + /** + * 编辑用户 + * @param jsonRequest + * @return + */ + public String changePassword(String jsonRequest){ + this.createTumsClient(); + log.info("changePassword:request:{}",jsonRequest); + String jsonResponse = tumsClient.requestEncryptedApi(jsonRequest, ApiEnum.CHANGE_PASSWORD.getValue()); + log.info("changePassword:response:{}",jsonResponse); + return jsonResponse; + } + /** * 设置当前项目 * @param jsonRequest diff --git a/nursing-unit-system/nu-system-biz/src/main/java/org/jeecg/modules/system/controller/SysDepartController.java b/nursing-unit-system/nu-system-biz/src/main/java/org/jeecg/modules/system/controller/SysDepartController.java index 4a1ca7f..a10a886 100644 --- a/nursing-unit-system/nu-system-biz/src/main/java/org/jeecg/modules/system/controller/SysDepartController.java +++ b/nursing-unit-system/nu-system-biz/src/main/java/org/jeecg/modules/system/controller/SysDepartController.java @@ -708,4 +708,20 @@ public class SysDepartController { return result; } + /** + * 查询所有子区域信息 + * @return + */ + @GetMapping("queryChildrenByParentId") + public Result> queryChildrenByParentId(@RequestParam(name = "pid", required = false) String parentId) { + Result> result = new Result<>(); + LambdaQueryWrapper query = new LambdaQueryWrapper(); + query.orderByAsc(SysDepart::getDepartName); + query.eq(SysDepart::getParentId,parentId); + List ls = this.sysDepartService.list(query); + result.setSuccess(true); + result.setResult(ls); + return result; + } + } From 401a2a9bd8d872c4c0f8db7edb2fbc7d31b97b3f 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 14:56:27 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E6=9C=BA=E6=9E=84=E7=AE=A1=E7=90=86?= =?UTF-8?q?=E5=A2=9E=E5=8A=A0TpLink=E7=94=A8=E6=88=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../tplink/common/service/impl/TumsConfigServiceImpl.java | 8 +------- 1 file changed, 1 insertion(+), 7 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 3bb166e..594893c 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 @@ -5,18 +5,13 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.nu.modules.tplink.common.entity.TumsConfig; import com.nu.modules.tplink.common.mapper.TumsConfigMapper; import com.nu.modules.tplink.common.service.ITumsConfigService; -import com.nu.modules.tplink.utils.RsaDecryptUtils; import com.nu.modules.tplink.utils.TumsApi; -import com.tplink.ignite.libs.developersdk.utils.RsaUtils; -import com.tplink.ignite.libs.developersdk.vo.EncryptKeyForLoginResponseVO; -import me.zhyd.oauth.log.Log; import org.jeecg.common.api.vo.Result; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; - import java.util.HashMap; import java.util.Map; -import java.util.Objects; + /** * @Description: 护理单元-物联管理-图门系统配置 @@ -59,7 +54,6 @@ public class TumsConfigServiceImpl extends ServiceImpl