实时更新的解析过程修改

search-console/src/main/java/com/uas/search/console/jms/QueueMessageParser.java

@@ -1,7 +1,5 @@
 package com.uas.search.console.jms;
 
-import java.util.Arrays;
-
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.util.StringUtils;
@@ -175,10 +173,7 @@ public class QueueMessageParser {
 						kind = null;
 					}
 				} else {
-					if (localKind != null) {
-						kind = new KindSimpleInfo();
-						kind.setId(kindId);
-					}
+					kind = localKind;
 				}
 			}
 			// 新增或更新操作
@@ -214,10 +209,7 @@ public class QueueMessageParser {
 						brand = null;
 					}
 				} else {
-					if (localBrand != null) {
-						brand = new BrandSimpleInfo();
-						brand.setId(brandId);
-					}
+					brand = localBrand;
 				}
 			} else {
 				if (localBrand != null && localBrand.equals(brand)) {
@@ -250,10 +242,7 @@ public class QueueMessageParser {
 						component = null;
 					}
 				} else {
-					if (localComponent != null) {
-						component = new ComponentSimpleInfo();
-						component.setId(componentId);
-					}
+					component = localComponent;
 				}
 			}
 			// 器件较为特殊，insert和update需分开对待
@@ -279,7 +268,6 @@ public class QueueMessageParser {
 	// {"method":"insert","table":"trade$order","ids":[124]}
 	private OrderSimpleInfo[] parseOrder(JSONObject jsonObject) throws JSONException {
 		Object[] ids = jsonObject.getJSONArray("ids").toArray();
-		System.out.println("order ids " + ids.length + " " + Arrays.toString(ids));
 		OrderSimpleInfo[] orders = new OrderSimpleInfo[ids.length];
 		for (int i = 0; i < ids.length; i++) {
 			Long id = Long.parseLong(ids[i].toString());
@@ -293,10 +281,7 @@ public class QueueMessageParser {
 						order = null;
 					}
 				} else {
-					if (localOrder != null) {
-						order = new OrderSimpleInfo();
-						order.setId(id);
-					}
+					order = localOrder;
 				}
 			}
 			// 更新或者插入操作
@@ -321,7 +306,6 @@ public class QueueMessageParser {
 	// {"method":"insert","table":"trade$order_detail","ids":[124]}
 	private OrderDetailSimpleInfo[] parseOrderDetail(JSONObject jsonObject) throws JSONException {
 		Object[] ids = jsonObject.getJSONArray("ids").toArray();
-		System.out.println("orderDetail ids " + ids.length + " " + Arrays.toString(ids));
 		OrderDetailSimpleInfo[] orderDetails = new OrderDetailSimpleInfo[ids.length];
 		for (int i = 0; i < ids.length; i++) {
 			Long id = Long.parseLong(ids[i].toString());
@@ -335,10 +319,7 @@ public class QueueMessageParser {
 						orderDetail = null;
 					}
 				} else {
-					if (localOrderDetail != null) {
-						orderDetail = new OrderDetailSimpleInfo();
-						orderDetail.setId(id);
-					}
+					orderDetail = localOrderDetail;
 				}
 			}
 			// 更新或者插入操作
@@ -376,10 +357,7 @@ public class QueueMessageParser {
 						orderInvoice = null;
 					}
 				} else {
-					if (localOrderInvoice != null) {
-						orderInvoice = new OrderInvoiceSimpleInfo();
-						orderInvoice.setId(id);
-					}
+					orderInvoice = localOrderInvoice;
 				}
 			}
 			// 更新或者插入操作
@@ -417,10 +395,7 @@ public class QueueMessageParser {
 						orderInvoiceDetail = null;
 					}
 				} else {
-					if (localOrderInvoiceDetail != null) {
-						orderInvoiceDetail = new OrderInvoiceDetailSimpleInfo();
-						orderInvoiceDetail.setId(id);
-					}
+					orderInvoiceDetail = localOrderInvoiceDetail;
 				}
 			}
 			// 更新或者插入操作
@@ -445,7 +420,6 @@ public class QueueMessageParser {
 	// {"method":"insert","table":"trade$purchase","ids":[124]}
 	private PurchaseSimpleInfo[] parsePurchase(JSONObject jsonObject) throws JSONException {
 		Object[] ids = jsonObject.getJSONArray("ids").toArray();
-		System.out.println("purchase ids " + ids.length + " " + Arrays.toString(ids));
 		PurchaseSimpleInfo[] purchases = new PurchaseSimpleInfo[ids.length];
 		for (int i = 0; i < ids.length; i++) {
 			Long id = Long.parseLong(ids[i].toString());
@@ -459,10 +433,7 @@ public class QueueMessageParser {
 						purchase = null;
 					}
 				} else {
-					if (localPurchase != null) {
-						purchase = new PurchaseSimpleInfo();
-						purchase.setId(id);
-					}
+					purchase = localPurchase;
 				}
 			}
 			// 更新或者插入操作
@@ -487,7 +458,6 @@ public class QueueMessageParser {
 	// {"method":"insert","table":"trade$purchase_detail","ids":[124]}
 	private PurchaseDetailSimpleInfo[] parsePurchaseDetail(JSONObject jsonObject) throws JSONException {
 		Object[] ids = jsonObject.getJSONArray("ids").toArray();
-		System.out.println("purchaseDetail ids " + ids.length + " " + Arrays.toString(ids));
 		PurchaseDetailSimpleInfo[] purchaseDetails = new PurchaseDetailSimpleInfo[ids.length];
 		for (int i = 0; i < ids.length; i++) {
 			Long id = Long.parseLong(ids[i].toString());
@@ -501,10 +471,7 @@ public class QueueMessageParser {
 						purchaseDetail = null;
 					}
 				} else {
-					if (localPurchaseDetail != null) {
-						purchaseDetail = new PurchaseDetailSimpleInfo();
-						purchaseDetail.setId(id);
-					}
+					purchaseDetail = localPurchaseDetail;
 				}
 			}
 			// 更新或者插入操作
@@ -542,10 +509,7 @@ public class QueueMessageParser {
 						purchaseInvoice = null;
 					}
 				} else {
-					if (localPurchaseInvoice != null) {
-						purchaseInvoice = new PurchaseInvoiceSimpleInfo();
-						purchaseInvoice.setId(id);
-					}
+					purchaseInvoice = localPurchaseInvoice;
 				}
 			}
 			// 更新或者插入操作
@@ -585,10 +549,7 @@ public class QueueMessageParser {
 						purchaseInvoiceDetail = null;
 					}
 				} else {
-					if (localPurchaseInvoiceDetail != null) {
-						purchaseInvoiceDetail = new PurchaseInvoiceDetailSimpleInfo();
-						purchaseInvoiceDetail.setId(id);
-					}
+					purchaseInvoiceDetail = localPurchaseInvoiceDetail;
 				}
 			}
 			// 更新或者插入操作

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

@@ -313,7 +313,6 @@ public class OrderSearchServiceImpl implements OrderSearchService, InnerOrderSea
 				TopDocs previousTopDocs = indexSearcher.search(booleanQuery, (sPage.getPage() - 1) * sPage.getSize());
 				int totalHits = previousTopDocs.totalHits;
 				ScoreDoc[] previousScoreDocs = previousTopDocs.scoreDocs;
-				logger.info(previousScoreDocs == null || previousScoreDocs.length == 0);
 				if (totalHits != 0) {
 					if ((sPage.getPage() - 1) * sPage.getSize() >= totalHits) {
 						throw new SearchException("页码过大：元素总数量为" + totalHits);