From 054d89d13db52f800b4a9afd9398d6c56838e4ab Mon Sep 17 00:00:00 2001
From: liuhaonan <31457034@qq.com>
Date: 星期四, 21 七月 2022 12:04:07 +0800
Subject: [PATCH] 优化

---
 ximon-admin/src/main/java/com/sandu/ximon/admin/utils/TerminalAPIUtils.java |   12 ++++++++----
 1 files changed, 8 insertions(+), 4 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..f62923b 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,6 +1,7 @@
 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;
@@ -8,6 +9,7 @@
 import com.sandu.ximon.admin.vo.ListDataResponseVO;
 import com.sandu.ximon.admin.vo.TerminalVO;
 
+import java.util.ArrayList;
 import java.util.List;
 
 public class TerminalAPIUtils {
@@ -41,7 +43,8 @@
                         CharUtils.GBK),
                 ListDataResponseVO.class
         );
-        return responseVO.covertTerminalList();
+        return responseVO.covertTerminalList() == null ? new ArrayList<>() : responseVO.covertTerminalList();
+//        return responseVO.covertTerminalList();
     }
 
     /**
@@ -102,8 +105,11 @@
      * @param terminalId
      * @param defaultVolumn
      */
-    public static boolean changeVol(Integer terminalId, Integer defaultVolumn, Long userId) {
+    public static boolean changeVol(Integer terminalId, Integer defaultVolumn) {
         TerminalVO terminalInfo = getTerminalInfo(terminalId);
+        if (terminalInfo == null) {
+            throw new BusinessException("IP闊虫煴纭欢璁惧涓嶅瓨鍦�");
+        }
         terminalInfo.setDefaultVolumn(defaultVolumn);
         terminalInfo.setVolumn(defaultVolumn);
         CommonResponseVO responseVO = JSON.parseObject(
@@ -117,10 +123,8 @@
                 CommonResponseVO.class
         );
         if (responseVO.isOK()) {
-//            log("淇敼鎾斁缁堢闊抽噺(id:"+terminalId+")",userId,null);
             return true;
         }
-//        logError("淇敼鎾斁缁堢闊抽噺澶辫触!(id:"+terminalId+")",userId,null);
         return false;
     }
 

--
Gitblit v1.9.3