From e11aff139734ce34e4f7468170ebf0f62ccbb50b Mon Sep 17 00:00:00 2001
From: liuhaonan <konodioda2333@vip.qq.com>
Date: 星期二, 19 四月 2022 16:07:11 +0800
Subject: [PATCH] 首页
---
ximon-admin/src/main/java/com/sandu/ximon/admin/controller/MonitorController.java | 22 ++++++++++++++++++++--
1 files changed, 20 insertions(+), 2 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 dc1959e..9a9b077 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,11 @@
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.*;
@@ -25,6 +27,7 @@
private final MonitorService monitorService;
private final MonitorMapper monitorMapper;
+ private PermissionConfig permissionConfig;
/**
@@ -40,6 +43,9 @@
// } else {
// list = monitorService.listMonitorByKeyword(baseConditionVO, monitorParam);
// }
+ if (!permissionConfig.check(MenuEnum.MONITOR_LIST.getCode())) {
+ return ResponseUtil.fail("缂哄皯瀵瑰簲鐢ㄦ埛鏉冮檺");
+ }
List<String> list;
list = monitorMapper.listMonitorDeviceSerial();
@@ -90,6 +96,17 @@
}
/**
+ * 鑾峰彇钀ょ煶浜戞憚鍍忓ご淇℃伅
+ *
+ * @param
+ * @return
+ */
+ @GetMapping("/getYSYInfo/{deviceSerial}")
+ public ResponseVO<Object> getMonitorInfo(@PathVariable String deviceSerial) {
+ return ResponseUtil.success(monitorService.getMonitorInfo(deviceSerial));
+ }
+
+ /**
* 娣诲姞钀ょ煶浜戞憚鍍忓ご
*
* @param monitorParam 娣诲姞鎽勫儚澶寸粨鏋�
@@ -98,6 +115,7 @@
@PostMapping("/addYSYMonitor")
public ResponseVO<Object> addYSYMonitor(@RequestBody MonitorParam monitorParam) {
YSY_MonitorDto addMonitorDto = monitorService.addYSYMonitor(monitorParam.getAccessToken(), monitorParam.getDeviceSerial(), monitorParam.getValidateCode());
+// YSY_MonitorDto addMonitorDto = monitorService.addYSYMonitor(monitorParam.getAccessToken(), monitorParam.getDeviceSerial());
if ("200".equals(addMonitorDto.getCode())) {
return ResponseUtil.success(addMonitorDto);
@@ -143,7 +161,7 @@
if ("200".equals(getMonitorDto.getCode())) {
Monitor monitor = new Monitor();
monitor.setDeviceSerial(getMonitorDto.getData().getDeviceSerial());
- monitor.setDevicesCode(monitorParam.getValidateCode());
+// monitor.setDevicesCode(monitorParam.getValidateCode());
monitor.setDeviceName(getMonitorDto.getData().getDeviceName());
monitor.setDeviceType(getMonitorDto.getData().getModel());
monitor.setEquipmentState(getMonitorDto.getData().getStatus());
@@ -172,7 +190,7 @@
if ("200".equals(getMonitorDto.getCode())) {
Monitor monitor = new Monitor();
monitor.setDeviceSerial(getMonitorDto.getData().getDeviceSerial());
- monitor.setDevicesCode(monitorParam.getValidateCode());
+// monitor.setDevicesCode(monitorParam.getValidateCode());
monitor.setDeviceName(getMonitorDto.getData().getDeviceName());
monitor.setDeviceType(getMonitorDto.getData().getModel());
monitor.setEquipmentState(getMonitorDto.getData().getStatus());
--
Gitblit v1.9.3