From 9f4c4e77bd7936645d174f21a6abf8951b533e8d Mon Sep 17 00:00:00 2001
From: liuhaonan <konodioda2333@vip.qq.com>
Date: 星期二, 18 一月 2022 17:51:10 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ximon-admin/src/main/java/com/sandu/ximon/admin/controller/BroadcastTerminalV2Controller.java | 18 ++++++++++++------
1 files changed, 12 insertions(+), 6 deletions(-)
diff --git a/ximon-admin/src/main/java/com/sandu/ximon/admin/controller/BroadcastTerminalV2Controller.java b/ximon-admin/src/main/java/com/sandu/ximon/admin/controller/BroadcastTerminalV2Controller.java
index e08f776..c0d0dde 100644
--- a/ximon-admin/src/main/java/com/sandu/ximon/admin/controller/BroadcastTerminalV2Controller.java
+++ b/ximon-admin/src/main/java/com/sandu/ximon/admin/controller/BroadcastTerminalV2Controller.java
@@ -5,6 +5,7 @@
import com.sandu.common.util.ResponseUtil;
import com.sandu.ximon.admin.param.BroadcastTerminalV2Param;
import com.sandu.ximon.admin.service.BroadcastTerminalV2Service;
+import com.sandu.ximon.dao.bo.BroadcastTerminalV2EntityBo;
import com.sandu.ximon.dao.domain.BroadcastTerminalV2Entity;
import lombok.AllArgsConstructor;
import org.springframework.web.bind.annotation.*;
@@ -28,15 +29,20 @@
return ResponseUtil.success("鍚屾瀹屾垚锛�");
}
- @GetMapping("/getBroadcastTerminalList")
+ @PostMapping("/getBroadcastTerminalList")
public ResponseVO<Object> getBroadcastTerminalList(BaseConditionVO baseConditionVO,
- @RequestParam(required = false) BroadcastTerminalV2Param broadcastTerminalV2Param) {
- List<BroadcastTerminalV2Entity> list = broadcastTerminalV2Service.getBroadcastTerminalList(baseConditionVO, broadcastTerminalV2Param);
- return ResponseUtil.successPage(list);
+ @RequestBody(required = false) BroadcastTerminalV2Param broadcastTerminalV2Param) {
+ List<BroadcastTerminalV2EntityBo> list = broadcastTerminalV2Service.getBroadcastTerminalList(baseConditionVO, broadcastTerminalV2Param);
+
+ if (2 != broadcastTerminalV2Param.getWorkState()) {
+ return ResponseUtil.success(list);
+ } else {
+ return ResponseUtil.successPage(list);
+ }
}
- @GetMapping("/changeVol")
- public ResponseVO<Object> changeVol(BroadcastTerminalV2Param broadcastTerminalV2Param) {
+ @PostMapping("/changeVol")
+ public ResponseVO<Object> changeVol(@RequestBody BroadcastTerminalV2Param broadcastTerminalV2Param) {
boolean flag = broadcastTerminalV2Service.changeVol(broadcastTerminalV2Param);
if (flag) {
return ResponseUtil.success("鎴愬姛淇敼闊抽噺锛�");
--
Gitblit v1.9.3