From bb2b1a43c6e07b5defb8e5254dfe48096302cd81 Mon Sep 17 00:00:00 2001
From: zhanzhiqin <895896009@qq.com>
Date: 星期三, 22 十二月 2021 15:01:07 +0800
Subject: [PATCH] 摄像头
---
ximon-admin/src/main/java/com/sandu/ximon/admin/controller/MonitorController.java | 25 ++++++++++++-------------
ximon-admin/src/main/java/com/sandu/ximon/admin/service/MonitorService.java | 1 +
2 files changed, 13 insertions(+), 13 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 f23cb0b..d04639b 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
@@ -1,6 +1,7 @@
package com.sandu.ximon.admin.controller;
import com.sandu.common.domain.ResponseVO;
+import com.sandu.common.execption.BusinessException;
import com.sandu.common.util.ResponseUtil;
import com.sandu.ximon.admin.param.MonitorParam;
import com.sandu.ximon.admin.service.MonitorService;
@@ -78,8 +79,14 @@
return ResponseUtil.success(addMonitorDto);
} else if ("20017".equals(addMonitorDto.getCode())) {
//宸茬粡琚嚜宸辨坊鍔犵殑鎽勫儚澶撮渶瑕佹坊鍔犲埌鏁版嵁搴�
- getYSYMonitorInfoAndaddMonitorToTable(monitorParam);
- return ResponseUtil.error(20017, addMonitorDto.getMsg());
+ boolean falg = getYSYMonitorInfoAndaddMonitorToTable(monitorParam);
+ if (falg) {
+ return ResponseUtil.success("娣诲姞鎽勫儚澶存垚鍔燂紒");
+
+ } else {
+ return ResponseUtil.fail("娣诲姞鎽勫儚澶村け璐ワ紒");
+ }
+
} else {
return ResponseUtil.fail(addMonitorDto.getMsg());
}
@@ -124,7 +131,7 @@
* @return
*/
@GetMapping("/getYSYMonitorInfoAndaddMonitorToTable")
- public ResponseVO<Object> getYSYMonitorInfoAndaddMonitorToTable(@RequestBody MonitorParam monitorParam) {
+ public boolean getYSYMonitorInfoAndaddMonitorToTable(@RequestBody MonitorParam monitorParam) {
YSY_MonitorDto getMonitorDto = monitorService.getYSYMonitorInfo(monitorParam.getAccessToken(), monitorParam.getDeviceSerial());
if ("200".equals(getMonitorDto.getCode())) {
@@ -137,20 +144,12 @@
monitor.setIsEncrypt(getMonitorDto.getData().getIsEncrypt());
monitor.setAddTime(getMonitorDto.getData().getUpdateTime());
monitor.setNetAddress(getMonitorDto.getData().getNetAddress());
- boolean flag = monitorService.addMonitorInfoToTable(monitor);
- if (flag) {
- return ResponseUtil.success("鍌ㄥ瓨鎽勫儚澶磋澶囦俊鎭垚鍔燂紒");
- } else {
-
- return ResponseUtil.fail("鍌ㄥ瓨鎽勫儚澶磋澶囦俊鎭け璐�!");
- }
-
+ return monitorService.addMonitorInfoToTable(monitor);
} else {
- return ResponseUtil.fail(getMonitorDto.getMsg());
+ throw new BusinessException(getMonitorDto.getMsg());
}
}
-
/**
* 缂栬緫鎽勫儚澶磋澶囦俊鎭�
diff --git a/ximon-admin/src/main/java/com/sandu/ximon/admin/service/MonitorService.java b/ximon-admin/src/main/java/com/sandu/ximon/admin/service/MonitorService.java
index ebb6a7b..30dbb63 100644
--- a/ximon-admin/src/main/java/com/sandu/ximon/admin/service/MonitorService.java
+++ b/ximon-admin/src/main/java/com/sandu/ximon/admin/service/MonitorService.java
@@ -175,6 +175,7 @@
if (one == null) {
return save(monitor);
} else {
+ monitor.setId(one.getId());
return updateById(monitor);
}
}
--
Gitblit v1.9.3