From b7abdf9e6a3ddb71c8ce2ebcf6d26c4414dbb614 Mon Sep 17 00:00:00 2001
From: lxw <810412026@qq.com>
Date: 星期二, 14 六月 2022 16:53:35 +0800
Subject: [PATCH] 告警工单修改
---
src/main/java/com/whyc/controller/UserWorkController.java | 37 +++++++++++++++++++++++--------------
1 files changed, 23 insertions(+), 14 deletions(-)
diff --git a/src/main/java/com/whyc/controller/UserWorkController.java b/src/main/java/com/whyc/controller/UserWorkController.java
index 2fc4efc..d105f80 100644
--- a/src/main/java/com/whyc/controller/UserWorkController.java
+++ b/src/main/java/com/whyc/controller/UserWorkController.java
@@ -30,51 +30,60 @@
private WorkAlarmService workAlarmService;
@GetMapping("/searchAllByUserIdAndStatus")
- @ApiOperation(value = "鏌ヨ缁存姢鍛樺憡璀﹀垪琛�")
+ @ApiOperation(value = "鏌ヨ缁存姢鍛樺憡璀﹀垪琛�", notes = "鏃�:UserWorkAction!searchAllByUserIdAndStatus")
public Response searchAllByUserIdAndStatus(int pageNum,int pageSize,@RequestParam(required = false) Integer note){
UserInf user = ActionUtil.getUser();
return workAlarmService.searchByUserIdAndStatus(pageNum,pageSize,user.getUId().intValue(),note);
}
+
@PostMapping("/updateWorkAlarm")
- @ApiOperation(value = "鏇存柊宸ュ崟鍛婅")
+ @ApiOperation(value = "鏇存柊宸ュ崟鍛婅", notes = " 鏃�:UserWorkAction!updateWorkAlarm")
public Response updateWorkAlarm(@RequestBody WorkAlarm workAlarm){
return workAlarmService.updateWorkAlarm(workAlarm);
}
+
@GetMapping("/searchStatusById")
- @ApiOperation("閫氳繃id鑾峰彇鍛婅鐘舵�佹暟鎹�")
+ @ApiOperation(value = "閫氳繃id鑾峰彇鍛婅鐘舵�佹暟鎹�(寮�濮嬪鐞嗘洿鏂扮姸鎬�)", notes = "鏃� UserWorkAction!searchStatusById")
public Response searchStatusById(int id){
return workAlarmService.searchById(id);
}
@PostMapping("/uploadAlarmFile")
- @ApiOperation("涓婁紶鍥剧墖")
- @ApiImplicitParam(name = "file", value = "涓婁紶鐨勬枃浠�", dataTypeClass = MultipartFile.class, required = true,paramType = "form")
- public Response uploadAlarmFile(@RequestPart("file") List<MultipartFile> file, @RequestParam String json){
+ @ApiOperation(value = "涓婁紶鍥剧墖", notes = " 鏃�:MyFileAction!uploadAlarmFile")
+ @ApiImplicitParam(name = "file", value = "涓婁紶鐨勬枃浠�", dataTypeClass = MultipartFile.class, required = true, paramType = "form")
+ public Response uploadAlarmFile(@RequestPart("file") List<MultipartFile> file, @RequestParam String json) {
Gson gson = new Gson();
- UserWorkAlarmParam alarmParam = gson.fromJson(json,UserWorkAlarmParam.class);
- return userWorkService.uploadAlarmFile(file,alarmParam);
+ UserWorkAlarmParam alarmParam = gson.fromJson(json, UserWorkAlarmParam.class);
+ return userWorkService.uploadAlarmFile(file, alarmParam);
}
+
+ @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);
+ }
+
@PostMapping("/updateUserWork")
- @ApiOperation("鏇存柊鍛婅澶勭悊")
- public Response updateUserWork(@RequestBody UserWork userWork){
+ @ApiOperation(value = "鏇存柊鍛婅澶勭悊", notes = "鏃�:UserWorkAction!updateUserWork")
+ public Response updateUserWork(@RequestBody UserWork userWork) {
return userWorkService.addOrUpdate(userWork);
}
@PostMapping("/serchByCondition")
- @ApiOperation("鏌ヨ鍛婅澶勭悊璇︽儏")
- public Response serchByCondition(@RequestBody UserWork userWork){
+ @ApiOperation(value = "鏌ヨ鍛婅澶勭悊璇︽儏", notes = "鏃�:UserWorkAction!serchByCondition")
+ public Response serchByCondition(@RequestBody UserWork userWork) {
return userWorkService.searchByCondition(userWork);
}
@GetMapping("getTaskListWithFlag")
- @ApiOperation("鏌ヨ绠＄悊鍛樺憡璀﹀垪琛�")
+ @ApiOperation(value = "鏌ヨ绠＄悊鍛樺憡璀﹀垪琛�", notes = "鏃�:WorkAlarmAction!getTaskListWithFlag")
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);
}
@PostMapping("/dispatchTask")
- @ApiOperation("纭鎸囨淳浠诲姟璁㈠崟")
+ @ApiOperation(value = "纭鎸囨淳浠诲姟璁㈠崟", notes = "鏃�:WorkAlarmAction!dispatchTask")
public Response dispatchTask(@RequestBody List<WorkAlarm> alarmList){
return workAlarmService.dispatchTask(alarmList);
}
--
Gitblit v1.9.1