From fa12bf28a088fe8cc82868fab9a9d689252108a3 Mon Sep 17 00:00:00 2001
From: fuliqi <fuliqi@qq.com>
Date: 星期二, 06 八月 2024 15:28:10 +0800
Subject: [PATCH] Monitor结构更新2
---
ycl-server/src/main/java/com/ycl/platform/service/ITMonitorService.java | 2 +-
ycl-server/src/main/java/com/ycl/platform/mapper/TMonitorMapper.java | 2 +-
ycl-server/src/main/java/com/ycl/platform/controller/TMonitorController.java | 4 ++--
ycl-server/src/main/resources/mapper/zgyw/TMonitorMapper.xml | 1 +
ycl-server/src/main/java/com/ycl/platform/service/impl/TMonitorServiceImpl.java | 2 +-
5 files changed, 6 insertions(+), 5 deletions(-)
diff --git a/ycl-server/src/main/java/com/ycl/platform/controller/TMonitorController.java b/ycl-server/src/main/java/com/ycl/platform/controller/TMonitorController.java
index f1b7859..3ac12c1 100644
--- a/ycl-server/src/main/java/com/ycl/platform/controller/TMonitorController.java
+++ b/ycl-server/src/main/java/com/ycl/platform/controller/TMonitorController.java
@@ -34,7 +34,7 @@
*/
@PreAuthorize("@ss.hasPermi('system:monitor:list')")
@GetMapping("/list")
- public TableDataInfo list(TMonitor tMonitor)
+ public TableDataInfo list(TMonitorVO tMonitor)
{
startPage();
List<TMonitorVO> list = tMonitorService.selectTMonitorList(tMonitor);
@@ -47,7 +47,7 @@
@PreAuthorize("@ss.hasPermi('system:monitor:export')")
@Log(title = "璁惧璧勪骇", businessType = BusinessType.EXPORT)
@PostMapping("/export")
- public void export(HttpServletResponse response, TMonitor tMonitor)
+ public void export(HttpServletResponse response, TMonitorVO tMonitor)
{
List<TMonitorVO> list = tMonitorService.selectTMonitorList(tMonitor);
ExcelUtil<TMonitorVO> util = new ExcelUtil<TMonitorVO>(TMonitorVO.class);
diff --git a/ycl-server/src/main/java/com/ycl/platform/mapper/TMonitorMapper.java b/ycl-server/src/main/java/com/ycl/platform/mapper/TMonitorMapper.java
index 2e9913c..433d542 100644
--- a/ycl-server/src/main/java/com/ycl/platform/mapper/TMonitorMapper.java
+++ b/ycl-server/src/main/java/com/ycl/platform/mapper/TMonitorMapper.java
@@ -30,7 +30,7 @@
* @param tMonitor 璁惧璧勪骇
* @return 璁惧璧勪骇闆嗗悎
*/
- public List<TMonitorVO> selectTMonitorList(TMonitor tMonitor);
+ public List<TMonitorVO> selectTMonitorList(TMonitorVO tMonitor);
/**
* 鏂板璁惧璧勪骇
diff --git a/ycl-server/src/main/java/com/ycl/platform/service/ITMonitorService.java b/ycl-server/src/main/java/com/ycl/platform/service/ITMonitorService.java
index a021021..c73a2d4 100644
--- a/ycl-server/src/main/java/com/ycl/platform/service/ITMonitorService.java
+++ b/ycl-server/src/main/java/com/ycl/platform/service/ITMonitorService.java
@@ -30,7 +30,7 @@
* @param tMonitor 璁惧璧勪骇
* @return 璁惧璧勪骇闆嗗悎
*/
- public List<TMonitorVO> selectTMonitorList(TMonitor tMonitor);
+ public List<TMonitorVO> selectTMonitorList(TMonitorVO tMonitor);
/**
* 鏂板璁惧璧勪骇
diff --git a/ycl-server/src/main/java/com/ycl/platform/service/impl/TMonitorServiceImpl.java b/ycl-server/src/main/java/com/ycl/platform/service/impl/TMonitorServiceImpl.java
index a5188d2..57ea6e8 100644
--- a/ycl-server/src/main/java/com/ycl/platform/service/impl/TMonitorServiceImpl.java
+++ b/ycl-server/src/main/java/com/ycl/platform/service/impl/TMonitorServiceImpl.java
@@ -52,7 +52,7 @@
*/
@Override
@DataScope(deptAlias = "d",userAlias = "u")
- public List<TMonitorVO> selectTMonitorList(TMonitor tMonitor)
+ public List<TMonitorVO> selectTMonitorList(TMonitorVO tMonitor)
{
List<TMonitorVO> monitors = tMonitorMapper.selectTMonitorList(tMonitor);
if (Objects.equals(tMonitor.getRecovery(), 1)) {
diff --git a/ycl-server/src/main/resources/mapper/zgyw/TMonitorMapper.xml b/ycl-server/src/main/resources/mapper/zgyw/TMonitorMapper.xml
index be8a21a..5968d66 100644
--- a/ycl-server/src/main/resources/mapper/zgyw/TMonitorMapper.xml
+++ b/ycl-server/src/main/resources/mapper/zgyw/TMonitorMapper.xml
@@ -86,6 +86,7 @@
#{id}
</foreach>
</select>
+
<select id="selectTMonitorList" resultType="com.ycl.platform.domain.vo.TMonitorVO">
select m.id, m.serial_number, name, site_type, mac_addr, ip, camera_fun_type, longitude, latitude,
camera_capture_area, on_state, civil_code, integrated_device, camera_brand, address, net_working,
--
Gitblit v1.8.0