Merge pull request #34 from T-baby/dev

1.0.8.2

pom.xml

@@ -5,7 +5,7 @@
 
     <groupId>com.cybermkd</groupId>
     <artifactId>MongodbPlugin</artifactId>
-    <version>1.0.8.1</version>
+    <version>1.0.8.2</version>
     <packaging>jar</packaging>
 
     <name>MongodbPlugin</name>

src/main/java/com/cybermkd/mongo/kit/MongoBean.java

@@ -34,5 +34,9 @@ public JSONObject toJSONObject() {
         return (JSONObject) JSON.toJSON(this);
     }
 
+    public String toJSONString() {
+        return  JSON.toJSONString(this);
+    }
+
 
 }

src/main/java/com/cybermkd/mongo/kit/MongoDocumentKit.java

@@ -17,6 +17,11 @@ public static Document toDocument(Object obj) {
 
         Map<String, Object> map;
 
+
+        if (Document.class.isInstance(obj)) {
+            return (Document) obj;
+        }
+
         if (!Map.class.isInstance(obj)) {
             map = MongoKit.INSTANCE.toMap(obj);
         } else {
@@ -50,6 +55,11 @@ public static Document toDocument(Object obj) {
 
             }
         }
+        String id = (String) map.get("id");
+        if (id == null || id.equals("")) {
+            map.remove("id");
+        }
+
         return new Document(map);
     }
 

src/main/java/com/cybermkd/mongo/kit/page/MongoPaginate.java

@@ -36,7 +36,7 @@ public MongoPaginate(MongoQuery query, int count, int page) {
             this.count = (int) totalRow;
         }
 
-        if (this.count <= 0 || this.page <= 0 || this.page > totalPage) {
+        if (totalRow != 0 && this.count <= 0 || this.page <= 0) {
             throw new RuntimeException("MongPage tips: (づ￣ 3￣)づ count or page is error !");
         }
 

src/test/java/com/cybermkd/Time.java

@@ -1,11 +1,13 @@
 package com.cybermkd;
 
+import com.alibaba.fastjson.annotation.JSONField;
 import com.cybermkd.mongo.kit.MongoValidate;
 
 import java.util.Date;
 
 public class Time extends MongoValidate{
 
+    @JSONField(format="yyyy-MM-dd HH:mm:ss")
     private Date date=new Date();
 
     public Date getDate() {