diff --git a/tongran-modules/tongran-system/src/main/java/com/tongran/system/domain/AllInterfaceName.java b/tongran-modules/tongran-system/src/main/java/com/tongran/system/domain/AllInterfaceName.java index 20e6b89..7b560f9 100644 --- a/tongran-modules/tongran-system/src/main/java/com/tongran/system/domain/AllInterfaceName.java +++ b/tongran-modules/tongran-system/src/main/java/com/tongran/system/domain/AllInterfaceName.java @@ -83,5 +83,7 @@ public class AllInterfaceName extends BaseEntity private boolean expand; /** 是否业务网卡 */ private boolean businessFlag; + /** 端口状态 1up 2down */ + private String portStatus; } diff --git a/tongran-modules/tongran-system/src/main/java/com/tongran/system/service/impl/AllInterfaceNameServiceImpl.java b/tongran-modules/tongran-system/src/main/java/com/tongran/system/service/impl/AllInterfaceNameServiceImpl.java index ac2591a..c49ab2c 100644 --- a/tongran-modules/tongran-system/src/main/java/com/tongran/system/service/impl/AllInterfaceNameServiceImpl.java +++ b/tongran-modules/tongran-system/src/main/java/com/tongran/system/service/impl/AllInterfaceNameServiceImpl.java @@ -56,6 +56,10 @@ public class AllInterfaceNameServiceImpl implements IAllInterfaceNameService @Override public List selectAllInterfaceNameList(AllInterfaceName allInterfaceName) { + if ("2".equals(allInterfaceName.getResourceType())) { + // 交换机类型,只返回端口为up的 + allInterfaceName.setPortStatus("1"); + } List allInterfaceNameList = allInterfaceNameMapper.selectAllInterfaceNameList(allInterfaceName); if (allInterfaceNameList == null || allInterfaceNameList.isEmpty()) { return allInterfaceNameList; @@ -150,7 +154,6 @@ public class AllInterfaceNameServiceImpl implements IAllInterfaceNameService interfaceName.getInterfaceName() != null && topologyManagement.getInterfaceName() != null && interfaceName.getInterfaceName().equalsIgnoreCase(topologyManagement.getInterfaceName()) ); - // 如果匹配成功,设置 expand 属性为 true if (isMatched) { interfaceName.setExpand(true); diff --git a/tongran-modules/tongran-system/src/main/java/com/tongran/system/service/impl/InitialSwitchInfoDetailsServiceImpl.java b/tongran-modules/tongran-system/src/main/java/com/tongran/system/service/impl/InitialSwitchInfoDetailsServiceImpl.java index 88715a4..9db8904 100644 --- a/tongran-modules/tongran-system/src/main/java/com/tongran/system/service/impl/InitialSwitchInfoDetailsServiceImpl.java +++ b/tongran-modules/tongran-system/src/main/java/com/tongran/system/service/impl/InitialSwitchInfoDetailsServiceImpl.java @@ -405,6 +405,7 @@ public class InitialSwitchInfoDetailsServiceImpl implements IInitialSwitchInfoDe record.setSwitchName(data.getSwitchName()); record.setSwitchSn(data.getSwitchSn()); record.setSwitchIp(data.getSwitchIp()); + record.setPortStatus(data.getStatus()); return record; } private void fillBusinessInfo(AllInterfaceName record, String serverSn) { diff --git a/tongran-modules/tongran-system/src/main/resources/mapper/system/AllInterfaceNameMapper.xml b/tongran-modules/tongran-system/src/main/resources/mapper/system/AllInterfaceNameMapper.xml index 66a6e48..da1e0bb 100644 --- a/tongran-modules/tongran-system/src/main/resources/mapper/system/AllInterfaceNameMapper.xml +++ b/tongran-modules/tongran-system/src/main/resources/mapper/system/AllInterfaceNameMapper.xml @@ -1,7 +1,7 @@ + PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> @@ -23,10 +23,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + - select id, client_id, interface_name, device_sn, node_name, business_code, business_name, resource_type, create_time, update_time, create_by, update_by, switch_name, interface_device_type, server_port, switch_sn, switch_ip, server_ip from all_interface_name + select id, client_id, interface_name, device_sn, node_name, business_code, business_name, resource_type, create_time, update_time, create_by, update_by, switch_name, interface_device_type, server_port, switch_sn, switch_ip, server_ip, port_status from all_interface_name @@ -73,6 +75,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" switch_sn, switch_ip, server_ip, + port_status, #{clientId}, @@ -92,6 +95,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" #{switchSn}, #{switchIp}, #{serverIp}, + #{portStatus}, @@ -115,6 +119,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" switch_sn = #{switchSn}, switch_ip = #{switchIp}, server_ip = #{serverIp}, + port_status = #{portStatus}, where id = #{id} @@ -145,7 +150,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" server_port AS serverPort, switch_sn AS switchSn, switch_ip AS switchIp, - server_ip AS serverIp + server_ip AS serverIp, + port_status AS portStatus FROM all_interface_name @@ -175,7 +181,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" node_name, business_code, business_name, - switch_name, interface_device_type, server_port, switch_sn, switch_ip, server_ip, + switch_name, interface_device_type, server_port, switch_sn, switch_ip, server_ip, port_status, create_time, update_time ) @@ -189,7 +195,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" #{item.nodeName}, #{item.businessCode}, #{item.businessName}, - #{item.switchName}, #{item.interfaceDeviceType}, #{item.serverPort}, #{item.switchSn}, #{item.switchIp}, #{item.serverIp}, + #{item.switchName}, #{item.interfaceDeviceType}, #{item.serverPort}, #{item.switchSn}, #{item.switchIp}, #{item.serverIp}, #{item.portStatus}, NOW(), NOW() ) @@ -240,6 +246,16 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" THEN VALUES(switch_ip) ELSE switch_ip END, + server_ip = CASE + WHEN server_ip != VALUES(server_ip) OR (server_ip IS NULL AND VALUES(server_ip) IS NOT NULL) + THEN VALUES(server_ip) + ELSE server_ip + END, + port_status = CASE + WHEN port_status != VALUES(port_status) OR (port_status IS NULL AND VALUES(port_status) IS NOT NULL) + THEN VALUES(port_status) + ELSE port_status + END, update_time = CASE WHEN device_sn != VALUES(device_sn) OR (device_sn IS NULL AND VALUES(device_sn) IS NOT NULL) OR node_name != VALUES(node_name) OR (node_name IS NULL AND VALUES(node_name) IS NOT NULL) @@ -250,6 +266,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" OR server_port != VALUES(server_port) OR (server_port IS NULL AND VALUES(server_port) IS NOT NULL) OR switch_sn != VALUES(switch_sn) OR (switch_sn IS NULL AND VALUES(switch_sn) IS NOT NULL) OR switch_ip != VALUES(switch_ip) OR (switch_ip IS NULL AND VALUES(switch_ip) IS NOT NULL) + OR server_ip != VALUES(server_ip) OR (server_ip IS NULL AND VALUES(server_ip) IS NOT NULL) + OR port_status != VALUES(port_status) OR (port_status IS NULL AND VALUES(port_status) IS NOT NULL) THEN NOW() ELSE update_time END @@ -257,13 +275,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + + delete from initial_switch_other_collect_data + + + + AND client_id = #{clientId} + AND collect_type = #{collectType} + AND create_time < #{createTime} + + + and 1=0 + + + + \ No newline at end of file diff --git a/tongran-rocketmq/src/main/resources/mapper/rocketmq/RmFrpcConfigManageMapper.xml b/tongran-rocketmq/src/main/resources/mapper/rocketmq/RmFrpcConfigManageMapper.xml index 48b776b..a233fd7 100644 --- a/tongran-rocketmq/src/main/resources/mapper/rocketmq/RmFrpcConfigManageMapper.xml +++ b/tongran-rocketmq/src/main/resources/mapper/rocketmq/RmFrpcConfigManageMapper.xml @@ -11,6 +11,7 @@ + @@ -23,7 +24,7 @@ - select id, client_id, frpc_server_addr, frpc_server_port, frpc_remote_port, frpc_local_port, frpc_name, frpc_connection_status, frpc_create_time, create_time, update_time, create_by, update_by, frpc_local_ip, frpc_status from rm_frpc_config_manage + select id, client_id, frpc_server_addr, frpc_server_port, frpc_remote_port, frpc_local_port, frpc_type, frpc_name, frpc_connection_status, frpc_create_time, create_time, update_time, create_by, update_by, frpc_local_ip, frpc_status from rm_frpc_config_manage