From e36e8f77581314541b27bcf43dd99bbc2c916255 Mon Sep 17 00:00:00 2001
From: 疯狂的狮子Li <15040126243@163.com>
Date: 星期一, 13 一月 2025 13:36:12 +0800
Subject: [PATCH] fix 修复 satoken dao层获取timeout为秒导致丢失毫秒进度问题(临时修复 等satoken官方解决)
---
ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/controller/TestLeaveController.java | 19 +++++++++----------
1 files changed, 9 insertions(+), 10 deletions(-)
diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/controller/TestLeaveController.java b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/controller/TestLeaveController.java
index cc83c28..e1c246f 100644
--- a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/controller/TestLeaveController.java
+++ b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/controller/TestLeaveController.java
@@ -15,7 +15,6 @@
import org.dromara.common.mybatis.core.page.PageQuery;
import org.dromara.common.mybatis.core.page.TableDataInfo;
import org.dromara.common.web.core.BaseController;
-import org.dromara.workflow.domain.TestLeave;
import org.dromara.workflow.domain.bo.TestLeaveBo;
import org.dromara.workflow.domain.vo.TestLeaveVo;
import org.dromara.workflow.service.ITestLeaveService;
@@ -33,7 +32,7 @@
@Validated
@RequiredArgsConstructor
@RestController
-@RequestMapping("/demo/leave")
+@RequestMapping("/workflow/leave")
public class TestLeaveController extends BaseController {
private final ITestLeaveService testLeaveService;
@@ -41,7 +40,7 @@
/**
* 鏌ヨ璇峰亣鍒楄〃
*/
- @SaCheckPermission("demo:leave:list")
+ @SaCheckPermission("workflow:leave:list")
@GetMapping("/list")
public TableDataInfo<TestLeaveVo> list(TestLeaveBo bo, PageQuery pageQuery) {
return testLeaveService.queryPageList(bo, pageQuery);
@@ -50,7 +49,7 @@
/**
* 瀵煎嚭璇峰亣鍒楄〃
*/
- @SaCheckPermission("demo:leave:export")
+ @SaCheckPermission("workflow:leave:export")
@Log(title = "璇峰亣", businessType = BusinessType.EXPORT)
@PostMapping("/export")
public void export(TestLeaveBo bo, HttpServletResponse response) {
@@ -63,7 +62,7 @@
*
* @param id 涓婚敭
*/
- @SaCheckPermission("demo:leave:query")
+ @SaCheckPermission("workflow:leave:query")
@GetMapping("/{id}")
public R<TestLeaveVo> getInfo(@NotNull(message = "涓婚敭涓嶈兘涓虹┖")
@PathVariable Long id) {
@@ -73,22 +72,22 @@
/**
* 鏂板璇峰亣
*/
- @SaCheckPermission("demo:leave:add")
+ @SaCheckPermission("workflow:leave:add")
@Log(title = "璇峰亣", businessType = BusinessType.INSERT)
@RepeatSubmit()
@PostMapping()
- public R<TestLeave> add(@Validated(AddGroup.class) @RequestBody TestLeaveBo bo) {
+ public R<TestLeaveVo> add(@Validated(AddGroup.class) @RequestBody TestLeaveBo bo) {
return R.ok(testLeaveService.insertByBo(bo));
}
/**
* 淇敼璇峰亣
*/
- @SaCheckPermission("demo:leave:edit")
+ @SaCheckPermission("workflow:leave:edit")
@Log(title = "璇峰亣", businessType = BusinessType.UPDATE)
@RepeatSubmit()
@PutMapping()
- public R<TestLeave> edit(@Validated(EditGroup.class) @RequestBody TestLeaveBo bo) {
+ public R<TestLeaveVo> edit(@Validated(EditGroup.class) @RequestBody TestLeaveBo bo) {
return R.ok(testLeaveService.updateByBo(bo));
}
@@ -97,7 +96,7 @@
*
* @param ids 涓婚敭涓�
*/
- @SaCheckPermission("demo:leave:remove")
+ @SaCheckPermission("workflow:leave:remove")
@Log(title = "璇峰亣", businessType = BusinessType.DELETE)
@DeleteMapping("/{ids}")
public R<Void> remove(@NotEmpty(message = "涓婚敭涓嶈兘涓虹┖")
--
Gitblit v1.9.3