From 33aae96b73f0a971c56052f90bd1d6947b22920e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9B=B9=E7=A3=8A?= <45566618@qq.com> Date: Thu, 20 Mar 2025 09:27:23 +0800 Subject: [PATCH] =?UTF-8?q?tplink=E6=91=84=E5=83=8F=E5=A4=B4=E6=9C=BA?= =?UTF-8?q?=E6=9E=84=E5=A2=9E=E5=88=A0=E6=94=B9=E5=90=8C=E6=AD=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/nu/modules/tplink/enums/ApiEnum.java | 4 ++ .../controller/ProjectInfoController.java | 33 +++++---- .../controller/RegionInfoController.java | 60 +++++++++++++++- .../region/mapper/RegionInfoMapper.java | 1 + .../region/mapper/xml/RegionInfoMapper.xml | 46 ++++++++----- .../region/service/IRegionInfoService.java | 4 ++ .../service/impl/RegionInfoServiceImpl.java | 69 ++++++++++++++++++- .../com/nu/modules/tplink/utils/TumsApi.java | 52 ++++++++++++++ 8 files changed, 230 insertions(+), 39 deletions(-) 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 148f149..8427f1d 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 @@ -26,6 +26,10 @@ public enum ApiEnum { ADD_PROJECT("/tums/resource/v2/addProject","添加项目信息"), EDIT_PROJECT("/tums/resource/v2/editProject","修改项目信息"), DELETE_PROJECT("/tums/resource/v2/deleteProject","删除项目信息"), + ADD_REGION("/tums/resource/v2/addRegion","添加区域信息"), + EDIT_REGION("/tums/resource/v2/editRegion","修改区域信息"), + SWITCH_REGION_ORDER("/tums/resource/v2/switchRegionOrder","移动区域信息"), + DELETE_REGION("/tums/resource/v2/deleteRegion","删除区域信息"), GET_ROOT_REGIONS("/tums/resource/v2/getRootRegions","获取区域列表"), GET_DEVICE_LIST("/tums/deviceManager/v2/getDeviceList","获取设备列表"), MODIFY_DEVICE_DETAILS("/tums/deviceManager/v1/modifyDeviceDetails","修改设备信息"), diff --git a/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tplink/project/controller/ProjectInfoController.java b/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tplink/project/controller/ProjectInfoController.java index 3ec6f14..531aa7b 100644 --- a/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tplink/project/controller/ProjectInfoController.java +++ b/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tplink/project/controller/ProjectInfoController.java @@ -1,6 +1,6 @@ /** * Version：v1.0.0 , - * Description：TP-LINK厂家项目信息相关操作 + * Description：TP-LINK厂家机构信息相关操作 * CreateDate：2025-01-22 09:00:00 * Author：曹磊 */ @@ -8,7 +8,6 @@ package com.nu.modules.tplink.project.controller; import javax.servlet.http.HttpServletRequest; -import com.nu.modules.tplink.alarm.entity.AlarmLog; import org.apache.shiro.authz.annotation.RequiresPermissions; import org.jeecg.common.api.vo.Result; import com.baomidou.mybatisplus.core.metadata.IPage; @@ -27,12 +26,12 @@ import io.swagger.annotations.ApiOperation; import java.util.List; /** - * @Description: 护理单元-物联管理-TPLINK项目信息 + * @Description: 护理单元-物联管理-TPLINK机构信息 * @Author: jeecg-boot * @Date: 2025-01-22 * @Version: V1.0 */ -@Api(tags="护理单元-物联管理-TPLINK项目信息") +@Api(tags="护理单元-物联管理-TPLINK机构信息") @RestController @RequestMapping("/iot/projectInfo") @Slf4j @@ -49,8 +48,8 @@ public class ProjectInfoController extends JeecgController> queryPageList(ProjectInfo projectInfo, @RequestParam(name="pageNo", defaultValue="1") Integer pageNo, @@ -62,7 +61,7 @@ public class ProjectInfoController extends JeecgController add(@RequestBody ProjectInfo projectInfo) { return service.addProject(projectInfo); @@ -109,8 +108,8 @@ public class ProjectInfoController extends JeecgController edit(@RequestBody ProjectInfo projectInfo) { return service.editProject(projectInfo); @@ -122,10 +121,10 @@ public class ProjectInfoController extends JeecgController delete(@RequestBody ProjectInfo projectInfo) { + public Result deleteProject(@RequestBody ProjectInfo projectInfo) { return service.deleteProject(projectInfo); } @@ -135,8 +134,8 @@ public class ProjectInfoController extends JeecgController queryById(@RequestParam(name="id",required=true) String id) { ProjectInfo projectInfo = service.getById(id); diff --git a/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tplink/region/controller/RegionInfoController.java b/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tplink/region/controller/RegionInfoController.java index b33a2dc..ee15185 100644 --- a/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tplink/region/controller/RegionInfoController.java +++ b/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tplink/region/controller/RegionInfoController.java @@ -44,8 +44,8 @@ public class RegionInfoController extends JeecgController> queryPageList(RegionInfo regionInfo, @RequestParam(name="pageNo", defaultValue="1") Integer pageNo, @@ -86,4 +86,60 @@ public class RegionInfoController extends JeecgController add(@RequestBody RegionInfo regionInfo) { + return service.addRegion(regionInfo); + } + + /** + * 编辑 + * + * @param regionInfo + * @return + */ +// @AutoLog(value = "护理单元-物联管理-TPLINK区域信息-编辑") + @ApiOperation(value="护理单元-物联管理-TPLINK区域信息-编辑", notes="护理单元-物联管理-TPLINK区域信息-编辑") + @PostMapping(value = "/edit") + public Result edit(@RequestBody RegionInfo regionInfo) { + return service.editRegion(regionInfo); + } + + /** + * 通过id删除 + * + * @param regionInfo + * @return + */ +// @AutoLog(value = "护理单元-物联管理-TPLINK区域信息-编辑") + @ApiOperation(value="护理单元-物联管理-TPLINK区域信息-通过id删除", notes="护理单元-物联管理-TPLINK区域信息-通过id删除") + @PostMapping(value = "/delete") + public Result deleteRegion(@RequestBody RegionInfo regionInfo) { + return service.deleteRegion(regionInfo); + } + + /** + * 通过id查询 + * + * @param id + * @return + */ + //@AutoLog(value = "护理单元-物联管理-TPLINK区域信息-通过id查询") + @ApiOperation(value="护理单元-物联管理-TPLINK区域信息-通过id查询", notes="护理单元-物联管理-TPLINK区域信息-通过id查询") + @GetMapping(value = "/queryById") + public Result queryById(@RequestParam(name="id",required=true) String id) { + RegionInfo regionInfo = service.getById(id); + if(regionInfo==null) { + return Result.error("未找到对应数据"); + } + return Result.OK(regionInfo); + } + } diff --git a/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tplink/region/mapper/RegionInfoMapper.java b/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tplink/region/mapper/RegionInfoMapper.java index 2fe3196..b7bafc5 100644 --- a/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tplink/region/mapper/RegionInfoMapper.java +++ b/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tplink/region/mapper/RegionInfoMapper.java @@ -20,5 +20,6 @@ public interface RegionInfoMapper extends BaseMapper { IPage findPage(Page page, @Param("params") RegionInfo regionInfo); int add(Map map); int updateById(Map map); + int deleteByRegionId(String regionId); List queryTreeListByPid(String parentId,String projectId); } diff --git a/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tplink/region/mapper/xml/RegionInfoMapper.xml b/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tplink/region/mapper/xml/RegionInfoMapper.xml index a755b3e..80840c8 100644 --- a/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tplink/region/mapper/xml/RegionInfoMapper.xml +++ b/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tplink/region/mapper/xml/RegionInfoMapper.xml @@ -4,22 +4,24 @@ select a.id, a.region_id as regionId, diff --git a/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tplink/region/service/IRegionInfoService.java b/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tplink/region/service/IRegionInfoService.java index 5dbe17b..f1ad5c1 100644 --- a/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tplink/region/service/IRegionInfoService.java +++ b/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tplink/region/service/IRegionInfoService.java @@ -21,4 +21,8 @@ public interface IRegionInfoService extends IService { List findList(RegionInfo regionInfo); IPage findPage(Page page, RegionInfo regionInfo); List queryTreeListByPid(String parentId,String projectId); + + Result addRegion(RegionInfo regionInfo); + Result editRegion(RegionInfo regionInfo); + Result deleteRegion(RegionInfo regionInfo); } diff --git a/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tplink/region/service/impl/RegionInfoServiceImpl.java b/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tplink/region/service/impl/RegionInfoServiceImpl.java index df1e103..9b155a9 100644 --- a/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tplink/region/service/impl/RegionInfoServiceImpl.java +++ b/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tplink/region/service/impl/RegionInfoServiceImpl.java @@ -7,9 +7,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import lombok.extern.slf4j.Slf4j; import org.jeecg.common.api.vo.Result; -import com.nu.modules.tplink.project.entity.ProjectInfo; import com.nu.modules.tplink.project.mapper.ProjectInfoMapper; -import com.nu.modules.tplink.project.model.ProjectTreeModel; import com.nu.modules.tplink.region.entity.RegionInfo; import com.nu.modules.tplink.region.mapper.RegionInfoMapper; import com.nu.modules.tplink.region.model.RegionTreeModel; @@ -143,4 +141,71 @@ public class RegionInfoServiceImpl extends ServiceImpl addRegion(RegionInfo regionInfo){ + StringBuffer sb = new StringBuffer(); + sb.append("{"); + sb.append("\"projectId\"").append(":").append("\"").append(regionInfo.getProjectId()).append("\","); + sb.append("\"parentId\"").append(":").append("\"").append(regionInfo.getParentId()).append("\","); + sb.append("\"regionName\"").append(":").append("\"").append(regionInfo.getRegionName()).append("\","); + sb.append("\"sysType\"").append(":").append("3"); + sb.append("}"); + String jsonResponse = tumsApi.addRegion(sb.toString()); + JSONObject jsonObject = new JSONObject(jsonResponse); + String errorCode = jsonObject.getStr("error_code"); + if(errorCode.equals("0")){ + sync(regionInfo); + return Result.OK("区域添加成功！"); + }else{ + return Result.error(jsonObject.getStr("msg")); + } + } + + /** + * 编辑 + * + */ + @Override + public Result editRegion(RegionInfo regionInfo){ + StringBuffer sb = new StringBuffer(); + sb.append("{"); + sb.append("\"regionId\"").append(":").append("\"").append(regionInfo.getRegionId()).append("\","); + sb.append("\"regionName\"").append(":").append("\"").append(regionInfo.getRegionName()).append("\""); + sb.append("}"); + String jsonResponse = tumsApi.editRegion(sb.toString()); + JSONObject jsonObject = new JSONObject(jsonResponse); + String errorCode = jsonObject.getStr("error_code"); + if(errorCode.equals("0")){ + sync(regionInfo); + return Result.OK("区域编辑成功！"); + }else{ + return Result.error(jsonObject.getStr("msg")); + } + } + + /** + * 通过id删除 + * + */ + @Override + public Result deleteRegion(RegionInfo regionInfo){ + StringBuffer sb = new StringBuffer(); + sb.append("{"); + sb.append("\"regionId\"").append(":").append("\"").append(regionInfo.getRegionId()).append("\""); + sb.append("}"); + String jsonResponse = tumsApi.deleteRegion(sb.toString()); + JSONObject jsonObject = new JSONObject(jsonResponse); + String errorCode = jsonObject.getStr("error_code"); + if(errorCode.equals("0")||errorCode.equals("-82401")){ + baseMapper.deleteByRegionId(regionInfo.getRegionId()); + return Result.OK("区域删除成功！"); + }else{ + return Result.error(jsonObject.getStr("msg")); + } + } + } 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 a36e708..4d6d657 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 @@ -135,6 +135,58 @@ public class TumsApi { return jsonResponse; } + /** + * 添加区域信息 + * @param jsonRequest + * @return + */ + public String addRegion(String jsonRequest){ + this.createTumsClient(); + log.info("addRegion:request:{}",jsonRequest); + String jsonResponse = tumsClient.request(jsonRequest, ApiEnum.ADD_REGION.getValue()); + log.info("addRegion:response:{}",jsonResponse); + return jsonResponse; + } + + /** + * 修改区域信息 + * @param jsonRequest + * @return + */ + public String editRegion(String jsonRequest){ + this.createTumsClient(); + log.info("editRegion:request:{}",jsonRequest); + String jsonResponse = tumsClient.request(jsonRequest, ApiEnum.EDIT_REGION.getValue()); + log.info("editRegion:response:{}",jsonResponse); + return jsonResponse; + } + + /** + * 移动区域信息 + * @param jsonRequest + * @return + */ + public String switchRegionOrder(String jsonRequest){ + this.createTumsClient(); + log.info("switchRegionOrder:request:{}",jsonRequest); + String jsonResponse = tumsClient.request(jsonRequest, ApiEnum.SWITCH_REGION_ORDER.getValue()); + log.info("switchRegionOrder:response:{}",jsonResponse); + return jsonResponse; + } + + /** + * 删除区域信息 + * @param jsonRequest + * @return + */ + public String deleteRegion(String jsonRequest){ + this.createTumsClient(); + log.info("deleteRegion:request:{}",jsonRequest); + String jsonResponse = tumsClient.request(jsonRequest, ApiEnum.DELETE_REGION.getValue()); + log.info("deleteRegion:response:{}",jsonResponse); + return jsonResponse; + } + /** * 获取区域列表 * @param jsonRequest