From 77edfb324184d304ae7763aae3ab609f2b495da4 Mon Sep 17 00:00:00 2001
From: zhanzhiqin <895896009@qq.com>
Date: 星期五, 22 七月 2022 17:31:47 +0800
Subject: [PATCH] fix
---
ximon-admin/src/main/java/com/sandu/ximon/admin/utils/TerminalAPIUtils.java | 37 +++++++++++++++++++++++++++++++------
1 files changed, 31 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 f62923b..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,7 +7,11 @@
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;
@@ -20,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(),
@@ -29,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(),
@@ -43,8 +56,20 @@
CharUtils.GBK),
ListDataResponseVO.class
);
- return responseVO.covertTerminalList() == null ? new ArrayList<>() : responseVO.covertTerminalList();
-// 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;
}
/**
@@ -106,7 +131,7 @@
* @param defaultVolumn
*/
public static boolean changeVol(Integer terminalId, Integer defaultVolumn) {
- TerminalVO terminalInfo = getTerminalInfo(terminalId);
+ TerminalDto terminalInfo = getTerminalInfo(terminalId);
if (terminalInfo == null) {
throw new BusinessException("IP闊虫煴纭欢璁惧涓嶅瓨鍦�");
}
--
Gitblit v1.9.3