巡查任务优化

linwei

2026-01-26 4f4872af1eef1c14d95f04bffe2a4f2d2f7d835d

 drone-service/drone-gd/src/main/java/org/sxkj/gd/workorder/service/impl/GdPatrolTaskServiceImpl.java

@@ -125,7 +125,7 @@
            GdWorkOrderFlowEntity gdWorkOrderFlowEntity = new GdWorkOrderFlowEntity();
            gdWorkOrderFlowEntity.setCreateUser(AuthUtil.getUserId());
            gdWorkOrderFlowEntity.setWorkOrderId(gdPatrolTaskEntity.getId());
            gdWorkOrderFlowEntity.setFlowName("任务发布");
            gdWorkOrderFlowEntity.setFlowName(PatrolTaskStatusEnum.PENDING_SIGNING.getStageDesc());
            gdWorkOrderFlowEntity.setFlowDesc(AuthUtil.getUserName() + " " + DateUtil.format(new Date(), "yyyy-MM-dd HH:mm:ss") + " 发布任务，等待接单");
            gdWorkOrderFlowEntity.setOperator(AuthUtil.getUserName());
            gdWorkOrderFlowEntity.setType(WorkOrderTypeEnum.PATROL_TASK.getValue());
@@ -362,7 +362,7 @@
    }

   @Override
   public File exportPatrolReport(Long patrolTaskId) {
   public boolean exportPatrolReport(Long patrolTaskId) {
      if (patrolTaskId == null) {
         throw new RuntimeException("巡查任务主键不能为空");
      }
@@ -377,8 +377,7 @@
      String deptName = getDeptName(taskEntity.getCreateDept());
      try {
         File reportFile = GdPatrolReportWordUtil.generateReportFile(taskEntity, resultList, creatorName, deptName);
         saveAttachFile(reportFile, taskEntity);
         return reportFile;
         return saveAttachFile(reportFile, taskEntity);
      } catch (Exception e) {
         throw new RuntimeException("生成巡查报告失败", e);
      }
@@ -417,7 +416,7 @@
        GdWorkOrderFlowEntity flowEntity = new GdWorkOrderFlowEntity();
        flowEntity.setCreateUser(AuthUtil.getUserId());
        flowEntity.setWorkOrderId(workOrderId);
        flowEntity.setFlowName(newStatus.getDesc());
        flowEntity.setFlowName(newStatus.getStageDesc());

        // 构建流转描述
        String flowDesc = buildFlowDesc(newStatus, rejectReason);
@@ -486,34 +485,35 @@
      return StringUtil.isBlank(realName) ? "/" : realName;
   }

   private BladeFile saveAttachFile(File reportFile, GdPatrolTaskEntity taskEntity) throws IOException {
   private boolean saveAttachFile(File reportFile, GdPatrolTaskEntity taskEntity) throws IOException {
      if (reportFile == null || !reportFile.exists()) {
         throw new RuntimeException("巡查报告文件不存在");
      }
      String fileName = reportFile.getName();
      String desiredName = buildReportAttachName(taskEntity, reportFile.getName());
      BladeFile bladeFile = attachClient.putFile(
         GdMultipartFileUtil.fromFile(reportFile,
            "application/vnd.openxmlformats-officedocument.wordprocessingml.document"),
         fileName
         desiredName
      );
      if (bladeFile == null || StringUtil.isBlank(bladeFile.getLink())) {
         throw new RuntimeException("附件上传失败");
      }
      Integer resultType = parseResultType(taskEntity != null ? taskEntity.getPatrolTaskType() : null);
      Attach attach = buildAttachInfo(taskEntity, reportFile, bladeFile, resultType);
      Attach attach = buildAttachInfo(taskEntity, reportFile, bladeFile, resultType, desiredName);
      Boolean saved = attachClient.saveAttachInfo(attach);
      if (!Boolean.TRUE.equals(saved)) {
         log.error("附件信息保存失败，报告文件:"+fileName);
         log.error("附件信息保存失败，报告文件:" + desiredName);
         return false;
      }
      return bladeFile;
      return true;
   }

   private Attach buildAttachInfo(GdPatrolTaskEntity taskEntity, File reportFile, BladeFile bladeFile, Integer resultType) {
   private Attach buildAttachInfo(GdPatrolTaskEntity taskEntity, File reportFile, BladeFile bladeFile, Integer resultType, String desiredName) {
      Attach attach = new Attach();
      attach.setDomainUrl(bladeFile.getDomain());
      attach.setLink(bladeFile.getLink());
      attach.setName(bladeFile.getName());
      attach.setOriginalName(StringUtil.isBlank(bladeFile.getOriginalName()) ? reportFile.getName() : bladeFile.getOriginalName());
      attach.setName(desiredName);
      attach.setOriginalName(desiredName);
      attach.setAttachSize(reportFile.length());
      attach.setExtension(FileUtil.getFileExtension(reportFile.getName()));
      attach.setResultType(resultType);
@@ -538,6 +538,14 @@
      return attach;
   }

   private String buildReportAttachName(GdPatrolTaskEntity taskEntity, String fallbackName) {
      String taskNo = taskEntity != null ? taskEntity.getTaskNo() : null;
      if (StringUtil.isBlank(taskNo)) {
         return fallbackName;
      }
      return taskNo + ".docx";
   }

   private Integer parseResultType(String patrolTaskType) {
      if (StringUtil.isBlank(patrolTaskType)) {
         return null;