新增描述功能(mongodb)

alexyang
1 parent d8621149
Showing 6 changed files with 115 additions and 86 deletions
titan-api/pom.xml
titan-api/src/main/java/com/diligrp/titan/rest/domain/output/ProductInfoOut.java
titan-api/src/main/java/com/diligrp/titan/ws/product/ProductRestService.java
titan-api/src/main/java/com/diligrp/titan/ws/product/impl/ProductRestServiceImpl.java
titan-api/src/main/resources/mongodb/spring-mongo.xml
titan-api/src/main/resources/spring-config.xml
@@ -90,6 +90,34 @@
     </build>
  
     <dependencies>
+        <dependency>
+            <groupId>org.springframework.data</groupId>
+            <artifactId>spring-data-mongodb</artifactId>
+            <version>1.4.2.RELEASE</version>
+            <exclusions>
+                <exclusion>
+                    <artifactId>spring-tx</artifactId>
+                    <groupId>org.springframework</groupId>
+                </exclusion>
+                <exclusion>
+                    <artifactId>spring-context</artifactId>
+                    <groupId>org.springframework</groupId>
+                </exclusion>
+                <exclusion>
+                    <artifactId>spring-beans</artifactId>
+                    <groupId>org.springframework</groupId>
+                </exclusion>
+                <exclusion>
+                    <artifactId>spring-core</artifactId>
+                    <groupId>org.springframework</groupId>
+                </exclusion>
+                <exclusion>
+                    <artifactId>spring-expression</artifactId>
+                    <groupId>org.springframework</groupId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+
         <!-- spring -->
         <dependency>
             <groupId>org.springframework</groupId>
@@ -317,6 +345,11 @@
                 <!--权限管理的redis配置-->
                 <manage.redis.url>10.28.11.205</manage.redis.url>
                 <manage.redis.port>6379</manage.redis.port>
+                <!-- mongodb -->
+                <mongo.host>10.28.11.148</mongo.host>
+                <mongo.port>27017</mongo.port>
+                <mongo.username></mongo.username>
+                <mongo.pwd></mongo.pwd>
             </properties>
         </profile>
     </profiles>
