From aebf1df56a02c71a5e6b4a9da395c12ed66edb1b Mon Sep 17 00:00:00 2001
From: liuhaonan <31457034@qq.com>
Date: 星期三, 14 九月 2022 14:13:12 +0800
Subject: [PATCH] changes

---
 ximon-admin/src/main/java/com/sandu/ximon/admin/utils/VnnoxProgramAPIUtil.java |   61 ++++++++++++++++++++++++++----
 1 files changed, 52 insertions(+), 9 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 c11e998..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
@@ -3,8 +3,9 @@
 import com.alibaba.fastjson.JSON;
 import com.sandu.ximon.admin.config.VnnoxUrl;
 import com.sandu.ximon.admin.dto.nova.AirDataProgram;
-import com.sandu.ximon.admin.utils.request.CommonHeader;
 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;
 import org.springframework.stereotype.Component;
@@ -16,17 +17,17 @@
     @Autowired
     private RedisUtils redisUtils;
 
-    public static VnnoxProgramAPIUtil getBean(){
+    public static VnnoxProgramAPIUtil getBean() {
         return (VnnoxProgramAPIUtil) SpringContextUtil.getBean("VnnoxProgramAPIUtil");
     }
 
 
     /**
-     * 鏅�氳妭鐩挱鏀�
+     * 澶ф皵淇℃伅鎺ㄩ��
+     *
      * @param
      * @return
      */
-    //public VnnoxResultResponse normalProgram(Map<String,Object> program) {
     public VnnoxResultResponse normalProgram(AirDataProgram program) {
 
         String result = VnnoxRequestUtil.PostWithHeader(
@@ -34,24 +35,66 @@
                 program.toJson(),
                 new CommonHeader(CommonHeader.JSON, true)
         );
-        LogUtils.error("鑺傜洰鎾斁response:"+result);
-        return JSON.parseObject(result,VnnoxResultResponse.class);
+        System.out.println(program.toJson());
+        LogUtils.error("鑺傜洰鎾斁response:" + result);
+        return JSON.parseObject(result, VnnoxResultResponse.class);
+    }
+
+
+    /**
+     * 鏅�氳妭鐩挱鏀�
+     *
+     * @param
+     * @return
+     */
+    public VnnoxResultResponse normalProgram(PlayerProgram program) {
+
+        String result = VnnoxRequestUtil.PostWithHeader(
+                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);
     }
 
     /**
+     * 瀹炴椂鑺傜洰鎾斁
+     *
+     * @param
+     * @return
+     */
+    public VnnoxResultResponse pushProgram(PlayerProgram program) {
+
+        String result = VnnoxRequestUtil.PostWithHeader(
+                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);
+    }
+
+
+    /**
      * 瀹氭椂鑺傜洰鎾斁
+     *
      * @param program
      * @return
      */
-    public VnnoxResultResponse timeProgram(PlayerProgram program) {
+    public VnnoxResultResponse timeProgram(ProgramSchedule program) {
         String result = VnnoxRequestUtil.PostWithHeader(
                 VnnoxUrl.getUrl(VnnoxUrl.TIMING_CONTROL),
                 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);
     }
 
 
+
+
 }
\ No newline at end of file

--
Gitblit v1.9.3