2017/12/01

jomalonejia · Dec 1, 2017 · baff6f3 · baff6f3
1 parent 6c8e882
commit baff6f3
Show file tree

Hide file tree

Showing 5 changed files with 17 additions and 8 deletions.
diff --git a/cz-api/src/main/java/com/cz/api/service/IItemService.java b/cz-api/src/main/java/com/cz/api/service/IItemService.java
@@ -10,7 +10,7 @@
  * Created by jomalone_jia on 2017/6/20.
  */
 public interface IItemService extends IService<Item>{
-    String saveOrUpdateItemContent(ItemContent itemContent);
+    void saveOrUpdateItemContent(ItemContent itemContent);
     PageInfo<Item> listItems(int pageNum,int pageSize);
     PageInfo<Item> listItemsByCategory(int categoryId,int pageNum);
     Integer updateImageById(String itemId, String imageUrl);

diff --git a/cz-dao/src/main/java/com/cz/mapper/xml/ItemMapper.xml b/cz-dao/src/main/java/com/cz/mapper/xml/ItemMapper.xml
@@ -83,7 +83,7 @@
     </delete>
 
     <update id="deleteItemContentById">
-       update sys_item SET content = '' WHERE id = #{itemId}
+       update sys_item SET content = NULL WHERE id = #{itemId}
     </update>
 
 </mapper>
diff --git a/cz-service/src/main/java/com/cz/service/service/ItemService.java b/cz-service/src/main/java/com/cz/service/service/ItemService.java
@@ -45,8 +45,8 @@ public class ItemService extends BaseServiceImpl<ItemMapper, Item> implements II
 
     @Override
     @Transactional
-    public String saveOrUpdateItemContent(ItemContent itemContent) {
-        String content = itemMapper.getItemContentById(itemContent.getItemId());
+    public void saveOrUpdateItemContent(ItemContent itemContent) {
+        /*String content = itemMapper.getItemContentById(itemContent.getItemId());
         if(StringUtils.isNotEmpty(content)){
             Pattern deletePattern = Pattern.compile("<img src=\"http://otlht2gvo.bkt.clouddn.com/(.*?)\">");
             Matcher matcher = deletePattern.matcher(content);
@@ -65,9 +65,11 @@ public String saveOrUpdateItemContent(ItemContent itemContent) {
             String imageTag = "<img src=\"" + imageUrl + "\">";
             m.appendReplacement(sb, imageTag);
         }
-        m.appendTail(sb);
-        itemMapper.updateContentById(new ItemContent(itemContent.getItemId(),sb.toString()));
-        return sb.toString();
+        m.appendTail(sb);*/
+        //itemMapper.updateContentById(new ItemContent(itemContent.getItemId(),sb.toString()));
+        Item item = itemMapper.selectById(itemContent.getItemId());
+        item.setContent(itemContent.getContent());
+        itemMapper.updateById(item);
     }
 
     @Override

diff --git a/cz-service/src/test/java/TestConfig.java b/cz-service/src/test/java/TestConfig.java
@@ -3,6 +3,7 @@
 import com.cz.api.service.*;
 import com.cz.common.util.qiniu.PictureUtil;
 import com.cz.dto.item.ItemContent;
+import com.cz.mapper.ItemMapper;
 import com.cz.model.category.Category;
 import com.cz.model.item.Item;
 import com.cz.model.order.Order;
@@ -41,6 +42,8 @@ public class TestConfig {
     private IParamService paramService;
     @Autowired
     private IOrderService orderService;
+    @Autowired
+    private ItemMapper itemMapper;
 
     @Test
     public void test1() {
@@ -329,5 +332,10 @@ public void  test31(){
         }
         PictureUtil.getInstance().bucketDelete(deleteArray.toArray(new String[0]));
     }
+
+    @Test
+    public void test32(){
+        itemMapper.deleteItemContentById("60e054fdd0c74824bbbac46bf7d08603");
+    }
 }
 
diff --git a/cz-web/src/main/java/com/cz/web/controller/ItemController.java b/cz-web/src/main/java/com/cz/web/controller/ItemController.java
@@ -147,7 +147,6 @@ public Object updateImages(@PathVariable("itemId") String itemId,@PathVariable("
     @ApiOperation(value = "item content update")
     public ResponseEntity<?> addContent(@RequestBody ItemContent itemContent) throws IOException, NoSuchAlgorithmException {
         try {
-            _log.info(itemContent.toString());
             itemService.saveOrUpdateItemContent(itemContent);
             return ResponseEntity.ok().body("update content success");
         } catch (Exception e) {