源数据接口修改,解决接口名称表数据重复bug,增加资源名称同步修改逻辑。

This commit is contained in:
gaoyutao
2025-09-04 23:18:08 +08:00
parent ec3fb074e1
commit 8aaa60d7ef
29 changed files with 396 additions and 571 deletions
@@ -1,9 +1,8 @@
package com.ruoyi.rocketmq.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;
/**
* CPU监控信息对象 initial_cpu_info
@@ -11,9 +10,10 @@ import com.ruoyi.common.core.web.domain.BaseEntity;
* @author gyt
* @date 2025-08-25
*/
@Data
public class InitialCpuInfo extends BaseEntity
{
private static final long serialVersionUID = 1L;
private static final Long serialVersionUID = 1L;
/** 主键ID */
private Long id;
@@ -24,213 +24,49 @@ public class InitialCpuInfo extends BaseEntity
/** CPU1分钟负载 */
@Excel(name = "CPU1分钟负载")
private long avg1;
private Long avg1;
/** CPU5分钟负载 */
@Excel(name = "CPU5分钟负载")
private long avg5;
private Long avg5;
/** CPU15分钟负载 */
@Excel(name = "CPU15分钟负载")
private long avg15;
private Long avg15;
/** CPU硬件中断提供服务时间(秒) */
@Excel(name = "CPU硬件中断提供服务时间(秒)")
private long interrupt;
private Long interrupt;
/** CPU使用率(%) */
@Excel(name = "CPU使用率(%)")
private long uti;
private Long uti;
/** CPU数量(核数) */
@Excel(name = "CPU数量(核数)")
private long num;
@Excel(name = "CPU数量")
private Long num;
/** CPU正常运行时间(秒) */
@Excel(name = "CPU正常运行时间(秒)")
@Excel(name = "CPU正常运行时间")
private Long normal;
/** CPU空闲时间(秒) */
@Excel(name = "CPU空闲时间(秒)")
private long idle;
@Excel(name = "CPU空闲时间")
private Long idle;
/** CPU等待响应时间(秒) */
@Excel(name = "CPU等待响应时间(秒)")
private long iowait;
@Excel(name = "CPU等待响应时间")
private Long iowait;
/** CPU系统时间(秒) */
@Excel(name = "CPU系统时间(秒)")
private long system;
@Excel(name = "CPU系统时间")
private Long system;
/** CPU软件无响应时间(秒) */
@Excel(name = "CPU软件无响应时间(秒)")
private long noresp;
@Excel(name = "CPU软件无响应时间")
private Long noresp;
/** CPU用户进程所花费的时间(秒) */
@Excel(name = "CPU用户进程所花费的时间(秒)")
private long user;
public void setId(Long id)
{
this.id = id;
}
public Long getId()
{
return id;
}
public void setClientId(String clientId)
{
this.clientId = clientId;
}
public String getClientId()
{
return clientId;
}
public void setAvg1(long avg1)
{
this.avg1 = avg1;
}
public long getAvg1()
{
return avg1;
}
public void setAvg5(long avg5)
{
this.avg5 = avg5;
}
public long getAvg5()
{
return avg5;
}
public void setAvg15(long avg15)
{
this.avg15 = avg15;
}
public long getAvg15()
{
return avg15;
}
public void setInterrupt(long interrupt)
{
this.interrupt = interrupt;
}
public long getInterrupt()
{
return interrupt;
}
public void setUti(long uti)
{
this.uti = uti;
}
public long getUti()
{
return uti;
}
public void setNum(long num)
{
this.num = num;
}
public long getNum()
{
return num;
}
public void setNormal(Long normal)
{
this.normal = normal;
}
public Long getNormal()
{
return normal;
}
public void setIdle(long idle)
{
this.idle = idle;
}
public long getIdle()
{
return idle;
}
public void setIowait(long iowait)
{
this.iowait = iowait;
}
public long getIowait()
{
return iowait;
}
public void setSystem(long system)
{
this.system = system;
}
public long getSystem()
{
return system;
}
public void setNoresp(long noresp)
{
this.noresp = noresp;
}
public long getNoresp()
{
return noresp;
}
public void setUser(long user)
{
this.user = user;
}
public long getUser()
{
return user;
}
@Override
public String toString() {
return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
.append("id", getId())
.append("clientId", getClientId())
.append("avg1", getAvg1())
.append("avg5", getAvg5())
.append("avg15", getAvg15())
.append("interrupt", getInterrupt())
.append("uti", getUti())
.append("num", getNum())
.append("normal", getNormal())
.append("idle", getIdle())
.append("iowait", getIowait())
.append("system", getSystem())
.append("noresp", getNoresp())
.append("user", getUser())
.append("createBy", getCreateBy())
.append("updateBy", getUpdateBy())
.append("createTime", getCreateTime())
.append("updateTime", getUpdateTime())
.toString();
}
@Excel(name = "CPU用户进程所花费的时间")
private Long user;
}
@@ -1,9 +1,8 @@
package com.ruoyi.rocketmq.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;
/**
* 磁盘监控信息对象 initial_disk_info
@@ -11,6 +10,7 @@ import com.ruoyi.common.core.web.domain.BaseEntity;
* @author gyt
* @date 2025-08-25
*/
@Data
public class InitialDiskInfo extends BaseEntity
{
private static final long serialVersionUID = 1L;
@@ -58,134 +58,4 @@ public class InitialDiskInfo extends BaseEntity
@Excel(name = "磁盘读取总字节数")
private Long readBytes;
public void setId(Long id)
{
this.id = id;
}
public Long getId()
{
return id;
}
public void setClientId(String clientId)
{
this.clientId = clientId;
}
public String getClientId()
{
return clientId;
}
public void setName(String name)
{
this.name = name;
}
public String getName()
{
return name;
}
public void setSerial(String serial)
{
this.serial = serial;
}
public String getSerial()
{
return serial;
}
public void setTotal(Long total)
{
this.total = total;
}
public Long getTotal()
{
return total;
}
public void setWriteSpeed(Long writeSpeed)
{
this.writeSpeed = writeSpeed;
}
public Long getWriteSpeed()
{
return writeSpeed;
}
public void setReadSpeed(Long readSpeed)
{
this.readSpeed = readSpeed;
}
public Long getReadSpeed()
{
return readSpeed;
}
public void setWriteTimes(Long writeTimes)
{
this.writeTimes = writeTimes;
}
public Long getWriteTimes()
{
return writeTimes;
}
public void setReadTimes(Long readTimes)
{
this.readTimes = readTimes;
}
public Long getReadTimes()
{
return readTimes;
}
public void setWriteBytes(Long writeBytes)
{
this.writeBytes = writeBytes;
}
public Long getWriteBytes()
{
return writeBytes;
}
public void setReadBytes(Long readBytes)
{
this.readBytes = readBytes;
}
public Long getReadBytes()
{
return readBytes;
}
@Override
public String toString() {
return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
.append("id", getId())
.append("clientId", getClientId())
.append("name", getName())
.append("serial", getSerial())
.append("total", getTotal())
.append("writeSpeed", getWriteSpeed())
.append("readSpeed", getReadSpeed())
.append("writeTimes", getWriteTimes())
.append("readTimes", getReadTimes())
.append("writeBytes", getWriteBytes())
.append("readBytes", getReadBytes())
.append("createBy", getCreateBy())
.append("updateBy", getUpdateBy())
.append("createTime", getCreateTime())
.append("updateTime", getUpdateTime())
.toString();
}
}
@@ -1,22 +0,0 @@
package com.ruoyi.rocketmq.domain;
import com.alibaba.fastjson.JSON;
import lombok.Data;
import java.util.List;
@Data
public class NetInterfaceInfo {
private String name;
private String type;
private String status;
private String ipV4;
private String mac;
private String inSpeed;
private String outSpeed;
private int inDropped;
private int outDropped;
public static List<NetInterfaceInfo> parseNetData(String jsonData) {
return JSON.parseArray(jsonData, NetInterfaceInfo.class);
}
}