[search-console-b2b] rename LuceneMessage from LuceneQueueMessage

search-console-b2b/src/main/java/com/uas/search/console/b2b/controller/IndexController.java

@@ -3,7 +3,7 @@ package com.uas.search.console.b2b.controller;
 import com.uas.search.b2b.model.SPage;
 import com.uas.search.b2b.service.SearchService.Table_name;
 import com.uas.search.console.b2b.jms.AQListener;
-import com.uas.search.console.b2b.jms.LuceneQueueMessage;
+import com.uas.search.console.b2b.jms.LuceneMessage;
 import com.uas.search.console.b2b.service.IndexService;
 import com.uas.search.console.b2b.support.DownloadHelper;
 import com.uas.search.console.b2b.util.SearchConstants.DataSourceQualifier;
@@ -132,8 +132,8 @@ public class IndexController {
 
 	@RequestMapping("/listen/details")
 	@ResponseBody
-	public SPage<LuceneQueueMessage> listenDetails(String dataSourceQualifier, Integer page, Integer size,
-			String searchContent) {
+	public SPage<LuceneMessage> listenDetails(String dataSourceQualifier, Integer page, Integer size,
+                                              String searchContent) {
 		DataSourceQualifier qualifier = null;
 		if (dataSourceQualifier != null) {
 			qualifier = DataSourceQualifier.checkDataSourceType(dataSourceQualifier);

search-console-b2b/src/main/java/com/uas/search/console/b2b/jms/LuceneQueueMessage.java → search-console-b2b/src/main/java/com/uas/search/console/b2b/jms/LuceneMessage.java

@@ -1,111 +1,111 @@
-package com.uas.search.console.b2b.jms;
-
-import java.util.Objects;
-
-/**
- * 各个表的数据改动信息（为了实时更新索引，关于各个表的数据更改记录存储在AQ消息队列中）
- * 
- * @author sunyj
- * @since 2016年12月1日 下午3:05:22
- */
-public class LuceneQueueMessage {
-
-	/**
-	 * 在表中的id
-	 */
-	private String messageId;
-
-	/**
-	 * 更改发生的表
-	 */
-	private String tableName;
-
-	/**
-	 * 更改发生的数据的id
-	 */
-	private String ids;
-
-	/**
-	 * 更改发生的数据
-	 */
-	private String data;
-
-	/**
-	 * 更改的类型，INSERT、UPDATE、DELETE
-	 */
-	private String method;
-
-	/**
-	 * 更改发生的时间
-	 */
-	private String modifyTime;
-
-	public String getMessageId() {
-		return messageId;
-	}
-
-	public void setMessageId(String messageId) {
-		this.messageId = messageId;
-	}
-
-	public String getTableName() {
-		return tableName;
-	}
-
-	public void setTableName(String tableName) {
-		this.tableName = tableName;
-	}
-
-	public String getIds() {
-		return ids;
-	}
-
-	public void setIds(String ids) {
-		this.ids = ids;
-	}
-
-	public String getData() {
-		return data;
-	}
-
-	public void setData(String data) {
-		this.data = data;
-	}
-
-	public String getMethod() {
-		return method;
-	}
-
-	public void setMethod(String method) {
-		this.method = method;
-	}
-
-	public String getModifyTime() {
-		return modifyTime;
-	}
-
-	public void setModifyTime(String modifyTime) {
-		this.modifyTime = modifyTime;
-	}
-
-	@Override
-	public boolean equals(Object obj) {
-		if (this == obj) {
-			return true;
-		}
-		if (obj == null || getClass() != obj.getClass() || !(obj instanceof LuceneQueueMessage)) {
-			return false;
-		}
-		LuceneQueueMessage other = (LuceneQueueMessage) obj;
-		return Objects.equals(messageId, other.getMessageId()) && Objects.equals(tableName, other.getTableName())
-				&& Objects.equals(ids, other.getIds()) && Objects.equals(data, other.getData())
-				&& Objects.equals(method, other.getMethod()) && Objects.equals(modifyTime, other.getModifyTime());
-	}
-
-	@Override
-	public String toString() {
-		return "LuceneQueueMessage [messageId=" + messageId + ", tableName=" + tableName + ", ids=" + ids + ", data="
-				+ data + ", method=" + method + ", modifyTime=" + modifyTime + "]";
-	}
-
-}
+package com.uas.search.console.b2b.jms;
+
+import java.util.Objects;
+
+/**
+ * 各个表的数据改动信息（为了实时更新索引，关于各个表的数据更改记录存储在AQ消息队列中）
+ * 
+ * @author sunyj
+ * @since 2016年12月1日 下午3:05:22
+ */
+public class LuceneMessage {
+
+	/**
+	 * 在表中的id
+	 */
+	private String messageId;
+
+	/**
+	 * 更改发生的表
+	 */
+	private String tableName;
+
+	/**
+	 * 更改发生的数据的id
+	 */
+	private String ids;
+
+	/**
+	 * 更改发生的数据
+	 */
+	private String data;
+
+	/**
+	 * 更改的类型，INSERT、UPDATE、DELETE
+	 */
+	private String method;
+
+	/**
+	 * 更改发生的时间
+	 */
+	private String modifyTime;
+
+	public String getMessageId() {
+		return messageId;
+	}
+
+	public void setMessageId(String messageId) {
+		this.messageId = messageId;
+	}
+
+	public String getTableName() {
+		return tableName;
+	}
+
+	public void setTableName(String tableName) {
+		this.tableName = tableName;
+	}
+
+	public String getIds() {
+		return ids;
+	}
+
+	public void setIds(String ids) {
+		this.ids = ids;
+	}
+
+	public String getData() {
+		return data;
+	}
+
+	public void setData(String data) {
+		this.data = data;
+	}
+
+	public String getMethod() {
+		return method;
+	}
+
+	public void setMethod(String method) {
+		this.method = method;
+	}
+
+	public String getModifyTime() {
+		return modifyTime;
+	}
+
+	public void setModifyTime(String modifyTime) {
+		this.modifyTime = modifyTime;
+	}
+
+	@Override
+	public boolean equals(Object obj) {
+		if (this == obj) {
+			return true;
+		}
+		if (obj == null || getClass() != obj.getClass() || !(obj instanceof LuceneMessage)) {
+			return false;
+		}
+		LuceneMessage other = (LuceneMessage) obj;
+		return Objects.equals(messageId, other.getMessageId()) && Objects.equals(tableName, other.getTableName())
+				&& Objects.equals(ids, other.getIds()) && Objects.equals(data, other.getData())
+				&& Objects.equals(method, other.getMethod()) && Objects.equals(modifyTime, other.getModifyTime());
+	}
+
+	@Override
+	public String toString() {
+		return "LuceneMessage [messageId=" + messageId + ", tableName=" + tableName + ", ids=" + ids + ", data="
+				+ data + ", method=" + method + ", modifyTime=" + modifyTime + "]";
+	}
+
+}

search-console-b2b/src/main/java/com/uas/search/console/b2b/jms/LuceneQueueMessageDao.java → search-console-b2b/src/main/java/com/uas/search/console/b2b/jms/LuceneMessageDao.java

@@ -1,202 +1,202 @@
-package com.uas.search.console.b2b.jms;
-
-import com.alibaba.fastjson.JSONObject;
-import com.uas.search.b2b.exception.SearchException;
-import com.uas.search.b2b.model.SPage;
-import com.uas.search.console.b2b.util.JSONUtils;
-import com.uas.search.console.b2b.util.SearchConstants;
-import com.uas.search.util.StringUtils;
-import oracle.sql.STRUCT;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import javax.sql.DataSource;
-import java.sql.*;
-import java.util.ArrayList;
-import java.util.List;
-
-/**
- * @author sunyj
- * @since 2016年12月1日 下午5:35:24
- */
-public class LuceneQueueMessageDao {
-
-	/**
-	 * 默认的页码
-	 */
-	private static final int PAGE_INDEX = 1;
-
-	/**
-	 * 默认每页的大小
-	 */
-	private static final int PAGE_SIZE = 20;
-
-	private DataSource dataSource;
-
-	private Logger logger = LoggerFactory.getLogger(getClass());
-
-	public LuceneQueueMessageDao(DataSource dataSource) {
-		this.dataSource = dataSource;
-	}
-
-	/**
-	 * 获取关于实时更新情况的详细信息
-	 * 
-	 * @param page
-	 *            页码
-	 * @param size
-	 *            页大小
-	 * @param searchContent
-	 *            对消息内容进行搜索
-	 * @return 消息（实时更新情况的详细信息）
-	 */
-	public SPage<LuceneQueueMessage> findAll(Integer page, Integer size, String searchContent)
-			throws SQLRecoverableException {
-		if (StringUtils.isEmpty(searchContent)) {
-			searchContent = "";
-		}
-		SPage<LuceneQueueMessage> sPage = new SPage<>();
-
-		// 先获取总数目
-		String sql = "select count(*) from " + SearchConstants.LUCENE_QUEUE_TABLE_NAME
-				+ " t where upper(t.user_data.message) like upper('%" + searchContent + "%')";
-		Connection connection = null;
-		PreparedStatement preparedStatement = null;
-		ResultSet resultSet = null;
-
-		try {
-			connection = dataSource.getConnection();
-			preparedStatement = connection.prepareStatement(sql);
-			resultSet = preparedStatement.executeQuery();
-			resultSet.next();
-			int totalElement = resultSet.getInt(1);
-			sPage.setTotalElement(totalElement);
-			// 总数目为0，返回
-			if (totalElement == 0) {
-				return sPage;
-			}
-			preparedStatement.close();
-			resultSet.close();
-
-			// 处理分页信息
-			if (page == null || page <= 0) {
-				page = PAGE_INDEX;
-			}
-			if (size == null || size <= 0) {
-				size = PAGE_SIZE;
-			}
-
-			int totalPage = (int) Math.ceil(totalElement / (1.0 * size));
-			sPage.setTotalPage(totalPage);
-			// 如果页码过大
-			if (page > totalPage) {
-				page = totalPage;
-			}
-			int minRownum = 1 + (page - 1) * size;
-			int maxRownum = page * size;
-			sPage.setPage(page);
-			sPage.setSize(size);
-			if (page == 1) {
-				sPage.setFirst(true);
-			}
-			if (page == totalPage) {
-				sPage.setLast(true);
-			}
-
-			// 分页获取数据
-			// enq_time为GMT时间，转为本地时间，需加上8小时
-			sql = "select msgid, to_char(enq_time+8/24,'yyyy-mm-dd hh24:mi:ss'),user_data from (select tt.*,rownum r from (select * from "
-					+ SearchConstants.LUCENE_QUEUE_TABLE_NAME + " t where upper(t.user_data.message) like upper('%"
-					+ searchContent + "%') order by enq_time) tt where rownum<=?) ttt where ttt.r >=?";
-			List<LuceneQueueMessage> luceneQueueMessages = new ArrayList<>();
-			preparedStatement = connection.prepareStatement(sql);
-			preparedStatement.setInt(1, maxRownum);
-			preparedStatement.setInt(2, minRownum);
-			resultSet = preparedStatement.executeQuery();
-			while (resultSet.next()) {
-				LuceneQueueMessage luceneQueueMessage = new LuceneQueueMessage();
-				luceneQueueMessage.setMessageId(resultSet.getString(1));
-				luceneQueueMessage.setModifyTime(resultSet.getString(2));
-				STRUCT userData = (STRUCT) resultSet.getObject(3);
-				Object[] attributes = userData.getAttributes();
-				// 自定义消息格式 {"method":"value1","table":"value2","ids":"[1,2,3]"}
-				// 从队列消息中获取表的改动信息
-				JSONObject jsonObject = JSONUtils.parseObject(attributes[0].toString());
-				luceneQueueMessage.setTableName(jsonObject.getString("table"));
-				luceneQueueMessage.setIds(jsonObject.getString("ids"));
-				luceneQueueMessage.setData(JSONUtils.reverseFormat(jsonObject.getString("data")));
-				luceneQueueMessage.setMethod(jsonObject.getString("method"));
-				luceneQueueMessages.add(luceneQueueMessage);
-			}
-			sPage.setContent(luceneQueueMessages);
-		} catch (Throwable e) {
-			throw new SearchException(e).setDetailedMessage(e);
-		} finally {
-			if (resultSet != null) {
-				try {
-					resultSet.close();
-				} catch (SQLException e) {
-					logger.error("", e);
-				}
-			}
-			if (preparedStatement != null) {
-				try {
-					preparedStatement.close();
-				} catch (SQLException e) {
-					logger.error("", e);
-				}
-			}
-			if (connection != null) {
-				try {
-					connection.close();
-				} catch (SQLException e) {
-					logger.error("", e);
-				}
-			}
-		}
-		return sPage;
-	}
-
-	/**
-	 * 消息队列出队消息
-	 * 
-	 * @param messageId
-	 *            所要出队的消息的id
-	 * @return 是否出队成功
-	 */
-	public boolean dequeueLuceneQueueMessage(String messageId) throws SQLRecoverableException {
-		if (StringUtils.isEmpty(messageId)) {
-			return false;
-		} // 通过dbms_aq.dequeue出队，无法指定所出队的消息，所以直接通过删除表的数据间接达到出队的效果
-		String sql = "delete from " + SearchConstants.LUCENE_QUEUE_TABLE_NAME + " where msgid=?";
-		Connection connection = null;
-		PreparedStatement preparedStatement = null;
-
-		try {
-			connection = dataSource.getConnection();
-			preparedStatement = connection.prepareStatement(sql);
-			preparedStatement.setString(1, messageId);
-			int result = preparedStatement.executeUpdate();
-			connection.commit();
-			return result > 0;
-		} catch (SQLException e) {
-			throw new SearchException("出队消息失败：msgid=" + messageId).setDetailedMessage(e);
-		} finally {
-			if (preparedStatement != null) {
-				try {
-					preparedStatement.close();
-				} catch (SQLException e) {
-					logger.error("", e);
-				}
-			}
-			if (connection != null) {
-				try {
-					connection.close();
-				} catch (SQLException e) {
-					logger.error("", e);
-				}
-			}
-		}
-	}
-
-}
+package com.uas.search.console.b2b.jms;
+
+import com.alibaba.fastjson.JSONObject;
+import com.uas.search.b2b.exception.SearchException;
+import com.uas.search.b2b.model.SPage;
+import com.uas.search.console.b2b.util.JSONUtils;
+import com.uas.search.console.b2b.util.SearchConstants;
+import com.uas.search.util.StringUtils;
+import oracle.sql.STRUCT;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import javax.sql.DataSource;
+import java.sql.*;
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * @author sunyj
+ * @since 2016年12月1日 下午5:35:24
+ */
+public class LuceneMessageDao {
+
+	/**
+	 * 默认的页码
+	 */
+	private static final int PAGE_INDEX = 1;
+
+	/**
+	 * 默认每页的大小
+	 */
+	private static final int PAGE_SIZE = 20;
+
+	private DataSource dataSource;
+
+	private Logger logger = LoggerFactory.getLogger(getClass());
+
+	public LuceneMessageDao(DataSource dataSource) {
+		this.dataSource = dataSource;
+	}
+
+	/**
+	 * 获取关于实时更新情况的详细信息
+	 * 
+	 * @param page
+	 *            页码
+	 * @param size
+	 *            页大小
+	 * @param searchContent
+	 *            对消息内容进行搜索
+	 * @return 消息（实时更新情况的详细信息）
+	 */
+	public SPage<LuceneMessage> findAll(Integer page, Integer size, String searchContent)
+			throws SQLRecoverableException {
+		if (StringUtils.isEmpty(searchContent)) {
+			searchContent = "";
+		}
+		SPage<LuceneMessage> sPage = new SPage<>();
+
+		// 先获取总数目
+		String sql = "select count(*) from " + SearchConstants.LUCENE_QUEUE_TABLE_NAME
+				+ " t where upper(t.user_data.message) like upper('%" + searchContent + "%')";
+		Connection connection = null;
+		PreparedStatement preparedStatement = null;
+		ResultSet resultSet = null;
+
+		try {
+			connection = dataSource.getConnection();
+			preparedStatement = connection.prepareStatement(sql);
+			resultSet = preparedStatement.executeQuery();
+			resultSet.next();
+			int totalElement = resultSet.getInt(1);
+			sPage.setTotalElement(totalElement);
+			// 总数目为0，返回
+			if (totalElement == 0) {
+				return sPage;
+			}
+			preparedStatement.close();
+			resultSet.close();
+
+			// 处理分页信息
+			if (page == null || page <= 0) {
+				page = PAGE_INDEX;
+			}
+			if (size == null || size <= 0) {
+				size = PAGE_SIZE;
+			}
+
+			int totalPage = (int) Math.ceil(totalElement / (1.0 * size));
+			sPage.setTotalPage(totalPage);
+			// 如果页码过大
+			if (page > totalPage) {
+				page = totalPage;
+			}
+			int minRownum = 1 + (page - 1) * size;
+			int maxRownum = page * size;
+			sPage.setPage(page);
+			sPage.setSize(size);
+			if (page == 1) {
+				sPage.setFirst(true);
+			}
+			if (page == totalPage) {
+				sPage.setLast(true);
+			}
+
+			// 分页获取数据
+			// enq_time为GMT时间，转为本地时间，需加上8小时
+			sql = "select msgid, to_char(enq_time+8/24,'yyyy-mm-dd hh24:mi:ss'),user_data from (select tt.*,rownum r from (select * from "
+					+ SearchConstants.LUCENE_QUEUE_TABLE_NAME + " t where upper(t.user_data.message) like upper('%"
+					+ searchContent + "%') order by enq_time) tt where rownum<=?) ttt where ttt.r >=?";
+			List<LuceneMessage> luceneMessages = new ArrayList<>();
+			preparedStatement = connection.prepareStatement(sql);
+			preparedStatement.setInt(1, maxRownum);
+			preparedStatement.setInt(2, minRownum);
+			resultSet = preparedStatement.executeQuery();
+			while (resultSet.next()) {
+				LuceneMessage luceneMessage = new LuceneMessage();
+				luceneMessage.setMessageId(resultSet.getString(1));
+				luceneMessage.setModifyTime(resultSet.getString(2));
+				STRUCT userData = (STRUCT) resultSet.getObject(3);
+				Object[] attributes = userData.getAttributes();
+				// 自定义消息格式 {"method":"value1","table":"value2","ids":"[1,2,3]"}
+				// 从队列消息中获取表的改动信息
+				JSONObject jsonObject = JSONUtils.parseObject(attributes[0].toString());
+				luceneMessage.setTableName(jsonObject.getString("table"));
+				luceneMessage.setIds(jsonObject.getString("ids"));
+				luceneMessage.setData(JSONUtils.reverseFormat(jsonObject.getString("data")));
+				luceneMessage.setMethod(jsonObject.getString("method"));
+				luceneMessages.add(luceneMessage);
+			}
+			sPage.setContent(luceneMessages);
+		} catch (Throwable e) {
+			throw new SearchException(e).setDetailedMessage(e);
+		} finally {
+			if (resultSet != null) {
+				try {
+					resultSet.close();
+				} catch (SQLException e) {
+					logger.error("", e);
+				}
+			}
+			if (preparedStatement != null) {
+				try {
+					preparedStatement.close();
+				} catch (SQLException e) {
+					logger.error("", e);
+				}
+			}
+			if (connection != null) {
+				try {
+					connection.close();
+				} catch (SQLException e) {
+					logger.error("", e);
+				}
+			}
+		}
+		return sPage;
+	}
+
+	/**
+	 * 消息队列出队消息
+	 * 
+	 * @param messageId
+	 *            所要出队的消息的id
+	 * @return 是否出队成功
+	 */
+	public boolean dequeueLuceneQueueMessage(String messageId) throws SQLRecoverableException {
+		if (StringUtils.isEmpty(messageId)) {
+			return false;
+		} // 通过dbms_aq.dequeue出队，无法指定所出队的消息，所以直接通过删除表的数据间接达到出队的效果
+		String sql = "delete from " + SearchConstants.LUCENE_QUEUE_TABLE_NAME + " where msgid=?";
+		Connection connection = null;
+		PreparedStatement preparedStatement = null;
+
+		try {
+			connection = dataSource.getConnection();
+			preparedStatement = connection.prepareStatement(sql);
+			preparedStatement.setString(1, messageId);
+			int result = preparedStatement.executeUpdate();
+			connection.commit();
+			return result > 0;
+		} catch (SQLException e) {
+			throw new SearchException("出队消息失败：msgid=" + messageId).setDetailedMessage(e);
+		} finally {
+			if (preparedStatement != null) {
+				try {
+					preparedStatement.close();
+				} catch (SQLException e) {
+					logger.error("", e);
+				}
+			}
+			if (connection != null) {
+				try {
+					connection.close();
+				} catch (SQLException e) {
+					logger.error("", e);
+				}
+			}
+		}
+	}
+
+}

search-console-b2b/src/main/java/com/uas/search/console/b2b/service/IndexService.java

@@ -2,7 +2,7 @@ package com.uas.search.console.b2b.service;
 
 import com.uas.search.b2b.model.SPage;
 import com.uas.search.b2b.service.SearchService.Table_name;
-import com.uas.search.console.b2b.jms.LuceneQueueMessage;
+import com.uas.search.console.b2b.jms.LuceneMessage;
 import com.uas.search.console.b2b.model.ParsedQueueMessage;
 import com.uas.search.console.b2b.support.DownloadHelper;
 import com.uas.search.console.b2b.util.SearchConstants.DataSourceQualifier;
@@ -145,8 +145,8 @@ public interface IndexService {
 	 *            可为空，对消息内容进行搜索
 	 * @return 等待更新的数据的信息
 	 */
-	public SPage<LuceneQueueMessage> getListenDetails(DataSourceQualifier dataSourceQualifier, Integer page,
-			Integer size, String searchContent);
+	public SPage<LuceneMessage> getListenDetails(DataSourceQualifier dataSourceQualifier, Integer page,
+                                                 Integer size, String searchContent);
 
 	/**
 	 * 指定数据源消息队列出队消息

search-console-b2b/src/main/java/com/uas/search/console/b2b/service/impl/IndexServiceImpl.java

@@ -9,8 +9,8 @@ import com.uas.search.b2b.service.SearchService.Table_name;
 import com.uas.search.console.b2b.DruidDBConfiguration;
 import com.uas.search.console.b2b.LuceneProperties;
 import com.uas.search.console.b2b.jms.AQListener;
-import com.uas.search.console.b2b.jms.LuceneQueueMessage;
-import com.uas.search.console.b2b.jms.LuceneQueueMessageDao;
+import com.uas.search.console.b2b.jms.LuceneMessage;
+import com.uas.search.console.b2b.jms.LuceneMessageDao;
 import com.uas.search.console.b2b.jms.QueueMessageParser;
 import com.uas.search.console.b2b.model.PageInfo;
 import com.uas.search.console.b2b.model.ParsedQueueMessage;
@@ -534,11 +534,11 @@ public class IndexServiceImpl implements IndexService {
 	}
 
 	@Override
-	public SPage<LuceneQueueMessage> getListenDetails(DataSourceQualifier dataSourceQualifier, Integer page,
-			Integer size, String searchContent) {
+	public SPage<LuceneMessage> getListenDetails(DataSourceQualifier dataSourceQualifier, Integer page,
+                                                 Integer size, String searchContent) {
 		try {
 			DruidDataSource dataSource = DruidDBConfiguration.getDataSource(dataSourceQualifier);
-			return new LuceneQueueMessageDao(dataSource).findAll(page, size, searchContent);
+			return new LuceneMessageDao(dataSource).findAll(page, size, searchContent);
 		} catch (SQLRecoverableException e) {
 			throw new SearchException(e).setDetailedMessage(e);
 		}
@@ -548,7 +548,7 @@ public class IndexServiceImpl implements IndexService {
 	public boolean dequeueLuceneQueueMessage(DataSourceQualifier dataSourceQualifier, String messageId) {
 		try {
 			DruidDataSource dataSource = DruidDBConfiguration.getDataSource(dataSourceQualifier);
-			return new LuceneQueueMessageDao(dataSource).dequeueLuceneQueueMessage(messageId);
+			return new LuceneMessageDao(dataSource).dequeueLuceneQueueMessage(messageId);
 		} catch (SQLRecoverableException e) {
 			throw new SearchException(e).setDetailedMessage(e);
 		}

search-console-b2b/src/main/java/com/uas/search/console/b2b/support/RealTimeUpdateMonitor.java

@@ -3,6 +3,7 @@ package com.uas.search.console.b2b.support;
 import java.sql.SQLRecoverableException;
 import java.util.HashSet;
 
+import com.uas.search.console.b2b.jms.LuceneMessage;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import com.uas.search.util.CollectionUtils;
@@ -12,8 +13,7 @@ import com.uas.search.b2b.model.SPage;
 import com.uas.search.console.b2b.DruidDBConfiguration;
 import com.uas.search.console.b2b.util.ContextUtils;
 import com.uas.search.console.b2b.jms.AQListener;
-import com.uas.search.console.b2b.jms.LuceneQueueMessage;
-import com.uas.search.console.b2b.jms.LuceneQueueMessageDao;
+import com.uas.search.console.b2b.jms.LuceneMessageDao;
 import com.uas.search.console.b2b.schedule.model.TaskInformation;
 import com.uas.search.console.b2b.schedule.service.Executable;
 import com.uas.search.console.b2b.schedule.service.TaskService;
@@ -36,7 +36,7 @@ public class RealTimeUpdateMonitor {
 	/**
 	 * 上次查询时最旧的消息
 	 */
-	private LuceneQueueMessage oldestMessage;
+	private LuceneMessage oldestMessage;
 
 	/**
 	 * 第一次执行的延迟时间间隔为1秒
@@ -93,18 +93,18 @@ public class RealTimeUpdateMonitor {
 	 */
 	private boolean workWell() throws SQLRecoverableException {
 		DruidDataSource dataSource = DruidDBConfiguration.getDataSource(dataSourceQualifier);
-		SPage<LuceneQueueMessage> sPage = new LuceneQueueMessageDao(dataSource).findAll(1, 1, null);
+		SPage<LuceneMessage> sPage = new LuceneMessageDao(dataSource).findAll(1, 1, null);
 		// 如果消息队列中没有消息，说明没有等待更新的消息
 		if (CollectionUtils.isEmpty(sPage.getContent())) {
 			return true;
 		}
-		LuceneQueueMessage luceneQueueMessage = CollectionUtils.isEmpty(sPage.getContent()) ? null
+		LuceneMessage luceneMessage = CollectionUtils.isEmpty(sPage.getContent()) ? null
 				: sPage.getContent().get(0);
 		// 比较上次与本次查询的最旧的消息，如果两者相同，说明实时更新服务出现了问题
-		if (oldestMessage != null && oldestMessage.equals(luceneQueueMessage)) {
+		if (oldestMessage != null && oldestMessage.equals(luceneMessage)) {
 			return false;
 		} else {
-			oldestMessage = luceneQueueMessage;
+			oldestMessage = luceneMessage;
 			return true;
 		}
 	}