diff --git a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/RemoteRocketMqService.java b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/RemoteRocketMqService.java index 8b0389e..1a6cf78 100644 --- a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/RemoteRocketMqService.java +++ b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/RemoteRocketMqService.java @@ -4,6 +4,7 @@ import com.ruoyi.common.core.constant.SecurityConstants; import com.ruoyi.common.core.constant.ServiceNameConstants; import com.ruoyi.common.core.domain.R; import com.ruoyi.system.api.domain.RmAlarmRecordRemote; +import com.ruoyi.system.api.domain.RmNetworkInterfaceRemote; import com.ruoyi.system.api.factory.RemoteRocketMqFallbackFactory; import org.springframework.cloud.openfeign.FeignClient; import org.springframework.web.bind.annotation.*; @@ -42,4 +43,13 @@ public interface RemoteRocketMqService { */ @GetMapping("/alarmRecord/alarmHandlingStatus") public R alarmHandlingStatus(@RequestHeader(SecurityConstants.FROM_SOURCE) String source); + + /** + * 获取网卡接口列表 + * @param rmNetworkInterfaceRemote + * @param source + * @return + */ + @PostMapping("/networkInterface/getNetworkInterfaceList") + public R> getNetworkInterfaceList(@RequestBody RmNetworkInterfaceRemote rmNetworkInterfaceRemote, @RequestHeader(SecurityConstants.FROM_SOURCE) String source); } diff --git a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/RmNetworkInterfaceRemote.java b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/RmNetworkInterfaceRemote.java new file mode 100644 index 0000000..8082f7b --- /dev/null +++ b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/RmNetworkInterfaceRemote.java @@ -0,0 +1,53 @@ +package com.ruoyi.system.api.domain; + +import com.ruoyi.common.core.annotation.Excel; +import com.ruoyi.common.core.web.domain.BaseEntity; +import lombok.Data; + +@Data +public class RmNetworkInterfaceRemote extends BaseEntity { + /** 主键ID */ + private Long id; + + /** 客户端ID */ + @Excel(name = "客户端ID") + private String clientId; + + /** 运营商 */ + @Excel(name = "运营商") + private String isp; + + /** 省 */ + @Excel(name = "省") + private String province; + + /** 市 */ + @Excel(name = "市") + private String city; + + /** 公网IP */ + @Excel(name = "公网IP") + private String publicIp; + + /** 接口名称 */ + @Excel(name = "接口名称") + private String interfaceName; + + /** MAC地址 */ + @Excel(name = "MAC地址") + private String macAddress; + + /** 接口类型 */ + @Excel(name = "接口类型") + private String interfaceType; + + /** IPv4地址 */ + @Excel(name = "IPv4地址") + private String ipv4Address; + + /** 网关 */ + @Excel(name = "网关") + private String gateway; + /** 绑定ip 1业务IP，2管理ip */ + private String bindIp; +} diff --git a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/factory/RemoteRocketMqFallbackFactory.java b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/factory/RemoteRocketMqFallbackFactory.java index d7444b5..871c383 100644 --- a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/factory/RemoteRocketMqFallbackFactory.java +++ b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/factory/RemoteRocketMqFallbackFactory.java @@ -3,6 +3,7 @@ package com.ruoyi.system.api.factory; import com.ruoyi.common.core.domain.R; import com.ruoyi.system.api.RemoteRocketMqService; import com.ruoyi.system.api.domain.RmAlarmRecordRemote; +import com.ruoyi.system.api.domain.RmNetworkInterfaceRemote; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.cloud.openfeign.FallbackFactory; @@ -45,6 +46,11 @@ public class RemoteRocketMqFallbackFactory implements FallbackFactory alarmHandlingStatus(String source) { return R.fail(throwable.getMessage()); } + + @Override + public R> getNetworkInterfaceList(RmNetworkInterfaceRemote rmNetworkInterfaceRemote, String source) { + return R.fail(throwable.getMessage()); + } }; } } diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/RmSwitchManagementController.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/RmSwitchManagementController.java index 1d2170c..27965fd 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/RmSwitchManagementController.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/RmSwitchManagementController.java @@ -100,4 +100,14 @@ public class RmSwitchManagementController extends BaseController { return toAjax(rmSwitchManagementService.deleteRmSwitchManagementByIds(ids)); } + /** + * 查询交换机管理列表 + */ + @RequiresPermissions("system:switchManagement:list") + @PostMapping("/getAllSwitchName") + public AjaxResult getAllSwitchName(@RequestBody RmSwitchManagement rmSwitchManagement) + { + List list = rmSwitchManagementService.selectRmSwitchManagementList(rmSwitchManagement); + return success(list); + } } diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/EpsMethodChangeRecord.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/EpsMethodChangeRecord.java index b9d8dd3..5d8d4d6 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/EpsMethodChangeRecord.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/EpsMethodChangeRecord.java @@ -49,6 +49,8 @@ public class EpsMethodChangeRecord extends BaseEntity /** 业务代码(12位) */ private String businessCode; + /** 客户端id */ + private String clientId; /** 开始时间 */ private String startTime; /** 结束时间 */ diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/RmEpsTopologyManagement.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/RmEpsTopologyManagement.java index 780dce2..4be09db 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/RmEpsTopologyManagement.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/RmEpsTopologyManagement.java @@ -75,4 +75,19 @@ public class RmEpsTopologyManagement extends BaseEntity private String switchIpAddress; /** 资源名称 */ private String resourceName; + + /** + * 对端交换机名称 + */ + private String peerSwitchName; + + /** + * 对端交换机接口 + */ + private String peerSwitchInterface; + + /** + * 服务器clientId + */ + private String serverClientId; } diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/RmSwitchInterfaceInfo.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/RmSwitchInterfaceInfo.java index ca64448..d2c842a 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/RmSwitchInterfaceInfo.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/RmSwitchInterfaceInfo.java @@ -1,9 +1,8 @@ package com.ruoyi.system.domain; -import org.apache.commons.lang3.builder.ToStringBuilder; -import org.apache.commons.lang3.builder.ToStringStyle; import com.ruoyi.common.core.annotation.Excel; import com.ruoyi.common.core.web.domain.BaseEntity; +import lombok.Data; /** * 交换机接口信息对象 rm_switch_interface_info @@ -11,6 +10,7 @@ import com.ruoyi.common.core.web.domain.BaseEntity; * @author gyt * @date 2025-10-10 */ +@Data public class RmSwitchInterfaceInfo extends BaseEntity { private static final long serialVersionUID = 1L; @@ -33,69 +33,4 @@ public class RmSwitchInterfaceInfo extends BaseEntity /** 接口备注 */ @Excel(name = "接口备注") private String interfaceRemark; - - public void setId(Long id) - { - this.id = id; - } - - public Long getId() - { - return id; - } - - public void setHardwareSn(String hardwareSn) - { - this.hardwareSn = hardwareSn; - } - - public String getHardwareSn() - { - return hardwareSn; - } - - public void setSwitchName(String switchName) - { - this.switchName = switchName; - } - - public String getSwitchName() - { - return switchName; - } - - public void setInterfaceName(String interfaceName) - { - this.interfaceName = interfaceName; - } - - public String getInterfaceName() - { - return interfaceName; - } - - public void setInterfaceRemark(String interfaceRemark) - { - this.interfaceRemark = interfaceRemark; - } - - public String getInterfaceRemark() - { - return interfaceRemark; - } - - @Override - public String toString() { - return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) - .append("id", getId()) - .append("hardwareSn", getHardwareSn()) - .append("switchName", getSwitchName()) - .append("interfaceName", getInterfaceName()) - .append("interfaceRemark", getInterfaceRemark()) - .append("createTime", getCreateTime()) - .append("updateTime", getUpdateTime()) - .append("createBy", getCreateBy()) - .append("updateBy", getUpdateBy()) - .toString(); - } } diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/RmSwitchManagement.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/RmSwitchManagement.java index fbbacd6..68e3ede 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/RmSwitchManagement.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/RmSwitchManagement.java @@ -44,11 +44,11 @@ public class RmSwitchManagement extends BaseEntity private Date upTime; /** 心跳监测次数 */ @Excel(name = "心跳监测次数") - private Long heartbeatCount; + private String heartbeatCount; /** 心跳监测周期(秒) */ @Excel(name = "心跳监测周期(秒)") - private Long heartbeatInterval; + private String heartbeatInterval; /** 心跳检测OID */ @Excel(name = "心跳检测OID") @@ -77,6 +77,10 @@ public class RmSwitchManagement extends BaseEntity /** 密码 */ @Excel(name = "密码") private String switchPassword; + /** 交换机类型 */ + private String switchType; + /** 用户名 */ + private String switchUser; /** 端口备注列表 */ private List switchInterfaceInfoList; diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/EpsBusinessDeployServiceImpl.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/EpsBusinessDeployServiceImpl.java index 58dfbdf..d67cc3c 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/EpsBusinessDeployServiceImpl.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/EpsBusinessDeployServiceImpl.java @@ -1,11 +1,16 @@ package com.ruoyi.system.service.impl; +import com.ruoyi.common.core.constant.SecurityConstants; import com.ruoyi.common.core.utils.DateUtils; import com.ruoyi.common.core.utils.StringUtils; import com.ruoyi.common.security.utils.SecurityUtils; +import com.ruoyi.system.api.RemoteRocketMqService; +import com.ruoyi.system.api.domain.RmNetworkInterfaceRemote; import com.ruoyi.system.domain.EpsBusinessDeploy; +import com.ruoyi.system.domain.EpsMethodChangeRecord; import com.ruoyi.system.domain.RmResourceRegistration; import com.ruoyi.system.mapper.EpsBusinessDeployMapper; +import com.ruoyi.system.mapper.EpsMethodChangeRecordMapper; import com.ruoyi.system.mapper.RmResourceRegistrationMapper; import com.ruoyi.system.service.IEpsBusinessDeployService; import org.springframework.beans.factory.annotation.Autowired; @@ -13,6 +18,7 @@ import org.springframework.stereotype.Service; import java.util.ArrayList; import java.util.List; +import java.util.stream.Collectors; /** * 业务下发管理Service业务层处理 @@ -27,6 +33,10 @@ public class EpsBusinessDeployServiceImpl implements IEpsBusinessDeployService private EpsBusinessDeployMapper epsBusinessDeployMapper; @Autowired private RmResourceRegistrationMapper rmResourceRegistrationMapper; + @Autowired + private RemoteRocketMqService remoteRocketMqService; + @Autowired + private EpsMethodChangeRecordMapper epsMethodChangeRecordMapper; /** * 查询业务下发管理 @@ -147,6 +157,40 @@ public class EpsBusinessDeployServiceImpl implements IEpsBusinessDeployService // 设置审核信息 epsBusinessDeploy.setReviewBy(SecurityUtils.getUsername()); epsBusinessDeploy.setReviewTime(DateUtils.getNowDate()); - return epsBusinessDeployMapper.updateEpsBusinessDeploy(epsBusinessDeploy); + int rows = epsBusinessDeployMapper.updateEpsBusinessDeploy(epsBusinessDeploy); + // 根据id查询业务信息 + EpsBusinessDeploy businessMsg = epsBusinessDeployMapper.selectEpsBusinessDeployById(epsBusinessDeploy.getId()); + String businessCode = businessMsg.getBusinessCode(); + String businessName = businessMsg.getBusinessName(); + String clientIdStr = businessMsg.getDeployDevice(); + String[] clientIds = clientIdStr.split("\n"); + // 保存业务修改记录 + for (String clientId : clientIds) { + // 根据clientId查询网卡接口名称 + RmNetworkInterfaceRemote queryParam = new RmNetworkInterfaceRemote(); + queryParam.setClientId(clientId); + List interfaceList = remoteRocketMqService.getNetworkInterfaceList(queryParam, SecurityConstants.INNER).getData(); + String interfaceName = ""; + if (interfaceList != null && !interfaceList.isEmpty()) { + interfaceName = interfaceList.stream() + .filter(interfaceRemote -> "1".equals(interfaceRemote.getBindIp())) + .map(RmNetworkInterfaceRemote::getInterfaceName) + .filter(name -> name != null && !name.trim().isEmpty()) + .collect(Collectors.joining(",")); + } + EpsMethodChangeRecord changeRecord = new EpsMethodChangeRecord(); + // 设置基本信息 + changeRecord.setClientId(clientId); + changeRecord.setTrafficPort(interfaceName); + changeRecord.setBusinessCode(businessCode); + changeRecord.setBusinessName(businessName); + changeRecord.setCreateTime(DateUtils.getNowDate()); + changeRecord.setCreatBy(SecurityUtils.getUsername()); + // 修改内容 + String content = "流量网口设置为" + interfaceName + ",业务为" + businessName; + // 保存数据 + epsMethodChangeRecordMapper.insertEpsMethodChangeRecord(changeRecord); + } + return 1; } } diff --git a/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/EpsMethodChangeRecordMapper.xml b/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/EpsMethodChangeRecordMapper.xml index b6532f4..522a95c 100644 --- a/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/EpsMethodChangeRecordMapper.xml +++ b/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/EpsMethodChangeRecordMapper.xml @@ -18,10 +18,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + - select id, node_name, change_content, hardware_sn, create_time, creat_by, update_time, update_by, revenue_method, traffic_port, package_bandwidth, business_name, business_code from eps_method_change_record + select id, node_name, change_content, hardware_sn, create_time, creat_by, update_time, update_by, revenue_method, traffic_port, package_bandwidth, business_name, business_code, client_id from eps_method_change_record @@ -42,6 +45,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" and updater_name like concat('%', #{updaterName}, '%') and switch_ip_address = #{switchIpAddress} and (switch_name like concat('%', #{resourceName}, '%') or server_name like concat('%', #{resourceName}, '%')) + and peer_switch_name like concat('%', #{peerSwitchName}, '%') + and peer_switch_interface = #{peerSwitchInterface} + and server_client_id = #{serverClientId} @@ -67,6 +73,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" updater_id, updater_name, switch_ip_address, + peer_switch_name, + peer_switch_interface, + server_client_id, #{switchName}, @@ -83,6 +92,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" #{updaterId}, #{updaterName}, #{switchIpAddress}, + #{peerSwitchName}, + #{peerSwitchInterface}, + #{serverClientId}, @@ -103,6 +115,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" updater_id = #{updaterId}, updater_name = #{updaterName}, switch_ip_address = #{switchIpAddress}, + peer_switch_name = #{peerSwitchName}, + peer_switch_interface = #{peerSwitchInterface}, + server_client_id = #{serverClientId}, where id = #{id} diff --git a/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/RmSwitchManagementMapper.xml b/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/RmSwitchManagementMapper.xml index f2283dc..d002fd9 100644 --- a/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/RmSwitchManagementMapper.xml +++ b/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/RmSwitchManagementMapper.xml @@ -6,6 +6,7 @@ + @@ -20,6 +21,7 @@ + @@ -28,19 +30,20 @@ - select id, switch_name, hardware_sn, snmp_address, snmp_port, online_status, heartbeat_count, heartbeat_interval, heartbeat_oid, snmp_version, up_time, read_write_permission, security_level, encryption_method, community_name, switch_password, create_time, update_time, create_by, update_by from rm_switch_management + select id, switch_type, switch_name, hardware_sn, snmp_address, snmp_port, online_status, heartbeat_count, heartbeat_interval, heartbeat_oid, snmp_version, up_time, read_write_permission, security_level, encryption_method, community_name, switch_user, switch_password, create_time, update_time, create_by, update_by from rm_switch_management @@ -60,13 +64,14 @@ insert into rm_switch_management + switch_type, switch_name, hardware_sn, snmp_address, snmp_port, online_status, - heartbeat_count, - heartbeat_interval, + heartbeat_count, + heartbeat_interval, heartbeat_oid, snmp_version, up_time, @@ -74,6 +79,7 @@ security_level, encryption_method, community_name, + switch_user, switch_password, create_time, update_time, @@ -81,13 +87,14 @@ update_by, + #{switchType}, #{switchName}, #{hardwareSn}, #{snmpAddress}, #{snmpPort}, #{onlineStatus}, - #{heartbeatCount}, - #{heartbeatInterval}, + #{heartbeatCount}, + #{heartbeatInterval}, #{heartbeatOid}, #{snmpVersion}, #{upTime}, @@ -95,6 +102,7 @@ #{securityLevel}, #{encryptionMethod}, #{communityName}, + #{switchUser}, #{switchPassword}, #{createTime}, #{updateTime}, @@ -106,13 +114,14 @@ update rm_switch_management + switch_type = #{switchType}, switch_name = #{switchName}, hardware_sn = #{hardwareSn}, snmp_address = #{snmpAddress}, snmp_port = #{snmpPort}, online_status = #{onlineStatus}, - heartbeat_count = #{heartbeatCount}, - heartbeat_interval = #{heartbeatInterval}, + heartbeat_count = #{heartbeatCount}, + heartbeat_interval = #{heartbeatInterval}, heartbeat_oid = #{heartbeatOid}, snmp_version = #{snmpVersion}, up_time = #{upTime}, @@ -120,6 +129,7 @@ security_level = #{securityLevel}, encryption_method = #{encryptionMethod}, community_name = #{communityName}, + switch_user = #{switchUser}, switch_password = #{switchPassword}, create_time = #{createTime}, update_time = #{updateTime}, diff --git a/ruoyi-rocketmq/src/main/java/com/ruoyi/rocketmq/controller/InitialSwitchOtherCollectDataController.java b/ruoyi-rocketmq/src/main/java/com/ruoyi/rocketmq/controller/InitialSwitchOtherCollectDataController.java index 45b52b1..63f4271 100644 --- a/ruoyi-rocketmq/src/main/java/com/ruoyi/rocketmq/controller/InitialSwitchOtherCollectDataController.java +++ b/ruoyi-rocketmq/src/main/java/com/ruoyi/rocketmq/controller/InitialSwitchOtherCollectDataController.java @@ -103,7 +103,7 @@ public class InitialSwitchOtherCollectDataController extends BaseController @PostMapping("/getSwitchMonitorMsg") public AjaxResult getSwitchMonitorMsg(@RequestBody InitialSwitchOtherCollectData initialSwitchOtherCollectData) { - List list = initialSwitchOtherCollectDataService.getSwitchMonitorMsg(initialSwitchOtherCollectData); + Map list = initialSwitchOtherCollectDataService.getSwitchMonitorMsg(initialSwitchOtherCollectData); return success(list); } /** diff --git a/ruoyi-rocketmq/src/main/java/com/ruoyi/rocketmq/controller/RmNetworkInterfaceController.java b/ruoyi-rocketmq/src/main/java/com/ruoyi/rocketmq/controller/RmNetworkInterfaceController.java new file mode 100644 index 0000000..ea038ff --- /dev/null +++ b/ruoyi-rocketmq/src/main/java/com/ruoyi/rocketmq/controller/RmNetworkInterfaceController.java @@ -0,0 +1,110 @@ +package com.ruoyi.rocketmq.controller; + +import com.ruoyi.common.core.domain.R; +import com.ruoyi.common.core.utils.poi.ExcelUtil; +import com.ruoyi.common.core.web.controller.BaseController; +import com.ruoyi.common.core.web.domain.AjaxResult; +import com.ruoyi.common.core.web.page.TableDataInfo; +import com.ruoyi.common.log.annotation.Log; +import com.ruoyi.common.log.enums.BusinessType; +import com.ruoyi.common.security.annotation.InnerAuth; +import com.ruoyi.common.security.annotation.RequiresPermissions; +import com.ruoyi.rocketmq.domain.RmNetworkInterface; +import com.ruoyi.rocketmq.service.IRmNetworkInterfaceService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; + +import javax.servlet.http.HttpServletResponse; +import java.util.List; + +/** + * 客户端网络接口信息Controller + * + * @author gyt + * @date 2025-10-14 + */ +@RestController +@RequestMapping("/networkInterface") +public class RmNetworkInterfaceController extends BaseController +{ + @Autowired + private IRmNetworkInterfaceService rmNetworkInterfaceService; + + /** + * 查询客户端网络接口信息列表 + */ + @RequiresPermissions("rocketmq:networkInterface:list") + @GetMapping("/list") + public TableDataInfo list(RmNetworkInterface rmNetworkInterface) + { + startPage(); + List list = rmNetworkInterfaceService.selectRmNetworkInterfaceList(rmNetworkInterface); + return getDataTable(list); + } + + /** + * 导出客户端网络接口信息列表 + */ + @RequiresPermissions("rocketmq:networkInterface:export") + @Log(title = "客户端网络接口信息", businessType = BusinessType.EXPORT) + @PostMapping("/export") + public void export(HttpServletResponse response, RmNetworkInterface rmNetworkInterface) + { + List list = rmNetworkInterfaceService.selectRmNetworkInterfaceList(rmNetworkInterface); + ExcelUtil util = new ExcelUtil(RmNetworkInterface.class); + util.exportExcel(response, list, "客户端网络接口信息数据"); + } + + /** + * 获取客户端网络接口信息详细信息 + */ + @RequiresPermissions("rocketmq:networkInterface:query") + @GetMapping(value = "/{id}") + public AjaxResult getInfo(@PathVariable("id") Long id) + { + return success(rmNetworkInterfaceService.selectRmNetworkInterfaceById(id)); + } + + /** + * 新增客户端网络接口信息 + */ + @RequiresPermissions("rocketmq:networkInterface:add") + @Log(title = "客户端网络接口信息", businessType = BusinessType.INSERT) + @PostMapping + public AjaxResult add(@RequestBody RmNetworkInterface rmNetworkInterface) + { + return toAjax(rmNetworkInterfaceService.insertRmNetworkInterface(rmNetworkInterface)); + } + + /** + * 修改客户端网络接口信息 + */ + @RequiresPermissions("rocketmq:networkInterface:edit") + @Log(title = "客户端网络接口信息", businessType = BusinessType.UPDATE) + @PutMapping + public AjaxResult edit(@RequestBody RmNetworkInterface rmNetworkInterface) + { + return toAjax(rmNetworkInterfaceService.updateRmNetworkInterface(rmNetworkInterface)); + } + + /** + * 删除客户端网络接口信息 + */ + @RequiresPermissions("rocketmq:networkInterface:remove") + @Log(title = "客户端网络接口信息", businessType = BusinessType.DELETE) + @DeleteMapping("/{ids}") + public AjaxResult remove(@PathVariable Long[] ids) + { + return toAjax(rmNetworkInterfaceService.deleteRmNetworkInterfaceByIds(ids)); + } + /** + * 远程调用查询客户端网络接口信息列表 + */ + @InnerAuth + @PostMapping("/getNetworkInterfaceList") + public R getNetworkInterfaceList(@RequestBody RmNetworkInterface rmNetworkInterface) + { + List list = rmNetworkInterfaceService.selectRmNetworkInterfaceList(rmNetworkInterface); + return R.ok(list); + } +} diff --git a/ruoyi-rocketmq/src/main/java/com/ruoyi/rocketmq/domain/RmNetworkInterface.java b/ruoyi-rocketmq/src/main/java/com/ruoyi/rocketmq/domain/RmNetworkInterface.java new file mode 100644 index 0000000..d326d86 --- /dev/null +++ b/ruoyi-rocketmq/src/main/java/com/ruoyi/rocketmq/domain/RmNetworkInterface.java @@ -0,0 +1,63 @@ +package com.ruoyi.rocketmq.domain; + +import com.ruoyi.common.core.annotation.Excel; +import com.ruoyi.common.core.web.domain.BaseEntity; +import lombok.Data; + +/** + * 客户端网络接口信息对象 rm_network_interface + * + * @author gyt + * @date 2025-10-14 + */ +@Data +public class RmNetworkInterface extends BaseEntity +{ + private static final long serialVersionUID = 1L; + + /** 主键ID */ + private Long id; + + /** 客户端ID */ + @Excel(name = "客户端ID") + private String clientId; + + /** 运营商 */ + @Excel(name = "运营商") + private String isp; + + /** 省 */ + @Excel(name = "省") + private String province; + + /** 市 */ + @Excel(name = "市") + private String city; + + /** 公网IP */ + @Excel(name = "公网IP") + private String publicIp; + + /** 接口名称 */ + @Excel(name = "接口名称") + private String interfaceName; + + /** MAC地址 */ + @Excel(name = "MAC地址") + private String macAddress; + + /** 接口类型 */ + @Excel(name = "接口类型") + private String interfaceType; + + /** IPv4地址 */ + @Excel(name = "IPv4地址") + private String ipv4Address; + + /** 网关 */ + @Excel(name = "网关") + private String gateway; + /** 绑定ip 1业务IP，2管理ip */ + private String bindIp; + +} diff --git a/ruoyi-rocketmq/src/main/java/com/ruoyi/rocketmq/mapper/InitialSwitchOtherCollectDataMapper.java b/ruoyi-rocketmq/src/main/java/com/ruoyi/rocketmq/mapper/InitialSwitchOtherCollectDataMapper.java index a3cd620..5b58648 100644 --- a/ruoyi-rocketmq/src/main/java/com/ruoyi/rocketmq/mapper/InitialSwitchOtherCollectDataMapper.java +++ b/ruoyi-rocketmq/src/main/java/com/ruoyi/rocketmq/mapper/InitialSwitchOtherCollectDataMapper.java @@ -66,5 +66,5 @@ public interface InitialSwitchOtherCollectDataMapper * @param initialSwitchOtherCollectData * @return */ - List getSwitchMonitorMsg(InitialSwitchOtherCollectData initialSwitchOtherCollectData); + Map getSwitchMonitorMsg(InitialSwitchOtherCollectData initialSwitchOtherCollectData); } diff --git a/ruoyi-rocketmq/src/main/java/com/ruoyi/rocketmq/mapper/RmNetworkInterfaceMapper.java b/ruoyi-rocketmq/src/main/java/com/ruoyi/rocketmq/mapper/RmNetworkInterfaceMapper.java new file mode 100644 index 0000000..548259c --- /dev/null +++ b/ruoyi-rocketmq/src/main/java/com/ruoyi/rocketmq/mapper/RmNetworkInterfaceMapper.java @@ -0,0 +1,61 @@ +package com.ruoyi.rocketmq.mapper; + +import java.util.List; +import com.ruoyi.rocketmq.domain.RmNetworkInterface; + +/** + * 客户端网络接口信息Mapper接口 + * + * @author gyt + * @date 2025-10-14 + */ +public interface RmNetworkInterfaceMapper +{ + /** + * 查询客户端网络接口信息 + * + * @param id 客户端网络接口信息主键 + * @return 客户端网络接口信息 + */ + public RmNetworkInterface selectRmNetworkInterfaceById(Long id); + + /** + * 查询客户端网络接口信息列表 + * + * @param rmNetworkInterface 客户端网络接口信息 + * @return 客户端网络接口信息集合 + */ + public List selectRmNetworkInterfaceList(RmNetworkInterface rmNetworkInterface); + + /** + * 新增客户端网络接口信息 + * + * @param rmNetworkInterface 客户端网络接口信息 + * @return 结果 + */ + public int insertRmNetworkInterface(RmNetworkInterface rmNetworkInterface); + + /** + * 修改客户端网络接口信息 + * + * @param rmNetworkInterface 客户端网络接口信息 + * @return 结果 + */ + public int updateRmNetworkInterface(RmNetworkInterface rmNetworkInterface); + + /** + * 删除客户端网络接口信息 + * + * @param id 客户端网络接口信息主键 + * @return 结果 + */ + public int deleteRmNetworkInterfaceById(Long id); + + /** + * 批量删除客户端网络接口信息 + * + * @param ids 需要删除的数据主键集合 + * @return 结果 + */ + public int deleteRmNetworkInterfaceByIds(Long[] ids); +} diff --git a/ruoyi-rocketmq/src/main/java/com/ruoyi/rocketmq/service/IInitialSwitchOtherCollectDataService.java b/ruoyi-rocketmq/src/main/java/com/ruoyi/rocketmq/service/IInitialSwitchOtherCollectDataService.java index b773441..d0b0786 100644 --- a/ruoyi-rocketmq/src/main/java/com/ruoyi/rocketmq/service/IInitialSwitchOtherCollectDataService.java +++ b/ruoyi-rocketmq/src/main/java/com/ruoyi/rocketmq/service/IInitialSwitchOtherCollectDataService.java @@ -66,7 +66,7 @@ public interface IInitialSwitchOtherCollectDataService * @param initialSwitchOtherCollectData * @return */ - List getSwitchMonitorMsg(InitialSwitchOtherCollectData initialSwitchOtherCollectData); + Map getSwitchMonitorMsg(InitialSwitchOtherCollectData initialSwitchOtherCollectData); /** * 图形监控交换机设备CPU使用率 diff --git a/ruoyi-rocketmq/src/main/java/com/ruoyi/rocketmq/service/IRmNetworkInterfaceService.java b/ruoyi-rocketmq/src/main/java/com/ruoyi/rocketmq/service/IRmNetworkInterfaceService.java new file mode 100644 index 0000000..ba0c872 --- /dev/null +++ b/ruoyi-rocketmq/src/main/java/com/ruoyi/rocketmq/service/IRmNetworkInterfaceService.java @@ -0,0 +1,61 @@ +package com.ruoyi.rocketmq.service; + +import java.util.List; +import com.ruoyi.rocketmq.domain.RmNetworkInterface; + +/** + * 客户端网络接口信息Service接口 + * + * @author gyt + * @date 2025-10-14 + */ +public interface IRmNetworkInterfaceService +{ + /** + * 查询客户端网络接口信息 + * + * @param id 客户端网络接口信息主键 + * @return 客户端网络接口信息 + */ + public RmNetworkInterface selectRmNetworkInterfaceById(Long id); + + /** + * 查询客户端网络接口信息列表 + * + * @param rmNetworkInterface 客户端网络接口信息 + * @return 客户端网络接口信息集合 + */ + public List selectRmNetworkInterfaceList(RmNetworkInterface rmNetworkInterface); + + /** + * 新增客户端网络接口信息 + * + * @param rmNetworkInterface 客户端网络接口信息 + * @return 结果 + */ + public int insertRmNetworkInterface(RmNetworkInterface rmNetworkInterface); + + /** + * 修改客户端网络接口信息 + * + * @param rmNetworkInterface 客户端网络接口信息 + * @return 结果 + */ + public int updateRmNetworkInterface(RmNetworkInterface rmNetworkInterface); + + /** + * 批量删除客户端网络接口信息 + * + * @param ids 需要删除的客户端网络接口信息主键集合 + * @return 结果 + */ + public int deleteRmNetworkInterfaceByIds(Long[] ids); + + /** + * 删除客户端网络接口信息信息 + * + * @param id 客户端网络接口信息主键 + * @return 结果 + */ + public int deleteRmNetworkInterfaceById(Long id); +} diff --git a/ruoyi-rocketmq/src/main/java/com/ruoyi/rocketmq/service/impl/InitialSwitchOtherCollectDataServiceImpl.java b/ruoyi-rocketmq/src/main/java/com/ruoyi/rocketmq/service/impl/InitialSwitchOtherCollectDataServiceImpl.java index 32c5981..992d540 100644 --- a/ruoyi-rocketmq/src/main/java/com/ruoyi/rocketmq/service/impl/InitialSwitchOtherCollectDataServiceImpl.java +++ b/ruoyi-rocketmq/src/main/java/com/ruoyi/rocketmq/service/impl/InitialSwitchOtherCollectDataServiceImpl.java @@ -100,7 +100,7 @@ public class InitialSwitchOtherCollectDataServiceImpl implements IInitialSwitchO } @Override - public List getSwitchMonitorMsg(InitialSwitchOtherCollectData initialSwitchOtherCollectData) { + public Map getSwitchMonitorMsg(InitialSwitchOtherCollectData initialSwitchOtherCollectData) { return initialSwitchOtherCollectDataMapper.getSwitchMonitorMsg(initialSwitchOtherCollectData); } diff --git a/ruoyi-rocketmq/src/main/java/com/ruoyi/rocketmq/service/impl/RmNetworkInterfaceServiceImpl.java b/ruoyi-rocketmq/src/main/java/com/ruoyi/rocketmq/service/impl/RmNetworkInterfaceServiceImpl.java new file mode 100644 index 0000000..5278428 --- /dev/null +++ b/ruoyi-rocketmq/src/main/java/com/ruoyi/rocketmq/service/impl/RmNetworkInterfaceServiceImpl.java @@ -0,0 +1,96 @@ +package com.ruoyi.rocketmq.service.impl; + +import java.util.List; +import com.ruoyi.common.core.utils.DateUtils; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import com.ruoyi.rocketmq.mapper.RmNetworkInterfaceMapper; +import com.ruoyi.rocketmq.domain.RmNetworkInterface; +import com.ruoyi.rocketmq.service.IRmNetworkInterfaceService; + +/** + * 客户端网络接口信息Service业务层处理 + * + * @author gyt + * @date 2025-10-14 + */ +@Service +public class RmNetworkInterfaceServiceImpl implements IRmNetworkInterfaceService +{ + @Autowired + private RmNetworkInterfaceMapper rmNetworkInterfaceMapper; + + /** + * 查询客户端网络接口信息 + * + * @param id 客户端网络接口信息主键 + * @return 客户端网络接口信息 + */ + @Override + public RmNetworkInterface selectRmNetworkInterfaceById(Long id) + { + return rmNetworkInterfaceMapper.selectRmNetworkInterfaceById(id); + } + + /** + * 查询客户端网络接口信息列表 + * + * @param rmNetworkInterface 客户端网络接口信息 + * @return 客户端网络接口信息 + */ + @Override + public List selectRmNetworkInterfaceList(RmNetworkInterface rmNetworkInterface) + { + return rmNetworkInterfaceMapper.selectRmNetworkInterfaceList(rmNetworkInterface); + } + + /** + * 新增客户端网络接口信息 + * + * @param rmNetworkInterface 客户端网络接口信息 + * @return 结果 + */ + @Override + public int insertRmNetworkInterface(RmNetworkInterface rmNetworkInterface) + { + rmNetworkInterface.setCreateTime(DateUtils.getNowDate()); + return rmNetworkInterfaceMapper.insertRmNetworkInterface(rmNetworkInterface); + } + + /** + * 修改客户端网络接口信息 + * + * @param rmNetworkInterface 客户端网络接口信息 + * @return 结果 + */ + @Override + public int updateRmNetworkInterface(RmNetworkInterface rmNetworkInterface) + { + rmNetworkInterface.setUpdateTime(DateUtils.getNowDate()); + return rmNetworkInterfaceMapper.updateRmNetworkInterface(rmNetworkInterface); + } + + /** + * 批量删除客户端网络接口信息 + * + * @param ids 需要删除的客户端网络接口信息主键 + * @return 结果 + */ + @Override + public int deleteRmNetworkInterfaceByIds(Long[] ids) + { + return rmNetworkInterfaceMapper.deleteRmNetworkInterfaceByIds(ids); + } + + /** + * 删除客户端网络接口信息信息 + * + * @param id 客户端网络接口信息主键 + * @return 结果 + */ + @Override + public int deleteRmNetworkInterfaceById(Long id) + { + return rmNetworkInterfaceMapper.deleteRmNetworkInterfaceById(id); + } +} diff --git a/ruoyi-rocketmq/src/main/resources/mapper/rocketmq/InitialSwitchOtherCollectDataMapper.xml b/ruoyi-rocketmq/src/main/resources/mapper/rocketmq/InitialSwitchOtherCollectDataMapper.xml index 386b476..c9ed335 100644 --- a/ruoyi-rocketmq/src/main/resources/mapper/rocketmq/InitialSwitchOtherCollectDataMapper.xml +++ b/ruoyi-rocketmq/src/main/resources/mapper/rocketmq/InitialSwitchOtherCollectDataMapper.xml @@ -81,4 +81,25 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" #{id} + \ No newline at end of file diff --git a/ruoyi-rocketmq/src/main/resources/mapper/rocketmq/RmMonitorPolicyMapper.xml b/ruoyi-rocketmq/src/main/resources/mapper/rocketmq/RmMonitorPolicyMapper.xml index 3d8a934..a4c5cb2 100644 --- a/ruoyi-rocketmq/src/main/resources/mapper/rocketmq/RmMonitorPolicyMapper.xml +++ b/ruoyi-rocketmq/src/main/resources/mapper/rocketmq/RmMonitorPolicyMapper.xml @@ -18,16 +18,18 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + - select id, template_id, resource_group_id, policy_name, description, status, deploy_time, create_time, update_time, create_by, update_by, switch_type, deploy_device from rm_monitor_policy + select id, template_id, resource_group_id, policy_name, description, status, deploy_time, create_time, update_time, create_by, update_by, switch_type, deploy_device, resource_type from rm_monitor_policy + + + and client_id = #{clientId} + and isp = #{isp} + and province = #{province} + and city = #{city} + and public_ip = #{publicIp} + and interface_name like concat('%', #{interfaceName}, '%') + and mac_address = #{macAddress} + and interface_type = #{interfaceType} + and ipv4_address = #{ipv4Address} + and gateway = #{gateway} + and bind_ip = #{bindIp} + + + + + + + insert into rm_network_interface + + client_id, + isp, + province, + city, + public_ip, + interface_name, + mac_address, + interface_type, + ipv4_address, + gateway, + create_time, + update_time, + create_by, + update_by, + bind_ip, + + + #{clientId}, + #{isp}, + #{province}, + #{city}, + #{publicIp}, + #{interfaceName}, + #{macAddress}, + #{interfaceType}, + #{ipv4Address}, + #{gateway}, + #{createTime}, + #{updateTime}, + #{createBy}, + #{updateBy}, + #{bindIp}, + + + + + update rm_network_interface + + client_id = #{clientId}, + isp = #{isp}, + province = #{province}, + city = #{city}, + public_ip = #{publicIp}, + interface_name = #{interfaceName}, + mac_address = #{macAddress}, + interface_type = #{interfaceType}, + ipv4_address = #{ipv4Address}, + gateway = #{gateway}, + create_time = #{createTime}, + update_time = #{updateTime}, + create_by = #{createBy}, + update_by = #{updateBy}, + bind_ip = #{bindIp}, + + where id = #{id} + + + + delete from rm_network_interface where id = #{id} + + + + delete from rm_network_interface where id in + + #{id} + + + \ No newline at end of file