优化草稿字段

hsweb-web-bean/src/main/java/org/hsweb/web/bean/po/draft/Draft.java

@@ -4,14 +4,13 @@ import org.hsweb.web.bean.po.GenericPo;
 
 import java.util.Date;
 
-/**
- * Created by zhouhao on 16-6-2.
- */
 public class Draft extends GenericPo<String> {
     private String name;
 
     private Object value;
 
+    private String key;
+
     private Date createDate;
 
     private String creatorId;
@@ -47,4 +46,12 @@ public class Draft extends GenericPo<String> {
     public void setCreateDate(Date createDate) {
         this.createDate = createDate;
     }
+
+    public String getKey() {
+        return key;
+    }
+
+    public void setKey(String key) {
+        this.key = key;
+    }
 }

hsweb-web-controller/src/main/java/org/hsweb/web/controller/draft/DraftController.java

@@ -63,6 +63,7 @@ public class DraftController {
         draft.setId(Draft.createUID());
         draft.setCreateDate(new Date());
         draft.setCreatorId(user.getId());
+        draft.setKey(key);
         return ResponseMessage.ok(draftService.createDraft(key, draft));
     }
 
@@ -90,7 +91,7 @@ public class DraftController {
     @AccessLogger("删除草稿")
     public ResponseMessage removeDraft(@PathVariable("key") String key, @PathVariable("id") String id) {
         User user = WebUtil.getLoginUser();
-        return ResponseMessage.ok(draftService.removeDraft(key, id, user.getId()));
+        return ResponseMessage.ok(draftService.removeDraft(key, user.getId(), id));
     }
 
 

hsweb-web-service/hsweb-web-service-simple/src/main/java/org/hsweb/web/service/impl/draft/CacheDraftService.java

@@ -57,7 +57,7 @@ public class CacheDraftService implements DraftService {
     }
 
     @Override
-    public boolean removeDraft(String key, String id, String userId) {
+    public boolean removeDraft(String key, String userId, String id) {
         Cache cache = cacheManager.getCache(cacheKey + userId);
         Cache.ValueWrapper wrapper = cache.get(key);
         if (wrapper != null) {