From bf5d9682beb8fa53c5adbd14bb3e458c1c859038 Mon Sep 17 00:00:00 2001
From: liuhaonan <31457034@qq.com>
Date: 星期一, 23 五月 2022 15:59:21 +0800
Subject: [PATCH] 单灯任务返回指令修改
---
ximon-admin/src/main/java/com/sandu/ximon/admin/utils/VnnoxProgramAPIUtil.java | 37 +++++++++++++++++++++++++++++++++++--
1 files changed, 35 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..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,25 @@
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);
}
+
+ /**
+ * 瀹氭椂鑺傜洰鎾斁
+ * @param program
+ * @return
+ */
+ 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);
+ }
+
+
}
\ No newline at end of file
--
Gitblit v1.9.3