From 2960fb87d70888313feaf695401c1bb8e8678703 Mon Sep 17 00:00:00 2001 From: lzh1232 <15120652+lzh1232@user.noreply.gitee.com> Date: Thu, 6 Nov 2025 22:50:03 +0800 Subject: [PATCH 1/4] =?UTF-8?q?11.6=20=E7=9B=91=E6=8E=A7=E8=AF=A6=E7=BB=86?= =?UTF-8?q?=E7=95=8C=E9=9D=A2=E7=9A=84=E6=95=B0=E6=8D=AE=E5=B1=95=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../alops/web/controller/equManagement/EquVlanController.java | 2 +- .../controller/exceptionController/AlertMessageController.java | 2 +- .../com/alops/web/controller/tool/EquInterfaceController.java | 2 +- .../com/alops/web/controller/tool/EquRoutingController.java | 2 +- .../java/com/alops/web/controller/tool/EquVeneerController.java | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) 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 index 456686be..d14901d9 100644 --- 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 @@ -57,7 +57,7 @@ public class EquVlanController extends BaseController @ApiOperation("获取界面Vlan信息") public TableDataInfo listByEquId(@PathVariable("equId") String equId) { - startPage(); + List list = equVlanService.selectEquVlanListByEquId(equId); return getDataTable(list); } 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/AlertMessageController.java index f6ca0cba..385feccf 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/AlertMessageController.java @@ -115,7 +115,7 @@ public class AlertMessageController extends BaseController @ApiOperation("获取界面ALlertMessage信息") public TableDataInfo listByEquId(@PathVariable("equId")Long equId) { - startPage(); + List list = alertMessageService.selectAlertMessageListByEquId(equId); return getDataTable(list); } 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 index 99e8d4e0..e048e74b 100644 --- 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 @@ -89,7 +89,7 @@ public class EquInterfaceController extends BaseController @ApiOperation("获取界面Interface接口信息") public TableDataInfo listByEquID(@PathVariable("equID") String equID) { - startPage(); + List list = equInterfaceService.selectEquInterfaceListByEquID(equID); return getDataTable(list); } 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 index 67abccbb..4024f4ab 100644 --- 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 @@ -56,7 +56,7 @@ public class EquRoutingController extends BaseController @ApiOperation("获取界面Routing信息") public TableDataInfo listByEquId(@PathVariable("equId") String equId) { - startPage(); + List list = equRoutingService.selectEquRoutingListByEquId(equId); return getDataTable(list); } 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 index a63fc5b7..fa78f827 100644 --- 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 @@ -56,7 +56,7 @@ public class EquVeneerController extends BaseController @ApiOperation("获取界面Venerr信息") public TableDataInfo listByEquId(@PathVariable("equID") String equID) { - startPage(); + List list = equVeneerService.selectEquVeneerListByEquId(equID); return getDataTable(list); } From ed3cd10ca7ec7b106fada14bb63820b529f17e85 Mon Sep 17 00:00:00 2001 From: xiaohuo <14141624+dsgfhrh@user.noreply.gitee.com> Date: Fri, 7 Nov 2025 18:52:32 +0800 Subject: [PATCH 2/4] =?UTF-8?q?11.7=E4=BF=A1=E6=81=AF=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/message/messageController.java | 25 +++++++++++++++---- 1 file changed, 20 insertions(+), 5 deletions(-) diff --git a/ALOps_sys_backend/alops-admin/src/main/java/com/alops/web/controller/message/messageController.java b/ALOps_sys_backend/alops-admin/src/main/java/com/alops/web/controller/message/messageController.java index d2642340..bf1a36e3 100644 --- a/ALOps_sys_backend/alops-admin/src/main/java/com/alops/web/controller/message/messageController.java +++ b/ALOps_sys_backend/alops-admin/src/main/java/com/alops/web/controller/message/messageController.java @@ -1,9 +1,12 @@ package com.alops.web.controller.message; 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.SecurityUtils; +import com.alops.system.domain.EquType; import com.alops.system.domain.InternalMessage; import com.alops.system.domain.dto.AlertRuleAddDto; import com.alops.system.domain.vo.AlertRuleVo; @@ -11,13 +14,25 @@ import com.alops.system.service.IInternalMessageService; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.security.access.prepost.PreAuthorize; -import org.springframework.web.bind.annotation.*; + + +import java.util.List; + +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PostMapping; + +import org.springframework.web.bind.annotation.PathVariable; + +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; import java.util.List; +import static com.alops.common.utils.PageUtils.startPage; + @RestController @RequestMapping("/message") -public class messageController { +public class messageController extends BaseController { @Autowired public IInternalMessageService iInternalMessageService; @@ -51,14 +66,14 @@ public class messageController { @ApiOperation("获取用户消息列表") @Log(title = "【消息列表】") @GetMapping("/list") - public AjaxResult getMessageList() { + public TableDataInfo getMessageList() { + startPage(); // 获取当前登录用户ID Long userId = SecurityUtils.getLoginUser().getUserId(); - // 调用Service获取消息列表 List messages = iInternalMessageService.getMessagesByUserId(userId); + return getDataTable(messages); - return AjaxResult.success(messages); } From ada6243ea449891776f4a3865f8bb68ff26f92f6 Mon Sep 17 00:00:00 2001 From: lzh1232 <15120652+lzh1232@user.noreply.gitee.com> Date: Fri, 7 Nov 2025 20:16:04 +0800 Subject: [PATCH 3/4] =?UTF-8?q?11.7=20=E7=9B=91=E6=8E=A7=E8=AF=A6=E7=BB=86?= =?UTF-8?q?=E7=95=8C=E9=9D=A2=E7=9A=84=E6=95=B0=E6=8D=AE=E5=B1=95=E7=A4=BA?= =?UTF-8?q?=E6=9B=B4=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../alops/web/controller/equManagement/EquVlanController.java | 2 +- .../src/main/resources/mapper/system/AlertMessageMapper.xml | 1 + .../src/main/resources/mapper/system/EquInterfaceMapper.xml | 2 ++ .../src/main/resources/mapper/system/EquVlanMapper.xml | 1 + 4 files changed, 5 insertions(+), 1 deletion(-) 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 index d14901d9..456686be 100644 --- 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 @@ -57,7 +57,7 @@ public class EquVlanController extends BaseController @ApiOperation("获取界面Vlan信息") public TableDataInfo listByEquId(@PathVariable("equId") String equId) { - + startPage(); List list = equVlanService.selectEquVlanListByEquId(equId); return getDataTable(list); } diff --git a/ALOps_sys_backend/alops-system/src/main/resources/mapper/system/AlertMessageMapper.xml b/ALOps_sys_backend/alops-system/src/main/resources/mapper/system/AlertMessageMapper.xml index 1b51f2e1..ac3e2078 100644 --- a/ALOps_sys_backend/alops-system/src/main/resources/mapper/system/AlertMessageMapper.xml +++ b/ALOps_sys_backend/alops-system/src/main/resources/mapper/system/AlertMessageMapper.xml @@ -133,6 +133,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" WHERE equ_id = #{equid} ) GROUP BY a.id + ORDER BY a.occur_time DESC diff --git a/ALOps_sys_backend/alops-system/src/main/resources/mapper/system/EquInterfaceMapper.xml b/ALOps_sys_backend/alops-system/src/main/resources/mapper/system/EquInterfaceMapper.xml index 050c9063..9b70b38f 100644 --- a/ALOps_sys_backend/alops-system/src/main/resources/mapper/system/EquInterfaceMapper.xml +++ b/ALOps_sys_backend/alops-system/src/main/resources/mapper/system/EquInterfaceMapper.xml @@ -72,6 +72,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" diff --git a/ALOps_sys_backend/alops-system/src/main/resources/mapper/system/EquVlanMapper.xml b/ALOps_sys_backend/alops-system/src/main/resources/mapper/system/EquVlanMapper.xml index 3d2dc88c..dcbc9305 100644 --- a/ALOps_sys_backend/alops-system/src/main/resources/mapper/system/EquVlanMapper.xml +++ b/ALOps_sys_backend/alops-system/src/main/resources/mapper/system/EquVlanMapper.xml @@ -57,6 +57,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" From 8493f9f2ee3ba7b518bdf813f37c6c7418c3c4f7 Mon Sep 17 00:00:00 2001 From: lzh1232 <15120652+lzh1232@user.noreply.gitee.com> Date: Fri, 7 Nov 2025 23:03:49 +0800 Subject: [PATCH 4/4] =?UTF-8?q?11.7=20=E9=A2=84=E8=AD=A6=E4=BF=A1=E6=81=AF?= =?UTF-8?q?=E7=9A=84=E7=B1=BB=E5=9E=8B=E6=94=B9=E4=B8=BAstring?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/exceptionController/AlertMessageController.java | 2 +- .../main/java/com/alops/system/mapper/AlertMessageMapper.java | 2 +- .../java/com/alops/system/service/IAlertMessageService.java | 2 +- .../com/alops/system/service/impl/AlertMessageServiceImpl.java | 2 +- .../src/main/resources/mapper/system/AlertMessageMapper.xml | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) 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/AlertMessageController.java index a664300d..0553cf58 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/AlertMessageController.java @@ -109,7 +109,7 @@ public class AlertMessageController extends BaseController @PreAuthorize("@ss.hasPermi('inMonitoring:alertMessage:listByEquId')") @GetMapping("/{equId}") @ApiOperation("获取界面ALlertMessage信息") - public TableDataInfo listByEquId(@PathVariable("equId")Long equId) + public TableDataInfo listByEquId(@PathVariable("equId")String equId) { List list = alertMessageService.selectAlertMessageListByEquId(equId); 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 index 580fe2a6..ddfdcfbf 100644 --- 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 @@ -47,7 +47,7 @@ public interface AlertMessageMapper public List selectAlertMessageList(AlertDto alertMessage); public List selectStaticAlertMessageList(); - public ArrayList selectAlertMessageByEquId(Long Equid); + public ArrayList selectAlertMessageByEquId(String Equid); /** * 统计设备类型、预警等级、时间的预警次数 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/IAlertMessageService.java index f528a1ad..03655ea1 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/IAlertMessageService.java @@ -32,7 +32,7 @@ public interface IAlertMessageService */ public List selectAlertMessageList(AlertDto alertMessage); public List selectStaticAlertMessageList(); - public List selectAlertMessageListByEquId(Long equId); + public List selectAlertMessageListByEquId(String equId); /** * 统计设备类型、预警等级、时间的预警次数 diff --git a/ALOps_sys_backend/alops-system/src/main/java/com/alops/system/service/impl/AlertMessageServiceImpl.java b/ALOps_sys_backend/alops-system/src/main/java/com/alops/system/service/impl/AlertMessageServiceImpl.java index d0708772..18dedbae 100644 --- a/ALOps_sys_backend/alops-system/src/main/java/com/alops/system/service/impl/AlertMessageServiceImpl.java +++ b/ALOps_sys_backend/alops-system/src/main/java/com/alops/system/service/impl/AlertMessageServiceImpl.java @@ -60,7 +60,7 @@ public class AlertMessageServiceImpl implements IAlertMessageService } @Override - public List selectAlertMessageListByEquId(Long equId) + public List selectAlertMessageListByEquId(String equId) { ArrayList alertMessagelist = alertMessageMapper.selectAlertMessageByEquId(equId); return alertMessagelist; diff --git a/ALOps_sys_backend/alops-system/src/main/resources/mapper/system/AlertMessageMapper.xml b/ALOps_sys_backend/alops-system/src/main/resources/mapper/system/AlertMessageMapper.xml index ac3e2078..ef1c2c8b 100644 --- a/ALOps_sys_backend/alops-system/src/main/resources/mapper/system/AlertMessageMapper.xml +++ b/ALOps_sys_backend/alops-system/src/main/resources/mapper/system/AlertMessageMapper.xml @@ -124,7 +124,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" where am.id = #{id} - where g.equ_id = #{equid} AND a.batch = (