Merge branch 'dev' of https://gitea.wangzhiwen.top/0214/ALOps_sys1 into dev
# Conflicts: # ALOps_sys_backend/alops-system/src/main/java/com/alops/system/domain/EquBase.javadev
commit
534a160702
@ -0,0 +1,41 @@ |
||||
package com.alops.web.controller.exceptionController; |
||||
|
||||
import com.alops.common.annotation.Log; |
||||
import com.alops.common.core.controller.BaseController; |
||||
import com.alops.common.core.page.TableDataInfo; |
||||
import com.alops.common.enums.BusinessType; |
||||
import com.alops.system.domain.vo.equipmentAssessmentVo; |
||||
import com.alops.system.service.IEquBaseService; |
||||
import io.swagger.annotations.ApiOperation; |
||||
import org.springframework.beans.factory.annotation.Autowired; |
||||
import org.springframework.security.access.prepost.PreAuthorize; |
||||
import org.springframework.web.bind.annotation.GetMapping; |
||||
import org.springframework.web.bind.annotation.RequestMapping; |
||||
import org.springframework.web.bind.annotation.RestController; |
||||
|
||||
import java.util.List; |
||||
|
||||
@RestController |
||||
@RequestMapping("/inMonitoring/equAssessment") |
||||
public class equAssessment extends BaseController { |
||||
|
||||
|
||||
|
||||
@Autowired |
||||
public IEquBaseService iEquBaseService; |
||||
/** |
||||
* 设备信息评估表 |
||||
* 获取所有设备id |
||||
*/ |
||||
@PreAuthorize("@ss.hasPermi('inMonitoring:equAssessment:list')") |
||||
@GetMapping("/list") |
||||
@ApiOperation("设备评估信息") |
||||
@Log(title = "设备评估与预测", businessType = BusinessType.UPDATE) |
||||
public TableDataInfo homeList() |
||||
{ |
||||
startPage(); |
||||
List<equipmentAssessmentVo> list = iEquBaseService.getDeviceIAssessmentnfo(); |
||||
return getDataTable(list); |
||||
} |
||||
|
||||
} |
||||
@ -0,0 +1,112 @@ |
||||
package com.alops.system.domain.dto; |
||||
|
||||
import com.alops.common.annotation.Excel; |
||||
import com.alops.system.domain.EquManu; |
||||
import com.alops.system.domain.EquType; |
||||
import com.fasterxml.jackson.annotation.JsonFormat; |
||||
import lombok.Data; |
||||
|
||||
import java.util.Date; |
||||
|
||||
@Data |
||||
public class EquBaseAddDto { |
||||
|
||||
private static final long serialVersionUID = 1L; |
||||
|
||||
/** 设备唯一标识（设备编号） */ |
||||
private String id; |
||||
|
||||
/** （设备编号） */ |
||||
private String equNumber; |
||||
|
||||
/** 设备名称 */ |
||||
@Excel(name = "设备名称") |
||||
private String name; |
||||
|
||||
/** 设备版本 */ |
||||
@Excel(name = "设备版本") |
||||
private String version; |
||||
|
||||
/** 带外管理 IP */ |
||||
@Excel(name = "带外管理 IP") |
||||
private String ip; |
||||
|
||||
/** 设备厂商 id */ |
||||
@Excel(name = "设备厂商 id") |
||||
private String manufacture; |
||||
|
||||
|
||||
private EquManu manufactureVO; |
||||
|
||||
/** 安装位置 */ |
||||
@Excel(name = "安装位置 ") |
||||
private String location; |
||||
|
||||
/** 设备类型 id */ |
||||
@Excel(name = "设备类型 id") |
||||
private String equType; |
||||
|
||||
|
||||
|
||||
public EquType getEquTypeVO() { |
||||
return equTypeVO; |
||||
} |
||||
|
||||
public void setEquTypeVO(EquType equTypeVO) { |
||||
this.equTypeVO = equTypeVO; |
||||
} |
||||
|
||||
private EquType equTypeVO; |
||||
|
||||
|
||||
/** 设备管理员姓名 */ |
||||
@Excel(name = "设备管理员姓名") |
||||
private String inCharge; |
||||
|
||||
|
||||
|
||||
|
||||
/** 安装日期 */ |
||||
@JsonFormat(pattern = "yyyy-MM-dd") |
||||
@Excel(name = "安装日期", width = 30, dateFormat = "yyyy-MM-dd") |
||||
private Date installDate; |
||||
|
||||
/** 预计年限(年) */ |
||||
@Excel(name = "预计年限(年)") |
||||
private Long lifeCycle; |
||||
|
||||
/** 质保时间(年) */ |
||||
@Excel(name = "质保时间(年)") |
||||
private Long warranty; |
||||
|
||||
/** 添加日期 */ |
||||
@JsonFormat(pattern = "yyyy-MM-dd") |
||||
@Excel(name = "添加日期", width = 30, dateFormat = "yyyy-MM-dd") |
||||
private Date createDate; |
||||
|
||||
/** 启用状态（1启用0禁用） */ |
||||
@Excel(name = "启用状态", readConverterExp = "0=启用1禁用") |
||||
private Long status; |
||||
|
||||
/** 累计预警次数 */ |
||||
@Excel(name = "累计预警次数") |
||||
private Long failureFrequency; |
||||
|
||||
/** 设备级别 */ |
||||
@Excel(name = "设备级别") |
||||
private String deviceLevel; |
||||
|
||||
/** 供应商id */ |
||||
@Excel(name = "供应商id") |
||||
private String supplierId; |
||||
|
||||
/** 采集次数 */ |
||||
@Excel(name = "采集次数") |
||||
private Long gatherFrequency; |
||||
|
||||
@Excel(name = "采集次数") |
||||
private Long createBy ; |
||||
|
||||
@Excel(name = "设备图片地址") |
||||
private String equImage ; |
||||
} |
||||
@ -0,0 +1,48 @@ |
||||
package com.alops.system.domain.dto; |
||||
|
||||
import com.alops.common.annotation.Excel; |
||||
import lombok.Data; |
||||
|
||||
import java.math.BigDecimal; |
||||
|
||||
@Data |
||||
public class equipmentAssessmentDto { |
||||
|
||||
/** 设备唯一标识（设备编号） */ |
||||
private String id; |
||||
|
||||
/** （设备编号） */ |
||||
private String equNumber; |
||||
|
||||
/** 设备名称 */ |
||||
@Excel(name = "设备名称") |
||||
private String name; |
||||
|
||||
/** 安装位置 */ |
||||
@Excel(name = "安装位置 ") |
||||
private String location; |
||||
|
||||
/** 设备类型 id */ |
||||
@Excel(name = "设备类型名称") |
||||
private String equType; |
||||
|
||||
/** 设备级别 */ |
||||
@Excel(name = "设备级别") |
||||
private String deviceLevel; |
||||
|
||||
@Excel(name = "综合计算的健康度指标(%)") |
||||
private BigDecimal health; |
||||
|
||||
/** 设备温度 */ |
||||
@Excel(name = "设备温度") |
||||
private BigDecimal temperature; |
||||
|
||||
/** CPU 使用率(%) */ |
||||
@Excel(name = "CPU 使用率(%)") |
||||
private BigDecimal cpuUtilization; |
||||
|
||||
/** 内存使用率(%) */ |
||||
@Excel(name = "内存使用率(%)") |
||||
private BigDecimal memoryUtilization; |
||||
|
||||
} |
||||
@ -0,0 +1,45 @@ |
||||
package com.alops.system.domain.vo; |
||||
|
||||
import com.alops.common.annotation.Excel; |
||||
import lombok.Data; |
||||
|
||||
@Data |
||||
public class equipmentAssessmentVo { |
||||
|
||||
/** 设备唯一标识（设备编号） */ |
||||
private String id; |
||||
|
||||
/** （设备编号） */ |
||||
private String equNumber; |
||||
|
||||
/** 设备名称 */ |
||||
@Excel(name = "设备名称") |
||||
private String name; |
||||
|
||||
/** 安装位置 */ |
||||
@Excel(name = "安装位置 ") |
||||
private String location; |
||||
|
||||
/** 设备类型 id */ |
||||
@Excel(name = "设备类型名称") |
||||
private String equType; |
||||
|
||||
/** 设备级别 */ |
||||
@Excel(name = "设备级别") |
||||
private String deviceLevel; |
||||
|
||||
/** CPU使用率（%） */ |
||||
private String cpuStatus; |
||||
|
||||
/** 内存使用率（%） */ |
||||
private String memoryStatus; |
||||
|
||||
/** 温度（℃） */ |
||||
private String temperatureStatus; |
||||
|
||||
/** 健康状态（健康、良好、一般、需维护） */ |
||||
private String healthStatus; |
||||
|
||||
/** 风险等级 */ |
||||
private String riskGrade ; |
||||
} |
||||
@ -1,13 +1,12 @@ |
||||
package com.alops.system.domain.vo; |
||||
|
||||
import com.alops.common.annotation.Excel; |
||||
import com.fasterxml.jackson.annotation.JsonFormat; |
||||
import lombok.Data; |
||||
|
||||
import java.util.Date; |
||||
|
||||
@Data |
||||
public class homeEquAlertMessage { |
||||
public class homeEquAlertMessageVo { |
||||
|
||||
|
||||
/** 预警级别(1-5级) */ |
||||
Loading…
Reference in new issue