From 0af78b53f3e2b272ea2ec6ff923abe3b9815b19f Mon Sep 17 00:00:00 2001
From: liuhaonan <konodioda2333@vip.qq.com>
Date: 星期五, 31 十二月 2021 14:28:02 +0800
Subject: [PATCH] 功能完善
---
ximon-admin/src/main/java/com/sandu/ximon/admin/service/IpVolumeMissionService.java | 323 +++++++++++++++++++++++++++++++++++++++++++++++------
1 files changed, 282 insertions(+), 41 deletions(-)
diff --git a/ximon-admin/src/main/java/com/sandu/ximon/admin/service/IpVolumeMissionService.java b/ximon-admin/src/main/java/com/sandu/ximon/admin/service/IpVolumeMissionService.java
index 3b4ae18..1e0c7b3 100644
--- a/ximon-admin/src/main/java/com/sandu/ximon/admin/service/IpVolumeMissionService.java
+++ b/ximon-admin/src/main/java/com/sandu/ximon/admin/service/IpVolumeMissionService.java
@@ -1,18 +1,28 @@
package com.sandu.ximon.admin.service;
-import cn.hutool.http.HttpUtil;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.sandu.common.execption.BusinessException;
import com.sandu.common.service.impl.BaseServiceImpl;
+import com.sandu.ximon.admin.config.MinIoConstant;
import com.sandu.ximon.admin.param.IpVolumeMissionParam;
import com.sandu.ximon.admin.param.ReceiveParam;
import com.sandu.ximon.admin.security.SecurityUtils;
+import com.sandu.ximon.admin.utils.TaskAPIUtils;
+import com.sandu.ximon.admin.vo.TaskMediaFileVO;
+import com.sandu.ximon.admin.vo.TaskTerminalVO;
+import com.sandu.ximon.dao.bo.IpVolumeMissionBo;
+import com.sandu.ximon.dao.domain.BroadcastV2TaskFile;
+import com.sandu.ximon.dao.domain.BroadcastV2TaskTerminal;
+import com.sandu.ximon.dao.domain.IpVolumeFile;
import com.sandu.ximon.dao.domain.IpVolumeMission;
import com.sandu.ximon.dao.mapper.IpVolumeMissionMapper;
import lombok.AllArgsConstructor;
import org.springframework.stereotype.Service;
+import java.math.BigInteger;
+import java.util.ArrayList;
+import java.util.HashSet;
import java.util.List;
/**
@@ -25,57 +35,277 @@
public class IpVolumeMissionService extends BaseServiceImpl<IpVolumeMissionMapper, IpVolumeMission> {
private final IpVolumeMissionMapper ipVolumeMissionMapper;
private final ClientService clientService;
+ private final IpVolumeFileService ipVolumeFileService;
+ private final BroadcastV2TaskFileService broadcastV2TaskFileService;
+ private final BroadcastV2TaskTerminalService broadcastV2TaskTerminalService;
public boolean addMission(IpVolumeMissionParam missionparam) {
- IpVolumeMission mission = new IpVolumeMission();
- mission.setUserId(SecurityUtils.getUserId());
- mission.setUserName(SecurityUtils.getUsername());
- mission.setClientId(clientService.getClientId());
- mission.setMissionName(missionparam.getMissionName());
- mission.setMissionFileId(missionparam.getMissionFileId());
- mission.setMissionFileName(missionparam.getMissionFileName());
- mission.setOnDate(missionparam.getOnDate());
- mission.setOffDate(missionparam.getOffDate());
- mission.setWeeksRange(missionparam.getWeeksRange());
- mission.setOnTime(missionparam.getOnTime());
- mission.setOffTime(missionparam.getOffTime());
- mission.setMissionVolume(missionparam.getMissionVolume());
+ String taskName = missionparam.getMissionName();
- return save(mission);
+ if (null == taskName || "".equals(taskName)) {
+ throw new BusinessException("浠诲姟鍚嶇О涓嶅彲涓虹┖");
+ //return 1;
+ }
+
+ if (missionparam.getFileIds().size() <= 0) {
+ throw new BusinessException("鎾斁鏂囦欢涓嶅彲涓虹┖");
+ //return 2;
+ }
+
+ if (missionparam.getTerminalIds().size() <= 0) {
+ throw new BusinessException("鎾斁缁堢涓嶅彲涓虹┖");
+ // return 3;
+ }
+
+ // 灏佽鎾斁缁堢
+ List<TaskTerminalVO> taskTerminalVOList = new ArrayList<>();
+ // 灏佽鏁版嵁搴撲腑浠诲姟缁堢缁戝畾
+ List<BroadcastV2TaskTerminal> taskTerminalEntityList = new ArrayList<>();
+ for(Integer id: new HashSet<>(missionparam.getTerminalIds())) {
+ TaskTerminalVO taskTerminalVO = new TaskTerminalVO();
+ BroadcastV2TaskTerminal taskTerminalEntity = new BroadcastV2TaskTerminal();
+
+ taskTerminalVO.setI(id);
+ taskTerminalEntity.setTerminalId(id);
+
+ taskTerminalVOList.add(taskTerminalVO);
+ taskTerminalEntityList.add(taskTerminalEntity);
+ }
+
+ // 灏佽鎾斁鏂囦欢鍒楄〃
+ List<TaskMediaFileVO> taskMediaFileVOS = new ArrayList<>();
+ List<BroadcastV2TaskFile> taskFileEntityList = new ArrayList<>();
+ int i = 1;
+ for(Integer fileId: new HashSet<>(missionparam.getFileIds())) {
+ TaskMediaFileVO taskMediaFileVO = new TaskMediaFileVO();
+ BroadcastV2TaskFile taskFileEntity = new BroadcastV2TaskFile();
+
+ taskFileEntity.setFileId(fileId);
+
+ IpVolumeFile fileEntity = ipVolumeFileService.getById(fileId);
+ String absolutePath = MinIoConstant.getAbsolutePath(
+ MinIoConstant.BROADCAST_FILE.getBucketName() + fileEntity.getUserId(),
+ fileEntity.getFileName()
+ );
+
+ taskMediaFileVO.setI(i);
+ i++;
+ taskMediaFileVO.setT(0);
+ taskMediaFileVO.setN(absolutePath);
+ taskMediaFileVO.setS(BigInteger.valueOf(fileEntity.getOriginSize()));
+
+ taskMediaFileVOS.add(taskMediaFileVO);
+ taskFileEntityList.add(taskFileEntity);
+ }
+
+
+ missionparam.setFiles(taskMediaFileVOS.toArray(new TaskMediaFileVO[taskMediaFileVOS.size()]));
+ missionparam.setTerminals(taskTerminalVOList.toArray(new TaskTerminalVO[taskTerminalVOList.size()]));
+ System.out.println("---------------------------");
+ // 鍚慖P闊虫煴鏈嶅姟鍣ㄦ坊鍔犱换鍔�
+ Integer taskId = TaskAPIUtils.addTask(missionparam);
+ // System.out.println("---------------------------");
+ //Integer taskId = 1111;
+
+ if (null != taskId && taskId != 0) {
+ IpVolumeMission byId = getById(taskId);
+ for (BroadcastV2TaskTerminal v2TaskTerminal: taskTerminalEntityList) {
+ v2TaskTerminal.setTaskId(taskId);
+ }
+ for (BroadcastV2TaskFile v2TaskFile :taskFileEntityList) {
+ v2TaskFile.setTaskId(taskId);
+ }
+ if (null == byId) {
+ // 鍚戞暟鎹簱娣诲姞璇ヤ换鍔¤褰�
+
+ IpVolumeMission mission = new IpVolumeMission();
+ mission.setTaskId(taskId);
+ mission.setUserId(SecurityUtils.getClientId());
+ if (SecurityUtils.getClientId() != null) {
+ mission.setUserName(SecurityUtils.getUsername());
+ }
+ mission.setClientId(clientService.getClientId());
+ mission.setMissionName(missionparam.getMissionName());
+ mission.setOnDate(missionparam.getOnDate());
+ mission.setOffDate(missionparam.getOffDate());
+ mission.setWeek(Integer.parseInt(missionparam.getWeek(), 2));//鏃堕棿鐢变簩杩涘埗瀛楃涓茶浆鎹负鍗佽繘鍒�
+ mission.setMissionVolume(missionparam.getMissionVolume());
+ //mission.setMissionFileUrl(missionparam.getFiles().toString());
+ mission.setNumberInPlay(missionparam.getTerminals().length);
+ /*TaskTerminalVO[] terminals = missionparam.getTerminals();*/
+
+ System.out.println(save(mission));
+ System.out.println("----------------------------------------------------------");
+
+
+ } else {//[Lcom.sandu.ximon.admin.vo.TaskMediaFileVO;@b5558c3
+
+ IpVolumeMission mission = new IpVolumeMission();
+ mission.setTaskId(taskId);
+ mission.setMissionName(missionparam.getMissionName());
+ mission.setOnDate(missionparam.getOnDate());
+ mission.setOffDate(missionparam.getOffDate());
+ mission.setWeek(Integer.parseInt(missionparam.getWeek(), 2));//鏃堕棿鐢变簩杩涘埗瀛楃涓茶浆鎹负鍗佽繘鍒�
+ mission.setMissionVolume(missionparam.getMissionVolume());
+ mission.setMissionFileUrl(missionparam.getFiles().toString());
+ mission.setNumberInPlay(missionparam.getTerminals().length);
+ System.out.println(updateById(mission));
+ System.out.println("----------------------------------------------------------");
+ }
+ broadcastV2TaskFileService.deleteByTaskId(taskId);
+ broadcastV2TaskTerminalService.deleteByTaskId(taskId);
+ broadcastV2TaskTerminalService.saveBatch(taskTerminalEntityList);
+ broadcastV2TaskFileService.saveBatch(taskFileEntityList);
+
+ return true;
+ } else {
+ return false;
+ }
+
}
- public boolean updateMission(Long missionId, IpVolumeMissionParam missionparam) {
- IpVolumeMission byId = getById(missionId);
- if (byId == null) {
- throw new BusinessException("鏈壘鍒拌浠诲姟");
+ public Integer updateMission(Integer taskId, IpVolumeMissionParam missionparam) {
+
+ String taskName = missionparam.getMissionName();
+
+ if(null == taskName || "".equals(taskName)) {
+ return 4;
}
- IpVolumeMission mission = new IpVolumeMission();
- mission.setId(missionId);
- /* mission.setUserId(SecurityUtils.getUserId());
- mission.setUserName(SecurityUtils.getUsername());
- mission.setClientId(clientService.getClientId());*/
- mission.setMissionName(missionparam.getMissionName());
- mission.setMissionFileId(missionparam.getMissionFileId());
- mission.setMissionFileName(missionparam.getMissionFileName());
- mission.setOnDate(missionparam.getOnDate());
- mission.setOffDate(missionparam.getOffDate());
- mission.setWeeksRange(missionparam.getWeeksRange());
- mission.setOnTime(missionparam.getOnTime());
- mission.setOffTime(missionparam.getOffTime());
- mission.setMissionVolume(missionparam.getMissionVolume());
- HttpUtil.post("123", String.valueOf(mission));
+ if(missionparam.getFileIds().size()<=0){
+ return 5;
+ }
- return updateById(mission);
+ if(missionparam.getTerminalIds().size()<=0){
+ return 6;
+ }
+
+
+ // 灏佽鎾斁缁堢
+ List<TaskTerminalVO> taskTerminalVOList = new ArrayList<>();
+ // 灏佽鏁版嵁搴撲腑浠诲姟缁堢缁戝畾
+ List<BroadcastV2TaskTerminal> taskTerminalEntityList = new ArrayList<>();
+ for(Integer id: new HashSet<>(missionparam.getTerminalIds())) {
+ TaskTerminalVO taskTerminalVO = new TaskTerminalVO();
+ BroadcastV2TaskTerminal taskTerminalEntity = new BroadcastV2TaskTerminal();
+
+ taskTerminalVO.setI(id);
+ taskTerminalEntity.setTerminalId(id);
+
+ taskTerminalVOList.add(taskTerminalVO);
+ taskTerminalEntityList.add(taskTerminalEntity);
+ }
+
+ // 灏佽鎾斁鏂囦欢鍒楄〃
+ List<TaskMediaFileVO> taskMediaFileVOS = new ArrayList<>();
+ List<BroadcastV2TaskFile> taskFileEntityList = new ArrayList<>();
+ int i = 1;
+ for(Integer fileId: new HashSet<>(missionparam.getFileIds())) {
+ TaskMediaFileVO taskMediaFileVO = new TaskMediaFileVO();
+ BroadcastV2TaskFile taskFileEntity = new BroadcastV2TaskFile();
+
+ taskFileEntity.setFileId(fileId);
+
+ IpVolumeFile fileEntity = ipVolumeFileService.getById(fileId);
+ String absolutePath = MinIoConstant.getAbsolutePath(
+ MinIoConstant.BROADCAST_FILE.getBucketName() + fileEntity.getUserId(),
+ fileEntity.getFileName()
+ );
+
+ taskMediaFileVO.setI(i);
+ i++;
+ taskMediaFileVO.setT(0);
+ taskMediaFileVO.setN(absolutePath);
+ taskMediaFileVO.setS(BigInteger.valueOf(fileEntity.getOriginSize()));
+
+ taskMediaFileVOS.add(taskMediaFileVO);
+ taskFileEntityList.add(taskFileEntity);
+ }
+
+
+ missionparam.setFiles(taskMediaFileVOS.toArray(new TaskMediaFileVO[taskMediaFileVOS.size()]));
+ missionparam.setTerminals(taskTerminalVOList.toArray(new TaskTerminalVO[taskTerminalVOList.size()]));
+ System.out.println("---------------------------");
+
+ // 鍚慖P闊虫煴鏈嶅姟鍣ㄦ洿鏂颁换鍔�
+ Integer result = TaskAPIUtils.updateTask(taskId, missionparam);
+
+ if(result==0){
+ IpVolumeMission byId = getById(taskId);
+ for (BroadcastV2TaskTerminal v2TaskTerminal: taskTerminalEntityList) {
+ v2TaskTerminal.setTaskId(taskId);
+ }
+ for (BroadcastV2TaskFile v2TaskFile :taskFileEntityList) {
+ v2TaskFile.setTaskId(taskId);
+ }
+ if (null == byId) {
+ // 鍚戞暟鎹簱娣诲姞璇ヤ换鍔¤褰�
+
+ IpVolumeMission mission = new IpVolumeMission();
+ mission.setTaskId(taskId);
+ mission.setUserId(SecurityUtils.getUserId());
+ if (SecurityUtils.getUserId() != null) {
+ mission.setUserName(SecurityUtils.getUsername());
+ }
+ mission.setClientId(clientService.getClientId());
+ mission.setMissionName(missionparam.getMissionName());
+ mission.setOnDate(missionparam.getOnDate());
+ mission.setOffDate(missionparam.getOffDate());
+ mission.setWeek(Integer.parseInt(missionparam.getWeek(), 2));//鏃堕棿鐢变簩杩涘埗瀛楃涓茶浆鎹负鍗佽繘鍒�
+ mission.setMissionVolume(missionparam.getMissionVolume());
+ // mission.setMissionFileUrl(missionparam.getFiles().toString());
+ mission.setNumberInPlay(missionparam.getTerminals().length);
+ /*TaskTerminalVO[] terminals = missionparam.getTerminals();*/
+
+ System.out.println(save(mission));
+ System.out.println("----------------------------------------------------------");
+ } else {//[Lcom.sandu.ximon.admin.vo.TaskMediaFileVO;@b5558c3
+
+ IpVolumeMission mission = new IpVolumeMission();
+ mission.setTaskId(taskId);
+ mission.setMissionName(missionparam.getMissionName());
+ mission.setOnDate(missionparam.getOnDate());
+ mission.setOffDate(missionparam.getOffDate());
+ mission.setWeek(Integer.parseInt(missionparam.getWeek(), 2));//鏃堕棿鐢变簩杩涘埗瀛楃涓茶浆鎹负鍗佽繘鍒�
+ mission.setMissionVolume(missionparam.getMissionVolume());
+ // mission.setMissionFileUrl(missionparam.getFiles().toString());
+ mission.setNumberInPlay(missionparam.getTerminals().length);
+ System.out.println(updateById(mission));
+ System.out.println("----------------------------------------------------------");
+ }
+ broadcastV2TaskFileService.deleteByTaskId(taskId);
+ broadcastV2TaskTerminalService.deleteByTaskId(taskId);
+ broadcastV2TaskTerminalService.saveBatch(taskTerminalEntityList);
+ broadcastV2TaskFileService.saveBatch(taskFileEntityList);
+ return 0;
+
+ }else {
+ return result;
+ }
}
- public boolean deleteMission(Long missionId) {
- IpVolumeMission byId = getById(missionId);
- if (byId == null) {
- throw new BusinessException("鏈壘鍒拌浠诲姟");
+ /**
+ * 鍒犻櫎浠诲姟
+ * @param taskId
+ * @return0锛氭垚鍔� 1锛氫换鍔′笉澶勪簬绌洪棽鐘舵�� 2:鏈嶅姟鍣ㄥ垹闄ゅけ璐�
+ */
+ public Integer deleteMission(Integer taskId) {
+ Integer del = TaskAPIUtils.delTask(taskId);
+ if(del==0){
+ IpVolumeMission byId = getById(taskId);
+ if (byId == null) {
+ return -1;
+ }
+ removeById(taskId);
+ broadcastV2TaskFileService.removeById(taskId);
+ broadcastV2TaskTerminalService.removeById(taskId);
+ return 0;
}
- return removeById(missionId);
+ else {
+ return del;
+ }
+
}
public List<IpVolumeMission> listMission(ReceiveParam receiveParam) {
@@ -85,8 +315,19 @@
return list(wrapper);
}
+ public List<IpVolumeMissionBo> missionList() {
+ List<IpVolumeMissionBo> ipVolumeMissionBos = ipVolumeMissionMapper.listAllByClientId();
- public void setMissionToData(Long missionId,List<Long> dateIds){
+ for (IpVolumeMissionBo missionBo: ipVolumeMissionBos) {
+ missionBo.setFileNames(broadcastV2TaskFileService.findByTaskid(missionBo.getTaskId()));
+
+ }
+
+ return ipVolumeMissionBos;
+ //return new ArrayList<>();
+ }
+
+ public void setMissionToData(Long missionId, List<Long> dateIds) {
// tudo
--
Gitblit v1.9.3