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 | 37 +++++++++++++++++++++++++++++++++---- 1 files changed, 33 insertions(+), 4 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 499a5ad..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 @@ -5,6 +5,8 @@ import com.ruoyi.common.core.domain.AjaxResult; import com.ruoyi.demo.domain.TestDemo; import com.ruoyi.demo.service.ITestDemoService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; import lombok.RequiredArgsConstructor; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.DeleteMapping; @@ -21,6 +23,7 @@ * @author Lion Li * @date 2021-05-30 */ +@Api(value = "娴嬭瘯鎵归噺鏂规硶", tags = {"娴嬭瘯鎵归噺鏂规硶"}) @RequiredArgsConstructor(onConstructor_ = @Autowired) @RestController @RequestMapping("/demo/batch") @@ -29,9 +32,11 @@ private final ITestDemoService iTestDemoService; /** - * 鏂板鎵归噺鏂规硶 + * 鏂板鎵归噺鏂规硶 鍙畬缇庢浛浠� saveBatch 绉掔骇鎻掑叆涓婁竾鏁版嵁 (瀵筸ysql璐熻嵎杈冨ぇ) */ - @PostMapping() + @ApiOperation(value = "鏂板鎵归噺鏂规硶") + @PostMapping("/add") +// @DataSource(DataSourceType.SLAVE) public AjaxResult<Void> add() { List<TestDemo> list = new ArrayList<>(); for (int i = 0; i < 1000; i++) { @@ -40,11 +45,35 @@ 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); + } + /** - * 淇敼鎵归噺鏂规硶 + * 鍒犻櫎鎵归噺鏂规硶 */ + @ApiOperation(value = "鍒犻櫎鎵归噺鏂规硶") @DeleteMapping() - public AjaxResult<Void> edit() { +// @DataSource(DataSourceType.SLAVE) + public AjaxResult<Void> remove() { return toAjax(iTestDemoService.remove(new LambdaQueryWrapper<TestDemo>() .eq(TestDemo::getOrderNum, -1L)) ? 1 : 0); } -- Gitblit v1.9.3