去除 model 层类名中的 SimpleInfo

src/main/java/com/uas/search/controller/OrderSearchController.java

@@ -20,10 +20,10 @@ import com.uas.search.constant.model.PageParams;
 import com.uas.search.constant.model.PageParams.FilterField;
 import com.uas.search.constant.model.SPage;
 import com.uas.search.exception.SearchException;
-import com.uas.search.model.OrderInvoiceSimpleInfo;
-import com.uas.search.model.OrderSimpleInfo;
-import com.uas.search.model.PurchaseInvoiceSimpleInfo;
-import com.uas.search.model.PurchaseSimpleInfo;
+import com.uas.search.model.OrderInvoice;
+import com.uas.search.model.Order;
+import com.uas.search.model.PurchaseInvoice;
+import com.uas.search.model.Purchase;
 import com.uas.search.service.OrderSearchService;
 import com.uas.search.service.OrderSearchService.Table_name;
 
@@ -114,25 +114,25 @@ public class OrderSearchController {
 
 	@RequestMapping("/order/{id}")
 	@ResponseBody
-	public OrderSimpleInfo getOrder(@PathVariable Long id, HttpServletRequest request) {
+	public Order getOrder(@PathVariable Long id, HttpServletRequest request) {
 		return orderSearchService.getOrder(id);
 	}
 
 	@RequestMapping("/orderInvoice/{id}")
 	@ResponseBody
-	public OrderInvoiceSimpleInfo getOrderInvoice(@PathVariable Long id, HttpServletRequest request) {
+	public OrderInvoice getOrderInvoice(@PathVariable Long id, HttpServletRequest request) {
 		return orderSearchService.getOrderInvoice(id);
 	}
 
 	@RequestMapping("/purchase/{id}")
 	@ResponseBody
-	public PurchaseSimpleInfo getPurchase(@PathVariable Long id, HttpServletRequest request) {
+	public Purchase getPurchase(@PathVariable Long id, HttpServletRequest request) {
 		return orderSearchService.getPurchase(id);
 	}
 
 	@RequestMapping("/purchaseInvoice/{id}")
 	@ResponseBody
-	public PurchaseInvoiceSimpleInfo getPurchaseInvoice(@PathVariable Long id, HttpServletRequest request) {
+	public PurchaseInvoice getPurchaseInvoice(@PathVariable Long id, HttpServletRequest request) {
 		return orderSearchService.getPurchaseInvoice(id);
 	}
 

src/main/java/com/uas/search/controller/SearchController.java

@@ -33,12 +33,12 @@ import com.uas.search.constant.model.PageParams.FilterField;
 import com.uas.search.constant.model.SPage;
 import com.uas.search.constant.model.Sort;
 import com.uas.search.constant.model.Sort.Field;
-import com.uas.search.dao.ComponentSimpleInfoDao;
+import com.uas.search.dao.ComponentDao;
 import com.uas.search.exception.SearchException;
-import com.uas.search.model.BrandSimpleInfo;
-import com.uas.search.model.ComponentSimpleInfo;
-import com.uas.search.model.GoodsSimpleInfo;
-import com.uas.search.model.KindSimpleInfo;
+import com.uas.search.model.Brand;
+import com.uas.search.model.Component;
+import com.uas.search.model.Goods;
+import com.uas.search.model.Kind;
 import com.uas.search.service.SearchService;
 import com.uas.search.service.impl.IndexServiceImpl;
 import com.uas.search.util.FileUtils;
@@ -112,16 +112,16 @@ public class SearchController {
 	}
 
 	@Autowired
-	private ComponentSimpleInfoDao componentDao;
+	private ComponentDao componentDao;
 
 	@RequestMapping("/components")
 	@ResponseBody
-	public List<ComponentSimpleInfo> searchComponents(String keyword, Integer page, Integer size, String filters,
+	public List<Component> searchComponents(String keyword, Integer page, Integer size, String filters,
 			HttpServletRequest request) {
 		@SuppressWarnings("unchecked")
 		List<Long> ids = (List<Long>) searchComponentIds(keyword, page, size, filters, request).get("componentIds");
 		if (CollectionUtils.isEmpty(ids)) {
-			return new ArrayList<ComponentSimpleInfo>();
+			return new ArrayList<Component>();
 		}
 
 		Long[] idsLong = new Long[ids.size()];
@@ -290,25 +290,25 @@ public class SearchController {
 
 	@RequestMapping("/kind/{id}")
 	@ResponseBody
-	public KindSimpleInfo getKind(@PathVariable Long id, HttpServletRequest request) {
+	public Kind getKind(@PathVariable Long id, HttpServletRequest request) {
 		return searchService.getKind(id);
 	}
 
 	@RequestMapping("/brand/{id}")
 	@ResponseBody
-	public BrandSimpleInfo getBrand(@PathVariable Long id, HttpServletRequest request) {
+	public Brand getBrand(@PathVariable Long id, HttpServletRequest request) {
 		return searchService.getBrand(id);
 	}
 
 	@RequestMapping("/component/{id}")
 	@ResponseBody
-	public ComponentSimpleInfo getComponent(@PathVariable Long id, HttpServletRequest request) {
+	public Component getComponent(@PathVariable Long id, HttpServletRequest request) {
 		return searchService.getComponent(id);
 	}
 
 	@RequestMapping("/goods/{id}")
 	@ResponseBody
-	public GoodsSimpleInfo getGoods(@PathVariable String id, HttpServletRequest request) {
+	public Goods getGoods(@PathVariable String id, HttpServletRequest request) {
 		return searchService.getGoods(id);
 	}
 

src/main/java/com/uas/search/dao/BrandSimpleInfoDao.java

@@ -1,24 +0,0 @@
-package com.uas.search.dao;
-
-import org.springframework.data.jpa.repository.JpaRepository;
-import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
-import org.springframework.stereotype.Repository;
-
-import com.uas.search.model.BrandSimpleInfo;
-
-/**
- * @author sunyj
- * @since 2016年7月7日 下午5:52:52
- */
-@Repository
-public interface BrandSimpleInfoDao
-		extends JpaSpecificationExecutor<BrandSimpleInfo>, JpaRepository<BrandSimpleInfo, Long> {
-
-	/**
-	 * 根据id获取品牌
-	 * 
-	 * @param id
-	 * @return
-	 */
-	public BrandSimpleInfo findById(Long id);
-}

src/main/java/com/uas/search/dao/ComponentSimpleInfoDao.java

@@ -1,18 +0,0 @@
-package com.uas.search.dao;
-
-import org.springframework.data.jpa.repository.JpaRepository;
-import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
-import org.springframework.stereotype.Repository;
-
-import com.uas.search.model.ComponentSimpleInfo;
-
-/**
- * @author sunyj
- * @since 2016年7月7日 下午5:59:24
- */
-@Repository
-public interface ComponentSimpleInfoDao
-		extends JpaSpecificationExecutor<ComponentSimpleInfo>, JpaRepository<ComponentSimpleInfo, Long> {
-
-	public ComponentSimpleInfo findByUuid(String uuid);
-}

src/main/java/com/uas/search/dao/GoodsSimpleInfoDao.java

@@ -1,89 +0,0 @@
-package com.uas.search.dao;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Repository;
-import org.springframework.util.CollectionUtils;
-
-import com.uas.search.model.ComponentSimpleInfo;
-import com.uas.search.model.GoodsSimpleInfo;
-import com.uas.search.model.StoreSimpleInfo;
-import com.uas.search.model.TradeGoodsSimpleInfo;
-
-/**
- * @author sunyj
- * @since 2017年7月8日 下午7:45:01
- */
-@Repository
-public class GoodsSimpleInfoDao {
-
-	@Autowired
-	private TradeGoodsSimpleInfoDao tradeGoodsDao;
-
-	@Autowired
-	private ComponentSimpleInfoDao componentDao;
-
-	@Autowired
-	private StoreSimpleInfoDao storeDao;
-
-	/**
-	 * 根据批次id或者器件id获取批次
-	 * 
-	 * @param goods
-	 * @return
-	 */
-	public List<GoodsSimpleInfo> find(GoodsSimpleInfo goods) {
-		if (goods == null) {
-			return null;
-		}
-		List<GoodsSimpleInfo> goodsesList = new ArrayList<>();
-		if (goods.getGoId() != null) {
-			goodsesList.add(findByGoId(goods.getGoId()));
-		} else if (goods.getCmpId() != null) {
-			goodsesList.addAll(findByCmpId(goods.getCmpId()));
-		}
-		return goodsesList;
-	}
-
-	/**
-	 * 根据批次id获取批次信息
-	 * 
-	 * @param goId
-	 * @return
-	 */
-	private GoodsSimpleInfo findByGoId(Long goId) {
-		TradeGoodsSimpleInfo tradeGoods = tradeGoodsDao.findOne(goId);
-		ComponentSimpleInfo component = componentDao.findByUuid(tradeGoods.getCmpUuid());
-		StoreSimpleInfo store = null;
-		if (tradeGoods.getStoreId() != null) {
-			store = storeDao.findByUuid(tradeGoods.getStoreId());
-		}
-		return new GoodsSimpleInfo(tradeGoods, store, component);
-	}
-
-	/**
-	 * 根据器件id获取批次信息
-	 * 
-	 * @param cmpId
-	 * @return
-	 */
-	private List<GoodsSimpleInfo> findByCmpId(Long cmpId) {
-		ComponentSimpleInfo component = componentDao.findOne(cmpId);
-		List<TradeGoodsSimpleInfo> tradeGoodsesList = tradeGoodsDao.findByCmpUuid(component.getUuid());
-		List<GoodsSimpleInfo> goodsesList = new ArrayList<>();
-		if (!CollectionUtils.isEmpty(tradeGoodsesList)) {
-			for (TradeGoodsSimpleInfo tradeGoods : tradeGoodsesList) {
-				StoreSimpleInfo store = null;
-				if (tradeGoods.getStoreId() != null) {
-					store = storeDao.findByUuid(tradeGoods.getStoreId());
-				}
-				goodsesList.add(new GoodsSimpleInfo(tradeGoods, store, component));
-			}
-		} else {
-			goodsesList.add(new GoodsSimpleInfo(null, null, component));
-		}
-		return goodsesList;
-	}
-}

src/main/java/com/uas/search/dao/KindSimpleInfoDao.java

@@ -1,24 +0,0 @@
-package com.uas.search.dao;
-
-import org.springframework.data.jpa.repository.JpaRepository;
-import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
-import org.springframework.stereotype.Repository;
-
-import com.uas.search.model.KindSimpleInfo;
-
-/**
- * @author sunyj
- * @since 2016年7月7日 下午5:46:35
- */
-@Repository
-public interface KindSimpleInfoDao
-		extends JpaSpecificationExecutor<KindSimpleInfo>, JpaRepository<KindSimpleInfo, Long> {
-
-	/**
-	 * 根据id获取类目
-	 * 
-	 * @param id
-	 * @return
-	 */
-	public KindSimpleInfo findById(Long id);
-}

src/main/java/com/uas/search/dao/OrderInvoiceSimpleInfoDao.java

@@ -1,23 +0,0 @@
-package com.uas.search.dao;
-
-import org.springframework.data.jpa.repository.JpaRepository;
-import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
-import org.springframework.stereotype.Repository;
-
-import com.uas.search.model.OrderInvoiceSimpleInfo;
-
-/**
- * @author sunyj
- * @since 2016年10月14日 上午11:58:50
- */
-@Repository
-public interface OrderInvoiceSimpleInfoDao
-		extends JpaSpecificationExecutor<OrderInvoiceSimpleInfo>, JpaRepository<OrderInvoiceSimpleInfo, Long> {
-	/**
-	 * 根据id获取销售发货单
-	 * 
-	 * @param id
-	 * @return
-	 */
-	public OrderInvoiceSimpleInfo findById(Long id);
-}

src/main/java/com/uas/search/dao/OrderSimpleInfoDao.java

@@ -1,23 +0,0 @@
-package com.uas.search.dao;
-
-import org.springframework.data.jpa.repository.JpaRepository;
-import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
-import org.springframework.stereotype.Repository;
-
-import com.uas.search.model.OrderSimpleInfo;
-
-/**
- * @author sunyj
- * @since 2016年10月14日 上午11:58:50
- */
-@Repository
-public interface OrderSimpleInfoDao
-		extends JpaSpecificationExecutor<OrderSimpleInfo>, JpaRepository<OrderSimpleInfo, Long> {
-	/**
-	 * 根据id获取销售单
-	 * 
-	 * @param id
-	 * @return
-	 */
-	public OrderSimpleInfo findById(Long id);
-}

src/main/java/com/uas/search/dao/PurchaseInvoiceSimpleInfoDao.java

@@ -1,23 +0,0 @@
-package com.uas.search.dao;
-
-import org.springframework.data.jpa.repository.JpaRepository;
-import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
-import org.springframework.stereotype.Repository;
-
-import com.uas.search.model.PurchaseInvoiceSimpleInfo;
-
-/**
- * @author sunyj
- * @since 2016年10月14日 上午11:58:50
- */
-@Repository
-public interface PurchaseInvoiceSimpleInfoDao
-		extends JpaSpecificationExecutor<PurchaseInvoiceSimpleInfo>, JpaRepository<PurchaseInvoiceSimpleInfo, Long> {
-	/**
-	 * 根据id获取销售发货单
-	 * 
-	 * @param id
-	 * @return
-	 */
-	public PurchaseInvoiceSimpleInfo findById(Long id);
-}

src/main/java/com/uas/search/dao/PurchaseSimpleInfoDao.java

@@ -1,23 +0,0 @@
-package com.uas.search.dao;
-
-import org.springframework.data.jpa.repository.JpaRepository;
-import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
-import org.springframework.stereotype.Repository;
-
-import com.uas.search.model.PurchaseSimpleInfo;
-
-/**
- * @author sunyj
- * @since 2016年10月14日 上午11:58:50
- */
-@Repository
-public interface PurchaseSimpleInfoDao
-		extends JpaSpecificationExecutor<PurchaseSimpleInfo>, JpaRepository<PurchaseSimpleInfo, Long> {
-	/**
-	 * 根据id获取销售单
-	 * 
-	 * @param id
-	 * @return
-	 */
-	public PurchaseSimpleInfo findById(Long id);
-}

src/main/java/com/uas/search/dao/StoreSimpleInfoDao.java

@@ -1,18 +0,0 @@
-package com.uas.search.dao;
-
-import org.springframework.data.jpa.repository.JpaRepository;
-import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
-import org.springframework.stereotype.Repository;
-
-import com.uas.search.model.StoreSimpleInfo;
-
-/**
- * @author sunyj
- * @since 2017年7月22日 下午8:16:07
- */
-@Repository
-public interface StoreSimpleInfoDao
-		extends JpaSpecificationExecutor<StoreSimpleInfo>, JpaRepository<StoreSimpleInfo, Long> {
-
-	public StoreSimpleInfo findByUuid(String uuid);
-}

src/main/java/com/uas/search/dao/TradeGoodsSimpleInfoDao.java

@@ -1,20 +0,0 @@
-package com.uas.search.dao;
-
-import java.util.List;
-
-import org.springframework.data.jpa.repository.JpaRepository;
-import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
-import org.springframework.stereotype.Repository;
-
-import com.uas.search.model.TradeGoodsSimpleInfo;
-
-/**
- * @author sunyj
- * @since 2017年7月22日 下午8:16:07
- */
-@Repository
-public interface TradeGoodsSimpleInfoDao
-		extends JpaSpecificationExecutor<TradeGoodsSimpleInfo>, JpaRepository<TradeGoodsSimpleInfo, Long> {
-
-	public List<TradeGoodsSimpleInfo> findByCmpUuid(String cmpUuid);
-}

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

@@ -15,22 +15,22 @@ import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONException;
 import com.alibaba.fastjson.JSONObject;
 import com.uas.search.constant.SearchConstants;
-import com.uas.search.dao.BrandSimpleInfoDao;
-import com.uas.search.dao.ComponentSimpleInfoDao;
-import com.uas.search.dao.KindSimpleInfoDao;
-import com.uas.search.dao.OrderInvoiceSimpleInfoDao;
-import com.uas.search.dao.OrderSimpleInfoDao;
-import com.uas.search.dao.PurchaseInvoiceSimpleInfoDao;
-import com.uas.search.dao.PurchaseSimpleInfoDao;
-import com.uas.search.model.BrandSimpleInfo;
-import com.uas.search.model.ComponentSimpleInfo;
-import com.uas.search.model.GoodsSimpleInfo;
-import com.uas.search.model.KindSimpleInfo;
-import com.uas.search.model.OrderInvoiceSimpleInfo;
-import com.uas.search.model.OrderSimpleInfo;
+import com.uas.search.dao.BrandDao;
+import com.uas.search.dao.ComponentDao;
+import com.uas.search.dao.KindDao;
+import com.uas.search.dao.OrderInvoiceDao;
+import com.uas.search.dao.OrderDao;
+import com.uas.search.dao.PurchaseInvoiceDao;
+import com.uas.search.dao.PurchaseDao;
+import com.uas.search.model.Brand;
+import com.uas.search.model.Component;
+import com.uas.search.model.Goods;
+import com.uas.search.model.Kind;
+import com.uas.search.model.OrderInvoice;
+import com.uas.search.model.Order;
 import com.uas.search.model.ParsedQueueMessage;
-import com.uas.search.model.PurchaseInvoiceSimpleInfo;
-import com.uas.search.model.PurchaseSimpleInfo;
+import com.uas.search.model.PurchaseInvoice;
+import com.uas.search.model.Purchase;
 
 /**
  * 对得到的队列消息进行解析的工具
@@ -42,25 +42,25 @@ import com.uas.search.model.PurchaseSimpleInfo;
 public class QueueMessageParser {
 
 	@Autowired
-	private KindSimpleInfoDao kindDao;
+	private KindDao kindDao;
 
 	@Autowired
-	private BrandSimpleInfoDao brandDao;
+	private BrandDao brandDao;
 
 	@Autowired
-	private ComponentSimpleInfoDao componentDao;
+	private ComponentDao componentDao;
 
 	@Autowired
-	private OrderSimpleInfoDao orderDao;
+	private OrderDao orderDao;
 
 	@Autowired
-	private OrderInvoiceSimpleInfoDao orderInvoiceDao;
+	private OrderInvoiceDao orderInvoiceDao;
 
 	@Autowired
-	private PurchaseSimpleInfoDao purchaseDao;
+	private PurchaseDao purchaseDao;
 
 	@Autowired
-	private PurchaseInvoiceSimpleInfoDao purchaseInvoiceDao;
+	private PurchaseInvoiceDao purchaseInvoiceDao;
 
 	private static Logger logger = LoggerFactory.getLogger(QueueMessageParser.class);
 
@@ -136,21 +136,21 @@ public class QueueMessageParser {
 	 * @throws JSONException
 	 */
 	// {"method":"insert","table":"product$kind","ids":[2400,1299]}
-	private KindSimpleInfo[] parseKind(JSONObject jsonObject) throws JSONException {
+	private Kind[] parseKind(JSONObject jsonObject) throws JSONException {
 		Set<Long> ids = getIds(jsonObject.getJSONArray("ids"));
-		List<KindSimpleInfo> kindsList = new ArrayList<>();
+		List<Kind> kindsList = new ArrayList<>();
 		// delete操作
 		// 删除后数据库中可能已经没有相应数据了，无法通过dao获取，需要手动创建对象
 		if (jsonObject.getString("method").equalsIgnoreCase("delete")) {
 			for (Long id : ids) {
-				KindSimpleInfo kind = new KindSimpleInfo();
+				Kind kind = new Kind();
 				kind.setId(id);
 				kindsList.add(kind);
 			}
 		} else {
 			kindsList = kindDao.findAll(ids);
 		}
-		KindSimpleInfo[] kinds = new KindSimpleInfo[kindsList.size()];
+		Kind[] kinds = new Kind[kindsList.size()];
 		kindsList.toArray(kinds);
 		return kinds;
 	}
@@ -163,19 +163,19 @@ public class QueueMessageParser {
 	 * @throws JSONException
 	 */
 	// {"method":"insert","table":"product$brand","ids":[124]}
-	private BrandSimpleInfo[] parseBrand(JSONObject jsonObject) throws JSONException {
+	private Brand[] parseBrand(JSONObject jsonObject) throws JSONException {
 		Set<Long> ids = getIds(jsonObject.getJSONArray("ids"));
-		List<BrandSimpleInfo> brandsList = new ArrayList<>();
+		List<Brand> brandsList = new ArrayList<>();
 		if (jsonObject.getString("method").equalsIgnoreCase("delete")) {
 			for (Long id : ids) {
-				BrandSimpleInfo brand = new BrandSimpleInfo();
+				Brand brand = new Brand();
 				brand.setId(id);
 				brandsList.add(brand);
 			}
 		} else {
 			brandsList = brandDao.findAll(ids);
 		}
-		BrandSimpleInfo[] brands = new BrandSimpleInfo[brandsList.size()];
+		Brand[] brands = new Brand[brandsList.size()];
 		brandsList.toArray(brands);
 		return brands;
 	}
@@ -188,19 +188,19 @@ public class QueueMessageParser {
 	 * @throws JSONException
 	 */
 	// {"method":"value1","table":"product$component","ids":[1024]}
-	private ComponentSimpleInfo[] parseComponent(JSONObject jsonObject) throws JSONException {
+	private Component[] parseComponent(JSONObject jsonObject) throws JSONException {
 		Set<Long> ids = getIds(jsonObject.getJSONArray("ids"));
-		List<ComponentSimpleInfo> componentsList = new ArrayList<>();
+		List<Component> componentsList = new ArrayList<>();
 		if (jsonObject.getString("method").equalsIgnoreCase("delete")) {
 			for (Long id : ids) {
-				ComponentSimpleInfo component = new ComponentSimpleInfo();
+				Component component = new Component();
 				component.setId(id);
 				componentsList.add(component);
 			}
 		} else {
 			componentsList = componentDao.findAll(ids);
 		}
-		ComponentSimpleInfo[] components = new ComponentSimpleInfo[componentsList.size()];
+		Component[] components = new Component[componentsList.size()];
 		componentsList.toArray(components);
 		return components;
 	}
@@ -214,24 +214,24 @@ public class QueueMessageParser {
 	 */
 	// {"method":"value1","table":"v$product$cmpgoods","cmpIds":[142]}
 	// {"method":"value1","table":"v$product$cmpgoods","goIds":[114287]}
-	private GoodsSimpleInfo[] parseGoods(JSONObject jsonObject) throws JSONException {
-		List<GoodsSimpleInfo> goodsesList = new ArrayList<>();
+	private Goods[] parseGoods(JSONObject jsonObject) throws JSONException {
+		List<Goods> goodsesList = new ArrayList<>();
 		if (jsonObject.containsKey("cmpIds")) {
 			Set<Long> ids = getIds(jsonObject.getJSONArray("cmpIds"));
 			for (Long id : ids) {
-				GoodsSimpleInfo goods = new GoodsSimpleInfo();
+				Goods goods = new Goods();
 				goods.setCmpId(id);
 				goodsesList.add(goods);
 			}
 		} else {
 			Set<Long> ids = getIds(jsonObject.getJSONArray("goIds"));
 			for (Long id : ids) {
-				GoodsSimpleInfo goods = new GoodsSimpleInfo();
+				Goods goods = new Goods();
 				goods.setGoId(id);
 				goodsesList.add(goods);
 			}
 		}
-		GoodsSimpleInfo[] goodses = new GoodsSimpleInfo[goodsesList.size()];
+		Goods[] goodses = new Goods[goodsesList.size()];
 		goodsesList.toArray(goodses);
 		return goodses;
 	}
@@ -244,19 +244,19 @@ public class QueueMessageParser {
 	 * @throws JSONException
 	 */
 	// {"method":"insert","table":"trade$order","ids":[124]}
-	private OrderSimpleInfo[] parseOrder(JSONObject jsonObject) throws JSONException {
+	private Order[] parseOrder(JSONObject jsonObject) throws JSONException {
 		Set<Long> ids = getIds(jsonObject.getJSONArray("ids"));
-		List<OrderSimpleInfo> ordersList = new ArrayList<>();
+		List<Order> ordersList = new ArrayList<>();
 		if (jsonObject.getString("method").equalsIgnoreCase("delete")) {
 			for (Long id : ids) {
-				OrderSimpleInfo order = new OrderSimpleInfo();
+				Order order = new Order();
 				order.setId(id);
 				ordersList.add(order);
 			}
 		} else {
 			ordersList = orderDao.findAll(ids);
 		}
-		OrderSimpleInfo[] orders = new OrderSimpleInfo[ordersList.size()];
+		Order[] orders = new Order[ordersList.size()];
 		ordersList.toArray(orders);
 		return orders;
 	}
@@ -269,19 +269,19 @@ public class QueueMessageParser {
 	 * @throws JSONException
 	 */
 	// {"method":"insert","table":"trade$invoice_fmor","ids":[124]}
-	private OrderInvoiceSimpleInfo[] parseOrderInvoice(JSONObject jsonObject) throws JSONException {
+	private OrderInvoice[] parseOrderInvoice(JSONObject jsonObject) throws JSONException {
 		Set<Long> ids = getIds(jsonObject.getJSONArray("ids"));
-		List<OrderInvoiceSimpleInfo> orderInvoicesList = new ArrayList<>();
+		List<OrderInvoice> orderInvoicesList = new ArrayList<>();
 		if (jsonObject.getString("method").equalsIgnoreCase("delete")) {
 			for (Long id : ids) {
-				OrderInvoiceSimpleInfo orderInvoice = new OrderInvoiceSimpleInfo();
+				OrderInvoice orderInvoice = new OrderInvoice();
 				orderInvoice.setId(id);
 				orderInvoicesList.add(orderInvoice);
 			}
 		} else {
 			orderInvoicesList = orderInvoiceDao.findAll(ids);
 		}
-		OrderInvoiceSimpleInfo[] orderInvoices = new OrderInvoiceSimpleInfo[orderInvoicesList.size()];
+		OrderInvoice[] orderInvoices = new OrderInvoice[orderInvoicesList.size()];
 		orderInvoicesList.toArray(orderInvoices);
 		return orderInvoices;
 	}
@@ -294,19 +294,19 @@ public class QueueMessageParser {
 	 * @throws JSONException
 	 */
 	// {"method":"insert","table":"trade$purchase","ids":[124]}
-	private PurchaseSimpleInfo[] parsePurchase(JSONObject jsonObject) throws JSONException {
+	private Purchase[] parsePurchase(JSONObject jsonObject) throws JSONException {
 		Set<Long> ids = getIds(jsonObject.getJSONArray("ids"));
-		List<PurchaseSimpleInfo> purchasesList = new ArrayList<>();
+		List<Purchase> purchasesList = new ArrayList<>();
 		if (jsonObject.getString("method").equalsIgnoreCase("delete")) {
 			for (Long id : ids) {
-				PurchaseSimpleInfo purchase = new PurchaseSimpleInfo();
+				Purchase purchase = new Purchase();
 				purchase.setId(id);
 				purchasesList.add(purchase);
 			}
 		} else {
 			purchasesList = purchaseDao.findAll(ids);
 		}
-		PurchaseSimpleInfo[] purchases = new PurchaseSimpleInfo[purchasesList.size()];
+		Purchase[] purchases = new Purchase[purchasesList.size()];
 		purchasesList.toArray(purchases);
 		return purchases;
 	}
@@ -319,19 +319,19 @@ public class QueueMessageParser {
 	 * @throws JSONException
 	 */
 	// {"method":"insert","table":"trade$invoice_fmpu","ids":[124]}
-	private PurchaseInvoiceSimpleInfo[] parsePurchaseInvoice(JSONObject jsonObject) throws JSONException {
+	private PurchaseInvoice[] parsePurchaseInvoice(JSONObject jsonObject) throws JSONException {
 		Set<Long> ids = getIds(jsonObject.getJSONArray("ids"));
-		List<PurchaseInvoiceSimpleInfo> purchaseInvoicesList = new ArrayList<>();
+		List<PurchaseInvoice> purchaseInvoicesList = new ArrayList<>();
 		if (jsonObject.getString("method").equalsIgnoreCase("delete")) {
 			for (Long id : ids) {
-				PurchaseInvoiceSimpleInfo purchaseInvoice = new PurchaseInvoiceSimpleInfo();
+				PurchaseInvoice purchaseInvoice = new PurchaseInvoice();
 				purchaseInvoice.setId(id);
 				purchaseInvoicesList.add(purchaseInvoice);
 			}
 		} else {
 			purchaseInvoicesList = purchaseInvoiceDao.findAll(ids);
 		}
-		PurchaseInvoiceSimpleInfo[] purchaseInvoices = new PurchaseInvoiceSimpleInfo[purchaseInvoicesList.size()];
+		PurchaseInvoice[] purchaseInvoices = new PurchaseInvoice[purchaseInvoicesList.size()];
 		purchaseInvoicesList.toArray(purchaseInvoices);
 		return purchaseInvoices;
 	}

src/main/java/com/uas/search/model/BaseOrderDetailSimpleInfo.java

@@ -1,73 +0,0 @@
-package com.uas.search.model;
-
-/**
- * 单据明细基类
- * 
- * @author sunyj
- * @since 2016年10月31日 上午11:30:35
- */
-public class BaseOrderDetailSimpleInfo {
-	private Long id;
-	private String code;
-	private Short detno;
-	private String cmpCode;
-	private String kiName;
-	private String brName;
-	private Integer status;
-
-	public Long getId() {
-		return id;
-	}
-
-	public void setId(Long id) {
-		this.id = id;
-	}
-
-	public String getCode() {
-		return code;
-	}
-
-	public void setCode(String code) {
-		this.code = code;
-	}
-
-	public Short getDetno() {
-		return detno;
-	}
-
-	public void setDetno(Short detno) {
-		this.detno = detno;
-	}
-
-	public String getCmpCode() {
-		return cmpCode;
-	}
-
-	public void setCmpCode(String cmpCode) {
-		this.cmpCode = cmpCode;
-	}
-
-	public String getKiName() {
-		return kiName;
-	}
-
-	public void setKiName(String kiName) {
-		this.kiName = kiName;
-	}
-
-	public String getBrName() {
-		return brName;
-	}
-
-	public void setBrName(String brName) {
-		this.brName = brName;
-	}
-
-	public Integer getStatus() {
-		return status;
-	}
-
-	public void setStatus(Integer status) {
-		this.status = status;
-	}
-}

src/main/java/com/uas/search/model/BrandSimpleInfo.java

@@ -1,87 +0,0 @@
-package com.uas.search.model;
-
-import java.io.Serializable;
-
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.Id;
-import javax.persistence.Table;
-
-/**
- * 品牌简要信息，只用于索引的创建与查询
- * 
- * @author sunyj
- * @since 2016年7月7日 下午5:48:32
- */
-@Entity
-@Table(name = "product$brand")
-public class BrandSimpleInfo implements Serializable {
-
-	/**
-	 * 序列号
-	 */
-	private static final long serialVersionUID = 1L;
-
-	/**
-	 * id
-	 */
-	@Id
-	@Column(name = "br_id")
-	private Long id;
-
-	/**
-	 * uuid
-	 */
-	@Column(name = "br_uuid", unique = true)
-	private String uuid;
-
-	/**
-	 * 品牌中文名称
-	 */
-	@Column(name = "br_name_cn")
-	private String nameCn;
-
-	/**
-	 * 品牌英文名称
-	 */
-	@Column(name = "br_name_en")
-	private String nameEn;
-
-	public Long getId() {
-		return id;
-	}
-
-	public void setId(Long id) {
-		this.id = id;
-	}
-
-	public String getUuid() {
-		return uuid;
-	}
-
-	public void setUuid(String uuid) {
-		this.uuid = uuid;
-	}
-
-	public String getNameCn() {
-		return nameCn;
-	}
-
-	public void setNameCn(String nameCn) {
-		this.nameCn = nameCn;
-	}
-
-	public String getNameEn() {
-		return nameEn;
-	}
-
-	public void setNameEn(String nameEn) {
-		this.nameEn = nameEn;
-	}
-
-	@Override
-	public String toString() {
-		return "BrandSimpleInfo [id=" + id + ", uuid=" + uuid + ", nameCn=" + nameCn + ", nameEn=" + nameEn + "]";
-	}
-
-}

src/main/java/com/uas/search/model/ComponentSimpleInfo.java

@@ -1,188 +0,0 @@
-package com.uas.search.model;
-
-import java.io.Serializable;
-import java.util.Set;
-
-import javax.persistence.CascadeType;
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.FetchType;
-import javax.persistence.Id;
-import javax.persistence.JoinColumn;
-import javax.persistence.ManyToOne;
-import javax.persistence.OneToMany;
-import javax.persistence.OrderBy;
-import javax.persistence.Table;
-
-/**
- * 器件简要信息，只用于索引的创建与查询
- * 
- * @author sunyj
- * @since 2016年7月7日 下午5:55:26
- */
-@Entity
-@Table(name = "product$component")
-public class ComponentSimpleInfo implements Serializable {
-
-	/**
-	 * 序列号
-	 */
-	private static final long serialVersionUID = 1L;
-
-	/**
-	 * id
-	 */
-	@Id
-	@Column(name = "cmp_id")
-	private Long id;
-
-	/**
-	 * 器件的uuid
-	 */
-	@Column(name = "cmp_uuid", unique = true)
-	private String uuid;
-
-	/**
-	 * 原厂型号
-	 */
-	@Column(name = "cmp_code")
-	private String code;
-
-	/**
-	 * 类目
-	 */
-	@ManyToOne
-	@JoinColumn(name = "cmp_kiid")
-	private KindSimpleInfo kind;
-
-	/**
-	 * 品牌
-	 */
-	@ManyToOne
-	@JoinColumn(name = "cmp_brid")
-	private BrandSimpleInfo brand;
-
-	/**
-	 * 以下为器件的库存交易属性，由器件对应的上架商品发生变化时，更新反应到器件
-	 */
-
-	/**
-	 * 器件的库存
-	 */
-	@Column(name = "cmp_reserve")
-	private Double reserve;
-
-	/**
-	 * 样品数量汇总
-	 */
-	@Column(name = "cmp_sampleqty")
-	private Double sampleQty;
-
-	/**
-	 * 现货数量
-	 */
-	@Column(name = "cmp_originalqty")
-	private Double originalQty;
-
-	/**
-	 * 呆滞库存数量
-	 */
-	@Column(name = "cmp_inastockqty")
-	private Double inactionStockQty;
-
-	/**
-	 * 带的属性及属性的值
-	 */
-	@OneToMany(cascade = { CascadeType.ALL }, fetch = FetchType.EAGER)
-	@JoinColumn(name = "pv_componentid", updatable = false, insertable = false)
-	@OrderBy("detno")
-	private Set<PropertyValueSimpleInfo> properties;
-
-	public Long getId() {
-		return id;
-	}
-
-	public void setId(Long id) {
-		this.id = id;
-	}
-
-	public String getUuid() {
-		return uuid;
-	}
-
-	public void setUuid(String uuid) {
-		this.uuid = uuid;
-	}
-
-	public String getCode() {
-		return code;
-	}
-
-	public void setCode(String code) {
-		this.code = code;
-	}
-
-	public KindSimpleInfo getKind() {
-		return kind;
-	}
-
-	public void setKind(KindSimpleInfo kind) {
-		this.kind = kind;
-	}
-
-	public BrandSimpleInfo getBrand() {
-		return brand;
-	}
-
-	public void setBrand(BrandSimpleInfo brand) {
-		this.brand = brand;
-	}
-
-	public Double getReserve() {
-		return reserve;
-	}
-
-	public void setReserve(Double reserve) {
-		this.reserve = reserve;
-	}
-
-	public Double getSampleQty() {
-		return sampleQty;
-	}
-
-	public void setSampleQty(Double sampleQty) {
-		this.sampleQty = sampleQty;
-	}
-
-	public Double getOriginalQty() {
-		return originalQty;
-	}
-
-	public void setOriginalQty(Double originalQty) {
-		this.originalQty = originalQty;
-	}
-
-	public Double getInactionStockQty() {
-		return inactionStockQty;
-	}
-
-	public void setInactionStockQty(Double inactionStockQty) {
-		this.inactionStockQty = inactionStockQty;
-	}
-
-	public Set<PropertyValueSimpleInfo> getProperties() {
-		return properties;
-	}
-
-	public void setProperties(Set<PropertyValueSimpleInfo> properties) {
-		this.properties = properties;
-	}
-
-	@Override
-	public String toString() {
-		return "ComponentSimpleInfo [id=" + id + ", uuid=" + uuid + ", code=" + code + ", kind=" + kind + ", brand="
-				+ brand + ", reserve=" + reserve + ", sampleQty=" + sampleQty + ", originalQty=" + originalQty
-				+ ", inactionStockQty=" + inactionStockQty + ", properties=" + properties + "]";
-	}
-
-}

src/main/java/com/uas/search/model/EnterpriseSimpleInfo.java

@@ -1,58 +0,0 @@
-/*CopyRright (c)2014: <www.usoftchina.com>
- */
-package com.uas.search.model;
-
-import java.io.Serializable;
-
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.Id;
-import javax.persistence.Table;
-
-/**
- * 企业信息
- * 
- * @author sunyj
- * @since 2016年10月14日 上午10:55:23
- */
-@Entity
-@Table(name = "sec$enterprises")
-public class EnterpriseSimpleInfo implements Serializable {
-
-	/**
-	 * 序列号
-	 */
-	private static final long serialVersionUID = 1L;
-
-	@Id
-	@Column(name = "en_uu")
-	private Long uu;
-
-	/**
-	 * 公司名称
-	 */
-	@Column(name = "en_name")
-	private String enName;
-
-	public Long getUu() {
-		return uu;
-	}
-
-	public void setUu(Long uu) {
-		this.uu = uu;
-	}
-
-	public String getEnName() {
-		return enName;
-	}
-
-	public void setEnName(String enName) {
-		this.enName = enName;
-	}
-
-	@Override
-	public String toString() {
-		return "EnterpriseSimpleInfo [uu=" + uu + ", enName=" + enName + "]";
-	}
-
-}

src/main/java/com/uas/search/model/GoodsSimpleInfo.java

@@ -1,185 +0,0 @@
-package com.uas.search.model;
-
-import java.io.Serializable;
-
-/**
- * 器件批次
- * 
- * @author sunyj
- * @since 2017年7月8日 下午5:14:08
- */
-public class GoodsSimpleInfo implements Serializable {
-
-	private static final long serialVersionUID = 1L;
-
-	/**
-	 * id
-	 */
-	private String id;
-
-	/**
-	 * 批次id
-	 */
-	private Long goId;
-
-	/**
-	 * 批次的库存
-	 */
-	private Double goReserve;
-
-	/**
-	 * 批次的人民币价格
-	 */
-	private Double goMinPriceRMB;
-
-	/**
-	 * 批次的美元价格
-	 */
-	private Double goMinPriceUSD;
-
-	/**
-	 * 货币
-	 */
-	private String crName;
-
-	/**
-	 * 货源
-	 */
-	private StoreSimpleInfo store;
-
-	/**
-	 * 器件的id
-	 */
-	private Long cmpId;
-
-	/**
-	 * 原厂型号
-	 */
-	private String cmpCode;
-
-	/**
-	 * 类目
-	 */
-	private KindSimpleInfo kind;
-
-	/**
-	 * 品牌
-	 */
-	private BrandSimpleInfo brand;
-
-	public GoodsSimpleInfo() {
-	}
-
-	public GoodsSimpleInfo(TradeGoodsSimpleInfo tradeGoods, StoreSimpleInfo store, ComponentSimpleInfo component) {
-		if (tradeGoods != null) {
-			this.goId = tradeGoods.getId();
-			this.goReserve = tradeGoods.getReserve();
-			this.goMinPriceRMB = tradeGoods.getMinPriceRMB();
-			this.goMinPriceUSD = tradeGoods.getMinPriceUSD();
-			this.crName = tradeGoods.getCrName();
-		}
-		this.store = store;
-		if (component != null) {
-			this.cmpId = component.getId();
-			this.cmpCode = component.getCode();
-			this.kind = component.getKind();
-			this.brand = component.getBrand();
-		}
-	}
-
-	public String getId() {
-		return id;
-	}
-
-	public void setId(String id) {
-		this.id = id;
-	}
-
-	public Long getGoId() {
-		return goId;
-	}
-
-	public void setGoId(Long goId) {
-		this.goId = goId;
-	}
-
-	public Double getGoReserve() {
-		return goReserve;
-	}
-
-	public void setGoReserve(Double goReserve) {
-		this.goReserve = goReserve;
-	}
-
-	public Double getGoMinPriceRMB() {
-		return goMinPriceRMB;
-	}
-
-	public void setGoMinPriceRMB(Double goMinPriceRMB) {
-		this.goMinPriceRMB = goMinPriceRMB;
-	}
-
-	public Double getGoMinPriceUSD() {
-		return goMinPriceUSD;
-	}
-
-	public void setGoMinPriceUSD(Double goMinPriceUSD) {
-		this.goMinPriceUSD = goMinPriceUSD;
-	}
-
-	public String getCrName() {
-		return crName;
-	}
-
-	public void setCrName(String crName) {
-		this.crName = crName;
-	}
-
-	public StoreSimpleInfo getStore() {
-		return store;
-	}
-
-	public void setStore(StoreSimpleInfo store) {
-		this.store = store;
-	}
-
-	public Long getCmpId() {
-		return cmpId;
-	}
-
-	public void setCmpId(Long cmpId) {
-		this.cmpId = cmpId;
-	}
-
-	public String getCmpCode() {
-		return cmpCode;
-	}
-
-	public void setCmpCode(String cmpCode) {
-		this.cmpCode = cmpCode;
-	}
-
-	public KindSimpleInfo getKind() {
-		return kind;
-	}
-
-	public void setKind(KindSimpleInfo kind) {
-		this.kind = kind;
-	}
-
-	public BrandSimpleInfo getBrand() {
-		return brand;
-	}
-
-	public void setBrand(BrandSimpleInfo brand) {
-		this.brand = brand;
-	}
-
-	@Override
-	public String toString() {
-		return "GoodsSimpleInfo [id=" + id + ", goId=" + goId + ", goReserve=" + goReserve + ", goMinPriceRMB="
-				+ goMinPriceRMB + ", goMinPriceUSD=" + goMinPriceUSD + ", crName=" + crName + ", store=" + store
-				+ ", cmpId=" + cmpId + ", cmpCode=" + cmpCode + ", kind=" + kind + ", brand=" + brand + "]";
-	}
-
-}

src/main/java/com/uas/search/model/KindSimpleInfo.java

@@ -1,87 +0,0 @@
-package com.uas.search.model;
-
-import java.io.Serializable;
-
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.Id;
-import javax.persistence.Table;
-
-/**
- * 类目简要信息，只用于索引的创建与查询
- * 
- * @author sunyj
- * @since 2016年7月7日 下午5:38:44
- */
-@Entity
-@Table(name = "product$kind")
-public class KindSimpleInfo implements Serializable {
-
-	/**
-	 * 序列号
-	 */
-	private static final long serialVersionUID = 1L;
-
-	/**
-	 * id
-	 */
-	@Id
-	@Column(name = "ki_id")
-	private Long id;
-
-	/**
-	 * 类目名称
-	 */
-	@Column(name = "ki_name")
-	private String nameCn;
-
-	/**
-	 * 类目的层级，从1开始，1、2、3
-	 */
-	@Column(name = "ki_level")
-	private Short level;
-
-	/**
-	 * 是否为叶子类目 1是 0否
-	 */
-	@Column(name = "ki_isleaf")
-	private Short isLeaf;
-
-	public Long getId() {
-		return id;
-	}
-
-	public void setId(Long id) {
-		this.id = id;
-	}
-
-	public String getNameCn() {
-		return nameCn;
-	}
-
-	public void setNameCn(String nameCn) {
-		this.nameCn = nameCn;
-	}
-
-	public Short getLevel() {
-		return level;
-	}
-
-	public void setLevel(Short level) {
-		this.level = level;
-	}
-
-	public Short getIsLeaf() {
-		return isLeaf;
-	}
-
-	public void setIsLeaf(Short isLeaf) {
-		this.isLeaf = isLeaf;
-	}
-
-	@Override
-	public String toString() {
-		return "KindSimpleInfo [id=" + id + ", nameCn=" + nameCn + ", level=" + level + ", isLeaf=" + isLeaf + "]";
-	}
-
-}

src/main/java/com/uas/search/model/OrderDetailSimpleInfo.java

@@ -1,119 +0,0 @@
-package com.uas.search.model;
-
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.Id;
-import javax.persistence.Table;
-
-/**
- * 商城销售订单明细
- * 
- * @author sunyj
- * @since 2016年10月14日 上午10:19:23
- */
-@Entity
-@Table(name = "trade$order_detail")
-public class OrderDetailSimpleInfo {
-
-	@Id
-	@Column(name = "id")
-	private Long id;
-
-	/**
-	 * 明细序号
-	 */
-	@Column(name = "detno")
-	private Short detno;
-
-	/**
-	 * 订单明细编号，因易与id命名混淆，其他类、lucenne建索引时该字段难以区分，特以此命名
-	 */
-	@Column(name = "detail_id", unique = true)
-	private String code;
-
-	/**
-	 * 原厂型号
-	 */
-	@Column(name = "cmp_code")
-	private String cmpCode;
-
-	/**
-	 * 器件所属类目
-	 */
-	@Column(name = "ki_name")
-	private String kiName;
-
-	/**
-	 * 器件所属品牌
-	 */
-	@Column(name = "br_name")
-	private String brName;
-
-	/**
-	 * 订单明细状态
-	 */
-	@Column(name = "detail_status")
-	private Integer status;
-
-	public Long getId() {
-		return id;
-	}
-
-	public void setId(Long id) {
-		this.id = id;
-	}
-
-	public String getCode() {
-		return code;
-	}
-
-	public void setCode(String code) {
-		this.code = code;
-	}
-
-	public Short getDetno() {
-		return detno;
-	}
-
-	public void setDetno(Short detno) {
-		this.detno = detno;
-	}
-
-	public String getCmpCode() {
-		return cmpCode;
-	}
-
-	public void setCmpCode(String cmpCode) {
-		this.cmpCode = cmpCode;
-	}
-
-	public String getKiName() {
-		return kiName;
-	}
-
-	public void setKiName(String kiName) {
-		this.kiName = kiName;
-	}
-
-	public String getBrName() {
-		return brName;
-	}
-
-	public void setBrName(String brName) {
-		this.brName = brName;
-	}
-
-	public Integer getStatus() {
-		return status;
-	}
-
-	public void setStatus(Integer status) {
-		this.status = status;
-	}
-
-	@Override
-	public String toString() {
-		return "OrderDetailSimpleInfo [id=" + id + ", detno=" + detno + ", code=" + code + ", cmpCode=" + cmpCode
-				+ ", kiName=" + kiName + ", brName=" + brName + ", status=" + status + "]";
-	}
-}

src/main/java/com/uas/search/model/OrderInvoiceDetailSimpleInfo.java

@@ -1,119 +0,0 @@
-package com.uas.search.model;
-
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.Id;
-import javax.persistence.Table;
-
-/**
- * 商城销售订单的发货单明细
- * 
- * @author sunyj
- * @since 2016年10月14日 上午10:29:22
- */
-@Entity
-@Table(name = "trade$invoice_fmor_dt")
-public class OrderInvoiceDetailSimpleInfo {
-
-	@Id
-	@Column(name = "id")
-	private Long id;
-
-	/**
-	 * 明细序号 detail NO.
-	 */
-	@Column(name = "detno")
-	private Short detno;
-
-	/**
-	 * 发货单明细编号，因易与id命名混淆，其他类、lucenne建索引时该字段难以区分，特以此命名
-	 */
-	@Column(name = "detail_id", unique = true)
-	private String code;
-
-	/**
-	 * 原厂型号
-	 */
-	@Column(name = "cmp_code")
-	private String cmpCode;
-
-	/**
-	 * 器件所属类目
-	 */
-	@Column(name = "ki_name")
-	private String kiName;
-
-	/**
-	 * 器件所属品牌
-	 */
-	@Column(name = "br_name")
-	private String brName;
-
-	/**
-	 * 发货单明细状态
-	 */
-	@Column(name = "detail_status")
-	private Integer status;
-
-	public Long getId() {
-		return id;
-	}
-
-	public void setId(Long id) {
-		this.id = id;
-	}
-
-	public String getCode() {
-		return code;
-	}
-
-	public void setCode(String code) {
-		this.code = code;
-	}
-
-	public Short getDetno() {
-		return detno;
-	}
-
-	public void setDetno(Short detno) {
-		this.detno = detno;
-	}
-
-	public String getCmpCode() {
-		return cmpCode;
-	}
-
-	public void setCmpCode(String cmpCode) {
-		this.cmpCode = cmpCode;
-	}
-
-	public String getKiName() {
-		return kiName;
-	}
-
-	public void setKiName(String kiName) {
-		this.kiName = kiName;
-	}
-
-	public String getBrName() {
-		return brName;
-	}
-
-	public void setBrName(String brName) {
-		this.brName = brName;
-	}
-
-	public Integer getStatus() {
-		return status;
-	}
-
-	public void setStatus(Integer status) {
-		this.status = status;
-	}
-
-	@Override
-	public String toString() {
-		return "OrderInvoiceDetailSimpleInfo [id=" + id + ", detno=" + detno + ", code=" + code + ", cmpCode=" + cmpCode
-				+ ", kiName=" + kiName + ", brName=" + brName + ", status=" + status + "]";
-	}
-}

src/main/java/com/uas/search/model/OrderInvoiceSimpleInfo.java

@@ -1,156 +0,0 @@
-package com.uas.search.model;
-
-import java.io.Serializable;
-import java.util.Date;
-import java.util.Set;
-
-import javax.persistence.CascadeType;
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.FetchType;
-import javax.persistence.Id;
-import javax.persistence.JoinColumn;
-import javax.persistence.OneToMany;
-import javax.persistence.OneToOne;
-import javax.persistence.OrderBy;
-import javax.persistence.Table;
-
-/**
- * 商城销售订单的发货单
- * 
- * @author sunyj
- * @since 2016年10月14日 上午10:05:02
- */
-@Entity
-@Table(name = "trade$invoice_fmor")
-public class OrderInvoiceSimpleInfo implements Serializable {
-
-	private static final long serialVersionUID = 1L;
-
-	@Id
-	@Column(name = "id")
-	private Long id;
-
-	/**
-	 * 发货单号，因易与id命名混淆，其他类、lucenne建索引时该字段难以区分，特以此命名
-	 */
-	@Column(name = "in_id", unique = true)
-	private String code;
-
-	/**
-	 * 买方uu
-	 * 
-	 * @Tip 这里因为平台作为中间商，所以发货单都由平台下达
-	 */
-	@Column(name = "in_buyeruu")
-	private Long buyeruu;
-
-	/**
-	 * 买方姓名
-	 */
-	@Column(name = "in_buyername")
-	private String buyername;
-
-	/**
-	 * 买方企业
-	 * 
-	 * @Tip 这里因为平台作为中间商，下达订单都看做给平台下达订单
-	 */
-	@OneToOne
-	@JoinColumn(name = "in_buyerenuu", updatable = false, insertable = false)
-	private EnterpriseSimpleInfo buyerEnterprise;
-
-	/**
-	 * 单生成时间
-	 */
-	@Column(name = "in_creattime")
-	private Date createtime;
-
-	/**
-	 * 订单状态(1->2)
-	 * 
-	 * @Tip 必须严格按照顺序流转 1、INBOUND(404, "待收货") 2、RECEIVED(405, "已收货"),
-	 */
-	@Column(name = "in_status")
-	private Integer status;
-
-	/**
-	 * 发货单明细
-	 */
-	@OneToMany(cascade = { CascadeType.ALL }, fetch = FetchType.EAGER)
-	@JoinColumn(name = "invoice_id", updatable = false, insertable = false)
-	@OrderBy("detno")
-	private Set<OrderInvoiceDetailSimpleInfo> details;
-
-	public Long getId() {
-		return id;
-	}
-
-	public void setId(Long id) {
-		this.id = id;
-	}
-
-	public String getCode() {
-		return code;
-	}
-
-	public void setCode(String code) {
-		this.code = code;
-	}
-
-	public Long getBuyeruu() {
-		return buyeruu;
-	}
-
-	public void setBuyeruu(Long buyeruu) {
-		this.buyeruu = buyeruu;
-	}
-
-	public String getBuyername() {
-		return buyername;
-	}
-
-	public void setBuyername(String buyername) {
-		this.buyername = buyername;
-	}
-
-	public Date getCreatetime() {
-		return createtime;
-	}
-
-	public void setCreatetime(Date createtime) {
-		this.createtime = createtime;
-	}
-
-	public EnterpriseSimpleInfo getBuyerEnterprise() {
-		return buyerEnterprise;
-	}
-
-	public void setBuyerEnterprise(EnterpriseSimpleInfo buyerEnterprise) {
-		this.buyerEnterprise = buyerEnterprise;
-	}
-
-	public Integer getStatus() {
-		return status;
-	}
-
-	public void setStatus(Integer status) {
-		this.status = status;
-	}
-
-	public Set<OrderInvoiceDetailSimpleInfo> getDetails() {
-		return details;
-	}
-
-	public void setDetails(Set<OrderInvoiceDetailSimpleInfo> details) {
-		this.details = details;
-	}
-
-	@Override
-	public String toString() {
-		return "OrderInvoiceSimpleInfo [id=" + id + ", code=" + code + ", buyeruu=" + buyeruu + ", buyername="
-				+ buyername + ", buyerEnterprise=" + buyerEnterprise + ", createtime=" + createtime + ", status="
-				+ status + ", details=" + details + "]";
-	}
-
-}

src/main/java/com/uas/search/model/OrderSimpleInfo.java

@@ -1,176 +0,0 @@
-package com.uas.search.model;
-
-import java.io.Serializable;
-import java.util.Date;
-import java.util.Set;
-
-import javax.persistence.CascadeType;
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.FetchType;
-import javax.persistence.Id;
-import javax.persistence.JoinColumn;
-import javax.persistence.OneToMany;
-import javax.persistence.OneToOne;
-import javax.persistence.OrderBy;
-import javax.persistence.Table;
-
-/**
- * 商城销售订单
- * 
- * @author sunyj
- * @since 2016年10月14日 上午10:09:53
- */
-@Entity(name = "trade.Order")
-@Table(name = "trade$order")
-public class OrderSimpleInfo implements Serializable {
-
-	private static final long serialVersionUID = 1L;
-
-	@Id
-	@Column(name = "id")
-	private Long id;
-
-	/**
-	 * 订单号，因易与id命名混淆，其他类、lucenne建索引时该字段难以区分，特以此命名
-	 */
-	@Column(name = "or_id", unique = true)
-	private String code;
-
-	/**
-	 * 买方uu
-	 * 
-	 * @Tip 这里因为平台作为中间商，下达订单都看做给平台下达订单
-	 */
-	@Column(name = "or_buyeruu")
-	private Long buyeruu;
-
-	/**
-	 * 买方姓名
-	 */
-	@Column(name = "or_buyername")
-	private String buyername;
-
-	/**
-	 * 买方企业
-	 * 
-	 * @Tip 这里因为平台作为中间商，下达订单都看做给平台下达订单
-	 */
-	@OneToOne
-	@JoinColumn(name = "or_buyerenuu", updatable = false, insertable = false)
-	private EnterpriseSimpleInfo buyerEnterprise;
-
-	/**
-	 * 卖方企业
-	 * 
-	 * @Tip 这里因为平台作为中间商，下达订单都看做给平台下达订单
-	 */
-	@OneToOne
-	@JoinColumn(name = "or_sellerenuu", updatable = false, insertable = false)
-	private EnterpriseSimpleInfo sellerEnterprise;
-
-	/**
-	 * 订单生成时间
-	 */
-	@Column(name = "or_creattime")
-	private Date createtime;
-
-	/**
-	 * 订单状态(1->2->3->4->5->6->7->8->9)
-	 * 
-	 * @Tip 必须严格按照顺序流转 1、TOBECONFIRMED(501, "待确认"), 2、TOBEPAID(503, "待付款"),
-	 *      3、PAID(505, "已付款"), 4、TOBESHIPPED(406, "待出货"), 5、SHIPPINGIN(403,
-	 *      "出货中"), 6、SHIPPED(407, "已出货"), 7、SENDING(408, "发货中"), 8、INBOUND(404,
-	 *      "待收货") 9、RECEIVED(405, "已收货"), 10、UNAVAILABLE(602, "无效的");
-	 */
-	@Column(name = "or_status")
-	private Integer status;
-
-	/**
-	 * 订单明细
-	 */
-	@OneToMany(cascade = { CascadeType.ALL }, fetch = FetchType.EAGER)
-	@JoinColumn(name = "order_id", updatable = false, insertable = false)
-	@OrderBy("detno")
-	private Set<OrderDetailSimpleInfo> details;
-
-	public Long getId() {
-		return id;
-	}
-
-	public void setId(Long id) {
-		this.id = id;
-	}
-
-	public String getCode() {
-		return code;
-	}
-
-	public void setCode(String code) {
-		this.code = code;
-	}
-
-	public Long getBuyeruu() {
-		return buyeruu;
-	}
-
-	public void setBuyeruu(Long buyeruu) {
-		this.buyeruu = buyeruu;
-	}
-
-	public String getBuyername() {
-		return buyername;
-	}
-
-	public void setBuyername(String buyername) {
-		this.buyername = buyername;
-	}
-
-	public EnterpriseSimpleInfo getBuyerEnterprise() {
-		return buyerEnterprise;
-	}
-
-	public void setBuyerEnterprise(EnterpriseSimpleInfo buyerEnterprise) {
-		this.buyerEnterprise = buyerEnterprise;
-	}
-
-	public EnterpriseSimpleInfo getSellerEnterprise() {
-		return sellerEnterprise;
-	}
-
-	public void setSellerEnterprise(EnterpriseSimpleInfo sellerEnterprise) {
-		this.sellerEnterprise = sellerEnterprise;
-	}
-
-	public Date getCreatetime() {
-		return createtime;
-	}
-
-	public void setCreatetime(Date createtime) {
-		this.createtime = createtime;
-	}
-
-	public Integer getStatus() {
-		return status;
-	}
-
-	public void setStatus(Integer status) {
-		this.status = status;
-	}
-
-	public Set<OrderDetailSimpleInfo> getDetails() {
-		return details;
-	}
-
-	public void setDetails(Set<OrderDetailSimpleInfo> details) {
-		this.details = details;
-	}
-
-	@Override
-	public String toString() {
-		return "OrderSimpleInfo [id=" + id + ", code=" + code + ", buyeruu=" + buyeruu + ", buyername=" + buyername
-				+ ", buyerEnterprise=" + buyerEnterprise + ", sellerEnterprise=" + sellerEnterprise + ", createtime="
-				+ createtime + ", status=" + status + ", details=" + details + "]";
-	}
-
-}

src/main/java/com/uas/search/model/PropertySimpleInfo.java

@@ -1,68 +0,0 @@
-package com.uas.search.model;
-
-import java.io.Serializable;
-
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.Id;
-import javax.persistence.Table;
-
-/**
- * 标准属性
- * 
- * @author suntg
- * @since 2016年3月11日下午5:02:18
- */
-@Entity
-@Table(name = "product$property")
-public class PropertySimpleInfo implements Serializable {
-
-	/**
-	 * 序列号
-	 */
-	private static final long serialVersionUID = 1L;
-
-	/**
-	 * id
-	 */
-	@Id
-	@Column(name = "pt_id")
-	private Long id;
-
-	/**
-	 * 属性中文名
-	 */
-	@Column(name = "pt_label")
-	private String labelCn;
-
-	/**
-	 * 属性名 英文
-	 */
-	@Column(name = "pt_label_en")
-	private String labelEn;
-
-	public Long getId() {
-		return id;
-	}
-
-	public void setId(Long id) {
-		this.id = id;
-	}
-
-	public String getLabelCn() {
-		return labelCn;
-	}
-
-	public void setLabelCn(String labelCn) {
-		this.labelCn = labelCn;
-	}
-
-	public String getLabelEn() {
-		return labelEn;
-	}
-
-	public void setLabelEn(String labelEn) {
-		this.labelEn = labelEn;
-	}
-
-}

src/main/java/com/uas/search/model/PropertyValueSimpleInfo.java

@@ -1,120 +0,0 @@
-package com.uas.search.model;
-
-import java.io.Serializable;
-
-import javax.persistence.CascadeType;
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.Id;
-import javax.persistence.JoinColumn;
-import javax.persistence.OneToOne;
-import javax.persistence.Table;
-
-/**
- * 器件对应的属性的值
- * 
- * @author suntg
- * @since 2016年3月11日下午2:24:29
- */
-@Entity
-@Table(name = "product$propertyvalue")
-public class PropertyValueSimpleInfo implements Serializable {
-
-	/**
-	 * 序列号
-	 */
-	private static final long serialVersionUID = 1L;
-
-	/**
-	 * id
-	 */
-	@Id
-	@Column(name = "pv_id")
-	private Long id;
-
-	/**
-	 * 器件Id TODO 仅用于合并导出的器件和属性数据，jpa中不需要，后期可能会删除
-	 */
-	@Column(name = "pv_componentid")
-	private Long componentid;
-
-	/**
-	 * 属性Id
-	 */
-	@Column(name = "pv_propertyid")
-	private Long propertyid;
-
-	/**
-	 * 属性
-	 */
-	// TODO 索引未用到，确认无用后删除
-	@OneToOne(cascade = { CascadeType.REFRESH })
-	@JoinColumn(name = "pv_propertyid", insertable = false, updatable = false)
-	private PropertySimpleInfo property;
-
-	/**
-	 * 排序 TODO jpa使用，之后换为jdbc后，需要删除
-	 */
-	@Column(name = "pv_detno")
-	private Short detno;
-
-	/**
-	 * 属性的值
-	 */
-	@Column(name = "pv_value")
-	private String value;
-
-	public Long getId() {
-		return id;
-	}
-
-	public void setId(Long id) {
-		this.id = id;
-	}
-
-	public Long getComponentid() {
-		return componentid;
-	}
-
-	public void setComponentid(Long componentid) {
-		this.componentid = componentid;
-	}
-
-	public PropertySimpleInfo getProperty() {
-		return property;
-	}
-
-	public void setProperty(PropertySimpleInfo property) {
-		this.property = property;
-	}
-
-	public Short getDetno() {
-		return detno;
-	}
-
-	public void setDetno(Short detno) {
-		this.detno = detno;
-	}
-
-	public String getValue() {
-		return value;
-	}
-
-	public void setValue(String value) {
-		this.value = value;
-	}
-
-	public Long getPropertyid() {
-		return propertyid;
-	}
-
-	public void setPropertyid(Long propertyid) {
-		this.propertyid = propertyid;
-	}
-
-	@Override
-	public String toString() {
-		return "PropertyValue [propertyid=" + propertyid + ", value=" + value + "]";
-	}
-
-}

src/main/java/com/uas/search/model/PurchaseDetailSimpleInfo.java

@@ -1,119 +0,0 @@
-package com.uas.search.model;
-
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.Id;
-import javax.persistence.Table;
-
-/**
- * 商城采购订单明细
- * 
- * @author sunyj
- * @since 2016年10月14日 上午10:27:53
- */
-@Entity
-@Table(name = "trade$purchase_detail")
-public class PurchaseDetailSimpleInfo {
-
-	@Id
-	@Column(name = "id")
-	private Long id;
-
-	/**
-	 * 明细序号 detailNO
-	 */
-	@Column(name = "detno")
-	private Short detno;
-
-	/**
-	 * 采购单明细编号，因易与id命名混淆，其他类、lucenne建索引时该字段难以区分，特以此命名
-	 */
-	@Column(name = "detail_id", unique = true)
-	private String code;
-
-	/**
-	 * 原厂型号
-	 */
-	@Column(name = "cmp_code")
-	private String cmpCode;
-
-	/**
-	 * 器件所属类目
-	 */
-	@Column(name = "ki_name")
-	private String kiName;
-
-	/**
-	 * 器件所属品牌
-	 */
-	@Column(name = "br_name")
-	private String brName;
-
-	/**
-	 * 采购单明细状态
-	 */
-	@Column(name = "detail_status")
-	private Integer status;
-
-	public Long getId() {
-		return id;
-	}
-
-	public void setId(Long id) {
-		this.id = id;
-	}
-
-	public String getCode() {
-		return code;
-	}
-
-	public void setCode(String code) {
-		this.code = code;
-	}
-
-	public Short getDetno() {
-		return detno;
-	}
-
-	public void setDetno(Short detno) {
-		this.detno = detno;
-	}
-
-	public String getCmpCode() {
-		return cmpCode;
-	}
-
-	public void setCmpCode(String cmpCode) {
-		this.cmpCode = cmpCode;
-	}
-
-	public String getKiName() {
-		return kiName;
-	}
-
-	public void setKiName(String kiName) {
-		this.kiName = kiName;
-	}
-
-	public String getBrName() {
-		return brName;
-	}
-
-	public void setBrName(String brName) {
-		this.brName = brName;
-	}
-
-	public Integer getStatus() {
-		return status;
-	}
-
-	public void setStatus(Integer status) {
-		this.status = status;
-	}
-
-	@Override
-	public String toString() {
-		return "PurchaseDetailSimpleInfo [id=" + id + ", detno=" + detno + ", code=" + code + ", cmpCode=" + cmpCode
-				+ ", kiName=" + kiName + ", brName=" + brName + ", status=" + status + "]";
-	}
-}

src/main/java/com/uas/search/model/PurchaseInvoiceDetailSimpleInfo.java

@@ -1,119 +0,0 @@
-package com.uas.search.model;
-
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.Id;
-import javax.persistence.Table;
-
-/**
- * 商城采购订单的发货单明细
- * 
- * @author sunyj
- * @since 2016年10月14日 上午10:31:06
- */
-@Entity
-@Table(name = "trade$invoice_fmpu_dt")
-public class PurchaseInvoiceDetailSimpleInfo {
-
-	@Id
-	@Column(name = "id")
-	private Long id;
-
-	/**
-	 * 明细序号 detail NO.(保存ERP的序号)
-	 */
-	@Column(name = "detno")
-	private Short detno;
-
-	/**
-	 * 发货单明细编号，因易与id命名混淆，其他类、lucenne建索引时该字段难以区分，特以此命名
-	 */
-	@Column(name = "detail_id", unique = true)
-	private String code;
-
-	/**
-	 * 原厂型号
-	 */
-	@Column(name = "cmp_code")
-	private String cmpCode;
-
-	/**
-	 * 器件所属类目
-	 */
-	@Column(name = "ki_name")
-	private String kiName;
-
-	/**
-	 * 器件所属品牌
-	 */
-	@Column(name = "br_name")
-	private String brName;
-
-	/**
-	 * 发货单明细状态
-	 */
-	@Column(name = "detail_status")
-	private Integer status;
-
-	public Long getId() {
-		return id;
-	}
-
-	public void setId(Long id) {
-		this.id = id;
-	}
-
-	public String getCode() {
-		return code;
-	}
-
-	public void setCode(String code) {
-		this.code = code;
-	}
-
-	public Short getDetno() {
-		return detno;
-	}
-
-	public void setDetno(Short detno) {
-		this.detno = detno;
-	}
-
-	public String getCmpCode() {
-		return cmpCode;
-	}
-
-	public void setCmpCode(String cmpCode) {
-		this.cmpCode = cmpCode;
-	}
-
-	public String getKiName() {
-		return kiName;
-	}
-
-	public void setKiName(String kiName) {
-		this.kiName = kiName;
-	}
-
-	public String getBrName() {
-		return brName;
-	}
-
-	public void setBrName(String brName) {
-		this.brName = brName;
-	}
-
-	public Integer getStatus() {
-		return status;
-	}
-
-	public void setStatus(Integer status) {
-		this.status = status;
-	}
-
-	@Override
-	public String toString() {
-		return "PurchaseInvoiceDetailSimpleInfo [id=" + id + ", detno=" + detno + ", code=" + code + ", cmpCode="
-				+ cmpCode + ", kiName=" + kiName + ", brName=" + brName + ", status=" + status + "]";
-	}
-}

src/main/java/com/uas/search/model/PurchaseInvoiceSimpleInfo.java

@@ -1,140 +0,0 @@
-package com.uas.search.model;
-
-import java.io.Serializable;
-import java.util.Date;
-import java.util.Set;
-
-import javax.persistence.CascadeType;
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.FetchType;
-import javax.persistence.Id;
-import javax.persistence.JoinColumn;
-import javax.persistence.OneToMany;
-import javax.persistence.OrderBy;
-import javax.persistence.Table;
-
-/**
- * 商城采购订单的发货单
- * 
- * @author sunyj
- * @since 2016年10月14日 上午10:32:37
- */
-@Entity
-@Table(name = "trade$invoice_fmpu")
-public class PurchaseInvoiceSimpleInfo implements Serializable {
-
-	private static final long serialVersionUID = 1L;
-
-	@Id
-	@Column(name = "id")
-	private Long id;
-
-	/**
-	 * 发货单号，因易与id命名混淆，其他类、lucenne建索引时该字段难以区分，特以此命名
-	 */
-	@Column(name = "in_id", unique = true)
-	private String code;
-
-	/**
-	 * 卖方企业uu
-	 * 
-	 * @Tip 这里因为平台作为中间商，所以发货单都由平台下达
-	 */
-	@Column(name = "in_sellerenuu")
-	private Long sellerenuu;
-
-	/**
-	 * 卖方企业名称
-	 */
-	@Column(name = "in_sellername")
-	private String sellerenname;
-
-	/**
-	 * 单生成时间
-	 */
-	@Column(name = "in_creattime")
-	private Date createtime;
-
-	/**
-	 * 单据状态(1->2->3)
-	 * 
-	 * @Tip 必须严格按照顺序流转 1、TOBESHIPPED(406, "待出货"), 2、INBOUND(404, "待收货")
-	 *      3、RECEIVED(405, "已收货"), 4、TORECEIVEMONEY(506, "待收款"),
-	 *      5、MONEYRECEIVED(505, "已收款"),
-	 */
-	@Column(name = "in_status")
-	private Integer status;
-
-	/**
-	 * 发货单明细
-	 */
-	@OneToMany(cascade = { CascadeType.ALL }, fetch = FetchType.EAGER)
-	@JoinColumn(name = "invoice_id", updatable = false, insertable = false)
-	@OrderBy("detno")
-	private Set<PurchaseInvoiceDetailSimpleInfo> details;
-
-	public Long getId() {
-		return id;
-	}
-
-	public void setId(Long id) {
-		this.id = id;
-	}
-
-	public String getCode() {
-		return code;
-	}
-
-	public void setCode(String code) {
-		this.code = code;
-	}
-
-	public Long getSellerenuu() {
-		return sellerenuu;
-	}
-
-	public void setSellerenuu(Long sellerenuu) {
-		this.sellerenuu = sellerenuu;
-	}
-
-	public String getSellerenname() {
-		return sellerenname;
-	}
-
-	public void setSellerenname(String sellerenname) {
-		this.sellerenname = sellerenname;
-	}
-
-	public Date getCreatetime() {
-		return createtime;
-	}
-
-	public void setCreatetime(Date createtime) {
-		this.createtime = createtime;
-	}
-
-	public Integer getStatus() {
-		return status;
-	}
-
-	public void setStatus(Integer status) {
-		this.status = status;
-	}
-
-	public Set<PurchaseInvoiceDetailSimpleInfo> getDetails() {
-		return details;
-	}
-
-	public void setDetails(Set<PurchaseInvoiceDetailSimpleInfo> details) {
-		this.details = details;
-	}
-
-	@Override
-	public String toString() {
-		return "PurchaseInvoiceSimpleInfo [id=" + id + ", code=" + code + ", sellerenuu=" + sellerenuu
-				+ ", sellerenname=" + sellerenname + ", createtime=" + createtime + ", status=" + status + ", details="
-				+ details + "]";
-	}
-
-}

src/main/java/com/uas/search/model/PurchaseSimpleInfo.java

@@ -1,138 +0,0 @@
-package com.uas.search.model;
-
-import java.io.Serializable;
-import java.util.Date;
-import java.util.Set;
-
-import javax.persistence.CascadeType;
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.FetchType;
-import javax.persistence.Id;
-import javax.persistence.JoinColumn;
-import javax.persistence.OneToMany;
-import javax.persistence.OrderBy;
-import javax.persistence.Table;
-
-/**
- * 商城采购订单
- * 
- * @author sunyj
- * @since 2016年10月14日 上午10:24:00
- */
-@Entity(name = "trade.Purchase")
-@Table(name = "trade$purchase")
-public class PurchaseSimpleInfo implements Serializable {
-
-	private static final long serialVersionUID = 1L;
-
-	@Id
-	@Column(name = "id")
-	private Long id;
-
-	/**
-	 * 采购单号，因易与id命名混淆，其他类、lucenne建索引时该字段难以区分，特以此命名
-	 */
-	@Column(name = "pu_id", unique = true)
-	private String code;
-
-	/**
-	 * 企业卖方uu
-	 * 
-	 * @Tip 这里因为平台作为中间商，所以采购单都由平台下达
-	 */
-	@Column(name = "pu_sellerenuu")
-	private Long sellerenuu;
-
-	/**
-	 * 卖方企业名称
-	 */
-	@Column(name = "pu_sellername")
-	private String sellerenname;
-
-	/**
-	 * 单生成时间
-	 */
-	@Column(name = "pu_createtime")
-	private Date createtime;
-
-	/**
-	 * 订单状态(1->2->3)
-	 * 
-	 * @Tip 必须严格按照顺序流转 1、TOBESHIPPED(406, "待出货"), 2、INBOUND(404, "待收货"),
-	 *      3、RECEIVED(405, "已收货"), 4、TOBEPAID(503, "待付款"), 5、PAID(504, "已付款"),
-	 */
-	@Column(name = "pu_status")
-	private Integer status;
-
-	/**
-	 * 采购单明细
-	 */
-	@OneToMany(cascade = { CascadeType.ALL }, fetch = FetchType.EAGER)
-	@JoinColumn(name = "purchase_id", updatable = false, insertable = false)
-	@OrderBy("detno")
-	private Set<PurchaseDetailSimpleInfo> details;
-
-	public Long getId() {
-		return id;
-	}
-
-	public void setId(Long id) {
-		this.id = id;
-	}
-
-	public String getCode() {
-		return code;
-	}
-
-	public void setCode(String code) {
-		this.code = code;
-	}
-
-	public Long getSellerenuu() {
-		return sellerenuu;
-	}
-
-	public void setSellerenuu(Long sellerenuu) {
-		this.sellerenuu = sellerenuu;
-	}
-
-	public String getSellerenname() {
-		return sellerenname;
-	}
-
-	public void setSellerenname(String sellerenname) {
-		this.sellerenname = sellerenname;
-	}
-
-	public Date getCreatetime() {
-		return createtime;
-	}
-
-	public void setCreatetime(Date createtime) {
-		this.createtime = createtime;
-	}
-
-	public Integer getStatus() {
-		return status;
-	}
-
-	public void setStatus(Integer status) {
-		this.status = status;
-	}
-
-	public Set<PurchaseDetailSimpleInfo> getDetails() {
-		return details;
-	}
-
-	public void setDetails(Set<PurchaseDetailSimpleInfo> details) {
-		this.details = details;
-	}
-
-	@Override
-	public String toString() {
-		return "PurchaseSimpleInfo [id=" + id + ", code=" + code + ", sellerenuu=" + sellerenuu + ", sellerenname="
-				+ sellerenname + ", createtime=" + createtime + ", status=" + status + ", details=" + details + "]";
-	}
-
-}

src/main/java/com/uas/search/model/StoreSimpleInfo.java

@@ -1,70 +0,0 @@
-package com.uas.search.model;
-
-import java.io.Serializable;
-
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.Id;
-import javax.persistence.Table;
-
-/**
- * 店铺
- * 
- * @author sunyj
- * @since 2017年7月8日 下午6:14:26
- */
-@Entity
-@Table(name = "store$info")
-public class StoreSimpleInfo implements Serializable {
-
-	private static final long serialVersionUID = 1L;
-
-	/**
-	 * id
-	 */
-	@Id
-	@Column(name = "id")
-	private Long id;
-
-	/**
-	 * uuid
-	 */
-	@Column(name = "ST_UUID")
-	private String uuid;
-
-	/**
-	 * 类型
-	 */
-	@Column(name = "ST_TYPE")
-	private String type;
-
-	public Long getId() {
-		return id;
-	}
-
-	public void setId(Long id) {
-		this.id = id;
-	}
-
-	public String getUuid() {
-		return uuid;
-	}
-
-	public void setUuid(String uuid) {
-		this.uuid = uuid;
-	}
-
-	public String getType() {
-		return type;
-	}
-
-	public void setType(String type) {
-		this.type = type;
-	}
-
-	@Override
-	public String toString() {
-		return "StoreSimpleInfo [id=" + id + ", uuid=" + uuid + ", type=" + type + "]";
-	}
-
-}

src/main/java/com/uas/search/model/TradeGoodsSimpleInfo.java

@@ -1,127 +0,0 @@
-package com.uas.search.model;
-
-import java.io.Serializable;
-
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.Id;
-import javax.persistence.Table;
-
-/**
- * 批次简要信息，只用于索引的创建与查询
- * 
- * @author sunyj
- * @since 2017年7月22日 下午8:06:10
- */
-@Entity
-@Table(name = "trade$goods")
-public class TradeGoodsSimpleInfo implements Serializable {
-
-	private static final long serialVersionUID = 1L;
-
-	/**
-	 * id
-	 */
-	@Id
-	@Column(name = "go_id")
-	private Long id;
-
-	/**
-	 * 批次的库存
-	 */
-	@Column(name = "go_reserve")
-	private Double reserve;
-
-	/**
-	 * 批次的人民币价格
-	 */
-	@Column(name = "go_minpricermb")
-	private Double minPriceRMB;
-
-	/**
-	 * 批次的美元价格
-	 */
-	@Column(name = "go_minpriceusd")
-	private Double minPriceUSD;
-
-	/**
-	 * 货币
-	 */
-	@Column(name = "cr_name")
-	private String crName;
-
-	/**
-	 * 货源uuid
-	 */
-	@Column(name = "go_storeid")
-	private String storeId;
-
-	/**
-	 * 器件的uuid
-	 */
-	@Column(name = "cmp_uuid")
-	private String cmpUuid;
-
-	public Long getId() {
-		return id;
-	}
-
-	public void setId(Long id) {
-		this.id = id;
-	}
-
-	public Double getReserve() {
-		return reserve;
-	}
-
-	public void setReserve(Double reserve) {
-		this.reserve = reserve;
-	}
-
-	public Double getMinPriceRMB() {
-		return minPriceRMB;
-	}
-
-	public void setMinPriceRMB(Double minPriceRMB) {
-		this.minPriceRMB = minPriceRMB;
-	}
-
-	public Double getMinPriceUSD() {
-		return minPriceUSD;
-	}
-
-	public void setMinPriceUSD(Double minPriceUSD) {
-		this.minPriceUSD = minPriceUSD;
-	}
-
-	public String getCrName() {
-		return crName;
-	}
-
-	public void setCrName(String crName) {
-		this.crName = crName;
-	}
-
-	public String getStoreId() {
-		return storeId;
-	}
-
-	public void setStoreId(String storeId) {
-		this.storeId = storeId;
-	}
-
-	public String getCmpUuid() {
-		return cmpUuid;
-	}
-
-	public void setCmpUuid(String cmpUuid) {
-		this.cmpUuid = cmpUuid;
-	}
-
-	@Override
-	public String toString() {
-		return "TradeGoods [id=" + id + ", reserve=" + reserve + ", minPriceRMB=" + minPriceRMB + ", minPriceUSD="
-				+ minPriceUSD + ", crName=" + crName + ", storeId=" + storeId + ", cmpUuid=" + cmpUuid + "]";
-	}
-
-}

src/main/java/com/uas/search/service/OrderSearchService.java

@@ -4,10 +4,10 @@ import com.uas.search.constant.model.BaseOrder;
 import com.uas.search.constant.model.PageParams;
 import com.uas.search.constant.model.SPage;
 import com.uas.search.exception.SearchException;
-import com.uas.search.model.OrderInvoiceSimpleInfo;
-import com.uas.search.model.OrderSimpleInfo;
-import com.uas.search.model.PurchaseInvoiceSimpleInfo;
-import com.uas.search.model.PurchaseSimpleInfo;
+import com.uas.search.model.OrderInvoice;
+import com.uas.search.model.Order;
+import com.uas.search.model.PurchaseInvoice;
+import com.uas.search.model.Purchase;
 
 /**
  * 商城订单搜索服务
@@ -180,7 +180,7 @@ public interface OrderSearchService {
 	 * @param id
 	 * @return
 	 */
-	public OrderSimpleInfo getOrder(Long id);
+	public Order getOrder(Long id);
 
 	/**
 	 * 根据id获取索引中的销售发货单数据
@@ -188,7 +188,7 @@ public interface OrderSearchService {
 	 * @param id
 	 * @return
 	 */
-	public OrderInvoiceSimpleInfo getOrderInvoice(Long id);
+	public OrderInvoice getOrderInvoice(Long id);
 
 	/**
 	 * 根据id获取索引中的采购单数据
@@ -196,7 +196,7 @@ public interface OrderSearchService {
 	 * @param id
 	 * @return
 	 */
-	public PurchaseSimpleInfo getPurchase(Long id);
+	public Purchase getPurchase(Long id);
 
 	/**
 	 * 根据id获取索引中的采购发货单数据
@@ -204,5 +204,5 @@ public interface OrderSearchService {
 	 * @param id
 	 * @return
 	 */
-	public PurchaseInvoiceSimpleInfo getPurchaseInvoice(Long id);
+	public PurchaseInvoice getPurchaseInvoice(Long id);
 }

src/main/java/com/uas/search/service/SearchService.java

@@ -9,10 +9,10 @@ import com.uas.search.constant.model.PageParams;
 import com.uas.search.constant.model.SPage;
 import com.uas.search.constant.model.PageParams.FilterField;
 import com.uas.search.exception.SearchException;
-import com.uas.search.model.BrandSimpleInfo;
-import com.uas.search.model.ComponentSimpleInfo;
-import com.uas.search.model.GoodsSimpleInfo;
-import com.uas.search.model.KindSimpleInfo;
+import com.uas.search.model.Brand;
+import com.uas.search.model.Component;
+import com.uas.search.model.Goods;
+import com.uas.search.model.Kind;
 
 /**
  * 搜索服务的接口
@@ -374,7 +374,7 @@ public interface SearchService {
 	 * @param id
 	 * @return
 	 */
-	public KindSimpleInfo getKind(Long id);
+	public Kind getKind(Long id);
 
 	/**
 	 * 根据id获取品牌
@@ -382,7 +382,7 @@ public interface SearchService {
 	 * @param id
 	 * @return
 	 */
-	public BrandSimpleInfo getBrand(Long id);
+	public Brand getBrand(Long id);
 
 	/**
 	 * 根据id获取器件
@@ -390,7 +390,7 @@ public interface SearchService {
 	 * @param id
 	 * @return
 	 */
-	public ComponentSimpleInfo getComponent(Long id);
+	public Component getComponent(Long id);
 
 	/**
 	 * 根据id获取批次
@@ -398,7 +398,7 @@ public interface SearchService {
 	 * @param id
 	 * @return
 	 */
-	public GoodsSimpleInfo getGoods(String id);
+	public Goods getGoods(String id);
 
 	/**
 	 * 分页获取本地指定表的索引中的数据

src/main/java/com/uas/search/service/impl/IndexServiceImpl.java

@@ -29,28 +29,28 @@ import com.uas.search.constant.SearchConstants;
 import com.uas.search.constant.model.PageInfo;
 import com.uas.search.constant.model.PageParams;
 import com.uas.search.constant.model.SPage;
-import com.uas.search.dao.BrandSimpleInfoDao;
-import com.uas.search.dao.ComponentSimpleInfoDao;
-import com.uas.search.dao.GoodsSimpleInfoDao;
-import com.uas.search.dao.KindSimpleInfoDao;
+import com.uas.search.dao.BrandDao;
+import com.uas.search.dao.ComponentDao;
+import com.uas.search.dao.GoodsDao;
+import com.uas.search.dao.KindDao;
 import com.uas.search.dao.LuceneQueueMessageDao;
-import com.uas.search.dao.OrderInvoiceSimpleInfoDao;
-import com.uas.search.dao.OrderSimpleInfoDao;
-import com.uas.search.dao.PurchaseInvoiceSimpleInfoDao;
-import com.uas.search.dao.PurchaseSimpleInfoDao;
+import com.uas.search.dao.OrderInvoiceDao;
+import com.uas.search.dao.OrderDao;
+import com.uas.search.dao.PurchaseInvoiceDao;
+import com.uas.search.dao.PurchaseDao;
 import com.uas.search.exception.SearchException;
 import com.uas.search.jms.AQListener;
 import com.uas.search.jms.QueueMessageParser;
-import com.uas.search.model.BrandSimpleInfo;
-import com.uas.search.model.ComponentSimpleInfo;
-import com.uas.search.model.GoodsSimpleInfo;
-import com.uas.search.model.KindSimpleInfo;
+import com.uas.search.model.Brand;
+import com.uas.search.model.Component;
+import com.uas.search.model.Goods;
+import com.uas.search.model.Kind;
 import com.uas.search.model.LuceneQueueMessage;
-import com.uas.search.model.OrderInvoiceSimpleInfo;
-import com.uas.search.model.OrderSimpleInfo;
+import com.uas.search.model.OrderInvoice;
+import com.uas.search.model.Order;
 import com.uas.search.model.ParsedQueueMessage;
-import com.uas.search.model.PurchaseInvoiceSimpleInfo;
-import com.uas.search.model.PurchaseSimpleInfo;
+import com.uas.search.model.PurchaseInvoice;
+import com.uas.search.model.Purchase;
 import com.uas.search.service.IndexService;
 import com.uas.search.support.IndexSearcherManager;
 import com.uas.search.support.IndexWriterManager;
@@ -73,28 +73,28 @@ public class IndexServiceImpl implements IndexService {
 	private LuceneQueueMessageDao luceneQueueMessageDao;
 
 	@Autowired
-	private KindSimpleInfoDao kindDao;
+	private KindDao kindDao;
 
 	@Autowired
-	private BrandSimpleInfoDao brandDao;
+	private BrandDao brandDao;
 
 	@Autowired
-	private ComponentSimpleInfoDao componentDao;
+	private ComponentDao componentDao;
 
 	@Autowired
-	private GoodsSimpleInfoDao goodsDao;
+	private GoodsDao goodsDao;
 
 	@Autowired
-	private OrderSimpleInfoDao orderDao;
+	private OrderDao orderDao;
 
 	@Autowired
-	private OrderInvoiceSimpleInfoDao orderInvoiceDao;
+	private OrderInvoiceDao orderInvoiceDao;
 
 	@Autowired
-	private PurchaseSimpleInfoDao purchaseDao;
+	private PurchaseDao purchaseDao;
 
 	@Autowired
-	private PurchaseInvoiceSimpleInfoDao purchaseInvoiceDao;
+	private PurchaseInvoiceDao purchaseInvoiceDao;
 
 	private IndexWriter indexWriter;
 
@@ -210,7 +210,7 @@ public class IndexServiceImpl implements IndexService {
 	 */
 	private Long createKindIndexes() throws IOException {
 		logger.info("正在创建类目索引...");
-		List<KindSimpleInfo> kinds = kindDao.findAll();
+		List<Kind> kinds = kindDao.findAll();
 		logger.info("发现数据：" + kinds.size() + "条");
 		return createIndexesWithObjects(kinds.toArray());
 	}
@@ -223,7 +223,7 @@ public class IndexServiceImpl implements IndexService {
 	 */
 	private Long createBrandIndexes() throws IOException {
 		logger.info("正在创建品牌索引...");
-		List<BrandSimpleInfo> brands = brandDao.findAll();
+		List<Brand> brands = brandDao.findAll();
 		logger.info("发现数据：" + brands.size() + "条");
 		return createIndexesWithObjects(brands.toArray());
 	}
@@ -246,7 +246,7 @@ public class IndexServiceImpl implements IndexService {
 				BufferedReader bufferedReader = new BufferedReader(new FileReader(file));
 				String line = null;
 				while (!StringUtils.isEmpty(line = bufferedReader.readLine())) {
-					ComponentSimpleInfo component = JSONObject.parseObject(line, ComponentSimpleInfo.class);
+					Component component = JSONObject.parseObject(line, Component.class);
 					Document document = ObjectToDocumentUtils.toDocument(component);
 					if (document != null) {
 						size++;
@@ -285,14 +285,14 @@ public class IndexServiceImpl implements IndexService {
 		params.setPage(page);
 
 		PageInfo info = new PageInfo(params);
-		Page<ComponentSimpleInfo> pageResult = componentDao.findAll(info);
+		Page<Component> pageResult = componentDao.findAll(info);
 		long totalElements = pageResult.getTotalElements();
 		logger.info("Number of components: " + totalElements);
 		// 用于记录上次提交索引时的创建进度
 		double recordProgress = 0;
 		while (totalElements > size) {
-			List<ComponentSimpleInfo> components = pageResult.getContent();
-			for (ComponentSimpleInfo component : components) {
+			List<Component> components = pageResult.getContent();
+			for (Component component : components) {
 				Document document = ObjectToDocumentUtils.toDocument(component);
 				if (document != null) {
 					indexWriter.addDocument(document);
@@ -335,7 +335,7 @@ public class IndexServiceImpl implements IndexService {
 				BufferedReader bufferedReader = new BufferedReader(new FileReader(file));
 				String line = null;
 				while (!StringUtils.isEmpty(line = bufferedReader.readLine())) {
-					GoodsSimpleInfo goods = JSONObject.parseObject(line, GoodsSimpleInfo.class);
+					Goods goods = JSONObject.parseObject(line, Goods.class);
 					Document document = ObjectToDocumentUtils.toDocument(goods);
 					if (document != null) {
 						size++;
@@ -361,28 +361,28 @@ public class IndexServiceImpl implements IndexService {
 
 	private Long createOrderIndexes() {
 		logger.info("正在创建销售单索引...");
-		List<OrderSimpleInfo> orders = orderDao.findAll();
+		List<Order> orders = orderDao.findAll();
 		logger.info("发现数据：" + orders.size() + "条");
 		return createIndexesWithObjects(orders.toArray());
 	}
 
 	private Long createOrderInvoiceIndexes() {
 		logger.info("正在创建销售发货单索引...");
-		List<OrderInvoiceSimpleInfo> orderInvoices = orderInvoiceDao.findAll();
+		List<OrderInvoice> orderInvoices = orderInvoiceDao.findAll();
 		logger.info("发现数据：" + orderInvoices.size() + "条");
 		return createIndexesWithObjects(orderInvoices.toArray());
 	}
 
 	private Long createPurchaseIndexes() {
 		logger.info("正在创建采购单索引...");
-		List<PurchaseSimpleInfo> purchases = purchaseDao.findAll();
+		List<Purchase> purchases = purchaseDao.findAll();
 		logger.info("发现数据：" + purchases.size() + "条");
 		return createIndexesWithObjects(purchases.toArray());
 	}
 
 	private Long createPurchaseInvoiceIndexes() {
 		logger.info("正在创建采购发货单索引...");
-		List<PurchaseInvoiceSimpleInfo> purchaseInvoices = purchaseInvoiceDao.findAll();
+		List<PurchaseInvoice> purchaseInvoices = purchaseInvoiceDao.findAll();
 		logger.info("发现数据：" + purchaseInvoices.size() + "条");
 		return createIndexesWithObjects(purchaseInvoices.toArray());
 	}
@@ -391,9 +391,9 @@ public class IndexServiceImpl implements IndexService {
 	 * 利用对象数组创建索引
 	 * 
 	 * @param objects
-	 *            对象数组，可为KindSimpleInfo、BrandSimpleInfo、OrderSimpleInfo、
-	 *            OrderInvoiceSimpleInfo、PurchaseSimpleInfo、
-	 *            PurchaseInvoiceSimpleInfo
+	 *            对象数组，可为Kind、Brand、Order、
+	 *            OrderInvoice、Purchase、
+	 *            PurchaseInvoice
 	 * @return 对象数组的数量
 	 */
 	private Long createIndexesWithObjects(Object[] objects) {
@@ -435,7 +435,7 @@ public class IndexServiceImpl implements IndexService {
 		pageParams.setPage((fileIndex - 1) * SINGLE_FILE_MAX_SIZE / PAGE_SIZE + 1);
 		pageParams.setSize(PAGE_SIZE);
 		PageInfo pageInfo = new PageInfo(pageParams);
-		Page<ComponentSimpleInfo> pageResult = componentDao.findAll(pageInfo);
+		Page<Component> pageResult = componentDao.findAll(pageInfo);
 
 		// 数据库中数据的总数目
 		if (pageResult.getTotalElements() < (fileIndex - 1) * SINGLE_FILE_MAX_SIZE) {
@@ -464,8 +464,8 @@ public class IndexServiceImpl implements IndexService {
 					fileIndex++;
 					printWriter = new PrintWriter(componentDataPath + "/" + fileIndex + ".txt");
 				}
-				List<ComponentSimpleInfo> content = pageResult.getContent();
-				for (ComponentSimpleInfo element : content) {
+				List<Component> content = pageResult.getContent();
+				for (Component element : content) {
 					printWriter.println(JSONObject.toJSONString(element));
 					count++;
 				}
@@ -518,28 +518,28 @@ public class IndexServiceImpl implements IndexService {
 			if (document != null) {
 				try {
 					indexWriter = indexWriterManager.get(tableName);
-					if (obj instanceof KindSimpleInfo) {
+					if (obj instanceof Kind) {
 						indexWriter.updateDocument(
-								new Term(SearchConstants.KIND_ID_FIELD, String.valueOf(((KindSimpleInfo) obj).getId())),
+								new Term(SearchConstants.KIND_ID_FIELD, String.valueOf(((Kind) obj).getId())),
 								document);
-					} else if (obj instanceof BrandSimpleInfo) {
+					} else if (obj instanceof Brand) {
 						indexWriter.updateDocument(new Term(SearchConstants.BRAND_ID_FIELD,
-								String.valueOf(((BrandSimpleInfo) obj).getId())), document);
-					} else if (obj instanceof ComponentSimpleInfo) {
+								String.valueOf(((Brand) obj).getId())), document);
+					} else if (obj instanceof Component) {
 						indexWriter.updateDocument(new Term(SearchConstants.COMPONENT_ID_FIELD,
-								String.valueOf(((ComponentSimpleInfo) obj).getId())), document);
-					} else if (obj instanceof OrderSimpleInfo) {
+								String.valueOf(((Component) obj).getId())), document);
+					} else if (obj instanceof Order) {
 						indexWriter.updateDocument(new Term(SearchConstants.ORDER_ID_FIELD,
-								String.valueOf(((OrderSimpleInfo) obj).getId())), document);
-					} else if (obj instanceof OrderInvoiceSimpleInfo) {
+								String.valueOf(((Order) obj).getId())), document);
+					} else if (obj instanceof OrderInvoice) {
 						indexWriter.updateDocument(new Term(SearchConstants.ORDER_INVOICE_ID_FIELD,
-								String.valueOf(((OrderInvoiceSimpleInfo) obj).getId())), document);
-					} else if (obj instanceof PurchaseSimpleInfo) {
+								String.valueOf(((OrderInvoice) obj).getId())), document);
+					} else if (obj instanceof Purchase) {
 						indexWriter.updateDocument(new Term(SearchConstants.PURCHASE_ID_FIELD,
-								String.valueOf(((PurchaseSimpleInfo) obj).getId())), document);
-					} else if (obj instanceof PurchaseInvoiceSimpleInfo) {
+								String.valueOf(((Purchase) obj).getId())), document);
+					} else if (obj instanceof PurchaseInvoice) {
 						indexWriter.updateDocument(new Term(SearchConstants.PURCHASE_INVOICE_ID_FIELD,
-								String.valueOf(((PurchaseInvoiceSimpleInfo) obj).getId())), document);
+								String.valueOf(((PurchaseInvoice) obj).getId())), document);
 					} else {
 						throw new SearchException("Message parsing failed!");
 					}
@@ -563,29 +563,29 @@ public class IndexServiceImpl implements IndexService {
 			String tableName = SearchUtils.getTableName(obj.getClass());
 			try {
 				indexWriter = indexWriterManager.get(tableName);
-				if (obj instanceof KindSimpleInfo) {
+				if (obj instanceof Kind) {
 					indexWriter.deleteDocuments(
-							new Term(SearchConstants.KIND_ID_FIELD, String.valueOf(((KindSimpleInfo) obj).getId())));
-				} else if (obj instanceof BrandSimpleInfo) {
+							new Term(SearchConstants.KIND_ID_FIELD, String.valueOf(((Kind) obj).getId())));
+				} else if (obj instanceof Brand) {
 					indexWriter.deleteDocuments(
-							new Term(SearchConstants.BRAND_ID_FIELD, String.valueOf(((BrandSimpleInfo) obj).getId())));
-				} else if (obj instanceof ComponentSimpleInfo) {
+							new Term(SearchConstants.BRAND_ID_FIELD, String.valueOf(((Brand) obj).getId())));
+				} else if (obj instanceof Component) {
 					indexWriter.deleteDocuments(new Term(SearchConstants.COMPONENT_ID_FIELD,
-							String.valueOf(((ComponentSimpleInfo) obj).getId())));
-				} else if (obj instanceof GoodsSimpleInfo) {
-					indexWriter.deleteDocuments(toTerm((GoodsSimpleInfo) obj));
-				} else if (obj instanceof OrderSimpleInfo) {
+							String.valueOf(((Component) obj).getId())));
+				} else if (obj instanceof Goods) {
+					indexWriter.deleteDocuments(toTerm((Goods) obj));
+				} else if (obj instanceof Order) {
 					indexWriter.deleteDocuments(
-							new Term(SearchConstants.ORDER_ID_FIELD, String.valueOf(((OrderSimpleInfo) obj).getId())));
-				} else if (obj instanceof OrderInvoiceSimpleInfo) {
+							new Term(SearchConstants.ORDER_ID_FIELD, String.valueOf(((Order) obj).getId())));
+				} else if (obj instanceof OrderInvoice) {
 					indexWriter.deleteDocuments(new Term(SearchConstants.ORDER_INVOICE_ID_FIELD,
-							String.valueOf(((OrderInvoiceSimpleInfo) obj).getId())));
-				} else if (obj instanceof PurchaseSimpleInfo) {
+							String.valueOf(((OrderInvoice) obj).getId())));
+				} else if (obj instanceof Purchase) {
 					indexWriter.deleteDocuments(new Term(SearchConstants.PURCHASE_ID_FIELD,
-							String.valueOf(((PurchaseSimpleInfo) obj).getId())));
-				} else if (obj instanceof PurchaseInvoiceSimpleInfo) {
+							String.valueOf(((Purchase) obj).getId())));
+				} else if (obj instanceof PurchaseInvoice) {
 					indexWriter.deleteDocuments(new Term(SearchConstants.PURCHASE_INVOICE_ID_FIELD,
-							String.valueOf(((PurchaseInvoiceSimpleInfo) obj).getId())));
+							String.valueOf(((PurchaseInvoice) obj).getId())));
 				} else {
 					throw new SearchException("Message parsing failed!");
 				}
@@ -608,7 +608,7 @@ public class IndexServiceImpl implements IndexService {
 	 * @param goods
 	 * @return
 	 */
-	private Term toTerm(GoodsSimpleInfo goods) {
+	private Term toTerm(Goods goods) {
 		if (goods.getGoId() != null) {
 			return new Term(SearchConstants.GOODS_GO_ID_FIELD, String.valueOf(goods.getGoId()));
 		} else if (goods.getCmpId() != null) {
@@ -632,10 +632,10 @@ public class IndexServiceImpl implements IndexService {
 			// 新增、更新索引
 			if (parsedQueueMessage.isInsert() || parsedQueueMessage.isUpdate()) {
 				for (Object object : objects) {
-					if (object instanceof GoodsSimpleInfo) {
-						List<GoodsSimpleInfo> goodsesList = goodsDao.find((GoodsSimpleInfo) object);
+					if (object instanceof Goods) {
+						List<Goods> goodsesList = goodsDao.find((Goods) object);
 						delete(object);
-						for (GoodsSimpleInfo goods : goodsesList) {
+						for (Goods goods : goodsesList) {
 							Object maintainedObject = save(goods);
 							if (maintainedObject != null) {
 								maintainedObjects.add(maintainedObject);

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

@@ -29,10 +29,10 @@ import com.uas.search.constant.model.PageParams;
 import com.uas.search.constant.model.PageParams.FilterField;
 import com.uas.search.constant.model.SPage;
 import com.uas.search.exception.SearchException;
-import com.uas.search.model.OrderInvoiceSimpleInfo;
-import com.uas.search.model.OrderSimpleInfo;
-import com.uas.search.model.PurchaseInvoiceSimpleInfo;
-import com.uas.search.model.PurchaseSimpleInfo;
+import com.uas.search.model.OrderInvoice;
+import com.uas.search.model.Order;
+import com.uas.search.model.PurchaseInvoice;
+import com.uas.search.model.Purchase;
 import com.uas.search.service.OrderSearchService;
 import com.uas.search.util.DocumentToObjectUtils;
 import com.uas.search.util.OrderSearchUtils;
@@ -385,25 +385,25 @@ public class OrderSearchServiceImpl implements OrderSearchService {
 	}
 
 	@Override
-	public OrderSimpleInfo getOrder(Long id) {
+	public Order getOrder(Long id) {
 		return DocumentToObjectUtils.toOrder(
 				SearchUtils.getDocumentById(SearchConstants.ORDER_TABLE_NAME, SearchConstants.ORDER_ID_FIELD, id));
 	}
 
 	@Override
-	public OrderInvoiceSimpleInfo getOrderInvoice(Long id) {
+	public OrderInvoice getOrderInvoice(Long id) {
 		return DocumentToObjectUtils.toOrderInvoice(SearchUtils
 				.getDocumentById(SearchConstants.ORDER_INVOICE_TABLE_NAME, SearchConstants.ORDER_INVOICE_ID_FIELD, id));
 	}
 
 	@Override
-	public PurchaseSimpleInfo getPurchase(Long id) {
+	public Purchase getPurchase(Long id) {
 		return DocumentToObjectUtils.toPurchase(SearchUtils.getDocumentById(SearchConstants.PURCHASE_TABLE_NAME,
 				SearchConstants.PURCHASE_ID_FIELD, id));
 	}
 
 	@Override
-	public PurchaseInvoiceSimpleInfo getPurchaseInvoice(Long id) {
+	public PurchaseInvoice getPurchaseInvoice(Long id) {
 		return DocumentToObjectUtils.toPurchaseInvoice(SearchUtils.getDocumentById(
 				SearchConstants.PURCHASE_INVOICE_TABLE_NAME, SearchConstants.PURCHASE_INVOICE_ID_FIELD, id));
 	}

src/main/java/com/uas/search/service/impl/SearchServiceImpl.java

@@ -41,10 +41,10 @@ import com.uas.search.constant.model.SPage;
 import com.uas.search.exception.SearchException;
 import com.uas.search.grouping.DistinctGroupCollector;
 import com.uas.search.grouping.GoodsGroupCollector;
-import com.uas.search.model.BrandSimpleInfo;
-import com.uas.search.model.ComponentSimpleInfo;
-import com.uas.search.model.GoodsSimpleInfo;
-import com.uas.search.model.KindSimpleInfo;
+import com.uas.search.model.Brand;
+import com.uas.search.model.Component;
+import com.uas.search.model.Goods;
+import com.uas.search.model.Kind;
 import com.uas.search.service.SearchService;
 import com.uas.search.sort.SimilarValuesFieldComparatorSource;
 import com.uas.search.util.DocumentToObjectUtils;
@@ -1169,25 +1169,25 @@ public class SearchServiceImpl implements SearchService {
 	}
 
 	@Override
-	public KindSimpleInfo getKind(Long id) {
+	public Kind getKind(Long id) {
 		return DocumentToObjectUtils.toKind(
 				SearchUtils.getDocumentById(SearchConstants.KIND_TABLE_NAME, SearchConstants.KIND_ID_FIELD, id));
 	}
 
 	@Override
-	public BrandSimpleInfo getBrand(Long id) {
+	public Brand getBrand(Long id) {
 		return DocumentToObjectUtils.toBrand(
 				SearchUtils.getDocumentById(SearchConstants.BRAND_TABLE_NAME, SearchConstants.BRAND_ID_FIELD, id));
 	}
 
 	@Override
-	public ComponentSimpleInfo getComponent(Long id) {
+	public Component getComponent(Long id) {
 		return DocumentToObjectUtils.toComponent(SearchUtils.getDocumentById(SearchConstants.COMPONENT_TABLE_NAME,
 				SearchConstants.COMPONENT_ID_FIELD, id));
 	}
 
 	@Override
-	public GoodsSimpleInfo getGoods(String id) {
+	public Goods getGoods(String id) {
 		return DocumentToObjectUtils.toGoods(
 				SearchUtils.getDocumentById(SearchConstants.GOODS_TABLE_NAME, SearchConstants.GOODS_ID_FIELD, id));
 	}

src/main/java/com/uas/search/util/DocumentToObjectUtils.java

@@ -12,21 +12,20 @@ import com.alibaba.fastjson.JSONObject;
 import com.uas.search.constant.SearchConstants;
 import com.uas.search.constant.model.BaseOrderDetail;
 import com.uas.search.exception.SearchException;
-import com.uas.search.model.BaseOrderDetailSimpleInfo;
-import com.uas.search.model.BrandSimpleInfo;
-import com.uas.search.model.ComponentSimpleInfo;
-import com.uas.search.model.EnterpriseSimpleInfo;
-import com.uas.search.model.GoodsSimpleInfo;
-import com.uas.search.model.KindSimpleInfo;
-import com.uas.search.model.OrderDetailSimpleInfo;
-import com.uas.search.model.OrderInvoiceDetailSimpleInfo;
-import com.uas.search.model.OrderInvoiceSimpleInfo;
-import com.uas.search.model.OrderSimpleInfo;
-import com.uas.search.model.PurchaseDetailSimpleInfo;
-import com.uas.search.model.PurchaseInvoiceDetailSimpleInfo;
-import com.uas.search.model.PurchaseInvoiceSimpleInfo;
-import com.uas.search.model.PurchaseSimpleInfo;
-import com.uas.search.model.StoreSimpleInfo;
+import com.uas.search.model.Brand;
+import com.uas.search.model.Component;
+import com.uas.search.model.Enterprise;
+import com.uas.search.model.Goods;
+import com.uas.search.model.Kind;
+import com.uas.search.model.OrderDetail;
+import com.uas.search.model.OrderInvoiceDetail;
+import com.uas.search.model.OrderInvoice;
+import com.uas.search.model.Order;
+import com.uas.search.model.PurchaseDetail;
+import com.uas.search.model.PurchaseInvoiceDetail;
+import com.uas.search.model.PurchaseInvoice;
+import com.uas.search.model.Purchase;
+import com.uas.search.model.Store;
 
 /**
  * 将Document转换为对象的工具类
@@ -69,11 +68,11 @@ public class DocumentToObjectUtils {
 	 * @param document
 	 * @return
 	 */
-	public static KindSimpleInfo toKind(Document document) {
+	public static Kind toKind(Document document) {
 		if (document == null) {
 			return null;
 		}
-		KindSimpleInfo kind = new KindSimpleInfo();
+		Kind kind = new Kind();
 		kind.setId(Long.valueOf(document.get(SearchConstants.KIND_ID_FIELD)));
 		kind.setNameCn(document.get(SearchConstants.KIND_NAMECN_FIELD));
 		kind.setIsLeaf(Short.valueOf(document.get(SearchConstants.KIND_ISLEAF_FIELD)));
@@ -87,11 +86,11 @@ public class DocumentToObjectUtils {
 	 * @param document
 	 * @return
 	 */
-	public static BrandSimpleInfo toBrand(Document document) {
+	public static Brand toBrand(Document document) {
 		if (document == null) {
 			return null;
 		}
-		BrandSimpleInfo brand = new BrandSimpleInfo();
+		Brand brand = new Brand();
 		brand.setId(Long.valueOf(document.get(SearchConstants.BRAND_ID_FIELD)));
 		brand.setNameCn(document.get(SearchConstants.BRAND_NAMECN_FIELD));
 		brand.setNameEn(document.get(SearchConstants.BRAND_NAMEEN_FIELD));
@@ -105,22 +104,22 @@ public class DocumentToObjectUtils {
 	 * @param document
 	 * @return
 	 */
-	public static ComponentSimpleInfo toComponent(Document document) {
+	public static Component toComponent(Document document) {
 		if (document == null) {
 			return null;
 		}
-		ComponentSimpleInfo component = new ComponentSimpleInfo();
+		Component component = new Component();
 		component.setId(Long.valueOf(document.get(SearchConstants.COMPONENT_ID_FIELD)));
 		component.setCode(document.get(SearchConstants.COMPONENT_CODE_FIELD));
 		component.setUuid(document.get(SearchConstants.COMPONENT_UUID_FIELD));
 
-		KindSimpleInfo kind = new KindSimpleInfo();
+		Kind kind = new Kind();
 		kind.setId(Long.valueOf(document.get(SearchConstants.COMPONENT_KINDID_FIELD)));
 		kind.setNameCn(document.get(SearchConstants.COMPONENT_KINDNAME_FIELD));
 		kind.setLevel(Short.valueOf(document.get(SearchConstants.COMPONENT_KINDLEVEL_FIELD)));
 		component.setKind(kind);
 
-		BrandSimpleInfo brand = new BrandSimpleInfo();
+		Brand brand = new Brand();
 		brand.setId(Long.valueOf(document.get(SearchConstants.COMPONENT_BRANDID_FIELD)));
 		brand.setNameCn(document.get(SearchConstants.COMPONENT_BRANDNAMECN_FIELD));
 		brand.setNameEn(document.get(SearchConstants.COMPONENT_BRANDNAMEEN_FIELD));
@@ -148,11 +147,11 @@ public class DocumentToObjectUtils {
 	 * @param document
 	 * @return
 	 */
-	public static GoodsSimpleInfo toGoods(Document document) {
+	public static Goods toGoods(Document document) {
 		if (document == null) {
 			return null;
 		}
-		GoodsSimpleInfo goods = new GoodsSimpleInfo();
+		Goods goods = new Goods();
 		goods.setId(document.get(SearchConstants.GOODS_ID_FIELD));
 
 		if (!StringUtils.isEmpty(document.get(SearchConstants.GOODS_GO_ID_FIELD))) {
@@ -171,7 +170,7 @@ public class DocumentToObjectUtils {
 			goods.setCrName(document.get(SearchConstants.GOODS_CRNAME_FIELD));
 		}
 
-		StoreSimpleInfo store = new StoreSimpleInfo();
+		Store store = new Store();
 		if (!StringUtils.isEmpty(document.get(SearchConstants.GOODS_ST_UUID_FIELD))) {
 			store.setUuid(document.get(SearchConstants.GOODS_ST_UUID_FIELD));
 		}
@@ -183,7 +182,7 @@ public class DocumentToObjectUtils {
 		goods.setCmpId(Long.valueOf(document.get(SearchConstants.GOODS_CMP_ID_FIELD)));
 		goods.setCmpCode(document.get(SearchConstants.GOODS_CMP_CODE_FIELD));
 
-		KindSimpleInfo kind = new KindSimpleInfo();
+		Kind kind = new Kind();
 		if (!StringUtils.isEmpty(document.get(SearchConstants.GOODS_KI_ID_FIELD))) {
 			kind.setId(Long.valueOf(document.get(SearchConstants.GOODS_KI_ID_FIELD)));
 		}
@@ -196,7 +195,7 @@ public class DocumentToObjectUtils {
 		}
 		goods.setKind(kind);
 
-		BrandSimpleInfo brand = new BrandSimpleInfo();
+		Brand brand = new Brand();
 		if (!StringUtils.isEmpty(document.get(SearchConstants.GOODS_BR_ID_FIELD))) {
 			brand.setId(Long.valueOf(document.get(SearchConstants.GOODS_BR_ID_FIELD)));
 		}
@@ -213,20 +212,20 @@ public class DocumentToObjectUtils {
 	 * @param document
 	 * @return
 	 */
-	public static OrderSimpleInfo toOrder(Document document) {
+	public static Order toOrder(Document document) {
 		if (document == null) {
 			return null;
 		}
-		OrderSimpleInfo order = new OrderSimpleInfo();
+		Order order = new Order();
 		order.setId(Long.valueOf(document.get(SearchConstants.ORDER_ID_FIELD)));
 		order.setCode(document.get(SearchConstants.ORDER_CODE_FIELD));
 		order.setBuyeruu(Long.valueOf(document.get(SearchConstants.ORDER_BUYERUU_FIELD)));
 		order.setBuyername(document.get(SearchConstants.ORDER_BUYERNAME_FIELD));
-		EnterpriseSimpleInfo buyerEnterprise = new EnterpriseSimpleInfo();
+		Enterprise buyerEnterprise = new Enterprise();
 		buyerEnterprise.setUu(Long.valueOf(document.get(SearchConstants.ORDER_BUYERENUU_FIELD)));
 		buyerEnterprise.setEnName(document.get(SearchConstants.ORDER_BUYERENNAME_FIELD));
 		order.setBuyerEnterprise(buyerEnterprise);
-		EnterpriseSimpleInfo sellerEnterprise = new EnterpriseSimpleInfo();
+		Enterprise sellerEnterprise = new Enterprise();
 		if (document.get(SearchConstants.ORDER_SELLERENUU_FIELD) != null) {
 			sellerEnterprise.setUu(Long.valueOf(document.get(SearchConstants.ORDER_SELLERENUU_FIELD)));
 		}
@@ -237,7 +236,7 @@ public class DocumentToObjectUtils {
 		Date createtime = new Date(Long.valueOf(document.get(SearchConstants.CREATETIME_FIELD)));
 		order.setCreatetime(createtime);
 		order.setStatus(Integer.valueOf(document.get(SearchConstants.ORDER_STATUS_FIELD)));
-		order.setDetails(toDetailsSet(document.get(SearchConstants.ORDER_DETAILS_FIELD), OrderDetailSimpleInfo.class));
+		order.setDetails(toDetailsSet(document.get(SearchConstants.ORDER_DETAILS_FIELD), OrderDetail.class));
 		return order;
 	}
 
@@ -247,16 +246,16 @@ public class DocumentToObjectUtils {
 	 * @param document
 	 * @return
 	 */
-	public static OrderInvoiceSimpleInfo toOrderInvoice(Document document) {
+	public static OrderInvoice toOrderInvoice(Document document) {
 		if (document == null) {
 			return null;
 		}
-		OrderInvoiceSimpleInfo orderInvoice = new OrderInvoiceSimpleInfo();
+		OrderInvoice orderInvoice = new OrderInvoice();
 		orderInvoice.setId(Long.valueOf(document.get(SearchConstants.ORDER_INVOICE_ID_FIELD)));
 		orderInvoice.setCode(document.get(SearchConstants.ORDER_INVOICE_CODE_FIELD));
 		orderInvoice.setBuyeruu(Long.valueOf(document.get(SearchConstants.ORDER_INVOICE_BUYERUU_FIELD)));
 		orderInvoice.setBuyername(document.get(SearchConstants.ORDER_INVOICE_BUYERNAME_FIELD));
-		EnterpriseSimpleInfo buyerEnterprise = new EnterpriseSimpleInfo();
+		Enterprise buyerEnterprise = new Enterprise();
 		buyerEnterprise.setUu(Long.valueOf(document.get(SearchConstants.ORDER_INVOICE_BUYERENUU_FIELD)));
 		buyerEnterprise.setEnName(document.get(SearchConstants.ORDER_INVOICE_BUYERENNAME_FIELD));
 		orderInvoice.setBuyerEnterprise(buyerEnterprise);
@@ -264,7 +263,7 @@ public class DocumentToObjectUtils {
 		orderInvoice.setCreatetime(createtime);
 		orderInvoice.setStatus(Integer.valueOf(document.get(SearchConstants.ORDER_INVOICE_STATUS_FIELD)));
 		orderInvoice.setDetails(toDetailsSet(document.get(SearchConstants.ORDER_INVOICE_DETAILS_FIELD),
-				OrderInvoiceDetailSimpleInfo.class));
+				OrderInvoiceDetail.class));
 		return orderInvoice;
 	}
 
@@ -274,11 +273,11 @@ public class DocumentToObjectUtils {
 	 * @param document
 	 * @return
 	 */
-	public static PurchaseSimpleInfo toPurchase(Document document) {
+	public static Purchase toPurchase(Document document) {
 		if (document == null) {
 			return null;
 		}
-		PurchaseSimpleInfo purchase = new PurchaseSimpleInfo();
+		Purchase purchase = new Purchase();
 		purchase.setId(Long.valueOf(document.get(SearchConstants.PURCHASE_ID_FIELD)));
 		purchase.setCode(document.get(SearchConstants.PURCHASE_CODE_FIELD));
 		purchase.setSellerenuu(Long.valueOf(document.get(SearchConstants.PURCHASE_SELLERENUU_FIELD)));
@@ -287,7 +286,7 @@ public class DocumentToObjectUtils {
 		purchase.setCreatetime(createtime);
 		purchase.setStatus(Integer.valueOf(document.get(SearchConstants.PURCHASE_STATUS_FIELD)));
 		purchase.setDetails(
-				toDetailsSet(document.get(SearchConstants.PURCHASE_DETAILS_FIELD), PurchaseDetailSimpleInfo.class));
+				toDetailsSet(document.get(SearchConstants.PURCHASE_DETAILS_FIELD), PurchaseDetail.class));
 		return purchase;
 	}
 
@@ -297,11 +296,11 @@ public class DocumentToObjectUtils {
 	 * @param document
 	 * @return
 	 */
-	public static PurchaseInvoiceSimpleInfo toPurchaseInvoice(Document document) {
+	public static PurchaseInvoice toPurchaseInvoice(Document document) {
 		if (document == null) {
 			return null;
 		}
-		PurchaseInvoiceSimpleInfo purchaseInvoice = new PurchaseInvoiceSimpleInfo();
+		PurchaseInvoice purchaseInvoice = new PurchaseInvoice();
 		purchaseInvoice.setId(Long.valueOf(document.get(SearchConstants.PURCHASE_INVOICE_ID_FIELD)));
 		purchaseInvoice.setCode(document.get(SearchConstants.PURCHASE_INVOICE_CODE_FIELD));
 		purchaseInvoice.setSellerenuu(Long.valueOf(document.get(SearchConstants.PURCHASE_INVOICE_SELLERENUU_FIELD)));
@@ -310,7 +309,7 @@ public class DocumentToObjectUtils {
 		purchaseInvoice.setCreatetime(createtime);
 		purchaseInvoice.setStatus(Integer.valueOf(document.get(SearchConstants.PURCHASE_INVOICE_STATUS_FIELD)));
 		purchaseInvoice.setDetails(toDetailsSet(document.get(SearchConstants.PURCHASE_INVOICE_DETAILS_FIELD),
-				PurchaseInvoiceDetailSimpleInfo.class));
+				PurchaseInvoiceDetail.class));
 		return purchaseInvoice;
 	}
 
@@ -343,9 +342,9 @@ public class DocumentToObjectUtils {
 		if (StringUtils.isEmpty(jsonString)) {
 			return null;
 		}
-		List<BaseOrderDetailSimpleInfo> details = JSONObject.parseArray(jsonString, BaseOrderDetailSimpleInfo.class);
+		List<com.uas.search.model.BaseOrderDetail> details = JSONObject.parseArray(jsonString, com.uas.search.model.BaseOrderDetail.class);
 		List<BaseOrderDetail> result = new ArrayList<>();
-		for (BaseOrderDetailSimpleInfo detail : details) {
+		for (com.uas.search.model.BaseOrderDetail detail : details) {
 			result.add(new BaseOrderDetail(detail.getId(), detail.getDetno(), detail.getCode()));
 		}
 		return result;

src/main/java/com/uas/search/util/ObjectToDocumentUtils.java

@@ -16,16 +16,15 @@ import org.springframework.util.StringUtils;
 
 import com.alibaba.fastjson.JSONObject;
 import com.uas.search.constant.SearchConstants;
-import com.uas.search.model.BrandSimpleInfo;
-import com.uas.search.model.ComponentSimpleInfo;
-import com.uas.search.model.GoodsSimpleInfo;
-import com.uas.search.model.KindSimpleInfo;
-import com.uas.search.model.OrderInvoiceSimpleInfo;
-import com.uas.search.model.OrderSimpleInfo;
-import com.uas.search.model.PropertyValueSimpleInfo;
-import com.uas.search.model.PurchaseInvoiceSimpleInfo;
-import com.uas.search.model.PurchaseSimpleInfo;
-import com.uas.search.model.StoreSimpleInfo;
+import com.uas.search.model.Brand;
+import com.uas.search.model.Component;
+import com.uas.search.model.Goods;
+import com.uas.search.model.Kind;
+import com.uas.search.model.OrderInvoice;
+import com.uas.search.model.Order;
+import com.uas.search.model.PropertyValue;
+import com.uas.search.model.PurchaseInvoice;
+import com.uas.search.model.Purchase;
 
 import net.sf.ehcache.search.SearchException;
 
@@ -41,9 +40,9 @@ public class ObjectToDocumentUtils {
 	 * 将对象转为Document
 	 * 
 	 * @param object
-	 *            对象，可为KindSimpleInfo、BrandSimpleInfo、ComponentSimpleInfo、
-	 *            OrderSimpleInfo、OrderInvoiceSimpleInfo、PurchaseSimpleInfo、
-	 *            PurchaseInvoiceSimpleInfo
+	 *            对象，可为Kind、Brand、Component、
+	 *            Order、OrderInvoice、Purchase、
+	 *            PurchaseInvoice
 	 * 
 	 * @return 转换的Document
 	 */
@@ -51,34 +50,34 @@ public class ObjectToDocumentUtils {
 		if (object == null) {
 			return null;
 		}
-		if (object instanceof KindSimpleInfo) {
-			return toDocument((KindSimpleInfo) object);
-		} else if (object instanceof BrandSimpleInfo) {
-			return toDocument((BrandSimpleInfo) object);
-		} else if (object instanceof ComponentSimpleInfo) {
-			return toDocument((ComponentSimpleInfo) object);
-		} else if (object instanceof GoodsSimpleInfo) {
-			return toDocument((GoodsSimpleInfo) object);
-		} else if (object instanceof OrderSimpleInfo) {
-			return toDocument((OrderSimpleInfo) object);
-		} else if (object instanceof OrderInvoiceSimpleInfo) {
-			return toDocument((OrderInvoiceSimpleInfo) object);
-		} else if (object instanceof PurchaseSimpleInfo) {
-			return toDocument((PurchaseSimpleInfo) object);
-		} else if (object instanceof PurchaseInvoiceSimpleInfo) {
-			return toDocument((PurchaseInvoiceSimpleInfo) object);
+		if (object instanceof Kind) {
+			return toDocument((Kind) object);
+		} else if (object instanceof Brand) {
+			return toDocument((Brand) object);
+		} else if (object instanceof Component) {
+			return toDocument((Component) object);
+		} else if (object instanceof Goods) {
+			return toDocument((Goods) object);
+		} else if (object instanceof Order) {
+			return toDocument((Order) object);
+		} else if (object instanceof OrderInvoice) {
+			return toDocument((OrderInvoice) object);
+		} else if (object instanceof Purchase) {
+			return toDocument((Purchase) object);
+		} else if (object instanceof PurchaseInvoice) {
+			return toDocument((PurchaseInvoice) object);
 		} else {
 			throw new SearchException("不支持将以下类型转换为Document：" + object.getClass().getName());
 		}
 	}
 
 	/**
-	 * KindSimpleInfo对象转为Document
+	 * Kind对象转为Document
 	 * 
 	 * @param kind
 	 * @return
 	 */
-	public static Document toDocument(KindSimpleInfo kind) {
+	public static Document toDocument(Kind kind) {
 		if (kind == null || kind.getId() == null || StringUtils.isEmpty(kind.getNameCn()) || kind.getIsLeaf() == null
 				|| kind.getLevel() == null) {
 			return null;
@@ -95,12 +94,12 @@ public class ObjectToDocumentUtils {
 	}
 
 	/**
-	 * BrandSimpleInfo对象转为Document
+	 * Brand对象转为Document
 	 * 
 	 * @param brand
 	 * @return
 	 */
-	public static Document toDocument(BrandSimpleInfo brand) {
+	public static Document toDocument(Brand brand) {
 		if (brand == null || brand.getId() == null || StringUtils.isEmpty(brand.getNameCn())
 				|| StringUtils.isEmpty(brand.getUuid())) {
 			return null;
@@ -119,12 +118,12 @@ public class ObjectToDocumentUtils {
 	}
 
 	/**
-	 * ComponentSimpleInfo对象转为Document
+	 * Component对象转为Document
 	 * 
 	 * @param component
 	 * @return
 	 */
-	public static Document toDocument(ComponentSimpleInfo component) {
+	public static Document toDocument(Component component) {
 		if (component == null || component.getId() == null || StringUtils.isEmpty(component.getUuid())
 				|| StringUtils.isEmpty(component.getCode()) || component.getKind() == null
 				|| component.getBrand() == null) {
@@ -166,8 +165,8 @@ public class ObjectToDocumentUtils {
 		}
 
 		// 属性值加入索引，索引中field的键："pr_"前缀连接属性的id
-		Set<PropertyValueSimpleInfo> propertyValues = component.getProperties();
-		for (PropertyValueSimpleInfo propertyValue : propertyValues) {
+		Set<PropertyValue> propertyValues = component.getProperties();
+		for (PropertyValue propertyValue : propertyValues) {
 			if (!StringUtils.isEmpty(propertyValue.getValue())) {
 				String fieldKey = SearchConstants.COMPONENT_PROPERTY_PREFIX + propertyValue.getPropertyid();
 				document.add(new StringField(fieldKey, propertyValue.getValue(), Store.YES));
@@ -181,12 +180,12 @@ public class ObjectToDocumentUtils {
 	}
 
 	/**
-	 * GoodsSimpleInfo对象转为Document
+	 * Goods对象转为Document
 	 * 
 	 * @param goods
 	 * @return
 	 */
-	public static Document toDocument(GoodsSimpleInfo goods) {
+	public static Document toDocument(Goods goods) {
 		if (goods == null || StringUtils.isEmpty(goods.getCmpId()) || StringUtils.isEmpty(goods.getCmpCode())
 				|| goods.getKind() == null || goods.getBrand() == null) {
 			return null;
@@ -221,7 +220,7 @@ public class ObjectToDocumentUtils {
 		}
 
 		if (goods.getStore() != null) {
-			StoreSimpleInfo store = goods.getStore();
+			com.uas.search.model.Store store = goods.getStore();
 			if (store.getUuid() != null) {
 				document.add(new TextField(SearchConstants.GOODS_ST_UUID_FIELD, store.getUuid(), Store.YES));
 			}
@@ -233,7 +232,7 @@ public class ObjectToDocumentUtils {
 		document.add(new StringField(SearchConstants.GOODS_CMP_ID_FIELD, String.valueOf(goods.getCmpId()), Store.YES));
 		document.add(new TextField(SearchConstants.GOODS_CMP_CODE_FIELD, goods.getCmpCode(), Store.YES));
 
-		KindSimpleInfo kind = goods.getKind();
+		Kind kind = goods.getKind();
 		if (kind.getId() != null) {
 			document.add(new StringField(SearchConstants.GOODS_KI_ID_FIELD, String.valueOf(kind.getId()), Store.YES));
 		}
@@ -249,7 +248,7 @@ public class ObjectToDocumentUtils {
 					new StringField(SearchConstants.GOODS_KI_ISLEAF_FIELD, String.valueOf(kind.getLevel()), Store.YES));
 		}
 
-		BrandSimpleInfo brand = goods.getBrand();
+		Brand brand = goods.getBrand();
 		if (brand.getId() != null) {
 			document.add(new StringField(SearchConstants.GOODS_BR_ID_FIELD, String.valueOf(brand.getId()), Store.YES));
 		}
@@ -270,13 +269,13 @@ public class ObjectToDocumentUtils {
 	}
 
 	/**
-	 * OrderSimpleInfo对象转为Document
+	 * Order对象转为Document
 	 * 
 	 * @param order
-	 *            OrderSimpleInfo对象
+	 *            Order对象
 	 * @return 转换的Document
 	 */
-	public static Document toDocument(OrderSimpleInfo order) {
+	public static Document toDocument(Order order) {
 		if (order == null || order.getId() == null || StringUtils.isEmpty(order.getCode()) || order.getBuyeruu() == null
 				|| StringUtils.isEmpty(order.getBuyername()) || order.getBuyerEnterprise() == null
 				|| order.getBuyerEnterprise().getUu() == null
@@ -317,13 +316,13 @@ public class ObjectToDocumentUtils {
 	}
 
 	/**
-	 * OrderInvoiceSimpleInfo对象转为Document
+	 * OrderInvoice对象转为Document
 	 * 
 	 * @param orderInvoice
-	 *            OrderInvoiceSimpleInfo对象
+	 *            OrderInvoice对象
 	 * @return 转换的Document
 	 */
-	public static Document toDocument(OrderInvoiceSimpleInfo orderInvoice) {
+	public static Document toDocument(OrderInvoice orderInvoice) {
 		if (orderInvoice == null || orderInvoice.getId() == null || StringUtils.isEmpty(orderInvoice.getCode())
 				|| orderInvoice.getBuyeruu() == null || StringUtils.isEmpty(orderInvoice.getBuyername())
 				|| orderInvoice.getBuyerEnterprise() == null || orderInvoice.getBuyerEnterprise().getUu() == null
@@ -355,13 +354,13 @@ public class ObjectToDocumentUtils {
 	}
 
 	/**
-	 * PurchaseSimpleInfo对象转为Document
+	 * Purchase对象转为Document
 	 * 
 	 * @param order
-	 *            PurchaseSimpleInfo对象
+	 *            Purchase对象
 	 * @return 转换的Document
 	 */
-	public static Document toDocument(PurchaseSimpleInfo purchase) {
+	public static Document toDocument(Purchase purchase) {
 		if (purchase == null || purchase.getId() == null || StringUtils.isEmpty(purchase.getCode())
 				|| purchase.getSellerenuu() == null || StringUtils.isEmpty(purchase.getSellerenname())
 				|| purchase.getCreatetime() == null || purchase.getStatus() == null) {
@@ -385,13 +384,13 @@ public class ObjectToDocumentUtils {
 	}
 
 	/**
-	 * PurchaseInvoiceSimpleInfo对象转为Document
+	 * PurchaseInvoice对象转为Document
 	 * 
 	 * @param purchaseInvoice
-	 *            PurchaseInvoiceSimpleInfo对象
+	 *            PurchaseInvoice对象
 	 * @return 转换的Document
 	 */
-	public static Document toDocument(PurchaseInvoiceSimpleInfo purchaseInvoice) {
+	public static Document toDocument(PurchaseInvoice purchaseInvoice) {
 		if (purchaseInvoice == null || purchaseInvoice.getId() == null || StringUtils.isEmpty(purchaseInvoice.getCode())
 				|| purchaseInvoice.getSellerenuu() == null || StringUtils.isEmpty(purchaseInvoice.getSellerenname())
 				|| purchaseInvoice.getCreatetime() == null || purchaseInvoice.getStatus() == null) {

src/main/java/com/uas/search/util/SearchUtils.java

@@ -28,14 +28,14 @@ import com.uas.search.LuceneProperties;
 import com.uas.search.constant.SearchConstants;
 import com.uas.search.constant.model.SPage;
 import com.uas.search.exception.SearchException;
-import com.uas.search.model.BrandSimpleInfo;
-import com.uas.search.model.ComponentSimpleInfo;
-import com.uas.search.model.GoodsSimpleInfo;
-import com.uas.search.model.KindSimpleInfo;
-import com.uas.search.model.OrderInvoiceSimpleInfo;
-import com.uas.search.model.OrderSimpleInfo;
-import com.uas.search.model.PurchaseInvoiceSimpleInfo;
-import com.uas.search.model.PurchaseSimpleInfo;
+import com.uas.search.model.Brand;
+import com.uas.search.model.Component;
+import com.uas.search.model.Goods;
+import com.uas.search.model.Kind;
+import com.uas.search.model.OrderInvoice;
+import com.uas.search.model.Order;
+import com.uas.search.model.PurchaseInvoice;
+import com.uas.search.model.Purchase;
 import com.uas.search.support.IndexSearcherManager;
 
 /**
@@ -353,21 +353,21 @@ public class SearchUtils {
 		if (clazz == null) {
 			return null;
 		}
-		if (clazz == KindSimpleInfo.class) {
+		if (clazz == Kind.class) {
 			return SearchConstants.KIND_TABLE_NAME;
-		} else if (clazz == BrandSimpleInfo.class) {
+		} else if (clazz == Brand.class) {
 			return SearchConstants.BRAND_TABLE_NAME;
-		} else if (clazz == ComponentSimpleInfo.class) {
+		} else if (clazz == Component.class) {
 			return SearchConstants.COMPONENT_TABLE_NAME;
-		} else if (clazz == GoodsSimpleInfo.class) {
+		} else if (clazz == Goods.class) {
 			return SearchConstants.GOODS_TABLE_NAME;
-		} else if (clazz == OrderSimpleInfo.class) {
+		} else if (clazz == Order.class) {
 			return SearchConstants.ORDER_TABLE_NAME;
-		} else if (clazz == OrderInvoiceSimpleInfo.class) {
+		} else if (clazz == OrderInvoice.class) {
 			return SearchConstants.ORDER_INVOICE_TABLE_NAME;
-		} else if (clazz == PurchaseSimpleInfo.class) {
+		} else if (clazz == Purchase.class) {
 			return SearchConstants.PURCHASE_TABLE_NAME;
-		} else if (clazz == PurchaseInvoiceSimpleInfo.class) {
+		} else if (clazz == PurchaseInvoice.class) {
 			return SearchConstants.PURCHASE_INVOICE_TABLE_NAME;
 		} else {
 			throw new SearchException("该实体类没有对应的需要建立索引的表：" + clazz);