From b67bd85fbe51486dcacf5a5e3b308e4a0f3e2e43 Mon Sep 17 00:00:00 2001
From: liuhaonan <konodioda2333@vip.qq.com>
Date: 星期日, 24 四月 2022 18:35:42 +0800
Subject: [PATCH] bug修复
---
ximon-admin/src/main/java/com/sandu/ximon/admin/controller/MonitorController.java | 102 ++++++++++++++++++++++++++++++++++++---------------
1 files changed, 72 insertions(+), 30 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 6e51eae..1741ba0 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
@@ -6,9 +6,12 @@
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.security.PermissionConfig;
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.enums.MenuEnum;
+import com.sandu.ximon.dao.mapper.MonitorMapper;
import lombok.AllArgsConstructor;
import org.springframework.web.bind.annotation.*;
@@ -23,6 +26,10 @@
public class MonitorController {
private final MonitorService monitorService;
+ private final MonitorMapper monitorMapper;
+ private PermissionConfig permissionConfig;
+
+
/**
* 妯＄硦鏌ヨ
*
@@ -30,13 +37,19 @@
*/
@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);
+ if (!permissionConfig.check(MenuEnum.MONITOR_LIST.getCode())) {
+ return ResponseUtil.fail("缂哄皯瀵瑰簲鐢ㄦ埛鏉冮檺");
}
- return ResponseUtil.successPage(list);
+
+ //杩斿洖鏌ヨ鐨勬憚鍍忓ご淇℃伅鍒楄〃
+ List<MonitorBo> listresult;
+ if (monitorParam == null) {
+ listresult = monitorService.listMonitorByKeyword(baseConditionVO, new MonitorParam());
+ } else {
+ listresult = monitorService.listMonitorByKeyword(baseConditionVO, monitorParam);
+ }
+
+ return ResponseUtil.successPage(listresult);
}
@@ -67,6 +80,17 @@
}
/**
+ * 鑾峰彇钀ょ煶浜戞憚鍍忓ご淇℃伅
+ *
+ * @param
+ * @return
+ */
+ @GetMapping("/getYSYInfo/{deviceSerial}")
+ public ResponseVO<Object> getMonitorInfo(@PathVariable String deviceSerial) {
+ return ResponseUtil.success(monitorService.getMonitorInfo(deviceSerial));
+ }
+
+ /**
* 娣诲姞钀ょ煶浜戞憚鍍忓ご
*
* @param monitorParam 娣诲姞鎽勫儚澶寸粨鏋�
@@ -74,9 +98,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())) {
//宸茬粡琚嚜宸辨坊鍔犵殑鎽勫儚澶撮渶瑕佹坊鍔犲埌鏁版嵁搴�
@@ -101,7 +130,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);
@@ -113,11 +142,22 @@
/**
* 鑾峰彇鍗曚釜璁惧淇℃伅 getYSYMonitorInfo
*/
- @GetMapping("/getYSYMonitorInfo")
+ @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();
+ monitor.setDeviceSerial(getMonitorDto.getData().getDeviceSerial());
+// monitor.setDevicesCode(monitorParam.getValidateCode());
+ monitor.setDeviceName(getMonitorDto.getData().getDeviceName());
+ monitor.setDeviceType(getMonitorDto.getData().getModel());
+ monitor.setEquipmentState(getMonitorDto.getData().getStatus());
+ monitor.setIsEncrypt(getMonitorDto.getData().getIsEncrypt());
+ monitor.setAddTime(getMonitorDto.getData().getUpdateTime());
+ monitor.setNetAddress(getMonitorDto.getData().getNetAddress());
+ monitorService.addMonitorInfoToTable(monitor);
+
return ResponseUtil.success(getMonitorDto.getData());
} else {
return ResponseUtil.fail(getMonitorDto.getMsg());
@@ -133,23 +173,8 @@
*/
@PostMapping("/getYSYMonitorInfoAndaddMonitorToTable")
public boolean getYSYMonitorInfoAndaddMonitorToTable(@RequestBody MonitorParam monitorParam) {
- YSY_MonitorDto getMonitorDto = monitorService.getYSYMonitorInfo(monitorParam.getAccessToken(), monitorParam.getDeviceSerial());
-
- if ("200".equals(getMonitorDto.getCode())) {
- Monitor monitor = new Monitor();
- monitor.setDeviceSerial(getMonitorDto.getData().getDeviceSerial());
- monitor.setDevicesCode(monitorParam.getValidateCode());
- monitor.setDeviceName(getMonitorDto.getData().getDeviceName());
- monitor.setDeviceType(getMonitorDto.getData().getModel());
- monitor.setEquipmentStatus(getMonitorDto.getData().getStatus());
- monitor.setIsEncrypt(getMonitorDto.getData().getIsEncrypt());
- monitor.setAddTime(getMonitorDto.getData().getUpdateTime());
- monitor.setNetAddress(getMonitorDto.getData().getNetAddress());
-
- return monitorService.addMonitorInfoToTable(monitor);
- } else {
- throw new BusinessException(getMonitorDto.getMsg());
- }
+ Monitor monitor = monitorService.getYSYMonitorInfoAndaddMonitorToTable(monitorParam);
+ return monitorService.addMonitorInfoToTable(monitor);
}
/**
@@ -176,12 +201,29 @@
/**
* 鑾峰彇鎽勫儚澶碪RL鎾斁鍦板潃
*/
- @GetMapping("/getMonitorVideoUrl")
- public ResponseVO<Object> getMonitorVideoUrl(@RequestParam MonitorParam monitorParam) {
- String URL = monitorService.getMonitorVideoUrl(monitorParam.getAccessToken(),
+ @PostMapping("/getMonitorVideoUrl")
+ public ResponseVO<Object> getMonitorVideoUrl(@RequestBody MonitorParam monitorParam) {
+ 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