From 8b464ee379c5b35ac8b22b4e5dde25c4f6fb75cf Mon Sep 17 00:00:00 2001
From: zengh <123456>
Date: Thu, 19 Aug 2021 15:03:05 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/java/org/springblade/modules/dispatcher/controller/DispatcherUnitController.java | 9 ++++++---
1 files changed, 6 insertions(+), 3 deletions(-)
diff --git a/src/main/java/org/springblade/modules/dispatcher/controller/DispatcherUnitController.java b/src/main/java/org/springblade/modules/dispatcher/controller/DispatcherUnitController.java
index aaaf3d3..3ff747d 100644
--- a/src/main/java/org/springblade/modules/dispatcher/controller/DispatcherUnitController.java
+++ b/src/main/java/org/springblade/modules/dispatcher/controller/DispatcherUnitController.java
@@ -22,6 +22,7 @@
import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiParam;
import lombok.AllArgsConstructor;
+import org.springblade.common.utils.arg;
import org.springblade.core.boot.ctrl.BladeController;
import org.springblade.core.mp.support.Condition;
import org.springblade.core.mp.support.Query;
@@ -113,8 +114,8 @@
* 新增或修改
*/
@PostMapping("/submit")
- public R submit(@Valid @RequestBody DispatcherUnit dispatcherUnit) {
- if (null==dispatcherUnit.getId()){
+ public R submit(@Valid @RequestBody DispatcherUnit dispatcherUnit) throws Exception {
+ if (null==dispatcherUnit.getId()) {
dispatcherUnit.setCreateTime(new Date());
}
return R.status(dispatcherUnitService.saveOrUpdate(dispatcherUnit));
@@ -126,7 +127,9 @@
*/
@PostMapping("/remove")
@ApiOperation(value = "删除", notes = "传入ids")
- public R remove(@ApiParam(value = "主键集合", required = true) @RequestParam String ids) {
+ public R remove(@ApiParam(value = "主键集合", required = true) @RequestParam String ids) throws Exception {
+ //内网删除
+ //arg.sendPostRemoveByIds(arg.url+"/dispatcherUnit/remove",ids);
return R.status(dispatcherUnitService.removeByIds(Func.toLongList(ids)));
}
--
Gitblit v1.9.3