From 954192cde1386ebd4a6135f659eccd89323f922d Mon Sep 17 00:00:00 2001
From: xiangpei <xiangpei@timesnew.cn>
Date: 星期二, 20 八月 2024 10:48:28 +0800
Subject: [PATCH] 资产设备分页bug
---
ycl-pojo/src/main/java/com/ycl/platform/base/AbsQuery.java | 8 +++++---
ycl-server/src/main/java/com/ycl/platform/mapper/TMonitorMapper.java | 2 +-
ycl-server/src/main/resources/mapper/zgyw/TMonitorMapper.xml | 30 ++++++++++++++++++++----------
ycl-server/src/main/java/com/ycl/platform/service/impl/TMonitorServiceImpl.java | 7 +++++--
4 files changed, 31 insertions(+), 16 deletions(-)
diff --git a/ycl-pojo/src/main/java/com/ycl/platform/base/AbsQuery.java b/ycl-pojo/src/main/java/com/ycl/platform/base/AbsQuery.java
index 09bf614..c0213c9 100644
--- a/ycl-pojo/src/main/java/com/ycl/platform/base/AbsQuery.java
+++ b/ycl-pojo/src/main/java/com/ycl/platform/base/AbsQuery.java
@@ -13,17 +13,19 @@
public class AbsQuery {
@ApiModelProperty(value = "褰撳墠椤�", required = true)
- private Long pageNum = 1L;
+ private Integer pageNum = 1;
@ApiModelProperty(value = "姣忛〉鏉℃暟", required = true)
- private Long pageSize = 10L;
+ private Integer pageSize = 10;
+
+ private Integer startNum;
/**
* 鑾峰彇mongo鍒嗛〉skip璺宠繃鐨勬潯鏁�
*
* @return
*/
- public Long getSkipNum() {
+ public Integer getSkipNum() {
return (pageNum - 1) * pageSize;
}
}
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 2a6592c..6e66a2a 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
@@ -124,11 +124,11 @@
/**
* 鏁版嵁涓績-璧勪骇绠＄悊
*
- * @param page
* @param query
*/
IPage assetManagement(IPage<TMonitorVO> page, @Param("query") DataCenterQuery query);
+
void deleteAll();
}
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 3a6d860..a895a82 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
@@ -2,8 +2,10 @@
import annotation.DataScope;
import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.conditions.query.LambdaQueryChainWrapper;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.github.pagehelper.Page;
+import com.github.pagehelper.PageHelper;
import com.ycl.platform.domain.entity.TMonitor;
import com.ycl.platform.domain.query.DashboardQuery;
import com.ycl.platform.domain.query.DataCenterQuery;
@@ -14,6 +16,7 @@
import com.ycl.platform.mapper.TMonitorMapper;
import com.ycl.platform.service.ITMonitorService;
import com.ycl.system.Result;
+import com.ycl.system.page.PageUtil;
import com.ycl.system.service.ISysConfigService;
import com.ycl.utils.StringUtils;
import com.ycl.utils.redis.RedisCache;
@@ -168,7 +171,7 @@
@Override
public Result assetManagement(DataCenterQuery query) {
- IPage<TMonitorVO> page = new Page<>(query.getPageNum(), query.getPageSize());
+ IPage<TMonitorVO> page = PageUtil.getPage(query, TMonitorVO.class);
baseMapper.assetManagement(page, query);
return Result.ok().data(page.getRecords()).total(page.getTotal());
}
diff --git a/ycl-server/src/main/resources/mapper/zgyw/TMonitorMapper.xml b/ycl-server/src/main/resources/mapper/zgyw/TMonitorMapper.xml
index 8c11119..8bf9143 100644
--- a/ycl-server/src/main/resources/mapper/zgyw/TMonitorMapper.xml
+++ b/ycl-server/src/main/resources/mapper/zgyw/TMonitorMapper.xml
@@ -488,23 +488,29 @@
tm.camera_dept,
tm.hybm,
tm.lxbm,
- dc.prop_name,
- dc.label_value,
- dcv.column_value
+ 't_monitor' as tableName,
+ #{query.keyword} as keyword
FROM
t_monitor tm
- LEFT JOIN t_dynamic_column_value dcv ON tm.id = dcv.ref_id
- LEFT JOIN t_dynamic_column dc ON dc.id = dcv.dynamic_column_id AND dc.table_name = #{query.tableName}
<where>
<if test="query.keyword != null and query.keyword != ''">
- AND (tm.name like concat('%', #{query.keyword}, '%') OR dcv.column_value like concat('%', #{query.keyword}, '%'))
+ AND tm.name like concat('%', #{query.keyword}, '%')
</if>
</where>
</select>
- <delete id="deleteAll">
- delete from t_monitor
- </delete>
+ <select id="getDyColumns" resultMap="dynamicColumnMap">
+ SELECT
+ *
+ FROM
+ t_dynamic_column_value dcv
+ LEFT JOIN t_dynamic_column dc ON dc.id = dcv.dynamic_column_id AND dc.table_name = #{tableName}
+ WHERE
+ dcv.ref_id = #{id}
+ <if test="keyword != null and keyword != ''">
+ and dcv.column_value like concat('%', #{keyword}, '%')
+ </if>
+ </select>
<resultMap id="dyMap" type="com.ycl.platform.domain.vo.TMonitorVO">
<id column="id" property="id"/>
@@ -537,7 +543,7 @@
<result column="camera_dept" property="cameraDept"/>
<result column="hybm" property="hybm"/>
<result column="lxbm" property="lxbm"/>
- <collection property="dynamicColumnList" ofType="com.ycl.platform.domain.vo.DynamicColumnVO" resultMap="dynamicColumnMap"/>
+ <collection property="dynamicColumnList" select="getDyColumns" column="{id=id,tableName=tableName,keyword=keyword}" ofType="com.ycl.platform.domain.vo.DynamicColumnVO"/>
</resultMap>
<resultMap id="dynamicColumnMap" type="com.ycl.platform.domain.vo.DynamicColumnVO">
@@ -546,4 +552,8 @@
<result column="column_value" property="columnValue"/>
</resultMap>
+
+ <delete id="deleteAll">
+ delete from t_monitor
+ </delete>
</mapper>
--
Gitblit v1.8.0