From d9a9d8a2dad1d1e57b184bf8f972a03d654d883a Mon Sep 17 00:00:00 2001
From: liuhaonan <31457034@qq.com>
Date: 星期五, 22 七月 2022 15:07:01 +0800
Subject: [PATCH] 优化
---
ximon-admin/src/main/java/com/sandu/ximon/admin/service/PlayPlanNvService.java | 391 ++++++++++++++++++++++++++++++++++++++++++++++++-------
1 files changed, 340 insertions(+), 51 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 66f6fc6..31ca00f 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
@@ -1,31 +1,35 @@
package com.sandu.ximon.admin.service;
+import cn.hutool.core.date.DatePattern;
+import cn.hutool.core.date.DateUtil;
import com.alibaba.fastjson.JSON;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.sandu.common.execption.BusinessException;
import com.sandu.common.service.impl.BaseServiceImpl;
+import com.sandu.common.util.SpringContextHolder;
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.dto.nova.PlayerProgram;
+import com.sandu.ximon.admin.dto.nova.ProgramDto;
+import com.sandu.ximon.admin.dto.nova.ProgramPush;
+import com.sandu.ximon.admin.dto.nova.ProgramSchedule;
+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.StoreOperationRecordsUtils;
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.admin.vo.NovaOpenVO;
+import com.sandu.ximon.admin.vo.NovaPushResultVO;
import com.sandu.ximon.admin.vo.PlansVO;
-import com.sandu.ximon.dao.domain.LEDProgram;
-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.mapper.PlayPlanNvMapper;
import lombok.AllArgsConstructor;
import org.springframework.stereotype.Service;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
/**
* 鎾斁璁″垝
@@ -40,6 +44,7 @@
private VnnoxAPIUtil vnnoxAPIUtil;
private final LEDProgramService ledProgramService;
private final ClientService clientService;
+ private final LEDProgramFileService fileService;
public boolean addPlan(PlayPlanParam playPlanParam) {
@@ -62,13 +67,80 @@
playPlan.setStartDate(playPlanParam.getStartDate());
playPlan.setEndDate(playPlanParam.getEndDate());
playPlan.setWeekDays(playPlanParam.getWeekDays());
+
+
+ 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");
+
+ List<SchedulesDTO> schedulesDTOS = new ArrayList<>();
+ for (int i = 0; i < plans.size(); i++) {
+ SchedulesDTO openDto = new SchedulesDTO();
+
+
+ SchedulesDTO closeDto = new SchedulesDTO();
+
+ openDto.setStartDate(schedule.get("startDate").toString());
+ openDto.setEndDate(schedule.get("endDate").toString());
+ openDto.setExecTime(plans.get(i).getStartTime());
+ openDto.setStatus("OPEN");
+
+ /**
+ * 鍒ゆ柇鏃堕棿鐨勫厛鍚�
+ */
+ String startTime = openDto.getStartDate() + " " + plans.get(i).getStartTime();
+ String endTime = openDto.getEndDate() + " " + plans.get(i).getEndTime();
+
+ //杞崲鎴愭椂闂存埑
+ long startTimeStamp = DateUtil.parse(startTime, DatePattern.NORM_DATETIME_PATTERN).getTime();
+ long endTimeStamp = DateUtil.parse(endTime, DatePattern.NORM_DATETIME_PATTERN).getTime();
+ if (startTimeStamp > endTimeStamp) {
+ throw new BusinessException("寮�濮嬫椂闂翠笉鑳藉ぇ浜庣粨鏉熸椂闂�");
+ }
+
+ closeDto.setStartDate(schedule.get("startDate").toString());
+ closeDto.setEndDate(schedule.get("endDate").toString());
+ closeDto.setWeekDays(plans.get(i).getWeekDays());
+ closeDto.setExecTime(plans.get(i).getEndTime());
+ closeDto.setStatus("CLOSE");
+
+ schedulesDTOS.add(closeDto);
+ schedulesDTOS.add(openDto);
+ }
+
playPlan.setSchedule(JSON.toJSONString(playPlanParam.getSchedule()));
+ playPlan.setSchedules(JSON.toJSONString(schedulesDTOS));
playPlan.setStartTime(playPlanParam.getStartTime());
playPlan.setEndTime(playPlanParam.getEndTime());
// BeanUtils.copyProperties(playPlanParam, playPlan);
+ /**
+ * 璇虹摝瀹氭椂浠诲姟/鎾斁璁″垝鏂板鏃ュ織璁板綍寮�濮�
+ */
+ boolean save = save(playPlan);
+ String content = "{鎾斁璁″垝锛�" + playPlan.getId()
+ + "锛� 鑺傜洰鍚嶇О锛�" + byId.getName()
+ + "锛� 鎾斁璁″垝璁″垝鍚嶇О锛�"
+ + playPlan.getName()
+ + "锛� 鎾斁璁″垝璁″垝鍐呭锛�"
+ + JSON.toJSONString(playPlan)
+ + "锛� 瀹氭椂浠诲姟鍐呭锛�" + playPlan.getSchedules()
+ + "}," + " 鎺ㄩ�佺粨鏋滐細" + save
+ + " }";
+ if (playPlanParam.getId() == null) {
+ StoreOperationRecordsUtils.storeOperationData(null, null, "璇虹摝瀹氭椂浠诲姟/鎾斁璁″垝鏂板", content);
+ } else {
+ StoreOperationRecordsUtils.storeOperationData(null, null, "璇虹摝瀹氭椂浠诲姟/鎾斁璁″垝淇敼", content);
+ }
+ /**
+ * 璇虹摝瀹氭椂浠诲姟/鎾斁璁″垝鏂板鏃ュ織璁板綍缁撴潫
+ */
- return save(playPlan);
+ return save;
}
@@ -77,21 +149,12 @@
if (byId == null) {
throw new BusinessException("鎿嶄綔瀵硅薄涓嶅瓨鍦�");
}
- PlayPlanNv playPlan = new PlayPlanNv();
- playPlan.setId(id);
- playPlan.setName(playPlanParam.getName());
- playPlan.setLedProgramName(playPlanParam.getLedProgramName());
- 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(JSON.toJSONString(playPlanParam.getSchedule()));
- playPlan.setStartTime(playPlanParam.getStartTime());
- playPlan.setEndTime(playPlanParam.getEndTime());
+ if (removeById(id)) {
+ playPlanParam.setId(id);
+ return addPlan(playPlanParam);
+ }
- return updateById(playPlan);
+ return false;
}
@@ -105,29 +168,66 @@
return removeByIds(ids);
}
- public Map<String, Object> pushToLed(Long planId, List<String> playerIds) {
-// public PlayerProgram pushToLed(Long planId){
+ public Map<String, Object> pushToLed(Long planId, List<NovaPushResultVO> nova) {
+ if (nova == null) {
+ throw new BusinessException("璇烽�夋嫨姝ｇ‘鐨凩ED灞�");
+ }
PushToLed pushToLed = playPlanMapper.pushToLed(planId);
- PlayPlanNv one = getOne(Wrappers.lambdaQuery(PlayPlanNv.class).eq(PlayPlanNv::getId, planId));
+ if (pushToLed.getPages() == null) {
+ throw new BusinessException("鑺傜洰鍐呭涓㈠け");
+ }
+ PlayPlanNv byId = getById(planId);
if (pushToLed == null) {
throw new BusinessException("鏈壘鍒拌鎾斁璁″垝");
}
- //List<String> playerIds=new ArrayList<>();
- // playerIds.add("872bb51ae0f06e70c21e913cf3dc9e4d");
- //List<Map<String,Object>> pages = JSON.parseObject(pushToLed.getPages(), List.class);
+ List<String> playerIds = new ArrayList<>();
+ nova.forEach(n -> {
+ playerIds.add(n.getPlayerId());
+ });
+
PlayerProgram program = new PlayerProgram();
program.setPlayerIds(playerIds);
- System.out.println(pushToLed.getPages());
- program.setPages(JSON.parseObject(pushToLed.getPages(), List.class));
- program.setSchedules(JSON.parseObject(pushToLed.getSchedule(), List.class));
+ //鑾峰彇鑺傜洰瀹炰綋
+
+
+ List<ProgramDto> programDtos = JSON.parseArray(pushToLed.getPages(), ProgramDto.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("鑺傜洰鏂囦欢宸插け鏁�");
+ }
+ widget.setMd5(one.getMd5());
+ widget.setSize(one.getSize());
+ }
+ );
+ }
+ );
+
+ 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);
program.setNoticeUrl(VnnoxConstant.NOTIFY_URL);
- VnnoxResultResponse vnnoxResultResponse = vnnoxProgramAPIUtil.timeProgram(program);
- VnnoxResult vnnoxResult = vnnoxAPIUtil.volChange(playerIds, Integer.valueOf(one.getVolume()).intValue());
+ VnnoxResultResponse vnnoxResultResponse = vnnoxProgramAPIUtil.normalProgram(program);
+ vnnoxAPIUtil.volChange(playerIds, Integer.valueOf(pushToLed.getVolume()).intValue());
- // VnnoxResultResponse vnnoxResultResponse = vnnoxProgramAPIUtil.normalProgram(push);
List<String> success = new ArrayList<>();
List<String> fail = new ArrayList<>();
if (vnnoxResultResponse.getData() != null) {
@@ -135,26 +235,110 @@
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));
- }
-
+ 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);
- result.put("program", program);
+
+ /**
+ * 璇虹摝鎺ㄩ�佽妭鐩棩蹇楄褰曞紑濮�
+ */
+ 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;
- // return program;
+ }
+
+ //鎺ㄩ�佸畾鏃跺埌LED
+ public Map<String, Object> pushSchedule(Long planId, List<NovaPushResultVO> nova) {
+ PlayPlanNv one = getOne(Wrappers.lambdaQuery(PlayPlanNv.class).eq(PlayPlanNv::getId, planId));
+ if (one == null) {
+ throw new BusinessException("鏈壘鍒拌妭鐩�");
+ }
+ List<SchedulesDTO> schedulesDTOS = JSON.parseArray(one.getSchedules(), SchedulesDTO.class);
+ ProgramSchedule programSchedule = new ProgramSchedule();
+ programSchedule.setSchedules(schedulesDTOS);
+ List<String> playerIds = new ArrayList<>();
+ nova.forEach(
+ n -> {
+ playerIds.add(n.getPlayerId());
+ }
+ );
+ //璁剧疆
+ programSchedule.setPlayerIds(playerIds);
+ VnnoxResultResponse vnnoxResultResponse = vnnoxProgramAPIUtil.timeProgram(programSchedule);
+ 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锛�" + one.getId()
+ + "锛� 鑺傜洰鍚嶇О锛�" + one.getName()
+ + "}," + " 鎺ㄩ�佺粨鏋滐細" + result
+ + " }";
+ StoreOperationRecordsUtils.storeOperationData(listCode, null, "璇虹摝鎺ㄩ�佸畾鏃跺紑鍏冲睆", content);
+ /**
+ * 璇虹摝鎺ㄩ�佸畾鏃舵棩蹇楄褰曠粨鏉�
+ */
+ return result;
}
/**
@@ -185,6 +369,12 @@
return null;
}
+ /**
+ * 鑾峰彇鎾斁璁″垝
+ *
+ * @param planId
+ * @return
+ */
public Object getByPlanId(Long planId) {
PlayPlanNv byId = getById(planId);
if (byId == null) {
@@ -194,7 +384,8 @@
if (byId1 == null) {
throw new BusinessException("鎵句笉鍒拌鑺傜洰");
}
- Map schedule = JSON.parseObject(byId.getSchedule(), Map.class);
+ List schedule = JSON.parseObject(byId.getSchedules(), List.class);
+ Map schedules = JSON.parseObject(byId.getSchedule(), Map.class);
List pages = JSON.parseObject(byId1.getPages(), List.class);
Map plan = new HashMap();
plan.put("planId", byId.getId());
@@ -205,6 +396,104 @@
plan.put("preview", byId1.getPreview());
plan.put("pages", pages);
plan.put("schedule", schedule);
+ plan.put("schedules", schedules);
return plan;
}
+
+
+ /**
+ * 鎺ㄩ�佸疄鏃惰妭鐩�
+ *
+ * @param pid
+ * @param nova
+ * @return
+ */
+ public Map<String, Object> pushProgram(Long pid, List<NovaPushResultVO> nova) {
+ LEDProgram ledProgram = ledProgramService.getById(pid);
+ if (ledProgram == null) {
+ throw new BusinessException("鏈壘鍒拌妭鐩�");
+ }
+ if (ledProgram.getPages() == null) {
+ throw new BusinessException("鑺傜洰鍐呭涓㈠け");
+ }
+ if (SecurityUtils.getClientId() != null && !Objects.equals(ledProgram.getClientId(), SecurityUtils.getUserId()) && !Objects.equals(ledProgram.getClientId(), SecurityUtils.getClientId())) {
+ throw new BusinessException("璇蜂笉瑕佹搷浣滃叾浠栦汉鐨勮妭鐩�");
+ }
+ String pages = ledProgram.getPages();
+ List<String> playerIds = new ArrayList<>();
+ nova.forEach(n -> {
+ playerIds.add(n.getPlayerId());
+ });
+
+ ProgramPush program = new ProgramPush();
+ List<ProgramDto> programDtos = JSON.parseArray(pages, ProgramDto.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("鑺傜洰鏂囦欢宸插け鏁�");
+ }
+ widget.setMd5(one.getMd5());
+ widget.setSize(one.getSize());
+ }
+ );
+ }
+ );
+
+ program.setPlayerIds(playerIds);
+ //鑾峰彇鑺傜洰瀹炰綋
+ program.setPages(programDtos);
+
+ program.setNoticeUrl(VnnoxConstant.NOTIFY_URL);
+ VnnoxResultResponse vnnoxResultResponse = vnnoxProgramAPIUtil.pushProgram(program);
+
+ 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锛�" + pid
+ + "锛� 鑺傜洰鍚嶇О锛�" + ledProgram.getName()
+ + "}," + " 鎺ㄩ�佺粨鏋滐細" + result
+ + " }";
+ StoreOperationRecordsUtils.storeOperationData(listCode, null, "璇虹摝鎺ㄩ�佽妭鐩�", content);
+ /**
+ * 璇虹摝鎺ㄩ�佽妭鐩棩蹇楄褰曠粨鏉�
+ */
+
+ return result;
+ }
+
}
--
Gitblit v1.9.3