From e55c8b0a92eb9715edd90c31dfd4de51a47b588b Mon Sep 17 00:00:00 2001
From: liuhaonan <31457034@qq.com>
Date: 星期五, 04 十一月 2022 17:40:08 +0800
Subject: [PATCH] changes
---
ximon-admin/src/main/java/com/sandu/ximon/admin/controller/MonitorController.java | 176 +++++++++++++++++++++++++++-------------------------------
1 files changed, 81 insertions(+), 95 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 3a89509..e057fee 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,12 +1,16 @@
package com.sandu.ximon.admin.controller;
+import com.sandu.common.domain.CommonPage;
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.security.PermissionConfig;
import com.sandu.ximon.admin.service.MonitorService;
import com.sandu.ximon.dao.domain.Monitor;
-import com.sandu.ximon.admin.dto.YSY_MonitorDto;
+import com.sandu.ximon.dao.enums.MenuEnum;
import lombok.AllArgsConstructor;
import org.springframework.web.bind.annotation.*;
@@ -21,33 +25,47 @@
public class MonitorController {
private final MonitorService monitorService;
- @GetMapping
- public ResponseVO<Object> listMonitor() {
- List<Monitor> list = monitorService.listMonitor();
- return ResponseUtil.successPage(list);
- }
+ private PermissionConfig permissionConfig;
+
/**
* 妯＄硦鏌ヨ
*
* @return
*/
- @GetMapping("/listMonitorByKeyword")
- public ResponseVO<Object> listMonitorByKeyword(@RequestBody MonitorParam monitorParam) {
- List<Monitor> list = monitorService.listMonitorByKeyword(monitorParam);
- return ResponseUtil.successPage(list);
+ @PostMapping("/listMonitor")
+ public ResponseVO<Object> listMonitorByKeyword(BaseConditionVO baseConditionVO,
+ @RequestParam(value = "order", required = false) Integer order,
+ @RequestParam(value = "seq", required = false) Integer seq,
+ @RequestBody(required = false) MonitorParam monitorParam) {
+ if (!permissionConfig.check(MenuEnum.MONITOR_LIST.getCode())) {
+ return ResponseUtil.fail("缂哄皯瀵瑰簲鐢ㄦ埛鏉冮檺");
+ }
+
+ //杩斿洖鏌ヨ鐨勬憚鍍忓ご淇℃伅鍒楄〃
+ CommonPage commonPage;
+ if (monitorParam == null) {
+ commonPage = monitorService.listMonitorByKeyword(baseConditionVO, order, seq, new MonitorParam());
+ } else {
+ commonPage = monitorService.listMonitorByKeyword(baseConditionVO, order, seq, monitorParam);
+ }
+
+ return ResponseUtil.success(commonPage);
}
/**
* 鍒犻櫎鏁版嵁搴撲腑钀ょ煶浜戞憚鍍忓ご
*
- * @param id
+ * @param
* @return
*/
- @PostMapping("/delete/{id}")
- public ResponseVO<Object> deleteMonitor(@PathVariable Long id) {
- boolean result = monitorService.deleteMonitor(id);
+ @PostMapping("/delete")
+ public ResponseVO<Object> deleteMonitor(@RequestBody List<Long> ids) {
+ if (!permissionConfig.check(MenuEnum.MONITOR_DELETE.getCode())) {
+ return ResponseUtil.fail("缂哄皯瀵瑰簲鐢ㄦ埛鏉冮檺");
+ }
+ boolean result = monitorService.deleteMonitor(ids);
if (result) {
return ResponseUtil.success(null);
} else {
@@ -71,116 +89,84 @@
* @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());
-
- if ("200".equals(addMonitorDto.getCode())) {
- return ResponseUtil.success(addMonitorDto);
- } else if ("20017".equals(addMonitorDto.getCode())) {
- //宸茬粡琚嚜宸辨坊鍔犵殑鎽勫儚澶撮渶瑕佹坊鍔犲埌鏁版嵁搴�
- boolean falg = getYSYMonitorInfoAndaddMonitorToTable(monitorParam);
- if (falg) {
- return ResponseUtil.success("娣诲姞鎽勫儚澶存垚鍔燂紒");
-
- } else {
- return ResponseUtil.fail("娣诲姞鎽勫儚澶村け璐ワ紒");
- }
-
- } else {
- return ResponseUtil.fail(addMonitorDto.getMsg());
+ if (!permissionConfig.check(MenuEnum.MONITOR_ADD.getCode())) {
+ return ResponseUtil.fail("缂哄皯瀵瑰簲鐢ㄦ埛鏉冮檺");
}
- }
+ if (monitorParam == null || monitorParam.getDeviceSerial() == null) {
+ throw new BusinessException("鍙傛暟涓嶆纭紒");
+ }
+ boolean flag = monitorService.addYSYMonitor(monitorParam.getDeviceSerial(), monitorParam.getValidateCode());
- /**
- * 鍒犻櫎钀ょ煶浜戞憚鍍忓ご
- *
- * @param monitorParam 娣诲姞鎽勫儚澶寸粨鏋�
- * @return
- */
- @GetMapping("/deleteYSYMonitor")
- public ResponseVO<Object> deleteYSYMonitor(@RequestBody MonitorParam monitorParam) {
- YSY_MonitorDto addMonitorDto = monitorService.deleteYSYMonitor(monitorParam.getAccessToken(), monitorParam.getDeviceSerial());
+ if (flag) {
+ return ResponseUtil.success("娣诲姞鎽勫儚澶存垚鍔燂紒");
- if ("200".equals(addMonitorDto.getCode())) {
- return ResponseUtil.success(addMonitorDto);
} else {
- return ResponseUtil.fail(addMonitorDto.getMsg());
+ return ResponseUtil.fail("娣诲姞鎽勫儚澶村け璐ワ紒");
}
}
/**
* 鑾峰彇鍗曚釜璁惧淇℃伅 getYSYMonitorInfo
*/
- @GetMapping("/getYSYMonitorInfo")
+ @PostMapping("/getYSYMonitorInfo")
public ResponseVO<Object> getYSYMonitorInfo(@RequestBody MonitorParam monitorParam) {
- YSY_MonitorDto getMonitorDto = monitorService.getYSYMonitorInfo(monitorParam.getAccessToken(), monitorParam.getDeviceSerial());
+ if (!permissionConfig.check(MenuEnum.MONITOR_INFO.getCode())) {
+ return ResponseUtil.fail("缂哄皯瀵瑰簲鐢ㄦ埛鏉冮檺");
+ }
+ YSY_MonitorDto getMonitorDto = monitorService.getYSYMonitorInfo(monitorService.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());
}
}
+ /**
+ * 鑾峰彇鎽勫儚澶碪RL鎾斁鍦板潃
+ */
+ @PostMapping("/getMonitorVideoUrl")
+ public ResponseVO<Object> getMonitorVideoUrl(@RequestBody MonitorParam monitorParam) {
+ if (!permissionConfig.check(MenuEnum.MONITOR_VIDEO_URL.getCode())) {
+ return ResponseUtil.fail("缂哄皯瀵瑰簲鐢ㄦ埛鏉冮檺");
+ }
+ String URL = monitorService.getMonitorVideoUrl(monitorService.getAccessToken(),
+ monitorParam.getDeviceSerial(), monitorParam.getProtocol(), monitorParam.getExpireTime());
+
+ return ResponseUtil.success(URL);
+ }
+
/**
- * 鑾峰彇鍗曚釜璁惧淇℃伅骞朵笖瀛樺偍鍒版暟鎹簱
+ * 淇敼澶囨敞
*
* @param monitorParam
* @return
*/
- @GetMapping("/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.setDeviceName(getMonitorDto.getData().getDeviceName());
- monitor.setDeviceType(getMonitorDto.getData().getModel());
- monitor.setEquipmentStatus(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());
+ @PostMapping("/updateNotes")
+ public ResponseVO<Object> updateNotes(@RequestBody MonitorParam monitorParam) {
+ if (!permissionConfig.check(MenuEnum.MONITOR_NOTES.getCode())) {
+ return ResponseUtil.fail("缂哄皯瀵瑰簲鐢ㄦ埛鏉冮檺");
}
- }
-
- /**
- * 缂栬緫鎽勫儚澶磋澶囦俊鎭�
- */
- @PostMapping("/UpDateMonitorInfo")
- public ResponseVO<Object> UpDateMonitorInfo(@RequestBody MonitorParam monitorParam) {
- Monitor monitor = new Monitor();
- monitor.setId(monitorParam.getId());
- monitor.setDeviceSerial(monitorParam.getDeviceSerial());
- monitor.setDevicesCode(monitorParam.getDevicesCode());
- monitor.setWorkState(monitorParam.getWorkState());
- monitor.setNote(monitorParam.getNote());
-
- boolean falg = monitorService.upDateMonitorInfo(monitorParam);
-
- if (falg) {
- return ResponseUtil.success("鏇存柊鏁版嵁鎴愬姛");
+ boolean flag = monitorService.updateNotes(monitorParam.getDeviceSerial(), monitorParam.getNotes());
+ if (flag) {
+ return ResponseUtil.success("淇敼澶囨敞鎴愬姛锛�");
} else {
- return ResponseUtil.fail("鏇存柊鏁版嵁澶辫触");
+ return ResponseUtil.fail("淇敼澶囨敞澶辫触锛�");
}
- }
-
- /**
- * 鑾峰彇鎽勫儚澶碪RL鎾斁鍦板潃
- */
- @GetMapping("/getMonitorVideoUrl")
- public ResponseVO<Object> getMonitorVideoUrl(@RequestBody MonitorParam monitorParam) {
- String URL = monitorService.getMonitorVideoUrl(monitorParam.getAccessToken(),
- monitorParam.getDeviceSerial(), monitorParam.getProtocol(), monitorParam.getExpireTime());
-
- return ResponseUtil.success(URL);
}
}
--
Gitblit v1.9.3