交换机收益图形分析、服务器注册优化

2025-10-28 18:51:08 +08:00
parent 46bf4c4114
commit 8c439013e1
48 changed files with 1037 additions and 106 deletions
@@ -115,4 +115,14 @@ public interface RemoteRevenueConfigService
    @PostMapping("/registration/innerUpdateRegist")
    public R<Integer> innerUpdateRegist(@RequestBody RmResourceRegistrationRemote rmResourceRegistrationRemote, @RequestHeader(SecurityConstants.FROM_SOURCE) String source);

+    /**
+     * 获取95值列表
+     * @param epsNodeBandwidthRemote
+     * @param source
+     * @return
+     */
+    @PostMapping("/bandwidth/getEpsNodeBandWidthList")
+    public R<List<EpsNodeBandwidthRemote>> getEpsNodeBandWidthList(@RequestBody EpsNodeBandwidthRemote epsNodeBandwidthRemote, @RequestHeader(SecurityConstants.FROM_SOURCE) String source);
+
+
 }
@@ -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.RmDeployScriptRemote;
 import com.ruoyi.system.api.domain.RmMonitorPolicyRemote;
 import com.ruoyi.system.api.domain.RmNetworkInterfaceRemote;
 import com.ruoyi.system.api.factory.RemoteRocketMqFallbackFactory;
@@ -95,4 +96,6 @@ public interface RemoteRocketMqService {
     */
    @GetMapping("/monitorPolicy/issueDefaultPolicyByClientId")
    public R<Integer> issueDefaultPolicyByClientId(String clientId, @RequestHeader(SecurityConstants.FROM_SOURCE) String source);
+    @PostMapping("policy/addDeployScript")
+    R<Integer> addDeployScript(@RequestBody RmDeployScriptRemote addData, @RequestHeader(SecurityConstants.FROM_SOURCE) String source);
 }
@@ -0,0 +1,136 @@
+package com.ruoyi.system.api.domain;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.ruoyi.common.core.annotation.Excel;
+import com.ruoyi.common.core.web.domain.BaseEntity;
+import lombok.Data;
+
+import java.math.BigDecimal;
+import java.util.Date;
+import java.util.List;
+
+@Data
+public class EpsNodeBandwidthRemote extends BaseEntity {
+    /** id */
+    private Long id;
+
+    /** 节点名称 */
+    @Excel(name = "节点名称")
+    private String nodeName;
+
+    /** 硬件SN */
+    @Excel(name = "硬件SN")
+    private String hardwareSn;
+    /** 带宽值类型
+     * 1-95带宽值Mbps/日
+     * 2-95带宽值Mbps/月
+     * 3-包端带宽值Mbps/日
+     * 4-月均日95值Mbps
+     * 5-有效-95带宽值Mbps/日
+     * 6-有效-95带宽值Mbps/月
+     * 7-有效-月均日95值
+     * */
+    private String bandwidthType;
+
+    /** 带宽值结果 */
+    private BigDecimal bandwidthResult;
+
+    /** 95带宽值Mbps/日 */
+    @Excel(name = "95带宽值Mbps/日")
+    private BigDecimal bandwidth95Daily;
+
+    /** 95带宽值Mbps/月 */
+    @Excel(name = "95带宽值Mbps/月")
+    private BigDecimal bandwidth95Monthly;
+
+    /** 月均日95值 */
+    @Excel(name = "月均日95值")
+    private BigDecimal avgMonthlyBandwidth95;
+
+    /** 包端带宽值Mbps/日 */
+    @Excel(name = "包端带宽值Mbps/日")
+    private BigDecimal packageBandwidthDaily;
+
+    /** 有效-95带宽值Mbps/日 */
+    @Excel(name = "有效-95带宽值Mbps/日")
+    private BigDecimal effectiveBandwidth95Daily;
+
+    /** 有效-95带宽值Mbps/月 */
+    @Excel(name = "有效-95带宽值Mbps/月")
+    private BigDecimal effectiveBandwidth95Monthly;
+
+    /** 有效-月均95值 */
+    @Excel(name = "有效-月均95值")
+    private BigDecimal effectiveAvgMonthlyBandwidth95;
+    /** 金山流量Mbps/日 */
+    private BigDecimal machineFlow;
+
+    /** 设备业务客户id */
+    @Excel(name = "设备业务客户id")
+    private String customerId;
+
+    /** 设备业务客户名称 */
+    @Excel(name = "设备业务客户名称")
+    private String customerName;
+
+    /** 业务号 */
+    @Excel(name = "业务号")
+    private String serviceNumber;
+
+    /** 上联交换机 */
+    @Excel(name = "上联交换机")
+    private String uplinkSwitch;
+
+    /** 创建人id */
+    @Excel(name = "创建人id")
+    private Long creatorId;
+
+    /** 创建人名称 */
+    @Excel(name = "创建人名称")
+    private String creatorName;
+
+    /** 交换机sn */
+    @Excel(name = "交换机sn")
+    private String switchSn;
+
+    /** 接口名称 */
+    @Excel(name = "接口名称")
+    private String interfaceName;
+
+    /** 资源类型(1服务器,2交换机) */
+    @Excel(name = "资源类型")
+    private String resourceType;
+
+    /** 接口连接设备类型(1服务器，2机房出口) */
+    @Excel(name = "接口连接设备类型")
+    private String interfaceLinkDeviceType;
+    /** 业务名称 */
+    @Excel(name = "业务名称")
+    private String businessName;
+
+    /** 业务代码 */
+    @Excel(name = "业务代码")
+    private String businessId;
+    /** 创建时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    private Date createTime;
+    /** 开始时间 */
+    private String startTime;
+    /** 结束时间 */
+    private String endTime;
+    /** 月份 */
+    private String monthTime;
+    /** 备注 */
+    private String remark1;
+    /** 创建时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date createDatetime;
+
+    private List<String> nodeNames;
+
+    private List<String> switchNames;
+    /** 计算方式 */
+    private String calculationMode;
+    /** 客户端id */
+    private String clientId;
+}
@@ -29,4 +29,6 @@ public class NetworkInfo {
    // 公网 IP
    @JsonProperty("publicIp")
    private String publicIp;
+    @JsonProperty("type")
+    private String type;
 }
