From e38aca8134570513435c003c25dc05f1ae51c9c9 Mon Sep 17 00:00:00 2001
From: yeg <1347747024@qq.com>
Date: 星期四, 08 十月 2026 13:56:28 +0800
Subject: [PATCH] 实现 Ticket04：采集器辅助测量与登记入口，拆除开发模拟器
---
ruoyi-admin/src/main/java/com/battery/business/web/TCollectorController.java | 34 ----------------------------------
1 files changed, 0 insertions(+), 34 deletions(-)
diff --git a/ruoyi-admin/src/main/java/com/battery/business/web/TCollectorController.java b/ruoyi-admin/src/main/java/com/battery/business/web/TCollectorController.java
index 0655948..1e9ea28 100644
--- a/ruoyi-admin/src/main/java/com/battery/business/web/TCollectorController.java
+++ b/ruoyi-admin/src/main/java/com/battery/business/web/TCollectorController.java
@@ -1,6 +1,5 @@
package com.battery.business.web;
-import java.util.Collections;
import java.util.List;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.security.access.prepost.PreAuthorize;
@@ -15,15 +14,10 @@
import org.springframework.web.bind.annotation.RestController;
import com.ruoyi.common.annotation.Log;
import com.ruoyi.common.core.controller.BaseController;
-import com.ruoyi.common.constant.HttpStatus;
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.battery.business.domain.TCollector;
-import com.battery.business.domain.vo.DiscoveredCollectorVo;
-import com.battery.business.service.ICollectorDiscoveryService;
import com.battery.business.service.ITCollectorService;
/**
@@ -38,9 +32,6 @@
@Autowired
private ITCollectorService collectorService;
- @Autowired
- private ICollectorDiscoveryService collectorDiscoveryService;
-
/** 分页查询采集器列表。 */
@PreAuthorize("@ss.hasPermi('system:collector:list')")
@GetMapping("/list")
@@ -49,31 +40,6 @@
startPage();
List<TCollector> list = collectorService.selectCollectorList(collector);
return getDataTable(list);
- }
-
- /**
- * 查询当前可发现的采集器列表。
- *
- * @return 可发现采集器分页数据
- */
- @PreAuthorize("@ss.hasPermi('system:collector:list')")
- @GetMapping("/discovered/list")
- public TableDataInfo discoveredList()
- {
- List<DiscoveredCollectorVo> devices = collectorDiscoveryService.selectDiscoveredCollectorList();
- 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();
- long offset = (long) (pageNum - 1) * pageSize;
- int fromIndex = (int) Math.min(offset, devices.size());
- int toIndex = (int) Math.min((long) fromIndex + pageSize, devices.size());
- List<DiscoveredCollectorVo> 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