From a41f60a19a3d32808a891b495898e7c2ab7ea145 Mon Sep 17 00:00:00 2001
From: zhanzhiqin <895896009@qq.com>
Date: 星期一, 28 三月 2022 15:27:13 +0800
Subject: [PATCH] 灯杆倾斜fix
---
ximon-admin/src/main/java/com/sandu/ximon/admin/controller/MonitorController.java | 72 +++++++++++++++++++++++++++---------
1 files changed, 54 insertions(+), 18 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 1bc0d87..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
@@ -2,11 +2,14 @@
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.admin.dto.YSY_MonitorDto;
+import com.sandu.ximon.dao.mapper.MonitorMapper;
import lombok.AllArgsConstructor;
import org.springframework.web.bind.annotation.*;
@@ -21,21 +24,42 @@
public class MonitorController {
private final MonitorService monitorService;
- @GetMapping
- public ResponseVO<Object> listMonitor() {
- List<Monitor> list = monitorService.listMonitor();
- return ResponseUtil.success(list);
- }
+ private final MonitorMapper monitorMapper;
+
/**
* 妯＄硦鏌ヨ
*
* @return
*/
- @PostMapping("/listMonitorByKeyword")
- public ResponseVO<Object> listMonitorByKeyword(@RequestBody MonitorParam monitorParam) {
- List<Monitor> list = monitorService.listMonitorByKeyword(monitorParam);
- return ResponseUtil.success(list);
+ @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);
+// }
+
+ 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) {
+ listresult = monitorService.listMonitorByKeyword(baseConditionVO, new MonitorParam());
+ } else {
+ listresult = monitorService.listMonitorByKeyword(baseConditionVO, monitorParam);
+ }
+
+ return ResponseUtil.successPage(listresult);
}
@@ -71,9 +95,10 @@
* @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());
+// 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);
@@ -98,7 +123,7 @@
* @param monitorParam 娣诲姞鎽勫儚澶寸粨鏋�
* @return
*/
- @GetMapping("/deleteYSYMonitor")
+ @PostMapping("/deleteYSYMonitor")
public ResponseVO<Object> deleteYSYMonitor(@RequestBody MonitorParam monitorParam) {
YSY_MonitorDto addMonitorDto = monitorService.deleteYSYMonitor(monitorParam.getAccessToken(), monitorParam.getDeviceSerial());
@@ -112,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());
@@ -130,17 +166,17 @@
* @param monitorParam
* @return
*/
- @GetMapping("/getYSYMonitorInfoAndaddMonitorToTable")
+ @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.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());
@@ -175,7 +211,7 @@
/**
* 鑾峰彇鎽勫儚澶碪RL鎾斁鍦板潃
*/
- @GetMapping("/getMonitorVideoUrl")
+ @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