From 28bf6e5a47b7235d829b5f1021cfbec1cb1811d6 Mon Sep 17 00:00:00 2001
From: liuhaonan <31457034@qq.com>
Date: 星期三, 03 八月 2022 16:29:38 +0800
Subject: [PATCH] changes

---
 ximon-admin/src/main/java/com/sandu/ximon/admin/utils/TerminalAPIUtils.java |   45 +++++++++++++++++++++++++++++++++++++--------
 1 files changed, 37 insertions(+), 8 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..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
@@ -1,13 +1,19 @@
 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.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.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 {
@@ -18,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(),
@@ -27,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(),
@@ -41,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;
     }
 
     /**
@@ -102,8 +130,11 @@
      * @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(
@@ -117,10 +148,8 @@
                 CommonResponseVO.class
         );
         if (responseVO.isOK()) {
-//            log("淇敼鎾斁缁堢闊抽噺(id:"+terminalId+")",userId,null);
             return true;
         }
-//        logError("淇敼鎾斁缁堢闊抽噺澶辫触!(id:"+terminalId+")",userId,null);
         return false;
     }
 

--
Gitblit v1.9.3