From 681d31e1de290eebd5f5ecb0a0e07a2a66cd01ae Mon Sep 17 00:00:00 2001
From: liuhaonan <31457034@qq.com>
Date: 星期四, 04 八月 2022 17:56:17 +0800
Subject: [PATCH] changes

---
 ximon-admin/src/main/java/com/sandu/ximon/admin/utils/VnnoxProgramAPIUtil.java |   48 +++++++++++++++++++-----------------------------
 1 files changed, 19 insertions(+), 29 deletions(-)

diff --git a/ximon-admin/src/main/java/com/sandu/ximon/admin/utils/VnnoxProgramAPIUtil.java b/ximon-admin/src/main/java/com/sandu/ximon/admin/utils/VnnoxProgramAPIUtil.java
index f9bb1f1..3f5f0d8 100644
--- a/ximon-admin/src/main/java/com/sandu/ximon/admin/utils/VnnoxProgramAPIUtil.java
+++ b/ximon-admin/src/main/java/com/sandu/ximon/admin/utils/VnnoxProgramAPIUtil.java
@@ -2,7 +2,9 @@
 
 import com.alibaba.fastjson.JSON;
 import com.sandu.ximon.admin.config.VnnoxUrl;
-import com.sandu.ximon.admin.dto.nova.*;
+import com.sandu.ximon.admin.dto.nova.AirDataProgram;
+import com.sandu.ximon.admin.dto.nova.PlayerProgram;
+import com.sandu.ximon.admin.dto.nova.ProgramSchedule;
 import com.sandu.ximon.admin.utils.request.CommonHeader;
 import com.sandu.ximon.admin.utils.response.VnnoxResultResponse;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -15,13 +17,14 @@
     @Autowired
     private RedisUtils redisUtils;
 
-    public static VnnoxProgramAPIUtil getBean(){
+    public static VnnoxProgramAPIUtil getBean() {
         return (VnnoxProgramAPIUtil) SpringContextUtil.getBean("VnnoxProgramAPIUtil");
     }
 
 
     /**
      * 澶ф皵淇℃伅鎺ㄩ��
+     *
      * @param
      * @return
      */
@@ -33,48 +36,51 @@
                 new CommonHeader(CommonHeader.JSON, true)
         );
         System.out.println(program.toJson());
-        LogUtils.error("鑺傜洰鎾斁response:"+result);
-        return JSON.parseObject(result,VnnoxResultResponse.class);
+        LogUtils.error("鑺傜洰鎾斁response:" + result);
+        return JSON.parseObject(result, VnnoxResultResponse.class);
     }
 
 
     /**
      * 鏅�氳妭鐩挱鏀�
+     *
      * @param
      * @return
      */
     public VnnoxResultResponse normalProgram(PlayerProgram program) {
 
         String result = VnnoxRequestUtil.PostWithHeader(
-                VnnoxUrl.getUrl(VnnoxUrl.NORMAL_PROGRAM),
+                VnnoxUrl.getUrl(VnnoxUrl.WEATHER),
                 program.toJson(),
                 new CommonHeader(CommonHeader.JSON, true)
         );
         System.out.println(program.toJson());
-        LogUtils.error("鏅�氳妭鐩挱鏀緍esponse:"+result);
-        return JSON.parseObject(result,VnnoxResultResponse.class);
+        LogUtils.error("鏅�氳妭鐩挱鏀緍esponse:" + result);
+        return JSON.parseObject(result, VnnoxResultResponse.class);
     }
 
     /**
      * 瀹炴椂鑺傜洰鎾斁
+     *
      * @param
      * @return
      */
-    public VnnoxResultResponse pushProgram(ProgramPush program) {
+    public VnnoxResultResponse pushProgram(PlayerProgram program) {
 
         String result = VnnoxRequestUtil.PostWithHeader(
-                VnnoxUrl.getUrl(VnnoxUrl.NORMAL_PROGRAM),
+                VnnoxUrl.getUrl(VnnoxUrl.WEATHER),
                 program.toJson(),
                 new CommonHeader(CommonHeader.JSON, true)
         );
         System.out.println(program.toJson());
-        LogUtils.error("鏅�氳妭鐩挱鏀緍esponse:"+result);
-        return JSON.parseObject(result,VnnoxResultResponse.class);
+        LogUtils.error("鏅�氳妭鐩挱鏀緍esponse:" + result);
+        return JSON.parseObject(result, VnnoxResultResponse.class);
     }
 
 
     /**
      * 瀹氭椂鑺傜洰鎾斁
+     *
      * @param program
      * @return
      */
@@ -84,27 +90,11 @@
                 program.toJson(),
                 new CommonHeader(CommonHeader.JSON, true)
         );
-        LogUtils.error("瀹氭椂浠诲姟response:"+result);
-        return JSON.parseObject(result,VnnoxResultResponse.class);
+        LogUtils.error("瀹氭椂浠诲姟response:" + result);
+        return JSON.parseObject(result, VnnoxResultResponse.class);
     }
 
 
-    /**
-     * 澶╂皵
-     * @param program
-     * @return
-     */
-    public VnnoxResultResponse pushWeather(WeatherProgram program) {
-
-        String result = VnnoxRequestUtil.PostWithHeader(
-                VnnoxUrl.getUrl(VnnoxUrl.WEATHER),
-                program.toJson(),
-                new CommonHeader(CommonHeader.JSON, true)
-        );
-        System.out.println(program.toJson());
-        LogUtils.error("澶╂皵鑺傜洰鎾斁response:"+result);
-        return JSON.parseObject(result,VnnoxResultResponse.class);
-    }
 
 
 }
\ No newline at end of file

--
Gitblit v1.9.3