From 0f5b61e7faf30dce9281c913fae59aa9d05c61c4 Mon Sep 17 00:00:00 2001
From: liuhaonan <31457034@qq.com>
Date: 星期五, 23 九月 2022 16:53:22 +0800
Subject: [PATCH] changes

---
 ximon-admin/src/main/java/com/sandu/ximon/admin/utils/TerminalAPIUtils.java |   56 +++++++++-----------------------------------------------
 1 files changed, 9 insertions(+), 47 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 8de0610..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
@@ -3,14 +3,12 @@
 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.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;
@@ -25,13 +23,7 @@
      * @return
      */
     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
-        );
+        DataResponseVO responseVO = JSON.parseObject(BroadcastPostUtils.Post(new CommonRequestParams().put("id", terminalId).getParams(), BroadcastAPI.GET_TERMINAL.getUrl(), CharUtils.GBK), DataResponseVO.class);
 
         TerminalVO bean = responseVO.convert(TerminalVO.class);
 
@@ -49,13 +41,7 @@
      * 鑾峰彇缁堢鏈嶅姟鍣ㄥ璞″垪琛�
      */
     public static List<TerminalDto> getTerminalList() {
-        ListDataResponseVO responseVO = JSON.parseObject(
-                BroadcastPostUtils.Post(
-                        new CommonRequestParams().getParams(),
-                        BroadcastAPI.GET_TERMINAL_LIST.getUrl(),
-                        CharUtils.GBK),
-                ListDataResponseVO.class
-        );
+        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) {
@@ -81,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;
@@ -107,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;
@@ -136,17 +105,10 @@
             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()) {
             return true;
         }

--
Gitblit v1.9.3