From 7b4e8c2fa93a973ed29c9f7ee1a5b9e539f85e1d Mon Sep 17 00:00:00 2001
From: zhanzhiqin <895896009@qq.com>
Date: 星期五, 14 十月 2022 18:50:03 +0800
Subject: [PATCH] 大气农耕
---
ximon-admin/src/main/java/com/sandu/ximon/admin/utils/TerminalAPIUtils.java | 95 +++++++++++++++++++++--------------------------
1 files changed, 43 insertions(+), 52 deletions(-)
diff --git a/ximon-admin/src/main/java/com/sandu/ximon/admin/utils/TerminalAPIUtils.java b/ximon-admin/src/main/java/com/sandu/ximon/admin/utils/TerminalAPIUtils.java
index 36506d0..2e33a26 100644
--- a/ximon-admin/src/main/java/com/sandu/ximon/admin/utils/TerminalAPIUtils.java
+++ b/ximon-admin/src/main/java/com/sandu/ximon/admin/utils/TerminalAPIUtils.java
@@ -1,13 +1,17 @@
package com.sandu.ximon.admin.utils;
import com.alibaba.fastjson.JSON;
+import com.sandu.common.execption.BusinessException;
import com.sandu.ximon.admin.config.BroadcastAPI;
+import com.sandu.ximon.admin.dto.TerminalDto;
import com.sandu.ximon.admin.utils.request.CommonRequestParams;
import com.sandu.ximon.admin.utils.response.CommonResponseVO;
import com.sandu.ximon.admin.utils.response.DataResponseVO;
import com.sandu.ximon.admin.vo.ListDataResponseVO;
import com.sandu.ximon.admin.vo.TerminalVO;
+import org.springframework.beans.BeanUtils;
+import java.util.ArrayList;
import java.util.List;
public class TerminalAPIUtils {
@@ -18,30 +22,40 @@
* @param terminalId
* @return
*/
- public static TerminalVO getTerminalInfo(Integer terminalId) {
- DataResponseVO responseVO = JSON.parseObject(
- BroadcastPostUtils.Post(
- new CommonRequestParams().put("id", terminalId).getParams(),
- BroadcastAPI.GET_TERMINAL.getUrl(),
- CharUtils.GBK),
- DataResponseVO.class
- );
+ public static TerminalDto getTerminalInfo(Integer terminalId) {
+ DataResponseVO responseVO = JSON.parseObject(BroadcastPostUtils.Post(new CommonRequestParams().put("id", terminalId).getParams(), BroadcastAPI.GET_TERMINAL.getUrl(), CharUtils.GBK), DataResponseVO.class);
- return responseVO.convert(TerminalVO.class);
+ TerminalVO bean = responseVO.convert(TerminalVO.class);
+
+ TerminalDto terminalDto = new TerminalDto();
+ BeanUtils.copyProperties(bean, terminalDto);
+ //鏍规嵁API涓婄殑鏇存柊瀛楁鍋氳祴鍊间慨鏀�
+ terminalDto.setVolumn(bean.getVolume());
+ terminalDto.setDefaultVolumn(bean.getFirstVol());
+ terminalDto.setDefaultPower(bean.getFirstPower());
+
+ return terminalDto;
}
/**
* 鑾峰彇缁堢鏈嶅姟鍣ㄥ璞″垪琛�
*/
- public static List<TerminalVO> getTerminalList() {
- ListDataResponseVO responseVO = JSON.parseObject(
- BroadcastPostUtils.Post(
- new CommonRequestParams().getParams(),
- BroadcastAPI.GET_TERMINAL_LIST.getUrl(),
- CharUtils.GBK),
- ListDataResponseVO.class
- );
- return responseVO.covertTerminalList();
+ public static List<TerminalDto> getTerminalList() {
+ ListDataResponseVO responseVO = JSON.parseObject(BroadcastPostUtils.Post(new CommonRequestParams().getParams(), BroadcastAPI.GET_TERMINAL_LIST.getUrl(), CharUtils.GBK), ListDataResponseVO.class);
+
+ List<TerminalDto> list = new ArrayList<>();
+ if (responseVO.covertTerminalList() != null) {
+ for (TerminalVO bean : responseVO.covertTerminalList()) {
+ TerminalDto terminalDto = new TerminalDto();
+ BeanUtils.copyProperties(bean, terminalDto);
+ //鏍规嵁API涓婄殑鏇存柊瀛楁鍋氳祴鍊间慨鏀�
+ terminalDto.setVolumn(bean.getVolume());
+ terminalDto.setDefaultVolumn(bean.getFirstVol());
+ terminalDto.setDefaultPower(bean.getFirstPower());
+ list.add(terminalDto);
+ }
+ }
+ return list;
}
/**
@@ -53,16 +67,7 @@
* @return
*/
public static boolean updateTerminal(Integer terminalId, TerminalVO terminalVO, Long userId) {
- CommonResponseVO responseVO = JSON.parseObject(
- BroadcastPostUtils.Post(
- new CommonRequestParams()
- .put("id", terminalId)
- .put("data", JSON.toJSONString(terminalVO))
- .getParams(),
- BroadcastAPI.UPDATE_TERMINAL.getUrl(),
- CharUtils.GBK),
- CommonResponseVO.class
- );
+ CommonResponseVO responseVO = JSON.parseObject(BroadcastPostUtils.Post(new CommonRequestParams().put("id", terminalId).put("data", JSON.toJSONString(terminalVO)).getParams(), BroadcastAPI.UPDATE_TERMINAL.getUrl(), CharUtils.GBK), CommonResponseVO.class);
if (responseVO.isOK()) {
// log("淇敼鎾斁缁堢(id:"+terminalId+", name:"+terminalVO.getName()+")",userId,null);
return true;
@@ -79,15 +84,7 @@
* @return
*/
public static boolean delTerminal(Integer terminalId, Long userId) {
- CommonResponseVO responseVO = JSON.parseObject(
- BroadcastPostUtils.Post(
- new CommonRequestParams()
- .put("id", terminalId)
- .getParams(),
- BroadcastAPI.DEL_TERMINAL.getUrl(),
- CharUtils.GBK),
- CommonResponseVO.class
- );
+ CommonResponseVO responseVO = JSON.parseObject(BroadcastPostUtils.Post(new CommonRequestParams().put("id", terminalId).getParams(), BroadcastAPI.DEL_TERMINAL.getUrl(), CharUtils.GBK), CommonResponseVO.class);
if (responseVO.isOK()) {
// log("鍒犻櫎鎾斁缁堢(id:"+terminalId+")",userId,null);
return true;
@@ -102,25 +99,19 @@
* @param terminalId
* @param defaultVolumn
*/
- public static boolean changeVol(Integer terminalId, Integer defaultVolumn, Long userId) {
- TerminalVO terminalInfo = getTerminalInfo(terminalId);
+ public static boolean changeVol(Integer terminalId, Integer defaultVolumn) {
+ TerminalDto terminalInfo = getTerminalInfo(terminalId);
+ if (terminalInfo == null) {
+ throw new BusinessException("IP闊虫煴纭欢璁惧涓嶅瓨鍦�");
+ }
terminalInfo.setDefaultVolumn(defaultVolumn);
- terminalInfo.setVolumn(defaultVolumn);
- CommonResponseVO responseVO = JSON.parseObject(
- BroadcastPostUtils.Post(
- new CommonRequestParams()
- .put("id", terminalId)
- .put("data", terminalInfo)
- .getParams(),
- BroadcastAPI.UPDATE_TERMINAL.getUrl(),
- CharUtils.GBK),
- CommonResponseVO.class
- );
+ terminalInfo.setVolume(defaultVolumn);
+
+ CommonResponseVO responseVO = JSON.parseObject(BroadcastPostUtils.Post(new CommonRequestParams().put("id", terminalId).put("data", terminalInfo).getParams(), BroadcastAPI.UPDATE_TERMINAL.getUrl(), CharUtils.GBK), CommonResponseVO.class);
+ System.out.println(responseVO + " response");
if (responseVO.isOK()) {
-// log("淇敼鎾斁缁堢闊抽噺(id:"+terminalId+")",userId,null);
return true;
}
-// logError("淇敼鎾斁缁堢闊抽噺澶辫触!(id:"+terminalId+")",userId,null);
return false;
}
--
Gitblit v1.9.3