From e16302f9d475c7cc4dd18c5abf1a23cb5502e362 Mon Sep 17 00:00:00 2001
From: whyclxw <810412026@qq.com>
Date: 星期三, 28 五月 2025 14:57:56 +0800
Subject: [PATCH] 密码验证加-
---
src/main/java/com/whyc/controller/UserWorkController.java | 23 +++++++++++++++--------
1 files changed, 15 insertions(+), 8 deletions(-)
diff --git a/src/main/java/com/whyc/controller/UserWorkController.java b/src/main/java/com/whyc/controller/UserWorkController.java
index d105f80..e2a815f 100644
--- a/src/main/java/com/whyc/controller/UserWorkController.java
+++ b/src/main/java/com/whyc/controller/UserWorkController.java
@@ -17,13 +17,14 @@
import org.springframework.web.multipart.MultipartFile;
import javax.annotation.Resource;
+import javax.servlet.http.HttpServletRequest;
import java.util.List;
@RestController
@RequestMapping("userwork")
@Api(tags = "鍛婅娲惧崟")
@Slf4j
-public class UserWorkController {
+public class UserWorkController extends BaseController{
@Resource
private UserWorkService userWorkService;
@Resource
@@ -59,8 +60,9 @@
@GetMapping("/deleteAlarmFile")
@ApiOperation(value = "鍒犻櫎鍥剧墖", notes = " 鏃�:MyFileAction!deleteAlarmFile")
- public Response deleteAlarmFile(@RequestParam String fileNames, @RequestParam int stationId, @RequestParam String afterOrBefore) {
- return userWorkService.deleteAlarmFile(fileNames, stationId, afterOrBefore);
+ public Response deleteAlarmFile(@RequestParam String fileNames, @RequestParam int stationId, @RequestParam String afterOrBefore, HttpServletRequest request) {
+
+ return userWorkService.deleteAlarmFile(fileNames, stationId, afterOrBefore,request);
}
@PostMapping("/updateUserWork")
@@ -77,18 +79,23 @@
@GetMapping("getTaskListWithFlag")
@ApiOperation(value = "鏌ヨ绠＄悊鍛樺憡璀﹀垪琛�", notes = "鏃�:WorkAlarmAction!getTaskListWithFlag")
- public Response getTaskListWithFlag(@RequestParam Integer note,@RequestParam int pageNum,@RequestParam int pageSize){
+ public Response getTaskListWithFlag(@RequestParam Integer note, @RequestParam int pageNum, @RequestParam int pageSize) {
UserInf userInf = ActionUtil.getUser();
- return workAlarmService.getTaskListWithFlag(userInf.getUId().intValue(),note,pageNum,pageSize);
+ return workAlarmService.getTaskListWithFlag(userInf.getUId().intValue(), note, pageNum, pageSize);
+ }
+
+ @GetMapping("getTaskListWithFlagNew")
+ @ApiOperation(value = "鏌ヨ绠＄悊鍛樺憡璀﹀垪琛�2.0椤甸潰", notes = "鏃�:WorkAlarmAction!getTaskListWithFlag")
+ public Response getTaskListWithFlagNew(@RequestParam Integer note, @RequestParam int pageNum, @RequestParam int pageSize) {
+ UserInf userInf = ActionUtil.getUser();
+ return workAlarmService.getTaskListWithFlagNew(userInf.getUId().intValue(), note, pageNum, pageSize);
}
@PostMapping("/dispatchTask")
@ApiOperation(value = "纭鎸囨淳浠诲姟璁㈠崟", notes = "鏃�:WorkAlarmAction!dispatchTask")
- public Response dispatchTask(@RequestBody List<WorkAlarm> alarmList){
+ public Response dispatchTask(@RequestBody List<WorkAlarm> alarmList) {
return workAlarmService.dispatchTask(alarmList);
}
-
-
}
--
Gitblit v1.9.1