Compare commits

..

No commits in common. '12fb40a5cc1ebc1901c674bf4cdcdce4f33a2b97' and '9a4ba243d70c49e805b96a11ebe2dd801d175350' have entirely different histories.

  1. 13
      ALOps_sys_backend/alops-admin/src/main/java/com/alops/web/controller/equManagement/EquBaseController.java
  2. 1
      ALOps_sys_backend/alops-admin/src/main/java/com/alops/web/controller/equManagement/EquManuController.java
  3. 1
      ALOps_sys_backend/alops-admin/src/main/java/com/alops/web/controller/equManagement/EquSupplierController.java
  4. 1
      ALOps_sys_backend/alops-admin/src/main/java/com/alops/web/controller/equManagement/EquTypeController.java
  5. 1
      ALOps_sys_backend/alops-admin/src/main/java/com/alops/web/controller/equManagement/EquVlanController.java
  6. 2
      ALOps_sys_backend/alops-admin/src/main/java/com/alops/web/controller/exceptionController/AlertMessageController.java
  7. 1
      ALOps_sys_backend/alops-admin/src/main/java/com/alops/web/controller/tool/EquInterfaceController.java
  8. 1
      ALOps_sys_backend/alops-admin/src/main/java/com/alops/web/controller/tool/EquRoutingController.java
  9. 1
      ALOps_sys_backend/alops-admin/src/main/java/com/alops/web/controller/tool/EquVeneerController.java
  10. 2
      ALOps_sys_backend/alops-common/src/main/java/com/alops/common/enums/BusinessType.java

