From 54cd0ca82059cdad4e9ee5b9b1c7164d443ab46f Mon Sep 17 00:00:00 2001
From: liuhaonan <konodioda2333@vip.qq.com>
Date: 星期五, 11 二月 2022 11:26:52 +0800
Subject: [PATCH] 功能完善
---
ximon-admin/src/main/java/com/sandu/ximon/admin/service/IpVolumeMissionService.java | 86 ++++++++++++++++++++++++++++++++++--------
1 files changed, 69 insertions(+), 17 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..299dc9c 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
@@ -8,11 +8,11 @@
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.admin.vo.TaskVO;
import com.sandu.ximon.dao.bo.IpVolumeMissionBo;
import com.sandu.ximon.dao.domain.BroadcastV2TaskFile;
import com.sandu.ximon.dao.domain.BroadcastV2TaskTerminal;
@@ -20,10 +20,12 @@
import com.sandu.ximon.dao.domain.IpVolumeMission;
import com.sandu.ximon.dao.mapper.IpVolumeMissionMapper;
import lombok.AllArgsConstructor;
+import org.springframework.beans.BeanUtils;
import org.springframework.stereotype.Service;
import java.math.BigInteger;
import java.util.ArrayList;
+import java.util.Collections;
import java.util.HashSet;
import java.util.List;
@@ -41,6 +43,10 @@
private final BroadcastV2TaskFileService broadcastV2TaskFileService;
private final BroadcastV2TaskTerminalService broadcastV2TaskTerminalService;
+
+ /*public boolean add1() {
+ return broadcastV2TaskTerminalService.save();
+ }*/
public boolean addMission(IpVolumeMissionParam missionparam) {
String taskName = missionparam.getMissionName();
@@ -107,8 +113,7 @@
System.out.println("---------------------------");
// 鍚慖P闊虫煴鏈嶅姟鍣ㄦ坊鍔犱换鍔�
Integer taskId = TaskAPIUtils.addTask(missionparam);
- // System.out.println("---------------------------");
- //Integer taskId = 1111;
+ // Integer taskId = 1111;
if (null != taskId && taskId != 0) {
IpVolumeMission byId = getById(taskId);
@@ -118,7 +123,7 @@
for (BroadcastV2TaskFile v2TaskFile :taskFileEntityList) {
v2TaskFile.setTaskId(taskId);
}
- if (null == byId) {
+ if (byId==null) {
// 鍚戞暟鎹簱娣诲姞璇ヤ换鍔¤褰�
IpVolumeMission mission = new IpVolumeMission();
@@ -157,8 +162,11 @@
}
broadcastV2TaskFileService.deleteByTaskId(taskId);
broadcastV2TaskTerminalService.deleteByTaskId(taskId);
- broadcastV2TaskTerminalService.saveBatch(taskTerminalEntityList);
+// broadcastV2TaskTerminalService.removeById(taskId);
+ broadcastV2TaskTerminalService.saveTaskTerminal(taskTerminalEntityList);
broadcastV2TaskFileService.saveBatch(taskFileEntityList);
+// broadcastV2TaskTerminalService.saveBatch(taskTerminalEntityList);
+// broadcastV2TaskTerminalService.insertTaskTerminal(taskTerminalEntityList);
return true;
} else {
@@ -310,32 +318,76 @@
}
- public List<IpVolumeMission> listMission(ReceiveParam receiveParam) {
-
- LambdaQueryWrapper<IpVolumeMission> wrapper = Wrappers.lambdaQuery(IpVolumeMission.class).eq(IpVolumeMission::getClientId, SecurityUtils.getUserId()).like(IpVolumeMission::getMissionName, receiveParam.getKeyWord());
-
- return list(wrapper);
- }
+// public List<IpVolumeMission> listMission(ReceiveParam receiveParam) {
+//
+// LambdaQueryWrapper<IpVolumeMission> wrapper = Wrappers.lambdaQuery(IpVolumeMission.class).eq(IpVolumeMission::getClientId, SecurityUtils.getUserId()).like(IpVolumeMission::getMissionName, receiveParam.getKeyWord());
+//
+// return list(wrapper);
+// }
public List<IpVolumeMissionBo> missionList(BaseConditionVO baseConditionVO,String keyword) {
PageHelper.startPage(baseConditionVO.getPageNo(),baseConditionVO.getPageSize());
- List<IpVolumeMissionBo> ipVolumeMissionBos = ipVolumeMissionMapper.listAllByClientId();
+ boolean r = clientService.findClientId(); //ture浠ｈ〃鏈変笂绾у鎴� 鏌ヨ閫氳繃userID
- for (IpVolumeMissionBo missionBo: ipVolumeMissionBos) {
- missionBo.setFileNames(broadcastV2TaskFileService.findByTaskid(missionBo.getTaskId()));
+ List<IpVolumeMissionBo> ipVolumeMissionBos = new ArrayList<>();
+ LambdaQueryWrapper<IpVolumeMission> eq=new LambdaQueryWrapper<>();
+
+// if(r.equals(-1L)){
+// ipVolumeMissionBos = ipVolumeMissionMapper.listAllByClientId(r);
+// }else {
+// ipVolumeMissionBos = ipVolumeMissionMapper.listAllByUserId(SecurityUtils.getUserId());
+// }
+ if(r){
+ eq = Wrappers.lambdaQuery(IpVolumeMission.class).eq(IpVolumeMission::getUserId, SecurityUtils.getUserId());
+ }else {
+ eq = Wrappers.lambdaQuery(IpVolumeMission.class).eq(IpVolumeMission::getClientId,SecurityUtils.getUserId());
+ }
+ if(!keyword.isEmpty()){
+ eq.like(IpVolumeMission::getMissionName,keyword);
+ }
+ List<IpVolumeMission> list = list(eq);
+
+
+ // ipVolumeMissionBos = ipVolumeMissionMapper.listAllByClientId();
+
+ 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);
}
+
+// for (IpVolumeMissionBo missionBo: ipVolumeMissionBos) {
+// missionBo.setFileNames(broadcastV2TaskFileService.findByTaskid(missionBo.getTaskId()));
+//
+// }
return ipVolumeMissionBos;
//return new ArrayList<>();
}
- public void setMissionToData(Long missionId, List<Long> dateIds) {
+ public IpVolumeMission getByTaskId(Integer taskId){
+ TaskVO task = TaskAPIUtils.getTask(taskId);
+ if(task==null){
+ throw new BusinessException("鏈嶅姟鍣ㄦ湭鎵惧埌璇ヤ换鍔�");
+ }
+
+ IpVolumeMission byId = getById(taskId);
+ if(byId==null){
+ throw new BusinessException("鏈湴鏈壘鍒拌浠诲姟");
+ }
+
+ byId.setWeeks("0"+Integer.toBinaryString(byId.getWeek()));
+
+ return byId;
- // tudo
+ }
-
+ public boolean playTask(Integer taskId) {
+ return TaskAPIUtils.playTask(taskId);
}
--
Gitblit v1.9.3