diff --git a/tongran-modules/tongran-system/src/main/java/com/tongran/system/controller/RmResourceRegistrationController.java b/tongran-modules/tongran-system/src/main/java/com/tongran/system/controller/RmResourceRegistrationController.java index dc64242..dc73a08 100644 --- a/tongran-modules/tongran-system/src/main/java/com/tongran/system/controller/RmResourceRegistrationController.java +++ b/tongran-modules/tongran-system/src/main/java/com/tongran/system/controller/RmResourceRegistrationController.java @@ -296,5 +296,13 @@ public class RmResourceRegistrationController extends BaseController { return toAjax(rmResourceRegistrationService.removeServer(rmResourceRegistration.getIds())); } - + /** + * 根据交换机分组 + */ + @Log(title = "根据交换机分组", businessType = BusinessType.UPDATE) + @PostMapping("/bindSwitch") + public AjaxResult bindSwitch(@RequestBody RmResourceRegistration rmResourceRegistration) + { + return toAjax(rmResourceRegistrationService.bindSwitch(rmResourceRegistration)); + } } diff --git a/tongran-modules/tongran-system/src/main/java/com/tongran/system/domain/RmResourceRegistration.java b/tongran-modules/tongran-system/src/main/java/com/tongran/system/domain/RmResourceRegistration.java index 96007ee..29f509e 100644 --- a/tongran-modules/tongran-system/src/main/java/com/tongran/system/domain/RmResourceRegistration.java +++ b/tongran-modules/tongran-system/src/main/java/com/tongran/system/domain/RmResourceRegistration.java @@ -91,7 +91,11 @@ public class RmResourceRegistration extends BaseEntity /** 出省流量占比 */ @Excel(name = "出省流量占比") private BigDecimal outboundRate; - + /** 所属交换机唯一标识*/ + private String switchClientId; + /** 所属交换机名称*/ + @Excel(name = "所属交换机名称") + private String switchName; /** 需要绑定的网卡信息 */ private List bindNetworkMsg; diff --git a/tongran-modules/tongran-system/src/main/java/com/tongran/system/service/IRmResourceRegistrationService.java b/tongran-modules/tongran-system/src/main/java/com/tongran/system/service/IRmResourceRegistrationService.java index d9bc1ea..878896e 100644 --- a/tongran-modules/tongran-system/src/main/java/com/tongran/system/service/IRmResourceRegistrationService.java +++ b/tongran-modules/tongran-system/src/main/java/com/tongran/system/service/IRmResourceRegistrationService.java @@ -157,4 +157,6 @@ public interface IRmResourceRegistrationService RmResourceRegistration getMaxAgentVersion(); RmResourceRegistration selectRmResourceRegistrationByClientId(RmResourceRegistration rmResourceRegistration); + + int bindSwitch(RmResourceRegistration rmResourceRegistration); } diff --git a/tongran-modules/tongran-system/src/main/java/com/tongran/system/service/impl/RmResourceRegistrationServiceImpl.java b/tongran-modules/tongran-system/src/main/java/com/tongran/system/service/impl/RmResourceRegistrationServiceImpl.java index f7c4f38..e1ab396 100644 --- a/tongran-modules/tongran-system/src/main/java/com/tongran/system/service/impl/RmResourceRegistrationServiceImpl.java +++ b/tongran-modules/tongran-system/src/main/java/com/tongran/system/service/impl/RmResourceRegistrationServiceImpl.java @@ -1476,4 +1476,18 @@ public class RmResourceRegistrationServiceImpl implements IRmResourceRegistratio } return new RmResourceRegistration(); } + + @Override + public int bindSwitch(RmResourceRegistration rmResourceRegistration) { + String clientIds = rmResourceRegistration.getDeployDevice(); + String[] clientIdArr = clientIds.split("\n"); + for (String clientId : clientIdArr) { + RmResourceRegistration updateData = new RmResourceRegistration(); + updateData.setClientId(clientId); + updateData.setSwitchName(rmResourceRegistration.getSwitchName()); + updateData.setSwitchClientId(rmResourceRegistration.getSwitchClientId()); + rmResourceRegistrationMapper.updateStatusByResource(updateData); + } + return 1; + } } diff --git a/tongran-modules/tongran-system/src/main/resources/mapper/system/RmResourceRegistrationMapper.xml b/tongran-modules/tongran-system/src/main/resources/mapper/system/RmResourceRegistrationMapper.xml index 5ffbd3e..3484ba2 100644 --- a/tongran-modules/tongran-system/src/main/resources/mapper/system/RmResourceRegistrationMapper.xml +++ b/tongran-modules/tongran-system/src/main/resources/mapper/system/RmResourceRegistrationMapper.xml @@ -29,16 +29,19 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + + - select id, client_id, hardware_sn, business_name, logical_node_id, multi_public_ip_status, registration_status, online_status, resource_type, agent_version, create_time, update_time, heartbeat_count, heartbeat_interval, onboard_time, remark, create_by, update_by, reported_bandwidth, del_alarm_time, outbound_rate from rm_resource_registration + select id, client_id, hardware_sn, business_name, logical_node_id, multi_public_ip_status, registration_status, online_status, resource_type, agent_version, create_time, update_time, heartbeat_count, heartbeat_interval, onboard_time, remark, create_by, update_by, reported_bandwidth, del_alarm_time, outbound_rate,switch_client_id, switch_name from rm_resource_registration