From c39c198a1cfffd91b0ae81da1fb70df6ca8a2af1 Mon Sep 17 00:00:00 2001
From: zhanzhiqin <895896009@qq.com>
Date: 星期一, 21 三月 2022 18:01:19 +0800
Subject: [PATCH] C3充电桩设置间隔时间
---
ximon-admin/src/main/java/com/sandu/ximon/admin/controller/MonitorController.java | 59 +++++++++++++++++++++++++++++++++++++++++++++++------------
1 files changed, 47 insertions(+), 12 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..2285c0f 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
@@ -9,6 +9,7 @@
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.mapper.MonitorMapper;
import lombok.AllArgsConstructor;
import org.springframework.web.bind.annotation.*;
@@ -23,6 +24,9 @@
public class MonitorController {
private final MonitorService monitorService;
+ private final MonitorMapper monitorMapper;
+
+
/**
* 妯＄硦鏌ヨ
*
@@ -30,13 +34,32 @@
*/
@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 (monitorParam == null) {
+// list = monitorService.listMonitorByKeyword(baseConditionVO, new MonitorParam());
+// } else {
+// list = monitorService.listMonitorByKeyword(baseConditionVO, monitorParam);
+// }
+
+ 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);
}
- 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);
}
@@ -74,7 +97,8 @@
*/
@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(), monitorParam.getValidateCode());
+ YSY_MonitorDto addMonitorDto = monitorService.addYSYMonitor(monitorParam.getAccessToken(), monitorParam.getDeviceSerial());
if ("200".equals(addMonitorDto.getCode())) {
return ResponseUtil.success(addMonitorDto);
@@ -113,11 +137,22 @@
/**
* 鑾峰彇鍗曚釜璁惧淇℃伅 getYSYMonitorInfo
*/
- @GetMapping("/getYSYMonitorInfo")
+ @PostMapping("/getYSYMonitorInfo")
public ResponseVO<Object> getYSYMonitorInfo(@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.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());
@@ -138,10 +173,10 @@
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.setEquipmentStatus(getMonitorDto.getData().getStatus());
+ monitor.setEquipmentState(getMonitorDto.getData().getStatus());
monitor.setIsEncrypt(getMonitorDto.getData().getIsEncrypt());
monitor.setAddTime(getMonitorDto.getData().getUpdateTime());
monitor.setNetAddress(getMonitorDto.getData().getNetAddress());
@@ -176,8 +211,8 @@
/**
* 鑾峰彇鎽勫儚澶碪RL鎾斁鍦板潃
*/
- @GetMapping("/getMonitorVideoUrl")
- public ResponseVO<Object> getMonitorVideoUrl(@RequestParam MonitorParam monitorParam) {
+ @PostMapping("/getMonitorVideoUrl")
+ public ResponseVO<Object> getMonitorVideoUrl(@RequestBody MonitorParam monitorParam) {
String URL = monitorService.getMonitorVideoUrl(monitorParam.getAccessToken(),
monitorParam.getDeviceSerial(), monitorParam.getProtocol(), monitorParam.getExpireTime());
--
Gitblit v1.9.3