From bfce748e37a753c729e15dd233600379f504d019 Mon Sep 17 00:00:00 2001
From: zhanzhiqin <895896009@qq.com>
Date: 星期四, 28 四月 2022 13:59:28 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ximon-admin/src/main/java/com/sandu/ximon/admin/utils/VnnoxProgramAPIUtil.java | 23 +++++++++++++++++++++--
1 files changed, 21 insertions(+), 2 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 0ca8c09..6aea084 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,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.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,14 +27,32 @@
* @return
*/
//public VnnoxResultResponse normalProgram(Map<String,Object> program) {
- public VnnoxResultResponse normalProgram(PlayerProgram 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);
}
+
+ /**
+ * 瀹氭椂鑺傜洰鎾斁
+ * @param program
+ * @return
+ */
+ public VnnoxResultResponse timeProgram(PlayerProgram 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);
+ }
+
+
}
\ No newline at end of file
--
Gitblit v1.9.3