From 34cc9fb821d30b64947c8a62d952f1621a515149 Mon Sep 17 00:00:00 2001
From: zhanzhiqin <895896009@qq.com>
Date: 星期一, 21 三月 2022 10:32:51 +0800
Subject: [PATCH] 普通用户修改密码
---
ximon-admin/src/main/java/com/sandu/ximon/admin/service/IpVolumeMissionService.java | 134 +++++++++++++++++++++++++-------------------
1 files changed, 75 insertions(+), 59 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 97c07e7..0d2cdba 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,10 +8,8 @@
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.utils.request.BroadcastParams;
import com.sandu.ximon.admin.vo.TaskMediaFileVO;
import com.sandu.ximon.admin.vo.TaskTerminalVO;
import com.sandu.ximon.admin.vo.TaskVO;
@@ -22,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;
@@ -43,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();
@@ -59,14 +63,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();
@@ -81,22 +85,25 @@
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+"鐨勬枃浠朵笉瀛樺湪");
+ }
+// 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);
@@ -109,18 +116,17 @@
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);
- for (BroadcastV2TaskTerminal v2TaskTerminal: taskTerminalEntityList) {
+ for (BroadcastV2TaskTerminal v2TaskTerminal : taskTerminalEntityList) {
v2TaskTerminal.setTaskId(taskId);
}
- for (BroadcastV2TaskFile v2TaskFile :taskFileEntityList) {
+ for (BroadcastV2TaskFile v2TaskFile : taskFileEntityList) {
v2TaskFile.setTaskId(taskId);
}
- if (byId==null) {
+ if (byId == null) {
// 鍚戞暟鎹簱娣诲姞璇ヤ换鍔¤褰�
IpVolumeMission mission = new IpVolumeMission();
@@ -135,9 +141,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("----------------------------------------------------------");
@@ -154,14 +159,11 @@
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;
} else {
return false;
@@ -173,15 +175,15 @@
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;
}
@@ -190,7 +192,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();
@@ -205,7 +207,7 @@
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();
@@ -235,12 +237,12 @@
// 鍚慖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) {
@@ -258,7 +260,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();*/
@@ -273,7 +275,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("----------------------------------------------------------");
@@ -284,73 +286,87 @@
broadcastV2TaskFileService.saveBatch(taskFileEntityList);
return 0;
- }else {
+ } else {
return result;
}
}
/**
* 鍒犻櫎浠诲姟
+ *
* @param taskId
- * @return0锛氭垚鍔� 1锛氫换鍔′笉澶勪簬绌洪棽鐘舵�� 2:鏈嶅姟鍣ㄥ垹闄ゅけ璐�
+ * @return0锛氭垚鍔� 1锛氫换鍔′笉澶勪簬绌洪棽鐘舵�� 2:鏈嶅姟鍣ㄥ垹闄ゅけ璐�
*/
public Integer deleteMission(Integer taskId) {
Integer del = TaskAPIUtils.delTask(taskId);
- if(del==0){
+ if (del == 0) {
IpVolumeMission byId = getById(taskId);
if (byId == null) {
- return -1;
+ return -1;
}
removeById(taskId);
- broadcastV2TaskFileService.removeById(taskId);
- broadcastV2TaskTerminalService.removeById(taskId);
+ broadcastV2TaskFileService.deleteByTaskId(taskId);
+ broadcastV2TaskTerminalService.deleteByTaskId(taskId);
+// broadcastV2TaskTerminalService.removeById(taskId);
return 0;
- }
- else {
+ } 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) {
+ // PageHelper.startPage(baseConditionVO.getPageNo(),baseConditionVO.getPageSize());
+ boolean r = clientService.findClientId(); //ture浠ｈ〃鏈変笂绾у鎴� 鏌ヨ閫氳繃userID
- return list(wrapper);
- }
+ List<IpVolumeMissionBo> ipVolumeMissionBos = new ArrayList<>();
+ LambdaQueryWrapper<IpVolumeMission> eq = new LambdaQueryWrapper<>();
- public List<IpVolumeMissionBo> missionList(BaseConditionVO baseConditionVO,String keyword) {
- PageHelper.startPage(baseConditionVO.getPageNo(),baseConditionVO.getPageSize());
- List<IpVolumeMissionBo> ipVolumeMissionBos = ipVolumeMissionMapper.listAllByClientId();
+ PageHelper.startPage(baseConditionVO.getPageNo(), baseConditionVO.getPageSize());
+ 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);
- for (IpVolumeMissionBo missionBo: ipVolumeMissionBos) {
- missionBo.setFileNames(broadcastV2TaskFileService.findByTaskid(missionBo.getTaskId()));
+
+ // 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) {
-
-
- // tudo
-
-
- }
- public IpVolumeMission getByTaskId(Integer taskId){
+ public IpVolumeMission getByTaskId(Integer taskId) {
TaskVO task = TaskAPIUtils.getTask(taskId);
- if(task==null){
+ if (task == null) {
throw new BusinessException("鏈嶅姟鍣ㄦ湭鎵惧埌璇ヤ换鍔�");
}
IpVolumeMission byId = getById(taskId);
- if(byId==null){
+ if (byId == null) {
throw new BusinessException("鏈湴鏈壘鍒拌浠诲姟");
}
- byId.setWeeks("0"+Integer.toBinaryString(byId.getWeek()));
+ byId.setWeeks("0" + Integer.toBinaryString(byId.getWeek()));
return byId;
--
Gitblit v1.9.3