From 9330e9b0e4e70151d36084ecb5695b818cfda2db Mon Sep 17 00:00:00 2001
From: liuhaonan <konodioda2333@vip.qq.com>
Date: 星期二, 19 四月 2022 16:07:32 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ximon-admin/src/main/java/com/sandu/ximon/admin/service/PlayPlanNvService.java | 105 +++++++++++++++++++++++++++++++++++-----------------
1 files changed, 71 insertions(+), 34 deletions(-)
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 67c351e..8afa9c4 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
@@ -7,13 +7,12 @@
import com.sandu.ximon.admin.config.VnnoxConstant;
import com.sandu.ximon.admin.param.PlayPlanParam;
import com.sandu.ximon.admin.security.SecurityUtils;
+import com.sandu.ximon.admin.utils.VnnoxAPIUtil;
import com.sandu.ximon.admin.utils.VnnoxProgramAPIUtil;
import com.sandu.ximon.admin.utils.request.PlayerProgram;
+import com.sandu.ximon.admin.utils.response.VnnoxResult;
import com.sandu.ximon.admin.utils.response.VnnoxResultResponse;
-import com.sandu.ximon.dao.domain.BroadcastV2TaskTerminal;
-import com.sandu.ximon.dao.domain.LedPlayerEntity;
-import com.sandu.ximon.dao.domain.PlayPlanNv;
-import com.sandu.ximon.dao.domain.PushToLed;
+import com.sandu.ximon.dao.domain.*;
import com.sandu.ximon.dao.enums.AdministratorEnums;
import com.sandu.ximon.dao.mapper.PlayPlanNvMapper;
import lombok.AllArgsConstructor;
@@ -32,25 +31,36 @@
private final PlayPlanNvMapper playPlanMapper;
private final VnnoxProgramAPIUtil vnnoxProgramAPIUtil;
private final LedPlayerEntityService ledPlayerEntityService;
+ private VnnoxAPIUtil vnnoxAPIUtil;
+ private final LEDProgramService ledProgramService;
+ private final ClientService clientService;
public boolean addPlan(PlayPlanParam playPlanParam) {
PlayPlanNv playPlan = new PlayPlanNv();
- if (AdministratorEnums.CUSTOMER.getCode().equals(SecurityUtils.getAdministratorIdentity())) {
+ if (SecurityUtils.getClientId()!=null){
playPlan.setUserId(SecurityUtils.getUserId());
+ if(clientService.findClientId()){
+ playPlan.setClientId(clientService.getClientId());
+ }
}
playPlan.setName(playPlanParam.getName());
- /* playPlan.setLedProgramName(playPlanParam.getLedProgramName());
+ playPlan.setLedProgramName(playPlanParam.getLedProgramName());
+ LEDProgram byId = ledProgramService.getById(playPlanParam.getLedProgramId());
+ if (byId == null) {
+ throw new BusinessException("ledProgramId鏈夎,鏈壘鍒拌鑺傜洰");
+ }
playPlan.setLedProgramId(playPlanParam.getLedProgramId());
playPlan.setVolume(playPlanParam.getVolume());
playPlan.setApplySeries(playPlanParam.getApplySeries());
playPlan.setStartDate(playPlanParam.getStartDate());
playPlan.setEndDate(playPlanParam.getEndDate());
playPlan.setWeekDays(playPlanParam.getWeekDays());
- playPlan.setSchedule(playPlanParam.getSchedule());
+ playPlan.setSchedule(JSON.toJSONString(playPlanParam.getSchedule()));
playPlan.setStartTime(playPlanParam.getStartTime());
- playPlan.setEndTime(playPlanParam.getEndTime());*/
- BeanUtils.copyProperties(playPlanParam, playPlan);
+ playPlan.setEndTime(playPlanParam.getEndTime());
+ // BeanUtils.copyProperties(playPlanParam, playPlan);
+
return save(playPlan);
@@ -71,7 +81,7 @@
playPlan.setStartDate(playPlanParam.getStartDate());
playPlan.setEndDate(playPlanParam.getEndDate());
playPlan.setWeekDays(playPlanParam.getWeekDays());
- playPlan.setSchedule(playPlanParam.getSchedule());
+ playPlan.setSchedule(JSON.toJSONString(playPlanParam.getSchedule()));
playPlan.setStartTime(playPlanParam.getStartTime());
playPlan.setEndTime(playPlanParam.getEndTime());
@@ -80,7 +90,7 @@
}
public boolean deletePlan(List<Long> ids) {
- for(Long id:ids){
+ for (Long id : ids) {
PlayPlanNv byId = getById(id);
if (byId == null) {
throw new BusinessException("閮ㄥ垎鎿嶄綔瀵硅薄涓嶅瓨鍦�");
@@ -89,16 +99,17 @@
return removeByIds(ids);
}
- public Map<String, Object> pushToLed(Long planId,List<String> playerIds){
+ public Map<String, Object> pushToLed(Long planId, List<String> playerIds) {
// public PlayerProgram pushToLed(Long planId){
PushToLed pushToLed = playPlanMapper.pushToLed(planId);
- if(pushToLed==null){
+ PlayPlanNv one = getOne(Wrappers.lambdaQuery(PlayPlanNv.class).eq(PlayPlanNv::getId, planId));
+ if (pushToLed == null) {
throw new BusinessException("鏈壘鍒拌鎾斁璁″垝");
}
//List<String> playerIds=new ArrayList<>();
- // playerIds.add("872bb51ae0f06e70c21e913cf3dc9e4d");
+ // playerIds.add("872bb51ae0f06e70c21e913cf3dc9e4d");
//List<Map<String,Object>> pages = JSON.parseObject(pushToLed.getPages(), List.class);
- PlayerProgram program=new PlayerProgram();
+ PlayerProgram program = new PlayerProgram();
program.setPlayerIds(playerIds);
System.out.println(pushToLed.getPages());
@@ -106,32 +117,58 @@
program.setPages(JSON.parseObject(pushToLed.getPages(), List.class));
program.setSchedule(JSON.parseObject(pushToLed.getSchedule(), Map.class));
program.setNoticeUrl(VnnoxConstant.NOTIFY_URL);
- /* Map schedule = JSON.parseObject(pushToLed.getSchedule(), Map.class);
- Map<String,Object> push=new HashMap<>();
- push.put("playerIds",playerIds);
- push.put("pages",pages);
- push.put("schedule",schedule);
- push.put("noticeUrl", VnnoxConstant.SCREEN_SHOT_NOTIFY_URL);
-*/
VnnoxResultResponse vnnoxResultResponse = vnnoxProgramAPIUtil.normalProgram(program);
- // VnnoxResultResponse vnnoxResultResponse = vnnoxProgramAPIUtil.normalProgram(push);
- List<String> success = vnnoxResultResponse.getData().getSuccess();
- List<String> fail = vnnoxResultResponse.getData().getFail();
- Map<String,Object> result=new HashMap<>();
- List<LedPlayerEntity> successList= new ArrayList<>();
- List<LedPlayerEntity> faileList= new ArrayList<>();
- for (String playerId:success){
+ VnnoxResult vnnoxResult = vnnoxAPIUtil.volChange(playerIds, Integer.valueOf(one.getVolume()).intValue());
+
+ // VnnoxResultResponse vnnoxResultResponse = vnnoxProgramAPIUtil.normalProgram(push);
+ List<String> success = new ArrayList<>();
+ List<String> fail = new ArrayList<>();
+ if (vnnoxResultResponse.getData() != null) {
+ success = vnnoxResultResponse.getData().getSuccess();
+ fail = vnnoxResultResponse.getData().getFail();
+ }
+
+
+ // fail.addAll(vnnoxResult.getFail());
+ Map<String, Object> result = new HashMap<>();
+ List<LedPlayerEntity> successList = new ArrayList<>();
+ List<LedPlayerEntity> faileList = new ArrayList<>();
+ for (String playerId : success) {
successList.add(ledPlayerEntityService.getByPlayerId(playerId));
}
- for (String playerId:fail){
- faileList.add( ledPlayerEntityService.getByPlayerId(playerId));
+ for (String playerId : fail) {
+ faileList.add(ledPlayerEntityService.getByPlayerId(playerId));
}
- result.put("success",successList);
- result.put("fail",faileList);
+
+ result.put("success", successList);
+ result.put("fail", faileList);
return result;
- // return program;
+ // return program;
}
+
+ public Object getByPlanId(Long planId) {
+ PlayPlanNv byId = getById(planId);
+ if (byId == null) {
+ throw new BusinessException("鎵句笉鍒拌璁″垝");
+ }
+ LEDProgram byId1 = ledProgramService.getById(byId.getLedProgramId());
+ if (byId1 == null) {
+ throw new BusinessException("鎵句笉鍒拌鑺傜洰");
+ }
+ Map schedule = JSON.parseObject(byId.getSchedule(), Map.class);
+ List pages = JSON.parseObject(byId1.getPages(), List.class);
+ Map plan = new HashMap();
+ plan.put("planId", byId.getId());
+ plan.put("planName", byId.getName());
+ plan.put("programId", byId1.getId());
+ plan.put("programName", byId1.getName());
+ plan.put("planVolume", byId.getVolume());
+ plan.put("preview", byId1.getPreview());
+ plan.put("pages", pages);
+ plan.put("schedule", schedule);
+ return plan;
+ }
}
--
Gitblit v1.9.3