From 0f1938fcb0acc34e2bf808048fa15435142cb5a6 Mon Sep 17 00:00:00 2001
From: liuhaonan <konodioda2333@vip.qq.com>
Date: 星期日, 24 四月 2022 16:25:25 +0800
Subject: [PATCH] bug修复
---
ximon-admin/src/main/java/com/sandu/ximon/admin/dto/PlanDto.java | 18 ++
ximon-admin/src/main/java/com/sandu/ximon/admin/utils/VnnoxProgramAPIUtil.java | 2
ximon-admin/src/main/java/com/sandu/ximon/admin/controller/XiXunController.java | 33 +++
ximon-admin/src/main/java/com/sandu/ximon/admin/security/MapOrList.java | 18 ++
ximon-admin/src/main/java/com/sandu/ximon/admin/utils/VnnoxAPIUtil.java | 47 +++++
ximon-admin/src/main/java/com/sandu/ximon/admin/service/PlayPlanNvService.java | 46 +++++
ximon-admin/src/main/java/com/sandu/ximon/admin/service/LedScheduleService.java | 65 +++++++
ximon-admin/src/main/java/com/sandu/ximon/admin/utils/request/TaskSchedules.java | 1
ximon-admin/src/main/java/com/sandu/ximon/admin/utils/request/requestbody/GetSchedules.java | 12 +
ximon-admin/src/main/java/com/sandu/ximon/admin/utils/request/requestbody/Task.java | 3
ximon-admin/src/main/java/com/sandu/ximon/admin/vo/LedScheduleVO.java | 21 ++
ximon-admin/src/main/java/com/sandu/ximon/admin/controller/VnnoxController.java | 27 +++
ximon-admin/src/main/java/com/sandu/ximon/admin/service/XiXunPlayerService.java | 32 ++++
ximon-admin/src/main/java/com/sandu/ximon/admin/utils/VnnoxRequestUtil.java | 1
ximon-admin/src/main/java/com/sandu/ximon/admin/entity/Plans.java | 29 +++
ximon-admin/src/main/java/com/sandu/ximon/admin/utils/request/VnnoxBaseRequest.java | 6
dao/src/main/java/com/sandu/ximon/dao/domain/PoleLightemitEntity.java | 1
ximon-admin/src/main/java/com/sandu/ximon/admin/config/VnnoxUrl.java | 4
ximon-admin/src/main/java/com/sandu/ximon/admin/security/test.java | 25 +-
ximon-admin/src/main/java/com/sandu/ximon/admin/service/VnnoxService.java | 36 +++
ximon-admin/src/main/java/com/sandu/ximon/admin/utils/request/PlayerProgram.java | 1
21 files changed, 399 insertions(+), 29 deletions(-)
diff --git a/dao/src/main/java/com/sandu/ximon/dao/domain/PoleLightemitEntity.java b/dao/src/main/java/com/sandu/ximon/dao/domain/PoleLightemitEntity.java
index 25cad9f..5477e90 100644
--- a/dao/src/main/java/com/sandu/ximon/dao/domain/PoleLightemitEntity.java
+++ b/dao/src/main/java/com/sandu/ximon/dao/domain/PoleLightemitEntity.java
@@ -52,6 +52,7 @@
/**
* 璇锋眰body,鑺傜洰涓讳綋鐨勫鍣�
*/
+ @JsonIgnore
private String requestBody;
/**
diff --git a/ximon-admin/src/main/java/com/sandu/ximon/admin/config/VnnoxUrl.java b/ximon-admin/src/main/java/com/sandu/ximon/admin/config/VnnoxUrl.java
index ce0d9a3..043068c 100644
--- a/ximon-admin/src/main/java/com/sandu/ximon/admin/config/VnnoxUrl.java
+++ b/ximon-admin/src/main/java/com/sandu/ximon/admin/config/VnnoxUrl.java
@@ -23,6 +23,10 @@
public static String REBOOT = "/v1/player/immediateControl/reboot";
// 涓嬪彂瀹氭椂浠诲姟
public static String TIMING_CONTROL = "/v1/player/timingControl/screenStatus";
+ //鍚屾
+ public static String SIMU_LCAST = "/v1/player/immediateControl/simulcast";
+ // NTP瀵规椂
+ public static String NTP_SYNC = "/v1/player/immediateControl/ntpSync";
public static String getUrl(String urlSuffix) {
return url + urlSuffix;
diff --git a/ximon-admin/src/main/java/com/sandu/ximon/admin/controller/VnnoxController.java b/ximon-admin/src/main/java/com/sandu/ximon/admin/controller/VnnoxController.java
index 2a9e286..ec4939c 100644
--- a/ximon-admin/src/main/java/com/sandu/ximon/admin/controller/VnnoxController.java
+++ b/ximon-admin/src/main/java/com/sandu/ximon/admin/controller/VnnoxController.java
@@ -20,6 +20,7 @@
import com.sandu.ximon.dao.domain.PoleBinding;
import com.sandu.ximon.dao.enums.AdministratorEnums;
import com.sandu.ximon.dao.enums.MenuEnum;
+import com.sun.javafx.collections.MappingChange;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
@@ -73,8 +74,30 @@
* @return
*/
@PostMapping("/reboot")
- public ResponseVO<Object> reboot(@RequestBody VnnoxParam vnnoxWebRequest) {
- VnnoxResult vnnoxResult = vnnoxService.reboot(vnnoxWebRequest.getPlayerList());
+ public ResponseVO<Object> reboot(@RequestBody List<String> vnnoxWebRequest) {
+ VnnoxResult vnnoxResult = vnnoxService.reboot(vnnoxWebRequest);
+ return ResponseUtil.success(vnnoxResult);
+ }
+
+ /**
+ * 鍚屾鎾斁
+ */
+ @PostMapping("/syncPlay")
+ public ResponseVO<Object> syncPlay(@RequestBody Map map) {
+ List playIdlist = (List)map.get("playIdlist");
+ Integer option = (Integer) map.get("option");
+ VnnoxResult vnnoxResult = vnnoxService.syncPlay(playIdlist,option);
+ return ResponseUtil.success(vnnoxResult);
+ }
+
+ /**
+ * ntp瀵规椂
+ */
+ @PostMapping("/ntp")
+ public ResponseVO<Object> ntp(@RequestBody Map map) {
+ boolean enable = (boolean)map.get("enable");
+ List playIdlist = (List)map.get("playIdlist");
+ VnnoxResult vnnoxResult = vnnoxService.ntpSync(playIdlist,enable);
return ResponseUtil.success(vnnoxResult);
}
diff --git a/ximon-admin/src/main/java/com/sandu/ximon/admin/controller/XiXunController.java b/ximon-admin/src/main/java/com/sandu/ximon/admin/controller/XiXunController.java
index 874acf9..7aab8c1 100644
--- a/ximon-admin/src/main/java/com/sandu/ximon/admin/controller/XiXunController.java
+++ b/ximon-admin/src/main/java/com/sandu/ximon/admin/controller/XiXunController.java
@@ -17,6 +17,7 @@
import com.sandu.ximon.admin.security.SecurityUtils;
import com.sandu.ximon.admin.service.*;
import com.sandu.ximon.admin.utils.LightemitUtils;
+import com.sandu.ximon.admin.vo.LedScheduleVO;
import com.sandu.ximon.dao.domain.PoleLightemitEntity;
import com.sandu.ximon.dao.domain.PoleXixunPlayerEntity;
import com.sandu.ximon.dao.enums.MenuEnum;
@@ -130,6 +131,13 @@
return ResponseUtil.success("鎺ㄩ�佹垚鍔�");
}
+ //鎵ц涓殑鑺傜洰
+ @GetMapping("/getProgram/{lightemitId}")
+ public ResponseVO<Object> getProgram(@PathVariable Long lightemitId) {
+ return ResponseUtil.success(xiXunPlayerService.getByPid(lightemitId));
+ }
+
+
/**
* LED灞忓箷鏂板
*
@@ -143,7 +151,11 @@
throw new BusinessException("LED鎺у埗鍗＄紪鍙蜂笉鑳介噸澶�");
}
- poleLightemit.setCreateUserId(SecurityUtils.getClientId());
+ if (SecurityUtils.getClientId() == null) {
+ poleLightemit.setClientId(clientService.getClientId());
+ poleLightemit.setUserId(SecurityUtils.getUserId());
+ poleLightemit.setCreateUserId(SecurityUtils.getUserId());
+ }
poleLightemitService.savePoleLightemit(poleLightemit);
@@ -195,7 +207,7 @@
}
List<PoleLightemitEntity> poleLightemitEntityList = poleLightemitService.listLed(keyword, isOnLine);
poleLightemitEntityList.forEach(
- led->{
+ led -> {
led.setStreetlightId(led.getPoleId());
led.setStreetlightName(led.getPoleName());
}
@@ -379,5 +391,22 @@
return ResponseUtil.success("璁剧疆鎴愬姛");
}
+ /**
+ * 鑾峰彇鎵ц涓殑瀹氭椂
+ * @param
+ * @return
+ */
+ @GetMapping("/getPushSchedule")
+ public ResponseVO<Object> getPushSchedule(@RequestBody List<Long> ids) {
+ if(ids.isEmpty()){
+ throw new BusinessException("鏈�夋嫨LED灞�");
+ }
+ List<LedScheduleVO> list = new ArrayList<>();
+ for(Long id : ids) {
+ LedScheduleVO ledScheduleVO = scheduleService.getledschedules(id);
+ list.add(ledScheduleVO);
+ }
+ return ResponseUtil.success(list);
+ }
}
diff --git a/ximon-admin/src/main/java/com/sandu/ximon/admin/dto/PlanDto.java b/ximon-admin/src/main/java/com/sandu/ximon/admin/dto/PlanDto.java
new file mode 100644
index 0000000..d145827
--- /dev/null
+++ b/ximon-admin/src/main/java/com/sandu/ximon/admin/dto/PlanDto.java
@@ -0,0 +1,18 @@
+package com.sandu.ximon.admin.dto;
+
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * @Author liuhaonan
+ * @Date 2022/04/22
+ * @Version 1.0
+ */
+@Data
+public class PlanDto {
+
+ private List<Integer> weekDays;
+ private String startTime;
+ private String endTime;
+}
diff --git a/ximon-admin/src/main/java/com/sandu/ximon/admin/entity/Plans.java b/ximon-admin/src/main/java/com/sandu/ximon/admin/entity/Plans.java
new file mode 100644
index 0000000..dcd762e
--- /dev/null
+++ b/ximon-admin/src/main/java/com/sandu/ximon/admin/entity/Plans.java
@@ -0,0 +1,29 @@
+package com.sandu.ximon.admin.entity;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.util.List;
+
+/**
+ * @Author liuhaonan
+ * @Date 2022/04/22
+ * @Version 1.0
+ */
+@NoArgsConstructor
+@Data
+public class Plans {
+// private String endDate;
+// private List<PlansDTO> plans;
+// private String startDate;
+//
+// @NoArgsConstructor
+// @Data
+// public static class PlansDTO {
+// private List<Integer> weekDays;
+// private String startTime;
+// private String endTime;
+//
+// }
+}
diff --git a/ximon-admin/src/main/java/com/sandu/ximon/admin/security/MapOrList.java b/ximon-admin/src/main/java/com/sandu/ximon/admin/security/MapOrList.java
new file mode 100644
index 0000000..19f561f
--- /dev/null
+++ b/ximon-admin/src/main/java/com/sandu/ximon/admin/security/MapOrList.java
@@ -0,0 +1,18 @@
+package com.sandu.ximon.admin.security;
+
+import java.util.*;
+import java.util.Map.Entry;
+
+public class MapOrList {
+
+ //map杞崲鎴恖isy
+ public static List mapTransitionList(Map map) {
+ List list = new ArrayList();
+ Iterator iter = map.entrySet().iterator(); //鑾峰緱map鐨処terator
+ while (iter.hasNext()) {
+ Entry entry = (Entry) iter.next();
+ list.add(entry.getValue());
+ }
+ return list;
+ }
+}
\ No newline at end of file
diff --git a/ximon-admin/src/main/java/com/sandu/ximon/admin/security/test.java b/ximon-admin/src/main/java/com/sandu/ximon/admin/security/test.java
index 6721243..a845f44 100644
--- a/ximon-admin/src/main/java/com/sandu/ximon/admin/security/test.java
+++ b/ximon-admin/src/main/java/com/sandu/ximon/admin/security/test.java
@@ -13,18 +13,19 @@
public class test {
public static void main(String[] args) {
-// String s="e10adc3949ba59abbe56e057f20f883e";
-// PasswordEncoder pw= new BCryptPasswordEncoder();
-// //鍔犲瘑
-// String encode=pw.encode(s);
-// System.out.println(encode);
-// //姣旇緝瀵嗙爜
-// boolean matches=pw.matches(s,encode);
-// System.out.println("==============================");
-// System.out.println(matches);
+ String s="123456";
+ PasswordEncoder pw= new BCryptPasswordEncoder();
+ //鍔犲瘑
+ String encode=pw.encode(s);
+ System.out.println(encode);
+ //姣旇緝瀵嗙爜
+ boolean matches=pw.matches(s,encode);
+ System.out.println("==============================");
+ System.out.println(matches);
- LocalDateTime now = LocalDateTime.now();
- Integer week = now.getDayOfWeek().getValue();
- System.out.println("鑾峰彇褰撳墠鍛�:" + week);
+ // LocalDateTime now = LocalDateTime.now();
+// Integer week = now.getDayOfWeek().getValue();
+// System.out.println("鑾峰彇褰撳墠鍛�:" + week);
+//
}
}
diff --git a/ximon-admin/src/main/java/com/sandu/ximon/admin/service/LedScheduleService.java b/ximon-admin/src/main/java/com/sandu/ximon/admin/service/LedScheduleService.java
index 53db442..fbf1548 100644
--- a/ximon-admin/src/main/java/com/sandu/ximon/admin/service/LedScheduleService.java
+++ b/ximon-admin/src/main/java/com/sandu/ximon/admin/service/LedScheduleService.java
@@ -12,10 +12,13 @@
import com.sandu.ximon.admin.config.RealtimeServerBean;
import com.sandu.ximon.admin.param.LEDScheduleParam_xixun;
import com.sandu.ximon.admin.security.SecurityUtils;
+import com.sandu.ximon.admin.utils.JsonUtil;
import com.sandu.ximon.admin.utils.LightemitUtils;
import com.sandu.ximon.admin.utils.request.Schedules;
-import com.sandu.ximon.admin.utils.request.Task;
+import com.sandu.ximon.admin.utils.request.requestbody.GetSchedules;
+import com.sandu.ximon.admin.utils.request.requestbody.Task;
import com.sandu.ximon.admin.utils.request.TaskSchedules;
+import com.sandu.ximon.admin.vo.LedScheduleVO;
import com.sandu.ximon.dao.domain.LedScheduleEntity;
import com.sandu.ximon.dao.domain.PoleLightemitEntity;
import com.sandu.ximon.dao.mapper.LedScheduleEntityMapper;
@@ -101,7 +104,12 @@
*/
public void ledschedulepush(Integer scheduleId, Long[] lightemitIds) {
- LedScheduleEntity ledScheduleEntity = baseMapper.selectById(scheduleId);
+// LedScheduleEntity ledScheduleEntity = baseMapper.selectById(scheduleId);
+ LedScheduleEntity ledScheduleEntity = getById(scheduleId);
+ if (ledScheduleEntity == null) {
+ throw new BusinessException("璇ュ畾鏃朵换鍔′笉瀛樺湪");
+ }
+// SendCommand sendCommand = new SendCommand();
// SendCommand sendCommand = new SendCommand();
// sendCommand.setTask(ledScheduleEntity.getSchedule());
// String json = new Gson().toJson(sendCommand);
@@ -166,4 +174,57 @@
return list(eq);
}
+
+ /**
+ * 瀹氭椂鏌ヨ
+ */
+ public LedScheduleVO getledschedules(Long id) {
+
+ PoleLightemitEntity poleLightemitEntity = poleLightemitService.getById(id);
+
+ String result1 = lightemitUtils.getTimeSchedule(poleLightemitEntity.getLightemitControlCode());
+ if(result1.indexOf("not open")!=-1){
+ LedScheduleVO notOpen = new LedScheduleVO();
+ notOpen.setLedName(poleLightemitEntity.getLightemitName());
+ notOpen.setScheduleName("璁惧鏈紑鍚�");
+ return notOpen;
+ }
+ boolean flag = result1.contains("exist");
+ if(flag!=true) {
+ String result = lightemitUtils.getTimeSchedule(poleLightemitEntity.getLightemitControlCode());
+// if(result !=null){
+ GetSchedules getSchedules = new GetSchedules();
+ try {
+ getSchedules = JsonUtil.convertJsonStringToObject(result, GetSchedules.class);
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
+ LedScheduleVO ledScheduleVO = new LedScheduleVO();
+ ledScheduleVO.setLedName(poleLightemitEntity.getLightemitName());
+ if (getSchedules.getTask().getName() != null) {
+ ledScheduleVO.setScheduleName(getSchedules.getTask().getName());
+ List<Schedules> list = new ArrayList();
+ list = getSchedules.getTask().getSchedules();
+ for (Schedules schedules : list) {
+
+ ledScheduleVO.setStartTime(schedules.getStartTime());
+ ledScheduleVO.setEndTime(schedules.getEndTime());
+ ledScheduleVO.setStartDate(schedules.getStartDate());
+ ledScheduleVO.setEndDate(schedules.getEndDate());
+ ledScheduleVO.setWeek(schedules.getWeekFilter());
+ }
+ ;
+ } else {
+ ledScheduleVO.setScheduleName("鏃犲畾鏃�");
+ }
+ return ledScheduleVO;
+ }else {
+ LedScheduleVO ledScheduleVO = new LedScheduleVO();
+ ledScheduleVO.setLedName(poleLightemitEntity.getLightemitName());
+ ledScheduleVO.setScheduleName("璁惧鏈紑鍚�");
+ return ledScheduleVO;
+ }
+
+ }
+
}
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 66f6fc6..b43db2a 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
@@ -5,6 +5,8 @@
import com.sandu.common.execption.BusinessException;
import com.sandu.common.service.impl.BaseServiceImpl;
import com.sandu.ximon.admin.config.VnnoxConstant;
+import com.sandu.ximon.admin.dto.PlanDto;
+import com.sandu.ximon.admin.dto.SchedulesDTO;
import com.sandu.ximon.admin.param.PlayPlanParam;
import com.sandu.ximon.admin.security.SecurityUtils;
import com.sandu.ximon.admin.utils.VnnoxAPIUtil;
@@ -62,7 +64,35 @@
playPlan.setStartDate(playPlanParam.getStartDate());
playPlan.setEndDate(playPlanParam.getEndDate());
playPlan.setWeekDays(playPlanParam.getWeekDays());
- playPlan.setSchedule(JSON.toJSONString(playPlanParam.getSchedule()));
+
+
+ Map schedule = playPlanParam.getSchedule();
+
+ String s = JSON.toJSONString(schedule.get("plans"));
+ List<PlanDto> plans = JSON.parseArray(s, PlanDto.class);
+ System.out.println(plans.toString()+"plans");
+
+// List<PlanDto> plans = (List<PlanDto>) schedule.get("plans");
+ plans.forEach(plan -> {
+ System.out.println(plan+"plan");
+ }
+ );
+
+ List<SchedulesDTO> schedulesDTOS = new ArrayList<>();
+ for (int i = 0; i < plans.size(); i++) {
+ SchedulesDTO schedulesDTO = new SchedulesDTO();
+ schedulesDTO.setStartDate(playPlanParam.getStartDate());
+ schedulesDTO.setEndDate(playPlanParam.getEndDate());
+ if (i % 2 == 1) {
+ schedulesDTO.setExecTime(plans.get(i).getStartTime());
+ } else {
+ schedulesDTO.setWeekDays(plans.get(i).getWeekDays());
+ schedulesDTO.setExecTime(plans.get(i).getEndTime());
+ }
+ schedulesDTOS.add(schedulesDTO);
+ }
+
+ playPlan.setSchedule(JSON.toJSONString(schedulesDTOS));
playPlan.setStartTime(playPlanParam.getStartTime());
playPlan.setEndTime(playPlanParam.getEndTime());
// BeanUtils.copyProperties(playPlanParam, playPlan);
@@ -120,8 +150,17 @@
System.out.println(pushToLed.getPages());
program.setPages(JSON.parseObject(pushToLed.getPages(), List.class));
- program.setSchedules(JSON.parseObject(pushToLed.getSchedule(), List.class));
- Map map = JSON.parseObject(pushToLed.getSchedule(), Map.class);
+//
+// test test = JSON.parseObject(pushToLed.getSchedule(), test.class);
+//
+// SchedulesDTO schedulesDTO = new SchedulesDTO();
+// schedulesDTO.setExecTime(A.get);
+
+
+ program.setSchedules((JSON.parseArray(pushToLed.getSchedule(), SchedulesDTO.class)));
+
+
+ // Map map = JSON.parseObject(pushToLed.getSchedule(), Map.class);
program.setNoticeUrl(VnnoxConstant.NOTIFY_URL);
VnnoxResultResponse vnnoxResultResponse = vnnoxProgramAPIUtil.timeProgram(program);
@@ -134,7 +173,6 @@
success = vnnoxResultResponse.getData().getSuccess();
fail = vnnoxResultResponse.getData().getFail();
}
-
// fail.addAll(vnnoxResult.getFail());
Map<String, Object> result = new HashMap<>();
diff --git a/ximon-admin/src/main/java/com/sandu/ximon/admin/service/VnnoxService.java b/ximon-admin/src/main/java/com/sandu/ximon/admin/service/VnnoxService.java
index f74e9f5..b483757 100644
--- a/ximon-admin/src/main/java/com/sandu/ximon/admin/service/VnnoxService.java
+++ b/ximon-admin/src/main/java/com/sandu/ximon/admin/service/VnnoxService.java
@@ -184,15 +184,39 @@
return map;
}
+// //閲嶅惎
+// public VnnoxResult reboot(List<LedPlayerEntity> playerList) {
+// return vnnoxAPIUtil.reboot(
+// playerList.stream().map(
+// item -> item.getPlayerId()
+// ).collect(Collectors.toList())
+// );
+// }
+
//閲嶅惎
- public VnnoxResult reboot(List<LedPlayerEntity> playerList) {
- return vnnoxAPIUtil.reboot(
- playerList.stream().map(
- item -> item.getPlayerId()
- ).collect(Collectors.toList())
- );
+ public VnnoxResult reboot(List<String> playerList) {
+ return vnnoxAPIUtil.reboot(playerList);
}
+ /**
+ * 鍚屾鎾斁
+ * @param
+ * @return
+ */
+ public VnnoxResult syncPlay(List<String> playerList,Integer option) {
+ return vnnoxAPIUtil.syncPlay(playerList,option);
+ }
+
+ /**
+ * 瀵规椂
+ * @param
+ * @return
+ */
+ public VnnoxResult ntpSync(List<String> playerList,boolean enable) {
+ return vnnoxAPIUtil.ntpSync(playerList,enable);
+ }
+
+
public boolean updateDataName(Long id, String name) {
LedPlayerEntity byId = ledPlayerEntityService.getById(id);
if (byId == null) {
diff --git a/ximon-admin/src/main/java/com/sandu/ximon/admin/service/XiXunPlayerService.java b/ximon-admin/src/main/java/com/sandu/ximon/admin/service/XiXunPlayerService.java
index cde80d1..a21f1b9 100644
--- a/ximon-admin/src/main/java/com/sandu/ximon/admin/service/XiXunPlayerService.java
+++ b/ximon-admin/src/main/java/com/sandu/ximon/admin/service/XiXunPlayerService.java
@@ -128,6 +128,38 @@
return programPro;
}
+
+
+// public Object getProgram(String json) {
+//// PoleXixunPlayerEntity byId = getById(pid);
+// List<Long> fileIds = new ArrayList<>();
+// List<LedSFile> file = new ArrayList<>();
+// if (json == null) {
+// throw new BusinessException("鏈壘鍒拌鑺傜洰");
+// }
+// ProgramPro programPro = new ProgramPro();
+// try {
+// programPro = JsonUtil.convertJsonStringToObject(json, ProgramPro.class);
+// programPro.setProgramId(pid);
+// programPro.setScreenShot(byId.getScreenShot());
+// programPro.getLayers().forEach(
+// layerPro -> {
+// layerPro.getSources().forEach(
+// sourcePro -> {
+// long fileId = Long.parseLong(sourcePro.getId());
+// file.add(xiXunFileService.getById(fileId));
+// }
+// );
+// }
+// );
+// programPro.setFileList(file);
+// } catch (Exception e) {
+// e.printStackTrace();
+// }
+// return programPro;
+// }
+
+
/**
* 鎺ㄩ�佽妭鐩�
*
diff --git a/ximon-admin/src/main/java/com/sandu/ximon/admin/utils/VnnoxAPIUtil.java b/ximon-admin/src/main/java/com/sandu/ximon/admin/utils/VnnoxAPIUtil.java
index 276dbe1..70034c0 100644
--- a/ximon-admin/src/main/java/com/sandu/ximon/admin/utils/VnnoxAPIUtil.java
+++ b/ximon-admin/src/main/java/com/sandu/ximon/admin/utils/VnnoxAPIUtil.java
@@ -13,7 +13,9 @@
import java.net.URISyntaxException;
import java.util.ArrayList;
+import java.util.HashMap;
import java.util.List;
+import java.util.Map;
@Component("VnnoxAPIUtil")
@AllArgsConstructor
@@ -220,4 +222,49 @@
return response.getData();
}
+ /**
+ * 鍚屾鎾斁
+ *
+ */
+ public VnnoxResult syncPlay(List<String> playerId, Integer option) {
+ VnnoxBaseRequest request = new VnnoxBaseRequest();
+ request.setPlayerIds(playerId);
+ request.setOption(option);
+ request.setNoticeUrl(VnnoxConstant.SCREEN_SHOT_NOTIFY_URL);
+
+ String result = VnnoxRequestUtil.PostWithHeader(
+ VnnoxUrl.getUrl(VnnoxUrl.SIMU_LCAST),
+ request.toJson(),
+ new CommonHeader(CommonHeader.JSON, true)
+ );
+ VnnoxResultResponse response = JSON.parseObject(result, VnnoxResultResponse.class);
+
+ return response.getData();
+ }
+
+ /**
+ * NTP_SYNC
+ */
+ public VnnoxResult ntpSync(List<String> playerId, boolean enable) {
+// VnnoxBaseRequest request = new VnnoxBaseRequest();
+// request.setPlayerIds(playerId);
+// request.setEnable(enable);
+// request.setServer("ntp1.aliyun.com");
+// request.setNoticeUrl(VnnoxConstant.SCREEN_SHOT_NOTIFY_URL);
+ Map map = new HashMap();
+ map.put("server", "ntp1.aliyun.com");
+ map.put("enable", enable);
+ map.put("noticeUrl", VnnoxConstant.SCREEN_SHOT_NOTIFY_URL);
+ map.put("playerIds", playerId);
+ String s = JSON.toJSONString(map);
+ String result = VnnoxRequestUtil.PostWithHeader(
+ VnnoxUrl.getUrl(VnnoxUrl.NTP_SYNC),
+ s,
+ new CommonHeader(CommonHeader.JSON, true)
+ );
+ VnnoxResultResponse response = JSON.parseObject(result, VnnoxResultResponse.class);
+
+ return response.getData();
+ }
+
}
\ No newline at end of file
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..bbf3798 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
@@ -51,4 +51,6 @@
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 4f94eb4..531bb10 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
@@ -112,6 +112,7 @@
inStream.close();
} catch (Exception e) {
+ System.out.println("error" + e.getMessage());
return null;
}
return result;
diff --git a/ximon-admin/src/main/java/com/sandu/ximon/admin/utils/request/PlayerProgram.java b/ximon-admin/src/main/java/com/sandu/ximon/admin/utils/request/PlayerProgram.java
index 48d5954..abfd141 100644
--- a/ximon-admin/src/main/java/com/sandu/ximon/admin/utils/request/PlayerProgram.java
+++ b/ximon-admin/src/main/java/com/sandu/ximon/admin/utils/request/PlayerProgram.java
@@ -16,6 +16,7 @@
// 闇�瑕佸鐞嗙殑鎾斁鍣↖D闆嗗悎,鏈�澶氭敮鎸�100涓挱鏀惧櫒鍚屾椂澶勭悊
private List<String> playerIds;
// 鎾斁鏃堕棿鎺掓湡锛屽鏋滀负绌猴紝浼氬叏澶�24灏忔椂寰幆鎾斁
+// private List<SchedulesDTO> schedules;
private List<SchedulesDTO> schedules;
// 闇�瑕佹挱鏀剧殑椤甸潰鍐呭闆嗗悎
private List<Map<String,Object>> pages ;
diff --git a/ximon-admin/src/main/java/com/sandu/ximon/admin/utils/request/TaskSchedules.java b/ximon-admin/src/main/java/com/sandu/ximon/admin/utils/request/TaskSchedules.java
index 64fc226..a5dc135 100644
--- a/ximon-admin/src/main/java/com/sandu/ximon/admin/utils/request/TaskSchedules.java
+++ b/ximon-admin/src/main/java/com/sandu/ximon/admin/utils/request/TaskSchedules.java
@@ -1,5 +1,6 @@
package com.sandu.ximon.admin.utils.request;
+import com.sandu.ximon.admin.utils.request.requestbody.Task;
import lombok.Data;
/**
diff --git a/ximon-admin/src/main/java/com/sandu/ximon/admin/utils/request/VnnoxBaseRequest.java b/ximon-admin/src/main/java/com/sandu/ximon/admin/utils/request/VnnoxBaseRequest.java
index 1240eb2..6670672 100644
--- a/ximon-admin/src/main/java/com/sandu/ximon/admin/utils/request/VnnoxBaseRequest.java
+++ b/ximon-admin/src/main/java/com/sandu/ximon/admin/utils/request/VnnoxBaseRequest.java
@@ -12,8 +12,14 @@
private Integer value;
+ private Integer option;
+
+ private boolean enable;
+
private String noticeUrl;
+ private String server;
+
@Override
public String toJson() {
return VnnoxConstant.GSON.toJson(this);
diff --git a/ximon-admin/src/main/java/com/sandu/ximon/admin/utils/request/requestbody/GetSchedules.java b/ximon-admin/src/main/java/com/sandu/ximon/admin/utils/request/requestbody/GetSchedules.java
new file mode 100644
index 0000000..fdf1bff
--- /dev/null
+++ b/ximon-admin/src/main/java/com/sandu/ximon/admin/utils/request/requestbody/GetSchedules.java
@@ -0,0 +1,12 @@
+package com.sandu.ximon.admin.utils.request.requestbody;
+
+import lombok.Data;
+
+@Data
+public class GetSchedules {
+ private String _id;
+
+ private String _type;
+
+ private Task task ;
+}
\ No newline at end of file
diff --git a/ximon-admin/src/main/java/com/sandu/ximon/admin/utils/request/Task.java b/ximon-admin/src/main/java/com/sandu/ximon/admin/utils/request/requestbody/Task.java
similarity index 85%
rename from ximon-admin/src/main/java/com/sandu/ximon/admin/utils/request/Task.java
rename to ximon-admin/src/main/java/com/sandu/ximon/admin/utils/request/requestbody/Task.java
index f411027..6c6ec97 100644
--- a/ximon-admin/src/main/java/com/sandu/ximon/admin/utils/request/Task.java
+++ b/ximon-admin/src/main/java/com/sandu/ximon/admin/utils/request/requestbody/Task.java
@@ -1,5 +1,6 @@
-package com.sandu.ximon.admin.utils.request;
+package com.sandu.ximon.admin.utils.request.requestbody;
+import com.sandu.ximon.admin.utils.request.Schedules;
import lombok.Data;
import java.util.List;
diff --git a/ximon-admin/src/main/java/com/sandu/ximon/admin/vo/LedScheduleVO.java b/ximon-admin/src/main/java/com/sandu/ximon/admin/vo/LedScheduleVO.java
new file mode 100644
index 0000000..46ff850
--- /dev/null
+++ b/ximon-admin/src/main/java/com/sandu/ximon/admin/vo/LedScheduleVO.java
@@ -0,0 +1,21 @@
+package com.sandu.ximon.admin.vo;
+
+import lombok.Data;
+
+@Data
+public class LedScheduleVO {
+
+ private String ledName;
+
+ private String scheduleName;
+
+ private String startTime;
+
+ private String endTime;
+
+ private String startDate;
+
+ private String endDate;
+
+ private Integer[] week;
+}
\ No newline at end of file
--
Gitblit v1.9.3