From e55c8b0a92eb9715edd90c31dfd4de51a47b588b Mon Sep 17 00:00:00 2001
From: liuhaonan <31457034@qq.com>
Date: 星期五, 04 十一月 2022 17:40:08 +0800
Subject: [PATCH] changes
---
ximon-admin/src/main/java/com/sandu/ximon/admin/service/IpVolumeMissionService.java | 335 ++++++++++++++++++++++++++++++++++++++++++++-----------
1 files changed, 264 insertions(+), 71 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 dcbb1d5..63bc00f 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,25 +1,28 @@
package com.sandu.ximon.admin.service;
+import com.alibaba.fastjson.JSON;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.github.pagehelper.PageHelper;
import com.sandu.common.execption.BusinessException;
import com.sandu.common.object.BaseConditionVO;
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.StoreOperationRecordsUtils;
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.admin.vo.TaskVO;
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.enums.OrderByEnums;
import com.sandu.ximon.dao.mapper.IpVolumeMissionMapper;
import lombok.AllArgsConstructor;
+import org.springframework.beans.BeanUtils;
import org.springframework.stereotype.Service;
import java.math.BigInteger;
@@ -37,11 +40,25 @@
public class IpVolumeMissionService extends BaseServiceImpl<IpVolumeMissionMapper, IpVolumeMission> {
private final IpVolumeMissionMapper ipVolumeMissionMapper;
private final ClientService clientService;
+ private final IpVolumeService ipVolumeService;
private final IpVolumeFileService ipVolumeFileService;
private final BroadcastV2TaskFileService broadcastV2TaskFileService;
private final BroadcastV2TaskTerminalService broadcastV2TaskTerminalService;
+
public boolean addMission(IpVolumeMissionParam missionparam) {
+
+ List<Integer> fileIds = missionparam.getFileIds();
+ List<IpVolumeFile> ipVolumeFiles = ipVolumeFileService.listByIds(fileIds);
+ ipVolumeFiles.forEach(file -> {
+ if (SecurityUtils.getClientId() != null) {
+ //闈炶秴绠＄敤鎴�
+ if (!SecurityUtils.getUserId().equals(file.getClientId()) && !SecurityUtils.getUserId().equals(file.getUserId())) {
+ //鐢ㄦ埛id鍜屽鎴穒d閮戒笉鍖归厤
+ throw new BusinessException("鏂囦欢褰掑睘寮傚父,鍒涘缓浠诲姟澶辫触");
+ }
+ }
+ });
String taskName = missionparam.getMissionName();
@@ -57,14 +74,14 @@
if (missionparam.getTerminalIds().size() <= 0) {
throw new BusinessException("鎾斁缁堢涓嶅彲涓虹┖");
- // return 3;
+ // return 3;
}
// 灏佽鎾斁缁堢
List<TaskTerminalVO> taskTerminalVOList = new ArrayList<>();
// 灏佽鏁版嵁搴撲腑浠诲姟缁堢缁戝畾
List<BroadcastV2TaskTerminal> taskTerminalEntityList = new ArrayList<>();
- for(Integer id: new HashSet<>(missionparam.getTerminalIds())) {
+ for (Integer id : new HashSet<>(missionparam.getTerminalIds())) {
TaskTerminalVO taskTerminalVO = new TaskTerminalVO();
BroadcastV2TaskTerminal taskTerminalEntity = new BroadcastV2TaskTerminal();
@@ -79,22 +96,21 @@
List<TaskMediaFileVO> taskMediaFileVOS = new ArrayList<>();
List<BroadcastV2TaskFile> taskFileEntityList = new ArrayList<>();
int i = 1;
- for(Integer fileId: new HashSet<>(missionparam.getFileIds())) {
+ 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()
- );
+ if (fileEntity == null) {
+ throw new BusinessException("fileId涓�" + fileId + "鐨勬枃浠朵笉瀛樺湪");
+ }
taskMediaFileVO.setI(i);
i++;
taskMediaFileVO.setT(0);
- taskMediaFileVO.setN(absolutePath);
+ taskMediaFileVO.setN(fileEntity.getFileUrl());
taskMediaFileVO.setS(BigInteger.valueOf(fileEntity.getOriginSize()));
taskMediaFileVOS.add(taskMediaFileVO);
@@ -107,18 +123,18 @@
System.out.println("---------------------------");
// 鍚慖P闊虫煴鏈嶅姟鍣ㄦ坊鍔犱换鍔�
Integer taskId = TaskAPIUtils.addTask(missionparam);
- // System.out.println("---------------------------");
- //Integer taskId = 1111;
+// Integer taskId = 1111;
+ boolean flag;
if (null != taskId && taskId != 0) {
IpVolumeMission byId = getById(taskId);
- for (BroadcastV2TaskTerminal v2TaskTerminal: taskTerminalEntityList) {
+ for (BroadcastV2TaskTerminal v2TaskTerminal : taskTerminalEntityList) {
v2TaskTerminal.setTaskId(taskId);
}
- for (BroadcastV2TaskFile v2TaskFile :taskFileEntityList) {
+ for (BroadcastV2TaskFile v2TaskFile : taskFileEntityList) {
v2TaskFile.setTaskId(taskId);
}
- if (null == byId) {
+ if (byId == null) {
// 鍚戞暟鎹簱娣诲姞璇ヤ换鍔¤褰�
IpVolumeMission mission = new IpVolumeMission();
@@ -133,9 +149,8 @@
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("----------------------------------------------------------");
@@ -152,34 +167,45 @@
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);
+ broadcastV2TaskTerminalService.saveTaskTerminal(taskTerminalEntityList);
broadcastV2TaskFileService.saveBatch(taskFileEntityList);
-
- return true;
+ flag = true;
} else {
- return false;
+ flag = false;
}
+ /**
+ * IP闊虫煴浠诲姟娣诲姞鏃ュ織璁板綍寮�濮�
+ */
+ String content = "{浠诲姟ID锛�" + taskId
+ + "锛屼换鍔″悕锛�" + taskName
+ + "锛岃澶嘔D闆嗗悎锛�" + missionparam.getTerminalIds()
+ + " }";
+ StoreOperationRecordsUtils.storeOperationData(missionparam.getTerminalIds(), null, "IP闊虫煴浠诲姟娣诲姞", content);
+ /**
+ * IP闊虫煴浠诲姟娣诲姞鏃ュ織璁板綍缁撴潫
+ */
+
+
+ return flag;
}
public Integer updateMission(Integer taskId, IpVolumeMissionParam missionparam) {
String taskName = missionparam.getMissionName();
- if(null == taskName || "".equals(taskName)) {
+ if (null == taskName || "".equals(taskName)) {
return 4;
}
- if(missionparam.getFileIds().size()<=0){
+ if (missionparam.getFileIds().size() <= 0) {
return 5;
}
- if(missionparam.getTerminalIds().size()<=0){
+ if (missionparam.getTerminalIds().size() <= 0) {
return 6;
}
@@ -188,7 +214,7 @@
List<TaskTerminalVO> taskTerminalVOList = new ArrayList<>();
// 灏佽鏁版嵁搴撲腑浠诲姟缁堢缁戝畾
List<BroadcastV2TaskTerminal> taskTerminalEntityList = new ArrayList<>();
- for(Integer id: new HashSet<>(missionparam.getTerminalIds())) {
+ for (Integer id : new HashSet<>(missionparam.getTerminalIds())) {
TaskTerminalVO taskTerminalVO = new TaskTerminalVO();
BroadcastV2TaskTerminal taskTerminalEntity = new BroadcastV2TaskTerminal();
@@ -203,22 +229,18 @@
List<TaskMediaFileVO> taskMediaFileVOS = new ArrayList<>();
List<BroadcastV2TaskFile> taskFileEntityList = new ArrayList<>();
int i = 1;
- for(Integer fileId: new HashSet<>(missionparam.getFileIds())) {
+ 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.setN(fileEntity.getFileUrl());
taskMediaFileVO.setS(BigInteger.valueOf(fileEntity.getOriginSize()));
taskMediaFileVOS.add(taskMediaFileVO);
@@ -228,17 +250,16 @@
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){
+ if (result == 0) {
IpVolumeMission byId = getById(taskId);
- for (BroadcastV2TaskTerminal v2TaskTerminal: taskTerminalEntityList) {
+ for (BroadcastV2TaskTerminal v2TaskTerminal : taskTerminalEntityList) {
v2TaskTerminal.setTaskId(taskId);
}
- for (BroadcastV2TaskFile v2TaskFile :taskFileEntityList) {
+ for (BroadcastV2TaskFile v2TaskFile : taskFileEntityList) {
v2TaskFile.setTaskId(taskId);
}
if (null == byId) {
@@ -256,7 +277,7 @@
mission.setOffDate(missionparam.getOffDate());
mission.setWeek(Integer.parseInt(missionparam.getWeek(), 2));//鏃堕棿鐢变簩杩涘埗瀛楃涓茶浆鎹负鍗佽繘鍒�
mission.setMissionVolume(missionparam.getMissionVolume());
- // mission.setMissionFileUrl(missionparam.getFiles().toString());
+ // mission.setMissionFileUrl(missionparam.getFiles().toString());
mission.setNumberInPlay(missionparam.getTerminals().length);
/*TaskTerminalVO[] terminals = missionparam.getTerminals();*/
@@ -271,7 +292,7 @@
mission.setOffDate(missionparam.getOffDate());
mission.setWeek(Integer.parseInt(missionparam.getWeek(), 2));//鏃堕棿鐢变簩杩涘埗瀛楃涓茶浆鎹负鍗佽繘鍒�
mission.setMissionVolume(missionparam.getMissionVolume());
- // mission.setMissionFileUrl(missionparam.getFiles().toString());
+ // mission.setMissionFileUrl(missionparam.getFiles().toString());
mission.setNumberInPlay(missionparam.getTerminals().length);
System.out.println(updateById(mission));
System.out.println("----------------------------------------------------------");
@@ -280,63 +301,235 @@
broadcastV2TaskTerminalService.deleteByTaskId(taskId);
broadcastV2TaskTerminalService.saveBatch(taskTerminalEntityList);
broadcastV2TaskFileService.saveBatch(taskFileEntityList);
- return 0;
-
- }else {
- return result;
}
+ /**
+ * IP闊虫煴浠诲姟淇敼 鏃ュ織璁板綍寮�濮�
+ */
+ String content = "{浠诲姟ID锛�" + taskId
+ + "锛屼换鍔″悕锛�" + taskName
+ + "锛岃澶嘔D闆嗗悎锛�" + missionparam.getTerminalIds()
+ + "锛屼换鍔＄紪杈戠粨鏋滐細" + result
+ + " }";
+ StoreOperationRecordsUtils.storeOperationData(missionparam.getTerminalIds(), null, "IP闊虫煴浠诲姟淇敼", content);
+ /**
+ * IP闊虫煴浠诲姟淇敼 鏃ュ織璁板綍缁撴潫
+ */
+ return result;
+
}
/**
* 鍒犻櫎浠诲姟
- * @param taskId
- * @return0锛氭垚鍔� 1锛氫换鍔′笉澶勪簬绌洪棽鐘舵�� 2:鏈嶅姟鍣ㄥ垹闄ゅけ璐�
+ *
+ * @param taskIds
+ * @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);
+ public Integer deleteMission(List<Integer> taskIds) {
+ //鍒犻櫎澶辫触鐨勯泦鍚�
+ List<Integer> delIds = new ArrayList<Integer>();
+ if (!taskIds.isEmpty()) {
+ taskIds.forEach(taskId -> {
+ Integer del = TaskAPIUtils.delTask(taskId);
+ if (del == 0) {
+ IpVolumeMission byId = getById(taskId);
+ if (byId == null) {
+ return;
+ }
+ removeById(taskId);
+ broadcastV2TaskFileService.deleteByTaskId(taskId);
+ broadcastV2TaskTerminalService.deleteByTaskId(taskId);
+// broadcastV2TaskTerminalService.removeById(taskId);
+ } else {
+ delIds.add(taskId);
+ }
+
+ /**
+ * IP闊虫煴浠诲姟鍒犻櫎 鏃ュ織璁板綍寮�濮�
+ */
+ String content = "{鍒犻櫎鐨勪换鍔D锛�" + taskId
+ + "锛屼换鍔″垹闄ょ粨鏋滐細" + del
+ + " }";
+ StoreOperationRecordsUtils.storeOperationData(null, null, "IP闊虫煴浠诲姟鍒犻櫎", content);
+ /**
+ * IP闊虫煴浠诲姟鍒犻櫎 鏃ュ織璁板綍缁撴潫
+ */
+ });
+ } else {
+ throw new BusinessException("浠诲姟id涓嶈兘涓虹┖");
+ }
+
+ if (delIds.isEmpty()) {
return 0;
+ } else {
+ throw new BusinessException("閮ㄥ垎鍒犻櫎澶辫触,澶辫触鐨勯泦鍚堜负:" + delIds);
}
- else {
- return del;
- }
-
}
- public List<IpVolumeMission> listMission(ReceiveParam receiveParam) {
- LambdaQueryWrapper<IpVolumeMission> wrapper = Wrappers.lambdaQuery(IpVolumeMission.class).eq(IpVolumeMission::getClientId, SecurityUtils.getUserId()).like(IpVolumeMission::getMissionName, receiveParam.getKeyWord());
+ public List<IpVolumeMissionBo> missionList(BaseConditionVO baseConditionVO, String keyword, Integer order, Integer seq) {
- return list(wrapper);
- }
- public List<IpVolumeMissionBo> missionList(BaseConditionVO baseConditionVO,String keyword) {
- PageHelper.startPage(baseConditionVO.getPageNo(),baseConditionVO.getPageSize());
- List<IpVolumeMissionBo> ipVolumeMissionBos = ipVolumeMissionMapper.listAllByClientId();
+ //鎺掑簭瀛楁
+ String orderByResult = "task_id";
+ //姝ｅ簭銆佸�掑彊
+ String orderBySeq = "ASC";
+ if (order != null) {
+ switch (order) {
+ case 1:
+ orderByResult = OrderByEnums.IP_VOLUME_MISSION_CREATE_TIME.getCode();
+ break;
+ default:
+ }
+ }
+ if (seq != null) {
+ switch (seq) {
+ case 1:
+ orderBySeq = " ASC";
+ break;
+ case 2:
+ orderBySeq = " DESC";
+ break;
+ default:
+ break;
+ }
+ }
+ //鎺掑簭鏂瑰紡
+ String orderBy = orderByResult + " " + orderBySeq;
+ if (baseConditionVO != null) {
+ PageHelper.startPage(baseConditionVO.getPageNo(), baseConditionVO.getPageSize(), orderBy);
+ }
- for (IpVolumeMissionBo missionBo: ipVolumeMissionBos) {
- missionBo.setFileNames(broadcastV2TaskFileService.findByTaskid(missionBo.getTaskId()));
+ List<IpVolumeMissionBo> ipVolumeMissionBos = new ArrayList<>();
+ LambdaQueryWrapper<IpVolumeMission> eq = Wrappers.lambdaQuery(IpVolumeMission.class);
+
+ //涓嶆槸瓒呯
+ if (SecurityUtils.getClientId() != null) {
+ eq = eq.eq(IpVolumeMission::getUserId, SecurityUtils.getUserId()).or(w -> {
+ w.eq(IpVolumeMission::getClientId, SecurityUtils.getUserId());
+ });
+ }
+ if (keyword != null && !keyword.isEmpty()) {
+ eq.like(IpVolumeMission::getMissionName, keyword);
+ }
+ List<IpVolumeMission> list = list(eq);
+
+ for (IpVolumeMission mission : list) {
+ List<String> fileName = broadcastV2TaskFileService.findByTaskid(mission.getTaskId());
+ IpVolumeMissionBo bo = new IpVolumeMissionBo();
+ BeanUtils.copyProperties(mission, bo);
+ bo.setFileNames(fileName);
+ ipVolumeMissionBos.add(bo);
}
return ipVolumeMissionBos;
- //return new ArrayList<>();
}
- public void setMissionToData(Long missionId, List<Long> dateIds) {
+ public TaskVO getByTaskId(Integer taskId) {
+ TaskVO task = TaskAPIUtils.getTask(taskId);
+ if (task == null) {
+ throw new BusinessException("鏈嶅姟鍣ㄦ湭鎵惧埌璇ヤ换鍔�");
+ }
+
+ IpVolumeMission byId = getById(taskId);
+ if (byId == null) {
+ throw new BusinessException("鏈湴鏈壘鍒拌浠诲姟");
+ }
+ if (SecurityUtils.getClientId() != null) {
+ if (clientService.findClientId()) {
+ if (!byId.getUserId().equals(SecurityUtils.getUserId())) {
+ throw new BusinessException("浠诲姟褰掑睘閿欒");
+ }
+
+ } else {
+ if (!byId.getClientId().equals(SecurityUtils.getUserId()) && !byId.getUserId().equals(SecurityUtils.getUserId())) {
+ throw new BusinessException("浠诲姟褰掑睘閿欒");
+ }
+ }
- // tudo
+ }
+ task.setWeeks("0" + Integer.toBinaryString(task.getWeek()));
+// byId.setWeeks("0" + Integer.toBinaryString(byId.getWeek()));
+
+ List<BroadcastV2TaskFile> taskFiles = broadcastV2TaskFileService.list(Wrappers.lambdaQuery(BroadcastV2TaskFile.class)
+ .eq(BroadcastV2TaskFile::getTaskId, taskId));
+ List<BroadcastV2TaskTerminal> taskTerminals = broadcastV2TaskTerminalService.list(Wrappers.lambdaQuery(BroadcastV2TaskTerminal.class)
+ .eq(BroadcastV2TaskTerminal::getTaskId, taskId));
+
+
+ if (!taskFiles.isEmpty()) {
+ taskFiles.forEach(
+ fileId -> {
+// IpVolumeFile volumeFile = ipVolumeFileService.getById(fileId.getFileId());
+// if(volumeFile==null){
+// throw new BusinessException("浠诲姟鏂囦欢涓嶅瓨鍦�");
+// }
+ task.getFileIds().add(fileId.getFileId());
+// byId.getFileIds().add(fileId.getFileId());
+ }
+ );
+
+ }
+ if (!taskTerminals.isEmpty()) {
+ taskTerminals.forEach(
+ terminalId -> {
+// BroadcastTerminalV2Entity v2Entity = ipVolumeService.getById(terminalId.getTerminalId());
+// if(v2Entity==null){
+// throw new BusinessException("璇ヤ换鍔℃殏鏃犺澶囦娇鐢�");
+// }
+ task.getTerminalIds().add(terminalId.getTerminalId());
+// byId.getTerminalIds().add(terminalId.getTerminalId());
+ }
+ );
+ }
+
+
+ System.out.println(JSON.toJSONString(task));
+ System.out.println(task);
+ return task;
}
+ /**
+ * 鎺ㄩ��
+ *
+ * @param taskId
+ * @return
+ */
+ public boolean playTask(Integer taskId) {
+ return TaskAPIUtils.playTask(taskId);
+ }
+
+ /**
+ * 鍋滄
+ *
+ * @param taskId
+ * @return
+ */
+ public boolean stopTask(Integer taskId) {
+ return TaskAPIUtils.stopTask(taskId);
+ }
+
+ /**
+ * 鏆傚仠
+ *
+ * @param taskId
+ * @return
+ */
+ public boolean pauseTask(Integer taskId) {
+ return TaskAPIUtils.pauseTask(taskId);
+ }
+
+ /**
+ * 缁х画
+ *
+ * @param taskId
+ * @return
+ */
+ public boolean continueTask(Integer taskId) {
+ return TaskAPIUtils.continueTask(taskId);
+ }
}
--
Gitblit v1.9.3