From 303e1b751aa6cf77411ba06298b7f84e245417ca Mon Sep 17 00:00:00 2001 From: ligang Date: Thu, 11 Apr 2019 16:30:58 +0800 Subject: [PATCH] update QueueMapper and QueueMapperProvider --- .../cn/escheduler/dao/mapper/QueueMapper.java | 32 +++++++++- .../dao/mapper/QueueMapperProvider.java | 62 +++++++++++++++++-- 2 files changed, 87 insertions(+), 7 deletions(-) diff --git a/escheduler-dao/src/main/java/cn/escheduler/dao/mapper/QueueMapper.java b/escheduler-dao/src/main/java/cn/escheduler/dao/mapper/QueueMapper.java index 534666c463..b5e8ad99be 100644 --- a/escheduler-dao/src/main/java/cn/escheduler/dao/mapper/QueueMapper.java +++ b/escheduler-dao/src/main/java/cn/escheduler/dao/mapper/QueueMapper.java @@ -20,6 +20,7 @@ import cn.escheduler.dao.model.Queue; import org.apache.ibatis.annotations.*; import org.apache.ibatis.type.JdbcType; +import java.sql.Timestamp; import java.util.List; /** @@ -64,7 +65,9 @@ public interface QueueMapper { */ @Results(value = {@Result(property = "id", column = "id", id = true, javaType = Integer.class, jdbcType = JdbcType.INTEGER), @Result(property = "queueName", column = "queue_name", javaType = String.class, jdbcType = JdbcType.VARCHAR), - @Result(property = "queue", column = "queue", javaType = String.class, jdbcType = JdbcType.VARCHAR) + @Result(property = "queue", column = "queue", javaType = String.class, jdbcType = JdbcType.VARCHAR), + @Result(property = "createTime", column = "create_time", javaType = Timestamp.class, jdbcType = JdbcType.DATE), + @Result(property = "updateTime", column = "update_time", javaType = Timestamp.class, jdbcType = JdbcType.DATE) }) @SelectProvider(type = QueueMapperProvider.class, method = "queryById") Queue queryById(@Param("queueId") int queueId); @@ -76,13 +79,38 @@ public interface QueueMapper { */ @Results(value = {@Result(property = "id", column = "id", id = true, javaType = Integer.class, jdbcType = JdbcType.INTEGER), @Result(property = "queueName", column = "queue_name", javaType = String.class, jdbcType = JdbcType.VARCHAR), - @Result(property = "queue", column = "queue", javaType = String.class, jdbcType = JdbcType.VARCHAR) + @Result(property = "queue", column = "queue", javaType = String.class, jdbcType = JdbcType.VARCHAR), + @Result(property = "createTime", column = "create_time", javaType = Timestamp.class, jdbcType = JdbcType.DATE), + @Result(property = "updateTime", column = "update_time", javaType = Timestamp.class, jdbcType = JdbcType.DATE) }) @SelectProvider(type = QueueMapperProvider.class, method = "queryAllQueue") List queryAllQueue(); + /** + * query all queue list + * @return + */ + @Results(value = {@Result(property = "id", column = "id", id = true, javaType = Integer.class, jdbcType = JdbcType.INTEGER), + @Result(property = "queueName", column = "queue_name", javaType = String.class, jdbcType = JdbcType.VARCHAR), + @Result(property = "queue", column = "queue", javaType = String.class, jdbcType = JdbcType.VARCHAR), + @Result(property = "createTime", column = "create_time", javaType = Timestamp.class, jdbcType = JdbcType.DATE), + @Result(property = "updateTime", column = "update_time", javaType = Timestamp.class, jdbcType = JdbcType.DATE) + }) + @SelectProvider(type = QueueMapperProvider.class, method = "queryQueuePaging") + List queryQueuePaging(@Param("searchVal") String searchVal, + @Param("offset") Integer offset, + @Param("pageSize") Integer pageSize); + /** + * count queue by search value + * @param searchVal + * @return + */ + @SelectProvider(type = QueueMapperProvider.class, method = "countQueuePaging") + Integer countQueuePaging(@Param("searchVal") String searchVal); + @SelectProvider(type = QueueMapperProvider.class, method = "queryByQueue") + Queue queryByQueue(@Param("queue") String queue); } diff --git a/escheduler-dao/src/main/java/cn/escheduler/dao/mapper/QueueMapperProvider.java b/escheduler-dao/src/main/java/cn/escheduler/dao/mapper/QueueMapperProvider.java index ee829f1557..e3adbaa1e6 100644 --- a/escheduler-dao/src/main/java/cn/escheduler/dao/mapper/QueueMapperProvider.java +++ b/escheduler-dao/src/main/java/cn/escheduler/dao/mapper/QueueMapperProvider.java @@ -16,6 +16,7 @@ */ package cn.escheduler.dao.mapper; +import org.apache.commons.lang3.StringUtils; import org.apache.ibatis.jdbc.SQL; import java.util.Map; @@ -39,7 +40,8 @@ public class QueueMapperProvider { INSERT_INTO(TABLE_NAME); VALUES("`queue_name`", "#{queue.queueName}"); VALUES("`queue`", "#{queue.queue}"); - + VALUES("`create_time`", "#{queue.createTime}"); + VALUES("`update_time`", "#{queue.updateTime}"); } }.toString(); } @@ -73,6 +75,7 @@ public class QueueMapperProvider { SET("`queue_name`=#{queue.queueName}"); SET("`queue`=#{queue.queue}"); + SET("`update_time`=#{queue.updateTime}"); WHERE("`id`=#{queue.id}"); } @@ -80,10 +83,6 @@ public class QueueMapperProvider { } - - - - /** * query queue by id * @@ -117,5 +116,58 @@ public class QueueMapperProvider { }.toString(); } + /** + * count queue by search value + * @param parameter + * @return + */ + public String countQueuePaging(Map parameter) { + return new SQL() {{ + SELECT("count(0)"); + FROM(TABLE_NAME); + Object searchVal = parameter.get("searchVal"); + if(searchVal != null && StringUtils.isNotEmpty(searchVal.toString())){ + WHERE( " queue like concat('%', #{searchVal}, '%') "); + } + }}.toString(); + } + + /** + * query tenant list paging + * @param parameter + * @return + */ + public String queryQueuePaging(Map parameter) { + return new SQL() { + { + SELECT("*"); + FROM(TABLE_NAME); + Object searchVal = parameter.get("searchVal"); + if(searchVal != null && StringUtils.isNotEmpty(searchVal.toString())){ + WHERE( " queue like concat('%', #{searchVal}, '%') "); + } + ORDER_BY(" update_time desc limit #{offset},#{pageSize} "); + } + }.toString(); + + } + + /** + * query by queue + * + * @param parameter + * @return + */ + public String queryByQueue(Map parameter) { + return new SQL() { + { + SELECT("*"); + + FROM(TABLE_NAME); + + WHERE("`queue` = #{queue}"); + } + }.toString(); + } }