diff --git a/ALOps_sys_backend/alops-admin/pom.xml b/ALOps_sys_backend/alops-admin/pom.xml
index c5e46b6a..8a8c1b4c 100644
--- a/ALOps_sys_backend/alops-admin/pom.xml
+++ b/ALOps_sys_backend/alops-admin/pom.xml
@@ -76,13 +76,6 @@
alops-generator
-
-
- org.springframework.boot
- spring-boot-starter-mail
- 2.5.15
-
-
diff --git a/ALOps_sys_backend/alops-admin/src/main/java/com/alops/web/controller/equManagement/EquBaseController.java b/ALOps_sys_backend/alops-admin/src/main/java/com/alops/web/controller/equManagement/EquBaseController.java
index cd4ed9bc..50cecfb1 100644
--- a/ALOps_sys_backend/alops-admin/src/main/java/com/alops/web/controller/equManagement/EquBaseController.java
+++ b/ALOps_sys_backend/alops-admin/src/main/java/com/alops/web/controller/equManagement/EquBaseController.java
@@ -13,7 +13,6 @@ import com.alops.common.enums.BusinessType;
import com.alops.common.utils.poi.ExcelUtil;
import com.alops.system.domain.EquBase;
import com.alops.system.domain.dto.EquBaseQueryDto;
-import com.alops.system.domain.vo.queryEquBaseVO;
import com.alops.system.service.IEquBaseService;
import io.swagger.annotations.ApiOperation;
import org.springframework.security.access.prepost.PreAuthorize;
@@ -49,7 +48,7 @@ public class EquBaseController extends BaseController
@ApiOperation("查询符合参数设备信息")
public AjaxResult list(EquBaseQueryDto equBaseQueryDto ) {
startPage();
- List list = equBaseService.selectEquBaseList(equBaseQueryDto);
+ List list = equBaseService.selectEquBaseList(equBaseQueryDto);
TableDataInfo tableDataInfo = getDataTable(list);
Map data = new HashMap<>();
data.put("total", tableDataInfo.getTotal());
@@ -69,15 +68,15 @@ public class EquBaseController extends BaseController
/**
* 导出设备基本信息列表
*/
-// @PreAuthorize("@ss.hasPermi('equipment:base:export')")
-// @Log(title = "设备档案", businessType = BusinessType.EXPORT)
-// @PostMapping("/export")
-//// public void export(HttpServletResponse response, EquBaseQueryDto equBaseQueryDto)
-//// {
-//// List list = equBaseService.selectEquBaseList(equBaseQueryDto);
-//// ExcelUtil util = new ExcelUtil(EquBase.class);
-//// util.exportExcel(response, list, "设备基本信息数据");
-//// }
+ @PreAuthorize("@ss.hasPermi('equipment:base:export')")
+ @Log(title = "设备档案", businessType = BusinessType.EXPORT)
+ @PostMapping("/export")
+ public void export(HttpServletResponse response, EquBaseQueryDto equBaseQueryDto)
+ {
+ List list = equBaseService.selectEquBaseList(equBaseQueryDto);
+ ExcelUtil util = new ExcelUtil(EquBase.class);
+ util.exportExcel(response, list, "设备基本信息数据");
+ }
/**
* 获取设备基本信息详细信息
diff --git a/ALOps_sys_backend/alops-admin/src/main/java/com/alops/web/controller/equManagement/EquOidController.java b/ALOps_sys_backend/alops-admin/src/main/java/com/alops/web/controller/equManagement/EquOidController.java
deleted file mode 100644
index b15c41d9..00000000
--- a/ALOps_sys_backend/alops-admin/src/main/java/com/alops/web/controller/equManagement/EquOidController.java
+++ /dev/null
@@ -1,106 +0,0 @@
-package com.alops.web.controller.equManagement;
-
-import java.util.List;
-import javax.servlet.http.HttpServletResponse;
-
-import com.alops.common.annotation.Log;
-import com.alops.common.core.controller.BaseController;
-import com.alops.common.core.domain.AjaxResult;
-import com.alops.common.core.page.TableDataInfo;
-import com.alops.common.enums.BusinessType;
-import com.alops.common.utils.poi.ExcelUtil;
-import com.alops.system.domain.EquOid;
-import com.alops.system.service.IEquOidService;
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.PutMapping;
-import org.springframework.web.bind.annotation.DeleteMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-
-/**
- * OID配置信息Controller
- *
- * @author ruoyi
- * @date 2025-08-15
- */
-@RestController
-@RequestMapping("/system/oid")
-public class EquOidController extends BaseController
-{
- @Autowired
- private IEquOidService equOidService;
-
- /**
- * 查询OID配置信息列表
- *
- */
- @PreAuthorize("@ss.hasPermi('system:oid:list')")
- @GetMapping("/list")
- public TableDataInfo list(EquOid equOid)
- {
- startPage();
- List list = equOidService.selectEquOidList(equOid);
- return getDataTable(list);
- }
-
- /**
- * 导出OID配置信息列表
- */
- @PreAuthorize("@ss.hasPermi('system:oid:export')")
- @Log(title = "OID配置信息", businessType = BusinessType.EXPORT)
- @PostMapping("/export")
- public void export(HttpServletResponse response, EquOid equOid)
- {
- List list = equOidService.selectEquOidList(equOid);
- ExcelUtil util = new ExcelUtil(EquOid.class);
- util.exportExcel(response, list, "OID配置信息数据");
- }
-
- /**
- * 获取OID配置信息详细信息
- */
- @PreAuthorize("@ss.hasPermi('system:oid:query')")
- @GetMapping(value = "/{id}")
- public AjaxResult getInfo(@PathVariable("id") Long id)
- {
- return success(equOidService.selectEquOidById(id));
- }
-
- /**
- * 新增OID配置信息
- */
- @PreAuthorize("@ss.hasPermi('system:oid:add')")
- @Log(title = "OID配置信息", businessType = BusinessType.INSERT)
- @PostMapping
- public AjaxResult add(@RequestBody EquOid equOid)
- {
- return toAjax(equOidService.insertEquOid(equOid));
- }
-
- /**
- * 修改OID配置信息
- */
- @PreAuthorize("@ss.hasPermi('system:oid:edit')")
- @Log(title = "OID配置信息", businessType = BusinessType.UPDATE)
- @PutMapping
- public AjaxResult edit(@RequestBody EquOid equOid)
- {
- return toAjax(equOidService.updateEquOid(equOid));
- }
-
- /**
- * 删除OID配置信息
- */
- @PreAuthorize("@ss.hasPermi('system:oid:remove')")
- @Log(title = "OID配置信息", businessType = BusinessType.DELETE)
- @DeleteMapping("/{ids}")
- public AjaxResult remove(@PathVariable Long[] ids)
- {
- return toAjax(equOidService.deleteEquOidByIds(ids));
- }
-}
diff --git a/ALOps_sys_backend/alops-admin/src/main/java/com/alops/web/controller/equManagement/EquVlanController.java b/ALOps_sys_backend/alops-admin/src/main/java/com/alops/web/controller/equManagement/EquVlanController.java
deleted file mode 100644
index 1067a1e8..00000000
--- a/ALOps_sys_backend/alops-admin/src/main/java/com/alops/web/controller/equManagement/EquVlanController.java
+++ /dev/null
@@ -1,105 +0,0 @@
-package com.alops.web.controller.equManagement;
-
-import java.util.List;
-import javax.servlet.http.HttpServletResponse;
-
-import com.alops.common.annotation.Log;
-import com.alops.common.core.controller.BaseController;
-import com.alops.common.core.domain.AjaxResult;
-import com.alops.common.core.page.TableDataInfo;
-import com.alops.common.enums.BusinessType;
-import com.alops.common.utils.poi.ExcelUtil;
-import com.alops.system.domain.EquVlan;
-import com.alops.system.service.IEquVlanService;
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.PutMapping;
-import org.springframework.web.bind.annotation.DeleteMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-
-/**
- * 【请填写功能名称】Controller
- *
- * @author ruoyi
- * @date 2025-08-15
- */
-@RestController
-@RequestMapping("/system/vlan")
-public class EquVlanController extends BaseController
-{
- @Autowired
- private IEquVlanService equVlanService;
-
- /**
- * 查询【请填写功能名称】列表
- */
- @PreAuthorize("@ss.hasPermi('system:vlan:list')")
- @GetMapping("/list")
- public TableDataInfo list(EquVlan equVlan)
- {
- startPage();
- List list = equVlanService.selectEquVlanList(equVlan);
- return getDataTable(list);
- }
-
- /**
- * 导出【请填写功能名称】列表
- */
- @PreAuthorize("@ss.hasPermi('system:vlan:export')")
- @Log(title = "【请填写功能名称】", businessType = BusinessType.EXPORT)
- @PostMapping("/export")
- public void export(HttpServletResponse response, EquVlan equVlan)
- {
- List list = equVlanService.selectEquVlanList(equVlan);
- ExcelUtil util = new ExcelUtil(EquVlan.class);
- util.exportExcel(response, list, "【请填写功能名称】数据");
- }
-
- /**
- * 获取【请填写功能名称】详细信息
- */
- @PreAuthorize("@ss.hasPermi('system:vlan:query')")
- @GetMapping(value = "/{id}")
- public AjaxResult getInfo(@PathVariable("id") String id)
- {
- return success(equVlanService.selectEquVlanById(id));
- }
-
- /**
- * 新增【请填写功能名称】
- */
- @PreAuthorize("@ss.hasPermi('system:vlan:add')")
- @Log(title = "【请填写功能名称】", businessType = BusinessType.INSERT)
- @PostMapping
- public AjaxResult add(@RequestBody EquVlan equVlan)
- {
- return toAjax(equVlanService.insertEquVlan(equVlan));
- }
-
- /**
- * 修改【请填写功能名称】
- */
- @PreAuthorize("@ss.hasPermi('system:vlan:edit')")
- @Log(title = "【请填写功能名称】", businessType = BusinessType.UPDATE)
- @PutMapping
- public AjaxResult edit(@RequestBody EquVlan equVlan)
- {
- return toAjax(equVlanService.updateEquVlan(equVlan));
- }
-
- /**
- * 删除【请填写功能名称】
- */
- @PreAuthorize("@ss.hasPermi('system:vlan:remove')")
- @Log(title = "【请填写功能名称】", businessType = BusinessType.DELETE)
- @DeleteMapping("/{ids}")
- public AjaxResult remove(@PathVariable String[] ids)
- {
- return toAjax(equVlanService.deleteEquVlanByIds(ids));
- }
-}
diff --git a/ALOps_sys_backend/alops-admin/src/main/java/com/alops/web/controller/equManagement/ScheduleRulesController.java b/ALOps_sys_backend/alops-admin/src/main/java/com/alops/web/controller/equManagement/ScheduleRulesController.java
index c17a66cb..85f5b72c 100644
--- a/ALOps_sys_backend/alops-admin/src/main/java/com/alops/web/controller/equManagement/ScheduleRulesController.java
+++ b/ALOps_sys_backend/alops-admin/src/main/java/com/alops/web/controller/equManagement/ScheduleRulesController.java
@@ -1,7 +1,6 @@
package com.alops.web.controller.equManagement;
import java.util.List;
-import java.util.concurrent.ExecutionException;
import javax.servlet.http.HttpServletResponse;
import com.alops.common.annotation.Log;
@@ -11,9 +10,7 @@ import com.alops.common.core.page.TableDataInfo;
import com.alops.common.enums.BusinessType;
import com.alops.common.utils.poi.ExcelUtil;
import com.alops.system.domain.ScheduleRules;
-import com.alops.system.domain.vo.Code;
import com.alops.system.service.IScheduleRulesService;
-import io.swagger.annotations.ApiOperation;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping;
@@ -27,42 +24,21 @@ import org.springframework.web.bind.annotation.RestController;
/**
* 定时采集规则Controller
- *
+ *
* @author ruoyi
* @date 2025-08-03
*/
@RestController
-@RequestMapping("/equipmentRule")
+@RequestMapping("/system/rules")
public class ScheduleRulesController extends BaseController
{
@Autowired
private IScheduleRulesService scheduleRulesService;
- /**
- * 立即执行按钮
- */
- @PreAuthorize("@ss.hasPermi('equipment:rules:list')")
- @GetMapping("/protoCollect")
- @ApiOperation("立即执行")
- public AjaxResult protoCollect() throws ExecutionException, InterruptedException {
- // 调用 Service 层执行采集,返回业务状态码
- int code = scheduleRulesService.executeImmediately();
-
- // 根据返回码生成 AjaxResult
- if(code == Code.SUCCESS){
- return AjaxResult.success("采集完成");
- } else if(code == Code.PARTIAL){
- return AjaxResult.warn("部分设备采集失败");
- } else {
- return AjaxResult.error("采集失败");
- }
- }
-
-
/**
* 查询定时采集规则列表
*/
- @PreAuthorize("@ss.hasPermi('equipment:rules:list')")
+ @PreAuthorize("@ss.hasPermi('system:rules:list')")
@GetMapping("/list")
public TableDataInfo list(ScheduleRules scheduleRules)
{
@@ -74,7 +50,7 @@ public class ScheduleRulesController extends BaseController
/**
* 导出定时采集规则列表
*/
- @PreAuthorize("@ss.hasPermi('equipment:rules:export')")
+ @PreAuthorize("@ss.hasPermi('system:rules:export')")
@Log(title = "定时采集规则", businessType = BusinessType.EXPORT)
@PostMapping("/export")
public void export(HttpServletResponse response, ScheduleRules scheduleRules)
@@ -87,19 +63,17 @@ public class ScheduleRulesController extends BaseController
/**
* 获取定时采集规则详细信息
*/
- @PreAuthorize("@ss.hasPermi('equipment:rules:query')")
+ @PreAuthorize("@ss.hasPermi('system:rules:query')")
@GetMapping(value = "/{id}")
public AjaxResult getInfo(@PathVariable("id") Long id)
{
return success(scheduleRulesService.selectScheduleRulesById(id));
}
-
-
/**
* 新增定时采集规则
*/
- @PreAuthorize("@ss.hasPermi('equipment:rules:add')")
+ @PreAuthorize("@ss.hasPermi('system:rules:add')")
@Log(title = "定时采集规则", businessType = BusinessType.INSERT)
@PostMapping
public AjaxResult add(@RequestBody ScheduleRules scheduleRules)
@@ -107,12 +81,10 @@ public class ScheduleRulesController extends BaseController
return toAjax(scheduleRulesService.insertScheduleRules(scheduleRules));
}
-
-
/**
* 修改定时采集规则
*/
- @PreAuthorize("@ss.hasPermi('equipment:rules:edit')")
+ @PreAuthorize("@ss.hasPermi('system:rules:edit')")
@Log(title = "定时采集规则", businessType = BusinessType.UPDATE)
@PutMapping
public AjaxResult edit(@RequestBody ScheduleRules scheduleRules)
@@ -120,16 +92,14 @@ public class ScheduleRulesController extends BaseController
return toAjax(scheduleRulesService.updateScheduleRules(scheduleRules));
}
-
/**
* 删除定时采集规则
*/
- @PreAuthorize("@ss.hasPermi('equipment:rules:remove')")
+ @PreAuthorize("@ss.hasPermi('system:rules:remove')")
@Log(title = "定时采集规则", businessType = BusinessType.DELETE)
- @DeleteMapping("rule/{ids}")
+ @DeleteMapping("/{ids}")
public AjaxResult remove(@PathVariable Long[] ids)
{
return toAjax(scheduleRulesService.deleteScheduleRulesByIds(ids));
}
-
}
diff --git a/ALOps_sys_backend/alops-admin/src/main/java/com/alops/web/controller/exceptionController/AlarmRuleController.java b/ALOps_sys_backend/alops-admin/src/main/java/com/alops/web/controller/exceptionController/AlarmRuleController.java
new file mode 100644
index 00000000..a89e5ea9
--- /dev/null
+++ b/ALOps_sys_backend/alops-admin/src/main/java/com/alops/web/controller/exceptionController/AlarmRuleController.java
@@ -0,0 +1,106 @@
+package com.alops.web.controller.exceptionController;
+
+import java.util.List;
+import javax.servlet.http.HttpServletResponse;
+
+import com.alops.common.annotation.Log;
+import com.alops.common.core.controller.BaseController;
+import com.alops.common.core.domain.AjaxResult;
+import com.alops.common.core.page.TableDataInfo;
+import com.alops.common.enums.BusinessType;
+import com.alops.common.utils.poi.ExcelUtil;
+import com.alops.system.domain.AlarmRule;
+import com.alops.system.service.IAlarmRuleService;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+
+/**
+ * 预警规则Controller
+ *
+ * @author ruoyi
+ * @date 2025-08-01
+ */
+@RestController
+@RequestMapping("/system/rule")
+public class AlarmRuleController extends BaseController
+{
+ @Autowired
+ private IAlarmRuleService alarmRuleService;
+
+ /**
+ * 查询预警规则列表
+ */
+ @PreAuthorize("@ss.hasPermi('system:rule:list')")
+ @GetMapping("/list")
+ public TableDataInfo list(AlarmRule alarmRule)
+ {
+ startPage();
+ List list = alarmRuleService.selectAlarmRuleList(alarmRule);
+ return getDataTable(list);
+ }
+
+ /**
+ * 导出预警规则列表
+ */
+ @PreAuthorize("@ss.hasPermi('system:rule:export')")
+ @Log(title = "预警规则", businessType = BusinessType.EXPORT)
+ @PostMapping("/export")
+ public void export(HttpServletResponse response, AlarmRule alarmRule)
+ {
+ List list = alarmRuleService.selectAlarmRuleList(alarmRule);
+ ExcelUtil util = new ExcelUtil(AlarmRule.class);
+ util.exportExcel(response, list, "预警规则数据");
+ }
+
+ /**
+ * 获取预警规则详细信息
+ */
+ @PreAuthorize("@ss.hasPermi('system:rule:query')")
+ @GetMapping(value = "/{id}")
+ public AjaxResult getInfo(@PathVariable("id") Long id)
+ {
+ return success(alarmRuleService.selectAlarmRuleById(id));
+ }
+
+ /**
+ * 新增预警规则
+ */
+ @PreAuthorize("@ss.hasPermi('system:rule:add')")
+ @Log(title = "预警规则", businessType = BusinessType.INSERT)
+ @PostMapping
+ public AjaxResult add(@RequestBody AlarmRule alarmRule)
+ {
+ return toAjax(alarmRuleService.insertAlarmRule(alarmRule));
+ }
+
+ /**
+ * 修改预警规则
+ */
+ @PreAuthorize("@ss.hasPermi('system:rule:edit')")
+ @Log(title = "预警规则", businessType = BusinessType.UPDATE)
+ @PutMapping
+ public AjaxResult edit(@RequestBody AlarmRule alarmRule)
+ {
+ return toAjax(alarmRuleService.updateAlarmRule(alarmRule));
+ }
+
+ /**
+ * 删除预警规则
+ */
+ @PreAuthorize("@ss.hasPermi('system:rule:remove')")
+ @Log(title = "预警规则", businessType = BusinessType.DELETE)
+ @DeleteMapping("/{ids}")
+ public AjaxResult remove(@PathVariable Long[] ids)
+ {
+ return toAjax(alarmRuleService.deleteAlarmRuleByIds(ids));
+ }
+}
diff --git a/ALOps_sys_backend/alops-admin/src/main/java/com/alops/web/controller/exceptionController/AlertRuleConditionController.java b/ALOps_sys_backend/alops-admin/src/main/java/com/alops/web/controller/exceptionController/AlertRuleConditionController.java
deleted file mode 100644
index cae542e9..00000000
--- a/ALOps_sys_backend/alops-admin/src/main/java/com/alops/web/controller/exceptionController/AlertRuleConditionController.java
+++ /dev/null
@@ -1,105 +0,0 @@
-package com.alops.web.controller.exceptionController;
-
-import java.util.List;
-import javax.servlet.http.HttpServletResponse;
-
-import com.alops.common.annotation.Log;
-import com.alops.common.core.controller.BaseController;
-import com.alops.common.core.domain.AjaxResult;
-import com.alops.common.core.page.TableDataInfo;
-import com.alops.common.enums.BusinessType;
-import com.alops.common.utils.poi.ExcelUtil;
-import com.alops.system.domain.AlertRuleCondition;
-import com.alops.system.service.IAlertRuleConditionService;
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.PutMapping;
-import org.springframework.web.bind.annotation.DeleteMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-
-/**
- * 【请填写功能名称】Controller
- *
- * @author ruoyi
- * @date 2025-09-04
- */
-@RestController
-@RequestMapping("/system/condition")
-public class AlertRuleConditionController extends BaseController
-{
- @Autowired
- private IAlertRuleConditionService alertRuleConditionService;
-
- /**
- * 查询【请填写功能名称】列表
- */
- @PreAuthorize("@ss.hasPermi('system:condition:list')")
- @GetMapping("/list")
- public TableDataInfo list(AlertRuleCondition alertRuleCondition)
- {
- startPage();
- List list = alertRuleConditionService.selectAlertRuleConditionList(alertRuleCondition);
- return getDataTable(list);
- }
-
- /**
- * 导出【请填写功能名称】列表
- */
- @PreAuthorize("@ss.hasPermi('system:condition:export')")
- @Log(title = "【请填写功能名称】", businessType = BusinessType.EXPORT)
- @PostMapping("/export")
- public void export(HttpServletResponse response, AlertRuleCondition alertRuleCondition)
- {
- List list = alertRuleConditionService.selectAlertRuleConditionList(alertRuleCondition);
- ExcelUtil util = new ExcelUtil(AlertRuleCondition.class);
- util.exportExcel(response, list, "【请填写功能名称】数据");
- }
-
- /**
- * 获取【请填写功能名称】详细信息
- */
- @PreAuthorize("@ss.hasPermi('system:condition:query')")
- @GetMapping(value = "/{id}")
- public AjaxResult getInfo(@PathVariable("id") Long id)
- {
- return success(alertRuleConditionService.selectAlertRuleConditionById(id));
- }
-
- /**
- * 新增【请填写功能名称】
- */
- @PreAuthorize("@ss.hasPermi('system:condition:add')")
- @Log(title = "【请填写功能名称】", businessType = BusinessType.INSERT)
- @PostMapping
- public AjaxResult add(@RequestBody AlertRuleCondition alertRuleCondition)
- {
- return toAjax(alertRuleConditionService.insertAlertRuleCondition(alertRuleCondition));
- }
-
- /**
- * 修改【请填写功能名称】
- */
- @PreAuthorize("@ss.hasPermi('system:condition:edit')")
- @Log(title = "【请填写功能名称】", businessType = BusinessType.UPDATE)
- @PutMapping
- public AjaxResult edit(@RequestBody AlertRuleCondition alertRuleCondition)
- {
- return toAjax(alertRuleConditionService.updateAlertRuleCondition(alertRuleCondition));
- }
-
- /**
- * 删除【请填写功能名称】
- */
- @PreAuthorize("@ss.hasPermi('system:condition:remove')")
- @Log(title = "【请填写功能名称】", businessType = BusinessType.DELETE)
- @DeleteMapping("/{ids}")
- public AjaxResult remove(@PathVariable Long[] ids)
- {
- return toAjax(alertRuleConditionService.deleteAlertRuleConditionByIds(ids));
- }
-}
diff --git a/ALOps_sys_backend/alops-admin/src/main/java/com/alops/web/controller/exceptionController/AlertRuleController.java b/ALOps_sys_backend/alops-admin/src/main/java/com/alops/web/controller/exceptionController/AlertRuleController.java
deleted file mode 100644
index 4f30da13..00000000
--- a/ALOps_sys_backend/alops-admin/src/main/java/com/alops/web/controller/exceptionController/AlertRuleController.java
+++ /dev/null
@@ -1,164 +0,0 @@
-package com.alops.web.controller.exceptionController;
-
-import java.util.List;
-import java.util.Map;
-import javax.servlet.http.HttpServletResponse;
-
-import com.alops.common.annotation.Log;
-import com.alops.common.core.controller.BaseController;
-import com.alops.common.core.domain.AjaxResult;
-import com.alops.common.core.page.TableDataInfo;
-import com.alops.common.enums.BusinessType;
-import com.alops.common.utils.poi.ExcelUtil;
-import com.alops.system.domain.AlertRule;
-import com.alops.system.domain.dto.AlertRuleAddDto;
-import com.alops.system.service.IAlertLaunchService;
-import com.alops.system.service.IAlertRuleService;
-import com.sun.jna.platform.win32.Winspool;
-import io.swagger.annotations.ApiOperation;
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.PutMapping;
-import org.springframework.web.bind.annotation.DeleteMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-
-/**
- * 【请填写功能名称】Controller
- *
- * @author ruoyi
- * @date 2025-09-04
- */
-@RestController
-@RequestMapping("/system/rule")
-public class AlertRuleController extends BaseController
-{
- @Autowired
- private IAlertRuleService alertRuleService;
- @Autowired
- private IAlertLaunchService iAlertLaunchService;
-
- //增加预警规则,生成对应的sql语句存入方法(只能针对个体表,表之间不能共同构成预警,特殊符号的规则只能有一个查询条件)
- //1.拿到 //预警名称,预警级别,预警对应的表格,预警方式,预警的到站方 预警规则,预警模版 内容描述 启用状态,创建人
- //+好几个规则条件实体类
- //2.生成sql语句
- //如果是如果是equ_gather直接根据组成条件构成查询语句,
- //如果是其他表格除去组成条件构成的语句+通过equ_garher_id关联到equ_gather表,搜索出实体外+设备id和设备类型
- //3.然后存入预警规则和预警规则条件表
-
- /**
- * 新增预警规则
- */
- @PreAuthorize("@ss.hasPermi('equipment:rules:add')")
- @ApiOperation("增加预警规则")
- @PostMapping("/add")
- public AjaxResult addRule(@RequestBody AlertRuleAddDto dto) {
- try {
- AlertRule alertRule = alertRuleService.saveRule(dto);
- return AjaxResult.success("预警规则新增成功", alertRule);
- } catch (Exception e) {
- e.printStackTrace();
- return AjaxResult.error("新增预警规则失败: " + e.getMessage());
- }
- }
-
-
- //立即预警方法
- //1.拿到预警规则,拿到查询语句(如果是change执行change的方法)和预警规则表的东西,进行查询,查询组成一个内从实体
- //2.根据每次预警模版,+进行对应填入,根据预警方式发送信息,再存入预警信息实体类
- //{设备id:{} 报错:{预警名称} 返回实体{自己看} }
- //3.批量存入预警信息数据库
-
- /**
- * 立即执行预警(带规则 ID 列表)
- */
- @PreAuthorize("@ss.hasPermi('equipment:rules:execute')")
- @ApiOperation("立即执行预警")
- @PostMapping("/executeImmediate")
- public AjaxResult executeImmediate(@RequestBody Map> paramMap) {
- try {
- List ruleIds = paramMap.get("ruleIds");
- if (ruleIds == null || ruleIds.isEmpty()) {
- return AjaxResult.error("请选择至少一条规则");
- }
-
- iAlertLaunchService.executeImmediateAlerts(ruleIds); // 调用 Service 执行
- return AjaxResult.success("立即预警任务已触发,存入成功,请查看");
- } catch (Exception e) {
- e.printStackTrace();
- return AjaxResult.error("执行立即预警失败: " + e.getMessage());
- }
- }
-
- /**
- * 查询【请填写功能名称】列表
- */
- @PreAuthorize("@ss.hasPermi('system:rule:list')")
- @GetMapping("/list")
- public TableDataInfo list(AlertRule alertRule)
- {
- startPage();
- List list = alertRuleService.selectAlertRuleList(alertRule);
- return getDataTable(list);
- }
-
- /**
- * 导出【请填写功能名称】列表
- */
- @PreAuthorize("@ss.hasPermi('system:rule:export')")
- @Log(title = "【请填写功能名称】", businessType = BusinessType.EXPORT)
- @PostMapping("/export")
- public void export(HttpServletResponse response, AlertRule alertRule)
- {
- List list = alertRuleService.selectAlertRuleList(alertRule);
- ExcelUtil util = new ExcelUtil(AlertRule.class);
- util.exportExcel(response, list, "【请填写功能名称】数据");
- }
-
- /**
- * 获取【请填写功能名称】详细信息
- */
- @PreAuthorize("@ss.hasPermi('system:rule:query')")
- @GetMapping(value = "/{id}")
- public AjaxResult getInfo(@PathVariable("id") Long id)
- {
- return success(alertRuleService.selectAlertRuleById(id));
- }
-
- /**
- * 新增【请填写功能名称】
- */
- @PreAuthorize("@ss.hasPermi('system:rule:add')")
- @Log(title = "【请填写功能名称】", businessType = BusinessType.INSERT)
- @PostMapping
- public AjaxResult add(@RequestBody AlertRule alertRule)
- {
- return toAjax(alertRuleService.insertAlertRule(alertRule));
- }
-
- /**
- * 修改【请填写功能名称】
- */
- @PreAuthorize("@ss.hasPermi('system:rule:edit')")
- @Log(title = "【请填写功能名称】", businessType = BusinessType.UPDATE)
- @PutMapping
- public AjaxResult edit(@RequestBody AlertRule alertRule)
- {
- return toAjax(alertRuleService.updateAlertRule(alertRule));
- }
-
- /**
- * 删除【请填写功能名称】
- */
- @PreAuthorize("@ss.hasPermi('system:rule:remove')")
- @Log(title = "【请填写功能名称】", businessType = BusinessType.DELETE)
- @DeleteMapping("/{ids}")
- public AjaxResult remove(@PathVariable Long[] ids)
- {
- return toAjax(alertRuleService.deleteAlertRuleByIds(ids));
- }
-}
diff --git a/ALOps_sys_backend/alops-admin/src/main/java/com/alops/web/controller/exceptionController/DictAlarmParamController.java b/ALOps_sys_backend/alops-admin/src/main/java/com/alops/web/controller/exceptionController/DictAlarmParamController.java
deleted file mode 100644
index 57cc7033..00000000
--- a/ALOps_sys_backend/alops-admin/src/main/java/com/alops/web/controller/exceptionController/DictAlarmParamController.java
+++ /dev/null
@@ -1,106 +0,0 @@
-package com.alops.web.controller.exceptionController;
-
-import java.util.List;
-import javax.servlet.http.HttpServletResponse;
-
-import com.alops.common.annotation.Log;
-import com.alops.common.core.controller.BaseController;
-import com.alops.common.core.domain.AjaxResult;
-import com.alops.common.core.page.TableDataInfo;
-import com.alops.common.enums.BusinessType;
-import com.alops.common.utils.poi.ExcelUtil;
-import com.alops.system.domain.DictAlarmParam;
-import com.alops.system.service.IDictAlarmParamService;
-import io.swagger.annotations.ApiImplicitParam;
-import io.swagger.annotations.ApiOperation;
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
-
-/**
- * 【请填写功能名称】Controller
- *
- * @author ruoyi
- * @date 2025-09-05
- */
-@RestController
-@RequestMapping("/system/param")
-public class DictAlarmParamController extends BaseController
-{
- @Autowired
- private IDictAlarmParamService dictAlarmParamService;
-
- @ApiOperation("获取预警参数")
- @PreAuthorize("@ss.hasPermi('system:param:byTable')")
- @GetMapping("/byTable")
- public AjaxResult getParamsByTableName(@RequestParam String tableName) {
- return AjaxResult.success("获取预警参数成功",dictAlarmParamService.getParamsByTableName(tableName));
- }
- /**
- * 查询【请填写功能名称】列表
- */
- @PreAuthorize("@ss.hasPermi('system:param:list')")
- @GetMapping("/list")
- public TableDataInfo list(DictAlarmParam dictAlarmParam)
- {
- startPage();
- List list = dictAlarmParamService.selectDictAlarmParamList(dictAlarmParam);
- return getDataTable(list);
- }
-
- /**
- * 导出【请填写功能名称】列表
- */
- @PreAuthorize("@ss.hasPermi('system:param:export')")
- @Log(title = "【请填写功能名称】", businessType = BusinessType.EXPORT)
- @PostMapping("/export")
- public void export(HttpServletResponse response, DictAlarmParam dictAlarmParam)
- {
- List list = dictAlarmParamService.selectDictAlarmParamList(dictAlarmParam);
- ExcelUtil util = new ExcelUtil(DictAlarmParam.class);
- util.exportExcel(response, list, "【请填写功能名称】数据");
- }
-
- /**
- * 获取【请填写功能名称】详细信息
- */
- @PreAuthorize("@ss.hasPermi('system:param:query')")
- @GetMapping(value = "/{id}")
- public AjaxResult getInfo(@PathVariable("id") Long id)
- {
- return success(dictAlarmParamService.selectDictAlarmParamById(id));
- }
-
- /**
- * 新增【请填写功能名称】
- */
- @PreAuthorize("@ss.hasPermi('system:param:add')")
- @Log(title = "【请填写功能名称】", businessType = BusinessType.INSERT)
- @PostMapping
- public AjaxResult add(@RequestBody DictAlarmParam dictAlarmParam)
- {
- return toAjax(dictAlarmParamService.insertDictAlarmParam(dictAlarmParam));
- }
-
- /**
- * 修改【请填写功能名称】
- */
- @PreAuthorize("@ss.hasPermi('system:param:edit')")
- @Log(title = "【请填写功能名称】", businessType = BusinessType.UPDATE)
- @PutMapping
- public AjaxResult edit(@RequestBody DictAlarmParam dictAlarmParam)
- {
- return toAjax(dictAlarmParamService.updateDictAlarmParam(dictAlarmParam));
- }
-
- /**
- * 删除【请填写功能名称】
- */
- @PreAuthorize("@ss.hasPermi('system:param:remove')")
- @Log(title = "【请填写功能名称】", businessType = BusinessType.DELETE)
- @DeleteMapping("/{ids}")
- public AjaxResult remove(@PathVariable Long[] ids)
- {
- return toAjax(dictAlarmParamService.deleteDictAlarmParamByIds(ids));
- }
-}
diff --git a/ALOps_sys_backend/alops-admin/src/main/java/com/alops/web/controller/exceptionController/AlertMessageController.java b/ALOps_sys_backend/alops-admin/src/main/java/com/alops/web/controller/exceptionController/FauStaController.java
similarity index 54%
rename from ALOps_sys_backend/alops-admin/src/main/java/com/alops/web/controller/exceptionController/AlertMessageController.java
rename to ALOps_sys_backend/alops-admin/src/main/java/com/alops/web/controller/exceptionController/FauStaController.java
index 091f3b6e..e11d327a 100644
--- a/ALOps_sys_backend/alops-admin/src/main/java/com/alops/web/controller/exceptionController/AlertMessageController.java
+++ b/ALOps_sys_backend/alops-admin/src/main/java/com/alops/web/controller/exceptionController/FauStaController.java
@@ -9,8 +9,8 @@ import com.alops.common.core.domain.AjaxResult;
import com.alops.common.core.page.TableDataInfo;
import com.alops.common.enums.BusinessType;
import com.alops.common.utils.poi.ExcelUtil;
-import com.alops.system.domain.AlertMessage;
-import com.alops.system.service.IAlertMessageService;
+import com.alops.system.domain.FauSta;
+import com.alops.system.service.IFauStaService;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping;
@@ -22,87 +22,85 @@ import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
+
/**
* 故障统计Controller
*
* @author ruoyi
- * @date 2025-09-04
+ * @date 2025-08-01
*/
@RestController
-@RequestMapping("/system/message")
-public class AlertMessageController extends BaseController
+@RequestMapping("/system/sta")
+public class FauStaController extends BaseController
{
@Autowired
- private IAlertMessageService alertMessageService;
-
-
-
+ private IFauStaService fauStaService;
/**
- * 查询预警信息统计列表
+ * 查询故障统计列表
*/
- @PreAuthorize("@ss.hasPermi('system:message:list')")
+ @PreAuthorize("@ss.hasPermi('system:sta:list')")
@GetMapping("/list")
- public TableDataInfo list(AlertMessage alertMessage)
+ public TableDataInfo list(FauSta fauSta)
{
startPage();
- List list = alertMessageService.selectAlertMessageList(alertMessage);
+ List list = fauStaService.selectFauStaList(fauSta);
return getDataTable(list);
}
/**
- * 导出 预警信息列表
+ * 导出故障统计列表
*/
- @PreAuthorize("@ss.hasPermi('system:message:export')")
+ @PreAuthorize("@ss.hasPermi('system:sta:export')")
@Log(title = "故障统计", businessType = BusinessType.EXPORT)
@PostMapping("/export")
- public void export(HttpServletResponse response, AlertMessage alertMessage)
+ public void export(HttpServletResponse response, FauSta fauSta)
{
- List list = alertMessageService.selectAlertMessageList(alertMessage);
- ExcelUtil util = new ExcelUtil(AlertMessage.class);
+ List list = fauStaService.selectFauStaList(fauSta);
+ ExcelUtil util = new ExcelUtil(FauSta.class);
util.exportExcel(response, list, "故障统计数据");
}
/**
- * 获取预警信息
+ * 获取故障统计详细信息
*/
- @PreAuthorize("@ss.hasPermi('system:message:query')")
+ @PreAuthorize("@ss.hasPermi('system:sta:query')")
@GetMapping(value = "/{id}")
public AjaxResult getInfo(@PathVariable("id") Long id)
{
- return success(alertMessageService.selectAlertMessageById(id));
+ return success(fauStaService.selectFauStaById(id));
}
/**
- * 新增预警信息
+ * 新增故障统计
*/
- @PreAuthorize("@ss.hasPermi('system:message:add')")
+ @PreAuthorize("@ss.hasPermi('system:sta:add')")
@Log(title = "故障统计", businessType = BusinessType.INSERT)
@PostMapping
- public AjaxResult add(@RequestBody AlertMessage alertMessage)
+ public AjaxResult add(@RequestBody FauSta fauSta)
{
- return toAjax(alertMessageService.insertAlertMessage(alertMessage));
+ return toAjax(fauStaService.insertFauSta(fauSta));
}
/**
- * 修改预警信息
+ * 修改故障统计
*/
- @PreAuthorize("@ss.hasPermi('system:message:edit')")
+ @PreAuthorize("@ss.hasPermi('system:sta:edit')")
@Log(title = "故障统计", businessType = BusinessType.UPDATE)
@PutMapping
- public AjaxResult edit(@RequestBody AlertMessage alertMessage)
+ public AjaxResult edit(@RequestBody FauSta fauSta)
{
- return toAjax(alertMessageService.updateAlertMessage(alertMessage));
+ return toAjax(fauStaService.updateFauSta(fauSta));
}
/**
- * 删除预警信息
+ * 删除故障统计
*/
- @PreAuthorize("@ss.hasPermi('system:message:remove')")
+ @PreAuthorize("@ss.hasPermi('system:sta:remove')")
@Log(title = "故障统计", businessType = BusinessType.DELETE)
@DeleteMapping("/{ids}")
public AjaxResult remove(@PathVariable Long[] ids)
{
- return toAjax(alertMessageService.deleteAlertMessageByIds(ids));
+ return toAjax(fauStaService.deleteFauStaByIds(ids));
}
}
diff --git a/ALOps_sys_backend/alops-admin/src/main/java/com/alops/web/controller/tool/EquGatherController.java b/ALOps_sys_backend/alops-admin/src/main/java/com/alops/web/controller/tool/EquGatherController.java
deleted file mode 100644
index 71a5cce1..00000000
--- a/ALOps_sys_backend/alops-admin/src/main/java/com/alops/web/controller/tool/EquGatherController.java
+++ /dev/null
@@ -1,105 +0,0 @@
-package com.alops.web.controller.tool;
-
-import java.util.List;
-import javax.servlet.http.HttpServletResponse;
-
-import com.alops.common.annotation.Log;
-import com.alops.common.core.controller.BaseController;
-import com.alops.common.core.domain.AjaxResult;
-import com.alops.common.core.page.TableDataInfo;
-import com.alops.common.enums.BusinessType;
-import com.alops.common.utils.poi.ExcelUtil;
-import com.alops.system.domain.EquGather;
-import com.alops.system.service.IEquGatherService;
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.PutMapping;
-import org.springframework.web.bind.annotation.DeleteMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-
-/**
- * 设备采集信息Controller
- *
- * @author ruoyi
- * @date 2025-08-15
- */
-@RestController
-@RequestMapping("/system/gather")
-public class EquGatherController extends BaseController
-{
- @Autowired
- private IEquGatherService equGatherService;
-
- /**
- * 查询设备采集信息列表
- */
- @PreAuthorize("@ss.hasPermi('system:gather:list')")
- @GetMapping("/list")
- public TableDataInfo list(EquGather equGather)
- {
- startPage();
- List list = equGatherService.selectEquGatherList(equGather);
- return getDataTable(list);
- }
-
- /**
- * 导出设备采集信息列表
- */
- @PreAuthorize("@ss.hasPermi('system:gather:export')")
- @Log(title = "设备采集信息", businessType = BusinessType.EXPORT)
- @PostMapping("/export")
- public void export(HttpServletResponse response, EquGather equGather)
- {
- List list = equGatherService.selectEquGatherList(equGather);
- ExcelUtil util = new ExcelUtil(EquGather.class);
- util.exportExcel(response, list, "设备采集信息数据");
- }
-
- /**
- * 获取设备采集信息详细信息
- */
- @PreAuthorize("@ss.hasPermi('system:gather:query')")
- @GetMapping(value = "/{id}")
- public AjaxResult getInfo(@PathVariable("id") String id)
- {
- return success(equGatherService.selectEquGatherById(id));
- }
-
- /**
- * 新增设备采集信息
- */
- @PreAuthorize("@ss.hasPermi('system:gather:add')")
- @Log(title = "设备采集信息", businessType = BusinessType.INSERT)
- @PostMapping
- public AjaxResult add(@RequestBody EquGather equGather)
- {
- return toAjax(equGatherService.insertEquGather(equGather));
- }
-
- /**
- * 修改设备采集信息
- */
- @PreAuthorize("@ss.hasPermi('system:gather:edit')")
- @Log(title = "设备采集信息", businessType = BusinessType.UPDATE)
- @PutMapping
- public AjaxResult edit(@RequestBody EquGather equGather)
- {
- return toAjax(equGatherService.updateEquGather(equGather));
- }
-
- /**
- * 删除设备采集信息
- */
- @PreAuthorize("@ss.hasPermi('system:gather:remove')")
- @Log(title = "设备采集信息", businessType = BusinessType.DELETE)
- @DeleteMapping("/{ids}")
- public AjaxResult remove(@PathVariable String[] ids)
- {
- return toAjax(equGatherService.deleteEquGatherByIds(ids));
- }
-}
diff --git a/ALOps_sys_backend/alops-admin/src/main/java/com/alops/web/controller/tool/EquInterfaceController.java b/ALOps_sys_backend/alops-admin/src/main/java/com/alops/web/controller/tool/EquInterfaceController.java
deleted file mode 100644
index 8f67a044..00000000
--- a/ALOps_sys_backend/alops-admin/src/main/java/com/alops/web/controller/tool/EquInterfaceController.java
+++ /dev/null
@@ -1,105 +0,0 @@
-package com.alops.web.controller.tool;
-
-import java.util.List;
-import javax.servlet.http.HttpServletResponse;
-
-import com.alops.common.annotation.Log;
-import com.alops.common.core.controller.BaseController;
-import com.alops.common.core.domain.AjaxResult;
-import com.alops.common.core.page.TableDataInfo;
-import com.alops.common.enums.BusinessType;
-import com.alops.common.utils.poi.ExcelUtil;
-import com.alops.system.domain.EquInterface;
-import com.alops.system.service.IEquInterfaceService;
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.PutMapping;
-import org.springframework.web.bind.annotation.DeleteMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-
-/**
- * 端口运行状态Controller
- *
- * @author ruoyi
- * @date 2025-08-20
- */
-@RestController
-@RequestMapping("/system/interface")
-public class EquInterfaceController extends BaseController
-{
- @Autowired
- private IEquInterfaceService equInterfaceService;
-
- /**
- * 查询端口运行状态列表
- */
- @PreAuthorize("@ss.hasPermi('system:interface:list')")
- @GetMapping("/list")
- public TableDataInfo list(EquInterface equInterface)
- {
- startPage();
- List list = equInterfaceService.selectEquInterfaceList(equInterface);
- return getDataTable(list);
- }
-
- /**
- * 导出端口运行状态列表
- */
- @PreAuthorize("@ss.hasPermi('system:interface:export')")
- @Log(title = "端口运行状态", businessType = BusinessType.EXPORT)
- @PostMapping("/export")
- public void export(HttpServletResponse response, EquInterface equInterface)
- {
- List list = equInterfaceService.selectEquInterfaceList(equInterface);
- ExcelUtil util = new ExcelUtil(EquInterface.class);
- util.exportExcel(response, list, "端口运行状态数据");
- }
-
- /**
- * 获取端口运行状态详细信息
- */
- @PreAuthorize("@ss.hasPermi('system:interface:query')")
- @GetMapping(value = "/{id}")
- public AjaxResult getInfo(@PathVariable("id") String id)
- {
- return success(equInterfaceService.selectEquInterfaceById(id));
- }
-
- /**
- * 新增端口运行状态
- */
- @PreAuthorize("@ss.hasPermi('system:interface:add')")
- @Log(title = "端口运行状态", businessType = BusinessType.INSERT)
- @PostMapping
- public AjaxResult add(@RequestBody EquInterface equInterface)
- {
- return toAjax(equInterfaceService.insertEquInterface(equInterface));
- }
-
- /**
- * 修改端口运行状态
- */
- @PreAuthorize("@ss.hasPermi('system:interface:edit')")
- @Log(title = "端口运行状态", businessType = BusinessType.UPDATE)
- @PutMapping
- public AjaxResult edit(@RequestBody EquInterface equInterface)
- {
- return toAjax(equInterfaceService.updateEquInterface(equInterface));
- }
-
- /**
- * 删除端口运行状态
- */
- @PreAuthorize("@ss.hasPermi('system:interface:remove')")
- @Log(title = "端口运行状态", businessType = BusinessType.DELETE)
- @DeleteMapping("/{ids}")
- public AjaxResult remove(@PathVariable String[] ids)
- {
- return toAjax(equInterfaceService.deleteEquInterfaceByIds(ids));
- }
-}
diff --git a/ALOps_sys_backend/alops-admin/src/main/java/com/alops/web/controller/tool/EquRoutingController.java b/ALOps_sys_backend/alops-admin/src/main/java/com/alops/web/controller/tool/EquRoutingController.java
deleted file mode 100644
index fe1d8d1f..00000000
--- a/ALOps_sys_backend/alops-admin/src/main/java/com/alops/web/controller/tool/EquRoutingController.java
+++ /dev/null
@@ -1,105 +0,0 @@
-package com.alops.web.controller.tool;
-
-import java.util.List;
-import javax.servlet.http.HttpServletResponse;
-
-import com.alops.common.annotation.Log;
-import com.alops.common.core.controller.BaseController;
-import com.alops.common.core.domain.AjaxResult;
-import com.alops.common.core.page.TableDataInfo;
-import com.alops.common.enums.BusinessType;
-import com.alops.common.utils.poi.ExcelUtil;
-import com.alops.system.domain.EquRouting;
-import com.alops.system.service.IEquRoutingService;
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.PutMapping;
-import org.springframework.web.bind.annotation.DeleteMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-
-/**
- * 路由信息Controller
- *
- * @author ruoyi
- * @date 2025-08-15
- */
-@RestController
-@RequestMapping("/system/routing")
-public class EquRoutingController extends BaseController
-{
- @Autowired
- private IEquRoutingService equRoutingService;
-
- /**
- * 查询路由信息列表
- */
- @PreAuthorize("@ss.hasPermi('system:routing:list')")
- @GetMapping("/list")
- public TableDataInfo list(EquRouting equRouting)
- {
- startPage();
- List list = equRoutingService.selectEquRoutingList(equRouting);
- return getDataTable(list);
- }
-
- /**
- * 导出路由信息列表
- */
- @PreAuthorize("@ss.hasPermi('system:routing:export')")
- @Log(title = "路由信息", businessType = BusinessType.EXPORT)
- @PostMapping("/export")
- public void export(HttpServletResponse response, EquRouting equRouting)
- {
- List list = equRoutingService.selectEquRoutingList(equRouting);
- ExcelUtil util = new ExcelUtil(EquRouting.class);
- util.exportExcel(response, list, "路由信息数据");
- }
-
- /**
- * 获取路由信息详细信息
- */
- @PreAuthorize("@ss.hasPermi('system:routing:query')")
- @GetMapping(value = "/{id}")
- public AjaxResult getInfo(@PathVariable("id") String id)
- {
- return success(equRoutingService.selectEquRoutingById(id));
- }
-
- /**
- * 新增路由信息
- */
- @PreAuthorize("@ss.hasPermi('system:routing:add')")
- @Log(title = "路由信息", businessType = BusinessType.INSERT)
- @PostMapping
- public AjaxResult add(@RequestBody EquRouting equRouting)
- {
- return toAjax(equRoutingService.insertEquRouting(equRouting));
- }
-
- /**
- * 修改路由信息
- */
- @PreAuthorize("@ss.hasPermi('system:routing:edit')")
- @Log(title = "路由信息", businessType = BusinessType.UPDATE)
- @PutMapping
- public AjaxResult edit(@RequestBody EquRouting equRouting)
- {
- return toAjax(equRoutingService.updateEquRouting(equRouting));
- }
-
- /**
- * 删除路由信息
- */
- @PreAuthorize("@ss.hasPermi('system:routing:remove')")
- @Log(title = "路由信息", businessType = BusinessType.DELETE)
- @DeleteMapping("/{ids}")
- public AjaxResult remove(@PathVariable String[] ids)
- {
- return toAjax(equRoutingService.deleteEquRoutingByIds(ids));
- }
-}
diff --git a/ALOps_sys_backend/alops-admin/src/main/java/com/alops/web/controller/tool/EquVeneerController.java b/ALOps_sys_backend/alops-admin/src/main/java/com/alops/web/controller/tool/EquVeneerController.java
deleted file mode 100644
index 969f5c02..00000000
--- a/ALOps_sys_backend/alops-admin/src/main/java/com/alops/web/controller/tool/EquVeneerController.java
+++ /dev/null
@@ -1,105 +0,0 @@
-package com.alops.web.controller.tool;
-
-import java.util.List;
-import javax.servlet.http.HttpServletResponse;
-
-import com.alops.common.annotation.Log;
-import com.alops.common.core.controller.BaseController;
-import com.alops.common.core.domain.AjaxResult;
-import com.alops.common.core.page.TableDataInfo;
-import com.alops.common.enums.BusinessType;
-import com.alops.common.utils.poi.ExcelUtil;
-import com.alops.system.domain.EquVeneer;
-import com.alops.system.service.IEquVeneerService;
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.PutMapping;
-import org.springframework.web.bind.annotation.DeleteMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-
-/**
- * 【请填写功能名称】Controller
- *
- * @author ruoyi
- * @date 2025-08-15
- */
-@RestController
-@RequestMapping("/system/veneer")
-public class EquVeneerController extends BaseController
-{
- @Autowired
- private IEquVeneerService equVeneerService;
-
- /**
- * 查询【请填写功能名称】列表
- */
- @PreAuthorize("@ss.hasPermi('system:veneer:list')")
- @GetMapping("/list")
- public TableDataInfo list(EquVeneer equVeneer)
- {
- startPage();
- List list = equVeneerService.selectEquVeneerList(equVeneer);
- return getDataTable(list);
- }
-
- /**
- * 导出【请填写功能名称】列表
- */
- @PreAuthorize("@ss.hasPermi('system:veneer:export')")
- @Log(title = "【请填写功能名称】", businessType = BusinessType.EXPORT)
- @PostMapping("/export")
- public void export(HttpServletResponse response, EquVeneer equVeneer)
- {
- List list = equVeneerService.selectEquVeneerList(equVeneer);
- ExcelUtil util = new ExcelUtil(EquVeneer.class);
- util.exportExcel(response, list, "【请填写功能名称】数据");
- }
-
- /**
- * 获取【请填写功能名称】详细信息
- */
- @PreAuthorize("@ss.hasPermi('system:veneer:query')")
- @GetMapping(value = "/{id}")
- public AjaxResult getInfo(@PathVariable("id") String id)
- {
- return success(equVeneerService.selectEquVeneerById(id));
- }
-
- /**
- * 新增【请填写功能名称】
- */
- @PreAuthorize("@ss.hasPermi('system:veneer:add')")
- @Log(title = "【请填写功能名称】", businessType = BusinessType.INSERT)
- @PostMapping
- public AjaxResult add(@RequestBody EquVeneer equVeneer)
- {
- return toAjax(equVeneerService.insertEquVeneer(equVeneer));
- }
-
- /**
- * 修改【请填写功能名称】
- */
- @PreAuthorize("@ss.hasPermi('system:veneer:edit')")
- @Log(title = "【请填写功能名称】", businessType = BusinessType.UPDATE)
- @PutMapping
- public AjaxResult edit(@RequestBody EquVeneer equVeneer)
- {
- return toAjax(equVeneerService.updateEquVeneer(equVeneer));
- }
-
- /**
- * 删除【请填写功能名称】
- */
- @PreAuthorize("@ss.hasPermi('system:veneer:remove')")
- @Log(title = "【请填写功能名称】", businessType = BusinessType.DELETE)
- @DeleteMapping("/{ids}")
- public AjaxResult remove(@PathVariable String[] ids)
- {
- return toAjax(equVeneerService.deleteEquVeneerByIds(ids));
- }
-}
diff --git a/ALOps_sys_backend/alops-admin/src/main/resources/application.yml b/ALOps_sys_backend/alops-admin/src/main/resources/application.yml
index fb19c529..c1dbf108 100644
--- a/ALOps_sys_backend/alops-admin/src/main/resources/application.yml
+++ b/ALOps_sys_backend/alops-admin/src/main/resources/application.yml
@@ -48,19 +48,7 @@ user:
lockTime: 10
# Spring配置
-Spring:
- # 邮件信息
- mail:
- host: smtp.qq.com
- port: 465
- username: 2028008386@qq.com
- password: qdcptuazfndybjdd
- protocol: smtp
- properties:
- mail.smtp.auth: true
- mail.smtp.ssl.enable: true # QQ邮箱用 SSL
- mail.smtp.starttls.enable: true
- mail.smtp.starttls.required: true
+spring:
# 资源信息
messages:
# 国际化资源文件路径
@@ -101,10 +89,6 @@ Spring:
max-active: 8
# #连接池最大阻塞等待时间(使用负值表示没有限制)
max-wait: -1ms
- #邮件信息
-
-
-
# token配置
token:
@@ -146,4 +130,3 @@ xss:
# 匹配链接
urlPatterns: /system/*,/monitor/*,/tool/*
-
diff --git a/ALOps_sys_backend/alops-common/src/main/java/com/alops/common/core/domain/BaseEntity.java b/ALOps_sys_backend/alops-common/src/main/java/com/alops/common/core/domain/BaseEntity.java
index 059fcaa9..000b282f 100644
--- a/ALOps_sys_backend/alops-common/src/main/java/com/alops/common/core/domain/BaseEntity.java
+++ b/ALOps_sys_backend/alops-common/src/main/java/com/alops/common/core/domain/BaseEntity.java
@@ -29,7 +29,7 @@ public class BaseEntity implements Serializable
private Date createTime;
/** 更新者 */
- private String updateBy;
+ private String updateBy;
/** 更新时间 */
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@@ -77,7 +77,7 @@ public class BaseEntity implements Serializable
return updateBy;
}
- public void setUpdateBy(String updateBy)
+ public void setUpdateBy(String updateBy)
{
this.updateBy = updateBy;
}
diff --git a/ALOps_sys_backend/alops-system/pom.xml b/ALOps_sys_backend/alops-system/pom.xml
index a09b3f2e..19822654 100644
--- a/ALOps_sys_backend/alops-system/pom.xml
+++ b/ALOps_sys_backend/alops-system/pom.xml
@@ -29,16 +29,8 @@
com.alops
alops-common
-
-
-
- org.springframework.boot
- spring-boot-starter-mail
- 2.5.15
-
-
\ No newline at end of file
diff --git a/ALOps_sys_backend/alops-system/src/main/java/com/alops/system/domain/AlarmRule.java b/ALOps_sys_backend/alops-system/src/main/java/com/alops/system/domain/AlarmRule.java
new file mode 100644
index 00000000..acd3eb23
--- /dev/null
+++ b/ALOps_sys_backend/alops-system/src/main/java/com/alops/system/domain/AlarmRule.java
@@ -0,0 +1,205 @@
+package com.alops.system.domain;
+
+import java.math.BigDecimal;
+
+import com.alops.common.annotation.Excel;
+import com.alops.common.core.domain.BaseEntity;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+
+/**
+ * 预警规则对象 alarm_rule
+ *
+ * @author ruoyi
+ * @date 2025-08-01
+ */
+public class AlarmRule extends BaseEntity
+{
+ private static final long serialVersionUID = 1L;
+
+ /** 规则ID */
+ private Long id;
+
+ /** 预警名称 */
+ @Excel(name = "预警名称")
+ private String ruleName;
+
+ /** 预警简述 */
+ @Excel(name = "预警简述")
+ private String description;
+
+ /** 设备参数(如:temperature/cpu_usage) */
+ @Excel(name = "设备参数(如:temperature/cpu_usage)")
+ private String paramName;
+
+ /** 对应的设备类型 */
+ @Excel(name = "对应的设备类型")
+ private String equType;
+
+ /** 比较运算符(>/=/<) */
+ @Excel(name = "比较运算符(>/=/<)")
+ private String compareOperator;
+
+ /** 触发阈值 */
+ @Excel(name = "触发阈值")
+ private BigDecimal paramValue;
+
+ /** 预警级别(1-5) */
+ @Excel(name = "预警级别(1-5)")
+ private Long alertLevel;
+
+ /** 预警消息模板 */
+ @Excel(name = "预警消息模板")
+ private String alertMessage;
+
+ /** 处理角色ID */
+ @Excel(name = "处理角色ID")
+ private Long roleId;
+
+ /** 通知邮箱 */
+ @Excel(name = "通知邮箱")
+ private String notifyEmail;
+
+ /** 启用状态(0-禁用,1-启用) */
+ @Excel(name = "启用状态(0-禁用,1-启用)")
+ private Long ruleStatus;
+
+ public void setId(Long id)
+ {
+ this.id = id;
+ }
+
+ public Long getId()
+ {
+ return id;
+ }
+
+ public void setRuleName(String ruleName)
+ {
+ this.ruleName = ruleName;
+ }
+
+ public String getRuleName()
+ {
+ return ruleName;
+ }
+
+ public void setDescription(String description)
+ {
+ this.description = description;
+ }
+
+ public String getDescription()
+ {
+ return description;
+ }
+
+ public void setParamName(String paramName)
+ {
+ this.paramName = paramName;
+ }
+
+ public String getParamName()
+ {
+ return paramName;
+ }
+
+ public void setEquType(String equType)
+ {
+ this.equType = equType;
+ }
+
+ public String getEquType()
+ {
+ return equType;
+ }
+
+ public void setCompareOperator(String compareOperator)
+ {
+ this.compareOperator = compareOperator;
+ }
+
+ public String getCompareOperator()
+ {
+ return compareOperator;
+ }
+
+ public void setParamValue(BigDecimal paramValue)
+ {
+ this.paramValue = paramValue;
+ }
+
+ public BigDecimal getParamValue()
+ {
+ return paramValue;
+ }
+
+ public void setAlertLevel(Long alertLevel)
+ {
+ this.alertLevel = alertLevel;
+ }
+
+ public Long getAlertLevel()
+ {
+ return alertLevel;
+ }
+
+ public void setAlertMessage(String alertMessage)
+ {
+ this.alertMessage = alertMessage;
+ }
+
+ public String getAlertMessage()
+ {
+ return alertMessage;
+ }
+
+ public void setRoleId(Long roleId)
+ {
+ this.roleId = roleId;
+ }
+
+ public Long getRoleId()
+ {
+ return roleId;
+ }
+
+ public void setNotifyEmail(String notifyEmail)
+ {
+ this.notifyEmail = notifyEmail;
+ }
+
+ public String getNotifyEmail()
+ {
+ return notifyEmail;
+ }
+
+ public void setRuleStatus(Long ruleStatus)
+ {
+ this.ruleStatus = ruleStatus;
+ }
+
+ public Long getRuleStatus()
+ {
+ return ruleStatus;
+ }
+
+ @Override
+ public String toString() {
+ return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+ .append("id", getId())
+ .append("ruleName", getRuleName())
+ .append("description", getDescription())
+ .append("paramName", getParamName())
+ .append("equType", getEquType())
+ .append("compareOperator", getCompareOperator())
+ .append("paramValue", getParamValue())
+ .append("alertLevel", getAlertLevel())
+ .append("alertMessage", getAlertMessage())
+ .append("roleId", getRoleId())
+ .append("notifyEmail", getNotifyEmail())
+ .append("ruleStatus", getRuleStatus())
+ .append("createTime", getCreateTime())
+ .toString();
+ }
+}
diff --git a/ALOps_sys_backend/alops-system/src/main/java/com/alops/system/domain/AlertRule.java b/ALOps_sys_backend/alops-system/src/main/java/com/alops/system/domain/AlertRule.java
deleted file mode 100644
index fbe38097..00000000
--- a/ALOps_sys_backend/alops-system/src/main/java/com/alops/system/domain/AlertRule.java
+++ /dev/null
@@ -1,191 +0,0 @@
-package com.alops.system.domain;
-
-import com.alops.common.annotation.Excel;
-import com.alops.common.core.domain.BaseEntity;
-import org.apache.commons.lang3.builder.ToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
-
-/**
- * 【请填写功能名称】对象 alert_rule
- *
- * @author ruoyi
- * @date 2025-09-05
- */
-public class AlertRule extends BaseEntity
-{
- private static final long serialVersionUID = 1L;
-
- /** 主键 */
- private Long id;
-
- /** 预警规则名称 */
- @Excel(name = "预警规则名称")
- private String ruleName;
-
- /** 预警级别 */
- @Excel(name = "预警级别")
- private Long severity;
-
- /** 预警方式(email/message) */
- @Excel(name = "预警方式(email/message)")
- private String alertWay;
-
- /** 预警到站方 */
- @Excel(name = "预警到站方")
- private String alertStation;
-
- /** 预警规则内容描述 */
- @Excel(name = "预警规则内容描述")
- private String description;
-
- /** 启用状态(0为启用) */
- @Excel(name = "启用状态", readConverterExp = "0=为启用")
- private Integer enable;
-
- /** 表格名称 */
- @Excel(name = "表格名称")
- private String tableName;
-
- /** 预警sql语句查询 */
- @Excel(name = "预警sql语句查询")
- private String alertSql;
-
- /** 预警模版(参数用数据库命名法) */
- @Excel(name = "预警模版", readConverterExp = "参=数用数据库命名法")
- private String alertTemplate;
-
- /** 预警类型 */
- @Excel(name = "预警类型")
- private String type;
-
- public void setId(Long id)
- {
- this.id = id;
- }
-
- public Long getId()
- {
- return id;
- }
-
- public void setRuleName(String ruleName)
- {
- this.ruleName = ruleName;
- }
-
- public String getRuleName()
- {
- return ruleName;
- }
-
- public void setSeverity(Long severity)
- {
- this.severity = severity;
- }
-
- public Long getSeverity()
- {
- return severity;
- }
-
- public void setAlertWay(String alertWay)
- {
- this.alertWay = alertWay;
- }
-
- public String getAlertWay()
- {
- return alertWay;
- }
-
- public void setAlertStation(String alertStation)
- {
- this.alertStation = alertStation;
- }
-
- public String getAlertStation()
- {
- return alertStation;
- }
-
- public void setDescription(String description)
- {
- this.description = description;
- }
-
- public String getDescription()
- {
- return description;
- }
-
- public void setEnable(Integer enable)
- {
- this.enable = enable;
- }
-
- public Integer getEnable()
- {
- return enable;
- }
-
- public void setTableName(String tableName)
- {
- this.tableName = tableName;
- }
-
- public String getTableName()
- {
- return tableName;
- }
-
- public void setAlertSql(String alertSql)
- {
- this.alertSql = alertSql;
- }
-
- public String getAlertSql()
- {
- return alertSql;
- }
-
- public void setAlertTemplate(String alertTemplate)
- {
- this.alertTemplate = alertTemplate;
- }
-
- public String getAlertTemplate()
- {
- return alertTemplate;
- }
-
- public void setType(String type)
- {
- this.type = type;
- }
-
- public String getType()
- {
- return type;
- }
-
- @Override
- public String toString() {
- return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
- .append("id", getId())
- .append("ruleName", getRuleName())
- .append("severity", getSeverity())
- .append("alertWay", getAlertWay())
- .append("alertStation", getAlertStation())
- .append("description", getDescription())
- .append("enable", getEnable())
- .append("createTime", getCreateTime())
- .append("updateTime", getUpdateTime())
- .append("createBy", getCreateBy())
- .append("updateBy", getUpdateBy())
- .append("tableName", getTableName())
- .append("alertSql", getAlertSql())
- .append("alertTemplate", getAlertTemplate())
- .append("type", getType())
- .toString();
- }
-}
diff --git a/ALOps_sys_backend/alops-system/src/main/java/com/alops/system/domain/AlertRuleCondition.java b/ALOps_sys_backend/alops-system/src/main/java/com/alops/system/domain/AlertRuleCondition.java
deleted file mode 100644
index 900bad59..00000000
--- a/ALOps_sys_backend/alops-system/src/main/java/com/alops/system/domain/AlertRuleCondition.java
+++ /dev/null
@@ -1,142 +0,0 @@
-package com.alops.system.domain;
-
-import com.alops.common.annotation.Excel;
-import com.alops.common.core.domain.BaseEntity;
-import org.apache.commons.lang3.builder.ToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
-
-/**
- * 【请填写功能名称】对象 alert_rule_condition
- *
- * @author ruoyi
- * @date 2025-09-04
- */
-public class AlertRuleCondition extends BaseEntity
-{
- private static final long serialVersionUID = 1L;
-
- /** 主键 */
- private Long id;
-
- /** 预警规则id */
- @Excel(name = "预警规则id")
- private Long alertRuleId;
-
- /** 参数名称 */
- @Excel(name = "参数名称")
- private String paramName;
-
- /** 比较符号 */
- @Excel(name = "比较符号")
- private String operator;
-
- /** 比较值 */
- @Excel(name = "比较值")
- private String compareValue;
-
- /** 与下一个条件的逻辑符号 */
- @Excel(name = "与下一个条件的逻辑符号")
- private String logicOperator;
-
- /** 条件顺序 */
- @Excel(name = "条件顺序")
- private Long orderNo;
-
- /** 比较值的类型 */
- @Excel(name = "比较值的类型")
- private String valueType;
-
- public void setId(Long id)
- {
- this.id = id;
- }
-
- public Long getId()
- {
- return id;
- }
-
- public void setAlertRuleId(Long alertRuleId)
- {
- this.alertRuleId = alertRuleId;
- }
-
- public Long getAlertRuleId()
- {
- return alertRuleId;
- }
-
- public void setParamName(String paramName)
- {
- this.paramName = paramName;
- }
-
- public String getParamName()
- {
- return paramName;
- }
-
- public void setOperator(String operator)
- {
- this.operator = operator;
- }
-
- public String getOperator()
- {
- return operator;
- }
-
- public void setCompareValue(String compareValue)
- {
- this.compareValue = compareValue;
- }
-
- public String getCompareValue()
- {
- return compareValue;
- }
-
- public void setLogicOperator(String logicOperator)
- {
- this.logicOperator = logicOperator;
- }
-
- public String getLogicOperator()
- {
- return logicOperator;
- }
-
- public void setOrderNo(Long orderNo)
- {
- this.orderNo = orderNo;
- }
-
- public Long getOrderNo()
- {
- return orderNo;
- }
-
- public void setValueType(String valueType)
- {
- this.valueType = valueType;
- }
-
- public String getValueType()
- {
- return valueType;
- }
-
- @Override
- public String toString() {
- return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
- .append("id", getId())
- .append("alertRuleId", getAlertRuleId())
- .append("paramName", getParamName())
- .append("operator", getOperator())
- .append("compareValue", getCompareValue())
- .append("logicOperator", getLogicOperator())
- .append("orderNo", getOrderNo())
- .append("valueType", getValueType())
- .toString();
- }
-}
diff --git a/ALOps_sys_backend/alops-system/src/main/java/com/alops/system/domain/DictAlarmParam.java b/ALOps_sys_backend/alops-system/src/main/java/com/alops/system/domain/DictAlarmParam.java
deleted file mode 100644
index 12ae6368..00000000
--- a/ALOps_sys_backend/alops-system/src/main/java/com/alops/system/domain/DictAlarmParam.java
+++ /dev/null
@@ -1,97 +0,0 @@
-package com.alops.system.domain;
-
-import com.alops.common.annotation.Excel;
-import com.alops.common.core.domain.BaseEntity;
-import org.apache.commons.lang3.builder.ToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
-
-/**
- * 【请填写功能名称】对象 dict_alarm_param
- *
- * @author ruoyi
- * @date 2025-09-05
- */
-public class DictAlarmParam extends BaseEntity
-{
- private static final long serialVersionUID = 1L;
-
- /** $column.columnComment */
- private Long id;
-
- /** 参数名称 */
- @Excel(name = "参数名称")
- private String paramName;
-
- /** 表名 */
- @Excel(name = "表名")
- private String tableName;
-
- /** 参数名 */
- @Excel(name = "参数名")
- private String columnName;
-
- /** 参数类型 */
- @Excel(name = "参数类型")
- private String paramType;
-
- public void setId(Long id)
- {
- this.id = id;
- }
-
- public Long getId()
- {
- return id;
- }
-
- public void setParamName(String paramName)
- {
- this.paramName = paramName;
- }
-
- public String getParamName()
- {
- return paramName;
- }
-
- public void setTableName(String tableName)
- {
- this.tableName = tableName;
- }
-
- public String getTableName()
- {
- return tableName;
- }
-
- public void setColumnName(String columnName)
- {
- this.columnName = columnName;
- }
-
- public String getColumnName()
- {
- return columnName;
- }
-
- public void setParamType(String paramType)
- {
- this.paramType = paramType;
- }
-
- public String getParamType()
- {
- return paramType;
- }
-
- @Override
- public String toString() {
- return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
- .append("id", getId())
- .append("paramName", getParamName())
- .append("tableName", getTableName())
- .append("columnName", getColumnName())
- .append("paramType", getParamType())
- .toString();
- }
-}
diff --git a/ALOps_sys_backend/alops-system/src/main/java/com/alops/system/domain/EquBase.java b/ALOps_sys_backend/alops-system/src/main/java/com/alops/system/domain/EquBase.java
index 09dd7257..65748d39 100644
--- a/ALOps_sys_backend/alops-system/src/main/java/com/alops/system/domain/EquBase.java
+++ b/ALOps_sys_backend/alops-system/src/main/java/com/alops/system/domain/EquBase.java
@@ -36,8 +36,8 @@ public class EquBase extends BaseEntity
private String ip;
/** 设备厂商 */
- @Excel(name = "设备厂商id ")
- private String manufacture;
+ @Excel(name = "设备厂商 ")
+ private EquManu manufacture;
/** 安装位置 id */
@Excel(name = "安装位置 id")
@@ -73,6 +73,17 @@ public class EquBase extends BaseEntity
@Excel(name = "质保时间(年)")
private Long warranty;
+ /** 累积故障次数 */
+ @Excel(name = "累积故障次数")
+ private Long failureFrequency;
+
+ /** 累积维修次数 */
+ @Excel(name = "累积维修次数")
+ private Long repairFrequency;
+
+ /** 累积维修金额(元) */
+ @Excel(name = "累积维修金额(元)")
+ private BigDecimal repairCost;
/** 添加日期 */
@JsonFormat(pattern = "yyyy-MM-dd")
@@ -87,17 +98,6 @@ public class EquBase extends BaseEntity
/** 启用状态 */
@Excel(name = "启用状态")
private Long status;
- /** 累积故障次数 */
- @Excel(name = "累积故障次数")
- private Long failureFrequency;
-
- /** 累积维修次数 */
- @Excel(name = "累积维修次数")
- private Long repairFrequency;
-
- /** 累积维修金额(元) */
- @Excel(name = "累积维修金额(元)")
- private BigDecimal repairCost;
public void setId(String id)
{
@@ -139,12 +139,12 @@ public class EquBase extends BaseEntity
return ip;
}
- public void setManufacture(String manufacture)
+ public void setManufacture(EquManu manufacture)
{
this.manufacture = manufacture;
}
- public String getManufacture()
+ public EquManu getManufacture()
{
return manufacture;
}
@@ -229,65 +229,64 @@ public class EquBase extends BaseEntity
return warranty;
}
-
-
- public void setCreateDate(Date createDate)
+ public void setFailureFrequency(Long failureFrequency)
{
- this.createDate = createDate;
+ this.failureFrequency = failureFrequency;
}
- public Date getCreateDate()
+ public Long getFailureFrequency()
{
- return createDate;
+ return failureFrequency;
}
- public void setUpdateDate(Date updateDate)
+ public void setRepairFrequency(Long repairFrequency)
{
- this.updateDate = updateDate;
+ this.repairFrequency = repairFrequency;
}
- public Date getUpdateDate()
+ public Long getRepairFrequency()
{
- return updateDate;
+ return repairFrequency;
}
- public void setStatus(Long status)
+ public void setRepairCost(BigDecimal repairCost)
{
- this.status = status;
+ this.repairCost = repairCost;
}
- public Long getStatus()
+ public BigDecimal getRepairCost()
{
- return status;
+ return repairCost;
}
- public void setFailureFrequency(Long failureFrequency)
+
+ public void setCreateDate(Date createDate)
{
- this.failureFrequency = failureFrequency;
+ this.createDate = createDate;
}
- public Long getFailureFrequency()
+ public Date getCreateDate()
{
- return failureFrequency;
+ return createDate;
}
- public void setRepairFrequency(Long repairFrequency)
+ public void setUpdateDate(Date updateDate)
{
- this.repairFrequency = repairFrequency;
+ this.updateDate = updateDate;
}
- public Long getRepairFrequency()
+ public Date getUpdateDate()
{
- return repairFrequency;
+ return updateDate;
}
- public void setRepairCost(BigDecimal repairCost)
+ public void setStatus(Long status)
{
- this.repairCost = repairCost;
+ this.status = status;
}
- public BigDecimal getRepairCost()
+ public Long getStatus()
{
- return repairCost;
+ return status;
}
@Override
@@ -306,15 +305,14 @@ public class EquBase extends BaseEntity
.append("lifeCycle", getLifeCycle())
.append("serviceTime", getServiceTime())
.append("warranty", getWarranty())
-
+ .append("failureFrequency", getFailureFrequency())
+ .append("repairFrequency", getRepairFrequency())
+ .append("repairCost", getRepairCost())
.append("createBy", getCreateBy())
.append("createDate", getCreateDate())
.append("updateBy", getUpdateBy())
.append("updateDate", getUpdateDate())
.append("status", getStatus())
- .append("failureFrequency", getFailureFrequency())
- .append("repairFrequency", getRepairFrequency())
- .append("repairCost", getRepairCost())
.toString();
}
}
diff --git a/ALOps_sys_backend/alops-system/src/main/java/com/alops/system/domain/EquGather.java b/ALOps_sys_backend/alops-system/src/main/java/com/alops/system/domain/EquGather.java
index 9366e4cc..1e445065 100644
--- a/ALOps_sys_backend/alops-system/src/main/java/com/alops/system/domain/EquGather.java
+++ b/ALOps_sys_backend/alops-system/src/main/java/com/alops/system/domain/EquGather.java
@@ -8,15 +8,13 @@ import com.alops.common.core.domain.BaseEntity;
import com.fasterxml.jackson.annotation.JsonFormat;
import org.apache.commons.lang3.builder.ToStringBuilder;
import org.apache.commons.lang3.builder.ToStringStyle;
-import org.apache.ibatis.annotations.Mapper;
/**
* 设备采集信息对象 equ_gather
*
* @author ruoyi
- * @date 2025-08-15
+ * @date 2025-08-01
*/
-
public class EquGather extends BaseEntity
{
private static final long serialVersionUID = 1L;
@@ -77,22 +75,6 @@ public class EquGather extends BaseEntity
@Excel(name = "采集时间", width = 30, dateFormat = "yyyy-MM-dd")
private Date gatherTime;
- /** 输入电压状态(Normal/UnderVoltage) */
- @Excel(name = "输入电压状态(Normal/UnderVoltage)")
- private String volInStatus;
-
- /** 输出电压状态(Normal/UnderVoltage) */
- @Excel(name = "输出电压状态(Normal/UnderVoltage)")
- private String volOutStatus;
-
- /** 风扇转速状态(Normal/Abnormal) */
- @Excel(name = "风扇转速状态(Normal/Abnormal)")
- private String fanSpeedStatus;
-
- /** 设备持续运行时长(如365天12小时) */
- @Excel(name = "设备持续运行时长(如365天12小时)")
- private String contWorkPeriod;
-
public void setId(String id)
{
this.id = id;
@@ -233,46 +215,6 @@ public class EquGather extends BaseEntity
return gatherTime;
}
- public void setVolInStatus(String volInStatus)
- {
- this.volInStatus = volInStatus;
- }
-
- public String getVolInStatus()
- {
- return volInStatus;
- }
-
- public void setVolOutStatus(String volOutStatus)
- {
- this.volOutStatus = volOutStatus;
- }
-
- public String getVolOutStatus()
- {
- return volOutStatus;
- }
-
- public void setFanSpeedStatus(String fanSpeedStatus)
- {
- this.fanSpeedStatus = fanSpeedStatus;
- }
-
- public String getFanSpeedStatus()
- {
- return fanSpeedStatus;
- }
-
- public void setContWorkPeriod(String contWorkPeriod)
- {
- this.contWorkPeriod = contWorkPeriod;
- }
-
- public String getContWorkPeriod()
- {
- return contWorkPeriod;
- }
-
@Override
public String toString() {
return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
@@ -290,10 +232,6 @@ public class EquGather extends BaseEntity
.append("logOnline", getLogOnline())
.append("logSys", getLogSys())
.append("gatherTime", getGatherTime())
- .append("volInStatus", getVolInStatus())
- .append("volOutStatus", getVolOutStatus())
- .append("fanSpeedStatus", getFanSpeedStatus())
- .append("contWorkPeriod", getContWorkPeriod())
.toString();
}
}
diff --git a/ALOps_sys_backend/alops-system/src/main/java/com/alops/system/domain/EquInterface.java b/ALOps_sys_backend/alops-system/src/main/java/com/alops/system/domain/EquInterface.java
index 2c3ded06..caf22db5 100644
--- a/ALOps_sys_backend/alops-system/src/main/java/com/alops/system/domain/EquInterface.java
+++ b/ALOps_sys_backend/alops-system/src/main/java/com/alops/system/domain/EquInterface.java
@@ -10,16 +10,16 @@ import org.apache.commons.lang3.builder.ToStringBuilder;
import org.apache.commons.lang3.builder.ToStringStyle;
/**
- * 端口运行状态对象 equ_interface
+ * 设备接口信息对象 equ_interface
*
* @author ruoyi
- * @date 2025-08-20
+ * @date 2025-08-01
*/
public class EquInterface extends BaseEntity
{
private static final long serialVersionUID = 1L;
- /** 主键 */
+ /** 接口 id */
private String id;
/** 设备 ID */
@@ -31,17 +31,17 @@ public class EquInterface extends BaseEntity
@Excel(name = "采集时间", width = 30, dateFormat = "yyyy-MM-dd")
private Date gatherTime;
- /** 端口运行与否(UP/DOWN(true/false)) */
- @Excel(name = "端口运行与否(UP/DOWN(true/false))")
- private String running;
+ /** 端口运行与否(UP/DOWN) */
+ @Excel(name = "端口运行与否(UP/DOWN)")
+ private Integer running;
/** 传输速率(Mbps) */
@Excel(name = "传输速率(Mbps)")
private Long rate;
- /** 通信模式字典值(null/half/auto) */
- @Excel(name = "通信模式字典值(null/half/auto)")
- private String commuicateMode;
+ /** 通信模式字典值(0/1/2) */
+ @Excel(name = "通信模式字典值(0/1/2)")
+ private Long commuicateMode;
/** 出方向流量(bps) */
@Excel(name = "出方向流量(bps)")
@@ -51,9 +51,9 @@ public class EquInterface extends BaseEntity
@Excel(name = "入方向流量(bps)")
private Long inFlow;
- /** 入方向带宽占有率(%) */
- @Excel(name = "入方向带宽占有率(%)")
- private BigDecimal inBandwidth;
+ /** 带宽占有率(%) */
+ @Excel(name = "带宽占有率(%)")
+ private BigDecimal bandwidth;
/** 丢包率(%) */
@Excel(name = "丢包率(%)")
@@ -63,18 +63,6 @@ public class EquInterface extends BaseEntity
@Excel(name = "错包率(%)")
private BigDecimal errorRate;
- /** 采集关联外键 */
- @Excel(name = "采集关联外键")
- private String equGatherId;
-
- /** 接口id */
- @Excel(name = "接口id")
- private String interfaceId;
-
- /** 出方向带宽占有率(%) */
- @Excel(name = "出方向带宽占有率(%)")
- private BigDecimal outBandwidth;
-
public void setId(String id)
{
this.id = id;
@@ -105,12 +93,12 @@ public class EquInterface extends BaseEntity
return gatherTime;
}
- public void setRunning(String running)
+ public void setRunning(Integer running)
{
this.running = running;
}
- public String getRunning()
+ public Integer getRunning()
{
return running;
}
@@ -125,12 +113,12 @@ public class EquInterface extends BaseEntity
return rate;
}
- public void setCommuicateMode(String commuicateMode)
+ public void setCommuicateMode(Long commuicateMode)
{
this.commuicateMode = commuicateMode;
}
- public String getCommuicateMode()
+ public Long getCommuicateMode()
{
return commuicateMode;
}
@@ -155,14 +143,14 @@ public class EquInterface extends BaseEntity
return inFlow;
}
- public void setInBandwidth(BigDecimal inBandwidth)
+ public void setBandwidth(BigDecimal bandwidth)
{
- this.inBandwidth = inBandwidth;
+ this.bandwidth = bandwidth;
}
- public BigDecimal getInBandwidth()
+ public BigDecimal getBandwidth()
{
- return inBandwidth;
+ return bandwidth;
}
public void setLossRate(BigDecimal lossRate)
@@ -185,36 +173,6 @@ public class EquInterface extends BaseEntity
return errorRate;
}
- public void setEquGatherId(String equGatherId)
- {
- this.equGatherId = equGatherId;
- }
-
- public String getEquGatherId()
- {
- return equGatherId;
- }
-
- public void setInterfaceId(String interfaceId)
- {
- this.interfaceId = interfaceId;
- }
-
- public String getInterfaceId()
- {
- return interfaceId;
- }
-
- public void setOutBandwidth(BigDecimal outBandwidth)
- {
- this.outBandwidth = outBandwidth;
- }
-
- public BigDecimal getOutBandwidth()
- {
- return outBandwidth;
- }
-
@Override
public String toString() {
return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
@@ -226,12 +184,9 @@ public class EquInterface extends BaseEntity
.append("commuicateMode", getCommuicateMode())
.append("outFlow", getOutFlow())
.append("inFlow", getInFlow())
- .append("inBandwidth", getInBandwidth())
+ .append("bandwidth", getBandwidth())
.append("lossRate", getLossRate())
.append("errorRate", getErrorRate())
- .append("equGatherId", getEquGatherId())
- .append("interfaceId", getInterfaceId())
- .append("outBandwidth", getOutBandwidth())
.toString();
}
}
diff --git a/ALOps_sys_backend/alops-system/src/main/java/com/alops/system/domain/EquOid.java b/ALOps_sys_backend/alops-system/src/main/java/com/alops/system/domain/EquOid.java
deleted file mode 100644
index c14165ad..00000000
--- a/ALOps_sys_backend/alops-system/src/main/java/com/alops/system/domain/EquOid.java
+++ /dev/null
@@ -1,236 +0,0 @@
-package com.alops.system.domain;
-
-import com.alops.common.annotation.Excel;
-import com.alops.common.core.domain.BaseEntity;
-import org.apache.commons.lang3.builder.ToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
-import org.apache.ibatis.annotations.Mapper;
-
-/**
- * OID配置信息对象 equ_oid
- *
- * @author ruoyi
- * @date 2025-08-15
- */
-
-public class EquOid extends BaseEntity
-{
- private static final long serialVersionUID = 1L;
-
- /** 主键ID */
- private Long id;
-
- /** 实际的OID值 */
- @Excel(name = "实际的OID值")
- private String oid;
-
- /** OID参数名称(唯一业务标识) */
- @Excel(name = "OID参数名称", readConverterExp = "唯=一业务标识")
- private String param;
-
- /** 存储表名 */
- @Excel(name = "存储表名")
- private String storeTable;
-
- /** 单个计算规则表达式 */
- @Excel(name = "单个计算规则表达式")
- private String convertRule;
-
- /** 合成组名,多个OID合成字段时相同 */
- @Excel(name = "合成组名,多个OID合成字段时相同")
- private String combineGroup;
-
- /** 是否是高位字段,合成64位时用,高为1 */
- @Excel(name = "是否是高位字段,合成64位时用,高为1")
- private Integer isHighPart;
-
- /** 厂商ID */
- @Excel(name = "厂商ID")
- private String manufacturerId;
-
- /** 截取方式规则(1最后一个非 0 值2 方式 2:每行索引 + 最后词 方式 3:单值 4 路由专用) */
- @Excel(name = "截取方式规则", readConverterExp = "1=最后一个非,0=,值=2,方=式,2=:每行索引,+=,最=后词,方=式,3=:单值,4=,路=由专用")
- private String cutRule;
-
- /** 是否一个OID对应多个参数 */
- @Excel(name = "是否一个OID对应多个参数")
- private Integer multiParam;
-
- /** 子参数组合组标识 */
- @Excel(name = "子参数组合组标识")
- private String subParamGroup;
-
- /** 描述说明 */
- @Excel(name = "描述说明")
- private String description;
-
- /** 单位 */
- @Excel(name = "单位")
- private String unit;
-
- /** 是否启用及启用方式 */
- @Excel(name = "是否启用及启用方式")
- private Integer enabled;
-
- public void setId(Long id)
- {
- this.id = id;
- }
-
- public Long getId()
- {
- return id;
- }
-
- public void setOid(String oid)
- {
- this.oid = oid;
- }
-
- public String getOid()
- {
- return oid;
- }
-
- public void setParam(String param)
- {
- this.param = param;
- }
-
- public String getParam()
- {
- return param;
- }
-
- public void setStoreTable(String storeTable)
- {
- this.storeTable = storeTable;
- }
-
- public String getStoreTable()
- {
- return storeTable;
- }
-
- public void setConvertRule(String convertRule)
- {
- this.convertRule = convertRule;
- }
-
- public String getConvertRule()
- {
- return convertRule;
- }
-
- public void setCombineGroup(String combineGroup)
- {
- this.combineGroup = combineGroup;
- }
-
- public String getCombineGroup()
- {
- return combineGroup;
- }
-
- public void setIsHighPart(Integer isHighPart)
- {
- this.isHighPart = isHighPart;
- }
-
- public Integer getIsHighPart()
- {
- return isHighPart;
- }
-
- public void setManufacturerId(String manufacturerId)
- {
- this.manufacturerId = manufacturerId;
- }
-
- public String getManufacturerId()
- {
- return manufacturerId;
- }
-
- public void setCutRule(String cutRule)
- {
- this.cutRule = cutRule;
- }
-
- public String getCutRule()
- {
- return cutRule;
- }
-
- public void setMultiParam(Integer multiParam)
- {
- this.multiParam = multiParam;
- }
-
- public Integer getMultiParam()
- {
- return multiParam;
- }
-
- public void setSubParamGroup(String subParamGroup)
- {
- this.subParamGroup = subParamGroup;
- }
-
- public String getSubParamGroup()
- {
- return subParamGroup;
- }
-
- public void setDescription(String description)
- {
- this.description = description;
- }
-
- public String getDescription()
- {
- return description;
- }
-
- public void setUnit(String unit)
- {
- this.unit = unit;
- }
-
- public String getUnit()
- {
- return unit;
- }
-
- public void setEnabled(Integer enabled)
- {
- this.enabled = enabled;
- }
-
- public Integer getEnabled()
- {
- return enabled;
- }
-
- @Override
- public String toString() {
- return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
- .append("id", getId())
- .append("oid", getOid())
- .append("param", getParam())
- .append("storeTable", getStoreTable())
- .append("convertRule", getConvertRule())
- .append("combineGroup", getCombineGroup())
- .append("isHighPart", getIsHighPart())
- .append("manufacturerId", getManufacturerId())
- .append("cutRule", getCutRule())
- .append("multiParam", getMultiParam())
- .append("subParamGroup", getSubParamGroup())
- .append("description", getDescription())
- .append("unit", getUnit())
- .append("enabled", getEnabled())
- .append("createTime", getCreateTime())
- .append("updateTime", getUpdateTime())
- .toString();
- }
-}
diff --git a/ALOps_sys_backend/alops-system/src/main/java/com/alops/system/domain/EquRouting.java b/ALOps_sys_backend/alops-system/src/main/java/com/alops/system/domain/EquRouting.java
deleted file mode 100644
index 96b9d1c0..00000000
--- a/ALOps_sys_backend/alops-system/src/main/java/com/alops/system/domain/EquRouting.java
+++ /dev/null
@@ -1,99 +0,0 @@
-package com.alops.system.domain;
-
-import com.alops.common.annotation.Excel;
-import com.alops.common.core.domain.BaseEntity;
-import org.apache.commons.lang3.builder.ToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
-import org.apache.ibatis.annotations.Mapper;
-
-/**
- * 路由信息对象 equ_routing
- *
- * @author ruoyi
- * @date 2025-08-15
- */
-
-public class EquRouting extends BaseEntity
-{
- private static final long serialVersionUID = 1L;
-
- /** 主键 */
- private String id;
-
- /** 设备采集id */
- @Excel(name = "设备采集id")
- private String equGatherId;
-
- /** 目的地址 (ipv4/ipv6网段) */
- @Excel(name = "目的地址 (ipv4/ipv6网段)")
- private String desAddress;
-
- /** 子网掩码 */
- @Excel(name = "子网掩码")
- private String subnetMask;
-
- /** 下一跳地址 (ipv4/ipv6网段) */
- @Excel(name = "下一跳地址 (ipv4/ipv6网段)")
- private String nextHop;
-
- public void setId(String id)
- {
- this.id = id;
- }
-
- public String getId()
- {
- return id;
- }
-
- public void setEquGatherId(String equGatherId)
- {
- this.equGatherId = equGatherId;
- }
-
- public String getEquGatherId()
- {
- return equGatherId;
- }
-
- public void setDesAddress(String desAddress)
- {
- this.desAddress = desAddress;
- }
-
- public String getDesAddress()
- {
- return desAddress;
- }
-
- public void setSubnetMask(String subnetMask)
- {
- this.subnetMask = subnetMask;
- }
-
- public String getSubnetMask()
- {
- return subnetMask;
- }
-
- public void setNextHop(String nextHop)
- {
- this.nextHop = nextHop;
- }
-
- public String getNextHop()
- {
- return nextHop;
- }
-
- @Override
- public String toString() {
- return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
- .append("id", getId())
- .append("equGatherId", getEquGatherId())
- .append("desAddress", getDesAddress())
- .append("subnetMask", getSubnetMask())
- .append("nextHop", getNextHop())
- .toString();
- }
-}
diff --git a/ALOps_sys_backend/alops-system/src/main/java/com/alops/system/domain/EquValn.java b/ALOps_sys_backend/alops-system/src/main/java/com/alops/system/domain/EquValn.java
deleted file mode 100644
index 1894daaf..00000000
--- a/ALOps_sys_backend/alops-system/src/main/java/com/alops/system/domain/EquValn.java
+++ /dev/null
@@ -1,101 +0,0 @@
-package com.alops.system.domain;
-
-import com.alops.common.annotation.Excel;
-import com.alops.common.core.domain.BaseEntity;
-import org.apache.commons.lang3.builder.ToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
-import org.apache.ibatis.annotations.Mapper;
-
-/**
- * 网络配置对象 equ_valn
- *
- * @author ruoyi
- * @date 2025-08-09
- */
-
-public class EquValn extends BaseEntity
-{
- private static final long serialVersionUID = 1L;
-
- /** 主键 */
- private Long id;
-
- /** 设备id */
- @Excel(name = "设备id")
- private String equId;
-
- /** VLan管理id */
- @Excel(name = "VLan管理id")
- private String mainId;
-
- /** ipv4地址 */
- @Excel(name = "ipv4地址")
- private String ipAddress;
-
- /** 子网掩码 */
- @Excel(name = "子网掩码")
- private String subnetMask;
-
- public void setId(Long id)
- {
- this.id = id;
- }
-
- public Long getId()
- {
- return id;
- }
-
- public void setEquId(String equId)
- {
- this.equId = equId;
- }
-
- public String getEquId()
- {
- return equId;
- }
-
- public void setMainId(String mainId)
- {
- this.mainId = mainId;
- }
-
- public String getMainId()
- {
- return mainId;
- }
-
- public void setIpAddress(String ipAddress)
- {
- this.ipAddress = ipAddress;
- }
-
- public String getIpAddress()
- {
- return ipAddress;
- }
-
- public void setSubnetMask(String subnetMask)
- {
- this.subnetMask = subnetMask;
- }
-
- public String getSubnetMask()
- {
- return subnetMask;
- }
-
- @Override
- public String toString() {
- return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
- .append("id", getId())
- .append("equId", getEquId())
- .append("mainId", getMainId())
- .append("ipAddress", getIpAddress())
- .append("subnetMask", getSubnetMask())
- .append("createTime", getCreateTime())
- .append("updateBy", getUpdateBy())
- .toString();
- }
-}
diff --git a/ALOps_sys_backend/alops-system/src/main/java/com/alops/system/domain/EquVeneer.java b/ALOps_sys_backend/alops-system/src/main/java/com/alops/system/domain/EquVeneer.java
deleted file mode 100644
index 23bd8554..00000000
--- a/ALOps_sys_backend/alops-system/src/main/java/com/alops/system/domain/EquVeneer.java
+++ /dev/null
@@ -1,84 +0,0 @@
-package com.alops.system.domain;
-
-import com.alops.common.annotation.Excel;
-import com.alops.common.core.domain.BaseEntity;
-import org.apache.commons.lang3.builder.ToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
-import org.apache.ibatis.annotations.Mapper;
-
-/**
- * 【请填写功能名称】对象 equ_veneer
- *
- * @author ruoyi
- * @date 2025-08-15
- */
-
-public class EquVeneer extends BaseEntity
-{
- private static final long serialVersionUID = 1L;
-
- /** 主键 */
- private String id;
-
- /** 设备的一个单板的运行id */
- @Excel(name = "设备的一个单板的运行id")
- private String veneerId;
-
- /** 单板运行状态校准值(Online/Offline/Fault) */
- @Excel(name = "单板运行状态校准值", readConverterExp = "O=nline/Offline/Fault")
- private String veneerStatus;
-
- /** 采集id */
- @Excel(name = "采集id")
- private String equGatherId;
-
- public void setId(String id)
- {
- this.id = id;
- }
-
- public String getId()
- {
- return id;
- }
-
- public void setVeneerId(String veneerId)
- {
- this.veneerId = veneerId;
- }
-
- public String getVeneerId()
- {
- return veneerId;
- }
-
- public void setVeneerStatus(String veneerStatus)
- {
- this.veneerStatus = veneerStatus;
- }
-
- public String getVeneerStatus()
- {
- return veneerStatus;
- }
-
- public void setEquGatherId(String equGatherId)
- {
- this.equGatherId = equGatherId;
- }
-
- public String getEquGatherId()
- {
- return equGatherId;
- }
-
- @Override
- public String toString() {
- return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
- .append("id", getId())
- .append("veneerId", getVeneerId())
- .append("veneerStatus", getVeneerStatus())
- .append("equGatherId", getEquGatherId())
- .toString();
- }
-}
diff --git a/ALOps_sys_backend/alops-system/src/main/java/com/alops/system/domain/EquVlan.java b/ALOps_sys_backend/alops-system/src/main/java/com/alops/system/domain/EquVlan.java
deleted file mode 100644
index f7bfaae9..00000000
--- a/ALOps_sys_backend/alops-system/src/main/java/com/alops/system/domain/EquVlan.java
+++ /dev/null
@@ -1,116 +0,0 @@
-package com.alops.system.domain;
-
-import com.alops.common.annotation.Excel;
-import com.alops.common.core.domain.BaseEntity;
-import org.apache.commons.lang3.builder.ToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
-import org.apache.ibatis.annotations.Mapper;
-
-/**
- * 【请填写功能名称】对象 equ_vlan
- *
- * @author ruoyi
- * @date 2025-08-15
- */
-
-public class EquVlan extends BaseEntity
-{
- private static final long serialVersionUID = 1L;
-
- /** 主键 */
- private String id;
-
- /** 采集ID */
- @Excel(name = "采集ID")
- private String equGatherId;
-
- /** vlan的ip地址 */
- @Excel(name = "vlan的ip地址")
- private String mainId;
-
- /** IPv4地址 */
- @Excel(name = "IPv4地址")
- private String ipAddress;
-
- /** 掩码格式 */
- @Excel(name = "掩码格式")
- private String subnetMask;
-
- /** $column.columnComment */
- @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()")
- private String vlanId;
-
- public void setId(String id)
- {
- this.id = id;
- }
-
- public String getId()
- {
- return id;
- }
-
- public void setEquGatherId(String equGatherId)
- {
- this.equGatherId = equGatherId;
- }
-
- public String getEquGatherId()
- {
- return equGatherId;
- }
-
- public void setMainId(String mainId)
- {
- this.mainId = mainId;
- }
-
- public String getMainId()
- {
- return mainId;
- }
-
- public void setIpAddress(String ipAddress)
- {
- this.ipAddress = ipAddress;
- }
-
- public String getIpAddress()
- {
- return ipAddress;
- }
-
- public void setSubnetMask(String subnetMask)
- {
- this.subnetMask = subnetMask;
- }
-
- public String getSubnetMask()
- {
- return subnetMask;
- }
-
- public void setVlanId(String vlanId)
- {
- this.vlanId = vlanId;
- }
-
- public String getVlanId()
- {
- return vlanId;
- }
-
- @Override
- public String toString() {
- return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
- .append("id", getId())
- .append("equGatherId", getEquGatherId())
- .append("mainId", getMainId())
- .append("ipAddress", getIpAddress())
- .append("subnetMask", getSubnetMask())
- .append("createTime", getCreateTime())
- .append("updateBy", getUpdateBy())
- .append("vlanId", getVlanId())
- .toString();
- }
-}
diff --git a/ALOps_sys_backend/alops-system/src/main/java/com/alops/system/domain/AlertMessage.java b/ALOps_sys_backend/alops-system/src/main/java/com/alops/system/domain/FauSta.java
similarity index 91%
rename from ALOps_sys_backend/alops-system/src/main/java/com/alops/system/domain/AlertMessage.java
rename to ALOps_sys_backend/alops-system/src/main/java/com/alops/system/domain/FauSta.java
index 6f73361f..4fb9bce5 100644
--- a/ALOps_sys_backend/alops-system/src/main/java/com/alops/system/domain/AlertMessage.java
+++ b/ALOps_sys_backend/alops-system/src/main/java/com/alops/system/domain/FauSta.java
@@ -9,29 +9,29 @@ import org.apache.commons.lang3.builder.ToStringBuilder;
import org.apache.commons.lang3.builder.ToStringStyle;
/**
- * 故障统计对象 alert_message
+ * 故障统计对象 fau_sta
*
* @author ruoyi
- * @date 2025-09-04
+ * @date 2025-08-01
*/
-public class AlertMessage extends BaseEntity
+public class FauSta extends BaseEntity
{
private static final long serialVersionUID = 1L;
- /** ID */
+ /** 故障ID */
private Long id;
/** 设备ID */
@Excel(name = "设备ID")
private String equId;
- /** 预警现象简述 */
- @Excel(name = "预警现象简述")
+ /** 故障现象简述 */
+ @Excel(name = "故障现象简述")
private String description;
- /** 预警类型(枚举表名) */
- @Excel(name = "预警类型(枚举表名)")
- private String type;
+ /** 故障类型(枚举) */
+ @Excel(name = "故障类型(枚举)")
+ private Long type;
/** 设备类型 */
@Excel(name = "设备类型")
@@ -46,7 +46,7 @@ public class AlertMessage extends BaseEntity
private String solution;
/** 故障级别(1-5级) */
- @Excel(name = "预警级别(1-5级)")
+ @Excel(name = "故障级别(1-5级)")
private Long level;
/** 发生时间 */
@@ -101,12 +101,12 @@ public class AlertMessage extends BaseEntity
return description;
}
- public void setType(String type)
+ public void setType(Long type)
{
this.type = type;
}
- public String getType()
+ public Long getType()
{
return type;
}
diff --git a/ALOps_sys_backend/alops-system/src/main/java/com/alops/system/domain/InternalMessage.java b/ALOps_sys_backend/alops-system/src/main/java/com/alops/system/domain/InternalMessage.java
deleted file mode 100644
index 428bdd5c..00000000
--- a/ALOps_sys_backend/alops-system/src/main/java/com/alops/system/domain/InternalMessage.java
+++ /dev/null
@@ -1,83 +0,0 @@
-package com.alops.system.domain;
-
-import com.alops.common.annotation.Excel;
-import com.alops.common.core.domain.BaseEntity;
-import org.apache.commons.lang3.builder.ToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
-
-/**
- * 站内信对象 internal_message
- *
- * @author ruoyi
- * @date 2025-09-04
- */
-public class InternalMessage extends BaseEntity
-{
- private static final long serialVersionUID = 1L;
-
- /** 主键ID */
- private Long id;
-
- /** 接收用户ID */
- @Excel(name = "接收用户ID")
- private Long userId;
-
- /** 消息内容 */
- @Excel(name = "消息内容")
- private String content;
-
- /** 消息状态(unread/read) */
- @Excel(name = "消息状态(unread/read)")
- private String status;
-
- public void setId(Long id)
- {
- this.id = id;
- }
-
- public Long getId()
- {
- return id;
- }
-
- public void setUserId(Long userId)
- {
- this.userId = userId;
- }
-
- public Long getUserId()
- {
- return userId;
- }
-
- public void setContent(String content)
- {
- this.content = content;
- }
-
- public String getContent()
- {
- return content;
- }
-
- public void setStatus(String status)
- {
- this.status = status;
- }
-
- public String getStatus()
- {
- return status;
- }
-
- @Override
- public String toString() {
- return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
- .append("id", getId())
- .append("userId", getUserId())
- .append("content", getContent())
- .append("status", getStatus())
- .append("createTime", getCreateTime())
- .toString();
- }
-}
diff --git a/ALOps_sys_backend/alops-system/src/main/java/com/alops/system/domain/dto/AlertRuleAddDto.java b/ALOps_sys_backend/alops-system/src/main/java/com/alops/system/domain/dto/AlertRuleAddDto.java
deleted file mode 100644
index 4e5843ee..00000000
--- a/ALOps_sys_backend/alops-system/src/main/java/com/alops/system/domain/dto/AlertRuleAddDto.java
+++ /dev/null
@@ -1,18 +0,0 @@
-package com.alops.system.domain.dto;
-
-import com.alops.system.domain.AlertRule;
-import com.alops.system.domain.AlertRuleCondition;
-import lombok.AllArgsConstructor;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-import java.util.List;
-
-@Data
-@NoArgsConstructor
-@AllArgsConstructor
-public class AlertRuleAddDto {
-
- private AlertRule alertRule;
- private List alertRuleConditionList;
-
-}
diff --git a/ALOps_sys_backend/alops-system/src/main/java/com/alops/system/domain/vo/Code.java b/ALOps_sys_backend/alops-system/src/main/java/com/alops/system/domain/vo/Code.java
deleted file mode 100644
index ab246d95..00000000
--- a/ALOps_sys_backend/alops-system/src/main/java/com/alops/system/domain/vo/Code.java
+++ /dev/null
@@ -1,17 +0,0 @@
-package com.alops.system.domain.vo;
-
-public class Code {
-
- // 通用状态
- public static final int SUCCESS = 200; // 成功
- public static final int FAIL = 500; // 失败
- public static final int PARTIAL = 206; // 部分成功
-
- // 业务相关状态码(可扩展)
- public static final int DEVICE_NOT_FOUND = 1001;
- public static final int SNMP_QUERY_FAIL = 1002;
- public static final int DB_INSERT_FAIL = 1003;
-
- //后续业务码都放这里
-
-}
diff --git a/ALOps_sys_backend/alops-system/src/main/java/com/alops/system/domain/vo/EquGatherInsertInfo.java b/ALOps_sys_backend/alops-system/src/main/java/com/alops/system/domain/vo/EquGatherInsertInfo.java
deleted file mode 100644
index 11875130..00000000
--- a/ALOps_sys_backend/alops-system/src/main/java/com/alops/system/domain/vo/EquGatherInsertInfo.java
+++ /dev/null
@@ -1,20 +0,0 @@
-package com.alops.system.domain.vo;
-
-import com.alops.system.domain.EquOid;
-
-import java.util.List;
-import java.util.Map;
-
-public class EquGatherInsertInfo {
- private Map> oidsByTable; // List 表格 OID 分组
- private String equGatherId; // 主表主键,作为外键使用
-
- public EquGatherInsertInfo(Map> oidsByTable, String equGatherId) {
- this.oidsByTable = oidsByTable;
- this.equGatherId = equGatherId;
- }
-
- public Map> getOidsByTable() { return oidsByTable; }
- public String getEquGatherId() { return equGatherId; }
-}
-
diff --git a/ALOps_sys_backend/alops-system/src/main/java/com/alops/system/domain/vo/EquGatherResult.java b/ALOps_sys_backend/alops-system/src/main/java/com/alops/system/domain/vo/EquGatherResult.java
deleted file mode 100644
index 45e6fb32..00000000
--- a/ALOps_sys_backend/alops-system/src/main/java/com/alops/system/domain/vo/EquGatherResult.java
+++ /dev/null
@@ -1,17 +0,0 @@
-package com.alops.system.domain.vo;
-
-import com.alops.system.domain.EquGather;
-import com.alops.system.domain.EquInterface;
-import lombok.AllArgsConstructor;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-
-import java.util.List;
-
-@Data
-@AllArgsConstructor
-@NoArgsConstructor
-public class EquGatherResult {
- private EquGather gather;
- private List interfaces;
-}
diff --git a/ALOps_sys_backend/alops-system/src/main/java/com/alops/system/domain/vo/GatherEntities.java b/ALOps_sys_backend/alops-system/src/main/java/com/alops/system/domain/vo/GatherEntities.java
deleted file mode 100644
index 32f4928e..00000000
--- a/ALOps_sys_backend/alops-system/src/main/java/com/alops/system/domain/vo/GatherEntities.java
+++ /dev/null
@@ -1,20 +0,0 @@
-package com.alops.system.domain.vo;
-
-import com.alops.system.domain.EquGather;
-import lombok.AllArgsConstructor;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-@Data
-@AllArgsConstructor
-@NoArgsConstructor
-public class GatherEntities {
-
- private EquGather equGather; // 主表
- private Map> subEntities = new HashMap<>();
-
-}
diff --git a/ALOps_sys_backend/alops-system/src/main/java/com/alops/system/domain/vo/queryEquBaseVO.java b/ALOps_sys_backend/alops-system/src/main/java/com/alops/system/domain/vo/queryEquBaseVO.java
deleted file mode 100644
index bf9ee4c2..00000000
--- a/ALOps_sys_backend/alops-system/src/main/java/com/alops/system/domain/vo/queryEquBaseVO.java
+++ /dev/null
@@ -1,295 +0,0 @@
-package com.alops.system.domain.vo;
-
-import com.alops.common.annotation.Excel;
-import com.alops.common.core.domain.BaseEntity;
-import com.alops.system.domain.EquManu;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import lombok.AllArgsConstructor;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-import org.apache.commons.lang3.builder.ToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
-
-import java.math.BigDecimal;
-import java.util.Date;
-@Data
-@AllArgsConstructor
-@NoArgsConstructor
-public class queryEquBaseVO extends BaseEntity {
-
- /**
- * 设备基本信息对象 equ_base
- *
- * @author ruoyi
- * @date 2025-08-01
- */
- private static final long serialVersionUID = 1L;
-
- /** 设备唯一标识 */
- private String id;
-
- /** 设备名称 */
- @Excel(name = "设备名称")
- private String name;
-
- /** 设备版本 */
- @Excel(name = "设备版本")
- private String version;
-
- /** 带外管理 IP */
- @Excel(name = "带外管理 IP")
- private String ip;
-
-// /** 设备厂商 */
-// @Excel(name = "设备厂商 ")
-// private EquManu manufacture;
- /** 设备厂商 */
- @Excel(name = "设备厂商id ")
- private String manuId;
- /** 设备厂商 */
- @Excel(name = "设备厂商名称 ")
- private String manuName;
- /** 安装位置 id */
- @Excel(name = "安装位置 id")
- private String location;
-
- /** 设备类型 id */
- @Excel(name = "设备类型 id")
- private String equType;
-
- /** 设备管理员 id */
- @Excel(name = "设备管理员 id")
- private Long inCharge;
-
- /** 出厂日期 */
- @JsonFormat(pattern = "yyyy-MM-dd")
- @Excel(name = "出厂日期", width = 30, dateFormat = "yyyy-MM-dd")
- private Date releaseDate;
-
- /** 安装日期 */
- @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 serviceTime;
-
- /** 质保时间(年) */
- @Excel(name = "质保时间(年)")
- private Long warranty;
-
-
- /** 添加日期 */
- @JsonFormat(pattern = "yyyy-MM-dd")
- @Excel(name = "添加日期", width = 30, dateFormat = "yyyy-MM-dd")
- private Date createDate;
-
- /** 最后修改日期 */
- @JsonFormat(pattern = "yyyy-MM-dd")
- @Excel(name = "最后修改日期", width = 30, dateFormat = "yyyy-MM-dd")
- private Date updateDate;
-
- /** 启用状态 */
- @Excel(name = "启用状态")
- private Long status;
- /** 累积故障次数 */
- @Excel(name = "累积故障次数")
- private Long failureFrequency;
-
- /** 累积维修次数 */
- @Excel(name = "累积维修次数")
- private Long repairFrequency;
-
- /** 累积维修金额(元) */
- @Excel(name = "累积维修金额(元)")
- private BigDecimal repairCost;
-
- public void setId(String id)
- {
- this.id = id;
- }
-
- public String getId()
- {
- return id;
- }
-
- public void setName(String name)
- {
- this.name = name;
- }
-
- public String getName()
- {
- return name;
- }
-
- public void setVersion(String version)
- {
- this.version = version;
- }
-
- public String getVersion()
- {
- return version;
- }
-
- public void setIp(String ip)
- {
- this.ip = ip;
- }
-
- public String getIp()
- {
- return ip;
- }
-
-
-
- public void setLocation(String location)
- {
- this.location = location;
- }
-
- public String getLocation()
- {
- return location;
- }
-
- public void setEquType(String equType)
- {
- this.equType = equType;
- }
-
- public String getEquType()
- {
- return equType;
- }
-
- public void setInCharge(Long inCharge)
- {
- this.inCharge = inCharge;
- }
-
- public Long getInCharge()
- {
- return inCharge;
- }
-
- public void setReleaseDate(Date releaseDate)
- {
- this.releaseDate = releaseDate;
- }
-
- public Date getReleaseDate()
- {
- return releaseDate;
- }
-
- public void setInstallDate(Date installDate)
- {
- this.installDate = installDate;
- }
-
- public Date getInstallDate()
- {
- return installDate;
- }
-
- public void setLifeCycle(Long lifeCycle)
- {
- this.lifeCycle = lifeCycle;
- }
-
- public Long getLifeCycle()
- {
- return lifeCycle;
- }
-
- public void setServiceTime(Long serviceTime)
- {
- this.serviceTime = serviceTime;
- }
-
- public Long getServiceTime()
- {
- return serviceTime;
- }
-
- public void setWarranty(Long warranty)
- {
- this.warranty = warranty;
- }
-
- public Long getWarranty()
- {
- return warranty;
- }
-
-
-
- public void setCreateDate(Date createDate)
- {
- this.createDate = createDate;
- }
-
- public Date getCreateDate()
- {
- return createDate;
- }
-
- public void setUpdateDate(Date updateDate)
- {
- this.updateDate = updateDate;
- }
-
- public Date getUpdateDate()
- {
- return updateDate;
- }
-
- public void setStatus(Long status)
- {
- this.status = status;
- }
-
- public Long getStatus()
- {
- return status;
- }
-
- @Override
- public String toString() {
- return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE)
- .append("id", getId())
- .append("name", getName())
- .append("version", getVersion())
- .append("ip", getIp())
- .append("manuId", getManuId())
- .append("manuName", getManuName())
- .append("location", getLocation())
- .append("equType", getEquType())
- .append("inCharge", getInCharge())
- .append("releaseDate", getReleaseDate())
- .append("installDate", getInstallDate())
- .append("lifeCycle", getLifeCycle())
- .append("serviceTime", getServiceTime())
- .append("warranty", getWarranty())
- .append("createBy", getCreateBy())
- .append("createDate", getCreateDate())
- .append("updateBy", getUpdateBy())
- .append("updateDate", getUpdateDate())
- .append("status", getStatus())
- .append("failureFrequency", getFailureFrequency())
- .append("repairFrequency", getRepairFrequency())
- .append("repairCost", getRepairCost())
- .toString();
- }
- }
-
-
diff --git a/ALOps_sys_backend/alops-system/src/main/java/com/alops/system/mapper/AlarmRuleMapper.java b/ALOps_sys_backend/alops-system/src/main/java/com/alops/system/mapper/AlarmRuleMapper.java
new file mode 100644
index 00000000..5d0c5009
--- /dev/null
+++ b/ALOps_sys_backend/alops-system/src/main/java/com/alops/system/mapper/AlarmRuleMapper.java
@@ -0,0 +1,64 @@
+package com.alops.system.mapper;
+
+import com.alops.system.domain.AlarmRule;
+import org.apache.ibatis.annotations.Mapper;
+
+import java.util.List;
+
+/**
+ * 预警规则Mapper接口
+ *
+ * @author ruoyi
+ * @date 2025-08-01
+ */
+@Mapper
+public interface AlarmRuleMapper
+{
+ /**
+ * 查询预警规则
+ *
+ * @param id 预警规则主键
+ * @return 预警规则
+ */
+ public AlarmRule selectAlarmRuleById(Long id);
+
+ /**
+ * 查询预警规则列表
+ *
+ * @param alarmRule 预警规则
+ * @return 预警规则集合
+ */
+ public List selectAlarmRuleList(AlarmRule alarmRule);
+
+ /**
+ * 新增预警规则
+ *
+ * @param alarmRule 预警规则
+ * @return 结果
+ */
+ public int insertAlarmRule(AlarmRule alarmRule);
+
+ /**
+ * 修改预警规则
+ *
+ * @param alarmRule 预警规则
+ * @return 结果
+ */
+ public int updateAlarmRule(AlarmRule alarmRule);
+
+ /**
+ * 删除预警规则
+ *
+ * @param id 预警规则主键
+ * @return 结果
+ */
+ public int deleteAlarmRuleById(Long id);
+
+ /**
+ * 批量删除预警规则
+ *
+ * @param ids 需要删除的数据主键集合
+ * @return 结果
+ */
+ public int deleteAlarmRuleByIds(Long[] ids);
+}
diff --git a/ALOps_sys_backend/alops-system/src/main/java/com/alops/system/mapper/AlertMessageMapper.java b/ALOps_sys_backend/alops-system/src/main/java/com/alops/system/mapper/AlertMessageMapper.java
deleted file mode 100644
index 61521487..00000000
--- a/ALOps_sys_backend/alops-system/src/main/java/com/alops/system/mapper/AlertMessageMapper.java
+++ /dev/null
@@ -1,73 +0,0 @@
-package com.alops.system.mapper;
-
-import com.alops.system.domain.AlertMessage;
-import org.apache.ibatis.annotations.Mapper;
-import org.springframework.data.repository.query.Param;
-
-import java.util.List;
-
-/**
- * 故障统计Mapper接口
- *
- * @author ruoyi
- * @date 2025-09-04
- */
-@Mapper
-public interface AlertMessageMapper
-{
-
- /**
- * 批量插入预警消息
- * @param messages 消息列表
- * @return 受影响行数
- */
- int batchInsert(List messages);
- ;
- /**
- * 查询故障统计
- *
- * @param id 故障统计主键
- * @return 故障统计
- */
- public AlertMessage selectAlertMessageById(Long id);
-
- /**
- * 查询故障统计列表
- *
- * @param alertMessage 故障统计
- * @return 故障统计集合
- */
- public List selectAlertMessageList(AlertMessage alertMessage);
-
- /**
- * 新增故障统计
- *
- * @param alertMessage 故障统计
- * @return 结果
- */
- public int insertAlertMessage(AlertMessage alertMessage);
-
- /**
- * 修改故障统计
- *
- * @param alertMessage 故障统计
- * @return 结果
- */
- public int updateAlertMessage(AlertMessage alertMessage);
-
- /**
- * 删除故障统计
- *
- * @param id 故障统计主键
- * @return 结果
- */
- public int deleteAlertMessageById(Long id);
-
- /**
- * 批量删除故障统计
- *
- * @param ids 需要删除的数据主键集合
- * @return 结果
- */
- public int deleteAlertMessageByIds(Long[] ids);
-}
diff --git a/ALOps_sys_backend/alops-system/src/main/java/com/alops/system/mapper/AlertRuleConditionMapper.java b/ALOps_sys_backend/alops-system/src/main/java/com/alops/system/mapper/AlertRuleConditionMapper.java
deleted file mode 100644
index 281b69d7..00000000
--- a/ALOps_sys_backend/alops-system/src/main/java/com/alops/system/mapper/AlertRuleConditionMapper.java
+++ /dev/null
@@ -1,72 +0,0 @@
-package com.alops.system.mapper;
-
-import com.alops.system.domain.AlertRuleCondition;
-import org.apache.ibatis.annotations.Mapper;
-import org.springframework.data.repository.query.Param;
-
-import java.util.List;
-
-/**
- * 【请填写功能名称】Mapper接口
- *
- * @author ruoyi
- * @date 2025-09-04
- */
-@Mapper
-public interface AlertRuleConditionMapper
-
-{
- /**
- * 根据预警规则ID查询对应的规则条件
- * @param ruleId 预警规则ID(整型)
- * @return AlertRuleCondition 列表
- */
- List findByRuleId(@Param("ruleId") Long ruleId);
- /**
- * 查询【请填写功能名称】
- *
- * @param id 【请填写功能名称】主键
- * @return 【请填写功能名称】
- */
- public AlertRuleCondition selectAlertRuleConditionById(Long id);
-
- /**
- * 查询【请填写功能名称】列表
- *
- * @param alertRuleCondition 【请填写功能名称】
- * @return 【请填写功能名称】集合
- */
- public List selectAlertRuleConditionList(AlertRuleCondition alertRuleCondition);
-
- /**
- * 新增【请填写功能名称】
- *
- * @param alertRuleCondition 【请填写功能名称】
- * @return 结果
- */
- public int insertAlertRuleCondition(AlertRuleCondition alertRuleCondition);
-
- /**
- * 修改【请填写功能名称】
- *
- * @param alertRuleCondition 【请填写功能名称】
- * @return 结果
- */
- public int updateAlertRuleCondition(AlertRuleCondition alertRuleCondition);
-
- /**
- * 删除【请填写功能名称】
- *
- * @param id 【请填写功能名称】主键
- * @return 结果
- */
- public int deleteAlertRuleConditionById(Long id);
-
- /**
- * 批量删除【请填写功能名称】
- *
- * @param ids 需要删除的数据主键集合
- * @return 结果
- */
- public int deleteAlertRuleConditionByIds(Long[] ids);
-}
diff --git a/ALOps_sys_backend/alops-system/src/main/java/com/alops/system/mapper/AlertRuleMapper.java b/ALOps_sys_backend/alops-system/src/main/java/com/alops/system/mapper/AlertRuleMapper.java
deleted file mode 100644
index 379fea07..00000000
--- a/ALOps_sys_backend/alops-system/src/main/java/com/alops/system/mapper/AlertRuleMapper.java
+++ /dev/null
@@ -1,69 +0,0 @@
-package com.alops.system.mapper;
-
-import com.alops.system.domain.AlertRule;
-import org.apache.ibatis.annotations.Mapper;
-import org.springframework.data.repository.query.Param;
-
-import java.util.List;
-
-/**
- * 【请填写功能名称】Mapper接口
- *
- * @author ruoyi
- * @date 2025-09-05
- */
-@Mapper
-public interface AlertRuleMapper
-{
-
- //根据id组,批量返回
- // Mapper 接口
- List selectByIds(@Param("list") List ids);
- /**
- * 查询【请填写功能名称】
- *
- * @param id 【请填写功能名称】主键
- * @return 【请填写功能名称】
- */
- public AlertRule selectAlertRuleById(Long id);
-
- /**
- * 查询【请填写功能名称】列表
- *
- * @param alertRule 【请填写功能名称】
- * @return 【请填写功能名称】集合
- */
- public List selectAlertRuleList(AlertRule alertRule);
-
- /**
- * 新增【请填写功能名称】
- *
- * @param alertRule 【请填写功能名称】
- * @return 结果
- */
- public int insertAlertRule(AlertRule alertRule);
-
- /**
- * 修改【请填写功能名称】
- *
- * @param alertRule 【请填写功能名称】
- * @return 结果
- */
- public int updateAlertRule(AlertRule alertRule);
-
- /**
- * 删除【请填写功能名称】
- *
- * @param id 【请填写功能名称】主键
- * @return 结果
- */
- public int deleteAlertRuleById(Long id);
-
- /**
- * 批量删除【请填写功能名称】
- *
- * @param ids 需要删除的数据主键集合
- * @return 结果
- */
- public int deleteAlertRuleByIds(Long[] ids);
-}
diff --git a/ALOps_sys_backend/alops-system/src/main/java/com/alops/system/mapper/DictAlarmParamMapper.java b/ALOps_sys_backend/alops-system/src/main/java/com/alops/system/mapper/DictAlarmParamMapper.java
deleted file mode 100644
index 758e670a..00000000
--- a/ALOps_sys_backend/alops-system/src/main/java/com/alops/system/mapper/DictAlarmParamMapper.java
+++ /dev/null
@@ -1,67 +0,0 @@
-package com.alops.system.mapper;
-
-import com.alops.system.domain.DictAlarmParam;
-import org.apache.ibatis.annotations.Mapper;
-import org.springframework.data.repository.query.Param;
-
-import java.util.List;
-
-/**
- * 【请填写功能名称】Mapper接口
- *
- * @author ruoyi
- * @date 2025-09-05
- */
-@Mapper
-public interface DictAlarmParamMapper
-{
-
- List selectByTableName(@Param("tableName") String tableName);
- /**
- * 查询【请填写功能名称】
- *
- * @param id 【请填写功能名称】主键
- * @return 【请填写功能名称】
- */
- public DictAlarmParam selectDictAlarmParamById(Long id);
-
- /**
- * 查询【请填写功能名称】列表
- *
- * @param dictAlarmParam 【请填写功能名称】
- * @return 【请填写功能名称】集合
- */
- public List selectDictAlarmParamList(DictAlarmParam dictAlarmParam);
-
- /**
- * 新增【请填写功能名称】
- *
- * @param dictAlarmParam 【请填写功能名称】
- * @return 结果
- */
- public int insertDictAlarmParam(DictAlarmParam dictAlarmParam);
-
- /**
- * 修改【请填写功能名称】
- *
- * @param dictAlarmParam 【请填写功能名称】
- * @return 结果
- */
- public int updateDictAlarmParam(DictAlarmParam dictAlarmParam);
-
- /**
- * 删除【请填写功能名称】
- *
- * @param id 【请填写功能名称】主键
- * @return 结果
- */
- public int deleteDictAlarmParamById(Long id);
-
- /**
- * 批量删除【请填写功能名称】
- *
- * @param ids 需要删除的数据主键集合
- * @return 结果
- */
- public int deleteDictAlarmParamByIds(Long[] ids);
-}
diff --git a/ALOps_sys_backend/alops-system/src/main/java/com/alops/system/mapper/EquBaseMapper.java b/ALOps_sys_backend/alops-system/src/main/java/com/alops/system/mapper/EquBaseMapper.java
index 9a513ce0..7643d8d2 100644
--- a/ALOps_sys_backend/alops-system/src/main/java/com/alops/system/mapper/EquBaseMapper.java
+++ b/ALOps_sys_backend/alops-system/src/main/java/com/alops/system/mapper/EquBaseMapper.java
@@ -2,9 +2,7 @@ package com.alops.system.mapper;
import com.alops.system.domain.EquBase;
import com.alops.system.domain.dto.EquBaseQueryDto;
-import com.alops.system.domain.vo.queryEquBaseVO;
import org.apache.ibatis.annotations.Mapper;
-import org.apache.ibatis.annotations.Update;
import java.util.List;
@@ -18,18 +16,6 @@ import java.util.List;
@Mapper
public interface EquBaseMapper
{
- @Update("DELETE FROM equ_interface")
- void deleteEquInterface();
-
- @Update("DELETE FROM equ_routing")
- void deleteEquRouting();
-
- @Update("DELETE FROM equ_veneer")
- void deleteEquVeneer();
-
- @Update("DELETE FROM equ_vlan")
- void deleteEquVlan();
-
/**
* 查询设备基本信息
*
@@ -39,20 +25,12 @@ public interface EquBaseMapper
public EquBase selectEquBaseById(String id);
/**
- * 查询设备基本信息和厂商信息
+ * 查询设备基本信息列表
*
* @param equBaseQueryDto 设备基本信息
* @return 设备基本信息集合
*/
- public List selectEquBaseList(EquBaseQueryDto equBaseQueryDto);
- /**
- * 查询设备基本信息列表
- *
- *
- */
- public List findEquBaseList();
-
-
+ public List selectEquBaseList(EquBaseQueryDto equBaseQueryDto);
/**
* 新增设备基本信息
diff --git a/ALOps_sys_backend/alops-system/src/main/java/com/alops/system/mapper/EquGatherMapper.java b/ALOps_sys_backend/alops-system/src/main/java/com/alops/system/mapper/EquGatherMapper.java
deleted file mode 100644
index 461618b5..00000000
--- a/ALOps_sys_backend/alops-system/src/main/java/com/alops/system/mapper/EquGatherMapper.java
+++ /dev/null
@@ -1,73 +0,0 @@
-package com.alops.system.mapper;
-
-import com.alops.system.domain.EquGather;
-import org.apache.ibatis.annotations.Mapper;
-import org.springframework.data.repository.query.Param;
-
-import java.util.List;
-
-/**
- * 设备采集信息Mapper接口
- *
- * @author ruoyi
- * @date 2025-08-15
- */
-@Mapper
-public interface EquGatherMapper
-{
-
- // 更新 health 字段
- int updateHealth(String collectId, Double totalHealth);
-
- /**
- * 查询设备采集信息
- *
- * @param id 设备采集信息主键
- * @return 设备采集信息
- */
- public EquGather selectEquGatherById(String id);
-
- /**
- * 批量插入 EquGather 记录
- */
- int batchInsertEquGather(@Param("list") List list);
- /**
- * 查询设备采集信息列表
- *
- * @param equGather 设备采集信息
- * @return 设备采集信息集合
- */
- public List selectEquGatherList(EquGather equGather);
-
- /**
- * 新增设备采集信息
- *
- * @param equGather 设备采集信息
- * @return 结果
- */
- public int insertEquGather(EquGather equGather);
-
- /**
- * 修改设备采集信息
- *
- * @param equGather 设备采集信息
- * @return 结果
- */
- public int updateEquGather(EquGather equGather);
-
- /**
- * 删除设备采集信息
- *
- * @param id 设备采集信息主键
- * @return 结果
- */
- public int deleteEquGatherById(String id);
-
- /**
- * 批量删除设备采集信息
- *
- * @param ids 需要删除的数据主键集合
- * @return 结果
- */
- public int deleteEquGatherByIds(String[] ids);
-}
diff --git a/ALOps_sys_backend/alops-system/src/main/java/com/alops/system/mapper/EquInterfaceMapper.java b/ALOps_sys_backend/alops-system/src/main/java/com/alops/system/mapper/EquInterfaceMapper.java
deleted file mode 100644
index 549be44c..00000000
--- a/ALOps_sys_backend/alops-system/src/main/java/com/alops/system/mapper/EquInterfaceMapper.java
+++ /dev/null
@@ -1,69 +0,0 @@
-package com.alops.system.mapper;
-
-import com.alops.system.domain.EquInterface;
-import org.apache.ibatis.annotations.Mapper;
-
-import java.util.List;
-
-/**
- * 端口运行状态Mapper接口
- *
- * @author ruoyi
- * @date 2025-08-20
- */
-@Mapper
-public interface EquInterfaceMapper
-{
-
- /**
- * 批量插入 PortsEntity
- */
- void insertBatch(List list);
- /**
- * 查询端口运行状态
- *
- * @param id 端口运行状态主键
- * @return 端口运行状态
- */
- public EquInterface selectEquInterfaceById(String id);
-
- /**
- * 查询端口运行状态列表
- *
- * @param equInterface 端口运行状态
- * @return 端口运行状态集合
- */
- public List selectEquInterfaceList(EquInterface equInterface);
-
- /**
- * 新增端口运行状态
- *
- * @param equInterface 端口运行状态
- * @return 结果
- */
- public int insertEquInterface(EquInterface equInterface);
-
- /**
- * 修改端口运行状态
- *
- * @param equInterface 端口运行状态
- * @return 结果
- */
- public int updateEquInterface(EquInterface equInterface);
-
- /**
- * 删除端口运行状态
- *
- * @param id 端口运行状态主键
- * @return 结果
- */
- public int deleteEquInterfaceById(String id);
-
- /**
- * 批量删除端口运行状态
- *
- * @param ids 需要删除的数据主键集合
- * @return 结果
- */
- public int deleteEquInterfaceByIds(String[] ids);
-}
diff --git a/ALOps_sys_backend/alops-system/src/main/java/com/alops/system/mapper/EquOidMapper.java b/ALOps_sys_backend/alops-system/src/main/java/com/alops/system/mapper/EquOidMapper.java
deleted file mode 100644
index 3f7c62fe..00000000
--- a/ALOps_sys_backend/alops-system/src/main/java/com/alops/system/mapper/EquOidMapper.java
+++ /dev/null
@@ -1,72 +0,0 @@
-package com.alops.system.mapper;
-
-import com.alops.system.domain.EquOid;
-import org.apache.ibatis.annotations.Mapper;
-import org.springframework.data.repository.query.Param;
-
-import java.util.List;
-
-/**
- * OID配置信息Mapper接口
- *
- * @author ruoyi
- * @date 2025-08-15
- */
-@Mapper
-public interface EquOidMapper
-{
-
- /**
- * 根据厂商ID和启用状态查询OID列表
- * @param manufacturerId 厂商ID
- * @return OID列表
- */
- List findByManuIdAndStatus(@Param("manufacturerId") String manufacturerId);
- /**
- * 查询OID配置信息
- *
- * @param id OID配置信息主键
- * @return OID配置信息
- */
- public EquOid selectEquOidById(Long id);
-
- /**
- * 查询OID配置信息列表
- *
- * @param equOid OID配置信息
- * @return OID配置信息集合
- */
- public List selectEquOidList(EquOid equOid);
-
- /**
- * 新增OID配置信息
- *
- * @param equOid OID配置信息
- * @return 结果
- */
- public int insertEquOid(EquOid equOid);
-
- /**
- * 修改OID配置信息
- *
- * @param equOid OID配置信息
- * @return 结果
- */
- public int updateEquOid(EquOid equOid);
-
- /**
- * 删除OID配置信息
- *
- * @param id OID配置信息主键
- * @return 结果
- */
- public int deleteEquOidById(Long id);
-
- /**
- * 批量删除OID配置信息
- *
- * @param ids 需要删除的数据主键集合
- * @return 结果
- */
- public int deleteEquOidByIds(Long[] ids);
-}
diff --git a/ALOps_sys_backend/alops-system/src/main/java/com/alops/system/mapper/EquRoutingMapper.java b/ALOps_sys_backend/alops-system/src/main/java/com/alops/system/mapper/EquRoutingMapper.java
deleted file mode 100644
index df21be44..00000000
--- a/ALOps_sys_backend/alops-system/src/main/java/com/alops/system/mapper/EquRoutingMapper.java
+++ /dev/null
@@ -1,67 +0,0 @@
-package com.alops.system.mapper;
-
-import com.alops.system.domain.EquRouting;
-import org.apache.ibatis.annotations.Mapper;
-
-import java.util.List;
-
-/**
- * 路由信息Mapper接口
- *
- * @author ruoyi
- * @date 2025-08-15
- */
-@Mapper
-public interface EquRoutingMapper
-{
- void insertBatchRouting(List list);
- /**
- * 查询路由信息
- *
- * @param id 路由信息主键
- * @return 路由信息
- */
- public EquRouting selectEquRoutingById(String id);
-
- /**
- * 查询路由信息列表
- *
- * @param equRouting 路由信息
- * @return 路由信息集合
- */
- public List selectEquRoutingList(EquRouting equRouting);
-
- /**
- * 新增路由信息
- *
- * @param equRouting 路由信息
- * @return 结果
- */
- public int insertEquRouting(EquRouting equRouting);
-
- /**
- * 修改路由信息
- *
- * @param equRouting 路由信息
- * @return 结果
- */
- public int updateEquRouting(EquRouting equRouting);
-
- /**
- * 删除路由信息
- *
- * @param id 路由信息主键
- * @return 结果
- */
- public int deleteEquRoutingById(String id);
-
- /**
- * 批量删除路由信息
- *
- * @param ids 需要删除的数据主键集合
- * @return 结果
- */
- public int deleteEquRoutingByIds(String[] ids);
-
-
-}
diff --git a/ALOps_sys_backend/alops-system/src/main/java/com/alops/system/mapper/EquVeneerMapper.java b/ALOps_sys_backend/alops-system/src/main/java/com/alops/system/mapper/EquVeneerMapper.java
deleted file mode 100644
index 34861fce..00000000
--- a/ALOps_sys_backend/alops-system/src/main/java/com/alops/system/mapper/EquVeneerMapper.java
+++ /dev/null
@@ -1,66 +0,0 @@
-package com.alops.system.mapper;
-
-import com.alops.system.domain.EquVeneer;
-import org.apache.ibatis.annotations.Mapper;
-
-import java.util.List;
-
-/**
- * 【请填写功能名称】Mapper接口
- *
- * @author ruoyi
- * @date 2025-08-15
- */
-@Mapper
-public interface EquVeneerMapper
-
-{
- void insertBatchVeneer(List list);
- /**
- * 查询【请填写功能名称】
- *
- * @param id 【请填写功能名称】主键
- * @return 【请填写功能名称】
- */
- public EquVeneer selectEquVeneerById(String id);
-
- /**
- * 查询【请填写功能名称】列表
- *
- * @param equVeneer 【请填写功能名称】
- * @return 【请填写功能名称】集合
- */
- public List selectEquVeneerList(EquVeneer equVeneer);
-
- /**
- * 新增【请填写功能名称】
- *
- * @param equVeneer 【请填写功能名称】
- * @return 结果
- */
- public int insertEquVeneer(EquVeneer equVeneer);
-
- /**
- * 修改【请填写功能名称】
- *
- * @param equVeneer 【请填写功能名称】
- * @return 结果
- */
- public int updateEquVeneer(EquVeneer equVeneer);
-
- /**
- * 删除【请填写功能名称】
- *
- * @param id 【请填写功能名称】主键
- * @return 结果
- */
- public int deleteEquVeneerById(String id);
-
- /**
- * 批量删除【请填写功能名称】
- *
- * @param ids 需要删除的数据主键集合
- * @return 结果
- */
- public int deleteEquVeneerByIds(String[] ids);
-}
diff --git a/ALOps_sys_backend/alops-system/src/main/java/com/alops/system/mapper/EquVlanMapper.java b/ALOps_sys_backend/alops-system/src/main/java/com/alops/system/mapper/EquVlanMapper.java
deleted file mode 100644
index 32245def..00000000
--- a/ALOps_sys_backend/alops-system/src/main/java/com/alops/system/mapper/EquVlanMapper.java
+++ /dev/null
@@ -1,67 +0,0 @@
-package com.alops.system.mapper;
-
-import com.alops.system.domain.EquVlan;
-import org.apache.ibatis.annotations.Mapper;
-
-import java.util.List;
-
-
-/**
- * 【请填写功能名称】Mapper接口
- *
- * @author ruoyi
- * @date 2025-08-15
- */
-@Mapper
-public interface EquVlanMapper
-{
-
- void insertBatchVlan(List list);
- /**
- * 查询【请填写功能名称】
- *
- * @param id 【请填写功能名称】主键
- * @return 【请填写功能名称】
- */
- public EquVlan selectEquVlanById(String id);
-
- /**
- * 查询【请填写功能名称】列表
- *
- * @param equVlan 【请填写功能名称】
- * @return 【请填写功能名称】集合
- */
- public List selectEquVlanList(EquVlan equVlan);
-
- /**
- * 新增【请填写功能名称】
- *
- * @param equVlan 【请填写功能名称】
- * @return 结果
- */
- public int insertEquVlan(EquVlan equVlan);
-
- /**
- * 修改【请填写功能名称】
- *
- * @param equVlan 【请填写功能名称】
- * @return 结果
- */
- public int updateEquVlan(EquVlan equVlan);
-
- /**
- * 删除【请填写功能名称】
- *
- * @param id 【请填写功能名称】主键
- * @return 结果
- */
- public int deleteEquVlanById(String id);
-
- /**
- * 批量删除【请填写功能名称】
- *
- * @param ids 需要删除的数据主键集合
- * @return 结果
- */
- public int deleteEquVlanByIds(String[] ids);
-}
diff --git a/ALOps_sys_backend/alops-system/src/main/java/com/alops/system/mapper/FauStaMapper.java b/ALOps_sys_backend/alops-system/src/main/java/com/alops/system/mapper/FauStaMapper.java
new file mode 100644
index 00000000..c461a6de
--- /dev/null
+++ b/ALOps_sys_backend/alops-system/src/main/java/com/alops/system/mapper/FauStaMapper.java
@@ -0,0 +1,65 @@
+package com.alops.system.mapper;
+
+import com.alops.system.domain.FauSta;
+import org.apache.ibatis.annotations.Mapper;
+
+import java.util.List;
+
+
+/**
+ * 故障统计Mapper接口
+ *
+ * @author ruoyi
+ * @date 2025-08-01
+ */
+@Mapper
+public interface FauStaMapper
+{
+ /**
+ * 查询故障统计
+ *
+ * @param id 故障统计主键
+ * @return 故障统计
+ */
+ public FauSta selectFauStaById(Long id);
+
+ /**
+ * 查询故障统计列表
+ *
+ * @param fauSta 故障统计
+ * @return 故障统计集合
+ */
+ public List selectFauStaList(FauSta fauSta);
+
+ /**
+ * 新增故障统计
+ *
+ * @param fauSta 故障统计
+ * @return 结果
+ */
+ public int insertFauSta(FauSta fauSta);
+
+ /**
+ * 修改故障统计
+ *
+ * @param fauSta 故障统计
+ * @return 结果
+ */
+ public int updateFauSta(FauSta fauSta);
+
+ /**
+ * 删除故障统计
+ *
+ * @param id 故障统计主键
+ * @return 结果
+ */
+ public int deleteFauStaById(Long id);
+
+ /**
+ * 批量删除故障统计
+ *
+ * @param ids 需要删除的数据主键集合
+ * @return 结果
+ */
+ public int deleteFauStaByIds(Long[] ids);
+}
diff --git a/ALOps_sys_backend/alops-system/src/main/java/com/alops/system/mapper/InternalMessageMapper.java b/ALOps_sys_backend/alops-system/src/main/java/com/alops/system/mapper/InternalMessageMapper.java
deleted file mode 100644
index f7cef6e8..00000000
--- a/ALOps_sys_backend/alops-system/src/main/java/com/alops/system/mapper/InternalMessageMapper.java
+++ /dev/null
@@ -1,73 +0,0 @@
-package com.alops.system.mapper;
-
-import com.alops.system.domain.InternalMessage;
-import org.apache.ibatis.annotations.Mapper;
-import org.springframework.data.repository.query.Param;
-
-import java.util.List;
-
-/**
- * 站内信Mapper接口
- *
- * @author ruoyi
- * @date 2025-09-04
- */
-@Mapper
-public interface InternalMessageMapper
- {
- /**
- * 批量插入消息
- * @param messages 消息列表
- * @return 受影响行数
- */
- int batchInsert(@Param("messages") List messages);
-
-
- /**
- * 查询站内信
- *
- * @param id 站内信主键
- * @return 站内信
- */
- public InternalMessage selectInternalMessageById(Long id);
-
- /**
- * 查询站内信列表
- *
- * @param internalMessage 站内信
- * @return 站内信集合
- */
- public List selectInternalMessageList(InternalMessage internalMessage);
-
- /**
- * 新增站内信
- *
- * @param internalMessage 站内信
- * @return 结果
- */
- public int insertInternalMessage(InternalMessage internalMessage);
-
- /**
- * 修改站内信
- *
- * @param internalMessage 站内信
- * @return 结果
- */
- public int updateInternalMessage(InternalMessage internalMessage);
-
- /**
- * 删除站内信
- *
- * @param id 站内信主键
- * @return 结果
- */
- public int deleteInternalMessageById(Long id);
-
- /**
- * 批量删除站内信
- *
- * @param ids 需要删除的数据主键集合
- * @return 结果
- */
- public int deleteInternalMessageByIds(Long[] ids);
-}
diff --git a/ALOps_sys_backend/alops-system/src/main/java/com/alops/system/mapper/SysUserMapper.java b/ALOps_sys_backend/alops-system/src/main/java/com/alops/system/mapper/SysUserMapper.java
index ec557c82..a2a87d30 100644
--- a/ALOps_sys_backend/alops-system/src/main/java/com/alops/system/mapper/SysUserMapper.java
+++ b/ALOps_sys_backend/alops-system/src/main/java/com/alops/system/mapper/SysUserMapper.java
@@ -13,11 +13,6 @@ import com.alops.common.core.domain.entity.SysUser;
*/@Mapper
public interface SysUserMapper
{
-
- /**
- * 根据角色ID查询用户列表(多对多)
- */
- List selectByRoleId(@Param("roleId") Long roleId);
/**
* 根据条件分页查询用户列表
*
diff --git a/ALOps_sys_backend/alops-system/src/main/java/com/alops/system/service/ConvertRawValueService.java b/ALOps_sys_backend/alops-system/src/main/java/com/alops/system/service/ConvertRawValueService.java
deleted file mode 100644
index 16f66b8b..00000000
--- a/ALOps_sys_backend/alops-system/src/main/java/com/alops/system/service/ConvertRawValueService.java
+++ /dev/null
@@ -1,12 +0,0 @@
-package com.alops.system.service;
-
-import com.alops.system.domain.EquOid;
-import org.springframework.stereotype.Service;
-
-import java.util.Map;
-@Service
-public interface ConvertRawValueService {
-
- public String convertValue(String rule, String val);
-
-}
diff --git a/ALOps_sys_backend/alops-system/src/main/java/com/alops/system/service/IAlarmRuleService.java b/ALOps_sys_backend/alops-system/src/main/java/com/alops/system/service/IAlarmRuleService.java
new file mode 100644
index 00000000..47cd49b8
--- /dev/null
+++ b/ALOps_sys_backend/alops-system/src/main/java/com/alops/system/service/IAlarmRuleService.java
@@ -0,0 +1,62 @@
+package com.alops.system.service;
+
+import com.alops.system.domain.AlarmRule;
+
+import java.util.List;
+
+/**
+ * 预警规则Service接口
+ *
+ * @author ruoyi
+ * @date 2025-08-01
+ */
+public interface IAlarmRuleService
+{
+ /**
+ * 查询预警规则
+ *
+ * @param id 预警规则主键
+ * @return 预警规则
+ */
+ public AlarmRule selectAlarmRuleById(Long id);
+
+ /**
+ * 查询预警规则列表
+ *
+ * @param alarmRule 预警规则
+ * @return 预警规则集合
+ */
+ public List selectAlarmRuleList(AlarmRule alarmRule);
+
+ /**
+ * 新增预警规则
+ *
+ * @param alarmRule 预警规则
+ * @return 结果
+ */
+ public int insertAlarmRule(AlarmRule alarmRule);
+
+ /**
+ * 修改预警规则
+ *
+ * @param alarmRule 预警规则
+ * @return 结果
+ */
+ public int updateAlarmRule(AlarmRule alarmRule);
+
+ /**
+ * 批量删除预警规则
+ *
+ * @param ids 需要删除的预警规则主键集合
+ * @return 结果
+ */
+ public int deleteAlarmRuleByIds(Long[] ids);
+
+ /**
+ * 删除预警规则信息
+ *
+ * @param id 预警规则主键
+ * @return 结果
+ */
+ public int deleteAlarmRuleById(Long id);
+}
diff --git a/ALOps_sys_backend/alops-system/src/main/java/com/alops/system/service/IAlertLaunchService.java b/ALOps_sys_backend/alops-system/src/main/java/com/alops/system/service/IAlertLaunchService.java
deleted file mode 100644
index c849e2b8..00000000
--- a/ALOps_sys_backend/alops-system/src/main/java/com/alops/system/service/IAlertLaunchService.java
+++ /dev/null
@@ -1,7 +0,0 @@
-package com.alops.system.service;
-
-import java.util.List;
-
-public interface IAlertLaunchService {
- public void executeImmediateAlerts(List ruleIds);
-}
diff --git a/ALOps_sys_backend/alops-system/src/main/java/com/alops/system/service/IAlertRuleConditionService.java b/ALOps_sys_backend/alops-system/src/main/java/com/alops/system/service/IAlertRuleConditionService.java
deleted file mode 100644
index 501fdd80..00000000
--- a/ALOps_sys_backend/alops-system/src/main/java/com/alops/system/service/IAlertRuleConditionService.java
+++ /dev/null
@@ -1,62 +0,0 @@
-package com.alops.system.service;
-
-import com.alops.system.domain.AlertRuleCondition;
-
-import java.util.List;
-
-/**
- * 【请填写功能名称】Service接口
- *
- * @author ruoyi
- * @date 2025-09-04
- */
-public interface IAlertRuleConditionService
-{
- /**
- * 查询【请填写功能名称】
- *
- * @param id 【请填写功能名称】主键
- * @return 【请填写功能名称】
- */
- public AlertRuleCondition selectAlertRuleConditionById(Long id);
-
- /**
- * 查询【请填写功能名称】列表
- *
- * @param alertRuleCondition 【请填写功能名称】
- * @return 【请填写功能名称】集合
- */
- public List selectAlertRuleConditionList(AlertRuleCondition alertRuleCondition);
-
- /**
- * 新增【请填写功能名称】
- *
- * @param alertRuleCondition 【请填写功能名称】
- * @return 结果
- */
- public int insertAlertRuleCondition(AlertRuleCondition alertRuleCondition);
-
- /**
- * 修改【请填写功能名称】
- *
- * @param alertRuleCondition 【请填写功能名称】
- * @return 结果
- */
- public int updateAlertRuleCondition(AlertRuleCondition alertRuleCondition);
-
- /**
- * 批量删除【请填写功能名称】
- *
- * @param ids 需要删除的【请填写功能名称】主键集合
- * @return 结果
- */
- public int deleteAlertRuleConditionByIds(Long[] ids);
-
- /**
- * 删除【请填写功能名称】信息
- *
- * @param id 【请填写功能名称】主键
- * @return 结果
- */
- public int deleteAlertRuleConditionById(Long id);
-}
diff --git a/ALOps_sys_backend/alops-system/src/main/java/com/alops/system/service/IAlertRuleService.java b/ALOps_sys_backend/alops-system/src/main/java/com/alops/system/service/IAlertRuleService.java
deleted file mode 100644
index e818e5d5..00000000
--- a/ALOps_sys_backend/alops-system/src/main/java/com/alops/system/service/IAlertRuleService.java
+++ /dev/null
@@ -1,65 +0,0 @@
-package com.alops.system.service;
-
-import com.alops.system.domain.AlertRule;
-import com.alops.system.domain.dto.AlertRuleAddDto;
-
-import java.util.List;
-
-/**
- * 【请填写功能名称】Service接口
- *
- * @author ruoyi
- * @date 2025-09-04
- */
-public interface IAlertRuleService
-{
-
- public AlertRule saveRule(AlertRuleAddDto dto);
- /**
- * 查询【请填写功能名称】
- *
- * @param id 【请填写功能名称】主键
- * @return 【请填写功能名称】
- */
- public AlertRule selectAlertRuleById(Long id);
-
- /**
- * 查询【请填写功能名称】列表
- *
- * @param alertRule 【请填写功能名称】
- * @return 【请填写功能名称】集合
- */
- public List selectAlertRuleList(AlertRule alertRule);
-
- /**
- * 新增【请填写功能名称】
- *
- * @param alertRule 【请填写功能名称】
- * @return 结果
- */
- public int insertAlertRule(AlertRule alertRule);
-
- /**
- * 修改【请填写功能名称】
- *
- * @param alertRule 【请填写功能名称】
- * @return 结果
- */
- public int updateAlertRule(AlertRule alertRule);
-
- /**
- * 批量删除【请填写功能名称】
- *
- * @param ids 需要删除的【请填写功能名称】主键集合
- * @return 结果
- */
- public int deleteAlertRuleByIds(Long[] ids);
-
- /**
- * 删除【请填写功能名称】信息
- *
- * @param id 【请填写功能名称】主键
- * @return 结果
- */
- public int deleteAlertRuleById(Long id);
-}
diff --git a/ALOps_sys_backend/alops-system/src/main/java/com/alops/system/service/IAlertSenderService.java b/ALOps_sys_backend/alops-system/src/main/java/com/alops/system/service/IAlertSenderService.java
deleted file mode 100644
index f98b51a4..00000000
--- a/ALOps_sys_backend/alops-system/src/main/java/com/alops/system/service/IAlertSenderService.java
+++ /dev/null
@@ -1,7 +0,0 @@
-package com.alops.system.service;
-
-import java.util.List;
-
-public interface IAlertSenderService {
- public void sendAlert(List alertMessage, String alertWay, String target);
-}
diff --git a/ALOps_sys_backend/alops-system/src/main/java/com/alops/system/service/IDictAlarmParamService.java b/ALOps_sys_backend/alops-system/src/main/java/com/alops/system/service/IDictAlarmParamService.java
deleted file mode 100644
index 6aa48d8c..00000000
--- a/ALOps_sys_backend/alops-system/src/main/java/com/alops/system/service/IDictAlarmParamService.java
+++ /dev/null
@@ -1,64 +0,0 @@
-package com.alops.system.service;
-
-import com.alops.system.domain.DictAlarmParam;
-
-import java.util.List;
-
-/**
- * 【请填写功能名称】Service接口
- *
- * @author ruoyi
- * @date 2025-09-05
- */
-public interface IDictAlarmParamService
-{
-
- List getParamsByTableName(String tableName);
- /**
- * 查询【请填写功能名称】
- *
- * @param id 【请填写功能名称】主键
- * @return 【请填写功能名称】
- */
- public DictAlarmParam selectDictAlarmParamById(Long id);
-
- /**
- * 查询【请填写功能名称】列表
- *
- * @param dictAlarmParam 【请填写功能名称】
- * @return 【请填写功能名称】集合
- */
- public List selectDictAlarmParamList(DictAlarmParam dictAlarmParam);
-
- /**
- * 新增【请填写功能名称】
- *
- * @param dictAlarmParam 【请填写功能名称】
- * @return 结果
- */
- public int insertDictAlarmParam(DictAlarmParam dictAlarmParam);
-
- /**
- * 修改【请填写功能名称】
- *
- * @param dictAlarmParam 【请填写功能名称】
- * @return 结果
- */
- public int updateDictAlarmParam(DictAlarmParam dictAlarmParam);
-
- /**
- * 批量删除【请填写功能名称】
- *
- * @param ids 需要删除的【请填写功能名称】主键集合
- * @return 结果
- */
- public int deleteDictAlarmParamByIds(Long[] ids);
-
- /**
- * 删除【请填写功能名称】信息
- *
- * @param id 【请填写功能名称】主键
- * @return 结果
- */
- public int deleteDictAlarmParamById(Long id);
-}
diff --git a/ALOps_sys_backend/alops-system/src/main/java/com/alops/system/service/IEquBaseService.java b/ALOps_sys_backend/alops-system/src/main/java/com/alops/system/service/IEquBaseService.java
index 5d00e6b2..0bac6c95 100644
--- a/ALOps_sys_backend/alops-system/src/main/java/com/alops/system/service/IEquBaseService.java
+++ b/ALOps_sys_backend/alops-system/src/main/java/com/alops/system/service/IEquBaseService.java
@@ -2,7 +2,6 @@ package com.alops.system.service;
import com.alops.system.domain.EquBase;
import com.alops.system.domain.dto.EquBaseQueryDto;
-import com.alops.system.domain.vo.queryEquBaseVO;
import java.util.List;
@@ -29,7 +28,7 @@ public interface IEquBaseService
* @param equBaseQueryDto 设备基本信息
* @return 设备基本信息集合
*/
- public List selectEquBaseList(EquBaseQueryDto equBaseQueryDto);
+ public List selectEquBaseList(EquBaseQueryDto equBaseQueryDto);
/**
* 新增设备基本信息
diff --git a/ALOps_sys_backend/alops-system/src/main/java/com/alops/system/service/IEquGatherService.java b/ALOps_sys_backend/alops-system/src/main/java/com/alops/system/service/IEquGatherService.java
deleted file mode 100644
index 617868f2..00000000
--- a/ALOps_sys_backend/alops-system/src/main/java/com/alops/system/service/IEquGatherService.java
+++ /dev/null
@@ -1,62 +0,0 @@
-package com.alops.system.service;
-
-import com.alops.system.domain.EquGather;
-
-import java.util.List;
-
-/**
- * 设备采集信息Service接口
- *
- * @author ruoyi
- * @date 2025-08-15
- */
-public interface IEquGatherService
-{
- /**
- * 查询设备采集信息
- *
- * @param id 设备采集信息主键
- * @return 设备采集信息
- */
- public EquGather selectEquGatherById(String id);
-
- /**
- * 查询设备采集信息列表
- *
- * @param equGather 设备采集信息
- * @return 设备采集信息集合
- */
- public List selectEquGatherList(EquGather equGather);
-
- /**
- * 新增设备采集信息
- *
- * @param equGather 设备采集信息
- * @return 结果
- */
- public int insertEquGather(EquGather equGather);
-
- /**
- * 修改设备采集信息
- *
- * @param equGather 设备采集信息
- * @return 结果
- */
- public int updateEquGather(EquGather equGather);
-
- /**
- * 批量删除设备采集信息
- *
- * @param ids 需要删除的设备采集信息主键集合
- * @return 结果
- */
- public int deleteEquGatherByIds(String[] ids);
-
- /**
- * 删除设备采集信息信息
- *
- * @param id 设备采集信息主键
- * @return 结果
- */
- public int deleteEquGatherById(String id);
-}
diff --git a/ALOps_sys_backend/alops-system/src/main/java/com/alops/system/service/IEquInterfaceService.java b/ALOps_sys_backend/alops-system/src/main/java/com/alops/system/service/IEquInterfaceService.java
deleted file mode 100644
index 570a0a32..00000000
--- a/ALOps_sys_backend/alops-system/src/main/java/com/alops/system/service/IEquInterfaceService.java
+++ /dev/null
@@ -1,64 +0,0 @@
-package com.alops.system.service;
-
-import com.alops.system.domain.EquInterface;
-import org.springframework.stereotype.Service;
-
-import java.util.List;
-
-/**
- * 端口运行状态Service接口
- *
- * @author ruoyi
- * @date 2025-08-20
- */
-
-public interface IEquInterfaceService
-{
- /**
- * 查询端口运行状态
- *
- * @param id 端口运行状态主键
- * @return 端口运行状态
- */
- public EquInterface selectEquInterfaceById(String id);
-
- /**
- * 查询端口运行状态列表
- *
- * @param equInterface 端口运行状态
- * @return 端口运行状态集合
- */
- public List selectEquInterfaceList(EquInterface equInterface);
-
- /**
- * 新增端口运行状态
- *
- * @param equInterface 端口运行状态
- * @return 结果
- */
- public int insertEquInterface(EquInterface equInterface);
-
- /**
- * 修改端口运行状态
- *
- * @param equInterface 端口运行状态
- * @return 结果
- */
- public int updateEquInterface(EquInterface equInterface);
-
- /**
- * 批量删除端口运行状态
- *
- * @param ids 需要删除的端口运行状态主键集合
- * @return 结果
- */
- public int deleteEquInterfaceByIds(String[] ids);
-
- /**
- * 删除端口运行状态信息
- *
- * @param id 端口运行状态主键
- * @return 结果
- */
- public int deleteEquInterfaceById(String id);
-}
diff --git a/ALOps_sys_backend/alops-system/src/main/java/com/alops/system/service/IEquOidService.java b/ALOps_sys_backend/alops-system/src/main/java/com/alops/system/service/IEquOidService.java
deleted file mode 100644
index a6282e09..00000000
--- a/ALOps_sys_backend/alops-system/src/main/java/com/alops/system/service/IEquOidService.java
+++ /dev/null
@@ -1,62 +0,0 @@
-package com.alops.system.service;
-
-import com.alops.system.domain.EquOid;
-
-import java.util.List;
-
-/**
- * OID配置信息Service接口
- *
- * @author ruoyi
- * @date 2025-08-15
- */
-public interface IEquOidService
-{
- /**
- * 查询OID配置信息
- *
- * @param id OID配置信息主键
- * @return OID配置信息
- */
- public EquOid selectEquOidById(Long id);
-
- /**
- * 查询OID配置信息列表
- *
- * @param equOid OID配置信息
- * @return OID配置信息集合
- */
- public List selectEquOidList(EquOid equOid);
-
- /**
- * 新增OID配置信息
- *
- * @param equOid OID配置信息
- * @return 结果
- */
- public int insertEquOid(EquOid equOid);
-
- /**
- * 修改OID配置信息
- *
- * @param equOid OID配置信息
- * @return 结果
- */
- public int updateEquOid(EquOid equOid);
-
- /**
- * 批量删除OID配置信息
- *
- * @param ids 需要删除的OID配置信息主键集合
- * @return 结果
- */
- public int deleteEquOidByIds(Long[] ids);
-
- /**
- * 删除OID配置信息信息
- *
- * @param id OID配置信息主键
- * @return 结果
- */
- public int deleteEquOidById(Long id);
-}
diff --git a/ALOps_sys_backend/alops-system/src/main/java/com/alops/system/service/IEquRoutingService.java b/ALOps_sys_backend/alops-system/src/main/java/com/alops/system/service/IEquRoutingService.java
deleted file mode 100644
index 2e116183..00000000
--- a/ALOps_sys_backend/alops-system/src/main/java/com/alops/system/service/IEquRoutingService.java
+++ /dev/null
@@ -1,62 +0,0 @@
-package com.alops.system.service;
-
-import com.alops.system.domain.EquRouting;
-
-import java.util.List;
-
-/**
- * 路由信息Service接口
- *
- * @author ruoyi
- * @date 2025-08-15
- */
-public interface IEquRoutingService
-{
- /**
- * 查询路由信息
- *
- * @param id 路由信息主键
- * @return 路由信息
- */
- public EquRouting selectEquRoutingById(String id);
-
- /**
- * 查询路由信息列表
- *
- * @param equRouting 路由信息
- * @return 路由信息集合
- */
- public List selectEquRoutingList(EquRouting equRouting);
-
- /**
- * 新增路由信息
- *
- * @param equRouting 路由信息
- * @return 结果
- */
- public int insertEquRouting(EquRouting equRouting);
-
- /**
- * 修改路由信息
- *
- * @param equRouting 路由信息
- * @return 结果
- */
- public int updateEquRouting(EquRouting equRouting);
-
- /**
- * 批量删除路由信息
- *
- * @param ids 需要删除的路由信息主键集合
- * @return 结果
- */
- public int deleteEquRoutingByIds(String[] ids);
-
- /**
- * 删除路由信息信息
- *
- * @param id 路由信息主键
- * @return 结果
- */
- public int deleteEquRoutingById(String id);
-}
diff --git a/ALOps_sys_backend/alops-system/src/main/java/com/alops/system/service/IEquVeneerService.java b/ALOps_sys_backend/alops-system/src/main/java/com/alops/system/service/IEquVeneerService.java
deleted file mode 100644
index da61c79b..00000000
--- a/ALOps_sys_backend/alops-system/src/main/java/com/alops/system/service/IEquVeneerService.java
+++ /dev/null
@@ -1,62 +0,0 @@
-package com.alops.system.service;
-
-import com.alops.system.domain.EquVeneer;
-
-import java.util.List;
-
-/**
- * 【请填写功能名称】Service接口
- *
- * @author ruoyi
- * @date 2025-08-15
- */
-public interface IEquVeneerService
-{
- /**
- * 查询【请填写功能名称】
- *
- * @param id 【请填写功能名称】主键
- * @return 【请填写功能名称】
- */
- public EquVeneer selectEquVeneerById(String id);
-
- /**
- * 查询【请填写功能名称】列表
- *
- * @param equVeneer 【请填写功能名称】
- * @return 【请填写功能名称】集合
- */
- public List selectEquVeneerList(EquVeneer equVeneer);
-
- /**
- * 新增【请填写功能名称】
- *
- * @param equVeneer 【请填写功能名称】
- * @return 结果
- */
- public int insertEquVeneer(EquVeneer equVeneer);
-
- /**
- * 修改【请填写功能名称】
- *
- * @param equVeneer 【请填写功能名称】
- * @return 结果
- */
- public int updateEquVeneer(EquVeneer equVeneer);
-
- /**
- * 批量删除【请填写功能名称】
- *
- * @param ids 需要删除的【请填写功能名称】主键集合
- * @return 结果
- */
- public int deleteEquVeneerByIds(String[] ids);
-
- /**
- * 删除【请填写功能名称】信息
- *
- * @param id 【请填写功能名称】主键
- * @return 结果
- */
- public int deleteEquVeneerById(String id);
-}
diff --git a/ALOps_sys_backend/alops-system/src/main/java/com/alops/system/service/IEquVlanService.java b/ALOps_sys_backend/alops-system/src/main/java/com/alops/system/service/IEquVlanService.java
deleted file mode 100644
index 0a951d96..00000000
--- a/ALOps_sys_backend/alops-system/src/main/java/com/alops/system/service/IEquVlanService.java
+++ /dev/null
@@ -1,62 +0,0 @@
-package com.alops.system.service;
-
-import com.alops.system.domain.EquVlan;
-
-import java.util.List;
-
-/**
- * 【请填写功能名称】Service接口
- *
- * @author ruoyi
- * @date 2025-08-15
- */
-public interface IEquVlanService
-{
- /**
- * 查询【请填写功能名称】
- *
- * @param id 【请填写功能名称】主键
- * @return 【请填写功能名称】
- */
- public EquVlan selectEquVlanById(String id);
-
- /**
- * 查询【请填写功能名称】列表
- *
- * @param equVlan 【请填写功能名称】
- * @return 【请填写功能名称】集合
- */
- public List selectEquVlanList(EquVlan equVlan);
-
- /**
- * 新增【请填写功能名称】
- *
- * @param equVlan 【请填写功能名称】
- * @return 结果
- */
- public int insertEquVlan(EquVlan equVlan);
-
- /**
- * 修改【请填写功能名称】
- *
- * @param equVlan 【请填写功能名称】
- * @return 结果
- */
- public int updateEquVlan(EquVlan equVlan);
-
- /**
- * 批量删除【请填写功能名称】
- *
- * @param ids 需要删除的【请填写功能名称】主键集合
- * @return 结果
- */
- public int deleteEquVlanByIds(String[] ids);
-
- /**
- * 删除【请填写功能名称】信息
- *
- * @param id 【请填写功能名称】主键
- * @return 结果
- */
- public int deleteEquVlanById(String id);
-}
diff --git a/ALOps_sys_backend/alops-system/src/main/java/com/alops/system/service/IAlertMessageService.java b/ALOps_sys_backend/alops-system/src/main/java/com/alops/system/service/IFauStaService.java
similarity index 55%
rename from ALOps_sys_backend/alops-system/src/main/java/com/alops/system/service/IAlertMessageService.java
rename to ALOps_sys_backend/alops-system/src/main/java/com/alops/system/service/IFauStaService.java
index adb89217..7a167f0f 100644
--- a/ALOps_sys_backend/alops-system/src/main/java/com/alops/system/service/IAlertMessageService.java
+++ b/ALOps_sys_backend/alops-system/src/main/java/com/alops/system/service/IFauStaService.java
@@ -1,6 +1,6 @@
package com.alops.system.service;
-import com.alops.system.domain.AlertMessage;
+import com.alops.system.domain.FauSta;
import java.util.List;
@@ -8,9 +8,9 @@ import java.util.List;
* 故障统计Service接口
*
* @author ruoyi
- * @date 2025-09-04
+ * @date 2025-08-01
*/
-public interface IAlertMessageService
+public interface IFauStaService
{
/**
* 查询故障统计
@@ -18,31 +18,31 @@ public interface IAlertMessageService
* @param id 故障统计主键
* @return 故障统计
*/
- public AlertMessage selectAlertMessageById(Long id);
+ public FauSta selectFauStaById(Long id);
/**
* 查询故障统计列表
*
- * @param alertMessage 故障统计
+ * @param fauSta 故障统计
* @return 故障统计集合
*/
- public List selectAlertMessageList(AlertMessage alertMessage);
+ public List selectFauStaList(FauSta fauSta);
/**
* 新增故障统计
*
- * @param alertMessage 故障统计
+ * @param fauSta 故障统计
* @return 结果
*/
- public int insertAlertMessage(AlertMessage alertMessage);
+ public int insertFauSta(FauSta fauSta);
/**
* 修改故障统计
*
- * @param alertMessage 故障统计
+ * @param fauSta 故障统计
* @return 结果
*/
- public int updateAlertMessage(AlertMessage alertMessage);
+ public int updateFauSta(FauSta fauSta);
/**
* 批量删除故障统计
@@ -50,7 +50,7 @@ public interface IAlertMessageService
* @param ids 需要删除的故障统计主键集合
* @return 结果
*/
- public int deleteAlertMessageByIds(Long[] ids);
+ public int deleteFauStaByIds(Long[] ids);
/**
* 删除故障统计信息
@@ -58,5 +58,5 @@ public interface IAlertMessageService
* @param id 故障统计主键
* @return 结果
*/
- public int deleteAlertMessageById(Long id);
+ public int deleteFauStaById(Long id);
}
diff --git a/ALOps_sys_backend/alops-system/src/main/java/com/alops/system/service/IScheduleRulesService.java b/ALOps_sys_backend/alops-system/src/main/java/com/alops/system/service/IScheduleRulesService.java
index 6e59a034..2a9e7a3b 100644
--- a/ALOps_sys_backend/alops-system/src/main/java/com/alops/system/service/IScheduleRulesService.java
+++ b/ALOps_sys_backend/alops-system/src/main/java/com/alops/system/service/IScheduleRulesService.java
@@ -1,11 +1,8 @@
package com.alops.system.service;
-import com.alops.common.core.domain.AjaxResult;
import com.alops.system.domain.ScheduleRules;
-import org.springframework.stereotype.Service;
import java.util.List;
-import java.util.concurrent.ExecutionException;
/**
@@ -14,13 +11,8 @@ import java.util.concurrent.ExecutionException;
* @author ruoyi
* @date 2025-08-03
*/
-
public interface IScheduleRulesService
{
-
-
- public int executeImmediately() throws ExecutionException, InterruptedException;
-
/**
* 查询定时采集规则
*
diff --git a/ALOps_sys_backend/alops-system/src/main/java/com/alops/system/service/MemoryToolService.java b/ALOps_sys_backend/alops-system/src/main/java/com/alops/system/service/MemoryToolService.java
deleted file mode 100644
index 8c589e9e..00000000
--- a/ALOps_sys_backend/alops-system/src/main/java/com/alops/system/service/MemoryToolService.java
+++ /dev/null
@@ -1,18 +0,0 @@
-package com.alops.system.service;
-
-import com.alops.system.domain.EquBase;
-import com.alops.system.domain.EquOid;
-import com.alops.system.domain.vo.EquGatherInsertInfo;
-import com.alops.system.domain.vo.GatherEntities;
-import org.springframework.stereotype.Service;
-
-import java.util.List;
-import java.util.Map;
-
-@Service
-public interface MemoryToolService {
- public GatherEntities buildAndInsertEntity(
- EquBase device,
- Map snmpResults);
- public int persistAll(List allEntities);
-}
diff --git a/ALOps_sys_backend/alops-system/src/main/java/com/alops/system/service/SnmpService.java b/ALOps_sys_backend/alops-system/src/main/java/com/alops/system/service/SnmpService.java
deleted file mode 100644
index 6d9c0c21..00000000
--- a/ALOps_sys_backend/alops-system/src/main/java/com/alops/system/service/SnmpService.java
+++ /dev/null
@@ -1,11 +0,0 @@
-package com.alops.system.service;
-
-import com.alops.system.domain.EquOid;
-import org.springframework.stereotype.Service;
-
-import java.util.List;
-import java.util.Map;
-@Service
-public interface SnmpService {
- public Map query(String ip, List oids);
-}
diff --git a/ALOps_sys_backend/alops-system/src/main/java/com/alops/system/service/impl/AlarmRuleServiceImpl.java b/ALOps_sys_backend/alops-system/src/main/java/com/alops/system/service/impl/AlarmRuleServiceImpl.java
new file mode 100644
index 00000000..1b58d14f
--- /dev/null
+++ b/ALOps_sys_backend/alops-system/src/main/java/com/alops/system/service/impl/AlarmRuleServiceImpl.java
@@ -0,0 +1,98 @@
+package com.alops.system.service.impl;
+
+import java.util.List;
+
+import com.alops.common.utils.DateUtils;
+import com.alops.system.domain.AlarmRule;
+import com.alops.system.mapper.AlarmRuleMapper;
+import com.alops.system.service.IAlarmRuleService;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+
+/**
+ * 预警规则Service业务层处理
+ *
+ * @author ruoyi
+ * @date 2025-08-01
+ */
+@Service
+public class AlarmRuleServiceImpl implements IAlarmRuleService
+{
+ @Autowired
+ private AlarmRuleMapper alarmRuleMapper;
+
+ /**
+ * 查询预警规则
+ *
+ * @param id 预警规则主键
+ * @return 预警规则
+ */
+ @Override
+ public AlarmRule selectAlarmRuleById(Long id)
+ {
+ return alarmRuleMapper.selectAlarmRuleById(id);
+ }
+
+ /**
+ * 查询预警规则列表
+ *
+ * @param alarmRule 预警规则
+ * @return 预警规则
+ */
+ @Override
+ public List selectAlarmRuleList(AlarmRule alarmRule)
+ {
+ return alarmRuleMapper.selectAlarmRuleList(alarmRule);
+ }
+
+ /**
+ * 新增预警规则
+ *
+ * @param alarmRule 预警规则
+ * @return 结果
+ */
+ @Override
+ public int insertAlarmRule(AlarmRule alarmRule)
+ {
+ alarmRule.setCreateTime(DateUtils.getNowDate());
+ return alarmRuleMapper.insertAlarmRule(alarmRule);
+ }
+
+ /**
+ * 修改预警规则
+ *
+ * @param alarmRule 预警规则
+ * @return 结果
+ */
+ @Override
+ public int updateAlarmRule(AlarmRule alarmRule)
+ {
+ return alarmRuleMapper.updateAlarmRule(alarmRule);
+ }
+
+ /**
+ * 批量删除预警规则
+ *
+ * @param ids 需要删除的预警规则主键
+ * @return 结果
+ */
+ @Override
+ public int deleteAlarmRuleByIds(Long[] ids)
+ {
+ return alarmRuleMapper.deleteAlarmRuleByIds(ids);
+ }
+
+ /**
+ * 删除预警规则信息
+ *
+ * @param id 预警规则主键
+ * @return 结果
+ */
+ @Override
+ public int deleteAlarmRuleById(Long id)
+ {
+ return alarmRuleMapper.deleteAlarmRuleById(id);
+ }
+}
diff --git a/ALOps_sys_backend/alops-system/src/main/java/com/alops/system/service/impl/AlertLaunchServiceImpl.java b/ALOps_sys_backend/alops-system/src/main/java/com/alops/system/service/impl/AlertLaunchServiceImpl.java
deleted file mode 100644
index 6e424a80..00000000
--- a/ALOps_sys_backend/alops-system/src/main/java/com/alops/system/service/impl/AlertLaunchServiceImpl.java
+++ /dev/null
@@ -1,155 +0,0 @@
-package com.alops.system.service.impl;
-
-import com.alops.system.domain.AlertMessage;
-import com.alops.system.domain.AlertRule;
-import com.alops.system.domain.AlertRuleCondition;
-import com.alops.system.mapper.AlertMessageMapper;
-import com.alops.system.mapper.AlertRuleConditionMapper;
-import com.alops.system.mapper.AlertRuleMapper;
-import com.alops.system.service.IAlertLaunchService;
-import com.alops.system.service.IAlertSenderService;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.jdbc.core.JdbcTemplate;
-import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
-
-import java.util.*;
-import java.util.concurrent.ExecutorService;
-import java.util.concurrent.Executors;
-
-@Service
-public class AlertLaunchServiceImpl implements IAlertLaunchService {
-
- @Autowired
- private AlertRuleMapper alertRuleMapper;
- @Autowired
- private AlertRuleConditionMapper alertRuleConditionMapper;
- @Autowired
- private AlertMessageMapper alertMessageMapper;
- @Autowired
- private JdbcTemplate jdbcTemplate;
- @Autowired
- private IAlertSenderService alertSender; // 发送通知
-
- private final ExecutorService executor = Executors.newFixedThreadPool(5);
-
- /**
- * 执行立即预警
- */
- @Override
- public void executeImmediateAlerts(List ruleIds) {
- List rules = alertRuleMapper.selectByIds(ruleIds);
-
- //每个规则开一个线程
-
- for (AlertRule rule : rules) {
- executor.submit(() -> processRule(rule));
- }
- }
- /**
- * 同步插入消息
- */
- @Transactional
- public void sendInternalMessages(List messages) {
- if (messages == null || messages.isEmpty()) {
- return;
- }
- int rows = alertMessageMapper.batchInsert(messages);
- if (rows != messages.size()) {
- throw new RuntimeException("部分消息未插入成功");
- }
- }
-
-
- /**
- * 处理单条预警规则
- */
- private void processRule(AlertRule rule) {
- try {
- //1.一次预警规则的所有预警信息实体存一块
- List messages = new ArrayList<>();
- List msgs=new ArrayList<>();
- //2.判断是否特殊符号
- boolean isChangedRule = "CHANGED".equalsIgnoreCase(rule.getAlertSql());
- //3.一个预警规则查询的所有行数据
- List