From 93b045e2f659a8dbd424bd8c9beb6525e7a80c05 Mon Sep 17 00:00:00 2001
From: zhanzhiqin <895896009@qq.com>
Date: 星期四, 02 六月 2022 11:27:38 +0800
Subject: [PATCH] fix
---
ximon-admin/src/main/java/com/sandu/ximon/admin/utils/VnnoxProgramAPIUtil.java | 26 ++++++++++++++++++++++----
1 files changed, 22 insertions(+), 4 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 419d740..51dd4d0 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,8 +2,10 @@
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.dto.nova.ProgramSchedule;
import com.sandu.ximon.admin.utils.request.CommonHeader;
-import com.sandu.ximon.admin.utils.request.PlayerProgram;
+import com.sandu.ximon.admin.dto.nova.PlayerProgram;
import com.sandu.ximon.admin.utils.response.VnnoxResultResponse;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
@@ -26,6 +28,19 @@
* @return
*/
//public VnnoxResultResponse normalProgram(Map<String,Object> program) {
+ public VnnoxResultResponse normalProgram(AirDataProgram program) {
+
+ String result = VnnoxRequestUtil.PostWithHeader(
+ VnnoxUrl.getUrl(VnnoxUrl.NORMAL_PROGRAM),
+ program.toJson(),
+ new CommonHeader(CommonHeader.JSON, true)
+ );
+ System.out.println(program.toJson());
+ LogUtils.error("鑺傜洰鎾斁response:"+result);
+ return JSON.parseObject(result,VnnoxResultResponse.class);
+ }
+
+
public VnnoxResultResponse normalProgram(PlayerProgram program) {
String result = VnnoxRequestUtil.PostWithHeader(
@@ -33,7 +48,8 @@
program.toJson(),
new CommonHeader(CommonHeader.JSON, true)
);
- LogUtils.error("鑺傜洰鎾斁response:"+result);
+ System.out.println(program.toJson());
+ LogUtils.error("鏅�氳妭鐩挱鏀緍esponse:"+result);
return JSON.parseObject(result,VnnoxResultResponse.class);
}
@@ -42,13 +58,15 @@
* @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);
+ LogUtils.error("瀹氭椂浠诲姟response:"+result);
return JSON.parseObject(result,VnnoxResultResponse.class);
}
+
+
}
\ No newline at end of file
--
Gitblit v1.9.3