From 2bd99e4b0cb672923d74cd46e21228f989e7b2d8 Mon Sep 17 00:00:00 2001
From: liuhaonan <konodioda2333@vip.qq.com>
Date: 星期五, 22 四月 2022 16:53:53 +0800
Subject: [PATCH] 首页
---
ximon-admin/src/main/java/com/sandu/ximon/admin/controller/MonitorController.java | 35 +++++++++++++++++++++++++++++------
1 files changed, 29 insertions(+), 6 deletions(-)
diff --git a/ximon-admin/src/main/java/com/sandu/ximon/admin/controller/MonitorController.java b/ximon-admin/src/main/java/com/sandu/ximon/admin/controller/MonitorController.java
index 9a9b077..203bc8d 100644
--- a/ximon-admin/src/main/java/com/sandu/ximon/admin/controller/MonitorController.java
+++ b/ximon-admin/src/main/java/com/sandu/ximon/admin/controller/MonitorController.java
@@ -114,10 +114,14 @@
*/
@PostMapping("/addYSYMonitor")
public ResponseVO<Object> addYSYMonitor(@RequestBody MonitorParam monitorParam) {
- YSY_MonitorDto addMonitorDto = monitorService.addYSYMonitor(monitorParam.getAccessToken(), monitorParam.getDeviceSerial(), monitorParam.getValidateCode());
+ if (monitorParam == null || monitorParam.getDeviceSerial() == null) {
+ throw new BusinessException("鍙傛暟涓嶆纭紒");
+ }
+ YSY_MonitorDto addMonitorDto = monitorService.addYSYMonitor(monitorService.getAccessToken(), monitorParam.getDeviceSerial(), monitorParam.getValidateCode());
// YSY_MonitorDto addMonitorDto = monitorService.addYSYMonitor(monitorParam.getAccessToken(), monitorParam.getDeviceSerial());
if ("200".equals(addMonitorDto.getCode())) {
+ getYSYMonitorInfoAndaddMonitorToTable(monitorParam);
return ResponseUtil.success(addMonitorDto);
} else if ("20017".equals(addMonitorDto.getCode())) {
//宸茬粡琚嚜宸辨坊鍔犵殑鎽勫儚澶撮渶瑕佹坊鍔犲埌鏁版嵁搴�
@@ -142,7 +146,7 @@
*/
@PostMapping("/deleteYSYMonitor")
public ResponseVO<Object> deleteYSYMonitor(@RequestBody MonitorParam monitorParam) {
- YSY_MonitorDto addMonitorDto = monitorService.deleteYSYMonitor(monitorParam.getAccessToken(), monitorParam.getDeviceSerial());
+ YSY_MonitorDto addMonitorDto = monitorService.deleteYSYMonitor(monitorService.getAccessToken(), monitorParam.getDeviceSerial());
if ("200".equals(addMonitorDto.getCode())) {
return ResponseUtil.success(addMonitorDto);
@@ -156,7 +160,7 @@
*/
@PostMapping("/getYSYMonitorInfo")
public ResponseVO<Object> getYSYMonitorInfo(@RequestBody MonitorParam monitorParam) {
- YSY_MonitorDto getMonitorDto = monitorService.getYSYMonitorInfo(monitorParam.getAccessToken(), monitorParam.getDeviceSerial());
+ YSY_MonitorDto getMonitorDto = monitorService.getYSYMonitorInfo(monitorService.getAccessToken(), monitorParam.getDeviceSerial());
if ("200".equals(getMonitorDto.getCode())) {
Monitor monitor = new Monitor();
@@ -185,12 +189,14 @@
*/
@PostMapping("/getYSYMonitorInfoAndaddMonitorToTable")
public boolean getYSYMonitorInfoAndaddMonitorToTable(@RequestBody MonitorParam monitorParam) {
- YSY_MonitorDto getMonitorDto = monitorService.getYSYMonitorInfo(monitorParam.getAccessToken(), monitorParam.getDeviceSerial());
+ YSY_MonitorDto getMonitorDto = monitorService.getYSYMonitorInfo(monitorService.getAccessToken(), monitorParam.getDeviceSerial());
if ("200".equals(getMonitorDto.getCode())) {
Monitor monitor = new Monitor();
monitor.setDeviceSerial(getMonitorDto.getData().getDeviceSerial());
-// monitor.setDevicesCode(monitorParam.getValidateCode());
+ if (monitorParam.getValidateCode() != null) {
+ monitor.setDevicesCode(monitorParam.getValidateCode());
+ }
monitor.setDeviceName(getMonitorDto.getData().getDeviceName());
monitor.setDeviceType(getMonitorDto.getData().getModel());
monitor.setEquipmentState(getMonitorDto.getData().getStatus());
@@ -230,10 +236,27 @@
*/
@PostMapping("/getMonitorVideoUrl")
public ResponseVO<Object> getMonitorVideoUrl(@RequestBody MonitorParam monitorParam) {
- String URL = monitorService.getMonitorVideoUrl(monitorParam.getAccessToken(),
+ String URL = monitorService.getMonitorVideoUrl(monitorService.getAccessToken(),
monitorParam.getDeviceSerial(), monitorParam.getProtocol(), monitorParam.getExpireTime());
return ResponseUtil.success(URL);
}
+
+ /**
+ * 淇敼澶囨敞
+ *
+ * @param monitorParam
+ * @return
+ */
+ @PostMapping("/updateNotes")
+ public ResponseVO<Object> updateNotes(@RequestBody MonitorParam monitorParam) {
+ boolean flag = monitorService.updateNotes(monitorParam.getDeviceSerial(), monitorParam.getNotes());
+ if (flag) {
+ return ResponseUtil.success("淇敼澶囨敞鎴愬姛锛�");
+ } else {
+ return ResponseUtil.fail("淇敼澶囨敞澶辫触锛�");
+ }
+ }
+
}
--
Gitblit v1.9.3