@ -63,7 +63,6 @@ public class EquBaseController extends BaseController
* 查询多台设备的最新监测信息
**/
@PreAuthorize("@ss.hasPermi('device:files:querymonitorpage')")
@Log(title="查询多台设备信息",businessType =BusinessType.OTHER)
@GetMapping("/monitorpage")
@ApiOperation("分页查询多台设备的最新监测信息")
public TableDataInfo getMonitorList() {
@ -76,11 +75,10 @@ public class EquBaseController extends BaseController
* 首页展示查询每台设备的最新监测信息
*/
@PreAuthorize("@ss.hasPermi('device:files:query')")
@Log(title="首页查询设备信息",businessType =BusinessType.OTHER)
@GetMapping("/monitorById")
@ApiOperation("首页展示:查询每台设备的最新监测信息")
public TableDataInfo getLatestEquMonitorList() {
startPage();
startPage(); // 启用分页(如果首页不分页可删除)
List<EquMonitorHomeDto> list = equBaseService.selectLatestEquMonitorList();
return getDataTable(list);
}
@ -92,12 +90,12 @@ public class EquBaseController extends BaseController
* @param id 查询对象包含设备ID开始时间和结束时间
*/
@PreAuthorize("@ss.hasPermi('device:files:querylatest')")
@Log(title="查询设备最新信息",businessType =BusinessType.OTHER)
@GetMapping(value = "/latest/{id}")
@GetMapping(value = "/latest/{id}") // URL清晰地表达了意图:获取历史监控信息
@ApiOperation("获取设备最新时间的历史监控信息")
@Anonymous
public AjaxResult getLastInfo(@PathVariable("id") String id)
public AjaxResult getLastInfo(@PathVariable("id") String id) // 方法名也更清晰
{
// 调用职责单一的 Service 方法
return success(equBaseService.selectLatestEquMonitorInfo(id));
}
@ -106,7 +104,6 @@ public class EquBaseController extends BaseController
* @param equBaseQueryDto 查询对象包含设备ID开始时间和结束时间
*/
@PreAuthorize("@ss.hasPermi('device:files:queryhistory')")
@Log(title="查询设备历史信息",businessType =BusinessType.OTHER)
@GetMapping(value = "/history") // URL清晰地表达了意图:获取历史监控信息
@ApiOperation("获取设备指定时间段内的历史监控信息")
@Anonymous
@ -119,7 +116,6 @@ public class EquBaseController extends BaseController
* 统计设备监测信息列表 - 按设备类型分类
*/
@PreAuthorize("@ss.hasPermi('device:files:statistic')")
@Log(title="统计设备信息",businessType =BusinessType.OTHER)
@GetMapping("/byEquType")
@ApiOperation("按设备类型分类统计设备信息")
public AjaxResult listMonitorInfoByType() {
@ -137,7 +133,6 @@ public class EquBaseController extends BaseController
* 统计楼层设备分布
*/
@PreAuthorize("@ss.hasPermi('device:files:statisticfloor')")
@Log(title="统计楼层设备分布",businessType =BusinessType.OTHER)
@GetMapping("/floorStatistic")
@ApiOperation("统计楼层设备分布信息")
public AjaxResult getFloorDeviceStatistic() {

@ -43,7 +43,6 @@ public class EquManuController extends BaseController
* 查询设备厂商管理列表
*/
@PreAuthorize("@ss.hasPermi('device:deviceManu:list')")
@Log(title = "设查询备厂商管理", businessType = BusinessType.OTHER)
@GetMapping("/query")
@ApiOperation("查询设备厂商管理列表")
public TableDataInfo list(EquManu equManu)

@ -51,7 +51,6 @@ public class EquSupplierController extends BaseController
* 查询供应商功能信息列表
*/
@PreAuthorize("@ss.hasPermi('device:supplier:list')")
@Log(title="查询供应商管理",businessType =BusinessType.OTHER)
@GetMapping("/query")
@ApiOperation("查询供应商功能信息列表")
public TableDataInfo list(EquSupplier equSupplier)

@ -43,7 +43,6 @@ public class EquTypeController extends BaseController
* 查询设备类型管理列表
*/
@PreAuthorize("@ss.hasPermi('device:deviceType:list')")
@Log(title = "查询设备类型管理", businessType = BusinessType.OTHER)
@GetMapping("/query")
@ApiOperation("查询设备类型管理列表")
public TableDataInfo list(EquType equType)

@ -53,7 +53,6 @@ public class EquVlanController extends BaseController
* 查询单台的vlan信息列表
*/
@PreAuthorize("@ss.hasPermi('device:vlan:queryByEquId')")
@Log(title="查询设备Vlan信息",businessType =BusinessType.OTHER)
@GetMapping("/ByEquId/{equId}")
@ApiOperation("获取界面Vlan信息")
public TableDataInfo listByEquId(@PathVariable("equId") String equId)

@ -108,7 +108,6 @@ public class AlertMessageController extends BaseController
* 查询界面预警信息+++
*/
@PreAuthorize("@ss.hasPermi('inMonitoring:alertMessage:listByEquId')")
@Log(title = "查询预警信息", businessType = BusinessType.OTHER)
@GetMapping("/{equId}")
@ApiOperation("获取界面ALlertMessage信息")
public TableDataInfo listByEquId(@PathVariable("equId")String equId)
@ -123,7 +122,6 @@ public class AlertMessageController extends BaseController
* 统计预警次数信息
*/
@PreAuthorize("@ss.hasPermi('inMonitoring:alertMessage:statistic')")
@Log(title = "统计预警信息", businessType = BusinessType.OTHER)
@GetMapping("/times")
@ApiOperation("统计预警次数信息")
public AjaxResult getAlertStatistic() {

@ -85,7 +85,6 @@ public class EquInterfaceController extends BaseController
* 查询界面详细信息----
*/
@PreAuthorize("@ss.hasPermi('device:interface:listByEquId')")
@Log(title = "查询设备端口信息", businessType = BusinessType.OTHER)
@GetMapping("/{equID}")
@ApiOperation("获取界面Interface接口信息")
public TableDataInfo listByEquID(@PathVariable("equID") String equID)

@ -52,7 +52,6 @@ public class EquRoutingController extends BaseController
* 查询路由界面详细信息+++
*/
@PreAuthorize("@ss.hasPermi('device:routing:listByEquId')")
@Log(title = "查询设备路由信息", businessType = BusinessType.OTHER)
@GetMapping("/{equId}")
@ApiOperation("获取界面Routing信息")
public TableDataInfo listByEquId(@PathVariable("equId") String equId)

@ -52,7 +52,6 @@ public class EquVeneerController extends BaseController
* 查询界面信息+++
*/
@PreAuthorize("@ss.hasPermi('device:veneer:listByEquId')")
@Log(title = "查询设备venner信息", businessType = BusinessType.OTHER)
@GetMapping("/{equID}")
@ApiOperation("获取界面Venerr信息")
public TableDataInfo listByEquId(@PathVariable("equID") String equID)

@ -55,5 +55,5 @@ public enum BusinessType
/**
* 清空数据
*/
CLEAN, SELECT,
CLEAN,
}

Loading…
Cancel
Save