巡查任务优化

linwei

2026-01-26 4f4872af1eef1c14d95f04bffe2a4f2d2f7d835d

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

@@ -21,6 +21,7 @@
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import org.apache.commons.lang3.StringUtils;
import org.springblade.core.mp.base.BaseServiceImpl;
import org.springblade.core.oss.model.BladeFile;
import org.springblade.core.secure.utils.AuthUtil;
import org.springblade.core.tool.utils.DateUtil;
import org.springframework.beans.factory.annotation.Autowired;
@@ -30,6 +31,7 @@
import org.sxkj.common.utils.OrderNumUtils;
import org.springblade.core.tool.api.R;
import org.springblade.core.tool.constant.BladeConstant;
import org.springblade.core.tool.utils.FileUtil;
import org.springblade.core.tool.utils.StringUtil;
import org.sxkj.gd.workorder.entity.GdPatrolTaskEntity;
import org.sxkj.gd.workorder.entity.GdTaskResultEntity;
@@ -47,12 +49,16 @@
import org.sxkj.gd.workorder.service.IGdWorkOrderFlowService;
import org.sxkj.gd.workorder.utils.GdPatrolReportWordUtil;
import org.sxkj.gd.workorder.vo.GdPatrolTaskVO;
import org.sxkj.gd.common.GdMultipartFileUtil;
import org.sxkj.resource.entity.Attach;
import org.sxkj.resource.feign.IAttachClient;
import org.sxkj.system.entity.Dept;
import org.sxkj.system.entity.User;
import org.sxkj.system.feign.ISysClient;
import org.sxkj.system.feign.IUserClient;

import java.io.File;
import java.io.IOException;
import java.util.Date;
import java.util.List;

@@ -74,6 +80,8 @@
   private ISysClient sysClient;
   @Autowired
   private IUserClient userClient;
   @Autowired
   private IAttachClient attachClient;
   @Autowired
   private IGdTaskResultService gdTaskResultService;
    @Override
@@ -117,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());
@@ -354,7 +362,7 @@
    }

   @Override
   public File exportPatrolReport(Long patrolTaskId) {
   public boolean exportPatrolReport(Long patrolTaskId) {
      if (patrolTaskId == null) {
         throw new RuntimeException("巡查任务主键不能为空");
      }
@@ -368,7 +376,8 @@
      String creatorName = getUserName(taskEntity.getCreateUser());
      String deptName = getDeptName(taskEntity.getCreateDept());
      try {
         return GdPatrolReportWordUtil.generateReportFile(taskEntity, resultList, creatorName, deptName);
         File reportFile = GdPatrolReportWordUtil.generateReportFile(taskEntity, resultList, creatorName, deptName);
         return saveAttachFile(reportFile, taskEntity);
      } catch (Exception e) {
         throw new RuntimeException("生成巡查报告失败", e);
      }
@@ -407,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);
@@ -476,5 +485,80 @@
      return StringUtil.isBlank(realName) ? "/" : realName;
   }

   private boolean saveAttachFile(File reportFile, GdPatrolTaskEntity taskEntity) throws IOException {
      if (reportFile == null || !reportFile.exists()) {
         throw new RuntimeException("巡查报告文件不存在");
      }
      String desiredName = buildReportAttachName(taskEntity, reportFile.getName());
      BladeFile bladeFile = attachClient.putFile(
         GdMultipartFileUtil.fromFile(reportFile,
            "application/vnd.openxmlformats-officedocument.wordprocessingml.document"),
         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, desiredName);
      Boolean saved = attachClient.saveAttachInfo(attach);
      if (!Boolean.TRUE.equals(saved)) {
         log.error("附件信息保存失败，报告文件:" + desiredName);
         return false;
      }
      return true;
   }

   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(desiredName);
      attach.setOriginalName(desiredName);
      attach.setAttachSize(reportFile.length());
      attach.setExtension(FileUtil.getFileExtension(reportFile.getName()));
      attach.setResultType(resultType);
      Long createUser = taskEntity != null ? taskEntity.getCreateUser() : null;
      Long updateUser = taskEntity != null ? taskEntity.getUpdateUser() : null;
      Long createDept = taskEntity != null ? taskEntity.getCreateDept() : null;
      if (createUser == null) {
         createUser = AuthUtil.getUserId();
      }
      if (updateUser == null) {
         updateUser = createUser;
      }
      if (createDept == null) {
         createDept = Long.valueOf(AuthUtil.getDeptId());
      }
      Date now = new Date();
      attach.setCreateUser(createUser);
      attach.setUpdateUser(updateUser);
      attach.setCreateDept(createDept);
      attach.setCreateTime(now);
      attach.setUpdateTime(now);
      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;
      }
      try {
         Integer type = Integer.valueOf(patrolTaskType);
         if (type < 1 || type > 5) {
            return null;
         }
         return type;
      } catch (NumberFormatException ex) {
         return null;
      }
   }

}