From 1f133e8c05c95c75ee4c897709d95e490a5bc2ac Mon Sep 17 00:00:00 2001 From: gaoyutao Date: Mon, 8 Dec 2025 19:23:53 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9D=83=E9=99=90=E6=8E=A7=E5=88=B6=E5=A2=9E?= =?UTF-8?q?=E5=8A=A0=20=E4=BC=98=E5=8C=96ipv4=E3=80=81ipv6=E6=B5=81?= =?UTF-8?q?=E9=87=8F=E5=B1=95=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../common/core/constant/UserConstants.java | 4 +- .../security/aspect/PreAuthorizeAspect.java | 216 ++++++++++++++++-- .../controller/AllMtrClientController.java | 32 +-- .../RmMtrClientRegistrationController.java | 10 +- .../RmMtrPolicyConfigController.java | 7 +- .../RmMtrProbeResultController.java | 8 +- .../AllInterfaceNameController.java | 2 - .../controller/EpsBusinessController.java | 9 +- .../EpsBusinessDeployController.java | 7 +- .../EpsBusinessScriptController.java | 7 +- .../EpsInitialTrafficDataController.java | 4 +- .../EpsMethodChangeRecordController.java | 3 +- .../EpsNodeBandwidthController.java | 17 +- .../EpsServerRevenueConfigController.java | 7 +- .../EpsTaskStatisticsController.java | 12 +- .../controller/EpsTrafficDataController.java | 32 +-- .../InitialSwitchInfoDetailsController.java | 11 +- .../controller/KnowledgeBaseController.java | 7 +- .../MtmMonitoringTemplateController.java | 32 +-- .../RmEpsTopologyManagementController.java | 9 +- .../controller/RmMonitorConfigController.java | 7 +- .../RmMonitorConfigDetailsController.java | 2 +- .../RmRegistrationMachineController.java | 32 +-- .../controller/RmResourceGroupController.java | 8 +- .../RmResourceRegistrationController.java | 15 +- .../RmSwitchInterfaceInfoController.java | 32 +-- .../RmSwitchManagementController.java | 9 +- .../system/controller/ScreenController.java | 8 +- .../controller/SysMenuClickController.java | 3 - .../UserTableColumnConfigController.java | 8 +- .../EpsInitialTrafficDataServiceImpl.java | 6 +- .../impl/EpsTaskStatisticsServiceImpl.java | 10 +- .../InitialSwitchInfoDetailsServiceImpl.java | 6 +- .../RmMonitorConfigDetailsServiceImpl.java | 4 +- .../RmResourceRegistrationServiceImpl.java | 20 +- .../InitialBandwidthTrafficController.java | 21 +- ...InitialBandwidthTrafficTempController.java | 31 +-- .../controller/InitialCpuInfoController.java | 9 +- .../controller/InitialDiskInfoController.java | 12 +- .../InitialDockerInfoController.java | 12 +- .../InitialMemoryInfoController.java | 12 +- .../InitialMountPointInfoController.java | 11 +- .../InitialSwitchFanInfoController.java | 9 +- .../InitialSwitchInfoController.java | 12 +- .../InitialSwitchInfoTempController.java | 31 +-- .../InitialSwitchMpuInfoController.java | 12 +- .../InitialSwitchOpticalModuleController.java | 11 +- ...itialSwitchOtherCollectDataController.java | 11 +- .../InitialSwitchPowerSupplyController.java | 11 +- .../InitialSystemInfoController.java | 10 +- ...itialSystemOtherCollectDataController.java | 15 +- .../RmAgentManagementController.java | 7 +- .../controller/RmAlarmLogController.java | 7 +- .../RmAlarmPushConfigController.java | 7 +- .../RmDeploymentPolicyController.java | 8 +- .../RmInitialMonitorItemController.java | 2 - .../controller/RmMonitorPolicyController.java | 11 +- .../RmMonitorTemplateController.java | 8 +- .../RmNetworkInterfaceController.java | 7 +- .../RmResourceRemoteController.java | 3 +- .../controller/RmTemplateLinuxController.java | 31 +-- .../RmTemplateSwitchController.java | 31 +-- .../domain/InitialBandwidthTraffic.java | 3 + .../IInitialBandwidthTrafficService.java | 7 + .../InitialBandwidthTrafficServiceImpl.java | 87 +++++-- .../impl/InitialSwitchInfoServiceImpl.java | 4 +- .../rocketmq/utils/DataProcessUtil.java | 2 +- .../InitialBandwidthTrafficMapper.xml | 2 +- 68 files changed, 452 insertions(+), 611 deletions(-) diff --git a/tongran-common/tongran-common-core/src/main/java/com/tongran/common/core/constant/UserConstants.java b/tongran-common/tongran-common-core/src/main/java/com/tongran/common/core/constant/UserConstants.java index ca66e0e..0a0f63e 100644 --- a/tongran-common/tongran-common-core/src/main/java/com/tongran/common/core/constant/UserConstants.java +++ b/tongran-common/tongran-common-core/src/main/java/com/tongran/common/core/constant/UserConstants.java @@ -83,8 +83,8 @@ public class UserConstants public static boolean isAdmin(Long userId) { -// return userId != null && 1L == userId; + return userId != null && 1L == userId; //TODO 权限控制 - return true; +// return true; } } diff --git a/tongran-common/tongran-common-security/src/main/java/com/tongran/common/security/aspect/PreAuthorizeAspect.java b/tongran-common/tongran-common-security/src/main/java/com/tongran/common/security/aspect/PreAuthorizeAspect.java index c1a0713..aa665c7 100644 --- a/tongran-common/tongran-common-security/src/main/java/com/tongran/common/security/aspect/PreAuthorizeAspect.java +++ b/tongran-common/tongran-common-security/src/main/java/com/tongran/common/security/aspect/PreAuthorizeAspect.java @@ -1,20 +1,22 @@ package com.tongran.common.security.aspect; -import java.lang.reflect.Method; +import com.tongran.common.security.annotation.RequiresLogin; +import com.tongran.common.security.annotation.RequiresPermissions; +import com.tongran.common.security.annotation.RequiresRoles; +import com.tongran.common.security.auth.AuthUtil; import org.aspectj.lang.ProceedingJoinPoint; import org.aspectj.lang.annotation.Around; import org.aspectj.lang.annotation.Aspect; import org.aspectj.lang.annotation.Pointcut; import org.aspectj.lang.reflect.MethodSignature; +import org.springframework.core.annotation.AnnotationUtils; import org.springframework.stereotype.Component; -import com.tongran.common.security.annotation.RequiresLogin; -import com.tongran.common.security.annotation.RequiresPermissions; -import com.tongran.common.security.annotation.RequiresRoles; -import com.tongran.common.security.auth.AuthUtil; + +import java.lang.reflect.Method; /** * 基于 Spring Aop 的注解鉴权 - * + * * @author kong */ @Aspect @@ -30,10 +32,16 @@ public class PreAuthorizeAspect /** * 定义AOP签名 (切入所有使用鉴权注解的方法) + * 支持：1. 方法上的注解 + * 2. 类上的注解 + * 3. 父类或接口上的注解 */ public static final String POINTCUT_SIGN = " @annotation(com.tongran.common.security.annotation.RequiresLogin) || " + "@annotation(com.tongran.common.security.annotation.RequiresPermissions) || " - + "@annotation(com.tongran.common.security.annotation.RequiresRoles)"; + + "@annotation(com.tongran.common.security.annotation.RequiresRoles) || " + + "@within(com.tongran.common.security.annotation.RequiresLogin) || " + + "@within(com.tongran.common.security.annotation.RequiresPermissions) || " + + "@within(com.tongran.common.security.annotation.RequiresRoles)"; /** * 声明AOP签名 @@ -45,7 +53,7 @@ public class PreAuthorizeAspect /** * 环绕切入 - * + * * @param joinPoint 切面对象 * @return 底层方法执行后的返回值 * @throws Throwable 底层方法抛出的异常 @@ -53,37 +61,207 @@ public class PreAuthorizeAspect @Around("pointcut()") public Object around(ProceedingJoinPoint joinPoint) throws Throwable { - // 注解鉴权 + // 获取方法签名和方法 MethodSignature signature = (MethodSignature) joinPoint.getSignature(); - checkMethodAnnotation(signature.getMethod()); + Method method = signature.getMethod(); + Object target = joinPoint.getTarget(); + Class targetClass = target.getClass(); + + // 注解鉴权：先检查类上的注解，再检查方法上的注解 + checkAnnotation(targetClass, method); + // 执行原有逻辑 return joinPoint.proceed(); } /** - * 对一个Method对象进行注解检查 + * 对类和方法进行注解检查 + * 检查顺序：1. 先检查类上的注解 + * 2. 再检查方法上的注解 */ - public void checkMethodAnnotation(Method method) + public void checkAnnotation(Class targetClass, Method method) { - // 校验 @RequiresLogin 注解 - RequiresLogin requiresLogin = method.getAnnotation(RequiresLogin.class); + // 检查类上的注解（包括继承的注解） + checkClassAnnotation(targetClass); + + // 检查方法上的注解 + checkMethodAnnotation(method); + } + + /** + * 检查类上的安全注解 + * 使用 Spring 的 AnnotationUtils 支持查找父类和接口上的注解 + */ + public void checkClassAnnotation(Class clazz) + { + // 校验类上的 @RequiresLogin 注解 + RequiresLogin requiresLogin = AnnotationUtils.findAnnotation(clazz, RequiresLogin.class); if (requiresLogin != null) { AuthUtil.checkLogin(); } - // 校验 @RequiresRoles 注解 - RequiresRoles requiresRoles = method.getAnnotation(RequiresRoles.class); + // 校验类上的 @RequiresRoles 注解 + RequiresRoles requiresRoles = AnnotationUtils.findAnnotation(clazz, RequiresRoles.class); if (requiresRoles != null) { AuthUtil.checkRole(requiresRoles); } - // 校验 @RequiresPermissions 注解 - RequiresPermissions requiresPermissions = method.getAnnotation(RequiresPermissions.class); + // 校验类上的 @RequiresPermissions 注解 + RequiresPermissions requiresPermissions = AnnotationUtils.findAnnotation(clazz, RequiresPermissions.class); if (requiresPermissions != null) { AuthUtil.checkPermi(requiresPermissions); } } -} + + /** + * 对一个Method对象进行注解检查 + * 使用 Spring 的 AnnotationUtils 支持查找父类和接口上的注解 + */ + public void checkMethodAnnotation(Method method) + { + // 校验方法上的 @RequiresLogin 注解 + RequiresLogin requiresLogin = AnnotationUtils.findAnnotation(method, RequiresLogin.class); + if (requiresLogin != null) + { + AuthUtil.checkLogin(); + } + + // 校验方法上的 @RequiresRoles 注解 + RequiresRoles requiresRoles = AnnotationUtils.findAnnotation(method, RequiresRoles.class); + if (requiresRoles != null) + { + AuthUtil.checkRole(requiresRoles); + } + + // 校验方法上的 @RequiresPermissions 注解 + RequiresPermissions requiresPermissions = AnnotationUtils.findAnnotation(method, RequiresPermissions.class); + if (requiresPermissions != null) + { + AuthUtil.checkPermi(requiresPermissions); + } + } + + /** + * 检查方法是否有指定类型的权限注解 + * 支持从方法、类、父类、接口上查找注解 + * + * @param method 目标方法 + * @return 如果找到注解返回true，否则返回false + */ + private boolean hasPermissionAnnotation(Method method) + { + // 检查是否有@RequiresLogin注解 + if (AnnotationUtils.findAnnotation(method, RequiresLogin.class) != null) + { + return true; + } + + // 检查类上是否有@RequiresLogin注解 + Class declaringClass = method.getDeclaringClass(); + if (AnnotationUtils.findAnnotation(declaringClass, RequiresLogin.class) != null) + { + return true; + } + + // 检查是否有@RequiresPermissions注解 + if (AnnotationUtils.findAnnotation(method, RequiresPermissions.class) != null) + { + return true; + } + + // 检查类上是否有@RequiresPermissions注解 + if (AnnotationUtils.findAnnotation(declaringClass, RequiresPermissions.class) != null) + { + return true; + } + + // 检查是否有@RequiresRoles注解 + if (AnnotationUtils.findAnnotation(method, RequiresRoles.class) != null) + { + return true; + } + + // 检查类上是否有@RequiresRoles注解 + if (AnnotationUtils.findAnnotation(declaringClass, RequiresRoles.class) != null) + { + return true; + } + + return false; + } + + /** + * 获取方法上的@RequiresPermissions注解 + * 支持从方法、类、父类、接口上查找注解 + * + * @param method 目标方法 + * @return 找到的注解，如果没找到返回null + */ + private RequiresPermissions getRequiresPermissionsFromMethod(Method method) + { + return AnnotationUtils.findAnnotation(method, RequiresPermissions.class); + } + + /** + * 获取类上的@RequiresPermissions注解 + * 支持从类、父类、接口上查找注解 + * + * @param clazz 目标类 + * @return 找到的注解，如果没找到返回null + */ + private RequiresPermissions getRequiresPermissionsFromClass(Class clazz) + { + return AnnotationUtils.findAnnotation(clazz, RequiresPermissions.class); + } + + /** + * 获取方法上的@RequiresRoles注解 + * 支持从方法、类、父类、接口上查找注解 + * + * @param method 目标方法 + * @return 找到的注解，如果没找到返回null + */ + private RequiresRoles getRequiresRolesFromMethod(Method method) + { + return AnnotationUtils.findAnnotation(method, RequiresRoles.class); + } + + /** + * 获取类上的@RequiresRoles注解 + * 支持从类、父类、接口上查找注解 + * + * @param clazz 目标类 + * @return 找到的注解，如果没找到返回null + */ + private RequiresRoles getRequiresRolesFromClass(Class clazz) + { + return AnnotationUtils.findAnnotation(clazz, RequiresRoles.class); + } + + /** + * 获取方法上的@RequiresLogin注解 + * 支持从方法、类、父类、接口上查找注解 + * + * @param method 目标方法 + * @return 找到的注解，如果没找到返回null + */ + private RequiresLogin getRequiresLoginFromMethod(Method method) + { + return AnnotationUtils.findAnnotation(method, RequiresLogin.class); + } + + /** + * 获取类上的@RequiresLogin注解 + * 支持从类、父类、接口上查找注解 + * + * @param clazz 目标类 + * @return 找到的注解，如果没找到返回null + */ + private RequiresLogin getRequiresLoginFromClass(Class clazz) + { + return AnnotationUtils.findAnnotation(clazz, RequiresLogin.class); + } +} \ No newline at end of file diff --git a/tongran-modules/tongran-mtragent/src/main/java/com/tongran/mtragent/controller/AllMtrClientController.java b/tongran-modules/tongran-mtragent/src/main/java/com/tongran/mtragent/controller/AllMtrClientController.java index fdb2c72..6601e5a 100644 --- a/tongran-modules/tongran-mtragent/src/main/java/com/tongran/mtragent/controller/AllMtrClientController.java +++ b/tongran-modules/tongran-mtragent/src/main/java/com/tongran/mtragent/controller/AllMtrClientController.java @@ -1,26 +1,19 @@ package com.tongran.mtragent.controller; -import java.util.List; -import java.io.IOException; -import javax.servlet.http.HttpServletResponse; -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; +import com.tongran.common.core.utils.poi.ExcelUtil; +import com.tongran.common.core.web.controller.BaseController; +import com.tongran.common.core.web.domain.AjaxResult; +import com.tongran.common.core.web.page.TableDataInfo; import com.tongran.common.log.annotation.Log; import com.tongran.common.log.enums.BusinessType; import com.tongran.common.security.annotation.RequiresPermissions; import com.tongran.mtragent.domain.AllMtrClient; import com.tongran.mtragent.service.IAllMtrClientService; -import com.tongran.common.core.web.controller.BaseController; -import com.tongran.common.core.web.domain.AjaxResult; -import com.tongran.common.core.utils.poi.ExcelUtil; -import com.tongran.common.core.web.page.TableDataInfo; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; + +import javax.servlet.http.HttpServletResponse; +import java.util.List; /** * mtr探测丢包clinetId记录Controller @@ -30,6 +23,7 @@ import com.tongran.common.core.web.page.TableDataInfo; */ @RestController @RequestMapping("/allMtrClient") +@RequiresPermissions("mtragent:mtrClientRegistration") public class AllMtrClientController extends BaseController { @Autowired @@ -38,7 +32,6 @@ public class AllMtrClientController extends BaseController /** * 查询mtr探测丢包clinetId记录列表 */ - @RequiresPermissions("mtragent:allMtrClient:list") @GetMapping("/list") public TableDataInfo list(AllMtrClient allMtrClient) { @@ -50,7 +43,6 @@ public class AllMtrClientController extends BaseController /** * 导出mtr探测丢包clinetId记录列表 */ - @RequiresPermissions("mtragent:allMtrClient:export") @Log(title = "mtr探测丢包clinetId记录", businessType = BusinessType.EXPORT) @PostMapping("/export") public void export(HttpServletResponse response, AllMtrClient allMtrClient) @@ -63,7 +55,6 @@ public class AllMtrClientController extends BaseController /** * 获取mtr探测丢包clinetId记录详细信息 */ - @RequiresPermissions("mtragent:allMtrClient:query") @GetMapping(value = "/{id}") public AjaxResult getInfo(@PathVariable("id") Long id) { @@ -73,7 +64,6 @@ public class AllMtrClientController extends BaseController /** * 新增mtr探测丢包clinetId记录 */ - @RequiresPermissions("mtragent:allMtrClient:add") @Log(title = "mtr探测丢包clinetId记录", businessType = BusinessType.INSERT) @PostMapping public AjaxResult add(@RequestBody AllMtrClient allMtrClient) @@ -84,7 +74,6 @@ public class AllMtrClientController extends BaseController /** * 修改mtr探测丢包clinetId记录 */ - @RequiresPermissions("mtragent:allMtrClient:edit") @Log(title = "mtr探测丢包clinetId记录", businessType = BusinessType.UPDATE) @PutMapping public AjaxResult edit(@RequestBody AllMtrClient allMtrClient) @@ -95,7 +84,6 @@ public class AllMtrClientController extends BaseController /** * 删除mtr探测丢包clinetId记录 */ - @RequiresPermissions("mtragent:allMtrClient:remove") @Log(title = "mtr探测丢包clinetId记录", businessType = BusinessType.DELETE) @DeleteMapping("/{ids}") public AjaxResult remove(@PathVariable Long[] ids) diff --git a/tongran-modules/tongran-mtragent/src/main/java/com/tongran/mtragent/controller/RmMtrClientRegistrationController.java b/tongran-modules/tongran-mtragent/src/main/java/com/tongran/mtragent/controller/RmMtrClientRegistrationController.java index 0f28ea0..09f629d 100644 --- a/tongran-modules/tongran-mtragent/src/main/java/com/tongran/mtragent/controller/RmMtrClientRegistrationController.java +++ b/tongran-modules/tongran-mtragent/src/main/java/com/tongran/mtragent/controller/RmMtrClientRegistrationController.java @@ -25,6 +25,7 @@ import java.util.List; */ @RestController @RequestMapping("/mtrClientRegistration") +@RequiresPermissions("mtragent:mtrClientRegistration") public class RmMtrClientRegistrationController extends BaseController { @Autowired @@ -33,7 +34,6 @@ public class RmMtrClientRegistrationController extends BaseController /** * 查询MTR客户端注册列表 */ - @RequiresPermissions("mtragent:mtrClientRegistration:list") @PostMapping("/list") public TableDataInfo list(@RequestBody RmMtrClientRegistration rmMtrClientRegistration) { @@ -48,7 +48,6 @@ public class RmMtrClientRegistrationController extends BaseController /** * 导出MTR客户端注册列表 */ - @RequiresPermissions("mtragent:mtrClientRegistration:export") @Log(title = "MTR客户端注册", businessType = BusinessType.EXPORT) @PostMapping("/export") public void export(HttpServletResponse response, @RequestBody RmMtrClientRegistration rmMtrClientRegistration) @@ -62,7 +61,6 @@ public class RmMtrClientRegistrationController extends BaseController /** * 获取MTR客户端注册详细信息 */ - @RequiresPermissions("mtragent:mtrClientRegistration:query") @GetMapping(value = "/{id}") public AjaxResult getInfo(@PathVariable("id") Long id) { @@ -72,7 +70,6 @@ public class RmMtrClientRegistrationController extends BaseController /** * 新增MTR客户端注册 */ - @RequiresPermissions("mtragent:mtrClientRegistration:add") @Log(title = "MTR客户端注册", businessType = BusinessType.INSERT) @PostMapping public AjaxResult add(@RequestBody RmMtrClientRegistration rmMtrClientRegistration) @@ -83,7 +80,6 @@ public class RmMtrClientRegistrationController extends BaseController /** * 修改MTR客户端注册 */ - @RequiresPermissions("mtragent:mtrClientRegistration:edit") @Log(title = "MTR客户端注册", businessType = BusinessType.UPDATE) @PutMapping public AjaxResult edit(@RequestBody RmMtrClientRegistration rmMtrClientRegistration) @@ -96,7 +92,6 @@ public class RmMtrClientRegistrationController extends BaseController * @param rmMtrClientRegistration * @return */ - @RequiresPermissions("mtragent:mtrClientRegistration:add") @PostMapping("/addAgentUpdatePolicy") public AjaxResult addAgentUpdatePolicy(@RequestBody RmMtrClientRegistration rmMtrClientRegistration){ int rows = rmMtrClientRegistrationService.addAgentUpdatePolicy(rmMtrClientRegistration); @@ -106,7 +101,6 @@ public class RmMtrClientRegistrationController extends BaseController /** * 查询所有MTR客户端注册 */ - @RequiresPermissions("mtragent:mtrClientRegistration:list") @PostMapping("/getAllMtrMsg") public AjaxResult getAllMtrMsg(@RequestBody RmMtrClientRegistration rmMtrClientRegistration) { @@ -116,7 +110,6 @@ public class RmMtrClientRegistrationController extends BaseController /** * 查询所有标识 */ - @RequiresPermissions("mtragent:mtrClientRegistration:list") @GetMapping("/getAllLogicalNode") public AjaxResult getAllLogicalNode() { @@ -128,7 +121,6 @@ public class RmMtrClientRegistrationController extends BaseController * @param rmMtrClientRegistration * @return */ - @RequiresPermissions("mtragent:mtrClientRegistration:list") @PostMapping("/getClientIdByMtrClientId") public AjaxResult getClientIdByMtrClientId(@RequestBody RmMtrClientRegistration rmMtrClientRegistration) { diff --git a/tongran-modules/tongran-mtragent/src/main/java/com/tongran/mtragent/controller/RmMtrPolicyConfigController.java b/tongran-modules/tongran-mtragent/src/main/java/com/tongran/mtragent/controller/RmMtrPolicyConfigController.java index 2812802..1b54631 100644 --- a/tongran-modules/tongran-mtragent/src/main/java/com/tongran/mtragent/controller/RmMtrPolicyConfigController.java +++ b/tongran-modules/tongran-mtragent/src/main/java/com/tongran/mtragent/controller/RmMtrPolicyConfigController.java @@ -24,6 +24,7 @@ import java.util.List; */ @RestController @RequestMapping("/mtrPolicyConfig") +@RequiresPermissions("mtragent:mtrPolicyConfig") public class RmMtrPolicyConfigController extends BaseController { @Autowired @@ -32,7 +33,6 @@ public class RmMtrPolicyConfigController extends BaseController /** * 查询mtr探测策略配置列表 */ - @RequiresPermissions("mtragent:mtrPolicyConfig:list") @PostMapping("/list") public TableDataInfo list(@RequestBody RmMtrPolicyConfig rmMtrPolicyConfig) { @@ -47,7 +47,6 @@ public class RmMtrPolicyConfigController extends BaseController /** * 导出mtr探测策略配置列表 */ - @RequiresPermissions("mtragent:mtrPolicyConfig:export") @Log(title = "mtr探测策略配置", businessType = BusinessType.EXPORT) @PostMapping("/export") public void export(HttpServletResponse response, RmMtrPolicyConfig rmMtrPolicyConfig) @@ -61,7 +60,6 @@ public class RmMtrPolicyConfigController extends BaseController /** * 获取mtr探测策略配置详细信息 */ - @RequiresPermissions("mtragent:mtrPolicyConfig:query") @GetMapping(value = "/{id}") public AjaxResult getInfo(@PathVariable("id") Long id) { @@ -71,7 +69,6 @@ public class RmMtrPolicyConfigController extends BaseController /** * 新增mtr探测策略配置 */ - @RequiresPermissions("mtragent:mtrPolicyConfig:add") @Log(title = "mtr探测策略配置", businessType = BusinessType.INSERT) @PostMapping public AjaxResult add(@RequestBody RmMtrPolicyConfig rmMtrPolicyConfig) @@ -83,7 +80,6 @@ public class RmMtrPolicyConfigController extends BaseController /** * 修改mtr探测策略配置 */ - @RequiresPermissions("mtragent:mtrPolicyConfig:edit") @Log(title = "mtr探测策略配置", businessType = BusinessType.UPDATE) @PutMapping public AjaxResult edit(@RequestBody RmMtrPolicyConfig rmMtrPolicyConfig) @@ -94,7 +90,6 @@ public class RmMtrPolicyConfigController extends BaseController /** * 删除mtr探测策略配置 */ - @RequiresPermissions("mtragent:mtrPolicyConfig:remove") @Log(title = "mtr探测策略配置", businessType = BusinessType.DELETE) @DeleteMapping("/{ids}") public AjaxResult remove(@PathVariable Long[] ids) diff --git a/tongran-modules/tongran-mtragent/src/main/java/com/tongran/mtragent/controller/RmMtrProbeResultController.java b/tongran-modules/tongran-mtragent/src/main/java/com/tongran/mtragent/controller/RmMtrProbeResultController.java index 3e3b3a3..21ccf93 100644 --- a/tongran-modules/tongran-mtragent/src/main/java/com/tongran/mtragent/controller/RmMtrProbeResultController.java +++ b/tongran-modules/tongran-mtragent/src/main/java/com/tongran/mtragent/controller/RmMtrProbeResultController.java @@ -24,6 +24,7 @@ import java.util.Map; */ @RestController @RequestMapping("/mtrProbeResult") +@RequiresPermissions("mtragent:mtrClientRegistration") public class RmMtrProbeResultController extends BaseController { @Autowired @@ -32,7 +33,6 @@ public class RmMtrProbeResultController extends BaseController /** * 查询网络mtr探测结果列表 */ - @RequiresPermissions("mtragent:mtrProbeResult:list") @GetMapping("/list") public TableDataInfo list(RmMtrProbeResult rmMtrProbeResult) { @@ -44,7 +44,6 @@ public class RmMtrProbeResultController extends BaseController /** * 导出网络mtr探测结果列表 */ - @RequiresPermissions("mtragent:mtrProbeResult:export") @Log(title = "网络mtr探测结果", businessType = BusinessType.EXPORT) @PostMapping("/export") public void export(HttpServletResponse response, RmMtrProbeResult rmMtrProbeResult) @@ -57,7 +56,6 @@ public class RmMtrProbeResultController extends BaseController /** * 获取网络mtr探测结果详细信息 */ - @RequiresPermissions("mtragent:mtrProbeResult:query") @GetMapping(value = "/{id}") public AjaxResult getInfo(@PathVariable("id") Long id) { @@ -67,7 +65,6 @@ public class RmMtrProbeResultController extends BaseController /** * 新增网络mtr探测结果 */ - @RequiresPermissions("mtragent:mtrProbeResult:add") @Log(title = "网络mtr探测结果", businessType = BusinessType.INSERT) @PostMapping public AjaxResult add(@RequestBody RmMtrProbeResult rmMtrProbeResult) @@ -78,7 +75,6 @@ public class RmMtrProbeResultController extends BaseController /** * 修改网络mtr探测结果 */ - @RequiresPermissions("mtragent:mtrProbeResult:edit") @Log(title = "网络mtr探测结果", businessType = BusinessType.UPDATE) @PutMapping public AjaxResult edit(@RequestBody RmMtrProbeResult rmMtrProbeResult) @@ -89,7 +85,6 @@ public class RmMtrProbeResultController extends BaseController /** * 删除网络mtr探测结果 */ - @RequiresPermissions("mtragent:mtrProbeResult:remove") @Log(title = "网络mtr探测结果", businessType = BusinessType.DELETE) @DeleteMapping("/{ids}") public AjaxResult remove(@PathVariable Long[] ids) @@ -100,7 +95,6 @@ public class RmMtrProbeResultController extends BaseController /** * 查看丢包率趋势 */ - @RequiresPermissions("mtragent:mtrProbeResult:list") @PostMapping("/getLossRateByMtrClientId") public AjaxResult getLossRateByMtrClientId(@RequestBody RmMtrProbeResult rmMtrProbeResult) { diff --git a/tongran-modules/tongran-system/src/main/java/com/tongran/system/controller/AllInterfaceNameController.java b/tongran-modules/tongran-system/src/main/java/com/tongran/system/controller/AllInterfaceNameController.java index c37b33e..64df86b 100644 --- a/tongran-modules/tongran-system/src/main/java/com/tongran/system/controller/AllInterfaceNameController.java +++ b/tongran-modules/tongran-system/src/main/java/com/tongran/system/controller/AllInterfaceNameController.java @@ -3,7 +3,6 @@ package com.tongran.system.controller; import com.tongran.common.core.domain.R; import com.tongran.common.core.web.controller.BaseController; import com.tongran.common.security.annotation.InnerAuth; -import com.tongran.common.security.annotation.RequiresPermissions; import com.tongran.system.domain.AllInterfaceName; import com.tongran.system.service.IAllInterfaceNameService; import org.springframework.beans.factory.annotation.Autowired; @@ -30,7 +29,6 @@ public class AllInterfaceNameController extends BaseController /** * 查询所有接口名称列表 */ - @RequiresPermissions("system:interfaceName:list") @PostMapping("/getAllNames") public List list(@RequestBody AllInterfaceName allInterfaceName) { diff --git a/tongran-modules/tongran-system/src/main/java/com/tongran/system/controller/EpsBusinessController.java b/tongran-modules/tongran-system/src/main/java/com/tongran/system/controller/EpsBusinessController.java index 12681f0..0594c3f 100644 --- a/tongran-modules/tongran-system/src/main/java/com/tongran/system/controller/EpsBusinessController.java +++ b/tongran-modules/tongran-system/src/main/java/com/tongran/system/controller/EpsBusinessController.java @@ -25,6 +25,7 @@ import java.util.Random; */ @RestController @RequestMapping("/business") +@RequiresPermissions("system:business") public class EpsBusinessController extends BaseController { @Autowired @@ -33,7 +34,6 @@ public class EpsBusinessController extends BaseController /** * 查询业务信息列表 */ - @RequiresPermissions("system:business:list") @PostMapping("/list") public TableDataInfo list(@RequestBody EpsBusiness epsBusiness) { @@ -48,7 +48,6 @@ public class EpsBusinessController extends BaseController /** * 查询业务信息列表 */ - @RequiresPermissions("system:business:list") @PostMapping("/getAllBusinessMsg") public AjaxResult getAllBusinessMsg(@RequestBody EpsBusiness epsBusiness) { @@ -59,7 +58,6 @@ public class EpsBusinessController extends BaseController /** * 导出业务信息列表 */ - @RequiresPermissions("system:business:export") @Log(title = "业务信息", businessType = BusinessType.EXPORT) @PostMapping("/export") public void export(HttpServletResponse response, @RequestBody EpsBusiness epsBusiness) @@ -73,7 +71,6 @@ public class EpsBusinessController extends BaseController /** * 获取业务信息详细信息 */ - @RequiresPermissions("system:business:query") @GetMapping(value = "/{id}") public AjaxResult getInfo(@PathVariable("id") String id) { @@ -83,7 +80,6 @@ public class EpsBusinessController extends BaseController /** * 新增业务信息 */ - @RequiresPermissions("system:business:add") @Log(title = "业务信息", businessType = BusinessType.INSERT) @PostMapping public AjaxResult add(@RequestBody EpsBusiness epsBusiness) @@ -98,7 +94,6 @@ public class EpsBusinessController extends BaseController /** * 修改业务信息 */ - @RequiresPermissions("system:business:edit") @Log(title = "业务信息", businessType = BusinessType.UPDATE) @PutMapping public AjaxResult edit(@RequestBody EpsBusiness epsBusiness) @@ -114,7 +109,6 @@ public class EpsBusinessController extends BaseController /** * 生成12位唯一标识 */ - @RequiresPermissions("system:business:list") @GetMapping("/getBusinessCode") public String getBusinessCode() { @@ -127,7 +121,6 @@ public class EpsBusinessController extends BaseController * @param epsBusiness * @return */ - @RequiresPermissions("system:business:list") @PostMapping("/countByBusinessName") public AjaxResult countByBusinessName(@RequestBody EpsBusiness epsBusiness) { diff --git a/tongran-modules/tongran-system/src/main/java/com/tongran/system/controller/EpsBusinessDeployController.java b/tongran-modules/tongran-system/src/main/java/com/tongran/system/controller/EpsBusinessDeployController.java index 09198d4..b63bbe6 100644 --- a/tongran-modules/tongran-system/src/main/java/com/tongran/system/controller/EpsBusinessDeployController.java +++ b/tongran-modules/tongran-system/src/main/java/com/tongran/system/controller/EpsBusinessDeployController.java @@ -24,6 +24,7 @@ import java.util.List; */ @RestController @RequestMapping("/businessDeploy") +@RequiresPermissions("system:businessDeploy") public class EpsBusinessDeployController extends BaseController { @Autowired @@ -32,7 +33,6 @@ public class EpsBusinessDeployController extends BaseController /** * 查询业务下发管理列表 */ - @RequiresPermissions("system:businessDeploy:list") @PostMapping("/list") public TableDataInfo list(@RequestBody EpsBusinessDeploy epsBusinessDeploy) { @@ -62,7 +62,6 @@ public class EpsBusinessDeployController extends BaseController /** * 获取业务下发管理详细信息 */ - @RequiresPermissions("system:businessDeploy:query") @GetMapping(value = "/{id}") public AjaxResult getInfo(@PathVariable("id") Long id) { @@ -72,7 +71,6 @@ public class EpsBusinessDeployController extends BaseController /** * 新增业务下发管理 */ - @RequiresPermissions("system:businessDeploy:add") @Log(title = "业务下发管理", businessType = BusinessType.INSERT) @PostMapping public AjaxResult add(@RequestBody EpsBusinessDeploy epsBusinessDeploy) @@ -83,7 +81,6 @@ public class EpsBusinessDeployController extends BaseController /** * 修改业务下发管理 */ - @RequiresPermissions("system:businessDeploy:edit") @Log(title = "业务下发管理", businessType = BusinessType.UPDATE) @PutMapping public AjaxResult edit(@RequestBody EpsBusinessDeploy epsBusinessDeploy) @@ -94,7 +91,6 @@ public class EpsBusinessDeployController extends BaseController /** * 删除业务下发管理 */ - @RequiresPermissions("system:businessDeploy:remove") @Log(title = "业务下发管理", businessType = BusinessType.DELETE) @DeleteMapping("/{ids}") public AjaxResult remove(@PathVariable Long[] ids) @@ -107,7 +103,6 @@ public class EpsBusinessDeployController extends BaseController * @param epsBusinessDeploy * @return */ - @RequiresPermissions("system:businessDeploy:review") @PostMapping("/reviewBusiness") public AjaxResult reviewBusiness(@RequestBody EpsBusinessDeploy epsBusinessDeploy){ return toAjax(epsBusinessDeployService.reviewBusiness(epsBusinessDeploy)); diff --git a/tongran-modules/tongran-system/src/main/java/com/tongran/system/controller/EpsBusinessScriptController.java b/tongran-modules/tongran-system/src/main/java/com/tongran/system/controller/EpsBusinessScriptController.java index 6bbf744..18c4c44 100644 --- a/tongran-modules/tongran-system/src/main/java/com/tongran/system/controller/EpsBusinessScriptController.java +++ b/tongran-modules/tongran-system/src/main/java/com/tongran/system/controller/EpsBusinessScriptController.java @@ -24,6 +24,7 @@ import java.util.List; */ @RestController @RequestMapping("/businessScript") +@RequiresPermissions("system:businessScript") public class EpsBusinessScriptController extends BaseController { @Autowired @@ -32,7 +33,6 @@ public class EpsBusinessScriptController extends BaseController /** * 查询业务脚本管理列表 */ - @RequiresPermissions("system:businessScript:list") @PostMapping("/list") public TableDataInfo list(@RequestBody EpsBusinessScript epsBusinessScript) { @@ -48,7 +48,6 @@ public class EpsBusinessScriptController extends BaseController /** * 获取业务脚本管理详细信息 */ - @RequiresPermissions("system:businessScript:query") @GetMapping(value = "/{id}") public AjaxResult getInfo(@PathVariable("id") Long id) { @@ -66,7 +65,6 @@ public class EpsBusinessScriptController extends BaseController /** * 新增业务脚本管理 */ - @RequiresPermissions("system:businessScript:add") @Log(title = "业务脚本管理", businessType = BusinessType.INSERT) @PostMapping public AjaxResult add(@RequestBody EpsBusinessScript epsBusinessScript) @@ -77,7 +75,6 @@ public class EpsBusinessScriptController extends BaseController /** * 修改业务脚本管理 */ - @RequiresPermissions("system:businessScript:edit") @Log(title = "业务脚本管理", businessType = BusinessType.UPDATE) @PutMapping public AjaxResult edit(@RequestBody EpsBusinessScript epsBusinessScript) @@ -88,7 +85,6 @@ public class EpsBusinessScriptController extends BaseController /** * 删除业务脚本管理 */ - @RequiresPermissions("system:businessScript:remove") @Log(title = "业务脚本管理", businessType = BusinessType.DELETE) @DeleteMapping("/{ids}") public AjaxResult remove(@PathVariable Long[] ids) @@ -100,7 +96,6 @@ public class EpsBusinessScriptController extends BaseController * 获取所有业务脚本名称 * @return */ - @RequiresPermissions("system:businessScript:list") @GetMapping("/getAllScriptName") public AjaxResult getAllScriptName(){ List list = epsBusinessScriptService.selectEpsBusinessScriptList(new EpsBusinessScript()); diff --git a/tongran-modules/tongran-system/src/main/java/com/tongran/system/controller/EpsInitialTrafficDataController.java b/tongran-modules/tongran-system/src/main/java/com/tongran/system/controller/EpsInitialTrafficDataController.java index 38509d0..1d22c0b 100644 --- a/tongran-modules/tongran-system/src/main/java/com/tongran/system/controller/EpsInitialTrafficDataController.java +++ b/tongran-modules/tongran-system/src/main/java/com/tongran/system/controller/EpsInitialTrafficDataController.java @@ -23,6 +23,7 @@ import static com.tongran.common.core.web.domain.AjaxResult.success; @RestController @RequestMapping("/epsTrafficData") @RequiredArgsConstructor +@RequiresPermissions("rocketmq:traffic") public class EpsInitialTrafficDataController { private final EpsInitialTrafficDataService epsInitialTrafficDataService; @@ -63,7 +64,6 @@ public class EpsInitialTrafficDataController { * 图形分析 - 95值/日 * @return */ - @RequiresPermissions("system:bandwidth:list") @PostMapping("/getServerGraphicalAnalysisDaily") public AjaxResult getServerGraphicalAnalysisDaily(@RequestBody EpsInitialTrafficData queryParam){ List> echartsData = epsInitialTrafficDataService.getServerGraphicalAnalysisDaily(queryParam); @@ -73,7 +73,6 @@ public class EpsInitialTrafficDataController { * 图形分析 - 95值/日 * @return */ - @RequiresPermissions("system:bandwidth:list") @PostMapping("/getServerGraphicalAnalysisMonthy") public AjaxResult getServerGraphicalAnalysisMonthy(@RequestBody EpsInitialTrafficData queryParam){ List> echartsData = epsInitialTrafficDataService.getServerGraphicalAnalysisMonthy(queryParam); @@ -82,7 +81,6 @@ public class EpsInitialTrafficDataController { /** * 监控看板-详情视图 出入流量 */ -// @RequiresPermissions("system:bandwidth:list") // @PostMapping("/getServerTrafficByMonitorView") // public AjaxResult getServerTrafficByMonitorView(@RequestBody EpsInitialTrafficData queryParam) // { diff --git a/tongran-modules/tongran-system/src/main/java/com/tongran/system/controller/EpsMethodChangeRecordController.java b/tongran-modules/tongran-system/src/main/java/com/tongran/system/controller/EpsMethodChangeRecordController.java index bd28281..ac58a2a 100644 --- a/tongran-modules/tongran-system/src/main/java/com/tongran/system/controller/EpsMethodChangeRecordController.java +++ b/tongran-modules/tongran-system/src/main/java/com/tongran/system/controller/EpsMethodChangeRecordController.java @@ -26,6 +26,7 @@ import java.util.List; */ @RestController @RequestMapping("/record") +@RequiresPermissions("system:record") public class EpsMethodChangeRecordController extends BaseController { @Autowired @@ -34,7 +35,6 @@ public class EpsMethodChangeRecordController extends BaseController /** * 查询收益方式修改记录列表 */ - @RequiresPermissions("system:record:list") @PostMapping("/list") public TableDataInfo list(@RequestBody EpsMethodChangeRecord epsMethodChangeRecord) { @@ -49,7 +49,6 @@ public class EpsMethodChangeRecordController extends BaseController /** * 导出收益方式修改记录列表 */ - @RequiresPermissions("system:record:export") @Log(title = "收益方式修改记录", businessType = BusinessType.EXPORT) @PostMapping("/export") public void export(HttpServletResponse response, @RequestBody EpsMethodChangeRecord epsMethodChangeRecord) diff --git a/tongran-modules/tongran-system/src/main/java/com/tongran/system/controller/EpsNodeBandwidthController.java b/tongran-modules/tongran-system/src/main/java/com/tongran/system/controller/EpsNodeBandwidthController.java index 37de1df..5db9439 100644 --- a/tongran-modules/tongran-system/src/main/java/com/tongran/system/controller/EpsNodeBandwidthController.java +++ b/tongran-modules/tongran-system/src/main/java/com/tongran/system/controller/EpsNodeBandwidthController.java @@ -42,6 +42,7 @@ import java.util.Map; */ @RestController @RequestMapping("/bandwidth") +@RequiresPermissions("system:bandwidth") @Slf4j public class EpsNodeBandwidthController extends BaseController { @@ -58,7 +59,6 @@ public class EpsNodeBandwidthController extends BaseController /** * 查询节点带宽信息列表 */ - @RequiresPermissions("system:bandwidth:list") @PostMapping("/list") public TableDataInfo list(@RequestBody EpsNodeBandwidth epsNodeBandwidth) { @@ -85,7 +85,6 @@ public class EpsNodeBandwidthController extends BaseController /** * 导出节点带宽信息列表 */ - @RequiresPermissions("system:bandwidth:export") @Log(title = "节点带宽信息", businessType = BusinessType.EXPORT) @PostMapping("/export") public void export(HttpServletResponse response, @RequestBody EpsNodeBandwidth epsNodeBandwidth) @@ -99,7 +98,6 @@ public class EpsNodeBandwidthController extends BaseController /** * 获取节点带宽信息详细信息 */ - @RequiresPermissions("system:bandwidth:query") @GetMapping(value = "/{id}") public AjaxResult getInfo(@PathVariable("id") Long id) { @@ -109,7 +107,6 @@ public class EpsNodeBandwidthController extends BaseController /** * 新增节点带宽信息 */ - @RequiresPermissions("system:bandwidth:add") @Log(title = "节点带宽信息", businessType = BusinessType.INSERT) @PostMapping public AjaxResult add(@RequestBody EpsNodeBandwidth epsNodeBandwidth) @@ -120,7 +117,6 @@ public class EpsNodeBandwidthController extends BaseController /** * 修改节点带宽信息 */ - @RequiresPermissions("system:bandwidth:edit") @Log(title = "节点带宽信息", businessType = BusinessType.UPDATE) @PutMapping public AjaxResult edit(@RequestBody EpsNodeBandwidth epsNodeBandwidth) @@ -130,7 +126,6 @@ public class EpsNodeBandwidthController extends BaseController /** * 重新计算 */ - @RequiresPermissions("system:bandwidth:query") @GetMapping(value = "recalculate/{id}") public AjaxResult recalculate(@PathVariable("id") Long id) { @@ -161,7 +156,6 @@ public class EpsNodeBandwidthController extends BaseController * @param id 资源ID * @return 表格数据信息 */ - @RequiresPermissions("system:bandwidth:query") @GetMapping(value = "relatedData/traffic") public TableDataInfo relatedData(Long id,Integer pageNum,Integer pageSize) { // 1. 参数校验 @@ -221,7 +215,6 @@ public class EpsNodeBandwidthController extends BaseController /** * 生成月均日95值 */ - @RequiresPermissions("system:bandwidth:add") @Log(title = "节点带宽信息", businessType = BusinessType.INSERT) @PostMapping("/calculateAvg") public AjaxResult calculateAvg(@RequestBody EpsNodeBandwidth epsNodeBandwidth) @@ -232,7 +225,6 @@ public class EpsNodeBandwidthController extends BaseController /** * 图形分析-95带宽值mbps/日 */ - @RequiresPermissions("system:bandwidth:list") @PostMapping("/graphicalAnalysisDaily") public AjaxResult graphicalAnalysisDaily(@RequestBody EpsNodeBandwidth epsNodeBandwidth) { @@ -244,7 +236,6 @@ public class EpsNodeBandwidthController extends BaseController /** * 图形分析-95带宽值mbps/月 */ - @RequiresPermissions("system:bandwidth:list") @PostMapping("/graphicalAnalysisMonthly") public AjaxResult graphicalAnalysisMonthly(@RequestBody EpsNodeBandwidth epsNodeBandwidth) { @@ -256,7 +247,6 @@ public class EpsNodeBandwidthController extends BaseController /** * 图形分析-包端带宽值Mbps/日 */ - @RequiresPermissions("system:bandwidth:list") @PostMapping("/graphicalAnalysisPackage") public AjaxResult graphicalAnalysisPackage(@RequestBody EpsNodeBandwidth epsNodeBandwidth) { @@ -268,7 +258,6 @@ public class EpsNodeBandwidthController extends BaseController /** * 图形分析-月均日95值 */ - @RequiresPermissions("system:bandwidth:list") @PostMapping("/graphicalAnalysisAvgMonthly") public AjaxResult graphicalAnalysisAvgMonthly(@RequestBody EpsNodeBandwidth epsNodeBandwidth) { @@ -280,7 +269,6 @@ public class EpsNodeBandwidthController extends BaseController /** * 图形分析-有效-95带宽值Mbps/日 */ - @RequiresPermissions("system:bandwidth:list") @PostMapping("/graphicalAnalysisEffectiveDaily") public AjaxResult graphicalAnalysisEffectiveDaily(@RequestBody EpsNodeBandwidth epsNodeBandwidth) { @@ -292,7 +280,6 @@ public class EpsNodeBandwidthController extends BaseController /** * 图形分析-有效-95带宽值Mbps/月 */ - @RequiresPermissions("system:bandwidth:list") @PostMapping("/graphicalAnalysisEffectiveMonthly") public AjaxResult graphicalAnalysisEffectiveMonthly(@RequestBody EpsNodeBandwidth epsNodeBandwidth) { @@ -304,7 +291,6 @@ public class EpsNodeBandwidthController extends BaseController /** * 图形分析-有效-月均日95值 */ - @RequiresPermissions("system:bandwidth:list") @PostMapping("/graphicalAnalysisEffectiveAvgMonthly") public AjaxResult graphicalAnalysisEffectiveAvgMonthly(@RequestBody EpsNodeBandwidth epsNodeBandwidth) { @@ -330,7 +316,6 @@ public class EpsNodeBandwidthController extends BaseController * @param epsNodeBandwidth * @return */ - @RequiresPermissions("system:bandwidth:list") @PostMapping("/getListByMonitorView") public TableDataInfo getListByMonitorView(@RequestBody EpsNodeBandwidth epsNodeBandwidth) { diff --git a/tongran-modules/tongran-system/src/main/java/com/tongran/system/controller/EpsServerRevenueConfigController.java b/tongran-modules/tongran-system/src/main/java/com/tongran/system/controller/EpsServerRevenueConfigController.java index 4c7b8fe..7ff05ab 100644 --- a/tongran-modules/tongran-system/src/main/java/com/tongran/system/controller/EpsServerRevenueConfigController.java +++ b/tongran-modules/tongran-system/src/main/java/com/tongran/system/controller/EpsServerRevenueConfigController.java @@ -8,6 +8,7 @@ import com.tongran.common.core.web.page.PageDomain; import com.tongran.common.core.web.page.TableDataInfo; import com.tongran.common.log.annotation.Log; import com.tongran.common.log.enums.BusinessType; +import com.tongran.common.security.annotation.InnerAuth; import com.tongran.common.security.annotation.RequiresPermissions; import com.tongran.system.domain.EpsServerRevenueConfig; import com.tongran.system.service.IEpsServerRevenueConfigService; @@ -25,6 +26,7 @@ import java.util.List; */ @RestController @RequestMapping("/revenueConfig") +@RequiresPermissions("system:revenueConfig") public class EpsServerRevenueConfigController extends BaseController { @Autowired @@ -33,7 +35,6 @@ public class EpsServerRevenueConfigController extends BaseController /** * 查询服务器收益方式配置列表 */ - @RequiresPermissions("system:config:list") @PostMapping("/list") public TableDataInfo list(@RequestBody EpsServerRevenueConfig epsServerRevenueConfig) { @@ -48,7 +49,6 @@ public class EpsServerRevenueConfigController extends BaseController /** * 导出服务器收益方式配置列表 */ - @RequiresPermissions("system:config:export") @Log(title = "服务器收益方式配置", businessType = BusinessType.EXPORT) @PostMapping("/export") public void export(HttpServletResponse response, @RequestBody EpsServerRevenueConfig epsServerRevenueConfig) @@ -63,7 +63,6 @@ public class EpsServerRevenueConfigController extends BaseController /** * 修改服务器收益方式配置 */ - @RequiresPermissions("system:config:edit") @Log(title = "服务器收益方式配置", businessType = BusinessType.UPDATE) @PutMapping public AjaxResult edit(@RequestBody EpsServerRevenueConfig epsServerRevenueConfig) @@ -74,7 +73,7 @@ public class EpsServerRevenueConfigController extends BaseController /** * 流量相关数据入库 */ -// @InnerAuth + @InnerAuth @PostMapping("/autoSaveServiceTrafficData") public R autoSaveServiceTrafficData(@RequestBody EpsServerRevenueConfig epsServerRevenueConfig) { diff --git a/tongran-modules/tongran-system/src/main/java/com/tongran/system/controller/EpsTaskStatisticsController.java b/tongran-modules/tongran-system/src/main/java/com/tongran/system/controller/EpsTaskStatisticsController.java index 1c2b54a..b7ba51d 100644 --- a/tongran-modules/tongran-system/src/main/java/com/tongran/system/controller/EpsTaskStatisticsController.java +++ b/tongran-modules/tongran-system/src/main/java/com/tongran/system/controller/EpsTaskStatisticsController.java @@ -26,6 +26,7 @@ import java.util.Map; */ @RestController @RequestMapping("/taskStatistics") +@RequiresPermissions("system:taskStatistics") public class EpsTaskStatisticsController extends BaseController { @Autowired @@ -34,7 +35,6 @@ public class EpsTaskStatisticsController extends BaseController /** * 查询业务95值计算任务列表 */ - @RequiresPermissions("system:taskStatistics:list") @PostMapping("/list") public TableDataInfo list(@RequestBody EpsTaskStatistics epsTaskStatistics) { @@ -49,7 +49,6 @@ public class EpsTaskStatisticsController extends BaseController /** * 导出业务95值计算任务列表 */ - @RequiresPermissions("system:taskStatistics:export") @Log(title = "业务95值计算任务", businessType = BusinessType.EXPORT) @PostMapping("/export") public void export(HttpServletResponse response, @RequestBody EpsTaskStatistics epsTaskStatistics) @@ -63,7 +62,6 @@ public class EpsTaskStatisticsController extends BaseController /** * 获取业务95值计算任务详细信息 */ - @RequiresPermissions("system:taskStatistics:query") @GetMapping(value = "/{id}") public AjaxResult getInfo(@PathVariable("id") Long id) { @@ -73,7 +71,6 @@ public class EpsTaskStatisticsController extends BaseController /** * 新增业务95值计算任务 */ - @RequiresPermissions("system:taskStatistics:add") @Log(title = "业务95值计算任务", businessType = BusinessType.INSERT) @PostMapping public AjaxResult add(@RequestBody EpsTaskStatistics epsTaskStatistics) @@ -84,7 +81,6 @@ public class EpsTaskStatisticsController extends BaseController /** * 修改业务95值计算任务 */ - @RequiresPermissions("system:taskStatistics:edit") @Log(title = "业务95值计算任务", businessType = BusinessType.UPDATE) @PutMapping public AjaxResult edit(@RequestBody EpsTaskStatistics epsTaskStatistics) @@ -95,7 +91,6 @@ public class EpsTaskStatisticsController extends BaseController /** * 删除业务95值计算任务 */ - @RequiresPermissions("system:taskStatistics:remove") @Log(title = "业务95值计算任务", businessType = BusinessType.DELETE) @DeleteMapping("/{ids}") public AjaxResult remove(@PathVariable Long[] ids) @@ -105,7 +100,6 @@ public class EpsTaskStatisticsController extends BaseController /** * 相关数据查询 */ - @RequiresPermissions("system:taskStatistics:list") @PostMapping("/getRelateData") public TableDataInfo getRelateData(@RequestBody EpsTaskStatistics epsTaskStatistics) { @@ -117,7 +111,6 @@ public class EpsTaskStatisticsController extends BaseController * @param epsTaskStatistics * @return */ - @RequiresPermissions("system:taskStatistics:edit") @PostMapping("/updateRelateData") public AjaxResult updateRelateData(@RequestBody EpsTaskStatistics epsTaskStatistics) { @@ -127,7 +120,6 @@ public class EpsTaskStatisticsController extends BaseController /** * 重新计算 */ - @RequiresPermissions("system:taskStatistics:list") @PostMapping("/recaculate") public AjaxResult recaculate(@RequestBody EpsTaskStatistics epsTaskStatistics) { @@ -137,7 +129,6 @@ public class EpsTaskStatisticsController extends BaseController /** * 图形查看 */ - @RequiresPermissions("system:taskStatistics:list") @PostMapping("/getRraphicalMsg") public AjaxResult getRraphicalMsg(@RequestBody EpsTaskStatistics epsTaskStatistics) { @@ -150,7 +141,6 @@ public class EpsTaskStatisticsController extends BaseController * @param epsTaskStatistics * @return */ - @RequiresPermissions("system:taskStatistics:list") @PostMapping("/getAvgTimeList") public AjaxResult getAvgTimeList(@RequestBody EpsTaskStatistics epsTaskStatistics) { diff --git a/tongran-modules/tongran-system/src/main/java/com/tongran/system/controller/EpsTrafficDataController.java b/tongran-modules/tongran-system/src/main/java/com/tongran/system/controller/EpsTrafficDataController.java index d73a9e7..8a6e75b 100644 --- a/tongran-modules/tongran-system/src/main/java/com/tongran/system/controller/EpsTrafficDataController.java +++ b/tongran-modules/tongran-system/src/main/java/com/tongran/system/controller/EpsTrafficDataController.java @@ -1,26 +1,19 @@ package com.tongran.system.controller; -import java.util.List; -import java.io.IOException; -import javax.servlet.http.HttpServletResponse; -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; +import com.tongran.common.core.utils.poi.ExcelUtil; +import com.tongran.common.core.web.controller.BaseController; +import com.tongran.common.core.web.domain.AjaxResult; +import com.tongran.common.core.web.page.TableDataInfo; import com.tongran.common.log.annotation.Log; import com.tongran.common.log.enums.BusinessType; import com.tongran.common.security.annotation.RequiresPermissions; import com.tongran.system.domain.EpsTrafficData; import com.tongran.system.service.IEpsTrafficDataService; -import com.tongran.common.core.web.controller.BaseController; -import com.tongran.common.core.web.domain.AjaxResult; -import com.tongran.common.core.utils.poi.ExcelUtil; -import com.tongran.common.core.web.page.TableDataInfo; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; + +import javax.servlet.http.HttpServletResponse; +import java.util.List; /** * 流量相关数据Controller @@ -30,6 +23,7 @@ import com.tongran.common.core.web.page.TableDataInfo; */ @RestController @RequestMapping("/data") +@RequiresPermissions("system:data") public class EpsTrafficDataController extends BaseController { @Autowired @@ -38,7 +32,6 @@ public class EpsTrafficDataController extends BaseController /** * 查询流量相关数据列表 */ - @RequiresPermissions("system:data:list") @GetMapping("/list") public TableDataInfo list(EpsTrafficData epsTrafficData) { @@ -50,7 +43,6 @@ public class EpsTrafficDataController extends BaseController /** * 导出流量相关数据列表 */ - @RequiresPermissions("system:data:export") @Log(title = "流量相关数据", businessType = BusinessType.EXPORT) @PostMapping("/export") public void export(HttpServletResponse response, EpsTrafficData epsTrafficData) @@ -63,7 +55,6 @@ public class EpsTrafficDataController extends BaseController /** * 获取流量相关数据详细信息 */ - @RequiresPermissions("system:data:query") @GetMapping(value = "/{id}") public AjaxResult getInfo(@PathVariable("id") Long id) { @@ -73,7 +64,6 @@ public class EpsTrafficDataController extends BaseController /** * 新增流量相关数据 */ - @RequiresPermissions("system:data:add") @Log(title = "流量相关数据", businessType = BusinessType.INSERT) @PostMapping public AjaxResult add(@RequestBody EpsTrafficData epsTrafficData) @@ -84,7 +74,6 @@ public class EpsTrafficDataController extends BaseController /** * 修改流量相关数据 */ - @RequiresPermissions("system:data:edit") @Log(title = "流量相关数据", businessType = BusinessType.UPDATE) @PutMapping public AjaxResult edit(@RequestBody EpsTrafficData epsTrafficData) @@ -95,7 +84,6 @@ public class EpsTrafficDataController extends BaseController /** * 删除流量相关数据 */ - @RequiresPermissions("system:data:remove") @Log(title = "流量相关数据", businessType = BusinessType.DELETE) @DeleteMapping("/{ids}") public AjaxResult remove(@PathVariable Long[] ids) diff --git a/tongran-modules/tongran-system/src/main/java/com/tongran/system/controller/InitialSwitchInfoDetailsController.java b/tongran-modules/tongran-system/src/main/java/com/tongran/system/controller/InitialSwitchInfoDetailsController.java index 8b3210a..e1128c2 100644 --- a/tongran-modules/tongran-system/src/main/java/com/tongran/system/controller/InitialSwitchInfoDetailsController.java +++ b/tongran-modules/tongran-system/src/main/java/com/tongran/system/controller/InitialSwitchInfoDetailsController.java @@ -27,6 +27,7 @@ import java.util.Map; */ @RestController @RequestMapping("/switchInfoDetails") +@RequiresPermissions("rocketmq:switchInfo") public class InitialSwitchInfoDetailsController extends BaseController { @Autowired @@ -34,7 +35,6 @@ public class InitialSwitchInfoDetailsController extends BaseController /** * 查询交换机监控信息列表 */ - @RequiresPermissions("system:switchInfoDetails:list") @GetMapping("/list") public TableDataInfo list(InitialSwitchInfoDetails initialSwitchInfoDetails) { @@ -46,7 +46,6 @@ public class InitialSwitchInfoDetailsController extends BaseController /** * 导出交换机监控信息列表 */ - @RequiresPermissions("system:switchInfoDetails:export") @Log(title = "交换机监控信息", businessType = BusinessType.EXPORT) @PostMapping("/export") public void export(HttpServletResponse response, InitialSwitchInfoDetails initialSwitchInfoDetails) @@ -59,7 +58,6 @@ public class InitialSwitchInfoDetailsController extends BaseController /** * 获取交换机监控信息详细信息 */ - @RequiresPermissions("system:switchInfoDetails:query") @GetMapping(value = "/{id}") public AjaxResult getInfo(@PathVariable("id") Long id) { @@ -69,7 +67,6 @@ public class InitialSwitchInfoDetailsController extends BaseController /** * 新增交换机监控信息 */ - @RequiresPermissions("system:switchInfoDetails:add") @Log(title = "交换机监控信息", businessType = BusinessType.INSERT) @PostMapping public AjaxResult add(@RequestBody InitialSwitchInfoDetails initialSwitchInfoDetails) @@ -80,7 +77,6 @@ public class InitialSwitchInfoDetailsController extends BaseController /** * 修改交换机监控信息 */ - @RequiresPermissions("system:switchInfoDetails:edit") @Log(title = "交换机监控信息", businessType = BusinessType.UPDATE) @PutMapping public AjaxResult edit(@RequestBody InitialSwitchInfoDetails initialSwitchInfoDetails) @@ -91,7 +87,6 @@ public class InitialSwitchInfoDetailsController extends BaseController /** * 删除交换机监控信息 */ - @RequiresPermissions("system:switchInfoDetails:remove") @Log(title = "交换机监控信息", businessType = BusinessType.DELETE) @DeleteMapping("/{ids}") public AjaxResult remove(@PathVariable Long[] ids) @@ -110,7 +105,6 @@ public class InitialSwitchInfoDetailsController extends BaseController /** * 图形分析-95带宽值mbps/日 v1.1 */ - @RequiresPermissions("system:bandwidth:list") @PostMapping("/getGraphicalAnalysisDaily") public AjaxResult getGraphicalAnalysisDaily(@RequestBody InitialSwitchInfoDetails initialSwitchInfoDetails) { @@ -120,7 +114,6 @@ public class InitialSwitchInfoDetailsController extends BaseController /** * 图形分析-95带宽值mbps/月 v1.1 */ - @RequiresPermissions("system:bandwidth:list") @PostMapping("/getGraphicalAnalysisMonthy") public AjaxResult getGraphicalAnalysisMonthy(@RequestBody InitialSwitchInfoDetails initialSwitchInfoDetails) { @@ -131,7 +124,6 @@ public class InitialSwitchInfoDetailsController extends BaseController /** * 监控看板-详情视图 出入流量 */ -// @RequiresPermissions("system:bandwidth:list") // @PostMapping("/getSwitchTrafficByMonitorView") // public AjaxResult getSwitchTrafficByMonitorView(@RequestBody InitialSwitchInfoDetails initialSwitchInfoDetails) // { @@ -141,7 +133,6 @@ public class InitialSwitchInfoDetailsController extends BaseController /** * 监控看板-详情视图 出入流量列表 */ - @RequiresPermissions("system:bandwidth:list") @PostMapping("/geSwitchListByMonitorView") public TableDataInfo geSwitchListByMonitorView(@RequestBody InitialSwitchInfoDetails initialSwitchInfoDetails) { diff --git a/tongran-modules/tongran-system/src/main/java/com/tongran/system/controller/KnowledgeBaseController.java b/tongran-modules/tongran-system/src/main/java/com/tongran/system/controller/KnowledgeBaseController.java index c2c744c..7f19d00 100644 --- a/tongran-modules/tongran-system/src/main/java/com/tongran/system/controller/KnowledgeBaseController.java +++ b/tongran-modules/tongran-system/src/main/java/com/tongran/system/controller/KnowledgeBaseController.java @@ -24,6 +24,7 @@ import java.util.List; */ @RestController @RequestMapping("/knowledgebase") +@RequiresPermissions("system:knowledgebase") public class KnowledgeBaseController extends BaseController { @Autowired @@ -32,7 +33,6 @@ public class KnowledgeBaseController extends BaseController /** * 查询知识库列表 */ - @RequiresPermissions("system:knowledgebase:list") @PostMapping("/list") public TableDataInfo list(@RequestBody KnowledgeBase knowledgeBase) { @@ -47,7 +47,6 @@ public class KnowledgeBaseController extends BaseController /** * 导出知识库列表 */ - @RequiresPermissions("system:knowledgebase:export") @Log(title = "知识库", businessType = BusinessType.EXPORT) @PostMapping("/export") public void export(HttpServletResponse response, KnowledgeBase knowledgeBase) @@ -61,7 +60,6 @@ public class KnowledgeBaseController extends BaseController /** * 获取知识库详细信息 */ - @RequiresPermissions("system:knowledgebase:query") @GetMapping(value = "/{id}") public AjaxResult getInfo(@PathVariable("id") Long id) { @@ -71,7 +69,6 @@ public class KnowledgeBaseController extends BaseController /** * 新增知识库 */ - @RequiresPermissions("system:knowledgebase:add") @Log(title = "知识库", businessType = BusinessType.INSERT) @PostMapping public AjaxResult add(@RequestBody KnowledgeBase knowledgeBase) @@ -82,7 +79,6 @@ public class KnowledgeBaseController extends BaseController /** * 修改知识库 */ - @RequiresPermissions("system:knowledgebase:edit") @Log(title = "知识库", businessType = BusinessType.UPDATE) @PutMapping public AjaxResult edit(@RequestBody KnowledgeBase knowledgeBase) @@ -93,7 +89,6 @@ public class KnowledgeBaseController extends BaseController /** * 删除知识库 */ - @RequiresPermissions("system:knowledgebase:remove") @Log(title = "知识库", businessType = BusinessType.DELETE) @DeleteMapping("/{ids}") public AjaxResult remove(@PathVariable Long[] ids) diff --git a/tongran-modules/tongran-system/src/main/java/com/tongran/system/controller/MtmMonitoringTemplateController.java b/tongran-modules/tongran-system/src/main/java/com/tongran/system/controller/MtmMonitoringTemplateController.java index aa88d79..64c8e0c 100644 --- a/tongran-modules/tongran-system/src/main/java/com/tongran/system/controller/MtmMonitoringTemplateController.java +++ b/tongran-modules/tongran-system/src/main/java/com/tongran/system/controller/MtmMonitoringTemplateController.java @@ -1,26 +1,19 @@ package com.tongran.system.controller; -import java.util.List; -import java.io.IOException; -import javax.servlet.http.HttpServletResponse; -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; +import com.tongran.common.core.utils.poi.ExcelUtil; +import com.tongran.common.core.web.controller.BaseController; +import com.tongran.common.core.web.domain.AjaxResult; +import com.tongran.common.core.web.page.TableDataInfo; import com.tongran.common.log.annotation.Log; import com.tongran.common.log.enums.BusinessType; import com.tongran.common.security.annotation.RequiresPermissions; import com.tongran.system.domain.MtmMonitoringTemplate; import com.tongran.system.service.IMtmMonitoringTemplateService; -import com.tongran.common.core.web.controller.BaseController; -import com.tongran.common.core.web.domain.AjaxResult; -import com.tongran.common.core.utils.poi.ExcelUtil; -import com.tongran.common.core.web.page.TableDataInfo; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; + +import javax.servlet.http.HttpServletResponse; +import java.util.List; /** * 监控模板管理Controller @@ -30,6 +23,7 @@ import com.tongran.common.core.web.page.TableDataInfo; */ @RestController @RequestMapping("/template") +@RequiresPermissions("system:template") public class MtmMonitoringTemplateController extends BaseController { @Autowired @@ -38,7 +32,6 @@ public class MtmMonitoringTemplateController extends BaseController /** * 查询监控模板管理列表 */ - @RequiresPermissions("system:template:list") @GetMapping("/list") public TableDataInfo list(MtmMonitoringTemplate mtmMonitoringTemplate) { @@ -50,7 +43,6 @@ public class MtmMonitoringTemplateController extends BaseController /** * 导出监控模板管理列表 */ - @RequiresPermissions("system:template:export") @Log(title = "监控模板管理", businessType = BusinessType.EXPORT) @PostMapping("/export") public void export(HttpServletResponse response, MtmMonitoringTemplate mtmMonitoringTemplate) @@ -63,7 +55,6 @@ public class MtmMonitoringTemplateController extends BaseController /** * 获取监控模板管理详细信息 */ - @RequiresPermissions("system:template:query") @GetMapping(value = "/{id}") public AjaxResult getInfo(@PathVariable("id") Long id) { @@ -73,7 +64,6 @@ public class MtmMonitoringTemplateController extends BaseController /** * 新增监控模板管理 */ - @RequiresPermissions("system:template:add") @Log(title = "监控模板管理", businessType = BusinessType.INSERT) @PostMapping public AjaxResult add(@RequestBody MtmMonitoringTemplate mtmMonitoringTemplate) @@ -84,7 +74,6 @@ public class MtmMonitoringTemplateController extends BaseController /** * 修改监控模板管理 */ - @RequiresPermissions("system:template:edit") @Log(title = "监控模板管理", businessType = BusinessType.UPDATE) @PutMapping public AjaxResult edit(@RequestBody MtmMonitoringTemplate mtmMonitoringTemplate) @@ -95,7 +84,6 @@ public class MtmMonitoringTemplateController extends BaseController /** * 删除监控模板管理 */ - @RequiresPermissions("system:template:remove") @Log(title = "监控模板管理", businessType = BusinessType.DELETE) @DeleteMapping("/{ids}") public AjaxResult remove(@PathVariable Long[] ids) diff --git a/tongran-modules/tongran-system/src/main/java/com/tongran/system/controller/RmEpsTopologyManagementController.java b/tongran-modules/tongran-system/src/main/java/com/tongran/system/controller/RmEpsTopologyManagementController.java index 791704e..d7ef47e 100644 --- a/tongran-modules/tongran-system/src/main/java/com/tongran/system/controller/RmEpsTopologyManagementController.java +++ b/tongran-modules/tongran-system/src/main/java/com/tongran/system/controller/RmEpsTopologyManagementController.java @@ -24,6 +24,7 @@ import java.util.List; */ @RestController @RequestMapping("/management") +@RequiresPermissions("system:management") public class RmEpsTopologyManagementController extends BaseController { @Autowired @@ -32,7 +33,6 @@ public class RmEpsTopologyManagementController extends BaseController /** * 查询交换机/服务器名称 */ - @RequiresPermissions("system:management:list") @PostMapping ("/getNamesByResoureType") public List getNamesByResoureType(@RequestBody RmEpsTopologyManagement rmEpsTopologyManagement) { @@ -42,7 +42,6 @@ public class RmEpsTopologyManagementController extends BaseController /** * 查询拓扑管理列表 */ - @RequiresPermissions("system:management:list") @PostMapping("/list") public TableDataInfo list(@RequestBody RmEpsTopologyManagement rmEpsTopologyManagement) { @@ -56,7 +55,6 @@ public class RmEpsTopologyManagementController extends BaseController /** * 查询拓扑管理图形 */ - @RequiresPermissions("system:management:list") @PostMapping("/getListChart") public AjaxResult getListChart(@RequestBody RmEpsTopologyManagement rmEpsTopologyManagement) { @@ -67,7 +65,6 @@ public class RmEpsTopologyManagementController extends BaseController /** * 导出拓扑管理列表 */ - @RequiresPermissions("system:management:export") @Log(title = "拓扑管理", businessType = BusinessType.EXPORT) @PostMapping("/export") public void export(HttpServletResponse response, @RequestBody RmEpsTopologyManagement rmEpsTopologyManagement) @@ -81,7 +78,6 @@ public class RmEpsTopologyManagementController extends BaseController /** * 获取拓扑管理详细信息 */ - @RequiresPermissions("system:management:query") @GetMapping(value = "/{id}") public AjaxResult getInfo(@PathVariable("id") Long id) { @@ -91,7 +87,6 @@ public class RmEpsTopologyManagementController extends BaseController /** * 新增拓扑管理 */ - @RequiresPermissions("system:management:add") @Log(title = "拓扑管理", businessType = BusinessType.INSERT) @PostMapping public AjaxResult add(@RequestBody RmEpsTopologyManagement rmEpsTopologyManagement) @@ -102,7 +97,6 @@ public class RmEpsTopologyManagementController extends BaseController /** * 修改拓扑管理 */ - @RequiresPermissions("system:management:edit") @Log(title = "拓扑管理", businessType = BusinessType.UPDATE) @PutMapping public AjaxResult edit(@RequestBody RmEpsTopologyManagement rmEpsTopologyManagement) @@ -113,7 +107,6 @@ public class RmEpsTopologyManagementController extends BaseController /** * 删除拓扑管理 */ - @RequiresPermissions("system:management:remove") @Log(title = "拓扑管理", businessType = BusinessType.DELETE) @DeleteMapping("/{ids}") public AjaxResult remove(@PathVariable Long[] ids) diff --git a/tongran-modules/tongran-system/src/main/java/com/tongran/system/controller/RmMonitorConfigController.java b/tongran-modules/tongran-system/src/main/java/com/tongran/system/controller/RmMonitorConfigController.java index af2aedf..836dec5 100644 --- a/tongran-modules/tongran-system/src/main/java/com/tongran/system/controller/RmMonitorConfigController.java +++ b/tongran-modules/tongran-system/src/main/java/com/tongran/system/controller/RmMonitorConfigController.java @@ -22,6 +22,7 @@ import java.util.List; */ @RestController @RequestMapping("/monitorConfig") +@RequiresPermissions("system:monitorConfig") public class RmMonitorConfigController extends BaseController { @Autowired @@ -30,7 +31,6 @@ public class RmMonitorConfigController extends BaseController /** * 查询监控配置列表 */ - @RequiresPermissions("system:monitorConfig:list") @PostMapping("/list") public AjaxResult list(@RequestBody RmMonitorConfig rmMonitorConfig) { @@ -41,7 +41,6 @@ public class RmMonitorConfigController extends BaseController /** * 导出监控配置列表 */ - @RequiresPermissions("system:monitorConfig:export") @Log(title = "监控配置", businessType = BusinessType.EXPORT) @PostMapping("/export") public void export(HttpServletResponse response, RmMonitorConfig rmMonitorConfig) @@ -54,7 +53,6 @@ public class RmMonitorConfigController extends BaseController /** * 获取监控配置详细信息 */ - @RequiresPermissions("system:monitorConfig:query") @GetMapping(value = "/{id}") public AjaxResult getInfo(@PathVariable("id") Long id) { @@ -64,7 +62,6 @@ public class RmMonitorConfigController extends BaseController /** * 新增监控配置 */ - @RequiresPermissions("system:monitorConfig:add") @Log(title = "监控配置", businessType = BusinessType.INSERT) @PostMapping public AjaxResult add(@RequestBody RmMonitorConfig rmMonitorConfig) @@ -75,7 +72,6 @@ public class RmMonitorConfigController extends BaseController /** * 修改监控配置 */ - @RequiresPermissions("system:monitorConfig:edit") @Log(title = "监控配置", businessType = BusinessType.UPDATE) @PutMapping public AjaxResult edit(@RequestBody RmMonitorConfig rmMonitorConfig) @@ -86,7 +82,6 @@ public class RmMonitorConfigController extends BaseController /** * 删除监控配置 */ - @RequiresPermissions("system:monitorConfig:remove") @Log(title = "监控配置", businessType = BusinessType.DELETE) @DeleteMapping("/{ids}") public AjaxResult remove(@PathVariable Long[] ids) diff --git a/tongran-modules/tongran-system/src/main/java/com/tongran/system/controller/RmMonitorConfigDetailsController.java b/tongran-modules/tongran-system/src/main/java/com/tongran/system/controller/RmMonitorConfigDetailsController.java index 1b6bdd9..8210530 100644 --- a/tongran-modules/tongran-system/src/main/java/com/tongran/system/controller/RmMonitorConfigDetailsController.java +++ b/tongran-modules/tongran-system/src/main/java/com/tongran/system/controller/RmMonitorConfigDetailsController.java @@ -22,6 +22,7 @@ import java.util.Map; */ @RestController @RequestMapping("/monitorConfigDetails") +@RequiresPermissions("system:monitorConfig") public class RmMonitorConfigDetailsController extends BaseController { @Autowired @@ -30,7 +31,6 @@ public class RmMonitorConfigDetailsController extends BaseController /** * 监控看板-详情视图 出入流量 */ - @RequiresPermissions("system:bandwidth:list") @PostMapping("/getTrafficByMonitorView") public AjaxResult getTrafficByMonitorView(@RequestBody RmMonitorConfigDetails queryParam) { diff --git a/tongran-modules/tongran-system/src/main/java/com/tongran/system/controller/RmRegistrationMachineController.java b/tongran-modules/tongran-system/src/main/java/com/tongran/system/controller/RmRegistrationMachineController.java index bf3dc49..834ae23 100644 --- a/tongran-modules/tongran-system/src/main/java/com/tongran/system/controller/RmRegistrationMachineController.java +++ b/tongran-modules/tongran-system/src/main/java/com/tongran/system/controller/RmRegistrationMachineController.java @@ -1,26 +1,19 @@ package com.tongran.system.controller; -import java.util.List; -import java.io.IOException; -import javax.servlet.http.HttpServletResponse; -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; +import com.tongran.common.core.utils.poi.ExcelUtil; +import com.tongran.common.core.web.controller.BaseController; +import com.tongran.common.core.web.domain.AjaxResult; +import com.tongran.common.core.web.page.TableDataInfo; import com.tongran.common.log.annotation.Log; import com.tongran.common.log.enums.BusinessType; import com.tongran.common.security.annotation.RequiresPermissions; import com.tongran.system.domain.RmRegistrationMachine; import com.tongran.system.service.IRmRegistrationMachineService; -import com.tongran.common.core.web.controller.BaseController; -import com.tongran.common.core.web.domain.AjaxResult; -import com.tongran.common.core.utils.poi.ExcelUtil; -import com.tongran.common.core.web.page.TableDataInfo; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; + +import javax.servlet.http.HttpServletResponse; +import java.util.List; /** * 绑定金山machinecodeController @@ -30,6 +23,7 @@ import com.tongran.common.core.web.page.TableDataInfo; */ @RestController @RequestMapping("/machine") +@RequiresPermissions("system:machine") public class RmRegistrationMachineController extends BaseController { @Autowired @@ -38,7 +32,6 @@ public class RmRegistrationMachineController extends BaseController /** * 查询绑定金山machinecode列表 */ - @RequiresPermissions("system:machine:list") @GetMapping("/list") public TableDataInfo list(RmRegistrationMachine rmRegistrationMachine) { @@ -50,7 +43,6 @@ public class RmRegistrationMachineController extends BaseController /** * 导出绑定金山machinecode列表 */ - @RequiresPermissions("system:machine:export") @Log(title = "绑定金山machinecode", businessType = BusinessType.EXPORT) @PostMapping("/export") public void export(HttpServletResponse response, RmRegistrationMachine rmRegistrationMachine) @@ -63,7 +55,6 @@ public class RmRegistrationMachineController extends BaseController /** * 获取绑定金山machinecode详细信息 */ - @RequiresPermissions("system:machine:query") @GetMapping(value = "/{id}") public AjaxResult getInfo(@PathVariable("id") Long id) { @@ -73,7 +64,6 @@ public class RmRegistrationMachineController extends BaseController /** * 新增绑定金山machinecode */ - @RequiresPermissions("system:machine:add") @Log(title = "绑定金山machinecode", businessType = BusinessType.INSERT) @PostMapping public AjaxResult add(@RequestBody RmRegistrationMachine rmRegistrationMachine) @@ -84,7 +74,6 @@ public class RmRegistrationMachineController extends BaseController /** * 修改绑定金山machinecode */ - @RequiresPermissions("system:machine:edit") @Log(title = "绑定金山machinecode", businessType = BusinessType.UPDATE) @PutMapping public AjaxResult edit(@RequestBody RmRegistrationMachine rmRegistrationMachine) @@ -95,7 +84,6 @@ public class RmRegistrationMachineController extends BaseController /** * 删除绑定金山machinecode */ - @RequiresPermissions("system:machine:remove") @Log(title = "绑定金山machinecode", businessType = BusinessType.DELETE) @DeleteMapping("/{ids}") public AjaxResult remove(@PathVariable Long[] ids) diff --git a/tongran-modules/tongran-system/src/main/java/com/tongran/system/controller/RmResourceGroupController.java b/tongran-modules/tongran-system/src/main/java/com/tongran/system/controller/RmResourceGroupController.java index b365f7c..89c515c 100644 --- a/tongran-modules/tongran-system/src/main/java/com/tongran/system/controller/RmResourceGroupController.java +++ b/tongran-modules/tongran-system/src/main/java/com/tongran/system/controller/RmResourceGroupController.java @@ -26,6 +26,7 @@ import java.util.List; */ @RestController @RequestMapping("/group") +@RequiresPermissions("system:group") public class RmResourceGroupController extends BaseController { @Autowired @@ -34,7 +35,6 @@ public class RmResourceGroupController extends BaseController /** * 查询资源分组列表 */ - @RequiresPermissions("system:group:list") @PostMapping("/list") public TableDataInfo list(@RequestBody RmResourceGroup rmResourceGroup) { @@ -49,7 +49,6 @@ public class RmResourceGroupController extends BaseController /** * 导出资源分组列表 */ - @RequiresPermissions("system:group:export") @Log(title = "资源分组", businessType = BusinessType.EXPORT) @PostMapping("/export") public void export(HttpServletResponse response, @RequestBody RmResourceGroup rmResourceGroup) @@ -63,7 +62,6 @@ public class RmResourceGroupController extends BaseController /** * 获取资源分组详细信息 */ - @RequiresPermissions("system:group:query") @GetMapping(value = "/{id}") public AjaxResult getInfo(@PathVariable("id") Long id) { @@ -73,7 +71,6 @@ public class RmResourceGroupController extends BaseController /** * 新增资源分组 */ - @RequiresPermissions("system:group:add") @Log(title = "资源分组", businessType = BusinessType.INSERT) @PostMapping public AjaxResult add(@RequestBody RmResourceGroup rmResourceGroup) @@ -84,7 +81,6 @@ public class RmResourceGroupController extends BaseController /** * 修改资源分组 */ - @RequiresPermissions("system:group:edit") @Log(title = "资源分组", businessType = BusinessType.UPDATE) @PutMapping public AjaxResult edit(@RequestBody RmResourceGroup rmResourceGroup) @@ -95,7 +91,6 @@ public class RmResourceGroupController extends BaseController /** * 删除资源分组 */ - @RequiresPermissions("system:group:remove") @Log(title = "资源分组", businessType = BusinessType.DELETE) @DeleteMapping("/{ids}") public AjaxResult remove(@PathVariable Long[] ids) @@ -115,7 +110,6 @@ public class RmResourceGroupController extends BaseController /** * 获取资源分组详细信息 */ - @RequiresPermissions("system:group:query") @PostMapping(value = "/exitsResourceById") public AjaxResult exitsResourceById(@RequestBody RmResourceGroup rmResourceGroup) { diff --git a/tongran-modules/tongran-system/src/main/java/com/tongran/system/controller/RmResourceRegistrationController.java b/tongran-modules/tongran-system/src/main/java/com/tongran/system/controller/RmResourceRegistrationController.java index 61f2e0d..f35f93a 100644 --- a/tongran-modules/tongran-system/src/main/java/com/tongran/system/controller/RmResourceRegistrationController.java +++ b/tongran-modules/tongran-system/src/main/java/com/tongran/system/controller/RmResourceRegistrationController.java @@ -28,6 +28,7 @@ import java.util.Map; */ @RestController @RequestMapping("/registration") +@RequiresPermissions("system:registration") public class RmResourceRegistrationController extends BaseController { @Autowired @@ -36,7 +37,6 @@ public class RmResourceRegistrationController extends BaseController /** * 查询资源注册列表 */ - @RequiresPermissions("system:registration:list") @PostMapping("/list") public TableDataInfo list(@RequestBody RmResourceRegistration rmResourceRegistration) { @@ -53,7 +53,6 @@ public class RmResourceRegistrationController extends BaseController /** * 导出资源注册列表 */ - @RequiresPermissions("system:registration:export") @Log(title = "资源注册", businessType = BusinessType.EXPORT) @PostMapping("/export") public void export(HttpServletResponse response, @RequestBody RmResourceRegistration rmResourceRegistration) @@ -67,7 +66,6 @@ public class RmResourceRegistrationController extends BaseController /** * 获取资源注册详细信息 */ - @RequiresPermissions("system:registration:query") @GetMapping(value = "/{id}") public AjaxResult getInfo(@PathVariable("id") Long id) { @@ -77,7 +75,6 @@ public class RmResourceRegistrationController extends BaseController /** * 新增资源注册 */ - @RequiresPermissions("system:registration:add") @Log(title = "资源注册", businessType = BusinessType.INSERT) @PostMapping public AjaxResult add(@RequestBody RmResourceRegistration rmResourceRegistration) @@ -92,7 +89,6 @@ public class RmResourceRegistrationController extends BaseController /** * 修改资源注册 */ - @RequiresPermissions("system:registration:edit") @Log(title = "资源注册", businessType = BusinessType.UPDATE) @PutMapping public AjaxResult edit(@RequestBody RmResourceRegistration rmResourceRegistration) @@ -103,7 +99,6 @@ public class RmResourceRegistrationController extends BaseController /** * 资源注册-注册 */ - @RequiresPermissions("system:registration:edit") @Log(title = "资源注册-注册", businessType = BusinessType.UPDATE) @PostMapping("/register") public AjaxResult register(@RequestBody RmResourceRegistration rmResourceRegistration) @@ -152,7 +147,6 @@ public class RmResourceRegistrationController extends BaseController /** * 查询资源注册列表 */ - @RequiresPermissions("system:registration:list") @PostMapping("/getRegistList") public AjaxResult getRegistList(@RequestBody RmResourceRegistration rmResourceRegistration) { @@ -187,7 +181,6 @@ public class RmResourceRegistrationController extends BaseController /** * 选择公网业务IP */ - @RequiresPermissions("system:registration:update") @PostMapping("/bindBusinessPubulicIp") public AjaxResult bindBusinessPubulicIp(@RequestBody RmResourceRegistration rmResourceRegistration) { @@ -198,7 +191,6 @@ public class RmResourceRegistrationController extends BaseController * 查询所有逻辑标识节点 * @return 资源注册集合 */ - @RequiresPermissions("system:registration:list") @GetMapping("/getAllLogicalNodeId") public List getAllLogicalNodeId() { @@ -209,7 +201,6 @@ public class RmResourceRegistrationController extends BaseController * 绑定业务名称 * @return 资源注册集合 */ - @RequiresPermissions("system:registration:list") @PostMapping("/bindBusinessByClientIds") public AjaxResult bindBusinessByClientIds(@RequestBody RmResourceRegistration rmResourceRegistration) { @@ -220,7 +211,6 @@ public class RmResourceRegistrationController extends BaseController * 根据clientId查询详情 * @return 资源注册集合 */ - @RequiresPermissions("system:registration:list") @PostMapping("/getServerMsgByClientId") public AjaxResult getServerMsgByClientId(@RequestBody RmResourceRegistration rmResourceRegistration) { @@ -233,7 +223,6 @@ public class RmResourceRegistrationController extends BaseController /** * 添加标签 */ - @RequiresPermissions("system:registration:edit") @Log(title = "添加服务器标签", businessType = BusinessType.UPDATE) @PostMapping("/addRemark") public AjaxResult addRemark(@RequestBody RmResourceRegistration rmResourceRegistration) @@ -243,7 +232,6 @@ public class RmResourceRegistrationController extends BaseController /** * 添加标签 */ - @RequiresPermissions("system:registration:edit") @Log(title = "添加服务器标签", businessType = BusinessType.UPDATE) @PostMapping("/updateRemark") public AjaxResult updateRemark(@RequestBody RmResourceRegistration rmResourceRegistration) @@ -253,7 +241,6 @@ public class RmResourceRegistrationController extends BaseController /** * 添加上报带宽值 */ - @RequiresPermissions("system:registration:edit") @Log(title = "添加上报带宽值", businessType = BusinessType.UPDATE) @PostMapping("/addReportedBandwidth") public AjaxResult addReportedBandwidth(@RequestBody RmResourceRegistration rmResourceRegistration) diff --git a/tongran-modules/tongran-system/src/main/java/com/tongran/system/controller/RmSwitchInterfaceInfoController.java b/tongran-modules/tongran-system/src/main/java/com/tongran/system/controller/RmSwitchInterfaceInfoController.java index bdbef91..0372d11 100644 --- a/tongran-modules/tongran-system/src/main/java/com/tongran/system/controller/RmSwitchInterfaceInfoController.java +++ b/tongran-modules/tongran-system/src/main/java/com/tongran/system/controller/RmSwitchInterfaceInfoController.java @@ -1,26 +1,19 @@ package com.tongran.system.controller; -import java.util.List; -import java.io.IOException; -import javax.servlet.http.HttpServletResponse; -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; +import com.tongran.common.core.utils.poi.ExcelUtil; +import com.tongran.common.core.web.controller.BaseController; +import com.tongran.common.core.web.domain.AjaxResult; +import com.tongran.common.core.web.page.TableDataInfo; import com.tongran.common.log.annotation.Log; import com.tongran.common.log.enums.BusinessType; import com.tongran.common.security.annotation.RequiresPermissions; import com.tongran.system.domain.RmSwitchInterfaceInfo; import com.tongran.system.service.IRmSwitchInterfaceInfoService; -import com.tongran.common.core.web.controller.BaseController; -import com.tongran.common.core.web.domain.AjaxResult; -import com.tongran.common.core.utils.poi.ExcelUtil; -import com.tongran.common.core.web.page.TableDataInfo; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; + +import javax.servlet.http.HttpServletResponse; +import java.util.List; /** * 交换机接口信息Controller @@ -30,6 +23,7 @@ import com.tongran.common.core.web.page.TableDataInfo; */ @RestController @RequestMapping("/switchInterfaceInfo") +@RequiresPermissions("system:switchInterfaceInfo") public class RmSwitchInterfaceInfoController extends BaseController { @Autowired @@ -38,7 +32,6 @@ public class RmSwitchInterfaceInfoController extends BaseController /** * 查询交换机接口信息列表 */ - @RequiresPermissions("system:switchInterfaceInfo:list") @GetMapping("/list") public TableDataInfo list(RmSwitchInterfaceInfo rmSwitchInterfaceInfo) { @@ -50,7 +43,6 @@ public class RmSwitchInterfaceInfoController extends BaseController /** * 导出交换机接口信息列表 */ - @RequiresPermissions("system:switchInterfaceInfo:export") @Log(title = "交换机接口信息", businessType = BusinessType.EXPORT) @PostMapping("/export") public void export(HttpServletResponse response, RmSwitchInterfaceInfo rmSwitchInterfaceInfo) @@ -63,7 +55,6 @@ public class RmSwitchInterfaceInfoController extends BaseController /** * 获取交换机接口信息详细信息 */ - @RequiresPermissions("system:switchInterfaceInfo:query") @GetMapping(value = "/{id}") public AjaxResult getInfo(@PathVariable("id") Long id) { @@ -73,7 +64,6 @@ public class RmSwitchInterfaceInfoController extends BaseController /** * 新增交换机接口信息 */ - @RequiresPermissions("system:switchInterfaceInfo:add") @Log(title = "交换机接口信息", businessType = BusinessType.INSERT) @PostMapping public AjaxResult add(@RequestBody RmSwitchInterfaceInfo rmSwitchInterfaceInfo) @@ -84,7 +74,6 @@ public class RmSwitchInterfaceInfoController extends BaseController /** * 修改交换机接口信息 */ - @RequiresPermissions("system:switchInterfaceInfo:edit") @Log(title = "交换机接口信息", businessType = BusinessType.UPDATE) @PutMapping public AjaxResult edit(@RequestBody RmSwitchInterfaceInfo rmSwitchInterfaceInfo) @@ -95,7 +84,6 @@ public class RmSwitchInterfaceInfoController extends BaseController /** * 删除交换机接口信息 */ - @RequiresPermissions("system:switchInterfaceInfo:remove") @Log(title = "交换机接口信息", businessType = BusinessType.DELETE) @DeleteMapping("/{ids}") public AjaxResult remove(@PathVariable Long[] ids) diff --git a/tongran-modules/tongran-system/src/main/java/com/tongran/system/controller/RmSwitchManagementController.java b/tongran-modules/tongran-system/src/main/java/com/tongran/system/controller/RmSwitchManagementController.java index 22df2fe..1b53851 100644 --- a/tongran-modules/tongran-system/src/main/java/com/tongran/system/controller/RmSwitchManagementController.java +++ b/tongran-modules/tongran-system/src/main/java/com/tongran/system/controller/RmSwitchManagementController.java @@ -26,6 +26,7 @@ import java.util.List; */ @RestController @RequestMapping("/switchManagement") +@RequiresPermissions("system:switchManagement") public class RmSwitchManagementController extends BaseController { @Autowired @@ -34,7 +35,6 @@ public class RmSwitchManagementController extends BaseController /** * 查询交换机管理列表 */ - @RequiresPermissions("system:switchManagement:list") @PostMapping("/list") public TableDataInfo list(@RequestBody RmSwitchManagement rmSwitchManagement) { @@ -49,7 +49,6 @@ public class RmSwitchManagementController extends BaseController /** * 导出交换机管理列表 */ - @RequiresPermissions("system:switchManagement:export") @Log(title = "交换机管理", businessType = BusinessType.EXPORT) @PostMapping("/export") public void export(HttpServletResponse response, RmSwitchManagement rmSwitchManagement) @@ -63,7 +62,6 @@ public class RmSwitchManagementController extends BaseController /** * 获取交换机管理详细信息 */ - @RequiresPermissions("system:switchManagement:query") @GetMapping(value = "/{id}") public AjaxResult getInfo(@PathVariable("id") Long id) { @@ -73,7 +71,6 @@ public class RmSwitchManagementController extends BaseController /** * 新增交换机管理 */ - @RequiresPermissions("system:switchManagement:add") @Log(title = "交换机管理", businessType = BusinessType.INSERT) @PostMapping public AjaxResult add(@RequestBody RmSwitchManagement rmSwitchManagement) @@ -84,7 +81,6 @@ public class RmSwitchManagementController extends BaseController /** * 修改交换机管理 */ - @RequiresPermissions("system:switchManagement:edit") @Log(title = "交换机管理", businessType = BusinessType.UPDATE) @PutMapping public AjaxResult edit(@RequestBody RmSwitchManagement rmSwitchManagement) @@ -95,7 +91,6 @@ public class RmSwitchManagementController extends BaseController /** * 删除交换机管理 */ - @RequiresPermissions("system:switchManagement:remove") @Log(title = "交换机管理", businessType = BusinessType.DELETE) @DeleteMapping("/{ids}") public AjaxResult remove(@PathVariable Long[] ids) @@ -105,7 +100,6 @@ public class RmSwitchManagementController extends BaseController /** * 查询交换机管理列表 */ - @RequiresPermissions("system:switchManagement:list") @PostMapping("/getAllSwitchName") public AjaxResult getAllSwitchName(@RequestBody RmSwitchManagement rmSwitchManagement) { @@ -125,7 +119,6 @@ public class RmSwitchManagementController extends BaseController /** * 查询交换机信息树形接口 */ - @RequiresPermissions("system:switchManagement:list") @GetMapping("/getAllSwitchNameTree") public AjaxResult getAllSwitchNameTree() { diff --git a/tongran-modules/tongran-system/src/main/java/com/tongran/system/controller/ScreenController.java b/tongran-modules/tongran-system/src/main/java/com/tongran/system/controller/ScreenController.java index 7273db6..2cd7089 100644 --- a/tongran-modules/tongran-system/src/main/java/com/tongran/system/controller/ScreenController.java +++ b/tongran-modules/tongran-system/src/main/java/com/tongran/system/controller/ScreenController.java @@ -28,6 +28,7 @@ import java.util.Optional; */ @RestController @RequestMapping("/screen") +@RequiresPermissions("system:screen") public class ScreenController extends BaseController { @Autowired @@ -45,7 +46,6 @@ public class ScreenController extends BaseController * 统计当前在线服务器的流量相关的业务数 * @return */ - @RequiresPermissions("system:config:list") @GetMapping("/countBusinessByTraffic") public AjaxResult countBusinessByTraffic() { @@ -56,7 +56,6 @@ public class ScreenController extends BaseController * 服务器在线率 * @return */ - @RequiresPermissions("system:config:list") @GetMapping("/getServerOnlineRate") public AjaxResult getServerOnlineRate() { @@ -66,7 +65,6 @@ public class ScreenController extends BaseController * 交换机在线数量 * @return */ - @RequiresPermissions("system:config:list") @GetMapping("/countSwitchNum") public AjaxResult countSwitchNum() { @@ -87,7 +85,6 @@ public class ScreenController extends BaseController * 当日业务的在线设备数量统计TOP5 * @return */ - @RequiresPermissions("system:config:list") @GetMapping("/countDeviceNumTop5") public AjaxResult countDeviceNumTop5() { @@ -103,7 +100,6 @@ public class ScreenController extends BaseController * 当前在线服务器发送带宽总流量 * @return */ - @RequiresPermissions("system:config:list") @GetMapping("/sumTrafficByServer") public AjaxResult sumTrafficByServer() { @@ -113,7 +109,6 @@ public class ScreenController extends BaseController * 当前在线交换机接收带宽总流量 * @return */ - @RequiresPermissions("system:config:list") @GetMapping("/sumTrafficBySwitch") public AjaxResult sumTrafficBySwitch() { @@ -123,7 +118,6 @@ public class ScreenController extends BaseController * 资源告警处理情况 * @return */ - @RequiresPermissions("system:config:list") @GetMapping("/alarmProcess") public AjaxResult alarmProcess() { Map alarmList = remoteRocketMqService.alarmHandlingStatus(SecurityConstants.INNER).getData(); diff --git a/tongran-modules/tongran-system/src/main/java/com/tongran/system/controller/SysMenuClickController.java b/tongran-modules/tongran-system/src/main/java/com/tongran/system/controller/SysMenuClickController.java index 7713738..cd8f170 100644 --- a/tongran-modules/tongran-system/src/main/java/com/tongran/system/controller/SysMenuClickController.java +++ b/tongran-modules/tongran-system/src/main/java/com/tongran/system/controller/SysMenuClickController.java @@ -4,7 +4,6 @@ import com.tongran.common.core.web.controller.BaseController; import com.tongran.common.core.web.domain.AjaxResult; import com.tongran.common.log.annotation.Log; import com.tongran.common.log.enums.BusinessType; -import com.tongran.common.security.annotation.RequiresPermissions; import com.tongran.system.domain.SysMenuClick; import com.tongran.system.service.ISysMenuClickService; import org.springframework.beans.factory.annotation.Autowired; @@ -28,7 +27,6 @@ public class SysMenuClickController extends BaseController /** * 查询菜单点击计数列表 */ - @RequiresPermissions("system:sysMenuClick:list") @GetMapping("/getMenuListTopEight") public AjaxResult list() { @@ -38,7 +36,6 @@ public class SysMenuClickController extends BaseController /** * 新增菜单点击计数 */ - @RequiresPermissions("system:sysMenuClick:add") @Log(title = "菜单点击计数", businessType = BusinessType.INSERT) @PostMapping public AjaxResult add(@RequestBody SysMenuClick sysMenuClick) diff --git a/tongran-modules/tongran-system/src/main/java/com/tongran/system/controller/UserTableColumnConfigController.java b/tongran-modules/tongran-system/src/main/java/com/tongran/system/controller/UserTableColumnConfigController.java index 2863f5d..f6d3d6f 100644 --- a/tongran-modules/tongran-system/src/main/java/com/tongran/system/controller/UserTableColumnConfigController.java +++ b/tongran-modules/tongran-system/src/main/java/com/tongran/system/controller/UserTableColumnConfigController.java @@ -4,11 +4,13 @@ import com.tongran.common.core.web.controller.BaseController; import com.tongran.common.core.web.domain.AjaxResult; import com.tongran.common.log.annotation.Log; import com.tongran.common.log.enums.BusinessType; -import com.tongran.common.security.annotation.RequiresPermissions; import com.tongran.system.domain.UserTableColumnConfig; import com.tongran.system.service.IUserTableColumnConfigService; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.*; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; /** * 用户自定义列配置Controller @@ -27,7 +29,6 @@ public class UserTableColumnConfigController extends BaseController /** * 根据获取用户id获取自定义列配置详细信息 */ - @RequiresPermissions("system:columnConfig:query") @PostMapping(value = "/getColumnConfigByUserId") public AjaxResult getColumnConfigByUserId(@RequestBody UserTableColumnConfig userTableColumnConfig) { @@ -38,7 +39,6 @@ public class UserTableColumnConfigController extends BaseController /** * 新增用户自定义列配置 */ - @RequiresPermissions("system:columnConfig:add") @Log(title = "用户自定义列配置", businessType = BusinessType.INSERT) @PostMapping("addColumnConfig") public AjaxResult add(@RequestBody UserTableColumnConfig userTableColumnConfig) diff --git a/tongran-modules/tongran-system/src/main/java/com/tongran/system/service/impl/EpsInitialTrafficDataServiceImpl.java b/tongran-modules/tongran-system/src/main/java/com/tongran/system/service/impl/EpsInitialTrafficDataServiceImpl.java index 1dfe2ee..8b3b15c 100644 --- a/tongran-modules/tongran-system/src/main/java/com/tongran/system/service/impl/EpsInitialTrafficDataServiceImpl.java +++ b/tongran-modules/tongran-system/src/main/java/com/tongran/system/service/impl/EpsInitialTrafficDataServiceImpl.java @@ -676,15 +676,15 @@ public class EpsInitialTrafficDataServiceImpl implements EpsInitialTrafficDataSe extractors.put("netOutSpeedData", info -> info != null && info.getOutSpeed() != null ? new BigDecimal(info.getOutSpeed()).divide(divisor, 2, RoundingMode.HALF_UP) : - 0); + null); extractors.put("netMachineFlowData", info -> info != null && info.getMachineFlow() != null ? new BigDecimal(info.getMachineFlow()).divide(divisor, 2, RoundingMode.HALF_UP) : - 0); + null); extractors.put("percentile95", info -> info != null && info.getPercentile95() != null ? info.getPercentile95().divide(divisor, 2, RoundingMode.HALF_UP) : - 0); + null); Map resultMap = EchartsDataUtils.buildEchartsDataAutoPadding( list, EpsInitialTrafficData::getCreateTime, extractors, epsInitialTrafficData.getStartTime(), epsInitialTrafficData.getEndTime() ); diff --git a/tongran-modules/tongran-system/src/main/java/com/tongran/system/service/impl/EpsTaskStatisticsServiceImpl.java b/tongran-modules/tongran-system/src/main/java/com/tongran/system/service/impl/EpsTaskStatisticsServiceImpl.java index 82873b7..e6fabb9 100644 --- a/tongran-modules/tongran-system/src/main/java/com/tongran/system/service/impl/EpsTaskStatisticsServiceImpl.java +++ b/tongran-modules/tongran-system/src/main/java/com/tongran/system/service/impl/EpsTaskStatisticsServiceImpl.java @@ -540,11 +540,11 @@ public class EpsTaskStatisticsServiceImpl implements IEpsTaskStatisticsService extractors.put("netOutSpeedData", info -> info != null && info.getOutSpeed() != null ? new BigDecimal(info.getOutSpeed()).divide(divisor, 2, RoundingMode.HALF_UP) : - 0); + null); extractors.put("percentile95", info -> info != null && info.getPercentile95() != null ? info.getPercentile95().divide(divisor, 2, RoundingMode.HALF_UP) : - 0); + null); Map resultMap = EchartsDataUtils.buildEchartsData(list, EpsInitialTrafficData::getCreateTime, extractors); resultMap.put("other", result); resultMap.put("percentile95", percentile95); @@ -568,16 +568,16 @@ public class EpsTaskStatisticsServiceImpl implements IEpsTaskStatisticsService extractors.put("netInSpeedData", info -> info != null && info.getInSpeed() != null ? info.getInSpeed().divide(divisor, 2, RoundingMode.HALF_UP) : - 0); + null); extractors.put("netOutSpeedData", info -> info != null && info.getOutSpeed() != null ? info.getOutSpeed().divide(divisor, 2, RoundingMode.HALF_UP) : - 0); + null); extractors.put("percentile95", info -> info != null && info.getPercentile95() != null ? info.getPercentile95().divide(divisor, 2, RoundingMode.HALF_UP) : - 0); + null); Map resultMap = EchartsDataUtils.buildEchartsData(list, InitialSwitchInfoDetails::getCreateTime, extractors); resultMap.put("other", result); if(StringUtils.equals("1", taskMsg.getCalculationType())){ diff --git a/tongran-modules/tongran-system/src/main/java/com/tongran/system/service/impl/InitialSwitchInfoDetailsServiceImpl.java b/tongran-modules/tongran-system/src/main/java/com/tongran/system/service/impl/InitialSwitchInfoDetailsServiceImpl.java index 0859de6..1f1eaa6 100644 --- a/tongran-modules/tongran-system/src/main/java/com/tongran/system/service/impl/InitialSwitchInfoDetailsServiceImpl.java +++ b/tongran-modules/tongran-system/src/main/java/com/tongran/system/service/impl/InitialSwitchInfoDetailsServiceImpl.java @@ -1089,16 +1089,16 @@ public class InitialSwitchInfoDetailsServiceImpl implements IInitialSwitchInfoDe extractors.put("netInSpeedData", info -> info != null && info.getInSpeed() != null ? info.getInSpeed().divide(divisor, 2, RoundingMode.HALF_UP) : - 0); + null); extractors.put("netOutSpeedData", info -> info != null && info.getOutSpeed() != null ? info.getOutSpeed().divide(divisor, 2, RoundingMode.HALF_UP) : - 0); + null); extractors.put("percentile95", info -> info != null && info.getPercentile95() != null ? info.getPercentile95().divide(divisor, 2, RoundingMode.HALF_UP) : - 0); + null); Map resultMap = EchartsDataUtils.buildEchartsDataAutoPadding( list, InitialSwitchInfoDetails::getCreateTime, extractors, initialSwitchInfoDetails.getStartTime(), initialSwitchInfoDetails.getEndTime()); diff --git a/tongran-modules/tongran-system/src/main/java/com/tongran/system/service/impl/RmMonitorConfigDetailsServiceImpl.java b/tongran-modules/tongran-system/src/main/java/com/tongran/system/service/impl/RmMonitorConfigDetailsServiceImpl.java index b088a55..19cb5cb 100644 --- a/tongran-modules/tongran-system/src/main/java/com/tongran/system/service/impl/RmMonitorConfigDetailsServiceImpl.java +++ b/tongran-modules/tongran-system/src/main/java/com/tongran/system/service/impl/RmMonitorConfigDetailsServiceImpl.java @@ -163,11 +163,11 @@ public class RmMonitorConfigDetailsServiceImpl implements IRmMonitorConfigDetail extractors.put("netOutSpeedData", info -> info != null && info.getOutSpeed() != null ? info.getOutSpeed().divide(divisor, 2, RoundingMode.HALF_UP) : - 0); + null); extractors.put("netInSpeedData", info -> info != null && info.getInSpeed() != null ? info.getInSpeed().divide(divisor, 2, RoundingMode.HALF_UP) : - 0); + null); extractors.put("deployDevice", info -> info != null && info.getDeployDevice() != null ? info.getDeployDevice() : diff --git a/tongran-modules/tongran-system/src/main/java/com/tongran/system/service/impl/RmResourceRegistrationServiceImpl.java b/tongran-modules/tongran-system/src/main/java/com/tongran/system/service/impl/RmResourceRegistrationServiceImpl.java index fa419c2..ddd63e3 100644 --- a/tongran-modules/tongran-system/src/main/java/com/tongran/system/service/impl/RmResourceRegistrationServiceImpl.java +++ b/tongran-modules/tongran-system/src/main/java/com/tongran/system/service/impl/RmResourceRegistrationServiceImpl.java @@ -81,7 +81,6 @@ public class RmResourceRegistrationServiceImpl implements IRmResourceRegistratio */ @Override public Map getRegistrationTableInfoList(RmResourceRegistration rmResourceRegistration) { - long startTime = System.currentTimeMillis(); Map resultMap = new HashMap<>(); // 获取参数 @@ -138,8 +137,6 @@ public class RmResourceRegistrationServiceImpl implements IRmResourceRegistratio resultMap.put("list", currentPageData); resultMap.put("total", total); - log.info("查询完成，总耗时: {}ms, 总条数: {}, 处理条数: {}", - System.currentTimeMillis() - startTime, total, currentPageData.size()); return resultMap; } @@ -159,15 +156,6 @@ public class RmResourceRegistrationServiceImpl implements IRmResourceRegistratio setBandwidthYestoday(item); } } - - long cost = System.currentTimeMillis() - startTime; - if (cost > 1000) { - log.info("处理{}条数据耗时较长: {}ms", pageList.size(), cost); - } else if (cost > 100) { - log.info("处理{}条数据耗时: {}ms", pageList.size(), cost); - } else { - log.info("处理{}条数据耗时: {}ms", pageList.size(), cost); - } } /** * 查询资源注册列表 @@ -255,12 +243,14 @@ public class RmResourceRegistrationServiceImpl implements IRmResourceRegistratio Comparator comparator = null; - if (sortType == 1) { + if (sortType == 1) { // 升序，对应 MySQL 的 ASC + // MySQL 升序：NULL 值在最前面 comparator = Comparator.comparing( RmResourceRegistration::getBandwidthResult, - Comparator.nullsLast(Comparator.naturalOrder()) + Comparator.nullsFirst(Comparator.naturalOrder()) ); - } else if (sortType == 2) { + } else if (sortType == 2) { // 降序，对应 MySQL 的 DESC + // MySQL 降序：NULL 值在最后面 comparator = Comparator.comparing( RmResourceRegistration::getBandwidthResult, Comparator.nullsLast(Comparator.reverseOrder()) diff --git a/tongran-rocketmq/src/main/java/com/tongran/rocketmq/controller/InitialBandwidthTrafficController.java b/tongran-rocketmq/src/main/java/com/tongran/rocketmq/controller/InitialBandwidthTrafficController.java index d1ac07e..7592180 100644 --- a/tongran-rocketmq/src/main/java/com/tongran/rocketmq/controller/InitialBandwidthTrafficController.java +++ b/tongran-rocketmq/src/main/java/com/tongran/rocketmq/controller/InitialBandwidthTrafficController.java @@ -24,6 +24,7 @@ import java.util.Map; */ @RestController @RequestMapping("/traffic") +@RequiresPermissions("rocketmq:traffic") public class InitialBandwidthTrafficController extends BaseController { @Autowired @@ -31,7 +32,6 @@ public class InitialBandwidthTrafficController extends BaseController /** * 查询初始带宽流量列表 */ - @RequiresPermissions("rocketmq:traffic:list") @GetMapping("/list") public TableDataInfo list(InitialBandwidthTraffic initialBandwidthTraffic) { @@ -43,7 +43,6 @@ public class InitialBandwidthTrafficController extends BaseController /** * 导出初始带宽流量列表 */ - @RequiresPermissions("rocketmq:traffic:export") @Log(title = "初始带宽流量", businessType = BusinessType.EXPORT) @PostMapping("/export") public void export(HttpServletResponse response, InitialBandwidthTraffic initialBandwidthTraffic) @@ -56,7 +55,6 @@ public class InitialBandwidthTrafficController extends BaseController /** * 获取初始带宽流量详细信息 */ - @RequiresPermissions("rocketmq:traffic:query") @GetMapping(value = "/{id}") public AjaxResult getInfo(@PathVariable("id") Long id) { @@ -66,7 +64,6 @@ public class InitialBandwidthTrafficController extends BaseController /** * 新增初始带宽流量 */ - @RequiresPermissions("rocketmq:traffic:add") @Log(title = "初始带宽流量", businessType = BusinessType.INSERT) @PostMapping public AjaxResult add(@RequestBody InitialBandwidthTraffic initialBandwidthTraffic) @@ -77,7 +74,6 @@ public class InitialBandwidthTrafficController extends BaseController /** * 修改初始带宽流量 */ - @RequiresPermissions("rocketmq:traffic:edit") @Log(title = "初始带宽流量", businessType = BusinessType.UPDATE) @PutMapping public AjaxResult edit(@RequestBody InitialBandwidthTraffic initialBandwidthTraffic) @@ -88,7 +84,6 @@ public class InitialBandwidthTrafficController extends BaseController /** * 删除初始带宽流量 */ - @RequiresPermissions("rocketmq:traffic:remove") @Log(title = "初始带宽流量", businessType = BusinessType.DELETE) @DeleteMapping("/{ids}") public AjaxResult remove(@PathVariable Long[] ids) @@ -102,7 +97,6 @@ public class InitialBandwidthTrafficController extends BaseController * @param initialBandwidthTraffic * @return */ - @RequiresPermissions("rocketmq:traffic:list") @PostMapping("/netInterfaceDetailsMsg") public AjaxResult netInterfaceDetailsMsg(@RequestBody InitialBandwidthTraffic initialBandwidthTraffic) { InitialBandwidthTraffic netInterfaceDetailsMsg = initialBandwidthTrafficService.getNetInterfaceDetailsMsg(initialBandwidthTraffic); @@ -112,7 +106,6 @@ public class InitialBandwidthTrafficController extends BaseController /** * 查询eth0流量信息并封装为多折线ECharts图表数据 */ - @RequiresPermissions("rocketmq:traffic:list") @PostMapping("/netInterfaceTrafficEcharts") public AjaxResult netInterfaceTrafficEcharts(@RequestBody InitialBandwidthTraffic initialBandwidthTraffic) { Map echartsData = initialBandwidthTrafficService.netInterfaceTrafficEcharts(initialBandwidthTraffic); @@ -121,7 +114,6 @@ public class InitialBandwidthTrafficController extends BaseController /** * 查询eth0 IPV4流量信息并封装为多折线ECharts图表数据 */ - @RequiresPermissions("rocketmq:traffic:list") @PostMapping("/netInterfaceIpv4TrafficEcharts") public AjaxResult netInterfaceIpv4TrafficEcharts(@RequestBody InitialBandwidthTraffic initialBandwidthTraffic) { Map echartsData = initialBandwidthTrafficService.netInterfaceIpv4TrafficEcharts(initialBandwidthTraffic); @@ -130,7 +122,6 @@ public class InitialBandwidthTrafficController extends BaseController /** * 查询eth0 IPV6流量信息并封装为多折线ECharts图表数据 */ - @RequiresPermissions("rocketmq:traffic:list") @PostMapping("/netInterfaceIpv6TrafficEcharts") public AjaxResult netInterfaceIpv6TrafficEcharts(@RequestBody InitialBandwidthTraffic initialBandwidthTraffic) { Map echartsData = initialBandwidthTrafficService.netInterfaceIpv6TrafficEcharts(initialBandwidthTraffic); @@ -142,11 +133,19 @@ public class InitialBandwidthTrafficController extends BaseController * @param initialBandwidthTraffic * @return */ - @RequiresPermissions("rocketmq:traffic:list") @PostMapping("/netInterfaceDroppedEcharts") public AjaxResult netInterfaceDroppedEcharts(@RequestBody InitialBandwidthTraffic initialBandwidthTraffic) { Map echartsData = initialBandwidthTrafficService.netInterfaceDroppedEcharts(initialBandwidthTraffic); return success(echartsData); } + /** + * 查询多个网卡流量信息并封装为多折线ECharts图表数据 + */ + @PostMapping("/netBatchTrafficEcharts") + public AjaxResult netBatchTrafficEcharts(@RequestBody InitialBandwidthTraffic initialBandwidthTraffic) { + List> echartsData = initialBandwidthTrafficService.netBatchTrafficEcharts(initialBandwidthTraffic); + return success(echartsData); + } + } diff --git a/tongran-rocketmq/src/main/java/com/tongran/rocketmq/controller/InitialBandwidthTrafficTempController.java b/tongran-rocketmq/src/main/java/com/tongran/rocketmq/controller/InitialBandwidthTrafficTempController.java index 61f7def..9e3643b 100644 --- a/tongran-rocketmq/src/main/java/com/tongran/rocketmq/controller/InitialBandwidthTrafficTempController.java +++ b/tongran-rocketmq/src/main/java/com/tongran/rocketmq/controller/InitialBandwidthTrafficTempController.java @@ -1,25 +1,19 @@ package com.tongran.rocketmq.controller; -import java.util.List; -import javax.servlet.http.HttpServletResponse; -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; +import com.tongran.common.core.utils.poi.ExcelUtil; +import com.tongran.common.core.web.controller.BaseController; +import com.tongran.common.core.web.domain.AjaxResult; +import com.tongran.common.core.web.page.TableDataInfo; import com.tongran.common.log.annotation.Log; import com.tongran.common.log.enums.BusinessType; import com.tongran.common.security.annotation.RequiresPermissions; import com.tongran.rocketmq.domain.InitialBandwidthTrafficTemp; import com.tongran.rocketmq.service.IInitialBandwidthTrafficTempService; -import com.tongran.common.core.web.controller.BaseController; -import com.tongran.common.core.web.domain.AjaxResult; -import com.tongran.common.core.utils.poi.ExcelUtil; -import com.tongran.common.core.web.page.TableDataInfo; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; + +import javax.servlet.http.HttpServletResponse; +import java.util.List; /** * 初始带宽流量临时表Controller @@ -29,6 +23,7 @@ import com.tongran.common.core.web.page.TableDataInfo; */ @RestController @RequestMapping("/trafficTemp") +@RequiresPermissions("rocketmq:trafficTemp") public class InitialBandwidthTrafficTempController extends BaseController { @Autowired @@ -37,7 +32,6 @@ public class InitialBandwidthTrafficTempController extends BaseController /** * 查询初始带宽流量临时表列表 */ - @RequiresPermissions("rocketmq:trafficTemp:list") @GetMapping("/list") public TableDataInfo list(InitialBandwidthTrafficTemp initialBandwidthTrafficTemp) { @@ -49,7 +43,6 @@ public class InitialBandwidthTrafficTempController extends BaseController /** * 导出初始带宽流量临时表列表 */ - @RequiresPermissions("rocketmq:trafficTemp:export") @Log(title = "初始带宽流量临时表", businessType = BusinessType.EXPORT) @PostMapping("/export") public void export(HttpServletResponse response, InitialBandwidthTrafficTemp initialBandwidthTrafficTemp) @@ -62,7 +55,6 @@ public class InitialBandwidthTrafficTempController extends BaseController /** * 获取初始带宽流量临时表详细信息 */ - @RequiresPermissions("rocketmq:trafficTemp:query") @GetMapping(value = "/{id}") public AjaxResult getInfo(@PathVariable("id") Long id) { @@ -72,7 +64,6 @@ public class InitialBandwidthTrafficTempController extends BaseController /** * 新增初始带宽流量临时表 */ - @RequiresPermissions("rocketmq:trafficTemp:add") @Log(title = "初始带宽流量临时表", businessType = BusinessType.INSERT) @PostMapping public AjaxResult add(@RequestBody InitialBandwidthTrafficTemp initialBandwidthTrafficTemp) @@ -83,7 +74,6 @@ public class InitialBandwidthTrafficTempController extends BaseController /** * 修改初始带宽流量临时表 */ - @RequiresPermissions("rocketmq:trafficTemp:edit") @Log(title = "初始带宽流量临时表", businessType = BusinessType.UPDATE) @PutMapping public AjaxResult edit(@RequestBody InitialBandwidthTrafficTemp initialBandwidthTrafficTemp) @@ -94,7 +84,6 @@ public class InitialBandwidthTrafficTempController extends BaseController /** * 删除初始带宽流量临时表 */ - @RequiresPermissions("rocketmq:trafficTemp:remove") @Log(title = "初始带宽流量临时表", businessType = BusinessType.DELETE) @DeleteMapping("/{ids}") public AjaxResult remove(@PathVariable Long[] ids) diff --git a/tongran-rocketmq/src/main/java/com/tongran/rocketmq/controller/InitialCpuInfoController.java b/tongran-rocketmq/src/main/java/com/tongran/rocketmq/controller/InitialCpuInfoController.java index 7e03400..56c6a53 100644 --- a/tongran-rocketmq/src/main/java/com/tongran/rocketmq/controller/InitialCpuInfoController.java +++ b/tongran-rocketmq/src/main/java/com/tongran/rocketmq/controller/InitialCpuInfoController.java @@ -25,6 +25,7 @@ import java.util.Map; */ @RestController @RequestMapping("/cpuInfo") +@RequiresPermissions("rocketmq:traffic") public class InitialCpuInfoController extends BaseController { @Autowired @@ -33,7 +34,6 @@ public class InitialCpuInfoController extends BaseController /** * 查询CPU监控信息列表 */ - @RequiresPermissions("rocketmq:cpuInfo:list") @PostMapping("/list") public TableDataInfo list(@RequestBody InitialCpuInfo initialCpuInfo) { @@ -48,7 +48,6 @@ public class InitialCpuInfoController extends BaseController /** * 导出CPU监控信息列表 */ - @RequiresPermissions("rocketmq:cpuInfo:export") @Log(title = "CPU监控信息", businessType = BusinessType.EXPORT) @PostMapping("/export") public void export(HttpServletResponse response, InitialCpuInfo initialCpuInfo) @@ -61,7 +60,6 @@ public class InitialCpuInfoController extends BaseController /** * 获取CPU监控信息详细信息 */ - @RequiresPermissions("rocketmq:cpuInfo:query") @GetMapping(value = "/{id}") public AjaxResult getInfo(@PathVariable("id") Long id) { @@ -71,7 +69,6 @@ public class InitialCpuInfoController extends BaseController /** * 新增CPU监控信息 */ - @RequiresPermissions("rocketmq:cpuInfo:add") @Log(title = "CPU监控信息", businessType = BusinessType.INSERT) @PostMapping public AjaxResult add(@RequestBody InitialCpuInfo initialCpuInfo) @@ -82,7 +79,6 @@ public class InitialCpuInfoController extends BaseController /** * 修改CPU监控信息 */ - @RequiresPermissions("rocketmq:cpuInfo:edit") @Log(title = "CPU监控信息", businessType = BusinessType.UPDATE) @PutMapping public AjaxResult edit(@RequestBody InitialCpuInfo initialCpuInfo) @@ -93,7 +89,6 @@ public class InitialCpuInfoController extends BaseController /** * 删除CPU监控信息 */ - @RequiresPermissions("rocketmq:cpuInfo:remove") @Log(title = "CPU监控信息", businessType = BusinessType.DELETE) @DeleteMapping("/{ids}") public AjaxResult remove(@PathVariable Long[] ids) @@ -104,7 +99,6 @@ public class InitialCpuInfoController extends BaseController /** * 查询CPU监控信息列表并封装为多折线ECharts图表数据 */ - @RequiresPermissions("rocketmq:cpuInfo:list") @PostMapping("/cpuLoadEcharts") public AjaxResult cpuLoadEcharts(@RequestBody InitialCpuInfo initialCpuInfo) { Map echartsData = initialCpuInfoService.cupLoadEcharts(initialCpuInfo); @@ -113,7 +107,6 @@ public class InitialCpuInfoController extends BaseController /** * 查询CPU监控信息列表并封装为多折线ECharts图表数据 */ - @RequiresPermissions("rocketmq:cpuInfo:list") @PostMapping("/cpuTimeEcharts") public AjaxResult cpuTimeEcharts(@RequestBody InitialCpuInfo initialCpuInfo) { Map echartsData = initialCpuInfoService.cpuTimeEcharts(initialCpuInfo); diff --git a/tongran-rocketmq/src/main/java/com/tongran/rocketmq/controller/InitialDiskInfoController.java b/tongran-rocketmq/src/main/java/com/tongran/rocketmq/controller/InitialDiskInfoController.java index 1a8ed5f..3f6c88e 100644 --- a/tongran-rocketmq/src/main/java/com/tongran/rocketmq/controller/InitialDiskInfoController.java +++ b/tongran-rocketmq/src/main/java/com/tongran/rocketmq/controller/InitialDiskInfoController.java @@ -25,6 +25,7 @@ import java.util.Map; */ @RestController @RequestMapping("/diskInfo") +@RequiresPermissions("rocketmq:traffic") public class InitialDiskInfoController extends BaseController { @Autowired @@ -33,7 +34,6 @@ public class InitialDiskInfoController extends BaseController /** * 查询磁盘监控信息列表 */ - @RequiresPermissions("rocketmq:diskInfo:list") @PostMapping("/list") public TableDataInfo list(@RequestBody InitialDiskInfo initialDiskInfo) { @@ -48,7 +48,6 @@ public class InitialDiskInfoController extends BaseController /** * 导出磁盘监控信息列表 */ - @RequiresPermissions("rocketmq:diskInfo:export") @Log(title = "磁盘监控信息", businessType = BusinessType.EXPORT) @PostMapping("/export") public void export(HttpServletResponse response, InitialDiskInfo initialDiskInfo) @@ -61,7 +60,6 @@ public class InitialDiskInfoController extends BaseController /** * 获取磁盘监控信息详细信息 */ - @RequiresPermissions("rocketmq:diskInfo:query") @GetMapping(value = "/{id}") public AjaxResult getInfo(@PathVariable("id") Long id) { @@ -71,7 +69,6 @@ public class InitialDiskInfoController extends BaseController /** * 新增磁盘监控信息 */ - @RequiresPermissions("rocketmq:diskInfo:add") @Log(title = "磁盘监控信息", businessType = BusinessType.INSERT) @PostMapping public AjaxResult add(@RequestBody InitialDiskInfo initialDiskInfo) @@ -82,7 +79,6 @@ public class InitialDiskInfoController extends BaseController /** * 修改磁盘监控信息 */ - @RequiresPermissions("rocketmq:diskInfo:edit") @Log(title = "磁盘监控信息", businessType = BusinessType.UPDATE) @PutMapping public AjaxResult edit(@RequestBody InitialDiskInfo initialDiskInfo) @@ -93,7 +89,6 @@ public class InitialDiskInfoController extends BaseController /** * 删除磁盘监控信息 */ - @RequiresPermissions("rocketmq:diskInfo:remove") @Log(title = "磁盘监控信息", businessType = BusinessType.DELETE) @DeleteMapping("/{ids}") public AjaxResult remove(@PathVariable Long[] ids) @@ -106,7 +101,6 @@ public class InitialDiskInfoController extends BaseController * @param initialDiskInfo * @return */ - @RequiresPermissions("rocketmq:distInfo:list") @PostMapping("/getDistDetailsMsg") public AjaxResult distDetailsMsg(@RequestBody InitialDiskInfo initialDiskInfo){ return success(initialDiskInfoService.getDistDetailsMsg(initialDiskInfo)); @@ -117,7 +111,6 @@ public class InitialDiskInfoController extends BaseController * @param initialDiskInfo * @return */ - @RequiresPermissions("rocketmq:distInfo:list") @PostMapping("/rwSpeedEcharts") public AjaxResult rwSpeedEcharts(@RequestBody InitialDiskInfo initialDiskInfo){ Map echartsData = initialDiskInfoService.rwSpeedEcharts(initialDiskInfo); @@ -129,7 +122,6 @@ public class InitialDiskInfoController extends BaseController * @param initialDiskInfo * @return */ - @RequiresPermissions("rocketmq:distInfo:list") @PostMapping("/rwTimesEcharts") public AjaxResult rwTimesEcharts(@RequestBody InitialDiskInfo initialDiskInfo){ Map echartsData = initialDiskInfoService.rwTimesEcharts(initialDiskInfo); @@ -141,7 +133,6 @@ public class InitialDiskInfoController extends BaseController * @param initialDiskInfo * @return */ - @RequiresPermissions("rocketmq:distInfo:list") @PostMapping("/rwBytesEcharts") public AjaxResult rwBytesEcharts(@RequestBody InitialDiskInfo initialDiskInfo){ Map echartsData = initialDiskInfoService.rwBytesEcharts(initialDiskInfo); @@ -152,7 +143,6 @@ public class InitialDiskInfoController extends BaseController * @param initialDiskInfo * @return */ - @RequiresPermissions("rocketmq:mountPointInfo:list") @PostMapping("/getAllDistName") public AjaxResult getAllDistName(@RequestBody InitialDiskInfo initialDiskInfo){ List list = initialDiskInfoService.getAllDistName(initialDiskInfo); diff --git a/tongran-rocketmq/src/main/java/com/tongran/rocketmq/controller/InitialDockerInfoController.java b/tongran-rocketmq/src/main/java/com/tongran/rocketmq/controller/InitialDockerInfoController.java index c373708..c184729 100644 --- a/tongran-rocketmq/src/main/java/com/tongran/rocketmq/controller/InitialDockerInfoController.java +++ b/tongran-rocketmq/src/main/java/com/tongran/rocketmq/controller/InitialDockerInfoController.java @@ -25,6 +25,7 @@ import java.util.Map; */ @RestController @RequestMapping("/dockerInfo") +@RequiresPermissions("rocketmq:traffic") public class InitialDockerInfoController extends BaseController { @Autowired @@ -33,7 +34,6 @@ public class InitialDockerInfoController extends BaseController /** * 查询容器监控信息列表 */ - @RequiresPermissions("rocketmq:dockerInfo:list") @PostMapping("/list") public TableDataInfo list(@RequestBody InitialDockerInfo initialDockerInfo) { @@ -48,7 +48,6 @@ public class InitialDockerInfoController extends BaseController /** * 导出容器监控信息列表 */ - @RequiresPermissions("rocketmq:dockerInfo:export") @Log(title = "容器监控信息", businessType = BusinessType.EXPORT) @PostMapping("/export") public void export(HttpServletResponse response, InitialDockerInfo initialDockerInfo) @@ -61,7 +60,6 @@ public class InitialDockerInfoController extends BaseController /** * 获取容器监控信息详细信息 */ - @RequiresPermissions("rocketmq:dockerInfo:query") @GetMapping(value = "/{id}") public AjaxResult getInfo(@PathVariable("id") Long id) { @@ -71,7 +69,6 @@ public class InitialDockerInfoController extends BaseController /** * 新增容器监控信息 */ - @RequiresPermissions("rocketmq:dockerInfo:add") @Log(title = "容器监控信息", businessType = BusinessType.INSERT) @PostMapping public AjaxResult add(@RequestBody InitialDockerInfo initialDockerInfo) @@ -82,7 +79,6 @@ public class InitialDockerInfoController extends BaseController /** * 修改容器监控信息 */ - @RequiresPermissions("rocketmq:dockerInfo:edit") @Log(title = "容器监控信息", businessType = BusinessType.UPDATE) @PutMapping public AjaxResult edit(@RequestBody InitialDockerInfo initialDockerInfo) @@ -93,7 +89,6 @@ public class InitialDockerInfoController extends BaseController /** * 删除容器监控信息 */ - @RequiresPermissions("rocketmq:dockerInfo:remove") @Log(title = "容器监控信息", businessType = BusinessType.DELETE) @DeleteMapping("/{ids}") public AjaxResult remove(@PathVariable Long[] ids) @@ -106,7 +101,6 @@ public class InitialDockerInfoController extends BaseController * @param initialDockerInfo * @return */ - @RequiresPermissions("rocketmq:dockerInfo:list") @PostMapping("/getDockerDetailsMsg") public AjaxResult dockerDetailsMsg(@RequestBody InitialDockerInfo initialDockerInfo){ return success(initialDockerInfoService.getDockerDetailsMsg(initialDockerInfo)); @@ -117,7 +111,6 @@ public class InitialDockerInfoController extends BaseController * @param initialDockerInfo * @return */ - @RequiresPermissions("rocketmq:dockerInfo:list") @PostMapping("/cpuUtilEcharts") public AjaxResult cpuUtilEcharts(@RequestBody InitialDockerInfo initialDockerInfo){ Map echartsData = initialDockerInfoService.cpuUtilEcharts(initialDockerInfo); @@ -128,7 +121,6 @@ public class InitialDockerInfoController extends BaseController * @param initialDockerInfo * @return */ - @RequiresPermissions("rocketmq:dockerInfo:list") @PostMapping("/memUtilEcharts") public AjaxResult memUtilEcharts(@RequestBody InitialDockerInfo initialDockerInfo){ Map echartsData = initialDockerInfoService.memUtilEcharts(initialDockerInfo); @@ -140,7 +132,6 @@ public class InitialDockerInfoController extends BaseController * @param initialDockerInfo * @return */ - @RequiresPermissions("rocketmq:dockerInfo:list") @PostMapping("/netSpeedEcharts") public AjaxResult netSpeedEcharts(@RequestBody InitialDockerInfo initialDockerInfo){ Map echartsData = initialDockerInfoService.netSpeedEcharts(initialDockerInfo); @@ -151,7 +142,6 @@ public class InitialDockerInfoController extends BaseController * @param initialDockerInfo * @return */ - @RequiresPermissions("rocketmq:mountPointInfo:list") @PostMapping("/getAllDockerId") public AjaxResult getAllDockerId(@RequestBody InitialDockerInfo initialDockerInfo){ List list = initialDockerInfoService.getAllDockerId(initialDockerInfo); diff --git a/tongran-rocketmq/src/main/java/com/tongran/rocketmq/controller/InitialMemoryInfoController.java b/tongran-rocketmq/src/main/java/com/tongran/rocketmq/controller/InitialMemoryInfoController.java index 66de015..8caf9aa 100644 --- a/tongran-rocketmq/src/main/java/com/tongran/rocketmq/controller/InitialMemoryInfoController.java +++ b/tongran-rocketmq/src/main/java/com/tongran/rocketmq/controller/InitialMemoryInfoController.java @@ -25,6 +25,7 @@ import java.util.Map; */ @RestController @RequestMapping("/memoryInfo") +@RequiresPermissions("rocketmq:traffic") public class InitialMemoryInfoController extends BaseController { @Autowired @@ -33,7 +34,6 @@ public class InitialMemoryInfoController extends BaseController /** * 查询内存监控信息列表 */ - @RequiresPermissions("rocketmq:memoryInfo:list") @PostMapping("/list") public TableDataInfo list(@RequestBody InitialMemoryInfo initialMemoryInfo) { @@ -48,7 +48,6 @@ public class InitialMemoryInfoController extends BaseController /** * 导出内存监控信息列表 */ - @RequiresPermissions("rocketmq:memoryInfo:export") @Log(title = "内存监控信息", businessType = BusinessType.EXPORT) @PostMapping("/export") public void export(HttpServletResponse response, InitialMemoryInfo initialMemoryInfo) @@ -61,7 +60,6 @@ public class InitialMemoryInfoController extends BaseController /** * 获取内存监控信息详细信息 */ - @RequiresPermissions("rocketmq:memoryInfo:query") @GetMapping(value = "/{id}") public AjaxResult getInfo(@PathVariable("id") Long id) { @@ -71,7 +69,6 @@ public class InitialMemoryInfoController extends BaseController /** * 新增内存监控信息 */ - @RequiresPermissions("rocketmq:memoryInfo:add") @Log(title = "内存监控信息", businessType = BusinessType.INSERT) @PostMapping public AjaxResult add(@RequestBody InitialMemoryInfo initialMemoryInfo) @@ -82,7 +79,6 @@ public class InitialMemoryInfoController extends BaseController /** * 修改内存监控信息 */ - @RequiresPermissions("rocketmq:memoryInfo:edit") @Log(title = "内存监控信息", businessType = BusinessType.UPDATE) @PutMapping public AjaxResult edit(@RequestBody InitialMemoryInfo initialMemoryInfo) @@ -93,7 +89,6 @@ public class InitialMemoryInfoController extends BaseController /** * 删除内存监控信息 */ - @RequiresPermissions("rocketmq:memoryInfo:remove") @Log(title = "内存监控信息", businessType = BusinessType.DELETE) @DeleteMapping("/{ids}") public AjaxResult remove(@PathVariable Long[] ids) @@ -104,7 +99,6 @@ public class InitialMemoryInfoController extends BaseController /** * 查询交换空间可用量监控数据 */ - @RequiresPermissions("rocketmq:systemInfo:list") @PostMapping("/swapSizeFreeEcharts") public AjaxResult swapSizeFreeEcharts(@RequestBody InitialMemoryInfo initialMemoryInfo) { Map echartsData = initialMemoryInfoService.swapSizeFreeEcharts(initialMemoryInfo); @@ -114,7 +108,6 @@ public class InitialMemoryInfoController extends BaseController /** * 查询内存利用率监控数据 */ - @RequiresPermissions("rocketmq:systemInfo:list") @PostMapping("/untilzationEcharts") public AjaxResult untilzationEcharts(@RequestBody InitialMemoryInfo initialMemoryInfo) { Map echartsData = initialMemoryInfoService.untilzationEcharts(initialMemoryInfo); @@ -124,7 +117,6 @@ public class InitialMemoryInfoController extends BaseController /** * 查询内存可用量监控数据（KB） */ - @RequiresPermissions("rocketmq:systemInfo:list") @PostMapping("/availableMemoryEcharts") public AjaxResult availableMemoryEcharts(@RequestBody InitialMemoryInfo initialMemoryInfo) { Map echartsData = initialMemoryInfoService.availableMemoryEcharts(initialMemoryInfo); @@ -134,7 +126,6 @@ public class InitialMemoryInfoController extends BaseController /** * 查询交换空间百分比监控数据 */ - @RequiresPermissions("rocketmq:systemInfo:list") @PostMapping("/swapSizePercentEcharts") public AjaxResult swapSizePercentEcharts(@RequestBody InitialMemoryInfo initialMemoryInfo) { Map echartsData = initialMemoryInfoService.swapSizePercentEcharts(initialMemoryInfo); @@ -144,7 +135,6 @@ public class InitialMemoryInfoController extends BaseController /** * 查询可用内存百分比监控数据 */ - @RequiresPermissions("rocketmq:systemInfo:list") @PostMapping("/percentEcharts") public AjaxResult percentEcharts(@RequestBody InitialMemoryInfo initialMemoryInfo) { Map echartsData = initialMemoryInfoService.percentEcharts(initialMemoryInfo); diff --git a/tongran-rocketmq/src/main/java/com/tongran/rocketmq/controller/InitialMountPointInfoController.java b/tongran-rocketmq/src/main/java/com/tongran/rocketmq/controller/InitialMountPointInfoController.java index dfc7825..2676b80 100644 --- a/tongran-rocketmq/src/main/java/com/tongran/rocketmq/controller/InitialMountPointInfoController.java +++ b/tongran-rocketmq/src/main/java/com/tongran/rocketmq/controller/InitialMountPointInfoController.java @@ -25,6 +25,7 @@ import java.util.Map; */ @RestController @RequestMapping("/mountPointInfo") +@RequiresPermissions("rocketmq:traffic") public class InitialMountPointInfoController extends BaseController { @Autowired @@ -33,7 +34,6 @@ public class InitialMountPointInfoController extends BaseController /** * 查询挂载点监控信息列表 */ - @RequiresPermissions("rocketmq:mountPointInfo:list") @PostMapping("/list") public TableDataInfo list(@RequestBody InitialMountPointInfo initialMountPointInfo) { @@ -48,7 +48,6 @@ public class InitialMountPointInfoController extends BaseController /** * 导出挂载点监控信息列表 */ - @RequiresPermissions("rocketmq:mountPointInfo:export") @Log(title = "挂载点监控信息", businessType = BusinessType.EXPORT) @PostMapping("/export") public void export(HttpServletResponse response, InitialMountPointInfo initialMountPointInfo) @@ -61,7 +60,6 @@ public class InitialMountPointInfoController extends BaseController /** * 获取挂载点监控信息详细信息 */ - @RequiresPermissions("rocketmq:mountPointInfo:query") @GetMapping(value = "/{id}") public AjaxResult getInfo(@PathVariable("id") Long id) { @@ -71,7 +69,6 @@ public class InitialMountPointInfoController extends BaseController /** * 新增挂载点监控信息 */ - @RequiresPermissions("rocketmq:mountPointInfo:add") @Log(title = "挂载点监控信息", businessType = BusinessType.INSERT) @PostMapping public AjaxResult add(@RequestBody InitialMountPointInfo initialMountPointInfo) @@ -82,7 +79,6 @@ public class InitialMountPointInfoController extends BaseController /** * 修改挂载点监控信息 */ - @RequiresPermissions("rocketmq:mountPointInfo:edit") @Log(title = "挂载点监控信息", businessType = BusinessType.UPDATE) @PutMapping public AjaxResult edit(@RequestBody InitialMountPointInfo initialMountPointInfo) @@ -93,7 +89,6 @@ public class InitialMountPointInfoController extends BaseController /** * 删除挂载点监控信息 */ - @RequiresPermissions("rocketmq:mountPointInfo:remove") @Log(title = "挂载点监控信息", businessType = BusinessType.DELETE) @DeleteMapping("/{ids}") public AjaxResult remove(@PathVariable Long[] ids) @@ -103,7 +98,6 @@ public class InitialMountPointInfoController extends BaseController /** * 获取挂载点监控信息详细信息 */ - @RequiresPermissions("rocketmq:mountPointInfo:query") @PostMapping(value = "/pointDetailsMsg") public AjaxResult pointDetailsMsg(@RequestBody InitialMountPointInfo initialMountPointInfo) { @@ -113,7 +107,6 @@ public class InitialMountPointInfoController extends BaseController /** * 获取挂载文件系统/的空间图形 */ - @RequiresPermissions("rocketmq:mountPointInfo:query") @PostMapping(value = "/spaceEcharts") public AjaxResult spaceEcharts(@RequestBody InitialMountPointInfo initialMountPointInfo) { @@ -123,7 +116,6 @@ public class InitialMountPointInfoController extends BaseController /** * 获取挂载文件系统/的空间利用率图形 */ - @RequiresPermissions("rocketmq:mountPointInfo:query") @PostMapping(value = "/spaceRateEcharts") public AjaxResult spaceRateEcharts(@RequestBody InitialMountPointInfo initialMountPointInfo) { @@ -135,7 +127,6 @@ public class InitialMountPointInfoController extends BaseController * @param initialMountPointInfo * @return */ - @RequiresPermissions("rocketmq:mountPointInfo:list") @PostMapping("/getAllMountName") public AjaxResult getAllMountName(@RequestBody InitialMountPointInfo initialMountPointInfo){ List list = initialMountPointInfoService.getAllMountName(initialMountPointInfo); diff --git a/tongran-rocketmq/src/main/java/com/tongran/rocketmq/controller/InitialSwitchFanInfoController.java b/tongran-rocketmq/src/main/java/com/tongran/rocketmq/controller/InitialSwitchFanInfoController.java index d745648..47fc11d 100644 --- a/tongran-rocketmq/src/main/java/com/tongran/rocketmq/controller/InitialSwitchFanInfoController.java +++ b/tongran-rocketmq/src/main/java/com/tongran/rocketmq/controller/InitialSwitchFanInfoController.java @@ -24,6 +24,7 @@ import java.util.Map; */ @RestController @RequestMapping("/switchFanInfo") +@RequiresPermissions("rocketmq:switchInfo") public class InitialSwitchFanInfoController extends BaseController { @Autowired @@ -32,7 +33,6 @@ public class InitialSwitchFanInfoController extends BaseController /** * 查询风扇信息列表 */ - @RequiresPermissions("rocketmq:info:list") @GetMapping("/list") public TableDataInfo list(InitialSwitchFanInfo initialSwitchFanInfo) { @@ -44,7 +44,6 @@ public class InitialSwitchFanInfoController extends BaseController /** * 导出风扇信息列表 */ - @RequiresPermissions("rocketmq:info:export") @Log(title = "风扇信息", businessType = BusinessType.EXPORT) @PostMapping("/export") public void export(HttpServletResponse response, InitialSwitchFanInfo initialSwitchFanInfo) @@ -57,7 +56,6 @@ public class InitialSwitchFanInfoController extends BaseController /** * 获取风扇信息详细信息 */ - @RequiresPermissions("rocketmq:info:query") @GetMapping(value = "/{id}") public AjaxResult getInfo(@PathVariable("id") Long id) { @@ -67,7 +65,6 @@ public class InitialSwitchFanInfoController extends BaseController /** * 新增风扇信息 */ - @RequiresPermissions("rocketmq:info:add") @Log(title = "风扇信息", businessType = BusinessType.INSERT) @PostMapping public AjaxResult add(@RequestBody InitialSwitchFanInfo initialSwitchFanInfo) @@ -78,7 +75,6 @@ public class InitialSwitchFanInfoController extends BaseController /** * 修改风扇信息 */ - @RequiresPermissions("rocketmq:info:edit") @Log(title = "风扇信息", businessType = BusinessType.UPDATE) @PutMapping public AjaxResult edit(@RequestBody InitialSwitchFanInfo initialSwitchFanInfo) @@ -89,7 +85,6 @@ public class InitialSwitchFanInfoController extends BaseController /** * 删除风扇信息 */ - @RequiresPermissions("rocketmq:info:remove") @Log(title = "风扇信息", businessType = BusinessType.DELETE) @DeleteMapping("/{ids}") public AjaxResult remove(@PathVariable Long[] ids) @@ -102,7 +97,6 @@ public class InitialSwitchFanInfoController extends BaseController * @param initialSwitchFanInfo * @return */ - @RequiresPermissions("rocketmq:info:list") @PostMapping("/getAllFanName") public AjaxResult getAllFanName(@RequestBody InitialSwitchFanInfo initialSwitchFanInfo){ List list = initialSwitchFanInfoService.getAllFanName(initialSwitchFanInfo); @@ -113,7 +107,6 @@ public class InitialSwitchFanInfoController extends BaseController * @param initialSwitchFanInfo * @return */ - @RequiresPermissions("rocketmq:info:list") @PostMapping("/getFanMsg") public AjaxResult getFanMsg(@RequestBody InitialSwitchFanInfo initialSwitchFanInfo){ List list = initialSwitchFanInfoService.getFanMsg(initialSwitchFanInfo); diff --git a/tongran-rocketmq/src/main/java/com/tongran/rocketmq/controller/InitialSwitchInfoController.java b/tongran-rocketmq/src/main/java/com/tongran/rocketmq/controller/InitialSwitchInfoController.java index 9c0a5a9..af87e60 100644 --- a/tongran-rocketmq/src/main/java/com/tongran/rocketmq/controller/InitialSwitchInfoController.java +++ b/tongran-rocketmq/src/main/java/com/tongran/rocketmq/controller/InitialSwitchInfoController.java @@ -24,6 +24,7 @@ import java.util.Map; */ @RestController @RequestMapping("/switchInfo") +@RequiresPermissions("rocketmq:switchInfo") public class InitialSwitchInfoController extends BaseController { @Autowired @@ -32,7 +33,6 @@ public class InitialSwitchInfoController extends BaseController /** * 查询交换机流量监控信息列表 */ - @RequiresPermissions("rocketmq:switchInfo:list") @GetMapping("/list") public TableDataInfo list(InitialSwitchInfo initialSwitchInfo) { @@ -44,7 +44,6 @@ public class InitialSwitchInfoController extends BaseController /** * 导出交换机流量监控信息列表 */ - @RequiresPermissions("rocketmq:switchInfo:export") @Log(title = "交换机流量监控信息", businessType = BusinessType.EXPORT) @PostMapping("/export") public void export(HttpServletResponse response, InitialSwitchInfo initialSwitchInfo) @@ -57,7 +56,6 @@ public class InitialSwitchInfoController extends BaseController /** * 获取交换机流量监控信息详细信息 */ - @RequiresPermissions("rocketmq:switchInfo:query") @GetMapping(value = "/{id}") public AjaxResult getInfo(@PathVariable("id") Long id) { @@ -67,7 +65,6 @@ public class InitialSwitchInfoController extends BaseController /** * 新增交换机流量监控信息 */ - @RequiresPermissions("rocketmq:switchInfo:add") @Log(title = "交换机流量监控信息", businessType = BusinessType.INSERT) @PostMapping public AjaxResult add(@RequestBody InitialSwitchInfo initialSwitchInfo) @@ -78,7 +75,6 @@ public class InitialSwitchInfoController extends BaseController /** * 修改交换机流量监控信息 */ - @RequiresPermissions("rocketmq:switchInfo:edit") @Log(title = "交换机流量监控信息", businessType = BusinessType.UPDATE) @PutMapping public AjaxResult edit(@RequestBody InitialSwitchInfo initialSwitchInfo) @@ -89,7 +85,6 @@ public class InitialSwitchInfoController extends BaseController /** * 删除交换机流量监控信息 */ - @RequiresPermissions("rocketmq:switchInfo:remove") @Log(title = "交换机流量监控信息", businessType = BusinessType.DELETE) @DeleteMapping("/{ids}") public AjaxResult remove(@PathVariable Long[] ids) @@ -102,7 +97,6 @@ public class InitialSwitchInfoController extends BaseController * @param initialSwitchInfo * @return */ - @RequiresPermissions("rocketmq:switchInfo:list") @PostMapping("/getSwitchNetDetailsMsg") public AjaxResult switchNetDetailsMsg(@RequestBody InitialSwitchInfo initialSwitchInfo){ return success(initialSwitchInfoService.getSwitchNetDetailsMsg(initialSwitchInfo)); @@ -113,7 +107,6 @@ public class InitialSwitchInfoController extends BaseController * @param initialSwitchInfo * @return */ - @RequiresPermissions("rocketmq:switchInfo:list") @PostMapping("/switchNetSpeedEcharts") public AjaxResult switchNetSpeedEcharts(@RequestBody InitialSwitchInfo initialSwitchInfo){ Map echartsData = initialSwitchInfoService.switchNetSpeedEcharts(initialSwitchInfo); @@ -124,7 +117,6 @@ public class InitialSwitchInfoController extends BaseController * @param initialSwitchInfo * @return */ - @RequiresPermissions("rocketmq:switchInfo:list") @PostMapping("/switchNetDiscardsEcharts") public AjaxResult switchNetDiscardsEcharts(@RequestBody InitialSwitchInfo initialSwitchInfo){ Map echartsData = initialSwitchInfoService.switchNetDiscardsEcharts(initialSwitchInfo); @@ -135,7 +127,6 @@ public class InitialSwitchInfoController extends BaseController * @param initialSwitchInfo * @return */ - @RequiresPermissions("rocketmq:switchInfo:list") @PostMapping("/switchNetTotalEcharts") public AjaxResult switchNetTotalEcharts(@RequestBody InitialSwitchInfo initialSwitchInfo){ Map echartsData = initialSwitchInfoService.switchNetTotalEcharts(initialSwitchInfo); @@ -146,7 +137,6 @@ public class InitialSwitchInfoController extends BaseController * @param initialSwitchInfo * @return */ - @RequiresPermissions("rocketmq:switchInfo:list") @PostMapping("/switchNetErrDiscardsEcharts") public AjaxResult switchNetErrDiscardsEcharts(@RequestBody InitialSwitchInfo initialSwitchInfo){ Map echartsData = initialSwitchInfoService.switchNetErrDiscardsEcharts(initialSwitchInfo); diff --git a/tongran-rocketmq/src/main/java/com/tongran/rocketmq/controller/InitialSwitchInfoTempController.java b/tongran-rocketmq/src/main/java/com/tongran/rocketmq/controller/InitialSwitchInfoTempController.java index 2b363f6..1d1b19c 100644 --- a/tongran-rocketmq/src/main/java/com/tongran/rocketmq/controller/InitialSwitchInfoTempController.java +++ b/tongran-rocketmq/src/main/java/com/tongran/rocketmq/controller/InitialSwitchInfoTempController.java @@ -1,25 +1,19 @@ package com.tongran.rocketmq.controller; -import java.util.List; -import javax.servlet.http.HttpServletResponse; -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; +import com.tongran.common.core.utils.poi.ExcelUtil; +import com.tongran.common.core.web.controller.BaseController; +import com.tongran.common.core.web.domain.AjaxResult; +import com.tongran.common.core.web.page.TableDataInfo; import com.tongran.common.log.annotation.Log; import com.tongran.common.log.enums.BusinessType; import com.tongran.common.security.annotation.RequiresPermissions; import com.tongran.rocketmq.domain.InitialSwitchInfoTemp; import com.tongran.rocketmq.service.IInitialSwitchInfoTempService; -import com.tongran.common.core.web.controller.BaseController; -import com.tongran.common.core.web.domain.AjaxResult; -import com.tongran.common.core.utils.poi.ExcelUtil; -import com.tongran.common.core.web.page.TableDataInfo; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; + +import javax.servlet.http.HttpServletResponse; +import java.util.List; /** * 交换机监控信息Controller @@ -29,6 +23,7 @@ import com.tongran.common.core.web.page.TableDataInfo; */ @RestController @RequestMapping("/temp") +@RequiresPermissions("rocketmq:switchInfo") public class InitialSwitchInfoTempController extends BaseController { @Autowired @@ -37,7 +32,6 @@ public class InitialSwitchInfoTempController extends BaseController /** * 查询交换机监控信息列表 */ - @RequiresPermissions("rocketmq:temp:list") @GetMapping("/list") public TableDataInfo list(InitialSwitchInfoTemp initialSwitchInfoTemp) { @@ -49,7 +43,6 @@ public class InitialSwitchInfoTempController extends BaseController /** * 导出交换机监控信息列表 */ - @RequiresPermissions("rocketmq:temp:export") @Log(title = "交换机监控信息", businessType = BusinessType.EXPORT) @PostMapping("/export") public void export(HttpServletResponse response, InitialSwitchInfoTemp initialSwitchInfoTemp) @@ -62,7 +55,6 @@ public class InitialSwitchInfoTempController extends BaseController /** * 获取交换机监控信息详细信息 */ - @RequiresPermissions("rocketmq:temp:query") @GetMapping(value = "/{id}") public AjaxResult getInfo(@PathVariable("id") Long id) { @@ -72,7 +64,6 @@ public class InitialSwitchInfoTempController extends BaseController /** * 新增交换机监控信息 */ - @RequiresPermissions("rocketmq:temp:add") @Log(title = "交换机监控信息", businessType = BusinessType.INSERT) @PostMapping public AjaxResult add(@RequestBody InitialSwitchInfoTemp initialSwitchInfoTemp) @@ -83,7 +74,6 @@ public class InitialSwitchInfoTempController extends BaseController /** * 修改交换机监控信息 */ - @RequiresPermissions("rocketmq:temp:edit") @Log(title = "交换机监控信息", businessType = BusinessType.UPDATE) @PutMapping public AjaxResult edit(@RequestBody InitialSwitchInfoTemp initialSwitchInfoTemp) @@ -94,7 +84,6 @@ public class InitialSwitchInfoTempController extends BaseController /** * 删除交换机监控信息 */ - @RequiresPermissions("rocketmq:temp:remove") @Log(title = "交换机监控信息", businessType = BusinessType.DELETE) @DeleteMapping("/{ids}") public AjaxResult remove(@PathVariable Long[] ids) diff --git a/tongran-rocketmq/src/main/java/com/tongran/rocketmq/controller/InitialSwitchMpuInfoController.java b/tongran-rocketmq/src/main/java/com/tongran/rocketmq/controller/InitialSwitchMpuInfoController.java index 5e66744..d819560 100644 --- a/tongran-rocketmq/src/main/java/com/tongran/rocketmq/controller/InitialSwitchMpuInfoController.java +++ b/tongran-rocketmq/src/main/java/com/tongran/rocketmq/controller/InitialSwitchMpuInfoController.java @@ -24,6 +24,7 @@ import java.util.Map; */ @RestController @RequestMapping("/switchMpuInfo") +@RequiresPermissions("rocketmq:switchInfo") public class InitialSwitchMpuInfoController extends BaseController { @Autowired @@ -32,7 +33,6 @@ public class InitialSwitchMpuInfoController extends BaseController /** * 查询MPU信息列表 */ - @RequiresPermissions("rocketmq:info:list") @GetMapping("/list") public TableDataInfo list(InitialSwitchMpuInfo initialSwitchMpuInfo) { @@ -44,7 +44,6 @@ public class InitialSwitchMpuInfoController extends BaseController /** * 导出MPU信息列表 */ - @RequiresPermissions("rocketmq:info:export") @Log(title = "MPU信息", businessType = BusinessType.EXPORT) @PostMapping("/export") public void export(HttpServletResponse response, InitialSwitchMpuInfo initialSwitchMpuInfo) @@ -57,7 +56,6 @@ public class InitialSwitchMpuInfoController extends BaseController /** * 获取MPU信息详细信息 */ - @RequiresPermissions("rocketmq:info:query") @GetMapping(value = "/{id}") public AjaxResult getInfo(@PathVariable("id") Long id) { @@ -67,7 +65,6 @@ public class InitialSwitchMpuInfoController extends BaseController /** * 新增MPU信息 */ - @RequiresPermissions("rocketmq:info:add") @Log(title = "MPU信息", businessType = BusinessType.INSERT) @PostMapping public AjaxResult add(@RequestBody InitialSwitchMpuInfo initialSwitchMpuInfo) @@ -78,7 +75,6 @@ public class InitialSwitchMpuInfoController extends BaseController /** * 修改MPU信息 */ - @RequiresPermissions("rocketmq:info:edit") @Log(title = "MPU信息", businessType = BusinessType.UPDATE) @PutMapping public AjaxResult edit(@RequestBody InitialSwitchMpuInfo initialSwitchMpuInfo) @@ -89,7 +85,6 @@ public class InitialSwitchMpuInfoController extends BaseController /** * 删除MPU信息 */ - @RequiresPermissions("rocketmq:info:remove") @Log(title = "MPU信息", businessType = BusinessType.DELETE) @DeleteMapping("/{ids}") public AjaxResult remove(@PathVariable Long[] ids) @@ -102,7 +97,6 @@ public class InitialSwitchMpuInfoController extends BaseController * @param initialSwitchMpuInfo * @return */ - @RequiresPermissions("rocketmq:info:list") @PostMapping("/getAllMpuName") public AjaxResult getAllMpuName(@RequestBody InitialSwitchMpuInfo initialSwitchMpuInfo){ List list = initialSwitchMpuInfoService.getAllMpuName(initialSwitchMpuInfo); @@ -113,7 +107,6 @@ public class InitialSwitchMpuInfoController extends BaseController * @param initialSwitchMpuInfo * @return */ - @RequiresPermissions("rocketmq:info:list") @PostMapping("/getMpuMsg") public AjaxResult getMpuMsg(@RequestBody InitialSwitchMpuInfo initialSwitchMpuInfo){ List list = initialSwitchMpuInfoService.getMpuMsg(initialSwitchMpuInfo); @@ -124,7 +117,6 @@ public class InitialSwitchMpuInfoController extends BaseController * @param initialSwitchMpuInfo * @return */ - @RequiresPermissions("rocketmq:info:list") @PostMapping("/getMpuCpuUse") public AjaxResult getMpuCpuUse(@RequestBody InitialSwitchMpuInfo initialSwitchMpuInfo){ Map echartsData = initialSwitchMpuInfoService.getMpuCpuUse(initialSwitchMpuInfo); @@ -135,7 +127,6 @@ public class InitialSwitchMpuInfoController extends BaseController * @param initialSwitchMpuInfo * @return */ - @RequiresPermissions("rocketmq:info:list") @PostMapping("/getMpuMemUse") public AjaxResult getMpuMemUse(@RequestBody InitialSwitchMpuInfo initialSwitchMpuInfo){ Map echartsData = initialSwitchMpuInfoService.getMpuMemUse(initialSwitchMpuInfo); @@ -146,7 +137,6 @@ public class InitialSwitchMpuInfoController extends BaseController * @param initialSwitchMpuInfo * @return */ - @RequiresPermissions("rocketmq:info:list") @PostMapping("/getMpuTemperature") public AjaxResult getMpuTemperature(@RequestBody InitialSwitchMpuInfo initialSwitchMpuInfo){ Map echartsData = initialSwitchMpuInfoService.getMpuTemperature(initialSwitchMpuInfo); diff --git a/tongran-rocketmq/src/main/java/com/tongran/rocketmq/controller/InitialSwitchOpticalModuleController.java b/tongran-rocketmq/src/main/java/com/tongran/rocketmq/controller/InitialSwitchOpticalModuleController.java index 2d26aa0..4ada9e9 100644 --- a/tongran-rocketmq/src/main/java/com/tongran/rocketmq/controller/InitialSwitchOpticalModuleController.java +++ b/tongran-rocketmq/src/main/java/com/tongran/rocketmq/controller/InitialSwitchOpticalModuleController.java @@ -24,6 +24,7 @@ import java.util.Map; */ @RestController @RequestMapping("/switchOpticalModule") +@RequiresPermissions("rocketmq:switchInfo") public class InitialSwitchOpticalModuleController extends BaseController { @Autowired @@ -32,7 +33,6 @@ public class InitialSwitchOpticalModuleController extends BaseController /** * 查询光模块信息列表 */ - @RequiresPermissions("rocketmq:module:list") @GetMapping("/list") public TableDataInfo list(InitialSwitchOpticalModule initialSwitchOpticalModule) { @@ -44,7 +44,6 @@ public class InitialSwitchOpticalModuleController extends BaseController /** * 导出光模块信息列表 */ - @RequiresPermissions("rocketmq:module:export") @Log(title = "光模块信息", businessType = BusinessType.EXPORT) @PostMapping("/export") public void export(HttpServletResponse response, InitialSwitchOpticalModule initialSwitchOpticalModule) @@ -57,7 +56,6 @@ public class InitialSwitchOpticalModuleController extends BaseController /** * 获取光模块信息详细信息 */ - @RequiresPermissions("rocketmq:module:query") @GetMapping(value = "/{id}") public AjaxResult getInfo(@PathVariable("id") Long id) { @@ -67,7 +65,6 @@ public class InitialSwitchOpticalModuleController extends BaseController /** * 新增光模块信息 */ - @RequiresPermissions("rocketmq:module:add") @Log(title = "光模块信息", businessType = BusinessType.INSERT) @PostMapping public AjaxResult add(@RequestBody InitialSwitchOpticalModule initialSwitchOpticalModule) @@ -78,7 +75,6 @@ public class InitialSwitchOpticalModuleController extends BaseController /** * 修改光模块信息 */ - @RequiresPermissions("rocketmq:module:edit") @Log(title = "光模块信息", businessType = BusinessType.UPDATE) @PutMapping public AjaxResult edit(@RequestBody InitialSwitchOpticalModule initialSwitchOpticalModule) @@ -89,7 +85,6 @@ public class InitialSwitchOpticalModuleController extends BaseController /** * 删除光模块信息 */ - @RequiresPermissions("rocketmq:module:remove") @Log(title = "光模块信息", businessType = BusinessType.DELETE) @DeleteMapping("/{ids}") public AjaxResult remove(@PathVariable Long[] ids) @@ -101,7 +96,6 @@ public class InitialSwitchOpticalModuleController extends BaseController * 获取该交换机的所有光模块名称 * @return */ - @RequiresPermissions("rocketmq:module:list") @PostMapping("/getAllModuleName") public AjaxResult getAllModuleName(@RequestBody InitialSwitchOpticalModule initialSwitchOpticalModule){ List list = initialSwitchOpticalModuleService.getAllModuleName(initialSwitchOpticalModule); @@ -112,7 +106,6 @@ public class InitialSwitchOpticalModuleController extends BaseController * @param initialSwitchOpticalModule * @return */ - @RequiresPermissions("rocketmq:module:list") @PostMapping("/switchOpticalModuleMsg") public AjaxResult switchOpticalModuleMsg(@RequestBody InitialSwitchOpticalModule initialSwitchOpticalModule){ @@ -124,7 +117,6 @@ public class InitialSwitchOpticalModuleController extends BaseController * @param initialSwitchOpticalModule * @return */ - @RequiresPermissions("rocketmq:module:list") @PostMapping("/opticalModuleLowThreshold") public AjaxResult opticalModuleLowThreshold(@RequestBody InitialSwitchOpticalModule initialSwitchOpticalModule){ Map echartsData = initialSwitchOpticalModuleService.opticalModuleLowThreshold(initialSwitchOpticalModule); @@ -135,7 +127,6 @@ public class InitialSwitchOpticalModuleController extends BaseController * @param initialSwitchOpticalModule * @return */ - @RequiresPermissions("rocketmq:module:list") @PostMapping("/opticalModulePower") public AjaxResult opticalModulePower(@RequestBody InitialSwitchOpticalModule initialSwitchOpticalModule){ Map echartsData = initialSwitchOpticalModuleService.opticalModulePower(initialSwitchOpticalModule); diff --git a/tongran-rocketmq/src/main/java/com/tongran/rocketmq/controller/InitialSwitchOtherCollectDataController.java b/tongran-rocketmq/src/main/java/com/tongran/rocketmq/controller/InitialSwitchOtherCollectDataController.java index ad0ded6..21bac1b 100644 --- a/tongran-rocketmq/src/main/java/com/tongran/rocketmq/controller/InitialSwitchOtherCollectDataController.java +++ b/tongran-rocketmq/src/main/java/com/tongran/rocketmq/controller/InitialSwitchOtherCollectDataController.java @@ -24,6 +24,7 @@ import java.util.Map; */ @RestController @RequestMapping("/switchOtherData") +@RequiresPermissions("rocketmq:switchInfo") public class InitialSwitchOtherCollectDataController extends BaseController { @Autowired @@ -32,7 +33,6 @@ public class InitialSwitchOtherCollectDataController extends BaseController /** * 查询交换机系统其他信息采集数据列表 */ - @RequiresPermissions("rocketmq:switchOtherData:list") @GetMapping("/list") public TableDataInfo list(InitialSwitchOtherCollectData initialSwitchOtherCollectData) { @@ -44,7 +44,6 @@ public class InitialSwitchOtherCollectDataController extends BaseController /** * 导出交换机系统其他信息采集数据列表 */ - @RequiresPermissions("rocketmq:switchOtherData:export") @Log(title = "交换机系统其他信息采集数据", businessType = BusinessType.EXPORT) @PostMapping("/export") public void export(HttpServletResponse response, InitialSwitchOtherCollectData initialSwitchOtherCollectData) @@ -57,7 +56,6 @@ public class InitialSwitchOtherCollectDataController extends BaseController /** * 获取交换机系统其他信息采集数据详细信息 */ - @RequiresPermissions("rocketmq:switchOtherData:query") @GetMapping(value = "/{id}") public AjaxResult getInfo(@PathVariable("id") Long id) { @@ -67,7 +65,6 @@ public class InitialSwitchOtherCollectDataController extends BaseController /** * 新增交换机系统其他信息采集数据 */ - @RequiresPermissions("rocketmq:switchOtherData:add") @Log(title = "交换机系统其他信息采集数据", businessType = BusinessType.INSERT) @PostMapping public AjaxResult add(@RequestBody InitialSwitchOtherCollectData initialSwitchOtherCollectData) @@ -78,7 +75,6 @@ public class InitialSwitchOtherCollectDataController extends BaseController /** * 修改交换机系统其他信息采集数据 */ - @RequiresPermissions("rocketmq:switchOtherData:edit") @Log(title = "交换机系统其他信息采集数据", businessType = BusinessType.UPDATE) @PutMapping public AjaxResult edit(@RequestBody InitialSwitchOtherCollectData initialSwitchOtherCollectData) @@ -89,7 +85,6 @@ public class InitialSwitchOtherCollectDataController extends BaseController /** * 删除交换机系统其他信息采集数据 */ - @RequiresPermissions("rocketmq:switchOtherData:remove") @Log(title = "交换机系统其他信息采集数据", businessType = BusinessType.DELETE) @DeleteMapping("/{ids}") public AjaxResult remove(@PathVariable Long[] ids) @@ -99,7 +94,6 @@ public class InitialSwitchOtherCollectDataController extends BaseController /** * 图形监控交换机监控项基础信息 */ - @RequiresPermissions("rocketmq:switchOtherData:list") @PostMapping("/getSwitchMonitorMsg") public AjaxResult getSwitchMonitorMsg(@RequestBody InitialSwitchOtherCollectData initialSwitchOtherCollectData) { @@ -109,7 +103,6 @@ public class InitialSwitchOtherCollectDataController extends BaseController /** * 图形监控交换机设备CPU使用率 */ - @RequiresPermissions("rocketmq:switchOtherData:list") @PostMapping("/getSwitchCpuUseMsg") public AjaxResult getSwitchCpuUseMsg(@RequestBody InitialSwitchOtherCollectData initialSwitchOtherCollectData) { @@ -119,7 +112,6 @@ public class InitialSwitchOtherCollectDataController extends BaseController /** * 图形监控交换机设备内存利用率 */ - @RequiresPermissions("rocketmq:switchOtherData:list") @PostMapping("/getSwitchMemUseMsg") public AjaxResult getSwitchMemUseMsg(@RequestBody InitialSwitchOtherCollectData initialSwitchOtherCollectData) { @@ -129,7 +121,6 @@ public class InitialSwitchOtherCollectDataController extends BaseController /** * 图形监控交换机设备系统功率 */ - @RequiresPermissions("rocketmq:switchOtherData:list") @PostMapping("/getSwitchPowerMsg") public AjaxResult getSwitchPowerMsg(@RequestBody InitialSwitchOtherCollectData initialSwitchOtherCollectData) { diff --git a/tongran-rocketmq/src/main/java/com/tongran/rocketmq/controller/InitialSwitchPowerSupplyController.java b/tongran-rocketmq/src/main/java/com/tongran/rocketmq/controller/InitialSwitchPowerSupplyController.java index 14e6971..292e6bd 100644 --- a/tongran-rocketmq/src/main/java/com/tongran/rocketmq/controller/InitialSwitchPowerSupplyController.java +++ b/tongran-rocketmq/src/main/java/com/tongran/rocketmq/controller/InitialSwitchPowerSupplyController.java @@ -24,6 +24,7 @@ import java.util.Map; */ @RestController @RequestMapping("/switchPowerSupply") +@RequiresPermissions("rocketmq:switchInfo") public class InitialSwitchPowerSupplyController extends BaseController { @Autowired @@ -32,7 +33,6 @@ public class InitialSwitchPowerSupplyController extends BaseController /** * 查询电源信息列表 */ - @RequiresPermissions("rocketmq:supply:list") @GetMapping("/list") public TableDataInfo list(InitialSwitchPowerSupply initialSwitchPowerSupply) { @@ -44,7 +44,6 @@ public class InitialSwitchPowerSupplyController extends BaseController /** * 导出电源信息列表 */ - @RequiresPermissions("rocketmq:supply:export") @Log(title = "电源信息", businessType = BusinessType.EXPORT) @PostMapping("/export") public void export(HttpServletResponse response, InitialSwitchPowerSupply initialSwitchPowerSupply) @@ -57,7 +56,6 @@ public class InitialSwitchPowerSupplyController extends BaseController /** * 获取电源信息详细信息 */ - @RequiresPermissions("rocketmq:supply:query") @GetMapping(value = "/{id}") public AjaxResult getInfo(@PathVariable("id") Long id) { @@ -67,7 +65,6 @@ public class InitialSwitchPowerSupplyController extends BaseController /** * 新增电源信息 */ - @RequiresPermissions("rocketmq:supply:add") @Log(title = "电源信息", businessType = BusinessType.INSERT) @PostMapping public AjaxResult add(@RequestBody InitialSwitchPowerSupply initialSwitchPowerSupply) @@ -78,7 +75,6 @@ public class InitialSwitchPowerSupplyController extends BaseController /** * 修改电源信息 */ - @RequiresPermissions("rocketmq:supply:edit") @Log(title = "电源信息", businessType = BusinessType.UPDATE) @PutMapping public AjaxResult edit(@RequestBody InitialSwitchPowerSupply initialSwitchPowerSupply) @@ -89,7 +85,6 @@ public class InitialSwitchPowerSupplyController extends BaseController /** * 删除电源信息 */ - @RequiresPermissions("rocketmq:supply:remove") @Log(title = "电源信息", businessType = BusinessType.DELETE) @DeleteMapping("/{ids}") public AjaxResult remove(@PathVariable Long[] ids) @@ -101,7 +96,6 @@ public class InitialSwitchPowerSupplyController extends BaseController * @param initialSwitchPowerSupply * @return */ - @RequiresPermissions("rocketmq:supply:list") @PostMapping("/getAllPwrName") public AjaxResult getAllPwrName(@RequestBody InitialSwitchPowerSupply initialSwitchPowerSupply){ List list = initialSwitchPowerSupplyService.getAllPwrName(initialSwitchPowerSupply); @@ -112,7 +106,6 @@ public class InitialSwitchPowerSupplyController extends BaseController * @param initialSwitchPowerSupply * @return */ - @RequiresPermissions("rocketmq:supply:list") @PostMapping("/getPwrMsg") public AjaxResult getPwrMsg(@RequestBody InitialSwitchPowerSupply initialSwitchPowerSupply){ List list = initialSwitchPowerSupplyService.getPwrMsg(initialSwitchPowerSupply); @@ -123,7 +116,6 @@ public class InitialSwitchPowerSupplyController extends BaseController * @param initialSwitchPowerSupply * @return */ - @RequiresPermissions("rocketmq:supply:list") @PostMapping("/getPwrCurrent") public AjaxResult getPwrCurrent(@RequestBody InitialSwitchPowerSupply initialSwitchPowerSupply){ Map echartsData = initialSwitchPowerSupplyService.getPwrCurrent(initialSwitchPowerSupply); @@ -134,7 +126,6 @@ public class InitialSwitchPowerSupplyController extends BaseController * @param initialSwitchPowerSupply * @return */ - @RequiresPermissions("rocketmq:supply:list") @PostMapping("/getPwrVoltage") public AjaxResult getPwrVoltage(@RequestBody InitialSwitchPowerSupply initialSwitchPowerSupply){ Map echartsData = initialSwitchPowerSupplyService.getPwrVoltage(initialSwitchPowerSupply); diff --git a/tongran-rocketmq/src/main/java/com/tongran/rocketmq/controller/InitialSystemInfoController.java b/tongran-rocketmq/src/main/java/com/tongran/rocketmq/controller/InitialSystemInfoController.java index ffd526d..1c1f9e2 100644 --- a/tongran-rocketmq/src/main/java/com/tongran/rocketmq/controller/InitialSystemInfoController.java +++ b/tongran-rocketmq/src/main/java/com/tongran/rocketmq/controller/InitialSystemInfoController.java @@ -26,6 +26,7 @@ import java.util.Map; */ @RestController @RequestMapping("/systemInfo") +@RequiresPermissions("rocketmq:traffic") public class InitialSystemInfoController extends BaseController { @Autowired @@ -34,7 +35,6 @@ public class InitialSystemInfoController extends BaseController /** * 查询系统监控信息列表 */ - @RequiresPermissions("rocketmq:systemInfo:list") @PostMapping("/list") public TableDataInfo list(@RequestBody InitialSystemInfo initialSystemInfo) { @@ -49,7 +49,6 @@ public class InitialSystemInfoController extends BaseController /** * 导出系统监控信息列表 */ - @RequiresPermissions("rocketmq:systemInfo:export") @Log(title = "系统监控信息", businessType = BusinessType.EXPORT) @PostMapping("/export") public void export(HttpServletResponse response, InitialSystemInfo initialSystemInfo) @@ -62,7 +61,6 @@ public class InitialSystemInfoController extends BaseController /** * 获取系统监控信息详细信息 */ - @RequiresPermissions("rocketmq:systemInfo:query") @GetMapping(value = "/{id}") public AjaxResult getInfo(@PathVariable("id") Long id) { @@ -72,7 +70,6 @@ public class InitialSystemInfoController extends BaseController /** * 新增系统监控信息 */ - @RequiresPermissions("rocketmq:systemInfo:add") @Log(title = "系统监控信息", businessType = BusinessType.INSERT) @PostMapping public AjaxResult add(@RequestBody InitialSystemInfo initialSystemInfo) @@ -83,7 +80,6 @@ public class InitialSystemInfoController extends BaseController /** * 修改系统监控信息 */ - @RequiresPermissions("rocketmq:systemInfo:edit") @Log(title = "系统监控信息", businessType = BusinessType.UPDATE) @PutMapping public AjaxResult edit(@RequestBody InitialSystemInfo initialSystemInfo) @@ -94,7 +90,6 @@ public class InitialSystemInfoController extends BaseController /** * 删除系统监控信息 */ - @RequiresPermissions("rocketmq:systemInfo:remove") @Log(title = "系统监控信息", businessType = BusinessType.DELETE) @DeleteMapping("/{ids}") public AjaxResult remove(@PathVariable Long[] ids) @@ -106,7 +101,6 @@ public class InitialSystemInfoController extends BaseController * @param initialSystemInfo * @return */ - @RequiresPermissions("rocketmq:systemInfo:list") @PostMapping("/systemProcessEcharts") public AjaxResult systemProcessEcharts(@RequestBody InitialSystemInfo initialSystemInfo) { Map echartsData = initialSystemInfoService.systemProcessEcharts(initialSystemInfo); @@ -117,7 +111,6 @@ public class InitialSystemInfoController extends BaseController * @param initialSystemInfo * @return */ - @RequiresPermissions("rocketmq:systemInfo:list") @PostMapping("/systemUserNumEcharts") public AjaxResult systemUserNumEcharts(@RequestBody InitialSystemInfo initialSystemInfo) { Map echartsData = initialSystemInfoService.systemUserNumEcharts(initialSystemInfo); @@ -129,7 +122,6 @@ public class InitialSystemInfoController extends BaseController * @param initialSystemInfo * @return */ - @RequiresPermissions("rocketmq:systemInfo:list") @PostMapping("/systemDetailsMsg") public AjaxResult systemDetailsMsg(@RequestBody InitialSystemInfo initialSystemInfo) { SystemMsgVo systemDetailsMsg = initialSystemInfoService.getSystemDetailsMsg(initialSystemInfo); diff --git a/tongran-rocketmq/src/main/java/com/tongran/rocketmq/controller/InitialSystemOtherCollectDataController.java b/tongran-rocketmq/src/main/java/com/tongran/rocketmq/controller/InitialSystemOtherCollectDataController.java index 2305b01..33c65b6 100644 --- a/tongran-rocketmq/src/main/java/com/tongran/rocketmq/controller/InitialSystemOtherCollectDataController.java +++ b/tongran-rocketmq/src/main/java/com/tongran/rocketmq/controller/InitialSystemOtherCollectDataController.java @@ -24,6 +24,7 @@ import java.util.Map; */ @RestController @RequestMapping("/systemOtherCollectData") +@RequiresPermissions("rocketmq:traffic") public class InitialSystemOtherCollectDataController extends BaseController { @Autowired @@ -32,7 +33,6 @@ public class InitialSystemOtherCollectDataController extends BaseController /** * 查询交换机系统其他信息采集数据列表 */ - @RequiresPermissions("rocketmq:systemOtherCollectData:list") @GetMapping("/list") public TableDataInfo list(InitialSystemOtherCollectData initialSystemOtherCollectData) { @@ -44,7 +44,6 @@ public class InitialSystemOtherCollectDataController extends BaseController /** * 导出交换机系统其他信息采集数据列表 */ - @RequiresPermissions("rocketmq:systemOtherCollectData:export") @Log(title = "交换机系统其他信息采集数据", businessType = BusinessType.EXPORT) @PostMapping("/export") public void export(HttpServletResponse response, InitialSystemOtherCollectData initialSystemOtherCollectData) @@ -57,7 +56,6 @@ public class InitialSystemOtherCollectDataController extends BaseController /** * 获取交换机系统其他信息采集数据详细信息 */ - @RequiresPermissions("rocketmq:systemOtherCollectData:query") @GetMapping(value = "/{id}") public AjaxResult getInfo(@PathVariable("id") Long id) { @@ -67,7 +65,6 @@ public class InitialSystemOtherCollectDataController extends BaseController /** * 新增交换机系统其他信息采集数据 */ - @RequiresPermissions("rocketmq:systemOtherCollectData:add") @Log(title = "交换机系统其他信息采集数据", businessType = BusinessType.INSERT) @PostMapping public AjaxResult add(@RequestBody InitialSystemOtherCollectData initialSystemOtherCollectData) @@ -78,7 +75,6 @@ public class InitialSystemOtherCollectDataController extends BaseController /** * 修改交换机系统其他信息采集数据 */ - @RequiresPermissions("rocketmq:systemOtherCollectData:edit") @Log(title = "交换机系统其他信息采集数据", businessType = BusinessType.UPDATE) @PutMapping public AjaxResult edit(@RequestBody InitialSystemOtherCollectData initialSystemOtherCollectData) @@ -89,7 +85,6 @@ public class InitialSystemOtherCollectDataController extends BaseController /** * 删除交换机系统其他信息采集数据 */ - @RequiresPermissions("rocketmq:systemOtherCollectData:remove") @Log(title = "交换机系统其他信息采集数据", businessType = BusinessType.DELETE) @DeleteMapping("/{ids}") public AjaxResult remove(@PathVariable Long[] ids) @@ -99,7 +94,6 @@ public class InitialSystemOtherCollectDataController extends BaseController /** * 查询系统其他信息基础数据 */ - @RequiresPermissions("rocketmq:systemOtherCollectData:list") @PostMapping("/getMontiorMsg") public AjaxResult getMontiorMsg(@RequestBody InitialSystemOtherCollectData initialSystemOtherCollectData) { @@ -111,7 +105,6 @@ public class InitialSystemOtherCollectDataController extends BaseController * @param initialSystemOtherCollectData * @return */ - @RequiresPermissions("rocketmq:systemOtherCollectData:list") @PostMapping("/systemUserNumEcharts") public AjaxResult systemUserNumEcharts(@RequestBody InitialSystemOtherCollectData initialSystemOtherCollectData) { Map echartsData = initialSystemOtherCollectDataService.systemUserNumEcharts(initialSystemOtherCollectData); @@ -120,7 +113,6 @@ public class InitialSystemOtherCollectDataController extends BaseController /** * 查询交换卷文件的可用空间监控信息列表并封装为多折线ECharts图表数据 */ - @RequiresPermissions("rocketmq:systemOtherCollectData:list") @PostMapping("/systemSwapSizeFreeEcharts") public AjaxResult systemSwapSizeFreeEcharts(@RequestBody InitialSystemOtherCollectData initialSystemOtherCollectData) { Map echartsData = initialSystemOtherCollectDataService.systemSwapSizeFreeEcharts(initialSystemOtherCollectData); @@ -130,7 +122,6 @@ public class InitialSystemOtherCollectDataController extends BaseController /** * 查询内存利用率监控信息列表并封装为多折线ECharts图表数据 */ - @RequiresPermissions("rocketmq:systemOtherCollectData:list") @PostMapping("/memoryUtilizationEcharts") public AjaxResult memoryUtilizationEcharts(@RequestBody InitialSystemOtherCollectData initialSystemOtherCollectData) { Map echartsData = initialSystemOtherCollectDataService.memoryUtilizationEcharts(initialSystemOtherCollectData); @@ -140,7 +131,6 @@ public class InitialSystemOtherCollectDataController extends BaseController /** * 查询可用交换空间百分比监控信息列表并封装为多折线ECharts图表数据 */ - @RequiresPermissions("rocketmq:systemOtherCollectData:list") @PostMapping("/systemSwapSizePercentEcharts") public AjaxResult systemSwapSizePercentEcharts(@RequestBody InitialSystemOtherCollectData initialSystemOtherCollectData) { Map echartsData = initialSystemOtherCollectDataService.systemSwapSizePercentEcharts(initialSystemOtherCollectData); @@ -150,7 +140,6 @@ public class InitialSystemOtherCollectDataController extends BaseController /** * 查询可用内存监控信息列表并封装为多折线ECharts图表数据 */ - @RequiresPermissions("rocketmq:systemOtherCollectData:list") @PostMapping("/memorySizeAvailableEcharts") public AjaxResult memorySizeAvailableEcharts(@RequestBody InitialSystemOtherCollectData initialSystemOtherCollectData) { Map echartsData = initialSystemOtherCollectDataService.memorySizeAvailableEcharts(initialSystemOtherCollectData); @@ -160,7 +149,6 @@ public class InitialSystemOtherCollectDataController extends BaseController /** * 查询可用内存百分比监控信息列表并封装为多折线ECharts图表数据 */ - @RequiresPermissions("rocketmq:systemOtherCollectData:list") @PostMapping("/memorySizePercentEcharts") public AjaxResult memorySizePercentEcharts(@RequestBody InitialSystemOtherCollectData initialSystemOtherCollectData) { Map echartsData = initialSystemOtherCollectDataService.memorySizePercentEcharts(initialSystemOtherCollectData); @@ -171,7 +159,6 @@ public class InitialSystemOtherCollectDataController extends BaseController /** * 查询进程数监控信息列表并封装为多折线ECharts图表数据 */ - @RequiresPermissions("rocketmq:systemOtherCollectData:list") @PostMapping("/procNumEcharts") public AjaxResult procNumEcharts(@RequestBody InitialSystemOtherCollectData initialSystemOtherCollectData) { Map echartsData = initialSystemOtherCollectDataService.procNumEcharts(initialSystemOtherCollectData); diff --git a/tongran-rocketmq/src/main/java/com/tongran/rocketmq/controller/RmAgentManagementController.java b/tongran-rocketmq/src/main/java/com/tongran/rocketmq/controller/RmAgentManagementController.java index 2f6b15f..54002b5 100644 --- a/tongran-rocketmq/src/main/java/com/tongran/rocketmq/controller/RmAgentManagementController.java +++ b/tongran-rocketmq/src/main/java/com/tongran/rocketmq/controller/RmAgentManagementController.java @@ -22,6 +22,7 @@ import java.util.List; */ @RestController @RequestMapping("/agentManagement") +@RequiresPermissions("rocketmq:management") public class RmAgentManagementController extends BaseController { @Autowired @@ -30,7 +31,6 @@ public class RmAgentManagementController extends BaseController /** * 查询Agent管理列表 */ - @RequiresPermissions("rocketmq:management:list") @PostMapping("/list") public TableDataInfo list(@RequestBody RmAgentManagement rmAgentManagement) { @@ -45,7 +45,6 @@ public class RmAgentManagementController extends BaseController /** * 获取Agent管理详细信息 */ - @RequiresPermissions("rocketmq:management:query") @GetMapping(value = "/{id}") public AjaxResult getInfo(@PathVariable("id") Long id) { @@ -55,7 +54,6 @@ public class RmAgentManagementController extends BaseController /** * 新增Agent管理 */ - @RequiresPermissions("rocketmq:management:add") @Log(title = "Agent管理", businessType = BusinessType.INSERT) @PostMapping public AjaxResult add(@RequestBody RmAgentManagement rmAgentManagement) @@ -66,7 +64,6 @@ public class RmAgentManagementController extends BaseController /** * 修改Agent管理 */ - @RequiresPermissions("rocketmq:management:edit") @Log(title = "Agent管理", businessType = BusinessType.UPDATE) @PutMapping public AjaxResult edit(@RequestBody RmAgentManagement rmAgentManagement) @@ -79,7 +76,6 @@ public class RmAgentManagementController extends BaseController * @param rmAgentManagement * @return */ - @RequiresPermissions("rocketmq:management:edit") @PostMapping("/updateAgentNow") public AjaxResult updateAgentNow(@RequestBody RmAgentManagement rmAgentManagement){ rmAgentManagementService.updateAgentNow(rmAgentManagement); @@ -89,7 +85,6 @@ public class RmAgentManagementController extends BaseController /** * 配置更新策略 */ - @RequiresPermissions("rocketmq:management:add") @Log(title = "Agent管理", businessType = BusinessType.INSERT) @PostMapping("/addUpdatePolicy") public AjaxResult addUpdatePolicy(@RequestBody RmAgentManagement rmAgentManagement) diff --git a/tongran-rocketmq/src/main/java/com/tongran/rocketmq/controller/RmAlarmLogController.java b/tongran-rocketmq/src/main/java/com/tongran/rocketmq/controller/RmAlarmLogController.java index 71ef18d..c94bf33 100644 --- a/tongran-rocketmq/src/main/java/com/tongran/rocketmq/controller/RmAlarmLogController.java +++ b/tongran-rocketmq/src/main/java/com/tongran/rocketmq/controller/RmAlarmLogController.java @@ -24,6 +24,7 @@ import java.util.List; */ @RestController @RequestMapping("/alarmLog") +@RequiresPermissions("rocketmq:alarmLog") public class RmAlarmLogController extends BaseController { @Autowired @@ -32,7 +33,6 @@ public class RmAlarmLogController extends BaseController /** * 查询客户端告警信息列表 */ - @RequiresPermissions("rocketmq:alarmLog:list") @PostMapping("/list") public TableDataInfo list(@RequestBody RmAlarmLog rmAlarmLog) { @@ -47,7 +47,6 @@ public class RmAlarmLogController extends BaseController /** * 导出客户端告警信息列表 */ - @RequiresPermissions("rocketmq:alarmLog:export") @Log(title = "客户端告警信息", businessType = BusinessType.EXPORT) @PostMapping("/export") public void export(HttpServletResponse response, RmAlarmLog rmAlarmLog) @@ -61,7 +60,6 @@ public class RmAlarmLogController extends BaseController /** * 获取客户端告警信息详细信息 */ - @RequiresPermissions("rocketmq:alarmLog:query") @GetMapping(value = "/{id}") public AjaxResult getInfo(@PathVariable("id") Long id) { @@ -71,7 +69,6 @@ public class RmAlarmLogController extends BaseController /** * 新增客户端告警信息 */ - @RequiresPermissions("rocketmq:alarmLog:add") @Log(title = "客户端告警信息", businessType = BusinessType.INSERT) @PostMapping public AjaxResult add(@RequestBody RmAlarmLog rmAlarmLog) @@ -82,7 +79,6 @@ public class RmAlarmLogController extends BaseController /** * 修改客户端告警信息 */ - @RequiresPermissions("rocketmq:alarmLog:edit") @Log(title = "客户端告警信息", businessType = BusinessType.UPDATE) @PutMapping public AjaxResult edit(@RequestBody RmAlarmLog rmAlarmLog) @@ -93,7 +89,6 @@ public class RmAlarmLogController extends BaseController /** * 删除客户端告警信息 */ - @RequiresPermissions("rocketmq:alarmLog:remove") @Log(title = "客户端告警信息", businessType = BusinessType.DELETE) @DeleteMapping("/{ids}") public AjaxResult remove(@PathVariable Long[] ids) diff --git a/tongran-rocketmq/src/main/java/com/tongran/rocketmq/controller/RmAlarmPushConfigController.java b/tongran-rocketmq/src/main/java/com/tongran/rocketmq/controller/RmAlarmPushConfigController.java index 8533700..2658bb0 100644 --- a/tongran-rocketmq/src/main/java/com/tongran/rocketmq/controller/RmAlarmPushConfigController.java +++ b/tongran-rocketmq/src/main/java/com/tongran/rocketmq/controller/RmAlarmPushConfigController.java @@ -24,6 +24,7 @@ import java.util.List; */ @RestController @RequestMapping("/alarmPushConfig") +@RequiresPermissions("rocketmq:alarmPushConfig") public class RmAlarmPushConfigController extends BaseController { @Autowired @@ -32,7 +33,6 @@ public class RmAlarmPushConfigController extends BaseController /** * 查询告警推送配置列表 */ - @RequiresPermissions("rocketmq:alarmPushConfig:list") @PostMapping("/list") public TableDataInfo list(@RequestBody RmAlarmPushConfig rmAlarmPushConfig) { @@ -47,7 +47,6 @@ public class RmAlarmPushConfigController extends BaseController /** * 导出告警推送配置列表 */ - @RequiresPermissions("rocketmq:alarmPushConfig:export") @Log(title = "告警推送配置", businessType = BusinessType.EXPORT) @PostMapping("/export") public void export(HttpServletResponse response, RmAlarmPushConfig rmAlarmPushConfig) @@ -61,7 +60,6 @@ public class RmAlarmPushConfigController extends BaseController /** * 获取告警推送配置详细信息 */ - @RequiresPermissions("rocketmq:alarmPushConfig:query") @GetMapping(value = "/{id}") public AjaxResult getInfo(@PathVariable("id") Long id) { @@ -71,7 +69,6 @@ public class RmAlarmPushConfigController extends BaseController /** * 新增告警推送配置 */ - @RequiresPermissions("rocketmq:alarmPushConfig:add") @Log(title = "告警推送配置", businessType = BusinessType.INSERT) @PostMapping public AjaxResult add(@RequestBody RmAlarmPushConfig rmAlarmPushConfig) @@ -82,7 +79,6 @@ public class RmAlarmPushConfigController extends BaseController /** * 修改告警推送配置 */ - @RequiresPermissions("rocketmq:alarmPushConfig:edit") @Log(title = "告警推送配置", businessType = BusinessType.UPDATE) @PutMapping public AjaxResult edit(@RequestBody RmAlarmPushConfig rmAlarmPushConfig) @@ -93,7 +89,6 @@ public class RmAlarmPushConfigController extends BaseController /** * 删除告警推送配置 */ - @RequiresPermissions("rocketmq:alarmPushConfig:remove") @Log(title = "告警推送配置", businessType = BusinessType.DELETE) @DeleteMapping("/{ids}") public AjaxResult remove(@PathVariable Long[] ids) diff --git a/tongran-rocketmq/src/main/java/com/tongran/rocketmq/controller/RmDeploymentPolicyController.java b/tongran-rocketmq/src/main/java/com/tongran/rocketmq/controller/RmDeploymentPolicyController.java index 9698257..fe2a512 100644 --- a/tongran-rocketmq/src/main/java/com/tongran/rocketmq/controller/RmDeploymentPolicyController.java +++ b/tongran-rocketmq/src/main/java/com/tongran/rocketmq/controller/RmDeploymentPolicyController.java @@ -26,6 +26,7 @@ import java.util.List; */ @RestController @RequestMapping("/policy") +@RequiresPermissions("rocketmq:policy") public class RmDeploymentPolicyController extends BaseController { @Autowired @@ -34,7 +35,6 @@ public class RmDeploymentPolicyController extends BaseController /** * 查询服务器脚本策略列表 */ - @RequiresPermissions("rocketmq:policy:list") @PostMapping("/list") public TableDataInfo list(@RequestBody RmDeploymentPolicy rmDeploymentPolicy) { @@ -49,7 +49,6 @@ public class RmDeploymentPolicyController extends BaseController /** * 导出服务器脚本策略列表 */ - @RequiresPermissions("rocketmq:policy:export") @Log(title = "服务器脚本策略", businessType = BusinessType.EXPORT) @PostMapping("/export") public void export(HttpServletResponse response, @RequestBody RmDeploymentPolicy rmDeploymentPolicy) @@ -63,7 +62,6 @@ public class RmDeploymentPolicyController extends BaseController /** * 获取服务器脚本策略详细信息 */ - @RequiresPermissions("rocketmq:policy:query") @GetMapping(value = "/{id}") public AjaxResult getInfo(@PathVariable("id") Long id) { @@ -73,7 +71,6 @@ public class RmDeploymentPolicyController extends BaseController /** * 新增服务器脚本策略 */ - @RequiresPermissions("rocketmq:policy:add") @Log(title = "服务器脚本策略", businessType = BusinessType.INSERT) @PostMapping public AjaxResult add(@RequestBody RmDeploymentPolicy rmDeploymentPolicy) @@ -84,7 +81,6 @@ public class RmDeploymentPolicyController extends BaseController /** * 修改服务器脚本策略 */ - @RequiresPermissions("rocketmq:policy:edit") @Log(title = "服务器脚本策略", businessType = BusinessType.UPDATE) @PutMapping public AjaxResult edit(@RequestBody RmDeploymentPolicy rmDeploymentPolicy) @@ -95,7 +91,6 @@ public class RmDeploymentPolicyController extends BaseController /** * 删除服务器脚本策略 */ - @RequiresPermissions("rocketmq:policy:remove") @Log(title = "服务器脚本策略", businessType = BusinessType.DELETE) @DeleteMapping("/{ids}") public AjaxResult remove(@PathVariable Long[] ids) @@ -106,7 +101,6 @@ public class RmDeploymentPolicyController extends BaseController /** * 下发服务器脚本策略 */ - @RequiresPermissions("rocketmq:policy:list") @GetMapping(value = "/issueDeploymentPolicy") public AjaxResult issueDeploymentPolicy(Long id) { diff --git a/tongran-rocketmq/src/main/java/com/tongran/rocketmq/controller/RmInitialMonitorItemController.java b/tongran-rocketmq/src/main/java/com/tongran/rocketmq/controller/RmInitialMonitorItemController.java index ea5bd6b..60ba49f 100644 --- a/tongran-rocketmq/src/main/java/com/tongran/rocketmq/controller/RmInitialMonitorItemController.java +++ b/tongran-rocketmq/src/main/java/com/tongran/rocketmq/controller/RmInitialMonitorItemController.java @@ -2,7 +2,6 @@ package com.tongran.rocketmq.controller; import com.tongran.common.core.web.controller.BaseController; import com.tongran.common.core.web.domain.AjaxResult; -import com.tongran.common.security.annotation.RequiresPermissions; import com.tongran.rocketmq.domain.RmInitialMonitorItem; import com.tongran.rocketmq.service.IRmInitialMonitorItemService; import org.springframework.beans.factory.annotation.Autowired; @@ -30,7 +29,6 @@ public class RmInitialMonitorItemController extends BaseController /** * 查询监控项列表 */ - @RequiresPermissions("rocketmq:item:list") @PostMapping("/list") public AjaxResult list(@RequestBody RmInitialMonitorItem rmInitialMonitorItem) { diff --git a/tongran-rocketmq/src/main/java/com/tongran/rocketmq/controller/RmMonitorPolicyController.java b/tongran-rocketmq/src/main/java/com/tongran/rocketmq/controller/RmMonitorPolicyController.java index c89f671..b779a79 100644 --- a/tongran-rocketmq/src/main/java/com/tongran/rocketmq/controller/RmMonitorPolicyController.java +++ b/tongran-rocketmq/src/main/java/com/tongran/rocketmq/controller/RmMonitorPolicyController.java @@ -26,6 +26,7 @@ import java.util.List; */ @RestController @RequestMapping("/monitorPolicy") +@RequiresPermissions("rocketmq:monitorPolicy") public class RmMonitorPolicyController extends BaseController { @Autowired @@ -34,7 +35,6 @@ public class RmMonitorPolicyController extends BaseController /** * 查询资源监控策略列表 */ - @RequiresPermissions("rocketmq:policy:list") @PostMapping("/list") public TableDataInfo list(@RequestBody RmMonitorPolicy rmMonitorPolicy) { @@ -49,7 +49,6 @@ public class RmMonitorPolicyController extends BaseController /** * 导出资源监控策略列表 */ - @RequiresPermissions("rocketmq:policy:export") @Log(title = "资源监控策略", businessType = BusinessType.EXPORT) @PostMapping("/export") public void export(HttpServletResponse response, @RequestBody RmMonitorPolicy rmMonitorPolicy) @@ -63,7 +62,6 @@ public class RmMonitorPolicyController extends BaseController /** * 获取资源监控策略详细信息 */ - @RequiresPermissions("rocketmq:policy:query") @GetMapping(value = "/{id}") public AjaxResult getInfo(@PathVariable("id") Long id) { @@ -73,7 +71,6 @@ public class RmMonitorPolicyController extends BaseController /** * 新增资源监控策略 */ - @RequiresPermissions("rocketmq:policy:add") @Log(title = "资源监控策略", businessType = BusinessType.INSERT) @PostMapping public AjaxResult add(@RequestBody RmMonitorPolicy rmMonitorPolicy) @@ -88,7 +85,6 @@ public class RmMonitorPolicyController extends BaseController /** * 修改资源监控策略 */ - @RequiresPermissions("rocketmq:policy:edit") @Log(title = "资源监控策略", businessType = BusinessType.UPDATE) @PutMapping public AjaxResult edit(@RequestBody RmMonitorPolicy rmMonitorPolicy) @@ -102,7 +98,6 @@ public class RmMonitorPolicyController extends BaseController /** * 资源监控策略下发 */ - @RequiresPermissions("rocketmq:policy:edit") @Log(title = "资源监控策略下发", businessType = BusinessType.UPDATE) @GetMapping("/issuePolicy") public AjaxResult issuePolicy(Long id) @@ -112,7 +107,6 @@ public class RmMonitorPolicyController extends BaseController /** * 资源监控策略下发 */ -// @RequiresPermissions("rocketmq:policy:edit") @Log(title = "issueSwitchPolicy", businessType = BusinessType.UPDATE) @GetMapping("/issueSwitchPolicy") public AjaxResult issueSwitchPolicy(Long id) @@ -123,7 +117,6 @@ public class RmMonitorPolicyController extends BaseController /** * 删除监控模板 */ - @RequiresPermissions("rocketmq:policy:remove") @Log(title = "资源监控策略", businessType = BusinessType.DELETE) @DeleteMapping("/{ids}") public AjaxResult remove(@PathVariable Long[] ids) @@ -134,7 +127,6 @@ public class RmMonitorPolicyController extends BaseController /** * 新增交换机监控策略 */ - @RequiresPermissions("rocketmq:policy:add") @Log(title = "资源监控策略", businessType = BusinessType.INSERT) @PostMapping("/addResourcePolicy") public AjaxResult addResourcePolicy(@RequestBody RmMonitorPolicy rmMonitorPolicy) @@ -145,7 +137,6 @@ public class RmMonitorPolicyController extends BaseController /** * 修改交换机监控策略 */ - @RequiresPermissions("rocketmq:policy:update") @Log(title = "资源监控策略", businessType = BusinessType.INSERT) @PostMapping("/updateResourcePolicy") public AjaxResult updateResourcePolicy(@RequestBody RmMonitorPolicy rmMonitorPolicy) diff --git a/tongran-rocketmq/src/main/java/com/tongran/rocketmq/controller/RmMonitorTemplateController.java b/tongran-rocketmq/src/main/java/com/tongran/rocketmq/controller/RmMonitorTemplateController.java index 0285aac..9d7232f 100644 --- a/tongran-rocketmq/src/main/java/com/tongran/rocketmq/controller/RmMonitorTemplateController.java +++ b/tongran-rocketmq/src/main/java/com/tongran/rocketmq/controller/RmMonitorTemplateController.java @@ -26,6 +26,7 @@ import java.util.Map; */ @RestController @RequestMapping("/template") +@RequiresPermissions("rocketmq:template") public class RmMonitorTemplateController extends BaseController { @Autowired @@ -34,7 +35,6 @@ public class RmMonitorTemplateController extends BaseController /** * 查询监控模板列表 */ - @RequiresPermissions("rocketmq:template:list") @PostMapping("/list") public TableDataInfo list(@RequestBody RmMonitorTemplate rmMonitorTemplate) { @@ -49,7 +49,6 @@ public class RmMonitorTemplateController extends BaseController /** * 导出监控模板列表 */ - @RequiresPermissions("rocketmq:template:export") @Log(title = "监控模板", businessType = BusinessType.EXPORT) @PostMapping("/export") public void export(HttpServletResponse response, @RequestBody RmMonitorTemplate rmMonitorTemplate) @@ -63,7 +62,6 @@ public class RmMonitorTemplateController extends BaseController /** * 获取监控模板详细信息 */ - @RequiresPermissions("rocketmq:template:query") @GetMapping(value = "/{id}") public AjaxResult getInfo(@PathVariable("id") Long id) { @@ -73,7 +71,6 @@ public class RmMonitorTemplateController extends BaseController /** * 新增监控模板 */ - @RequiresPermissions("rocketmq:template:add") @Log(title = "监控模板", businessType = BusinessType.INSERT) @PostMapping public AjaxResult add(@RequestBody RmMonitorTemplateVo rmMonitorTemplateVo) @@ -84,7 +81,6 @@ public class RmMonitorTemplateController extends BaseController /** * 修改监控模板 */ - @RequiresPermissions("rocketmq:template:edit") @Log(title = "监控模板", businessType = BusinessType.UPDATE) @PutMapping public AjaxResult edit(@RequestBody RmMonitorTemplateVo rmMonitorTemplateVo) @@ -95,7 +91,6 @@ public class RmMonitorTemplateController extends BaseController /** * 删除监控模板 */ - @RequiresPermissions("rocketmq:template:remove") @Log(title = "监控模板", businessType = BusinessType.DELETE) @DeleteMapping("/{ids}") public AjaxResult remove(@PathVariable Long[] ids) @@ -105,7 +100,6 @@ public class RmMonitorTemplateController extends BaseController /** * 关联监控模板查询 */ - @RequiresPermissions("rocketmq:template:list") @GetMapping("/getAllTemplate") public AjaxResult getAllTemplate() { diff --git a/tongran-rocketmq/src/main/java/com/tongran/rocketmq/controller/RmNetworkInterfaceController.java b/tongran-rocketmq/src/main/java/com/tongran/rocketmq/controller/RmNetworkInterfaceController.java index 8620eb5..08f486a 100644 --- a/tongran-rocketmq/src/main/java/com/tongran/rocketmq/controller/RmNetworkInterfaceController.java +++ b/tongran-rocketmq/src/main/java/com/tongran/rocketmq/controller/RmNetworkInterfaceController.java @@ -24,6 +24,7 @@ import java.util.List; */ @RestController @RequestMapping("/networkInterface") +@RequiresPermissions("system:registration") public class RmNetworkInterfaceController extends BaseController { @Autowired @@ -32,7 +33,6 @@ public class RmNetworkInterfaceController extends BaseController /** * 查询客户端网络接口信息列表 */ - @RequiresPermissions("rocketmq:networkInterface:list") @PostMapping("/list") public AjaxResult list(@RequestBody RmNetworkInterface rmNetworkInterface) { @@ -43,7 +43,6 @@ public class RmNetworkInterfaceController extends BaseController /** * 导出客户端网络接口信息列表 */ - @RequiresPermissions("rocketmq:networkInterface:export") @Log(title = "客户端网络接口信息", businessType = BusinessType.EXPORT) @PostMapping("/export") public void export(HttpServletResponse response, RmNetworkInterface rmNetworkInterface) @@ -56,7 +55,6 @@ public class RmNetworkInterfaceController extends BaseController /** * 获取客户端网络接口信息详细信息 */ - @RequiresPermissions("rocketmq:networkInterface:query") @GetMapping(value = "/{id}") public AjaxResult getInfo(@PathVariable("id") Long id) { @@ -66,7 +64,6 @@ public class RmNetworkInterfaceController extends BaseController /** * 新增客户端网络接口信息 */ - @RequiresPermissions("rocketmq:networkInterface:add") @Log(title = "客户端网络接口信息", businessType = BusinessType.INSERT) @PostMapping public AjaxResult add(@RequestBody RmNetworkInterface rmNetworkInterface) @@ -77,7 +74,6 @@ public class RmNetworkInterfaceController extends BaseController /** * 修改客户端网络接口信息 */ - @RequiresPermissions("rocketmq:networkInterface:edit") @Log(title = "客户端网络接口信息", businessType = BusinessType.UPDATE) @PutMapping public AjaxResult edit(@RequestBody RmNetworkInterface rmNetworkInterface) @@ -88,7 +84,6 @@ public class RmNetworkInterfaceController extends BaseController /** * 删除客户端网络接口信息 */ - @RequiresPermissions("rocketmq:networkInterface:remove") @Log(title = "客户端网络接口信息", businessType = BusinessType.DELETE) @DeleteMapping("/{ids}") public AjaxResult remove(@PathVariable Long[] ids) diff --git a/tongran-rocketmq/src/main/java/com/tongran/rocketmq/controller/RmResourceRemoteController.java b/tongran-rocketmq/src/main/java/com/tongran/rocketmq/controller/RmResourceRemoteController.java index d46fa53..c89b219 100644 --- a/tongran-rocketmq/src/main/java/com/tongran/rocketmq/controller/RmResourceRemoteController.java +++ b/tongran-rocketmq/src/main/java/com/tongran/rocketmq/controller/RmResourceRemoteController.java @@ -23,6 +23,7 @@ import java.util.List; */ @RestController @RequestMapping("/remote") +@RequiresPermissions("rocketmq:remote") public class RmResourceRemoteController extends BaseController { @Autowired @@ -32,7 +33,6 @@ public class RmResourceRemoteController extends BaseController /** * 获取资源远程管理详细信息 */ - @RequiresPermissions("rocketmq:remote:query") @PostMapping(value = "/getScriptResultBySn") public AjaxResult getScriptResultBySn(@RequestBody RmResourceRemote rmResourceRemote) { @@ -42,7 +42,6 @@ public class RmResourceRemoteController extends BaseController /** * 获取资源远程管理详细信息 -- 分页 */ - @RequiresPermissions("rocketmq:remote:query") @PostMapping(value = "/getScriptResultByScriptId") public TableDataInfo getScriptResultByScriptId(@RequestBody RmResourceRemote rmResourceRemote) { diff --git a/tongran-rocketmq/src/main/java/com/tongran/rocketmq/controller/RmTemplateLinuxController.java b/tongran-rocketmq/src/main/java/com/tongran/rocketmq/controller/RmTemplateLinuxController.java index dfb7107..65c0a6a 100644 --- a/tongran-rocketmq/src/main/java/com/tongran/rocketmq/controller/RmTemplateLinuxController.java +++ b/tongran-rocketmq/src/main/java/com/tongran/rocketmq/controller/RmTemplateLinuxController.java @@ -1,25 +1,19 @@ package com.tongran.rocketmq.controller; -import java.util.List; -import javax.servlet.http.HttpServletResponse; -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; +import com.tongran.common.core.utils.poi.ExcelUtil; +import com.tongran.common.core.web.controller.BaseController; +import com.tongran.common.core.web.domain.AjaxResult; +import com.tongran.common.core.web.page.TableDataInfo; import com.tongran.common.log.annotation.Log; import com.tongran.common.log.enums.BusinessType; import com.tongran.common.security.annotation.RequiresPermissions; import com.tongran.rocketmq.domain.RmTemplateLinux; import com.tongran.rocketmq.service.IRmTemplateLinuxService; -import com.tongran.common.core.web.controller.BaseController; -import com.tongran.common.core.web.domain.AjaxResult; -import com.tongran.common.core.utils.poi.ExcelUtil; -import com.tongran.common.core.web.page.TableDataInfo; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; + +import javax.servlet.http.HttpServletResponse; +import java.util.List; /** * Linux系统监控项Controller @@ -29,6 +23,7 @@ import com.tongran.common.core.web.page.TableDataInfo; */ @RestController @RequestMapping("/linux") +@RequiresPermissions("rocketmq:linux") public class RmTemplateLinuxController extends BaseController { @Autowired @@ -37,7 +32,6 @@ public class RmTemplateLinuxController extends BaseController /** * 查询Linux系统监控项列表 */ - @RequiresPermissions("rocketmq:linux:list") @GetMapping("/list") public TableDataInfo list(RmTemplateLinux rmTemplateLinux) { @@ -49,7 +43,6 @@ public class RmTemplateLinuxController extends BaseController /** * 导出Linux系统监控项列表 */ - @RequiresPermissions("rocketmq:linux:export") @Log(title = "Linux系统监控项", businessType = BusinessType.EXPORT) @PostMapping("/export") public void export(HttpServletResponse response, RmTemplateLinux rmTemplateLinux) @@ -62,7 +55,6 @@ public class RmTemplateLinuxController extends BaseController /** * 获取Linux系统监控项详细信息 */ - @RequiresPermissions("rocketmq:linux:query") @GetMapping(value = "/{id}") public AjaxResult getInfo(@PathVariable("id") Long id) { @@ -72,7 +64,6 @@ public class RmTemplateLinuxController extends BaseController /** * 新增Linux系统监控项 */ - @RequiresPermissions("rocketmq:linux:add") @Log(title = "Linux系统监控项", businessType = BusinessType.INSERT) @PostMapping public AjaxResult add(@RequestBody RmTemplateLinux rmTemplateLinux) @@ -83,7 +74,6 @@ public class RmTemplateLinuxController extends BaseController /** * 修改Linux系统监控项 */ - @RequiresPermissions("rocketmq:linux:edit") @Log(title = "Linux系统监控项", businessType = BusinessType.UPDATE) @PutMapping public AjaxResult edit(@RequestBody RmTemplateLinux rmTemplateLinux) @@ -94,7 +84,6 @@ public class RmTemplateLinuxController extends BaseController /** * 删除Linux系统监控项 */ - @RequiresPermissions("rocketmq:linux:remove") @Log(title = "Linux系统监控项", businessType = BusinessType.DELETE) @DeleteMapping("/{ids}") public AjaxResult remove(@PathVariable Long[] ids) diff --git a/tongran-rocketmq/src/main/java/com/tongran/rocketmq/controller/RmTemplateSwitchController.java b/tongran-rocketmq/src/main/java/com/tongran/rocketmq/controller/RmTemplateSwitchController.java index 61b0ac7..5624239 100644 --- a/tongran-rocketmq/src/main/java/com/tongran/rocketmq/controller/RmTemplateSwitchController.java +++ b/tongran-rocketmq/src/main/java/com/tongran/rocketmq/controller/RmTemplateSwitchController.java @@ -1,25 +1,19 @@ package com.tongran.rocketmq.controller; -import java.util.List; -import javax.servlet.http.HttpServletResponse; -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; +import com.tongran.common.core.utils.poi.ExcelUtil; +import com.tongran.common.core.web.controller.BaseController; +import com.tongran.common.core.web.domain.AjaxResult; +import com.tongran.common.core.web.page.TableDataInfo; import com.tongran.common.log.annotation.Log; import com.tongran.common.log.enums.BusinessType; import com.tongran.common.security.annotation.RequiresPermissions; import com.tongran.rocketmq.domain.RmTemplateSwitch; import com.tongran.rocketmq.service.IRmTemplateSwitchService; -import com.tongran.common.core.web.controller.BaseController; -import com.tongran.common.core.web.domain.AjaxResult; -import com.tongran.common.core.utils.poi.ExcelUtil; -import com.tongran.common.core.web.page.TableDataInfo; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; + +import javax.servlet.http.HttpServletResponse; +import java.util.List; /** * 交换机监控模板Controller @@ -29,6 +23,7 @@ import com.tongran.common.core.web.page.TableDataInfo; */ @RestController @RequestMapping("/switch") +@RequiresPermissions("rocketmq:switch") public class RmTemplateSwitchController extends BaseController { @Autowired @@ -37,7 +32,6 @@ public class RmTemplateSwitchController extends BaseController /** * 查询交换机监控模板列表 */ - @RequiresPermissions("rocketmq:switch:list") @GetMapping("/list") public TableDataInfo list(RmTemplateSwitch rmTemplateSwitch) { @@ -49,7 +43,6 @@ public class RmTemplateSwitchController extends BaseController /** * 导出交换机监控模板列表 */ - @RequiresPermissions("rocketmq:switch:export") @Log(title = "交换机监控模板", businessType = BusinessType.EXPORT) @PostMapping("/export") public void export(HttpServletResponse response, RmTemplateSwitch rmTemplateSwitch) @@ -62,7 +55,6 @@ public class RmTemplateSwitchController extends BaseController /** * 获取交换机监控模板详细信息 */ - @RequiresPermissions("rocketmq:switch:query") @GetMapping(value = "/{id}") public AjaxResult getInfo(@PathVariable("id") Long id) { @@ -72,7 +64,6 @@ public class RmTemplateSwitchController extends BaseController /** * 新增交换机监控模板 */ - @RequiresPermissions("rocketmq:switch:add") @Log(title = "交换机监控模板", businessType = BusinessType.INSERT) @PostMapping public AjaxResult add(@RequestBody RmTemplateSwitch rmTemplateSwitch) @@ -83,7 +74,6 @@ public class RmTemplateSwitchController extends BaseController /** * 修改交换机监控模板 */ - @RequiresPermissions("rocketmq:switch:edit") @Log(title = "交换机监控模板", businessType = BusinessType.UPDATE) @PutMapping public AjaxResult edit(@RequestBody RmTemplateSwitch rmTemplateSwitch) @@ -94,7 +84,6 @@ public class RmTemplateSwitchController extends BaseController /** * 删除交换机监控模板 */ - @RequiresPermissions("rocketmq:switch:remove") @Log(title = "交换机监控模板", businessType = BusinessType.DELETE) @DeleteMapping("/{ids}") public AjaxResult remove(@PathVariable Long[] ids) diff --git a/tongran-rocketmq/src/main/java/com/tongran/rocketmq/domain/InitialBandwidthTraffic.java b/tongran-rocketmq/src/main/java/com/tongran/rocketmq/domain/InitialBandwidthTraffic.java index 892743d..d64b802 100644 --- a/tongran-rocketmq/src/main/java/com/tongran/rocketmq/domain/InitialBandwidthTraffic.java +++ b/tongran-rocketmq/src/main/java/com/tongran/rocketmq/domain/InitialBandwidthTraffic.java @@ -6,6 +6,7 @@ import lombok.Data; import java.math.BigDecimal; import java.util.List; +import java.util.Map; /** * 初始带宽流量对象 initial_bandwidth_traffic @@ -102,4 +103,6 @@ public class InitialBandwidthTraffic extends BaseEntity private String totalIpv6InSpeed; /** IPv6发送总流量 */ private String totalIpv6OutSpeed; + /** 多个clientId */ + private Map> clientInterfaces; } diff --git a/tongran-rocketmq/src/main/java/com/tongran/rocketmq/service/IInitialBandwidthTrafficService.java b/tongran-rocketmq/src/main/java/com/tongran/rocketmq/service/IInitialBandwidthTrafficService.java index 927cd0e..a2228f0 100644 --- a/tongran-rocketmq/src/main/java/com/tongran/rocketmq/service/IInitialBandwidthTrafficService.java +++ b/tongran-rocketmq/src/main/java/com/tongran/rocketmq/service/IInitialBandwidthTrafficService.java @@ -105,4 +105,11 @@ public interface IInitialBandwidthTrafficService * @return */ Map netInterfaceIpv6TrafficEcharts(InitialBandwidthTraffic initialBandwidthTraffic); + + /** + * 查询多个网卡流量信息并封装为多折线ECharts图表数据 + * @param initialBandwidthTraffic + * @return + */ + List> netBatchTrafficEcharts(InitialBandwidthTraffic initialBandwidthTraffic); } diff --git a/tongran-rocketmq/src/main/java/com/tongran/rocketmq/service/impl/InitialBandwidthTrafficServiceImpl.java b/tongran-rocketmq/src/main/java/com/tongran/rocketmq/service/impl/InitialBandwidthTrafficServiceImpl.java index 1a8b437..29388fe 100644 --- a/tongran-rocketmq/src/main/java/com/tongran/rocketmq/service/impl/InitialBandwidthTrafficServiceImpl.java +++ b/tongran-rocketmq/src/main/java/com/tongran/rocketmq/service/impl/InitialBandwidthTrafficServiceImpl.java @@ -30,14 +30,14 @@ import java.util.stream.Collectors; */ @Service @Slf4j -public class InitialBandwidthTrafficServiceImpl implements IInitialBandwidthTrafficService +public class InitialBandwidthTrafficServiceImpl implements IInitialBandwidthTrafficService { @Autowired private InitialBandwidthTrafficMapper initialBandwidthTrafficMapper; /** * 查询初始带宽流量 - * + * * @param id 初始带宽流量主键 * @return 初始带宽流量 */ @@ -49,7 +49,7 @@ public class InitialBandwidthTrafficServiceImpl implements IInitialBandwidthTraf /** * 查询初始带宽流量列表 - * + * * @param initialBandwidthTraffic 初始带宽流量 * @return 初始带宽流量 */ @@ -61,7 +61,7 @@ public class InitialBandwidthTrafficServiceImpl implements IInitialBandwidthTraf /** * 新增初始带宽流量 - * + * * @param initialBandwidthTraffic 初始带宽流量 * @return 结果 */ @@ -75,7 +75,7 @@ public class InitialBandwidthTrafficServiceImpl implements IInitialBandwidthTraf /** * 修改初始带宽流量 - * + * * @param initialBandwidthTraffic 初始带宽流量 * @return 结果 */ @@ -88,7 +88,7 @@ public class InitialBandwidthTrafficServiceImpl implements IInitialBandwidthTraf /** * 批量删除初始带宽流量 - * + * * @param ids 需要删除的初始带宽流量主键 * @return 结果 */ @@ -100,7 +100,7 @@ public class InitialBandwidthTrafficServiceImpl implements IInitialBandwidthTraf /** * 删除初始带宽流量信息 - * + * * @param id 初始带宽流量主键 * @return 结果 */ @@ -236,12 +236,12 @@ public class InitialBandwidthTrafficServiceImpl implements IInitialBandwidthTraf extractors.put("netInSpeedData", info -> info != null && info.getInSpeed() != null ? new BigDecimal(info.getInSpeed()).divide(divisor, 2, RoundingMode.HALF_UP) : - 0); + null); extractors.put("netOutSpeedData", info -> info != null && info.getOutSpeed() != null ? new BigDecimal(info.getOutSpeed()).divide(divisor, 2, RoundingMode.HALF_UP) : - 0); + null); Map resultMap = EchartsDataUtils.buildEchartsDataAutoPadding( list, InitialBandwidthTraffic::getCreateTime, extractors, initialBandwidthTraffic.getStartTime(), initialBandwidthTraffic.getEndTime() @@ -294,12 +294,12 @@ public class InitialBandwidthTrafficServiceImpl implements IInitialBandwidthTraf extractors.put("netInSpeedData", info -> info != null && info.getIpv4InSpeed() != null ? new BigDecimal(info.getIpv4InSpeed()).divide(divisor, 2, RoundingMode.HALF_UP) : - 0); + null); extractors.put("netOutSpeedData", info -> info != null && info.getIpv4OutSpeed() != null ? new BigDecimal(info.getIpv4OutSpeed()).divide(divisor, 2, RoundingMode.HALF_UP) : - 0); + null); Map resultMap = EchartsDataUtils.buildEchartsDataAutoPadding( list, InitialBandwidthTraffic::getCreateTime, extractors, initialBandwidthTraffic.getStartTime(), initialBandwidthTraffic.getEndTime() @@ -326,12 +326,73 @@ public class InitialBandwidthTrafficServiceImpl implements IInitialBandwidthTraf extractors.put("netInSpeedData", info -> info != null && info.getIpv6InSpeed() != null ? new BigDecimal(info.getIpv6InSpeed()).divide(divisor, 2, RoundingMode.HALF_UP) : - 0); + null); extractors.put("netOutSpeedData", info -> info != null && info.getIpv6OutSpeed() != null ? new BigDecimal(info.getIpv6OutSpeed()).divide(divisor, 2, RoundingMode.HALF_UP) : - 0); + null); + Map resultMap = EchartsDataUtils.buildEchartsDataAutoPadding( + list, InitialBandwidthTraffic::getCreateTime, extractors, + initialBandwidthTraffic.getStartTime(), initialBandwidthTraffic.getEndTime() + ); + resultMap.put("unit", unit); + return resultMap; + } catch (Exception e){ + e.printStackTrace(); + } + return new HashMap<>(); + } + + @Override + public List> netBatchTrafficEcharts(InitialBandwidthTraffic initialBandwidthTraffic) { + List> resultList = new ArrayList<>(); + Map> clientIdMap = initialBandwidthTraffic.getClientInterfaces(); + if(clientIdMap == null){ + return new ArrayList<>(); + } + for (Map.Entry> entry : clientIdMap.entrySet()) { + String clientId = entry.getKey(); + List interfaces = entry.getValue(); + for (String interfaceName : interfaces) { + InitialBandwidthTraffic trafficData = new InitialBandwidthTraffic(); + trafficData.setClientId(clientId); + trafficData.setName(interfaceName); + trafficData.setStartTime(initialBandwidthTraffic.getStartTime()); + trafficData.setEndTime(initialBandwidthTraffic.getEndTime()); + Map resultMap = getEchartsData(trafficData); + resultMap.put("interfaceName", interfaceName); + resultMap.put("clientId", clientId); + resultList.add(resultMap); + } + } + return resultList; + } + + /** + * 构建echarts图表 + * @param initialBandwidthTraffic + * @return + */ + public Map getEchartsData(InitialBandwidthTraffic initialBandwidthTraffic){ + // 流量信息 + List list = getListByTableName(initialBandwidthTraffic); + try { + String unit = SpeedUtils.calculateUnitWithStringTraffic(list, "inSpeed", "outSpeed"); + if(initialBandwidthTraffic.getUnit() != null){ + unit = initialBandwidthTraffic.getUnit(); + } + BigDecimal divisor = SpeedUtils.getDivisor(unit); + Map> extractors = new LinkedHashMap<>(); + extractors.put("netInSpeedData", info -> + info != null && info.getInSpeed() != null ? + new BigDecimal(info.getInSpeed()).divide(divisor, 2, RoundingMode.HALF_UP) : + null); + + extractors.put("netOutSpeedData", info -> + info != null && info.getOutSpeed() != null ? + new BigDecimal(info.getOutSpeed()).divide(divisor, 2, RoundingMode.HALF_UP) : + null); Map resultMap = EchartsDataUtils.buildEchartsDataAutoPadding( list, InitialBandwidthTraffic::getCreateTime, extractors, initialBandwidthTraffic.getStartTime(), initialBandwidthTraffic.getEndTime() diff --git a/tongran-rocketmq/src/main/java/com/tongran/rocketmq/service/impl/InitialSwitchInfoServiceImpl.java b/tongran-rocketmq/src/main/java/com/tongran/rocketmq/service/impl/InitialSwitchInfoServiceImpl.java index 18b7543..0495e9a 100644 --- a/tongran-rocketmq/src/main/java/com/tongran/rocketmq/service/impl/InitialSwitchInfoServiceImpl.java +++ b/tongran-rocketmq/src/main/java/com/tongran/rocketmq/service/impl/InitialSwitchInfoServiceImpl.java @@ -228,12 +228,12 @@ public class InitialSwitchInfoServiceImpl implements IInitialSwitchInfoService extractors.put("netInSpeedData", info -> info != null && info.getInSpeed() != null ? info.getInSpeed().divide(divisor, 2, RoundingMode.HALF_UP) : - 0); + null); extractors.put("netOutSpeedData", info -> info != null && info.getOutSpeed() != null ? info.getOutSpeed().divide(divisor, 2, RoundingMode.HALF_UP) : - 0); + null); Map resultMap = EchartsDataUtils.buildEchartsDataAutoPadding( list, InitialSwitchInfo::getCreateTime, extractors, initialSwitchInfo.getStartTime(), initialSwitchInfo.getEndTime() diff --git a/tongran-rocketmq/src/main/java/com/tongran/rocketmq/utils/DataProcessUtil.java b/tongran-rocketmq/src/main/java/com/tongran/rocketmq/utils/DataProcessUtil.java index 2e267aa..d3ae8f9 100644 --- a/tongran-rocketmq/src/main/java/com/tongran/rocketmq/utils/DataProcessUtil.java +++ b/tongran-rocketmq/src/main/java/com/tongran/rocketmq/utils/DataProcessUtil.java @@ -213,7 +213,7 @@ public class DataProcessUtil { */ public String bytesToBits(String speed) { if (speed == null || speed.trim().isEmpty()) { - return "0"; + return null; } String cleanedSpeed = speed.trim(); diff --git a/tongran-rocketmq/src/main/resources/mapper/rocketmq/InitialBandwidthTrafficMapper.xml b/tongran-rocketmq/src/main/resources/mapper/rocketmq/InitialBandwidthTrafficMapper.xml index 17f2ed7..becfb0e 100644 --- a/tongran-rocketmq/src/main/resources/mapper/rocketmq/InitialBandwidthTrafficMapper.xml +++ b/tongran-rocketmq/src/main/resources/mapper/rocketmq/InitialBandwidthTrafficMapper.xml @@ -216,7 +216,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" from ${tableName} and client_id = #{clientId} - and name = #{name} + and name like concat(#{name},'%') and create_time >= #{startTime} and create_time <= #{endTime}