功能完善

liuhaonan

2022-02-10 a34d02ea17cfaeec1e576b9ac5100ed60b5f4b9e

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

@@ -8,7 +8,6 @@
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;
@@ -21,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;

@@ -42,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,9 +112,9 @@
        missionparam.setTerminals(taskTerminalVOList.toArray(new TaskTerminalVO[taskTerminalVOList.size()]));
        System.out.println("---------------------------");
        //  向IP音柱服务器添加任务
        Integer taskId = TaskAPIUtils.addTask(missionparam);
        //Integer taskId = TaskAPIUtils.addTask(missionparam);
       // System.out.println("---------------------------");
        //Integer taskId = 1111;
        Integer taskId = 1111;

        if (null != taskId && taskId != 0) {
            IpVolumeMission byId = getById(taskId);
@@ -158,8 +163,11 @@
            }
            broadcastV2TaskFileService.deleteByTaskId(taskId);
            broadcastV2TaskTerminalService.deleteByTaskId(taskId);
            broadcastV2TaskTerminalService.saveBatch(taskTerminalEntityList);
//            broadcastV2TaskTerminalService.removeById(taskId);
            broadcastV2TaskTerminalService.saveTaskTerminal(taskTerminalEntityList);
            broadcastV2TaskFileService.saveBatch(taskFileEntityList);
//            broadcastV2TaskTerminalService.insertTaskTerminal(taskTerminalEntityList);
//            broadcastV2TaskTerminalService.saveBatch(taskTerminalEntityList);

            return true;
        } else {
@@ -311,33 +319,56 @@

    }

    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) {


        // tudo


    }
    public IpVolumeMission getByTaskId(Integer taskId){
        TaskVO task = TaskAPIUtils.getTask(taskId);
        if(task==null){