zgyw.git - Gitblit

			@@ -60,6 +60,7 @@
			import org.springframework.util.CollectionUtils;
			import org.springframework.util.StringUtils;
			import pojo.CascadeOption;
			import utils.file.FileUtils;

			import java.time.LocalDateTime;
			import java.time.ZoneId;
			@@ -215,6 +216,7 @@
			}
			List<String> willAddSerialNumber = waitAddList.stream().map(WorkOrder::getSerialNumber).collect(Collectors.toList());
			//只生成考核设备、且有运维单位的工单

			List<YwPoint> pointList = new LambdaQueryChainWrapper<>(ywPointService.getBaseMapper())
			.select(YwPoint::getUnitId, YwPoint::getSerialNumber, YwPoint::getImportantTag, YwPoint::getImportantTag, YwPoint::getImportantCommandImageTag)
			.in(YwPoint::getSerialNumber, willAddSerialNumber)
			@@ -287,6 +289,7 @@
			}
			log.info("即将生成的工单:{}", workOrder);
			}

			redisCache.setCacheObject(RedisConstant.WORKORDER_NUM, workOrderNum);
			redisCache.releaseLock(RedisConstant.WORKORDER_NUM_LOCK, requestId);
			// 保存工单和故障类型
			@@ -605,6 +608,27 @@
			img.setWorkOrderNo(workOrder.getWorkOrderNo());
			img.setImgUrl(frameImg);
			img.setCreateTime(new Date());
			//判断该工单的图片是否已经大于5张了
			LambdaQueryChainWrapper<WorkOrderCheckImg> qw = new LambdaQueryChainWrapper<>(workOrderCheckImgMapper);

			//按照创建日期降序排列
			List<WorkOrderCheckImg> imgList = workOrderCheckImgMapper.selectList(
			new LambdaQueryChainWrapper<>(workOrderCheckImgMapper)
			.eq(WorkOrderCheckImg::getWorkOrderNo, workOrder.getWorkOrderNo())
			.orderByDesc(WorkOrderCheckImg::getCreateTime)
			);
			//保留最新的5张
			if (imgList.size()>=5){
			List<Integer> subList = imgList.subList(4, imgList.size()).stream().map(WorkOrderCheckImg::getId).collect(Collectors.toList());
			//删除照片，并且物理删除服务器内对应照片的名字


			workOrderCheckImgMapper.deleteBatchIds(subList);


			}


			workOrderCheckImgMapper.insert(img);
			}
			}
			@@ -667,6 +691,19 @@
			String workOrderNo = workOrder.getWorkOrderNo();
			//删除工单审核记录
			workOrderAuditingRecordMapper.delete(new QueryWrapper<WorkOrderAuditingRecord>().eq("work_order_no", workOrderNo));
			//需要物理删除服务器中的图片
			//查询到工单照片集合
			List<String> workOrderImg = workOrderCheckImgMapper
			.selectList(new QueryWrapper<WorkOrderCheckImg>().eq("work_order_no", workOrderNo))
			.stream().map(WorkOrderCheckImg::getImgUrl).collect(Collectors.toList());
			log.error("删除工单图片集合:{}",workOrderImg);
			log.error("删除路径:{}",PlatformConfig.getUploadPath());

			for (String filePath: workOrderImg){
			FileUtils.deleteFile( PlatformConfig.getUploadPath()+ filePath);
			}
			// /home/zgyw/uploadPath

			//删除工单图片记录
			workOrderCheckImgMapper.delete(new QueryWrapper<WorkOrderCheckImg>().eq("work_order_no", workOrderNo));
			//删除工单下发记录
			@@ -676,11 +713,17 @@
			//删除工单情况记录
			workOrderYwConditionRecordMapper.delete(new QueryWrapper<WorkOrderYwConditionRecord>().eq("work_order_no", workOrderNo));




			if (baseMapper.deleteById(id) > 0) {
			return Result.ok("删除成功");
			}
			return Result.error("删除失败");
			}




			/**
			* 分页查询
			@@ -1147,6 +1190,11 @@
			@Override
			public Result detailByNo(String workOrderNo) {
			WorkOrderDetailVO workOrder = baseMapper.detailByNo(workOrderNo);
			//报空原因1. sql 中 inner join 表 t_work_order_distribute_record 中无与该表关联的记录 wo.work_order_no = dr.work_order_no
			if(workOrder == null){
			workOrder = baseMapper.detailByNoButNoDistributeRecord(workOrderNo);
			}

			// 是否报备
			boolean hasReport = new LambdaQueryChainWrapper<>(reportMapper)
			.eq(Report::getSerialNumber, workOrder.getSerialNumber())
			@@ -1165,6 +1213,9 @@
			workOrder.setImgList(imgList);
			return Result.ok().data(workOrder);
			}

			@Autowired
			private WorkOrderMapper workOrderMapper;

			/**
			* 工单导出的逻辑
			@@ -1195,6 +1246,30 @@
			query.setErrorTypeList(errorTypeList);
			}
			List<WorkOrderVO> export = baseMapper.export(query);


			List<String> workOrderNos = export.stream().map(WorkOrderVO::getWorkOrderNo).collect(Collectors.toList());
			List<WorkOrderVO> auditTimeList = workOrderMapper.getAuditTimeList(workOrderNos);
			Map<String, List<Date>> auditTimeMap = auditTimeList.stream()
			.collect(Collectors.groupingBy(
			WorkOrderVO::getWorkOrderNo, // 分组的键
			Collectors.mapping(WorkOrderVO::getAuditTime, Collectors.toList())));
			if (!CollectionUtils.isEmpty(workOrderNos)){
			export.forEach(workOrderVO -> {
			List<Date> auditTimes = auditTimeMap.get(workOrderVO.getWorkOrderNo());
			if (!CollectionUtils.isEmpty(auditTimes)){
			//审核通过时间
			Date passTime = Collections.max(auditTimes);
			ZoneId zoneId = ZoneId.systemDefault();
			workOrderVO.setPassTime(passTime.toInstant().atZone(zoneId).toLocalDateTime());
			}
			});
			}





			if (CollectionUtils.isEmpty(export)) return new ArrayList<WorkOrderVO>();
			List<String> ips = export.stream().map(WorkOrderVO::getIp).collect(Collectors.toList());
			//查出相同ip的设备、并查出标签