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 |   13 +++++++------
 1 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/src/main/java/com/whyc/controller/AlarmManualClearController.java b/src/main/java/com/whyc/controller/AlarmManualClearController.java
index 12bf0f1..9469fba 100644
--- a/src/main/java/com/whyc/controller/AlarmManualClearController.java
+++ b/src/main/java/com/whyc/controller/AlarmManualClearController.java
@@ -17,14 +17,16 @@
 @RestController
 @Api(tags = "鍛婅鎵嬪姩娑堥櫎")
 @RequestMapping("alarmManualClear")
-public class AlarmManualClearController {
+public class AlarmManualClearController extends BaseController{
 
     @Autowired
     private AlarmManualClearService service;
 
     @PostMapping("submit")
     @ApiOperation("鎻愪氦鍛婅娑堥櫎")
-    public Response addClearSubmission(@RequestPart("file") List<MultipartFile> file, @RequestParam String clearJson){
+    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);
     }
@@ -37,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