docs: 调整示例代码，简化示例数据

biggates · biggates · commit 65416b3607d4 · 2024-09-09T14:44:47.000+08:00
diff --git a/eaphone-spring-data-query-samples/src/main/java/com/eaphonetech/common/datatables/samples/mongo/document/Order.java b/eaphone-spring-data-query-samples/src/main/java/com/eaphonetech/common/datatables/samples/mongo/document/Order.java
@@ -1,10 +1,10 @@
 package com.eaphonetech.common.datatables.samples.mongo.document;
 
+import java.util.ArrayList;
 import java.util.Calendar;
 import java.util.Date;
-import java.util.HashSet;
+import java.util.List;
 import java.util.Random;
-import java.util.Set;
 
 import org.bson.types.ObjectId;
 import org.springframework.data.annotation.Id;
@@ -47,7 +47,7 @@ public class Order {
 	private double price;
 
 	@JsonView(QueryOutput.View.class)
-	private Set<OrderItem> items;
+	private List<OrderItem> items;
 
 	@Transient
 	public static Order random() {
@@ -62,29 +62,27 @@ public static Order random() {
 
 		o.isValid = r.nextBoolean();
 
-		o.amount = r.nextInt(25);
-
 		o.price = Math.round(100.0 * 100.0 * r.nextDouble()) / 100.0;
 
-		Set<OrderItem> items = new HashSet<>();
-		for (int i = 0; i < r.nextInt(8); i++) {
-			int amount = r.nextInt(25);
-			double price = Math.round(100.0 * 100.0 * r.nextDouble()) / 100.0;
+		List<OrderItem> items = new ArrayList<>();
+		int itemsCount = r.nextInt(5);
+		int preciseTotalPrice = 0;
+		for (int i = 0; i < itemsCount; i++) {
+			int preciseItemPrice = r.nextInt(10000);
 
 			OrderItem item = new OrderItem();
 			item.setId(new ObjectId().toHexString());
 			item.setName(o.getOrderNumber() + "_" + i);
-			item.setAmount(amount);
-			item.setPrice(price);
-			item.setDate(o.getDate());
-			item.setValid(o.isValid());
+			item.setPrice((double) preciseItemPrice / 100.0);
 			items.add(item);
 
-			o.setAmount(o.getAmount() + amount);
-			o.setPrice(o.getPrice() + price);
+			preciseTotalPrice += preciseItemPrice;
 		}
+		o.setPrice((double) preciseTotalPrice / 100.0);
 		o.setItems(items);
 
+		o.amount = itemsCount;
+
 		return o;
 	}
 }
diff --git a/eaphone-spring-data-query-samples/src/main/java/com/eaphonetech/common/datatables/samples/mongo/document/OrderItem.java b/eaphone-spring-data-query-samples/src/main/java/com/eaphonetech/common/datatables/samples/mongo/document/OrderItem.java
@@ -1,11 +1,8 @@
 package com.eaphonetech.common.datatables.samples.mongo.document;
 
-import java.util.Date;
-
 import org.springframework.data.mongodb.core.mapping.Field;
 
 import com.eaphonetech.common.datatables.model.mapping.QueryOutput;
-import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.annotation.JsonView;
 
 import lombok.Data;
@@ -20,17 +17,6 @@ public class OrderItem {
 	@JsonView(QueryOutput.View.class)
 	private String name;
 
-	@JsonView(QueryOutput.View.class)
-	private int amount;
-
 	@JsonView(QueryOutput.View.class)
 	private double price;
-
-	@JsonFormat(pattern = "yyyy-MM-dd")
-	@JsonView(QueryOutput.View.class)
-	private Date date;
-
-	@JsonView(QueryOutput.View.class)
-	private boolean isValid;
-
 }
diff --git a/eaphone-spring-data-query-samples/src/main/resources/static/index.html b/eaphone-spring-data-query-samples/src/main/resources/static/index.html
@@ -3,12 +3,12 @@
 
 <head>
   <title>Eaphone Query Example</title>
-  <!--
   <link rel="stylesheet" href="/webjars/bootstrap/css/bootstrap.min.css" />
-  <link rel="stylesheet" href="/webjars/highlightjs/styles/solarized-light.css" />
-  -->
+  <link rel="stylesheet" href="/webjars/highlightjs/styles/solarized-light.min.css" />
+  <!--
   <link href="https://cdn.bootcss.com/bootstrap/4.1.1/css/bootstrap.min.css" rel="stylesheet">
   <link href="https://cdn.bootcss.com/highlight.js/9.12.0/styles/solarized-light.min.css" rel="stylesheet">
+  -->
   <link rel="stylesheet" href="css/style.css">
 </head>
 
@@ -45,7 +45,7 @@ <h5 class="card-header">Request</h5>
             <div class="card mb-4">
               <h5 class="card-header">Rendered Grid</h5>
               <div class="card-body">
-                <table class="table table-bordered table-striped table-sm">
+                <table class="table table-bordered table-striped table-sm text-center">
                   <thead>
                     <tr>
                       <th scope="col">i</th>
@@ -75,9 +75,15 @@ <h5 class="card-header">Server Response</h5>
       </div>
     </div>
   </div>
+  
+  <script src="/webjars/jquery/jquery.min.js"></script>
+  <script src="/webjars/bootstrap/js/bootstrap.min.js"></script>
+  <script src="/webjars/highlightjs/highlight.min.js"></script>
+  <!--
   <script src="https://cdn.bootcss.com/jquery/3.3.1/jquery.min.js"></script>
   <script src="https://cdn.bootcss.com/bootstrap/4.1.1/js/bootstrap.min.js"></script>
   <script src="https://cdn.bootcss.com/highlight.js/9.12.0/highlight.min.js"></script>
+  -->
   <script type="text/javascript" src="/js/index.js"></script>
 </body>
 
diff --git a/eaphone-spring-data-query-samples/src/main/resources/static/js/index.js b/eaphone-spring-data-query-samples/src/main/resources/static/js/index.js
@@ -26,6 +26,26 @@ $(document).ready(function () {
 				}
 			}
 		}
+	}, {
+		summary: 'Single regex filter',
+		description: 'Filter with regular expression',
+		value: {
+			where: {
+				orderNumber: {
+					'_regex': 'O1..[25].*'
+				}
+			}
+		}
+	}, {
+		summary: 'SQL Like',
+		description: 'Query using SQL like (%)',
+		value: {
+			where: {
+				"orderNumber": {
+					"_like": "O100%"
+				}
+			}
+		}
 	}, {
 		summary: 'Single comparison filter',
 		description: 'Comparison filter on single column',
@@ -46,13 +66,23 @@ $(document).ready(function () {
 				}
 			}
 		}
