changes

liuhaonan

2022-10-25 350608105f300c6c629d743dc9896feca2f22e8d

 ximon-admin/src/main/java/com/sandu/ximon/admin/service/IpVolumeMissionService.java

@@ -1,6 +1,5 @@
package com.sandu.ximon.admin.service;

import cn.hutool.core.collection.CollectionUtil;
import com.alibaba.fastjson.JSON;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
@@ -8,7 +7,6 @@
import com.sandu.common.execption.BusinessException;
import com.sandu.common.object.BaseConditionVO;
import com.sandu.common.service.impl.BaseServiceImpl;
import com.sandu.common.util.SpringContextHolder;
import com.sandu.ximon.admin.minio.entity.MinIoConstant;
import com.sandu.ximon.admin.param.IpVolumeMissionParam;
import com.sandu.ximon.admin.security.SecurityUtils;
@@ -18,7 +16,11 @@
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.*;
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;
@@ -28,7 +30,6 @@
import java.util.ArrayList;
import java.util.HashSet;
import java.util.List;
import java.util.stream.Collectors;

/**
 * @Author liuhaonan
@@ -47,6 +48,18 @@


    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和客户id都不匹配
                    throw new BusinessException("文件归属异常,创建任务失败");
                }
            }
        });

        String taskName = missionparam.getMissionName();

@@ -102,7 +115,7 @@
                    MinIoConstant.BROADCAST_FILE.getBucketName() + fileEntity.getUserId(),
                    fileEntity.getFileName()
            );
            if (fileEntity.getUserId() == null && fileEntity.getClientId() == null) {
            if (fileEntity.getUserId() == null && fileEntity.getClientId() != null) {
                absolutePath = MinIoConstant.getAbsolutePath(
                        MinIoConstant.ADMIN_BROADCAST_FILE.getBucketName(),
                        fileEntity.getFileName()
@@ -315,7 +328,7 @@
            broadcastV2TaskFileService.saveBatch(taskFileEntityList);
        }
        /**
         * IP音柱任务修改日志记录开始
         * IP音柱任务修改 日志记录开始
         */
        String content = "{任务ID：" + taskId
                + "，任务名：" + taskName
@@ -324,7 +337,7 @@
                + " }";
        StoreOperationRecordsUtils.storeOperationData(missionparam.getTerminalIds(), null, "IP音柱任务修改", content);
        /**
         * IP音柱任务修改日志记录结束
         * IP音柱任务修改 日志记录结束
         */
        return result;

@@ -350,14 +363,14 @@
        }

        /**
         * IP音柱任务删除日志记录开始
         * IP音柱任务删除 日志记录开始
         */
        String content = "{删除的任务ID：" + taskId
                + "，任务删除结果：" + del
                + " }";
        StoreOperationRecordsUtils.storeOperationData(null, null, "IP音柱任务删除", content);
        /**
         * IP音柱任务删除日志记录结束
         * IP音柱任务删除 日志记录结束
         */


@@ -365,13 +378,43 @@
    }


    public List<IpVolumeMissionBo> missionList(BaseConditionVO baseConditionVO, String keyword) {
        PageHelper.startPage(baseConditionVO.getPageNo(), baseConditionVO.getPageSize());
    public List<IpVolumeMissionBo> missionList(BaseConditionVO baseConditionVO, String keyword, Integer order, Integer seq) {


        //排序字段
        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);
        }

        List<IpVolumeMissionBo> ipVolumeMissionBos = new ArrayList<>();
        LambdaQueryWrapper<IpVolumeMission> eq = Wrappers.lambdaQuery(IpVolumeMission.class);

        PageHelper.startPage(baseConditionVO.getPageNo(), baseConditionVO.getPageSize());

        //不是超管
        if (SecurityUtils.getClientId() != null) {
            eq = eq.eq(IpVolumeMission::getUserId, SecurityUtils.getUserId()).or(w -> {
@@ -406,12 +449,12 @@
        }
        if (SecurityUtils.getClientId() != null) {
            if (clientService.findClientId()) {
                if (byId.getUserId().equals(SecurityUtils.getUserId())) {
                if (!byId.getUserId().equals(SecurityUtils.getUserId())) {
                    throw new BusinessException("任务归属错误");
                }

            } else {
                if (byId.getClientId().equals(SecurityUtils.getUserId())) {
                if (!byId.getClientId().equals(SecurityUtils.getUserId()) && !byId.getUserId().equals(SecurityUtils.getUserId())) {
                    throw new BusinessException("任务归属错误");
                }
            }