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 8427f1d..7e99f87 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 @@ -31,6 +31,7 @@ public enum ApiEnum { SWITCH_REGION_ORDER("/tums/resource/v2/switchRegionOrder","移动区域信息"), DELETE_REGION("/tums/resource/v2/deleteRegion","删除区域信息"), GET_ROOT_REGIONS("/tums/resource/v2/getRootRegions","获取区域列表"), + GET_ROOT_REGION_CHILDREN("/tums/resource/v2/getRegionChildren","获取子区域列表"), GET_DEVICE_LIST("/tums/deviceManager/v2/getDeviceList","获取设备列表"), MODIFY_DEVICE_DETAILS("/tums/deviceManager/v1/modifyDeviceDetails","修改设备信息"), REBOOT_DEVICE_LIST("/tums/deviceManager/v2/rebootDeviceList","重启设备"), 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 ee15185..c48ca92 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 @@ -62,7 +62,7 @@ public class RegionInfoController extends JeecgController @@ -131,7 +133,8 @@ update_time = #{updateTime}, media_server_id = #{mediaServerId}, backup_media_server_id = #{backupMediaServerId}, - bind_type = #{bindType} + bind_type = #{bindType}, + iz_leaf = #{izLeaf} where id = #{id} @@ -146,8 +149,9 @@ a.region_level as regionLevel, a.sort, a.parent_id as parentId, - b.project_name as projectName, a.project_id as projectId, + ifnull(p.region_name,'无') as parentName, + b.project_name as projectName, a.sys_type as sysType, a.stream_way as streamWay, a.has_children as hasChildren, @@ -159,6 +163,7 @@ a.iz_leaf as izLeaf from nu_iot_tplink_region a left join nu_iot_tplink_project b on a.project_id = b.project_id + left join nu_iot_tplink_region p on a.parent_id = p.region_id where a.parent_id = #{parentId} and a.project_id = #{projectId} 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 9b155a9..c9451af 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 @@ -83,12 +83,15 @@ public class RegionInfoServiceImpl extends ServiceImpl projectMap = new HashMap<>(); @@ -96,6 +99,56 @@ public class RegionInfoServiceImpl extends ServiceImpl map = new HashMap<>(); + for (String key : voObject.keySet()) { + map.put(key, voObject.getStr(key)); + } + map.put("sort", map.get("order")); + String hasChildren = map.get("hasChildren"); + if(hasChildren.equals("0")){ + map.put("izLeaf", "1"); + }else{ + map.put("izLeaf", "0"); + } + RegionInfo entity = baseMapper.getByRegionId(map); + if(entity==null){ + //新增 + entity = new RegionInfo(); + entity.setRegionId(map.get("regionId")); + baseMapper.add(map); + }else{ + //修改 + map.put("id",String.valueOf(entity.getId())); + baseMapper.updateById(map); + } + if(hasChildren.equals("1")){ + //同步子级 + syncChildren(entity); + } } } } 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 4d6d657..e072b0c 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 @@ -194,8 +194,22 @@ public class TumsApi { */ public String getRootRegions(String jsonRequest){ this.createTumsClient(); + log.info("getRootRegions:request:{}",jsonRequest); String jsonResponse = tumsClient.request(jsonRequest, ApiEnum.GET_ROOT_REGIONS.getValue()); - log.info("getAllProjectInfo:{}",jsonResponse); + log.info("getRootRegions:response:{}",jsonResponse); + return jsonResponse; + } + + /** + * 获取子区域列表 + * @param jsonRequest + * @return + */ + public String getRegionChildren(String jsonRequest){ + this.createTumsClient(); + log.info("getRegionChildren:request:{}",jsonRequest); + String jsonResponse = tumsClient.request(jsonRequest, ApiEnum.GET_ROOT_REGION_CHILDREN.getValue()); + log.info("getRegionChildren:response:{}",jsonResponse); return jsonResponse; }