代采搜索判断是否为空

search-console-b2b/src/main/java/com/uas/search/console/b2b/util/DocumentToObjectUtils.java

@@ -154,26 +154,53 @@ public class DocumentToObjectUtils {
 		}
 		Table_name tableName = ClassAndTableNameUtils.toTableName(DeputyOrderSimpleInfo.class);
 		DeputyOrderSimpleInfo depOrder = new DeputyOrderSimpleInfo();
-		depOrder.setId(Long
-				.valueOf(document.get(ClassAndTableNameUtils.combineField(tableName, DeputyOrderSimpleInfo.ID_FIELD))));
-		depOrder.setEnuu(Long.valueOf(
-				document.get(ClassAndTableNameUtils.combineField(tableName, DeputyOrderSimpleInfo.ENUU_FIELD))));
-		depOrder.setTervenduu(Long.valueOf(
-				document.get(ClassAndTableNameUtils.combineField(tableName, DeputyOrderSimpleInfo.TERVENDUU_FEILD))));
-		depOrder.setVenduseruu(Long.valueOf(
-				document.get(ClassAndTableNameUtils.combineField(tableName, DeputyOrderSimpleInfo.VENDUSERUU_FIELD))));
-		depOrder.setCode(
-				document.get(ClassAndTableNameUtils.combineField(tableName, DeputyOrderSimpleInfo.CODE_FIELD)));
-		depOrder.setCompanyname(
-				document.get(ClassAndTableNameUtils.combineField(tableName, DeputyOrderSimpleInfo.COMPANYNAME_FIELD)));
-		depOrder.setCustomer(
-				document.get(ClassAndTableNameUtils.combineField(tableName, DeputyOrderSimpleInfo.CUSTOMER_FIELD)));
-		depOrder.setLegalrepresent(document
-				.get(ClassAndTableNameUtils.combineField(tableName, DeputyOrderSimpleInfo.LEGALREPRESENT_FIELD)));
-		depOrder.setTervendor(
-				document.get(ClassAndTableNameUtils.combineField(tableName, DeputyOrderSimpleInfo.TERVENDOR_FIELD)));
-		depOrder.setVenduser(
-				document.get(ClassAndTableNameUtils.combineField(tableName, DeputyOrderSimpleInfo.VENDUSER_FIELD)));
+		if (null != document.get(ClassAndTableNameUtils.combineField(tableName, DeputyOrderSimpleInfo.ID_FIELD))) {
+			depOrder.setId(Long.valueOf(
+					document.get(ClassAndTableNameUtils.combineField(tableName, DeputyOrderSimpleInfo.ID_FIELD))));
+		}
+		if (null != document.get(ClassAndTableNameUtils.combineField(tableName, DeputyOrderSimpleInfo.ENUU_FIELD))) {
+			depOrder.setEnuu(Long.valueOf(
+					document.get(ClassAndTableNameUtils.combineField(tableName, DeputyOrderSimpleInfo.ENUU_FIELD))));
+		}
+		if (null != document
+				.get(ClassAndTableNameUtils.combineField(tableName, DeputyOrderSimpleInfo.TERVENDUU_FEILD))) {
+			depOrder.setTervenduu(Long.valueOf(document
+					.get(ClassAndTableNameUtils.combineField(tableName, DeputyOrderSimpleInfo.TERVENDUU_FEILD))));
+		}
+		if (null != document
+				.get(ClassAndTableNameUtils.combineField(tableName, DeputyOrderSimpleInfo.VENDUSERUU_FIELD))) {
+			depOrder.setVenduseruu(Long.valueOf(document
+					.get(ClassAndTableNameUtils.combineField(tableName, DeputyOrderSimpleInfo.VENDUSERUU_FIELD))));
+		}
+		if (null != document.get(ClassAndTableNameUtils.combineField(tableName, DeputyOrderSimpleInfo.CODE_FIELD))) {
+			depOrder.setCode(
+					document.get(ClassAndTableNameUtils.combineField(tableName, DeputyOrderSimpleInfo.CODE_FIELD)));
+		}
+		if (null != document
+				.get(ClassAndTableNameUtils.combineField(tableName, DeputyOrderSimpleInfo.COMPANYNAME_FIELD))) {
+			depOrder.setCompanyname(document
+					.get(ClassAndTableNameUtils.combineField(tableName, DeputyOrderSimpleInfo.COMPANYNAME_FIELD)));
+		}
+		if (null != document
+				.get(ClassAndTableNameUtils.combineField(tableName, DeputyOrderSimpleInfo.CUSTOMER_FIELD))) {
+			depOrder.setCustomer(
+					document.get(ClassAndTableNameUtils.combineField(tableName, DeputyOrderSimpleInfo.CUSTOMER_FIELD)));
+		}
+		if (null != document
+				.get(ClassAndTableNameUtils.combineField(tableName, DeputyOrderSimpleInfo.LEGALREPRESENT_FIELD))) {
+			depOrder.setLegalrepresent(document
+					.get(ClassAndTableNameUtils.combineField(tableName, DeputyOrderSimpleInfo.LEGALREPRESENT_FIELD)));
+		}
+		if (null != document
+				.get(ClassAndTableNameUtils.combineField(tableName, DeputyOrderSimpleInfo.TERVENDOR_FIELD))) {
+			depOrder.setTervendor(document
+					.get(ClassAndTableNameUtils.combineField(tableName, DeputyOrderSimpleInfo.TERVENDOR_FIELD)));
+		}
+		if (null != document
+				.get(ClassAndTableNameUtils.combineField(tableName, DeputyOrderSimpleInfo.VENDUSER_FIELD))) {
+			depOrder.setVenduser(
+					document.get(ClassAndTableNameUtils.combineField(tableName, DeputyOrderSimpleInfo.VENDUSER_FIELD)));
+		}
 		if (null != document.get(ClassAndTableNameUtils.combineField(tableName, DeputyOrderSimpleInfo.ITEMS_FIELD))) {
 			depOrder.setDeputyOrderItems(toSet(
 					document.get(ClassAndTableNameUtils.combineField(tableName, DeputyOrderSimpleInfo.ITEMS_FIELD)),

search-console-b2b/src/main/java/com/uas/search/console/b2b/util/ObjectToDocumentUtils.java

@@ -1569,35 +1569,60 @@ public class ObjectToDocumentUtils {
 		Document document = new Document();
 		// 不能用LongField，否则后续实时更新索引时，方法updateDocument(new Term("", ""),
 		// doc)无法根据id进行更新
-		document.add(new StringField(ClassAndTableNameUtils.combineField(tableName, DeputyOrderSimpleInfo.ID_FIELD),
-						String.valueOf(depOrder.getId()), Store.YES));
-		document.add(new StringField(ClassAndTableNameUtils.combineField(tableName, DeputyOrderSimpleInfo.CODE_FIELD),
-				String.valueOf(depOrder.getCode()), Store.YES));
-		document.add(
-				new StringField(ClassAndTableNameUtils.combineField(tableName, DeputyOrderSimpleInfo.CUSTOMER_FIELD),
-						String.valueOf(depOrder.getCustomer()), Store.YES));
-		document.add(new StringField(
-				ClassAndTableNameUtils.combineField(tableName, DeputyOrderSimpleInfo.LEGALREPRESENT_FIELD),
-				String.valueOf(depOrder.getLegalrepresent()), Store.YES));
-		document.add(
-				new StringField(ClassAndTableNameUtils.combineField(tableName, DeputyOrderSimpleInfo.VENDUSER_FIELD),
-						String.valueOf(depOrder.getId()), Store.YES));
-		document.add(
-				new StringField(ClassAndTableNameUtils.combineField(tableName, DeputyOrderSimpleInfo.STATUSCOE_FIELD),
-						String.valueOf(depOrder.getStatuscode()), Store.YES));
-		document.add(new StringField(ClassAndTableNameUtils.combineField(tableName, DeputyOrderSimpleInfo.ENUU_FIELD),
-				String.valueOf(depOrder.getEnuu()), Store.YES));
-		document.add(new TextField(ClassAndTableNameUtils.combineField(tableName, DeputyOrderSimpleInfo.ITEMS_FIELD),
-				String.valueOf(depOrder.getDeputyOrderItems()), Store.YES));
-		document.add(
-				new StringField(ClassAndTableNameUtils.combineField(tableName, DeputyOrderSimpleInfo.TERVENDUU_FEILD),
-						String.valueOf(depOrder.getTervenduu()), Store.YES));
-		document.add(
-				new TextField(ClassAndTableNameUtils.combineField(tableName, DeputyOrderSimpleInfo.COMPANYNAME_FIELD),
-						String.valueOf(depOrder.getCompanyname()), Store.YES));
-		document.add(
-				new StringField(ClassAndTableNameUtils.combineField(tableName, DeputyOrderSimpleInfo.TERVENDOR_FIELD),
-						String.valueOf(depOrder.getTervendor()), Store.YES));
+		if (null != depOrder.getId()) {
+			document.add(new StringField(ClassAndTableNameUtils.combineField(tableName, DeputyOrderSimpleInfo.ID_FIELD),
+					String.valueOf(depOrder.getId()), Store.YES));
+		}
+		if (null != depOrder.getCode()) {
+			document.add(
+					new StringField(ClassAndTableNameUtils.combineField(tableName, DeputyOrderSimpleInfo.CODE_FIELD),
+							String.valueOf(depOrder.getCode()), Store.YES));
+		}
+		if (null != depOrder.getCustomer()) {
+			document.add(new StringField(
+					ClassAndTableNameUtils.combineField(tableName, DeputyOrderSimpleInfo.CUSTOMER_FIELD),
+					String.valueOf(depOrder.getCustomer()), Store.YES));
+		}
+		if (null != depOrder.getLegalrepresent()) {
+			document.add(new StringField(
+					ClassAndTableNameUtils.combineField(tableName, DeputyOrderSimpleInfo.LEGALREPRESENT_FIELD),
+					String.valueOf(depOrder.getLegalrepresent()), Store.YES));
+		}
+		if (null != depOrder.getVenduser()) {
+			document.add(new StringField(
+					ClassAndTableNameUtils.combineField(tableName, DeputyOrderSimpleInfo.VENDUSER_FIELD),
+					String.valueOf(depOrder.getVenduser()), Store.YES));
+		}
+		if (null != depOrder.getStatuscode()) {
+			document.add(new StringField(
+					ClassAndTableNameUtils.combineField(tableName, DeputyOrderSimpleInfo.STATUSCOE_FIELD),
+					String.valueOf(depOrder.getStatuscode()), Store.YES));
+		}
+		if (null != depOrder.getEnuu()) {
+			document.add(
+					new StringField(ClassAndTableNameUtils.combineField(tableName, DeputyOrderSimpleInfo.ENUU_FIELD),
+							String.valueOf(depOrder.getEnuu()), Store.YES));
+		}
+		if (null != depOrder.getDeputyOrderItems()) {
+			document.add(
+					new TextField(ClassAndTableNameUtils.combineField(tableName, DeputyOrderSimpleInfo.ITEMS_FIELD),
+							String.valueOf(depOrder.getDeputyOrderItems()), Store.YES));
+		}
+		if (null != depOrder.getTervenduu()) {
+			document.add(new StringField(
+					ClassAndTableNameUtils.combineField(tableName, DeputyOrderSimpleInfo.TERVENDUU_FEILD),
+					String.valueOf(depOrder.getTervenduu()), Store.YES));
+		}
+		if (null != depOrder.getCompanyname()) {
+			document.add(new TextField(
+					ClassAndTableNameUtils.combineField(tableName, DeputyOrderSimpleInfo.COMPANYNAME_FIELD),
+					String.valueOf(depOrder.getCompanyname()), Store.YES));
+		}
+		if (null != depOrder.getTervendor()) {
+			document.add(new StringField(
+					ClassAndTableNameUtils.combineField(tableName, DeputyOrderSimpleInfo.TERVENDOR_FIELD),
+					String.valueOf(depOrder.getTervendor()), Store.YES));
+		}
 		return document;
 	}
 	
@@ -1608,7 +1633,6 @@ public class ObjectToDocumentUtils {
 	 * @return
 	 */
 	public static Document toDocument(PurchaseTenderSimpleInfo tender) {
-		System.out.println("tender--" + JSON.toJSONString(tender));
 		if (tender == null || tender.getId() == null || tender.getCode() == null ||tender.getProdCode() == null
 				|| tender.getProdTitle() == null || tender.getStatus() == null || tender.getIfOpen() == null  || tender.getIsPublish() == null) {
 			return null;