|
|
@@ -1,12 +1,8 @@
|
|
|
package com.uas.search.console.b2b.util;
|
|
|
|
|
|
import org.apache.commons.collections.CollectionUtils;
|
|
|
-import org.apache.lucene.document.Document;
|
|
|
+import org.apache.lucene.document.*;
|
|
|
import org.apache.lucene.document.Field.Store;
|
|
|
-import org.apache.lucene.document.LongField;
|
|
|
-import org.apache.lucene.document.NumericDocValuesField;
|
|
|
-import org.apache.lucene.document.StringField;
|
|
|
-import org.apache.lucene.document.TextField;
|
|
|
import org.springframework.util.StringUtils;
|
|
|
|
|
|
import com.alibaba.fastjson.JSON;
|
|
|
@@ -51,6 +47,7 @@ import com.uas.search.console.b2b.model.SaleArcheckSimpleInfo;
|
|
|
import com.uas.search.console.b2b.model.SaleQuotationSimpleInfo;
|
|
|
import com.uas.search.console.b2b.model.SaleSendSimpleInfo;
|
|
|
import com.uas.search.console.b2b.model.VendorSimpleInfo;
|
|
|
+import com.uas.search.console.b2b.model.CartSimpleInfo;
|
|
|
import com.uas.search.console.b2b.platformmanager.model.UserSpaceDetailSimpleInfo;
|
|
|
|
|
|
import net.sf.ehcache.search.SearchException;
|
|
|
@@ -148,6 +145,8 @@ public class ObjectToDocumentUtils {
|
|
|
return toDocument((InvitationRecordSimpleInfo) object);
|
|
|
} else if (object instanceof ErpSaleTenderSimpleInfo) {
|
|
|
return toDocument((ErpSaleTenderSimpleInfo) object);
|
|
|
+ } else if (object instanceof CartSimpleInfo) {
|
|
|
+ return toDocument((CartSimpleInfo) object);
|
|
|
} else if (object instanceof ProdStandardSimpleInfo) {
|
|
|
return toDocument((ProdStandardSimpleInfo) object);
|
|
|
} else if (object instanceof ProdNonStandardSimpleInfo) {
|
|
|
@@ -407,7 +406,7 @@ public class ObjectToDocumentUtils {
|
|
|
/**
|
|
|
* PurchaseApbillSimpleInfo对象转为Document
|
|
|
*
|
|
|
- * @param purchaseOrder
|
|
|
+ * @param purchapbill
|
|
|
* @return 转换的Document
|
|
|
*/
|
|
|
public static Document toDocument(PurchaseApbillSimpleInfo purchapbill) {
|
|
|
@@ -451,7 +450,7 @@ public class ObjectToDocumentUtils {
|
|
|
/**
|
|
|
* PurchaseBadinSimpleInfo对象转为Document
|
|
|
*
|
|
|
- * @param purchaseOrder
|
|
|
+ * @param purchBadin
|
|
|
* @return 转换的Document
|
|
|
*/
|
|
|
public static Document toDocument(PurchaseBadinSimpleInfo purchBadin) {
|
|
|
@@ -506,7 +505,7 @@ public class ObjectToDocumentUtils {
|
|
|
/**
|
|
|
* PurchaseBadoutSimpleInfo对象转为Document
|
|
|
*
|
|
|
- * @param purchaseOrder
|
|
|
+ * @param purchaseBadout
|
|
|
* @return 转换的Document
|
|
|
*/
|
|
|
public static Document toDocument(PurchaseBadoutSimpleInfo purchaseBadout) {
|
|
|
@@ -562,7 +561,7 @@ public class ObjectToDocumentUtils {
|
|
|
/**
|
|
|
* PurchaseForecastSimpleInfo对象转为Document
|
|
|
*
|
|
|
- * @param purchaseOrder
|
|
|
+ * @param purchaseForecast
|
|
|
* @return 转换的Document
|
|
|
*/
|
|
|
public static Document toDocument(PurchaseForecastSimpleInfo purchaseForecast) {
|
|
|
@@ -733,6 +732,11 @@ public class ObjectToDocumentUtils {
|
|
|
document.add(new StringField(
|
|
|
ClassAndTableNameUtils.combineField(tableName, PurchaseProofingItemSimpleInfo.VEND_FIELD),
|
|
|
JSONObject.toJSONString(purcProofingItem.getEnterprise()), Store.YES));
|
|
|
+ if (purcProofingItem.getDate() != null){
|
|
|
+ document.add(new LongField(
|
|
|
+ ClassAndTableNameUtils.combineField(tableName, PurchaseProofingItemSimpleInfo.DATE_FIELD),
|
|
|
+ purcProofingItem.getDate().getTime(), Store.YES));
|
|
|
+ }
|
|
|
if (purcProofingItem.getProofing() != null) {
|
|
|
document.add(new TextField(
|
|
|
ClassAndTableNameUtils.combineField(tableName, PurchaseProofingItemSimpleInfo.PROOFING_FIELD),
|
|
|
@@ -883,6 +887,11 @@ public class ObjectToDocumentUtils {
|
|
|
ClassAndTableNameUtils.combineField(tableName, MakeOrderChangeItemSimpleInfo.MAKE_FIELD),
|
|
|
JSONObject.toJSONString(makeChangeItems.getMakeChanges()), Store.YES));
|
|
|
}
|
|
|
+ if (null != makeChangeItems.getDate()) {
|
|
|
+ document.add(new LongField(
|
|
|
+ ClassAndTableNameUtils.combineField(tableName, MakeOrderChangeItemSimpleInfo.DATE_FIELD),
|
|
|
+ makeChangeItems.getDate().getTime(), Store.YES));
|
|
|
+ }
|
|
|
// 排序字段
|
|
|
document.add(new NumericDocValuesField(
|
|
|
ClassAndTableNameUtils.combineField(tableName, MakeOrderChangeItemSimpleInfo.ID_FIELD),
|
|
|
@@ -1283,7 +1292,7 @@ public class ObjectToDocumentUtils {
|
|
|
/**
|
|
|
* 将PurchaseInquiryItemSimpleInfo转换成Document
|
|
|
*
|
|
|
- * @param saleArcheck
|
|
|
+ * @param inquiryItem
|
|
|
* @return
|
|
|
*/
|
|
|
public static Document toDocument(PurchaseInquiryItemSimpleInfo inquiryItem) {
|
|
|
@@ -1347,6 +1356,11 @@ public class ObjectToDocumentUtils {
|
|
|
ClassAndTableNameUtils.combineField(tableName, PurchaseInquiryItemSimpleInfo.AGREED_FIELD),
|
|
|
String.valueOf(inquiryItem.getAgreed()), Store.YES));
|
|
|
}
|
|
|
+ if (null != inquiryItem.getDate()) {
|
|
|
+ document.add(new LongField(
|
|
|
+ ClassAndTableNameUtils.combineField(tableName, PurchaseInquiryItemSimpleInfo.DATE_FIELD),
|
|
|
+ Long.valueOf(inquiryItem.getDate().getTime()), Store.YES));
|
|
|
+ }
|
|
|
// 排序字段
|
|
|
document.add(new NumericDocValuesField(
|
|
|
ClassAndTableNameUtils.combineField(tableName, PurchaseInquiryItemSimpleInfo.ID_FIELD),
|
|
|
@@ -1434,7 +1448,7 @@ public class ObjectToDocumentUtils {
|
|
|
/**
|
|
|
* 将ProdSimpleInfo转换成Document
|
|
|
*
|
|
|
- * @param saleArcheck
|
|
|
+ * @param prodSimpleInfo
|
|
|
* @return
|
|
|
*/
|
|
|
public static Document toDocument(ProdSimpleInfo prodSimpleInfo) {
|
|
|
@@ -1535,7 +1549,7 @@ public class ObjectToDocumentUtils {
|
|
|
/**
|
|
|
* 将ProdStandardSimpleInfo转换成Document
|
|
|
*
|
|
|
- * @param saleArcheck
|
|
|
+ * @param prodSimpleInfo
|
|
|
* @return
|
|
|
*/
|
|
|
public static Document toDocument(ProdStandardSimpleInfo prodSimpleInfo) {
|
|
|
@@ -1633,7 +1647,7 @@ public class ObjectToDocumentUtils {
|
|
|
/**
|
|
|
* 将ProdNonStandardSimpleInfo转换成Document
|
|
|
*
|
|
|
- * @param saleArcheck
|
|
|
+ * @param prodSimpleInfo
|
|
|
* @return
|
|
|
*/
|
|
|
public static Document toDocument(ProdNonStandardSimpleInfo prodSimpleInfo) {
|
|
|
@@ -1894,7 +1908,7 @@ public class ObjectToDocumentUtils {
|
|
|
/**
|
|
|
* 将DeputyOrderSimpleInfo转换为Document
|
|
|
*
|
|
|
- * @param tender
|
|
|
+ * @param depOrder
|
|
|
* @return
|
|
|
*/
|
|
|
public static Document toDocument(DeputyOrderSimpleInfo depOrder) {
|
|
|
@@ -1964,6 +1978,11 @@ public class ObjectToDocumentUtils {
|
|
|
ClassAndTableNameUtils.combineField(tableName, DeputyOrderSimpleInfo.ENTRYSTATUS_FIELD),
|
|
|
String.valueOf(depOrder.getEntrystatus()), Store.YES));
|
|
|
}
|
|
|
+ if (null != depOrder.getDate()) {
|
|
|
+ document.add(new LongField(
|
|
|
+ ClassAndTableNameUtils.combineField(tableName, DeputyOrderSimpleInfo.DATE_FIELD),
|
|
|
+ Long.valueOf(depOrder.getDate().getTime()), Store.YES));
|
|
|
+ }
|
|
|
if (null != depOrder.getDownloadstatus()) {
|
|
|
document.add(new StringField(
|
|
|
ClassAndTableNameUtils.combineField(tableName, DeputyOrderSimpleInfo.DOWNLOADSTATUS_FIELD),
|
|
|
@@ -2324,7 +2343,7 @@ public class ObjectToDocumentUtils {
|
|
|
/**
|
|
|
* 将CustmerSimpleInfo 转换成Document
|
|
|
*
|
|
|
- * @param vendorSimpleInfo
|
|
|
+ * @param custmerSimpleInfo
|
|
|
* @return
|
|
|
*/
|
|
|
public static Document toDocument(CustmerSimpleInfo custmerSimpleInfo) {
|
|
|
@@ -2536,7 +2555,7 @@ public class ObjectToDocumentUtils {
|
|
|
/**
|
|
|
* 将PurchaseInquiryItemSimpleInfo转换成Document
|
|
|
*
|
|
|
- * @param saleArcheck
|
|
|
+ * @param inquiryItem
|
|
|
* @return
|
|
|
*/
|
|
|
public static Document toDocument(PurcInquiryItemSimpleInfo2 inquiryItem) {
|
|
|
@@ -2580,6 +2599,11 @@ public class ObjectToDocumentUtils {
|
|
|
ClassAndTableNameUtils.combineField(tableName, PurcInquiryItemSimpleInfo2.AGREED_FIELD),
|
|
|
String.valueOf(inquiryItem.getAgreed()), Store.YES));
|
|
|
}
|
|
|
+ if (null != inquiryItem.getDate()) {
|
|
|
+ document.add(new LongField(
|
|
|
+ ClassAndTableNameUtils.combineField(tableName, PurcInquiryItemSimpleInfo2.DATE_FIELD),
|
|
|
+ inquiryItem.getDate().getTime(), Store.YES));
|
|
|
+ }
|
|
|
// 排序字段
|
|
|
document.add(new NumericDocValuesField(
|
|
|
ClassAndTableNameUtils.combineField(tableName, PurcInquiryItemSimpleInfo2.ID_FIELD),
|
|
|
@@ -2590,7 +2614,7 @@ public class ObjectToDocumentUtils {
|
|
|
/**
|
|
|
* 将InvitationRecordSimpleInfo转换成Document
|
|
|
*
|
|
|
- * @param saleArcheck
|
|
|
+ * @param invitation
|
|
|
* @return
|
|
|
*/
|
|
|
public static Document toDocument(InvitationRecordSimpleInfo invitation) {
|
|
|
@@ -2645,4 +2669,117 @@ public class ObjectToDocumentUtils {
|
|
|
invitation.getId()));
|
|
|
return document;
|
|
|
}
|
|
|
+
|
|
|
+ /**
|
|
|
+ * 将CartSimpleInfo转换成Document
|
|
|
+ *
|
|
|
+ * @param cartSimpleInfo
|
|
|
+ * @return
|
|
|
+ */
|
|
|
+ public static Document toDocument(CartSimpleInfo cartSimpleInfo) {
|
|
|
+ if (cartSimpleInfo == null || cartSimpleInfo.getId() == null ||
|
|
|
+ cartSimpleInfo.getUser() == null || cartSimpleInfo.getUser().getUserUU() == null) {
|
|
|
+ return null;
|
|
|
+ }
|
|
|
+ Table_name tableName = ClassAndTableNameUtils.toTableName(CartSimpleInfo.class);
|
|
|
+ Document document = new Document();
|
|
|
+ document.add(new TextField(
|
|
|
+ ClassAndTableNameUtils.combineField(tableName, CartSimpleInfo.USERUU_FIELD),
|
|
|
+ JSONObject.toJSONString(cartSimpleInfo.getUser()), Store.YES));
|
|
|
+ if (null != cartSimpleInfo.getDate()) {
|
|
|
+ document.add(new NumericDocValuesField(
|
|
|
+ ClassAndTableNameUtils.combineField(tableName, CartSimpleInfo.DATE_FIELD),
|
|
|
+ Long.valueOf(cartSimpleInfo.getDate().getTime())));
|
|
|
+ }
|
|
|
+ if (null != cartSimpleInfo.getAuditor()) {
|
|
|
+ document.add(new TextField(
|
|
|
+ ClassAndTableNameUtils.combineField(tableName, CartSimpleInfo.AUDITOR_FIELD),
|
|
|
+ String.valueOf(cartSimpleInfo.getAuditor()), Store.YES));
|
|
|
+ }
|
|
|
+ if (null != cartSimpleInfo.getCode()) {
|
|
|
+ document.add(new TextField(
|
|
|
+ ClassAndTableNameUtils.combineField(tableName, CartSimpleInfo.CODE_FIELD),
|
|
|
+ String.valueOf(cartSimpleInfo.getCode()), Store.YES));
|
|
|
+ }
|
|
|
+ if (null != cartSimpleInfo.getCurrency()) {
|
|
|
+ document.add(new TextField(
|
|
|
+ ClassAndTableNameUtils.combineField(tableName, CartSimpleInfo.CURRENCY_FIELD),
|
|
|
+ String.valueOf(cartSimpleInfo.getCurrency()), Store.YES));
|
|
|
+ }
|
|
|
+ if (null != cartSimpleInfo.getEnUU()) {
|
|
|
+ document.add(new NumericDocValuesField(
|
|
|
+ ClassAndTableNameUtils.combineField(tableName, CartSimpleInfo.ENUU_FIELD),
|
|
|
+ Long.valueOf(cartSimpleInfo.getEnUU())));
|
|
|
+ }
|
|
|
+ if (null != cartSimpleInfo.getId()) {
|
|
|
+ document.add(new NumericDocValuesField(
|
|
|
+ ClassAndTableNameUtils.combineField(tableName, CartSimpleInfo.ID_FIELD),
|
|
|
+ Long.valueOf(cartSimpleInfo.getId())));
|
|
|
+ }
|
|
|
+ if (null != cartSimpleInfo.getPayments()) {
|
|
|
+ document.add(new TextField(
|
|
|
+ ClassAndTableNameUtils.combineField(tableName, CartSimpleInfo.PAYMENTS_FIELD),
|
|
|
+ String.valueOf(cartSimpleInfo.getPayments()), Store.YES));
|
|
|
+ }
|
|
|
+ if (null != cartSimpleInfo.getRate()) {
|
|
|
+ document.add(new FloatDocValuesField(
|
|
|
+ ClassAndTableNameUtils.combineField(tableName, CartSimpleInfo.RATE_FIELD),
|
|
|
+ Float.valueOf(cartSimpleInfo.getRate())));
|
|
|
+ }
|
|
|
+ if (null != cartSimpleInfo.getReceiveCode()) {
|
|
|
+ document.add(new TextField(
|
|
|
+ ClassAndTableNameUtils.combineField(tableName, CartSimpleInfo.RECEIVECODE_FIELD),
|
|
|
+ String.valueOf(cartSimpleInfo.getReceiveCode()), Store.YES));
|
|
|
+ }
|
|
|
+ if (null != cartSimpleInfo.getReceiveName()) {
|
|
|
+ document.add(new TextField(
|
|
|
+ ClassAndTableNameUtils.combineField(tableName, CartSimpleInfo.RECEIVENAME_FIELD),
|
|
|
+ String.valueOf(cartSimpleInfo.getReceiveName()), Store.YES));
|
|
|
+ }
|
|
|
+ if (null != cartSimpleInfo.getRecorder()) {
|
|
|
+ document.add(new TextField(
|
|
|
+ ClassAndTableNameUtils.combineField(tableName, CartSimpleInfo.RECORDER_FIELD),
|
|
|
+ String.valueOf(cartSimpleInfo.getRecorder()), Store.YES));
|
|
|
+ }
|
|
|
+ if (null != cartSimpleInfo.getRemark()) {
|
|
|
+ document.add(new TextField(
|
|
|
+ ClassAndTableNameUtils.combineField(tableName, CartSimpleInfo.REMARK_FIELD),
|
|
|
+ String.valueOf(cartSimpleInfo.getRemark()), Store.YES));
|
|
|
+ }
|
|
|
+ if (null != cartSimpleInfo.getShipAddress()) {
|
|
|
+ document.add(new TextField(
|
|
|
+ ClassAndTableNameUtils.combineField(tableName, CartSimpleInfo.SHIPADDRESS_FIELD),
|
|
|
+ String.valueOf(cartSimpleInfo.getShipAddress()), Store.YES));
|
|
|
+ }
|
|
|
+ if (null != cartSimpleInfo.getStatus()) {
|
|
|
+ document.add(new NumericDocValuesField(
|
|
|
+ ClassAndTableNameUtils.combineField(tableName, CartSimpleInfo.STATUS_FIELD),
|
|
|
+ Integer.valueOf(cartSimpleInfo.getStatus())));
|
|
|
+ }
|
|
|
+ if (null != cartSimpleInfo.getVenduser()) {
|
|
|
+ document.add(new TextField(
|
|
|
+ ClassAndTableNameUtils.combineField(tableName, CartSimpleInfo.VENDUSER_FIELD),
|
|
|
+ String.valueOf(cartSimpleInfo.getVenduser()), Store.YES));
|
|
|
+ }
|
|
|
+ if (null != cartSimpleInfo.getVendusertel()) {
|
|
|
+ document.add(new TextField(
|
|
|
+ ClassAndTableNameUtils.combineField(tableName, CartSimpleInfo.VENDUSERTEL_FIELD),
|
|
|
+ String.valueOf(cartSimpleInfo.getVendusertel()), Store.YES));
|
|
|
+ }
|
|
|
+ if (null != cartSimpleInfo.getVendUserUU()) {
|
|
|
+ document.add(new NumericDocValuesField(
|
|
|
+ ClassAndTableNameUtils.combineField(tableName, CartSimpleInfo.VENDUSERUU_FIELD),
|
|
|
+ Long.valueOf(cartSimpleInfo.getVendUserUU())));
|
|
|
+ }
|
|
|
+ if (null != cartSimpleInfo.getVendUU()) {
|
|
|
+ document.add(new NumericDocValuesField(
|
|
|
+ ClassAndTableNameUtils.combineField(tableName, CartSimpleInfo.VENDUU_FIELD),
|
|
|
+ Long.valueOf(cartSimpleInfo.getVendUU())));
|
|
|
+ }
|
|
|
+ // 排序字段
|
|
|
+ document.add(new NumericDocValuesField(
|
|
|
+ ClassAndTableNameUtils.combineField(tableName, InvitationRecordSimpleInfo.ID_FIELD),
|
|
|
+ cartSimpleInfo.getId()));
|
|
|
+ return document;
|
|
|
+ }
|
|
|
}
|
hejq