@@ -0,0 +1,84 @@
+package com.ruoyi.system.api.domain;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.ruoyi.common.core.annotation.Excel;
+import lombok.Data;
+
+import java.util.Date;
+
+@Data
+public class RmDeployScriptRemote {
+    /** 策略ID */
+    private Long id;
+
+    /** 策略名称 */
+    @Excel(name = "策略名称")
+    private String policyName;
+
+    /** 策略描述 */
+    @Excel(name = "策略描述")
+    private String description;
+
+    /** 关联资源组ID */
+    @Excel(name = "关联资源组ID")
+    private Long resourceGroupId;
+
+    /** 包含的设备ID列表（逗号分隔） */
+    private String includedDevicesId;
+    /** 包含设备 */
+    @Excel(name = "包含设备")
+    private String includedDevicesName;
+
+    /** 源文件地址格式 */
+    @Excel(name = "源文件地址格式")
+    private String sourceFilePathType;
+    /** 源文件路径 */
+    @Excel(name = "源文件路径")
+    private String sourceFilePath;
+
+    /** 目标目录 */
+    @Excel(name = "目标目录")
+    private String targetDirectory;
+
+    /** 命令执行内容 */
+    @Excel(name = "命令执行内容")
+    private String commandContent;
+
+    /** 0=立即执行,1=定时执行 */
+    @Excel(name = "执行方式", readConverterExp = "0=立即执行,1=定时执行")
+    private Integer executionMethod;
+
+    /** 定时执行时间 */
+    @Excel(name = "定时执行时间")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date scheduledTime;
+    /** 定时执行时间(时间戳秒) */
+    private Long policyTime;
+
+    /** 策略状态：0-未下发，1-已下发 */
+    @Excel(name = "策略状态：0-未下发，1-已下发")
+    private String policyStatus;
+
+    /** 策略下发时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "策略下发时间", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date deployTime;
+
+    /** 脚本类型 */
+    @Excel(name = "脚本类型")
+    private String scriptType;
+    /** 资源组名称 */
+    private String resourceGroupName;
+    /** 资源组置空 */
+    private Boolean resourceGroupIdNull;
+    /** 部署设备 */
+    private String deployDevice;
+    /** 业务脚本名称 */
+    private String scriptName;
+    /** 业务脚本文件地址 */
+    private String scriptPath;
+    /** 业务脚本参数 */
+    private String defaultParams;
+    /** 业务下发名称 */
+    private String taskName;
+}
@@ -50,4 +50,6 @@ public class RmNetworkInterfaceRemote extends BaseEntity {
    private String gateway;
    /** 绑定ip 1业务IP，2管理ip */
    private String bindIp;
+    /** 新旧标识 */
+    private Integer newFlag;
 }
@@ -1,9 +1,12 @@
 package com.ruoyi.system.api.domain;

+import com.fasterxml.jackson.annotation.JsonFormat;
 import com.ruoyi.common.core.annotation.Excel;
 import com.ruoyi.common.core.web.domain.BaseEntity;
 import lombok.Data;

+import java.util.Date;
+
 /**
 * 资源注册对象 rm_resource_registration
 * 
@@ -171,5 +174,9 @@ public class RmResourceRegistrationRemote extends BaseEntity
     * 心跳周期（单位：秒）
     */
    private Integer heartbeatInterval;
+    /** 上机时间 */
+    @Excel(name = "上机时间")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date onboardTime;

 }
@@ -81,6 +81,11 @@ public class RemoteRevenueConfigFallbackFactory implements FallbackFactory<Remot
            public R<Integer> innerUpdateRegist(RmResourceRegistrationRemote rmResourceRegistrationRemote, String source) {
                return R.fail("修改服务器注册信息失败：" + throwable.getMessage());
            }
+
+            @Override
+            public R<List<EpsNodeBandwidthRemote>> getEpsNodeBandWidthList(EpsNodeBandwidthRemote epsNodeBandwidthRemote, String source) {
+                return R.fail("获取95值列表失败：" + throwable.getMessage());
+            }
        };
    }
 }
@@ -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.RmDeployScriptRemote;
 import com.ruoyi.system.api.domain.RmMonitorPolicyRemote;
 import com.ruoyi.system.api.domain.RmNetworkInterfaceRemote;
 import org.slf4j.Logger;
@@ -77,6 +78,11 @@ public class RemoteRocketMqFallbackFactory implements FallbackFactory<RemoteRock
            public R<Integer> issueDefaultPolicyByClientId(String clientId, String source) {
                return R.fail(throwable.getMessage());
            }
+
+            @Override
+            public R<Integer> addDeployScript(RmDeployScriptRemote addData, String source) {
+                return R.fail(throwable.getMessage());
+            }
        };
    }
 }