From f89c8d19d96fdbff3081ba4ac48ea3e72168bc59 Mon Sep 17 00:00:00 2001
From: liuhaonan <31457034@qq.com>
Date: 星期五, 20 五月 2022 15:52:44 +0800
Subject: [PATCH] 日志
---
ximon-admin/src/main/java/com/sandu/ximon/admin/service/PlayPlanNvService.java | 208 +++++++++++++++++++++++++++++++++++++++++----------
1 files changed, 166 insertions(+), 42 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 6f3b801..022c9c3 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,23 +1,29 @@
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.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.dto.nova.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.mapper.PlayPlanNvMapper;
@@ -70,21 +76,14 @@
String s = JSON.toJSONString(schedule.get("plans"));
List<PlanDto> plans = JSON.parseArray(s, PlanDto.class);
- System.out.println(plans.toString()+"plans");
+ 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();
-// if (i % 2 == 0) {
-// schedulesDTO.setExecTime(plans.get(i).getStartTime());
-// schedulesDTO.setStatus("OPEN");
-// } else {
-// schedulesDTO.setWeekDays(plans.get(i).getWeekDays());
-// schedulesDTO.setExecTime(plans.get(i).getEndTime());
-// schedulesDTO.setStatus("CLOSE");
-// }
+
SchedulesDTO closeDto = new SchedulesDTO();
@@ -92,6 +91,19 @@
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());
@@ -103,13 +115,35 @@
schedulesDTOS.add(openDto);
}
- playPlan.setSchedule(JSON.toJSONString(schedulesDTOS));
+ 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;
}
@@ -118,7 +152,8 @@
if (byId == null) {
throw new BusinessException("鎿嶄綔瀵硅薄涓嶅瓨鍦�");
}
- if(removeById(id)){
+ if (removeById(id)) {
+ playPlanParam.setId(id);
return addPlan(playPlanParam);
}
@@ -137,41 +172,41 @@
}
public Map<String, Object> pushToLed(Long planId, List<NovaPushResultVO> nova) {
-// public PlayerProgram pushToLed(Long planId){
PushToLed pushToLed = playPlanMapper.pushToLed(planId);
- PlayPlanNv one = getOne(Wrappers.lambdaQuery(PlayPlanNv.class).eq(PlayPlanNv::getId, planId));
+ PlayPlanNv byId = getById(planId);
if (pushToLed == null) {
throw new BusinessException("鏈壘鍒拌鎾斁璁″垝");
}
- List<String> playerIds=new ArrayList<>();
- nova.forEach(
- n->{
- playerIds.add(n.getPlayerId());
- }
- );
+ 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));
-//
-// 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.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) {
@@ -179,17 +214,82 @@
fail = vnnoxResultResponse.getData().getFail();
}
- // fail.addAll(vnnoxResult.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;
+ }
+
+
+ //鎺ㄩ�佸畾鏃跺埌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())){
+ n -> {
+ if (finalSuccess.contains(n.getPlayerId())) {
successList.add(n);
- }else if(finalFail.contains(n.getPlayerId())){
+ } else if (finalFail.contains(n.getPlayerId())) {
faileList.add(n);
}
}
@@ -199,9 +299,25 @@
result.put("success", successList);
result.put("fail", faileList);
- return result;
- // return 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锛�" + one.getId()
+ + "锛� 鑺傜洰鍚嶇О锛�" + one.getName()
+ + "}," + " 鎺ㄩ�佺粨鏋滐細" + result
+ + " }";
+ StoreOperationRecordsUtils.storeOperationData(listCode, null, "璇虹摝鎺ㄩ�佸畾鏃跺紑鍏冲睆", content);
+ /**
+ * 璇虹摝鎺ㄩ�佸畾鏃舵棩蹇楄褰曠粨鏉�
+ */
+ return result;
}
/**
@@ -232,6 +348,12 @@
return null;
}
+ /**
+ * 鑾峰彇鎾斁璁″垝
+ *
+ * @param planId
+ * @return
+ */
public Object getByPlanId(Long planId) {
PlayPlanNv byId = getById(planId);
if (byId == null) {
@@ -241,7 +363,8 @@
if (byId1 == null) {
throw new BusinessException("鎵句笉鍒拌鑺傜洰");
}
- List schedule = JSON.parseObject(byId.getSchedule(), List.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());
@@ -252,6 +375,7 @@
plan.put("preview", byId1.getPreview());
plan.put("pages", pages);
plan.put("schedule", schedule);
+ plan.put("schedules", schedules);
return plan;
}
}
--
Gitblit v1.9.3