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/AlarmManualClearController.java | 21 ++++++++++++++-------
1 files changed, 14 insertions(+), 7 deletions(-)
diff --git a/src/main/java/com/whyc/controller/AlarmManualClearController.java b/src/main/java/com/whyc/controller/AlarmManualClearController.java
index cb5a687..9469fba 100644
--- a/src/main/java/com/whyc/controller/AlarmManualClearController.java
+++ b/src/main/java/com/whyc/controller/AlarmManualClearController.java
@@ -4,23 +4,31 @@
import com.whyc.dto.Response;
import com.whyc.pojo.AlarmManualClear;
import com.whyc.service.AlarmManualClearService;
+import com.whyc.util.ActionUtil;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
+
+import javax.swing.*;
+import java.util.List;
@RestController
@Api(tags = "鍛婅鎵嬪姩娑堥櫎")
@RequestMapping("alarmManualClear")
-public class AlarmManualClearController {
+public class AlarmManualClearController extends BaseController{
@Autowired
private AlarmManualClearService service;
@PostMapping("submit")
@ApiOperation("鎻愪氦鍛婅娑堥櫎")
- public Response addClearSubmission(@RequestBody AlarmManualClear clear){
- return service.submit(clear);
+ public Response addClearSubmission(@RequestPart(value = "file",required = false) List<MultipartFile> file, @RequestParam String clearJson){
+ //灏哻learJson瀛楃涓插唴鐨�"monNum":"-"鏇挎崲涓�"monNum":0
+ clearJson = clearJson.replace("monNum\":\"-\"","monNum\":0");
+ AlarmManualClear clear = ActionUtil.getGson().fromJson(clearJson, AlarmManualClear.class);
+ return service.submit(file,clear);
}
@ApiOperation(value = "鏌ヨ鍏蜂綋鍛婅娑堥櫎璁板綍",notes = "蹇呬紶 alarmType,[battGroupId,mon_num,alm_signal_id]/[deviceId]/[powerDeviceId],alm_start_time,alm_id")
@@ -31,10 +39,9 @@
@ApiOperation("鏌ヨ鎵�鏈夊憡璀︽墜鍔ㄦ秷闄よ褰曞垎椤�")
- @GetMapping("page")
- public Response getPage(@RequestParam int pageNum,
- @RequestParam int pageSize){
- return service.getPage(pageNum,pageSize);
+ @PostMapping("page")
+ public Response getPage(@RequestBody AlarmManualClear param){
+ return service.getPage(param);
}
}
--
Gitblit v1.9.1