From e12439d1f4a94957d68cda653cb666702bc71040 Mon Sep 17 00:00:00 2001
From: yeg <1347747024@qq.com>
Date: 星期三, 26 八月 2026 16:09:55 +0800
Subject: [PATCH] feat(device): implement adapter registry and discovery
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/TDetectionCabinetController.java | 37 +------------------------------------
1 files changed, 1 insertions(+), 36 deletions(-)
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/TDetectionCabinetController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/TDetectionCabinetController.java
index 75af3d8..2786419 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/TDetectionCabinetController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/TDetectionCabinetController.java
@@ -1,6 +1,5 @@
package com.ruoyi.web.controller.system;
-import java.util.Collections;
import java.util.List;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.validation.annotation.Validated;
@@ -13,16 +12,11 @@
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import com.ruoyi.common.annotation.Log;
-import com.ruoyi.common.constant.HttpStatus;
import com.ruoyi.common.core.controller.BaseController;
import com.ruoyi.common.core.domain.AjaxResult;
-import com.ruoyi.common.core.page.PageDomain;
import com.ruoyi.common.core.page.TableDataInfo;
-import com.ruoyi.common.core.page.TableSupport;
import com.ruoyi.common.enums.BusinessType;
import com.ruoyi.system.domain.TDetectionCabinet;
-import com.ruoyi.system.domain.vo.DiscoveredCabinetVo;
-import com.ruoyi.system.service.IDetectionCabinetDiscoveryService;
import com.ruoyi.system.service.ITDetectionCabinetService;
/**
@@ -36,19 +30,14 @@
{
private final ITDetectionCabinetService detectionCabinetService;
- private final IDetectionCabinetDiscoveryService detectionCabinetDiscoveryService;
-
/**
* 构造检测柜管理控制器。
*
* @param detectionCabinetService 检测柜业务服务
- * @param detectionCabinetDiscoveryService 检测柜设备发现服务
*/
- public TDetectionCabinetController(ITDetectionCabinetService detectionCabinetService,
- IDetectionCabinetDiscoveryService detectionCabinetDiscoveryService)
+ public TDetectionCabinetController(ITDetectionCabinetService detectionCabinetService)
{
this.detectionCabinetService = detectionCabinetService;
- this.detectionCabinetDiscoveryService = detectionCabinetDiscoveryService;
}
/**
@@ -64,30 +53,6 @@
startPage();
List<TDetectionCabinet> list = detectionCabinetService.selectDetectionCabinetList(detectionCabinet);
return getDataTable(list);
- }
-
- /**
- * 查询当前可发现的检测柜列表。
- *
- * @return 可发现检测柜分页数据
- */
- @PreAuthorize("@ss.hasPermi('system:detectionCabinet:list')")
- @GetMapping("/discovered/list")
- public TableDataInfo discoveredList()
- {
- List<DiscoveredCabinetVo> devices = detectionCabinetDiscoveryService.selectDiscoveredCabinetList();
- PageDomain pageDomain = TableSupport.buildPageRequest();
- int pageNum = pageDomain.getPageNum() == null || pageDomain.getPageNum() < 1 ? 1 : pageDomain.getPageNum();
- int pageSize = pageDomain.getPageSize() == null || pageDomain.getPageSize() < 1 ? 10 : pageDomain.getPageSize();
- int fromIndex = Math.min((pageNum - 1) * pageSize, devices.size());
- int toIndex = Math.min(fromIndex + pageSize, devices.size());
- List<DiscoveredCabinetVo> rows = fromIndex == toIndex
- ? Collections.emptyList()
- : devices.subList(fromIndex, toIndex);
- TableDataInfo result = new TableDataInfo(rows, devices.size());
- result.setCode(HttpStatus.SUCCESS);
- result.setMsg("查询成功");
- return result;
}
/**
--
Gitblit v1.7.1