@@ -85,6 +85,15 @@ public class ProductInfoOut {
      */
     private List<String> pictures;
  
+    private String desc;
+
+    public String getDesc() {
+        return desc;
+    }
+
+    public void setDesc(String desc) {
+        this.desc = desc;
+    }
  
     /**
      * 创建时间
@@ -22,7 +22,7 @@ public interface ProductRestService {
      * @createTime 2014年6月9日 下午2:09:41
      * @author celine
      */
-    public Long insertPopProduct(PopProductInput input) throws TitanError;
+    Long insertPopProduct(PopProductInput input) throws TitanError;
  
  
     /**
@@ -35,7 +35,7 @@ public interface ProductRestService {
      * @createTime 2015年3月30日 下午4:03:14
      * @author yangwd
      */
-    public List<ProductInfoOut> getProductInfo(List<Long> pids,  boolean isCludDeleteSku) throws TitanError;
+    List<ProductInfoOut> getProductInfo(List<Long> pids, boolean isCludDeleteSku) throws TitanError;
  
     /**
      * 分页获取所有第三方商品（搜索同步使用）
@@ -44,9 +44,9 @@ public interface ProductRestService {
      * @param pageSize
      * @return
      */
-    public PageOutput<List<ProductInfoOut>> getAllProductPop(int page, int pageSize);
+    PageOutput<List<ProductInfoOut>> getAllProductPop(int page, int pageSize);
  
-    public PageOutput<List<ProductInfoOut>> searchProductPop(int page, int pageSize, ProductInfoInput input);
+    PageOutput<List<ProductInfoOut>> searchProductPop(int page, int pageSize, ProductInfoInput input);
  
     /**
      * 批量获取sku信息
@@ -54,7 +54,7 @@ public interface ProductRestService {
      * @param skus 需要查询的sku
      * @return 返回 key为sku  值为相应sku商品
      */
-    public Map<String, ProductInfoOut> getSkuInfoMap(List<String> skus);
+    Map<String, ProductInfoOut> getSkuInfoMap(List<String> skus);
  
     /**
      * this method is  删除第三方产品信息
@@ -64,18 +64,9 @@ public interface ProductRestService {
      * @createTime 2014年6月18日 下午2:57:51
      * @author yangjianjun
      */
-    public void delProductInfo(List<Long> pids) throws TitanError;
+    void delProductInfo(List<Long> pids) throws TitanError;
  
  
-    /**
-     * 更新买卖对接商品
-     *
-     * @param input 买卖对接商品信息
-     * @return
-     * @throws TitanError
-     * @createTime 2014年6月20日 下午5:13:59
-     */
-    public Map<String, Boolean> updatePopProduct(PopProductInput input) throws TitanError;
  
     /**
      * this method is 更新第三方商品库的状态信息
@@ -88,7 +79,7 @@ public interface ProductRestService {
      * @createTime 2014年6月19日 上午11:18:27
      * @author yangjianjun
      */
-    public int updatePopProductStatus(int status, List<Long> pids, long sellerId) throws TitanError;
+    int updatePopProductStatus(int status, List<Long> pids, long sellerId) throws TitanError;
  
     /**
      * this method is 自定义第三方商品的分类
@@ -100,7 +91,7 @@ public interface ProductRestService {
      * @createTime 2014年6月19日 下午2:14:32
      * @author yangjianjun
      */
-    public int setProductVirtualCid(List<Long> pids, long vcid) throws TitanError;
+    int setProductVirtualCid(List<Long> pids, long vcid) throws TitanError;
  
  
     /**
@@ -110,7 +101,7 @@ public interface ProductRestService {
      * @param num    获取数量
      * @return
      */
-    public List<ProductInfoOut> listLatestProduct(Long shopId, Integer num);
+    List<ProductInfoOut> listLatestProduct(Long shopId, Integer num);
  
     /**
      * this method is 获取设置的商品搜索排序
@@ -119,7 +110,7 @@ public interface ProductRestService {
      * @createTime 2014年9月7日 下午3:36:14
      * @author chenzhiwei
      */
-    public List<ProductSearchSortOut> getProductSearchSort(Long cid, Integer type);
+    List<ProductSearchSortOut> getProductSearchSort(Long cid, Integer type);
  
     /**
      * this method is 查询上架自定义类目下的商品总数
@@ -130,7 +121,7 @@ public interface ProductRestService {
      * @createTime 2014年6月19日 下午3:59:32
      * @author yangjianjun
      */
-    public Long countVirtualCatProducts(long vcid) throws TitanError;
+    Long countVirtualCatProducts(long vcid) throws TitanError;
  
     /**
      * 获取商品描述信息
@@ -141,7 +132,7 @@ public interface ProductRestService {
      * @createTime 2015年3月31日 下午5:17:24
      * @author yangjianjun
      */
-    public String getProductDesc(Long pid) throws TitanError;
+    String getProductDesc(Long pid) throws TitanError;
  
     /**
      * 设置商品描述信息
@@ -152,7 +143,7 @@ public interface ProductRestService {
      * @createTime 2015年3月31日 下午5:17:24
      * @author yangjianjun
      */
-    public void setProductDesc(Long pid, String desc) throws TitanError;
+    void setProductDesc(Long pid, String desc) throws TitanError;
  
  
     /**
@@ -165,7 +156,7 @@ public interface ProductRestService {
      * @createTime 2015年4月20日 下午8:20:32
      * @author yjj
      */
-    public Map<Integer, String> getPopProductCategroyByShopId(Integer shopId, Integer pstatus) throws TitanError;
+    Map<Integer, String> getPopProductCategroyByShopId(Integer shopId, Integer pstatus) throws TitanError;
  
  
     /**
@@ -174,7 +165,7 @@ public interface ProductRestService {
      * @param query
      * @return
      */
-    public int getProductPopCount(ProductPop query);
+    int getProductPopCount(ProductPop query);
  
     /**
      * 根据店铺ID获取商品数量
@@ -182,7 +173,7 @@ public interface ProductRestService {
      * @param shopId
      * @return
      */
-    public int getCountByShopId(Long shopId);
+    int getCountByShopId(Long shopId);
  
  
     /**
 package com.diligrp.titan.ws.product.impl;
  
+import com.alibaba.fastjson.JSONObject;
 import com.diligrp.titan.common.ProductStatus;
 import com.diligrp.titan.common.exception.TitanError;
 import com.diligrp.titan.common.log.LogHelper;
@@ -32,6 +33,11 @@ import com.diligrp.titan.ws.product.pop.ProductPopRestService;
 import com.diligrp.titan.ws.product.pop.ProductSkuPopRestService;
 import org.apache.commons.collections.CollectionUtils;
 import org.apache.commons.lang.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.data.mongodb.core.MongoTemplate;
+import org.springframework.data.mongodb.core.query.Criteria;
+import org.springframework.data.mongodb.core.query.Query;
+import org.springframework.data.mongodb.core.query.Update;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
  
@@ -72,6 +78,9 @@ public class ProductRestServiceImpl implements ProductRestService {
     @Resource
     private AttributeRestService attributeRestService;
  
+    @Autowired
+    private MongoTemplate mongoTemplate;
+
     @Override
     @Transactional(rollbackFor = TitanError.class)
     public Long insertPopProduct(PopProductInput productInput) throws TitanError {
@@ -88,7 +97,15 @@ public class ProductRestServiceImpl implements ProductRestService {
  
  
             // 将商品描述写入hbase
-            //productDescDao.putProductDesc(pid, keyWordsRPC.filterKeyWordsInfoByTag(productInput.getDesc(),"*"));
+            try {
+                JSONObject json = new JSONObject();
+                json.put("id", pid);
+                json.put("content", productInput.getDesc());
+                mongoTemplate.save(json, "content");
+
+            } catch (Exception e) {
+                e.printStackTrace();
+            }
             // 生成属性列表
             List<ProductPopAttr> attrs = generateAttrs(productInput, pid);
             productPopAttrRestService.batchInsert(attrs);
@@ -172,7 +189,14 @@ public class ProductRestServiceImpl implements ProductRestService {
         Map<String, List<AttributeOut>> attrMap = productPopAttrRestService.findByPid(pid, popProductDb.getCateId());
         result.setSaleAtt(attrMap.get("saleAttrs"));
  
-
+        try {
+            Query query = new Query();
+            query.addCriteria(Criteria.where("id").is(pid));
+            JSONObject object = mongoTemplate.findOne(query, JSONObject.class, "content");
+            result.setDesc(object.getString("content"));
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
         //设置sku信息
         List<ProductSkuPop> skuList = productSkuPopRestService.findByPid(pid, isCludDeleteSku);
         List<SkuOut> skus = CovertUtils.covertEntrtyList(skuList, SkuOut.class);
@@ -518,64 +542,6 @@ public class ProductRestServiceImpl implements ProductRestService {
         productSearchSortRestService.deleteProductSearchSort(pids);
     }
  
-    @Override
-    @Transactional(rollbackFor = TitanError.class)
-    public Map<String, Boolean> updatePopProduct(PopProductInput input) throws TitanError {
-        Map<String, Boolean> resultMap = new HashMap<String, Boolean>();
-        boolean isWaitProduct = false; //强制下架后，用户重新修改的商品
-        Long pid = input.getPid();
-        if (pid == null) {
-            throw new TitanError(0, "商品PID为空,请检查输入参数");
-        }
-        ProductPop condtion = new ProductPop();
-        condtion.setPid(pid);
-        List<ProductPop> productInDb = productPopRestService.selectEntryList(condtion);
-        if (productInDb == null || productInDb.size() != 1) {
-            throw new TitanError(0, "商品" + pid + "不存在");
-        }
-        try {
-            // 插入商品主表product_pop
-            ProductPop productPop = generateProduct(input);
-            productPop.setPid(pid);
-            // 根据商品原来的状体和新的商品信息，更新商品状态
-            int status = productInDb.get(0).getStatus();
-            // 商品在架状态，不允许修改上架时间和上架模式
-
-
-            productPopRestService.updateByKey(productPop);
-
-
-            // 生成SKU更新product_pop
-            List<ProductSkuPop> skus = generateSku(input, productPop.getPid(), false);
-            List<ProductSkuPop> skuInDb = productSkuPopRestService.findByPid(pid);
-            updateSku(skus, skuInDb);
-
-            // 将商品描述写入hbase
-            //productDescDao.putProductDesc(pid, keyWordsRPC.filterKeyWordsInfoByTag(input.getDesc(), "*"));
-
-            // 生成属性列表
-            List<ProductPopAttr> attrs = generateAttrs(input, pid);
-            productPopAttrRestService.deleteByPid(pid);
-            productPopAttrRestService.batchInsert(attrs);
-            // 生成图片列表
-            List<ProductImg> imgs = generateImgs(input.getPictures(), pid);
-            productImgRestService.updateProductImg(pid, imgs);
-
-            // 生成属性值列表
-            List<ProductAttrValue> attrValues = generateAttrValues(input, pid);
-            productPopAttrValueRestService.deleteByPid(pid);
-            productPopAttrValueRestService.batchInsert(attrValues);
-
-
-            resultMap.put("isWaitProduct", isWaitProduct);
-            resultMap.put("updateSuccess", true);
-            return resultMap;
-        } catch (Exception e) {
-            LogHelper.error(LogTypeEnum.PRODUCT, e, "更新商品失败!{}", e.getMessage());
-            throw new TitanError(500, "更新商品失败" + e.getMessage());
-        }
-    }
-
     /**
      * 对比输入的SKU与数据库中的SKU，进行新增、更新、删除
      *
@@ -690,7 +656,7 @@ public class ProductRestServiceImpl implements ProductRestService {
         List<Integer> cateId = productPopRestService.getPopProductCategroyByShopId(shopId, pstatus);
         Map<Integer, String> map = null;
         if (!CollectionUtils.isEmpty(cateId)) {
-            map = new HashMap<Integer, String>();
+            map = new HashMap<>();
             for (Integer categroy : cateId) {
                 CategoryOut cateOut = categoryRestService.getCatrgoryInfo(categroy, false);
                 if (cateOut != null) {
@@ -746,6 +712,7 @@ public class ProductRestServiceImpl implements ProductRestService {
         //修改详情
         if (StringUtils.isNotEmpty(input.getDesc())) {
             // 将商品描述写入hbase
+            mongoTemplate.updateFirst(new Query(Criteria.where("id").is(input.getPid())), Update.update("content", input.getDesc()), "content");
         }
  
         resultMap.put("isWaitProduct", isWaitProduct);
+<?xml version="1.0" encoding="UTF-8"?>
+<beans xmlns="http://www.springframework.org/schema/beans" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xmlns:mongo="http://www.springframework.org/schema/data/mongo"
+       xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-4.0.xsd http://www.springframework.org/schema/data/mongo http://www.springframework.org/schema/data/mongo/spring-mongo.xsd"
+       default-lazy-init="true">
+
+    <description>RPC配置文件</description>
+
+    <mongo:mongo host="${mongo.host}" port="${mongo.port}">
+        <mongo:options connections-per-host="8"
+                       threads-allowed-to-block-for-connection-multiplier="4"
+                       connect-timeout="1000"
+                       max-wait-time="1500"
+                       auto-connect-retry="true"
+                       socket-keep-alive="true"
+                       socket-timeout="1500"
+                       slave-ok="true"
+                       write-number="1"
+                       write-timeout="0"
+                       write-fsync="true"/>
+    </mongo:mongo>
+
+    <mongo:db-factory dbname="titan" mongo-ref="mongo" password="${mongo.pwd}" username="${mongo.username}"/>
+
+    <bean id="mongoTemplate" class="org.springframework.data.mongodb.core.MongoTemplate">
+        <constructor-arg name="mongoDbFactory" ref="mongoDbFactory"/>
+    </bean>
+</beans>
 \ No newline at end of file
@@ -31,4 +31,5 @@
 	<import resource="classpath*:spring-config-rpc.xml" />
     <import resource="classpath*:spring-config-redis.xml" />
     <import resource="classpath*:spring-redis-manager.xml" />
+    <import resource="mongodb/spring-mongo.xml" />
 </beans>
 \ No newline at end of file