From 82f1f5d0cf1b51a5d81915e842e01760f404fa74 Mon Sep 17 00:00:00 2001
From: 疯狂的狮子li <15040126243@163.com>
Date: 星期三, 20 十月 2021 13:07:16 +0800
Subject: [PATCH] update 优化xxl-job-admin相关pr代码 增加格式化日志输出与docker镜像

---
 ruoyi-demo/src/main/java/com/ruoyi/demo/controller/TestBatchController.java |   33 +++++++++++++++++++++++++--------
 1 files changed, 25 insertions(+), 8 deletions(-)

diff --git a/ruoyi-demo/src/main/java/com/ruoyi/demo/controller/TestBatchController.java b/ruoyi-demo/src/main/java/com/ruoyi/demo/controller/TestBatchController.java
index db96797..ef117a1 100644
--- a/ruoyi-demo/src/main/java/com/ruoyi/demo/controller/TestBatchController.java
+++ b/ruoyi-demo/src/main/java/com/ruoyi/demo/controller/TestBatchController.java
@@ -35,21 +35,38 @@
      * 鏂板鎵归噺鏂规硶 鍙畬缇庢浛浠� saveBatch 绉掔骇鎻掑叆涓婁竾鏁版嵁 (瀵筸ysql璐熻嵎杈冨ぇ)
      */
 	@ApiOperation(value = "鏂板鎵归噺鏂规硶")
-    @PostMapping()
+    @PostMapping("/add")
 //	@DataSource(DataSourceType.SLAVE)
     public AjaxResult<Void> add() {
 		List<TestDemo> list = new ArrayList<>();
-		for (int i = 0; i < 10; i++) {
-			TestDemo testDemo = new TestDemo();
-			if (i % 2 == 0) {
-				list.add(testDemo.setId((long) i + 1).setTestKey("鎵归噺鏇存柊").setValue("鎵归噺鏇存柊"));
-			} else {
-				list.add(testDemo.setOrderNum(-1L).setTestKey("鎵归噺鏂板").setValue("娴嬭瘯鏂板"));
-			}
+		for (int i = 0; i < 1000; i++) {
+			list.add(new TestDemo().setOrderNum(-1L).setTestKey("鎵归噺鏂板").setValue("娴嬭瘯鏂板"));
 		}
         return toAjax(iTestDemoService.saveAll(list) ? 1 : 0);
     }
 
+	/**
+	 * 鏂板鎴栨洿鏂� 鍙畬缇庢浛浠� saveOrUpdateBatch 楂樻�ц兘
+	 */
+	@ApiOperation(value = "鏂板鎴栨洿鏂版壒閲忔柟娉�")
+	@PostMapping("/addOrUpdate")
+//	@DataSource(DataSourceType.SLAVE)
+	public AjaxResult<Void> addOrUpdate() {
+		List<TestDemo> list = new ArrayList<>();
+		for (int i = 0; i < 1000; i++) {
+			list.add(new TestDemo().setOrderNum(-1L).setTestKey("鎵归噺鏂板").setValue("娴嬭瘯鏂板"));
+		}
+		iTestDemoService.saveAll(list);
+		for (int i = 0; i < list.size(); i++) {
+			TestDemo testDemo = list.get(i);
+			testDemo.setTestKey("鎵归噺鏂板鎴栦慨鏀�").setValue("鎵归噺鏂板鎴栦慨鏀�");
+			if (i % 2 == 0) {
+				testDemo.setId(null);
+			}
+		}
+		return toAjax(iTestDemoService.saveOrUpdateAll(list) ? 1 : 0);
+	}
+
     /**
      * 鍒犻櫎鎵归噺鏂规硶
      */

--
Gitblit v1.9.3