From 38b60d99fc04db878c43cb9f6d03476a30979be6 Mon Sep 17 00:00:00 2001
From: liuhaonan <31457034@qq.com>
Date: 星期四, 21 七月 2022 14:23:55 +0800
Subject: [PATCH] 优化
---
ximon-admin/src/main/java/com/sandu/ximon/admin/utils/TerminalAPIUtils.java | 39 +++++++++++++++++++++++++++++++++------
1 files changed, 33 insertions(+), 6 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 3150fb5..8de0610 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
@@ -7,8 +7,13 @@
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.dto.TerminalDto;
import com.sandu.ximon.admin.vo.TerminalVO;
+import jodd.bean.BeanCopy;
+import jodd.bean.BeanUtil;
+import org.springframework.beans.BeanUtils;
+import java.util.ArrayList;
import java.util.List;
public class TerminalAPIUtils {
@@ -19,7 +24,7 @@
* @param terminalId
* @return
*/
- public static TerminalVO getTerminalInfo(Integer terminalId) {
+ public static TerminalDto getTerminalInfo(Integer terminalId) {
DataResponseVO responseVO = JSON.parseObject(
BroadcastPostUtils.Post(
new CommonRequestParams().put("id", terminalId).getParams(),
@@ -28,13 +33,22 @@
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() {
+ public static List<TerminalDto> getTerminalList() {
ListDataResponseVO responseVO = JSON.parseObject(
BroadcastPostUtils.Post(
new CommonRequestParams().getParams(),
@@ -42,7 +56,20 @@
CharUtils.GBK),
ListDataResponseVO.class
);
- return responseVO.covertTerminalList();
+
+ 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;
}
/**
@@ -104,8 +131,8 @@
* @param defaultVolumn
*/
public static boolean changeVol(Integer terminalId, Integer defaultVolumn) {
- TerminalVO terminalInfo = getTerminalInfo(terminalId);
- if(terminalInfo == null){
+ TerminalDto terminalInfo = getTerminalInfo(terminalId);
+ if (terminalInfo == null) {
throw new BusinessException("IP闊虫煴纭欢璁惧涓嶅瓨鍦�");
}
terminalInfo.setDefaultVolumn(defaultVolumn);
--
Gitblit v1.9.3