From 9dd4f3549911f1253ccd9b934e8a5a90a7b2ce8c Mon Sep 17 00:00:00 2001
From: liuhaonan <konodioda2333@vip.qq.com>
Date: 星期四, 28 四月 2022 18:24:56 +0800
Subject: [PATCH] 大气数据推送到LED
---
ximon-admin/src/main/java/com/sandu/ximon/admin/controller/MonitorController.java | 37 ++-----------------------------------
1 files changed, 2 insertions(+), 35 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 203bc8d..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
@@ -37,26 +37,10 @@
*/
@PostMapping("/listMonitor")
public ResponseVO<Object> listMonitorByKeyword(BaseConditionVO baseConditionVO, @RequestBody(required = false) MonitorParam monitorParam) {
-// //鏌ヨ鏁版嵁搴撶殑鎽勫儚澶翠俊鎭垪琛�
-// 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("缂哄皯瀵瑰簲鐢ㄦ埛鏉冮檺");
}
- List<String> list;
- list = monitorMapper.listMonitorDeviceSerial();
-
- MonitorParam monitorParam1;
- for (String devices_serial : list) {
- monitorParam1 = new MonitorParam();
- monitorParam1.setAccessToken(monitorService.getAccessToken());
- monitorParam1.setDeviceSerial(devices_serial);
- getYSYMonitorInfoAndaddMonitorToTable(monitorParam1);
- }
//杩斿洖鏌ヨ鐨勬憚鍍忓ご淇℃伅鍒楄〃
List<MonitorBo> listresult;
if (monitorParam == null) {
@@ -189,25 +173,8 @@
*/
@PostMapping("/getYSYMonitorInfoAndaddMonitorToTable")
public boolean getYSYMonitorInfoAndaddMonitorToTable(@RequestBody MonitorParam monitorParam) {
- YSY_MonitorDto getMonitorDto = monitorService.getYSYMonitorInfo(monitorService.getAccessToken(), monitorParam.getDeviceSerial());
-
- if ("200".equals(getMonitorDto.getCode())) {
- Monitor monitor = new Monitor();
- monitor.setDeviceSerial(getMonitorDto.getData().getDeviceSerial());
- if (monitorParam.getValidateCode() != null) {
- 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());
-
- return monitorService.addMonitorInfoToTable(monitor);
- } else {
- throw new BusinessException(getMonitorDto.getMsg());
- }
+ Monitor monitor = monitorService.getYSYMonitorInfoAndaddMonitorToTable(monitorParam);
+ return monitorService.addMonitorInfoToTable(monitor);
}
/**
--
Gitblit v1.9.3