From 681d31e1de290eebd5f5ecb0a0e07a2a66cd01ae Mon Sep 17 00:00:00 2001
From: liuhaonan <31457034@qq.com>
Date: 星期四, 04 八月 2022 17:56:17 +0800
Subject: [PATCH] changes
---
/dev/null | 32 ----
ximon-admin/src/main/java/com/sandu/ximon/admin/dto/nova/PlayerWidget.java | 76 +++++++--
ximon-admin/src/main/java/com/sandu/ximon/admin/dto/nova/WratherPage.java | 61 +++++++
ximon-admin/src/main/java/com/sandu/ximon/admin/utils/VnnoxRequestUtil.java | 1
ximon-admin/src/main/java/com/sandu/ximon/admin/dto/nova/PlayerSchedulePlans.java | 17 ++
ximon-admin/src/main/java/com/sandu/ximon/admin/utils/VnnoxProgramAPIUtil.java | 48 ++---
ximon-admin/src/main/java/com/sandu/ximon/admin/controller/PlayPlanNvController.java | 35 ++--
ximon-admin/src/main/java/com/sandu/ximon/admin/service/PlayPlanNvService.java | 169 +++++---------------
ximon-admin/src/main/java/com/sandu/ximon/admin/dto/nova/PlayerWidgetType.java | 5
ximon-admin/src/main/java/com/sandu/ximon/admin/dto/nova/PlayerProgram.java | 5
ximon-admin/src/main/java/com/sandu/ximon/admin/dto/nova/PlayerSchedule.java | 17 ++
11 files changed, 239 insertions(+), 227 deletions(-)
diff --git a/ximon-admin/src/main/java/com/sandu/ximon/admin/controller/PlayPlanNvController.java b/ximon-admin/src/main/java/com/sandu/ximon/admin/controller/PlayPlanNvController.java
index d866093..16a2b10 100644
--- a/ximon-admin/src/main/java/com/sandu/ximon/admin/controller/PlayPlanNvController.java
+++ b/ximon-admin/src/main/java/com/sandu/ximon/admin/controller/PlayPlanNvController.java
@@ -65,12 +65,19 @@
return ResponseUtil.success(playPlanNvService.deletePlan(plianIds));
}
- @PostMapping(value = "/push/{plianId}", produces = "application/json;charset=UTF-8")
- public ResponseVO<Object> pushToLed(@PathVariable Long plianId, @RequestBody List<NovaPushResultVO> playerIds) {
+ /**
+ * 瀹氭椂鑺傜洰
+ *
+ * @param planId
+ * @param playerIds
+ * @return
+ */
+ @PostMapping(value = "/push/{planId}", produces = "application/json;charset=UTF-8")
+ public ResponseVO<Object> pushToLed(@PathVariable Long planId, @RequestBody List<NovaPushResultVO> playerIds) {
if (!permissionConfig.check(MenuEnum.LED_N_PLAY_PLAN_PUSH.getCode())) {
return ResponseUtil.fail("缂哄皯瀵瑰簲鐢ㄦ埛鏉冮檺");
}
- return ResponseUtil.success(playPlanNvService.pushToLed(plianId, playerIds));
+ return ResponseUtil.success(playPlanNvService.pushToLed(planId, playerIds));
}
@@ -83,6 +90,13 @@
}
+ /**
+ * 瀹炴椂鑺傜洰
+ *
+ * @param pid
+ * @param playerIds
+ * @return
+ */
@PostMapping(value = "/pushProgram/{pid}", produces = "application/json;charset=UTF-8")
public ResponseVO<Object> pushProgram(@PathVariable Long pid, @RequestBody List<NovaPushResultVO> playerIds) {
if (!permissionConfig.check(MenuEnum.LED_N_PLAY_PLAN_PUSH.getCode())) {
@@ -91,21 +105,6 @@
return ResponseUtil.success(playPlanNvService.pushProgram(pid, playerIds));
}
- @PostMapping(value = "/pushWeather/{pid}", produces = "application/json;charset=UTF-8")
- public ResponseVO<Object> pushWeather(@PathVariable Long pid, @RequestBody List<NovaPushResultVO> playerIds) {
- if (!permissionConfig.check(MenuEnum.LED_N_PLAY_PLAN_PUSH.getCode())) {
- return ResponseUtil.fail("缂哄皯瀵瑰簲鐢ㄦ埛鏉冮檺");
- }
- return ResponseUtil.success(playPlanNvService.pushProgram(pid, playerIds));
- }
-
- @PostMapping(value = "/pushWeatherPlan/{id}", produces = "application/json;charset=UTF-8")
- public ResponseVO<Object> pushWeatherPlan(@PathVariable Long id, @RequestBody List<NovaPushResultVO> playerIds) {
- if (!permissionConfig.check(MenuEnum.LED_N_PLAY_PLAN_PUSH.getCode())) {
- return ResponseUtil.fail("缂哄皯瀵瑰簲鐢ㄦ埛鏉冮檺");
- }
- return ResponseUtil.success(playPlanNvService.pushWeatherToLed(id, playerIds));
- }
@GetMapping("/listPlan")
public ResponseVO<Object> list(BaseConditionVO baseConditionVO,
diff --git a/ximon-admin/src/main/java/com/sandu/ximon/admin/dto/nova/NormalProgramDto.java b/ximon-admin/src/main/java/com/sandu/ximon/admin/dto/nova/NormalProgramDto.java
deleted file mode 100644
index 3fcc5a3..0000000
--- a/ximon-admin/src/main/java/com/sandu/ximon/admin/dto/nova/NormalProgramDto.java
+++ /dev/null
@@ -1,89 +0,0 @@
-package com.sandu.ximon.admin.dto.nova;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-
-import java.util.List;
-
-/**
- * @author LiuHaoNan
- * @date 2022/8/1
- * 鏅�氳妭鐩疄浣�
- */
-@NoArgsConstructor
-@Data
-public class NormalProgramDto {
-
-
- private String name;
-
- private List<SchedulesDTO> schedules;
-
- private List<WidgetsDTO> widgets;
-
- @NoArgsConstructor
- @Data
- public static class SchedulesDTO {
-
- private String startDate;
-
- private String endDate;
-
- private List<PlansDTO> plans;
-
- @NoArgsConstructor
- @Data
- public static class PlansDTO {
-
- private List<Integer> weekDays;
-
- private String startTime;
-
- private String endTime;
- }
- }
-
- @NoArgsConstructor
- @Data
- public static class WidgetsDTO {
-
- private Integer zIndex;
-
- private String type;
-
- private Integer size;
-
- private String md5;
-
- private Integer duration;
-
- private String url;
-
- private LayoutDTO layout;
-
- private InAnimationDTO inAnimation;
-
- @NoArgsConstructor
- @Data
- public static class LayoutDTO {
-
- private String x;
-
- private String y;
-
- private String width;
-
- private String height;
- }
-
- @NoArgsConstructor
- @Data
- public static class InAnimationDTO {
-
- private String type;
-
- private Integer duration;
- }
- }
-}
diff --git a/ximon-admin/src/main/java/com/sandu/ximon/admin/dto/nova/PlayerProgram.java b/ximon-admin/src/main/java/com/sandu/ximon/admin/dto/nova/PlayerProgram.java
index a9c56d1..047e448 100644
--- a/ximon-admin/src/main/java/com/sandu/ximon/admin/dto/nova/PlayerProgram.java
+++ b/ximon-admin/src/main/java/com/sandu/ximon/admin/dto/nova/PlayerProgram.java
@@ -5,7 +5,6 @@
import lombok.Data;
import java.util.List;
-import java.util.Map;
/**
* 鏅�氳妭鐩�
@@ -16,9 +15,9 @@
// 闇�瑕佸鐞嗙殑鎾斁鍣↖D闆嗗悎,鏈�澶氭敮鎸�100涓挱鏀惧櫒鍚屾椂澶勭悊
private List<String> playerIds;
// 鎾斁鏃堕棿鎺掓湡锛屽鏋滀负绌猴紝浼氬叏澶�24灏忔椂寰幆鎾斁
- private Map schedule;
+ private PlayerSchedule schedule;
// 闇�瑕佹挱鏀剧殑椤甸潰鍐呭闆嗗悎
- private List<ProgramDto> pages ;
+ private List<PlayerPage> pages;
// 鑺傜洰涓嬭浇杩涘害閫氱煡鎺ュ彛锛屼細閫氳繃姝ゆ帴鍙ｅ皢鑺傜洰鐨勪笅杞借繘搴﹀彂缁欏鎴凤紝鎺ュ彛鐨勫搷搴旀椂闂翠笉鑳借秴杩�3s
private String noticeUrl;
diff --git a/ximon-admin/src/main/java/com/sandu/ximon/admin/dto/nova/PlayerSchedule.java b/ximon-admin/src/main/java/com/sandu/ximon/admin/dto/nova/PlayerSchedule.java
new file mode 100644
index 0000000..7140a6c
--- /dev/null
+++ b/ximon-admin/src/main/java/com/sandu/ximon/admin/dto/nova/PlayerSchedule.java
@@ -0,0 +1,17 @@
+package com.sandu.ximon.admin.dto.nova;
+
+import lombok.Data;
+
+import java.util.List;
+
+@Data
+public class PlayerSchedule {
+
+ // 鎾斁寮�濮嬫棩鏈燂紝濡傦細2020-04-12
+ private String startDate;
+ // 鎾斁缁撴潫鏃ユ湡 ,濡傦細2020-12-22
+ private String endDate;
+ // 鍏蜂綋鎾斁璁″垝
+ private List<PlayerSchedulePlans> plans;
+
+}
\ No newline at end of file
diff --git a/ximon-admin/src/main/java/com/sandu/ximon/admin/dto/nova/PlayerSchedulePlans.java b/ximon-admin/src/main/java/com/sandu/ximon/admin/dto/nova/PlayerSchedulePlans.java
new file mode 100644
index 0000000..b57cfb7
--- /dev/null
+++ b/ximon-admin/src/main/java/com/sandu/ximon/admin/dto/nova/PlayerSchedulePlans.java
@@ -0,0 +1,17 @@
+package com.sandu.ximon.admin.dto.nova;
+
+import lombok.Data;
+
+import java.util.List;
+
+@Data
+public class PlayerSchedulePlans {
+
+ // 鍛ㄥ唴鐨勬挱鏀炬棩鏈燂紝0-鍛ㄦ棩锛�1-鍛ㄤ竴锛�2-鍛ㄤ簩锛�3-鍛ㄤ笁锛�4-鍛ㄥ洓锛�5-鍛ㄤ簲锛�6-鍛ㄥ叚
+ private List<Integer> weekDays;
+ // 鍏蜂綋褰撴棩寮�濮嬫椂闂达紝濡傦細08:00
+ private String startTime;
+ // 鍏蜂綋褰撴棩鐨勭粨鏉熸椂闂达紝濡傦細18:00
+ private String endTime;
+
+}
\ No newline at end of file
diff --git a/ximon-admin/src/main/java/com/sandu/ximon/admin/dto/nova/PlayerWidget.java b/ximon-admin/src/main/java/com/sandu/ximon/admin/dto/nova/PlayerWidget.java
index 7850ebf..40f4d79 100644
--- a/ximon-admin/src/main/java/com/sandu/ximon/admin/dto/nova/PlayerWidget.java
+++ b/ximon-admin/src/main/java/com/sandu/ximon/admin/dto/nova/PlayerWidget.java
@@ -19,6 +19,7 @@
//HTML - 缃戦〉濯掍綋
//STREAM_MEDIA - 娴佸獟浣�
//BOX - 绐楀彛
+ //WEATHER - 绠�鏄撳ぉ姘旂粍浠�
private PlayerWidgetType type;
// 鍥剧墖鍜岃棰戜负蹇呭～椤癸紝鍐呭涓哄浘鐗囨垨瑙嗛鐨刴d5鍊�
private String md5;
@@ -47,12 +48,52 @@
// html缁勪欢绂荤嚎鎾斁濯掍綋锛堝畾鍒跺姛鑳斤級
private PlayerOffline offline;
- public PlayerWidget generateMediaWidget (String widgetName,
- Integer zIndex,
- PlayerWidgetType playerWidgetType,
- LEDProgramFile file,
- PlayerLayout playerLayout,
- PlayerAnimation animation) {
+
+ private String address;
+
+ private Double latitude;
+
+ private Double longitude;
+
+ private Integer width;
+
+ private Integer height;
+
+ private Integer refreshPeriod;
+
+ private Integer fontSize;
+
+ private Boolean bold;
+
+ private Boolean italic;
+
+ private Boolean underline;
+
+ private String color;
+
+ private Integer tempUnit;
+
+ private Integer unitSymbol;
+
+ private Boolean weatherEnable;
+
+ private Boolean tempEnable;
+
+ private Boolean windEnable;
+
+ private Boolean humidEnable;
+
+ private Boolean currentTempEnable;
+
+ private Boolean isShowInOneLine;
+
+
+ public PlayerWidget generateMediaWidget(String widgetName,
+ Integer zIndex,
+ PlayerWidgetType playerWidgetType,
+ LEDProgramFile file,
+ PlayerLayout playerLayout,
+ PlayerAnimation animation) {
this.setName(widgetName);
this.setZIndex(zIndex);
this.setType(playerWidgetType);
@@ -65,13 +106,13 @@
return this;
}
- public PlayerWidget generateScrollUpTextWidget (String widgetName,
- Integer zIndex,
- Long duration,
- List<String> content,
- String contentColor,
- Integer fontSize,
- PlayerLayout playerLayout) {
+ public PlayerWidget generateScrollUpTextWidget(String widgetName,
+ Integer zIndex,
+ Long duration,
+ List<String> content,
+ String contentColor,
+ Integer fontSize,
+ PlayerLayout playerLayout) {
this.setName(widgetName);
this.setZIndex(zIndex);
this.setType(PlayerWidgetType.ARCH_TEXT);
@@ -79,7 +120,7 @@
this.setBackgroundColor("#00000000");
this.setScrollAttribute(
new PlayerWidgetScrollAttribute(
- PlayerWidgetScrollAttributeAnimation.MARQUEE_UP,1
+ PlayerWidgetScrollAttributeAnimation.MARQUEE_UP, 1
)
);
this.setDuration(duration);
@@ -87,7 +128,7 @@
List<PlayerWidgetLine> playerWidgetLineList = new ArrayList<>();
- for(String str: content) {
+ for (String str : content) {
PlayerWidgetLine playerWidgetLine = new PlayerWidgetLine();
List<PlayerWidgetLineTextAttributes> playerWidgetLineTextAttributesList =
new ArrayList<>();
@@ -124,7 +165,7 @@
this.setBackgroundColor("#00000000");
this.setScrollAttribute(
new PlayerWidgetScrollAttribute(
- PlayerWidgetScrollAttributeAnimation.MARQUEE_LEFT,2
+ PlayerWidgetScrollAttributeAnimation.MARQUEE_LEFT, 2
)
);
this.setDuration(duration);
@@ -150,4 +191,7 @@
return this;
}
+
+
+
}
\ No newline at end of file
diff --git a/ximon-admin/src/main/java/com/sandu/ximon/admin/dto/nova/PlayerWidgetType.java b/ximon-admin/src/main/java/com/sandu/ximon/admin/dto/nova/PlayerWidgetType.java
index ab15178..5af8164 100644
--- a/ximon-admin/src/main/java/com/sandu/ximon/admin/dto/nova/PlayerWidgetType.java
+++ b/ximon-admin/src/main/java/com/sandu/ximon/admin/dto/nova/PlayerWidgetType.java
@@ -10,6 +10,7 @@
* HTML - 缃戦〉濯掍綋
* STREAM_MEDIA - 娴佸獟浣�
* BOX - 绐楀彛
+ * WEATHER - 绠�鏄撳ぉ姘旂粍浠�
*/
PICTURE,
VIDEO,
@@ -17,6 +18,8 @@
SIMPLE_RSS,
HTML,
STREAM_MEDIA,
- BOX
+ BOX,
+ WEATHER
+
}
diff --git a/ximon-admin/src/main/java/com/sandu/ximon/admin/dto/nova/ProgramDto.java b/ximon-admin/src/main/java/com/sandu/ximon/admin/dto/nova/ProgramDto.java
deleted file mode 100644
index f8d4b80..0000000
--- a/ximon-admin/src/main/java/com/sandu/ximon/admin/dto/nova/ProgramDto.java
+++ /dev/null
@@ -1,52 +0,0 @@
-package com.sandu.ximon.admin.dto.nova;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-
-import java.util.List;
-
-/**
- * @author LiuHaoNan
- * @date 2022/7/15
- * 鐩存帴鎺ㄩ�佽妭鐩疄浣�
- */
-@NoArgsConstructor
-@Data
-public class ProgramDto {
-
- private String name;
- private List<WidgetsDTO> widgets;
-
-
- @Data
- public static class WidgetsDTO {
-
- private Integer duration;
-
- private String type;
-
- private String url;
-
- private Integer zIndex;
-
- private LayoutDTO layout;
-
- private String md5;
-
- private String size;
-
-
- @Data
- public static class LayoutDTO {
-
- private String x;
-
- private String y;
-
- private String width;
-
- private String height;
- }
- }
-}
diff --git a/ximon-admin/src/main/java/com/sandu/ximon/admin/dto/nova/ProgramPush.java b/ximon-admin/src/main/java/com/sandu/ximon/admin/dto/nova/ProgramPush.java
deleted file mode 100644
index 64526ea..0000000
--- a/ximon-admin/src/main/java/com/sandu/ximon/admin/dto/nova/ProgramPush.java
+++ /dev/null
@@ -1,32 +0,0 @@
-package com.sandu.ximon.admin.dto.nova;
-
-import com.sandu.ximon.admin.config.VnnoxConstant;
-import com.sandu.ximon.admin.utils.request.VnnoxRequest;
-import lombok.Data;
-
-import java.util.List;
-import java.util.Map;
-
-/**
- * @author LiuHaoNan
- * @date 2022/7/15
- */
-@Data
-public class ProgramPush implements VnnoxRequest {
-
-
- // 闇�瑕佸鐞嗙殑鎾斁鍣↖D闆嗗悎,鏈�澶氭敮鎸�100涓挱鏀惧櫒鍚屾椂澶勭悊
- private List<String> playerIds;
- // 鎾斁鏃堕棿鎺掓湡锛屽鏋滀负绌猴紝浼氬叏澶�24灏忔椂寰幆鎾斁
- private Map schedule;
- // 闇�瑕佹挱鏀剧殑椤甸潰鍐呭闆嗗悎
- private List<ProgramDto> pages ;
- // 鑺傜洰涓嬭浇杩涘害閫氱煡鎺ュ彛锛屼細閫氳繃姝ゆ帴鍙ｅ皢鑺傜洰鐨勪笅杞借繘搴﹀彂缁欏鎴凤紝鎺ュ彛鐨勫搷搴旀椂闂翠笉鑳借秴杩�3s
- private String noticeUrl;
-
-
- @Override
- public String toJson() {
- return VnnoxConstant.GSON.toJson(this);
- }
-}
diff --git a/ximon-admin/src/main/java/com/sandu/ximon/admin/dto/nova/WeatherDto.java b/ximon-admin/src/main/java/com/sandu/ximon/admin/dto/nova/WeatherDto.java
deleted file mode 100644
index df37a5b..0000000
--- a/ximon-admin/src/main/java/com/sandu/ximon/admin/dto/nova/WeatherDto.java
+++ /dev/null
@@ -1,84 +0,0 @@
-package com.sandu.ximon.admin.dto.nova;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-
-import java.util.List;
-
-/**
- * @author LiuHaoNan
- * @date 2022/8/1
- */
-@NoArgsConstructor
-@Data
-public class WeatherDto {
-
- private String name;
-
- private List<WidgetsDTO> widgets;
-
- @NoArgsConstructor
- @Data
- public static class WidgetsDTO {
-
- private Integer zIndex;
-
- private String type;
-
- private String address;
-
- private Double latitude;
-
- private Double longitude;
-
- private Integer width;
-
- private Integer height;
-
- private Integer refreshPeriod;
-
- private Integer fontSize;
-
- private Boolean bold;
-
- private Boolean italic;
-
- private Boolean underline;
-
- private String color;
-
- private Integer tempUnit;
-
- private Integer unitSymbol;
-
- private Boolean weatherEnable;
-
- private Boolean tempEnable;
-
- private Boolean windEnable;
-
- private Boolean humidEnable;
-
- private Boolean currentTempEnable;
-
- private Boolean isShowInOneLine;
-
- private Integer duration;
-
- private LayoutDTO layout;
-
- @NoArgsConstructor
- @Data
- public static class LayoutDTO {
-
- private String x;
-
- private String y;
-
- private String width;
-
- private String height;
- }
- }
-}
diff --git a/ximon-admin/src/main/java/com/sandu/ximon/admin/dto/nova/WeatherProgram.java b/ximon-admin/src/main/java/com/sandu/ximon/admin/dto/nova/WeatherProgram.java
deleted file mode 100644
index 71d3e07..0000000
--- a/ximon-admin/src/main/java/com/sandu/ximon/admin/dto/nova/WeatherProgram.java
+++ /dev/null
@@ -1,32 +0,0 @@
-package com.sandu.ximon.admin.dto.nova;
-
-import com.sandu.ximon.admin.config.VnnoxConstant;
-import com.sandu.ximon.admin.utils.request.VnnoxRequest;
-import lombok.Data;
-
-import java.util.List;
-import java.util.Map;
-
-/**
- * @author LiuHaoNan
- * @date 2022/8/1
- */
-@Data
-public class WeatherProgram implements VnnoxRequest {
-
-
- // 闇�瑕佸鐞嗙殑鎾斁鍣↖D闆嗗悎,鏈�澶氭敮鎸�100涓挱鏀惧櫒鍚屾椂澶勭悊
- private List<String> playerIds;
- // 鎾斁鏃堕棿鎺掓湡锛屽鏋滀负绌猴紝浼氬叏澶�24灏忔椂寰幆鎾斁
- private Map schedule;
- // 闇�瑕佹挱鏀剧殑椤甸潰鍐呭闆嗗悎
- private List<WeatherDto> pages;
- // 鑺傜洰涓嬭浇杩涘害閫氱煡鎺ュ彛锛屼細閫氳繃姝ゆ帴鍙ｅ皢鑺傜洰鐨勪笅杞借繘搴﹀彂缁欏鎴凤紝鎺ュ彛鐨勫搷搴旀椂闂翠笉鑳借秴杩�3s
- private String noticeUrl;
-
-
- @Override
- public String toJson() {
- return VnnoxConstant.GSON.toJson(this);
- }
-}
diff --git a/ximon-admin/src/main/java/com/sandu/ximon/admin/dto/nova/WratherPage.java b/ximon-admin/src/main/java/com/sandu/ximon/admin/dto/nova/WratherPage.java
new file mode 100644
index 0000000..8715716
--- /dev/null
+++ b/ximon-admin/src/main/java/com/sandu/ximon/admin/dto/nova/WratherPage.java
@@ -0,0 +1,61 @@
+package com.sandu.ximon.admin.dto.nova;
+
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+/**
+ * @author LiuHaoNan
+ * @date 2022/8/4
+ */
+@NoArgsConstructor
+@Data
+public class WratherPage {
+
+
+ private Integer zIndex;
+
+ private String type;
+
+ private String address;
+
+ private Double latitude;
+
+ private Double longitude;
+
+ private Integer width;
+
+ private Integer height;
+
+ private Integer refreshPeriod;
+
+ private Integer fontSize;
+
+ private Boolean bold;
+
+ private Boolean italic;
+
+ private Boolean underline;
+
+ private String color;
+
+ private Integer tempUnit;
+
+ private Integer unitSymbol;
+
+ private Boolean weatherEnable;
+
+ private Boolean tempEnable;
+
+ private Boolean windEnable;
+
+ private Boolean humidEnable;
+
+ private Boolean currentTempEnable;
+
+ private Boolean isShowInOneLine;
+
+ private Integer duration;
+
+ private PlayerLayout layout;
+
+}
diff --git a/ximon-admin/src/main/java/com/sandu/ximon/admin/service/PlayPlanNvService.java b/ximon-admin/src/main/java/com/sandu/ximon/admin/service/PlayPlanNvService.java
index 2c4297d..c400470 100644
--- a/ximon-admin/src/main/java/com/sandu/ximon/admin/service/PlayPlanNvService.java
+++ b/ximon-admin/src/main/java/com/sandu/ximon/admin/service/PlayPlanNvService.java
@@ -11,9 +11,9 @@
import com.sandu.ximon.admin.dto.PlanDto;
import com.sandu.ximon.admin.dto.SchedulesDTO;
import com.sandu.ximon.admin.dto.nova.*;
-import com.sandu.ximon.admin.entity.Plans;
import com.sandu.ximon.admin.param.PlayPlanParam;
import com.sandu.ximon.admin.security.SecurityUtils;
+import com.sandu.ximon.admin.utils.LogUtils;
import com.sandu.ximon.admin.utils.StoreOperationRecordsUtils;
import com.sandu.ximon.admin.utils.VnnoxAPIUtil;
import com.sandu.ximon.admin.utils.VnnoxProgramAPIUtil;
@@ -24,6 +24,7 @@
import com.sandu.ximon.dao.domain.*;
import com.sandu.ximon.dao.mapper.PlayPlanNvMapper;
import lombok.AllArgsConstructor;
+import org.aspectj.weaver.ast.Var;
import org.springframework.stereotype.Service;
import java.util.*;
@@ -167,6 +168,7 @@
/**
* 鎺ㄩ�佸畾鏃惰妭鐩�
+ *
* @param planId
* @param nova
* @return
@@ -194,18 +196,20 @@
//鑾峰彇鑺傜洰瀹炰綋
- List<ProgramDto> programDtos = JSON.parseArray(pushToLed.getPages(), ProgramDto.class);
+ List<PlayerPage> programDtos = JSON.parseArray(pushToLed.getPages(), PlayerPage.class);
programDtos.forEach(
programDto -> {
programDto.getWidgets().forEach(
widget -> {
- String url = widget.getUrl();
- LEDProgramFile one = fileService.getOne(Wrappers.lambdaQuery(LEDProgramFile.class).eq(LEDProgramFile::getFileUrl, url));
- if (one == null) {
- throw new BusinessException("鑺傜洰鏂囦欢宸插け鏁�");
+ if (!PlayerWidgetType.WEATHER.equals(widget.getType())) {
+ String url = widget.getUrl();
+ LEDProgramFile one = fileService.getOne(Wrappers.lambdaQuery(LEDProgramFile.class).eq(LEDProgramFile::getFileUrl, url));
+ if (one == null) {
+ throw new BusinessException("鑺傜洰鏂囦欢宸插け鏁�");
+ }
+ widget.setMd5(one.getMd5());
+ widget.setSize(Long.parseLong(one.getSize()));
}
- widget.setMd5(one.getMd5());
- widget.setSize(one.getSize());
}
);
}
@@ -214,20 +218,21 @@
program.setPages(programDtos);
//鑾峰彇鑺傜洰瀹氭椂瀹炰綋
- program.setSchedule((JSON.parseObject(pushToLed.getSchedule(), Map.class)));
- Map map = JSON.parseObject(pushToLed.getSchedule(), Map.class);
- map.get("plans");
- List<Plans> plans = JSON.parseArray(map.get("plans").toString(), Plans.class);
- plans.forEach(p -> {
- //鍒犻櫎鍚庝袱浣嶅瓧绗︿覆
- p.setStartTime(p.getStartTime().substring(0, p.getStartTime().length() - 3));
- p.setEndTime(p.getEndTime().substring(0, p.getEndTime().length() - 3));
- });
- System.out.println(plans + "plans11111");
- map.put("plans", plans);
- program.setSchedule(map);
+ PlayerSchedule playerSchedule = JSON.parseObject(pushToLed.getSchedule(), PlayerSchedule.class);
+ //鍒犻櫎鏃堕棿鐨勫悗涓変綅
+ List<PlayerSchedulePlans> plans = playerSchedule.getPlans();
+ plans.forEach(
+ plan -> {
+ plan.setStartTime(plan.getStartTime().substring(0, plan.getStartTime().length() - 3));
+ plan.setEndTime(plan.getEndTime().substring(0, plan.getEndTime().length() - 3));
+ }
+ );
+ program.setSchedule(playerSchedule);
+
+
program.setNoticeUrl(VnnoxConstant.NOTIFY_URL);
+ LogUtils.error("鑺傜洰鍐呭+++++++++++" + JSON.toJSONString(program));
VnnoxResultResponse vnnoxResultResponse = vnnoxProgramAPIUtil.normalProgram(program);
vnnoxAPIUtil.volChange(playerIds, Integer.valueOf(pushToLed.getVolume()).intValue());
@@ -428,30 +433,38 @@
playerIds.add(n.getPlayerId());
});
- ProgramPush program = new ProgramPush();
- List<ProgramDto> programDtos = JSON.parseArray(pages, ProgramDto.class);
+ PlayerProgram program = new PlayerProgram();
+ List<PlayerPage> programDtos = JSON.parseArray(pages, PlayerPage.class);
programDtos.forEach(
programDto -> {
programDto.getWidgets().forEach(
widget -> {
- String url = widget.getUrl();
- LEDProgramFile one = fileService.getOne(Wrappers.lambdaQuery(LEDProgramFile.class).eq(LEDProgramFile::getFileUrl, url));
- if (one == null) {
- throw new BusinessException("鑺傜洰鏂囦欢宸插け鏁�");
+ if (!PlayerWidgetType.WEATHER.equals(widget.getType())) {
+ String url = widget.getUrl();
+ LEDProgramFile one = fileService.getOne(Wrappers.lambdaQuery(LEDProgramFile.class).eq(LEDProgramFile::getFileUrl, url));
+ if (one == null) {
+ throw new BusinessException("鑺傜洰鏂囦欢宸插け鏁�");
+ }
+ widget.setMd5(one.getMd5());
+ widget.setSize(Long.parseLong(one.getSize()));
+ }else {
+ //WratherPage
+ System.out.println(widget+"widget");
}
- widget.setMd5(one.getMd5());
- widget.setSize(one.getSize());
}
);
}
);
-
program.setPlayerIds(playerIds);
//鑾峰彇鑺傜洰瀹炰綋
program.setPages(programDtos);
program.setNoticeUrl(VnnoxConstant.NOTIFY_URL);
VnnoxResultResponse vnnoxResultResponse = vnnoxProgramAPIUtil.pushProgram(program);
+
+ if (vnnoxResultResponse == null || vnnoxResultResponse.getData() == null) {
+ throw new BusinessException("鎺ㄩ�佸け璐�");
+ }
List<String> success = new ArrayList<>();
List<String> fail = new ArrayList<>();
@@ -499,103 +512,5 @@
return result;
}
-
-
- /**
- * 瀹氭椂鎺ㄩ�佸ぉ姘�
- * @param planId
- * @param nova
- * @return
- */
- public Map<String, Object> pushWeatherToLed(Long planId, List<NovaPushResultVO> nova) {
- if (nova == null) {
- throw new BusinessException("璇烽�夋嫨姝ｇ‘鐨凩ED灞�");
- }
- PushToLed pushToLed = playPlanMapper.pushToLed(planId);
- if (pushToLed.getPages() == null) {
- throw new BusinessException("鑺傜洰鍐呭涓㈠け");
- }
- PlayPlanNv byId = getById(planId);
- if (pushToLed == null) {
- throw new BusinessException("鏈壘鍒拌鎾斁璁″垝");
- }
- List<String> playerIds = new ArrayList<>();
- nova.forEach(n -> {
- playerIds.add(n.getPlayerId());
- });
-
- WeatherProgram program = new WeatherProgram();
- program.setPlayerIds(playerIds);
-
- //鑾峰彇鑺傜洰瀹炰綋
-
-
- List<WeatherDto> programDtos = JSON.parseArray(pushToLed.getPages(), WeatherDto.class);
-
-
- program.setPages(programDtos);
-
- //鑾峰彇鑺傜洰瀹氭椂瀹炰綋
- program.setSchedule((JSON.parseObject(pushToLed.getSchedule(), Map.class)));
- Map map = JSON.parseObject(pushToLed.getSchedule(), Map.class);
- map.get("plans");
- List<Plans> plans = JSON.parseArray(map.get("plans").toString(), Plans.class);
- plans.forEach(p -> {
- //鍒犻櫎鍚庝袱浣嶅瓧绗︿覆
- p.setStartTime(p.getStartTime().substring(0, p.getStartTime().length() - 3));
- p.setEndTime(p.getEndTime().substring(0, p.getEndTime().length() - 3));
- });
- map.put("plans", plans);
- program.setSchedule(map);
-
- program.setNoticeUrl(VnnoxConstant.NOTIFY_URL);
- VnnoxResultResponse vnnoxResultResponse = vnnoxProgramAPIUtil.pushWeather(program);
- vnnoxAPIUtil.volChange(playerIds, Integer.valueOf(pushToLed.getVolume()).intValue());
-
- List<String> success = new ArrayList<>();
- List<String> fail = new ArrayList<>();
- if (vnnoxResultResponse.getData() != null) {
- success = vnnoxResultResponse.getData().getSuccess();
- fail = vnnoxResultResponse.getData().getFail();
- }
-
- //鎷兼帴鎴愬姛澶辫触鐨勭粨鏋�
- Map<String, Object> result = new HashMap<>();
- List<NovaPushResultVO> successList = new ArrayList<>();
- List<NovaPushResultVO> faileList = new ArrayList<>();
- List<String> finalSuccess = success;
- List<String> finalFail = fail;
- nova.forEach(n -> {
- if (finalSuccess.contains(n.getPlayerId())) {
- successList.add(n);
- } else if (finalFail.contains(n.getPlayerId())) {
- faileList.add(n);
- }
- });
-
- result.put("success", successList);
- result.put("fail", faileList);
-
- /**
- * 璇虹摝鎺ㄩ�佽妭鐩棩蹇楄褰曞紑濮�
- */
- List<LedPlayerEntity> list = SpringContextHolder.getBean(LedPlayerEntityService.class)
- .list(Wrappers.lambdaQuery(LedPlayerEntity.class).in(LedPlayerEntity::getId, nova.stream().map(NovaPushResultVO::getPlayerId).toArray()));
- List<String> listCode = new ArrayList<>();
- for (LedPlayerEntity temp : list) {
- listCode.add(temp.getSn());
- }
-
- String content = "{鑺傜洰ID锛�" + planId
- + "锛� 鑺傜洰鍚嶇О锛�" + byId.getName()
- + "}," + " 鎺ㄩ�佺粨鏋滐細" + result
- + " }";
- StoreOperationRecordsUtils.storeOperationData(listCode, null, "璇虹摝鎺ㄩ�佹挱鏀捐鍒�", content);
- /**
- * 璇虹摝鎺ㄩ�佽妭鐩棩蹇楄褰曠粨鏉�
- */
-
- return result;
- }
}
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
diff --git a/ximon-admin/src/main/java/com/sandu/ximon/admin/utils/VnnoxRequestUtil.java b/ximon-admin/src/main/java/com/sandu/ximon/admin/utils/VnnoxRequestUtil.java
index 531bb10..0a3de51 100644
--- a/ximon-admin/src/main/java/com/sandu/ximon/admin/utils/VnnoxRequestUtil.java
+++ b/ximon-admin/src/main/java/com/sandu/ximon/admin/utils/VnnoxRequestUtil.java
@@ -92,7 +92,6 @@
public static String PostWithHeader (String URL, String json, CommonHeader header) {
- System.out.println(json);
System.out.println("****************************************");
CloseableHttpClient client = HttpClients.createDefault();
HttpPost post = new HttpPost(URL);
--
Gitblit v1.9.3