修改bug

Pu Zhibing

2025-02-10 24c1f8a945c6fbcb0968e9d78cf97e74f2677802

 guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/TaskDetailServiceImpl.java

@@ -36,6 +36,7 @@
import java.net.URLConnection;
import java.net.URLEncoder;
import java.text.SimpleDateFormat;
import java.time.LocalDateTime;
import java.time.format.DateTimeFormatter;
import java.util.*;
import java.util.stream.Collectors;
@@ -124,12 +125,15 @@
      info.setName(patrolTask.getName());
      info.setStatus(taskDetail.getStatus());
      info.setExecutionTime(taskDetail.getExecutionTime().format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")));
      long offlineNum = taskDetailVehiclesList.stream().filter(s -> s.getStatus() == 3).count();
      //执行状态（1=待执行，2=执行中，3=成功，4=离线，5=失败）
      long offlineNum = taskDetailVehiclesList.stream().filter(s -> s.getStatus() == 4).count();
      info.setOfflineNum(offlineNum);
      long normalNum = taskDetailVehiclesList.stream().filter(s -> s.getStatus() == 2).count();
      long normalNum = taskDetailVehiclesList.stream().filter(s -> s.getStatus() == 3).count();
      info.setNormalNum(normalNum);
      long abnormalNum = taskDetailVehiclesList.stream().filter(s -> s.getStatus() == 4).count();
      long abnormalNum = taskDetailVehiclesList.stream().filter(s -> s.getStatus() == 5).count();
      info.setAbnormalNum(abnormalNum);
      long underway = taskDetailVehiclesList.stream().filter(s -> s.getStatus() == 2).count();
      info.setUnderway(underway);
      return info;
   }
   
@@ -157,21 +161,25 @@
         wrapper.eq("status", vo.getStatus());
      }
      if(null != vo.getSysStatus()){
         List<TaskDetailVehiclesChannel> sys_status = taskDetailVehiclesChannelService.selectList(new EntityWrapper<TaskDetailVehiclesChannel>().eq("sys_status", vo.getSysStatus()));
         List<TaskDetailVehiclesChannel> sys_status = taskDetailVehiclesChannelService.selectList(new EntityWrapper<TaskDetailVehiclesChannel>()
               .eq("sys_status", vo.getSysStatus()));
         List<Integer> collect = sys_status.stream().map(TaskDetailVehiclesChannel::getTaskDetailVehiclesId).collect(Collectors.toList());
         if(collect.size() > 0){
            wrapper.in("id", collect);
         if(collect.size() == 0){
            collect.add(-1);
         }
         wrapper.in("id", collect);
      }
      if(null != vo.getArtificialStatus()){
         List<TaskDetailVehiclesChannel> sys_status = taskDetailVehiclesChannelService.selectList(new EntityWrapper<TaskDetailVehiclesChannel>().eq("artificial_status", vo.getArtificialStatus()));
         List<TaskDetailVehiclesChannel> sys_status = taskDetailVehiclesChannelService.selectList(new EntityWrapper<TaskDetailVehiclesChannel>()
               .eq("artificial_status", vo.getArtificialStatus()));
         List<Integer> collect = sys_status.stream().map(TaskDetailVehiclesChannel::getTaskDetailVehiclesId).collect(Collectors.toList());
         if(collect.size() > 0){
            wrapper.in("id", collect);
         if(collect.size() == 0){
            collect.add(-1);
         }
         wrapper.in("id", collect);
      }
      
      List<TaskDetailVehicles> taskDetailVehiclesList = taskDetailVehiclesService.selectList(wrapper);
      List<TaskDetailVehicles> taskDetailVehiclesList = taskDetailVehiclesService.selectList(wrapper.groupBy("vehicleIdUnique"));
      List<TaskDetailVehicles> vehiclesList = taskDetailVehiclesList.stream().filter(s -> s.getVehicleType() == 1).collect(Collectors.toList());
      List<VehicleVo> vehicle = new ArrayList<>();
      for (TaskDetailVehicles taskDetailVehicles : vehiclesList) {
@@ -217,7 +225,9 @@
      }
      List<TaskDetailVehicles> taskDetailVehiclesList = taskDetailVehiclesService.selectList(wrapper);
      List<Integer> collect = taskDetailVehiclesList.stream().map(TaskDetailVehicles::getId).collect(Collectors.toList());
		
      if(collect.size() > 0){
         collect.add(-1);
      }
      List<PictureDetails> pictureDetails = taskDetailVehiclesChannelService.getPictureDetails(pageInfo, collect, vo.getSysStatus(), vo.getArtificialStatus());
      for (PictureDetails pictureDetail : pictureDetails) {
         String videoChannel = pictureDetail.getVideoChannel();
@@ -234,14 +244,16 @@
    * @return
    */
   @Override
   public ResultUtil manualAudit(ManualAuditVo vo) {
   public ResultUtil manualAudit(ManualAuditVo vo, String userId) {
      List<TaskDetailVehiclesChannel> taskDetailVehiclesChannels = taskDetailVehiclesChannelService.selectBatchIds(vo.getId());
      for (TaskDetailVehiclesChannel taskDetailVehiclesChannel : taskDetailVehiclesChannels) {
         if(null != taskDetailVehiclesChannel.getArtificialStatus() && 1 == taskDetailVehiclesChannel.getArtificialStatus()){
         if(null != taskDetailVehiclesChannel.getArtificialStatus() && 1 != taskDetailVehiclesChannel.getArtificialStatus()){
            return ResultUtil.error("不能重复审核");
         }
         taskDetailVehiclesChannel.setArtificialStatus(vo.getStatus());
         taskDetailVehiclesChannel.setRemark(vo.getRemark());
         taskDetailVehiclesChannel.setArtificialCreateTime(LocalDateTime.now());
         taskDetailVehiclesChannel.setArtificialUserId(Integer.valueOf(userId));
         taskDetailVehiclesChannelService.updateById(taskDetailVehiclesChannel);
      }
      return ResultUtil.success();