+	}, {
+		summary: 'Boolean search',
+		description: 'Search with boolean values',
+		value: {
+			where: {
+				isValid: {
+					'_eq': true
+				}
+			}
+		}
 	}, {
 		summary: 'Enumeration (in)',
 		description: 'Enumeration with number',
 		value: {
 			where: {
 				amount: {
-					'_in': [5, 9, 13]
+					'_in': [2, 3, 5]
 				}
 			}
 		}
@@ -62,22 +92,32 @@ $(document).ready(function () {
 		value: {
 			where: {
 				price: {
-					'_gte': 10,
-					'_lt': 20.5
+					'_gte': 50,
+					'_lt': 200
 				}
 			}
 		}
 	}, {
 		summary: 'Multiple columns',
-		description: 'More where on multiple columns',
+		description: 'More criteria on multiple columns (AND)',
 		value: {
 			where: {
 				date: {
 					'_gt': '2012-01-01'
 				},
 				price: {
-					'_gte': 10,
-					'_lt': 20.5
+					'_gte': 50,
+					'_lt': 200
+				}
+			}
+		}
+	}, {
+		summary: 'Empty array',
+		description: 'Search for empty array',
+		value: {
+			where: {
+				items: {
+					'_eq': []
 				}
 			}
 		}
@@ -103,16 +143,6 @@ $(document).ready(function () {
 				'price': 'asc'
 			}]
 		}
-	}, {
-		summary: 'Like',
-		description: 'SQL like',
-		value: {
-			where: {
-				"orderNumber": {
-					"_like": "O100%"
-				}
-			}
-		}
 	}];
 	
 	/** Draw example buttons */
