liuyupeng/saas-houduan
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

权限控制增加

Browse Source 
优化ipv4、ipv6流量展示
This commit is contained in:
gaoyutao
2025-12-08 19:23:53 +08:00
parent cd8cafaf3f
commit 1f133e8c05
68 changed files with 452 additions and 611 deletions
Download Patch File Download Diff File Expand all files Collapse all files
tongran-modules/tongran-system/src/main/java/com/tongran/system/controller/AllInterfaceNameController.java
-2
View File
@@ -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<AllInterfaceName> list(@RequestBody AllInterfaceName allInterfaceName)
{
tongran-modules/tongran-system/src/main/java/com/tongran/system/controller/EpsBusinessController.java
+1 -8
View File
@@ -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)
{
tongran-modules/tongran-system/src/main/java/com/tongran/system/controller/EpsBusinessDeployController.java
+1 -6
View File
@@ -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));
tongran-modules/tongran-system/src/main/java/com/tongran/system/controller/EpsBusinessScriptController.java
+1 -6
View File
@@ -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<EpsBusinessScript> list = epsBusinessScriptService.selectEpsBusinessScriptList(new EpsBusinessScript());
tongran-modules/tongran-system/src/main/java/com/tongran/system/controller/EpsInitialTrafficDataController.java
+1 -3
View File
@@ -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<Map<String, Object>> 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<Map<String, Object>> echartsData = epsInitialTrafficDataService.getServerGraphicalAnalysisMonthy(queryParam);
@@ -82,7 +81,6 @@ public class EpsInitialTrafficDataController {
/**
* 监控看板-详情视图 出入流量
*/
// @RequiresPermissions("system:bandwidth:list")
// @PostMapping("/getServerTrafficByMonitorView")
// public AjaxResult getServerTrafficByMonitorView(@RequestBody EpsInitialTrafficData queryParam)
// {
tongran-modules/tongran-system/src/main/java/com/tongran/system/controller/EpsMethodChangeRecordController.java
+1 -2
View File
@@ -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)
tongran-modules/tongran-system/src/main/java/com/tongran/system/controller/EpsNodeBandwidthController.java
+1 -16
View File
@@ -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)
{
tongran-modules/tongran-system/src/main/java/com/tongran/system/controller/EpsServerRevenueConfigController.java
+3 -4
View File
@@ -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<String> autoSaveServiceTrafficData(@RequestBody EpsServerRevenueConfig epsServerRevenueConfig)
{
tongran-modules/tongran-system/src/main/java/com/tongran/system/controller/EpsTaskStatisticsController.java
+1 -11
View File
@@ -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)
{
tongran-modules/tongran-system/src/main/java/com/tongran/system/controller/EpsTrafficDataController.java
+10 -22
View File
@@ -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)
tongran-modules/tongran-system/src/main/java/com/tongran/system/controller/InitialSwitchInfoDetailsController.java
+1 -10
View File
@@ -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)
{
tongran-modules/tongran-system/src/main/java/com/tongran/system/controller/KnowledgeBaseController.java
+1 -6
View File
@@ -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)
tongran-modules/tongran-system/src/main/java/com/tongran/system/controller/MtmMonitoringTemplateController.java
+10 -22
View File
@@ -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)
tongran-modules/tongran-system/src/main/java/com/tongran/system/controller/RmEpsTopologyManagementController.java
+1 -8
View File
@@ -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<RmEpsTopologyManagement> 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)
tongran-modules/tongran-system/src/main/java/com/tongran/system/controller/RmMonitorConfigController.java
+1 -6
View File
@@ -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)
tongran-modules/tongran-system/src/main/java/com/tongran/system/controller/RmMonitorConfigDetailsController.java
+1 -1
View File
@@ -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)
{
tongran-modules/tongran-system/src/main/java/com/tongran/system/controller/RmRegistrationMachineController.java
+10 -22
View File
@@ -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)
tongran-modules/tongran-system/src/main/java/com/tongran/system/controller/RmResourceGroupController.java
+1 -7
View File
@@ -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)
{
tongran-modules/tongran-system/src/main/java/com/tongran/system/controller/RmResourceRegistrationController.java
+1 -14
View File
@@ -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<Map> 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)
tongran-modules/tongran-system/src/main/java/com/tongran/system/controller/RmSwitchInterfaceInfoController.java
+10 -22
View File
@@ -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)
tongran-modules/tongran-system/src/main/java/com/tongran/system/controller/RmSwitchManagementController.java
+1 -8
View File
@@ -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()
{
tongran-modules/tongran-system/src/main/java/com/tongran/system/controller/ScreenController.java
+1 -7
View File
@@ -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();
tongran-modules/tongran-system/src/main/java/com/tongran/system/controller/SysMenuClickController.java
-3
View File
@@ -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)
tongran-modules/tongran-system/src/main/java/com/tongran/system/controller/UserTableColumnConfigController.java
+4 -4
View File
@@ -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)
tongran-modules/tongran-system/src/main/java/com/tongran/system/service/impl/EpsInitialTrafficDataServiceImpl.java
+3 -3
View File
@@ -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<String, Object> resultMap = EchartsDataUtils.buildEchartsDataAutoPadding(
list, EpsInitialTrafficData::getCreateTime, extractors, epsInitialTrafficData.getStartTime(), epsInitialTrafficData.getEndTime()
);
tongran-modules/tongran-system/src/main/java/com/tongran/system/service/impl/EpsTaskStatisticsServiceImpl.java
+5 -5
View File
@@ -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<String, Object> 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<String, Object> resultMap = EchartsDataUtils.buildEchartsData(list, InitialSwitchInfoDetails::getCreateTime, extractors);
resultMap.put("other", result);
if(StringUtils.equals("1", taskMsg.getCalculationType())){
tongran-modules/tongran-system/src/main/java/com/tongran/system/service/impl/InitialSwitchInfoDetailsServiceImpl.java
+3 -3
View File
@@ -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<String, Object> resultMap = EchartsDataUtils.buildEchartsDataAutoPadding(
list, InitialSwitchInfoDetails::getCreateTime, extractors,
initialSwitchInfoDetails.getStartTime(), initialSwitchInfoDetails.getEndTime());
tongran-modules/tongran-system/src/main/java/com/tongran/system/service/impl/RmMonitorConfigDetailsServiceImpl.java
+2 -2
View File
@@ -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() :
tongran-modules/tongran-system/src/main/java/com/tongran/system/service/impl/RmResourceRegistrationServiceImpl.java
+5 -15
View File
@@ -81,7 +81,6 @@ public class RmResourceRegistrationServiceImpl implements IRmResourceRegistratio
*/
@Override
public Map<String, Object> getRegistrationTableInfoList(RmResourceRegistration rmResourceRegistration) {
long startTime = System.currentTimeMillis();
Map<String, Object> 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<RmResourceRegistration> 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())