From 7563aba9cebb22433a6cd2ee6429432ac2176a86 Mon Sep 17 00:00:00 2001
From: whycxzp <perryhsu@163.com>
Date: 星期五, 18 八月 2023 09:20:46 +0800
Subject: [PATCH] 更新告警手动消除
---
src/main/java/com/whyc/controller/AlarmManualClearController.java | 10 ++++++++--
1 files changed, 8 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/whyc/controller/AlarmManualClearController.java b/src/main/java/com/whyc/controller/AlarmManualClearController.java
index cb5a687..12bf0f1 100644
--- a/src/main/java/com/whyc/controller/AlarmManualClearController.java
+++ b/src/main/java/com/whyc/controller/AlarmManualClearController.java
@@ -4,10 +4,15 @@
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 = "鍛婅鎵嬪姩娑堥櫎")
@@ -19,8 +24,9 @@
@PostMapping("submit")
@ApiOperation("鎻愪氦鍛婅娑堥櫎")
- public Response addClearSubmission(@RequestBody AlarmManualClear clear){
- return service.submit(clear);
+ public Response addClearSubmission(@RequestPart("file") List<MultipartFile> file, @RequestParam String clearJson){
+ 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")
--
Gitblit v1.9.1