From 87a050a80c477fedf706adfe1c89b11a705ac325 Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期一, 09 六月 2025 16:17:37 +0800
Subject: [PATCH] 完善代码
---
pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/daoVi/ViCameraMapper.java | 13 +++++++++++++
pipIrr-platform/pipIrr-global/src/main/resources/mapper/ViCameraMapper.xml | 32 ++++++++++++++++++++++++++++++++
pipIrr-platform/pipIrr-web/pipIrr-web-remote/src/main/java/com/dy/pipIrrRemote/video/VideoSv.java | 4 ++--
3 files changed, 47 insertions(+), 2 deletions(-)
diff --git a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/daoVi/ViCameraMapper.java b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/daoVi/ViCameraMapper.java
index 48e9123..05843d2 100644
--- a/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/daoVi/ViCameraMapper.java
+++ b/pipIrr-platform/pipIrr-global/src/main/java/com/dy/pipIrrGlobal/daoVi/ViCameraMapper.java
@@ -43,6 +43,19 @@
* @return 瀹炰綋闆嗗悎
*/
List<VoCamera> selectSome(Map<?, ?> params) ;
+ /**
+ * 鏌ヨ鎬绘暟
+ * @param params 鏌ヨ鏉′欢
+ * @return 鎬绘暟
+ */
+ Long selectTotal4Monitor(Map<?, ?> params) ;
+
+ /**
+ * 鍒嗛〉鏌ヨ涓�浜�
+ * @param params 鏌ヨ鏉′欢
+ * @return 瀹炰綋闆嗗悎
+ */
+ List<VoCamera> selectSome4Monitor(Map<?, ?> params) ;
// Update the record in the ViCamera table based on the primary key, but only update the fields that are not null
int updateByPrimaryKeySelective(ViCamera record);
diff --git a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/ViCameraMapper.xml b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/ViCameraMapper.xml
index 62cb3b9..7c22788 100644
--- a/pipIrr-platform/pipIrr-global/src/main/resources/mapper/ViCameraMapper.xml
+++ b/pipIrr-platform/pipIrr-global/src/main/resources/mapper/ViCameraMapper.xml
@@ -62,6 +62,38 @@
</if>
</trim>
</select>
+
+ <select id="selectTotal4Monitor" parameterType="java.util.Map" resultType="java.lang.Long">
+ select
+ count(*)
+ from vi_camera tb
+ where tb.deleted != 1 and tb.on_screen = 1
+ <trim prefix="and" suffixOverrides="and">
+ <if test="name != null and name != ''">
+ tb.`name` like concat('%', #{name}, '%') and
+ </if>
+ </trim>
+ </select>
+ <select id="selectSome4Monitor" parameterType="java.util.Map" resultType="com.dy.pipIrrGlobal.voVi.VoCamera">
+ <!--@mbg.generated-->
+ select
+ <include refid="part_Column_List" >
+ <property name="alias" value="tb"/>
+ </include>
+ from vi_camera tb
+ where tb.deleted != 1 and tb.on_screen = 1
+ <trim prefix="and" suffixOverrides="and">
+ <if test="name != null">
+ tb.`name` like concat('%', #{name}, '%') and
+ </if>
+ </trim>
+ order by tb.on_sort ASC, tb.id DESC
+ <trim prefix="limit " >
+ <if test="start != null and count != null">
+ #{start,javaType=Integer,jdbcType=INTEGER}, #{count,javaType=Integer,jdbcType=INTEGER}
+ </if>
+ </trim>
+ </select>
<delete id="deleteByPrimaryKey" parameterType="java.lang.Long">
<!--@mbg.generated-->
delete from vi_camera
diff --git a/pipIrr-platform/pipIrr-web/pipIrr-web-remote/src/main/java/com/dy/pipIrrRemote/video/VideoSv.java b/pipIrr-platform/pipIrr-web/pipIrr-web-remote/src/main/java/com/dy/pipIrrRemote/video/VideoSv.java
index 45025f5..58ab291 100644
--- a/pipIrr-platform/pipIrr-web/pipIrr-web-remote/src/main/java/com/dy/pipIrrRemote/video/VideoSv.java
+++ b/pipIrr-platform/pipIrr-web/pipIrr-web-remote/src/main/java/com/dy/pipIrrRemote/video/VideoSv.java
@@ -30,13 +30,13 @@
*/
public QueryResultVo<List<VoCamera>> some(VideoQo queryQo, int pageSize) {
Map<String, Object> params = (Map<String, Object>) PojoUtils.generalize(queryQo);
- Long itemTotal = dao.selectTotal(params);
+ Long itemTotal = dao.selectTotal4Monitor(params);
QueryResultVo<List<VoCamera>> rsVo = new QueryResultVo<>();
rsVo.pageSize = pageSize;
rsVo.pageCurr = queryQo.pageCurr;
rsVo.calculateAndSet(itemTotal, params);
- rsVo.obj = dao.selectSome(params);
+ rsVo.obj = dao.selectSome4Monitor((params)) ;
return rsVo;
}
--
Gitblit v1.8.0