From 58a72f5b844bc77490431fc66bad0be45ce90bd2 Mon Sep 17 00:00:00 2001
From: liuhaonan <31457034@qq.com>
Date: 星期一, 09 五月 2022 09:56:44 +0800
Subject: [PATCH] Changes
---
ximon-admin/src/main/java/com/sandu/ximon/admin/controller/MonitorController.java | 108 ++++-------------------------------------------------
1 files changed, 9 insertions(+), 99 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 9c49166..fba1c84 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,5 +1,6 @@
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;
@@ -11,7 +12,6 @@
import com.sandu.ximon.dao.bo.MonitorBo;
import com.sandu.ximon.dao.domain.Monitor;
import com.sandu.ximon.dao.enums.MenuEnum;
-import com.sandu.ximon.dao.mapper.MonitorMapper;
import lombok.AllArgsConstructor;
import org.springframework.web.bind.annotation.*;
@@ -26,7 +26,6 @@
public class MonitorController {
private final MonitorService monitorService;
- private final MonitorMapper monitorMapper;
private PermissionConfig permissionConfig;
@@ -37,35 +36,19 @@
*/
@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;
+ CommonPage commonPage;
if (monitorParam == null) {
- listresult = monitorService.listMonitorByKeyword(baseConditionVO, new MonitorParam());
+ commonPage = monitorService.listMonitorByKeyword(baseConditionVO, new MonitorParam());
} else {
- listresult = monitorService.listMonitorByKeyword(baseConditionVO, monitorParam);
+ commonPage = monitorService.listMonitorByKeyword(baseConditionVO, monitorParam);
}
- return ResponseUtil.successPage(listresult);
+ return ResponseUtil.success(commonPage);
}
@@ -96,17 +79,6 @@
}
/**
- * 鑾峰彇钀ょ煶浜戞憚鍍忓ご淇℃伅
- *
- * @param
- * @return
- */
- @GetMapping("/getYSYInfo/{deviceSerial}")
- public ResponseVO<Object> getMonitorInfo(@PathVariable String deviceSerial) {
- return ResponseUtil.success(monitorService.getMonitorInfo(deviceSerial));
- }
-
- /**
* 娣诲姞钀ょ煶浜戞憚鍍忓ご
*
* @param monitorParam 娣诲姞鎽勫儚澶寸粨鏋�
@@ -117,41 +89,13 @@
if (monitorParam == null || monitorParam.getDeviceSerial() == null) {
throw new BusinessException("鍙傛暟涓嶆纭紒");
}
- YSY_MonitorDto addMonitorDto = monitorService.addYSYMonitor(monitorService.getAccessToken(), monitorParam.getDeviceSerial(), monitorParam.getValidateCode());
-// YSY_MonitorDto addMonitorDto = monitorService.addYSYMonitor(monitorParam.getAccessToken(), monitorParam.getDeviceSerial());
+ boolean flag = monitorService.addYSYMonitor(monitorParam.getDeviceSerial(), monitorParam.getValidateCode());
- if ("200".equals(addMonitorDto.getCode())) {
- getYSYMonitorInfoAndaddMonitorToTable(monitorParam);
- return ResponseUtil.success(addMonitorDto);
- } else if ("20017".equals(addMonitorDto.getCode())) {
- //宸茬粡琚嚜宸辨坊鍔犵殑鎽勫儚澶撮渶瑕佹坊鍔犲埌鏁版嵁搴�
- boolean falg = getYSYMonitorInfoAndaddMonitorToTable(monitorParam);
- if (falg) {
- return ResponseUtil.success("娣诲姞鎽勫儚澶存垚鍔燂紒");
-
- } else {
- return ResponseUtil.fail("娣诲姞鎽勫儚澶村け璐ワ紒");
- }
+ if (flag) {
+ return ResponseUtil.success("娣诲姞鎽勫儚澶存垚鍔燂紒");
} else {
- return ResponseUtil.fail(addMonitorDto.getMsg());
- }
- }
-
- /**
- * 鍒犻櫎钀ょ煶浜戞憚鍍忓ご
- *
- * @param monitorParam 娣诲姞鎽勫儚澶寸粨鏋�
- * @return
- */
- @PostMapping("/deleteYSYMonitor")
- public ResponseVO<Object> deleteYSYMonitor(@RequestBody MonitorParam monitorParam) {
- YSY_MonitorDto addMonitorDto = monitorService.deleteYSYMonitor(monitorService.getAccessToken(), monitorParam.getDeviceSerial());
-
- if ("200".equals(addMonitorDto.getCode())) {
- return ResponseUtil.success(addMonitorDto);
- } else {
- return ResponseUtil.fail(addMonitorDto.getMsg());
+ return ResponseUtil.fail("娣诲姞鎽勫儚澶村け璐ワ紒");
}
}
@@ -177,40 +121,6 @@
return ResponseUtil.success(getMonitorDto.getData());
} else {
return ResponseUtil.fail(getMonitorDto.getMsg());
- }
- }
-
-
- /**
- * 鑾峰彇鍗曚釜璁惧淇℃伅骞朵笖瀛樺偍鍒版暟鎹簱
- *
- * @param monitorParam
- * @return
- */
- @PostMapping("/getYSYMonitorInfoAndaddMonitorToTable")
- public boolean getYSYMonitorInfoAndaddMonitorToTable(@RequestBody MonitorParam monitorParam) {
- Monitor monitor = monitorService.getYSYMonitorInfoAndaddMonitorToTable(monitorParam);
- return monitorService.addMonitorInfoToTable(monitor);
- }
-
- /**
- * 缂栬緫鎽勫儚澶磋澶囦俊鎭�
- */
- @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("鏇存柊鏁版嵁鎴愬姛");
- } else {
- return ResponseUtil.fail("鏇存柊鏁版嵁澶辫触");
}
}
--
Gitblit v1.9.3