From d452a8fd59cd8b21bbd8371c56bc2df3af8cd7e8 Mon Sep 17 00:00:00 2001
From: liuhaonan <konodioda2333@vip.qq.com>
Date: 星期三, 12 一月 2022 10:32:21 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ximon-admin/src/main/java/com/sandu/ximon/admin/controller/MonitorController.java | 70 +++++++++++++++++++---------------
1 files changed, 39 insertions(+), 31 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 1f5908d..6fd0983 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
@@ -1,11 +1,14 @@
package com.sandu.ximon.admin.controller;
import com.sandu.common.domain.ResponseVO;
+import com.sandu.common.execption.BusinessException;
+import com.sandu.common.object.BaseConditionVO;
import com.sandu.common.util.ResponseUtil;
+import com.sandu.ximon.admin.dto.YSY_MonitorDto;
import com.sandu.ximon.admin.param.MonitorParam;
import com.sandu.ximon.admin.service.MonitorService;
+import com.sandu.ximon.dao.bo.MonitorBo;
import com.sandu.ximon.dao.domain.Monitor;
-import com.sandu.ximon.dao.domain.YSY_MonitorDto;
import lombok.AllArgsConstructor;
import org.springframework.web.bind.annotation.*;
@@ -20,20 +23,19 @@
public class MonitorController {
private final MonitorService monitorService;
- @GetMapping
- public ResponseVO<Object> listMonitor() {
- List<Monitor> list = monitorService.listMonitor();
- return ResponseUtil.successPage(list);
- }
-
/**
* 妯＄硦鏌ヨ
*
* @return
*/
- @GetMapping("/listMonitorByKeyword")
- public ResponseVO<Object> listMonitorByKeyword(@RequestBody MonitorParam monitorParam) {
- List<Monitor> list = monitorService.listMonitorByKeyword(monitorParam);
+ @PostMapping("/listMonitor")
+ public ResponseVO<Object> listMonitorByKeyword(BaseConditionVO baseConditionVO, @RequestBody(required = false) MonitorParam monitorParam) {
+ List<MonitorBo> list;
+ if (monitorParam == null) {
+ list = monitorService.listMonitorByKeyword(baseConditionVO, new MonitorParam());
+ } else {
+ list = monitorService.listMonitorByKeyword(baseConditionVO, monitorParam);
+ }
return ResponseUtil.successPage(list);
}
@@ -70,7 +72,7 @@
* @param monitorParam 娣诲姞鎽勫儚澶寸粨鏋�
* @return
*/
- @GetMapping("/addYSYMonitor")
+ @PostMapping("/addYSYMonitor")
public ResponseVO<Object> addYSYMonitor(@RequestBody MonitorParam monitorParam) {
YSY_MonitorDto addMonitorDto = monitorService.addYSYMonitor(monitorParam.getAccessToken(), monitorParam.getDeviceSerial(), monitorParam.getValidateCode());
@@ -78,8 +80,14 @@
return ResponseUtil.success(addMonitorDto);
} else if ("20017".equals(addMonitorDto.getCode())) {
//宸茬粡琚嚜宸辨坊鍔犵殑鎽勫儚澶撮渶瑕佹坊鍔犲埌鏁版嵁搴�
- getYSYMonitorInfoAndaddMonitorToTable(monitorParam);
- return ResponseUtil.error(20017, addMonitorDto.getMsg());
+ boolean falg = getYSYMonitorInfoAndaddMonitorToTable(monitorParam);
+ if (falg) {
+ return ResponseUtil.success("娣诲姞鎽勫儚澶存垚鍔燂紒");
+
+ } else {
+ return ResponseUtil.fail("娣诲姞鎽勫儚澶村け璐ワ紒");
+ }
+
} else {
return ResponseUtil.fail(addMonitorDto.getMsg());
}
@@ -91,7 +99,7 @@
* @param monitorParam 娣诲姞鎽勫儚澶寸粨鏋�
* @return
*/
- @GetMapping("/deleteYSYMonitor")
+ @PostMapping("/deleteYSYMonitor")
public ResponseVO<Object> deleteYSYMonitor(@RequestBody MonitorParam monitorParam) {
YSY_MonitorDto addMonitorDto = monitorService.deleteYSYMonitor(monitorParam.getAccessToken(), monitorParam.getDeviceSerial());
@@ -105,7 +113,7 @@
/**
* 鑾峰彇鍗曚釜璁惧淇℃伅 getYSYMonitorInfo
*/
- @GetMapping("/getYSYMonitorInfo")
+ @PostMapping("/getYSYMonitorInfo")
public ResponseVO<Object> getYSYMonitorInfo(@RequestBody MonitorParam monitorParam) {
YSY_MonitorDto getMonitorDto = monitorService.getYSYMonitorInfo(monitorParam.getAccessToken(), monitorParam.getDeviceSerial());
@@ -123,8 +131,8 @@
* @param monitorParam
* @return
*/
- @GetMapping("/getYSYMonitorInfoAndaddMonitorToTable")
- public ResponseVO<Object> getYSYMonitorInfoAndaddMonitorToTable(@RequestBody MonitorParam monitorParam) {
+ @PostMapping("/getYSYMonitorInfoAndaddMonitorToTable")
+ public boolean getYSYMonitorInfoAndaddMonitorToTable(@RequestBody MonitorParam monitorParam) {
YSY_MonitorDto getMonitorDto = monitorService.getYSYMonitorInfo(monitorParam.getAccessToken(), monitorParam.getDeviceSerial());
if ("200".equals(getMonitorDto.getCode())) {
@@ -137,26 +145,15 @@
monitor.setIsEncrypt(getMonitorDto.getData().getIsEncrypt());
monitor.setAddTime(getMonitorDto.getData().getUpdateTime());
monitor.setNetAddress(getMonitorDto.getData().getNetAddress());
- boolean flag = monitorService.addMonitorInfoToTable(monitor);
- if (flag) {
- return ResponseUtil.success("鍌ㄥ瓨鎽勫儚澶磋澶囦俊鎭垚鍔燂紒");
- } else {
-
- return ResponseUtil.fail("鍌ㄥ瓨鎽勫儚澶磋澶囦俊鎭け璐�!");
- }
-
+ return monitorService.addMonitorInfoToTable(monitor);
} else {
- return ResponseUtil.fail(getMonitorDto.getMsg());
+ throw new BusinessException(getMonitorDto.getMsg());
}
}
-
/**
- * 缂栬緫鎽勫儚澶磋澶囦俊鎭�
- */
- /**
- * 鑾峰彇鍗曚釜璁惧淇℃伅 getYSYMonitorInfo
+ * 缂栬緫鎽勫儚澶磋澶囦俊鎭�
*/
@PostMapping("/UpDateMonitorInfo")
public ResponseVO<Object> UpDateMonitorInfo(@RequestBody MonitorParam monitorParam) {
@@ -176,4 +173,15 @@
}
}
+ /**
+ * 鑾峰彇鎽勫儚澶碪RL鎾斁鍦板潃
+ */
+ @PostMapping("/getMonitorVideoUrl")
+ public ResponseVO<Object> getMonitorVideoUrl(@RequestBody MonitorParam monitorParam) {
+ String URL = monitorService.getMonitorVideoUrl(monitorParam.getAccessToken(),
+ monitorParam.getDeviceSerial(), monitorParam.getProtocol(), monitorParam.getExpireTime());
+
+ return ResponseUtil.success(URL);
+ }
+
}
--
Gitblit v1.9.3