From d877cf557db5452093087fabb4479a10497ee218 Mon Sep 17 00:00:00 2001
From: zhanzhiqin <895896009@qq.com>
Date: 星期一, 28 二月 2022 18:25:32 +0800
Subject: [PATCH] fix
---
ximon-admin/src/main/java/com/sandu/ximon/admin/controller/BroadcastTerminalV2Controller.java | 24 ++++++++++++++----------
1 files changed, 14 insertions(+), 10 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 c695be3..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,12 +5,10 @@
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.GetMapping;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
import java.util.List;
@@ -31,14 +29,20 @@
return ResponseUtil.success("鍚屾瀹屾垚锛�");
}
- @GetMapping("/getBroadcastTerminalList")
- public ResponseVO<Object> getBroadcastTerminalList(BaseConditionVO baseConditionVO, BroadcastTerminalV2Param broadcastTerminalV2Param) {
- List<BroadcastTerminalV2Entity> list = broadcastTerminalV2Service.getBroadcastTerminalList(baseConditionVO, broadcastTerminalV2Param);
- return ResponseUtil.successPage(list);
+ @PostMapping("/getBroadcastTerminalList")
+ public ResponseVO<Object> getBroadcastTerminalList(BaseConditionVO baseConditionVO,
+ @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