refactor(workorder): 重构工单状态聚合逻辑-只处理撤回任务状态

linwei

3 days ago 92dc5972adbd94d47c0e6501ce4a7b51af09e3c3

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

@@ -4,6 +4,7 @@
import com.baomidou.mybatisplus.core.conditions.Wrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.StringUtils;
import org.springblade.core.mp.base.BaseServiceImpl;
import org.springblade.core.secure.utils.AuthUtil;
@@ -11,10 +12,10 @@
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import org.sxkj.common.constant.CommonConstant;
import org.sxkj.common.constant.WordOrderConstant;
import org.sxkj.common.utils.GeomUtils;
import org.sxkj.common.utils.OrderNumUtils;
import org.sxkj.gd.utils.GdGeoAddressUtil;
import org.sxkj.gd.workorder.entity.GdPatrolTaskEntity;
import org.sxkj.gd.workorder.entity.GdWorkOrderEntity;
import org.sxkj.gd.workorder.entity.GdWorkOrderFlowEntity;
@@ -42,6 +43,7 @@
 * @author lw
 * @since 2026-01-14
 */
@Slf4j
@Service
public class GdWorkOrderServiceImpl extends BaseServiceImpl<GdWorkOrderMapper, GdWorkOrderEntity> implements IGdWorkOrderService {

@@ -51,7 +53,7 @@
   private IGdPatrolTaskService gdPatrolTaskService;

   @Override
   public GdWorkOrderEntity getWorkOrderDetail(GdWorkOrderEntity gdWorkOrder) {
   public GdWorkOrderVO getWorkOrderDetail(GdWorkOrderEntity gdWorkOrder) {
      return baseMapper.getWorkOrderDetail(gdWorkOrder);
   }

@@ -59,7 +61,7 @@
   public IPage<GdWorkOrderVO> selectGdWorkOrderPage(IPage<GdWorkOrderVO> page, WorkOrderPageParam gdWorkOrder) {
      if (gdWorkOrder.getIsQueryAll()) {
         List<Long> deptList = new ArrayList<>();
         if (!AuthUtil.isAdministrator()) {
         if (!(AuthUtil.isAdministrator() || AuthUtil.isAdmin())) {
            deptList = SysCache.getDeptChildIds(Long.valueOf(AuthUtil.getDeptId()));
         }
         gdWorkOrder.setDeptList(deptList);
@@ -77,12 +79,6 @@
      return gdWorkOrderList;
   }

   /**
    * 保存工单任务表
    *
    * @param workOrderParam
    * @return
    */
   @Override
   @Transactional(rollbackFor = Exception.class)
   public boolean saveOrUpdateWorkOrder(WorkOrderAddParam workOrderParam) {
@@ -96,6 +92,13 @@
      }
      entity.setGeom(validatedGeom);

      // 从几何数据中提取中心点坐标，用于获取行政区划编码
      double[] centerCoords = GeomUtils.extractCenterPoint(validatedGeom);
      if (centerCoords == null || centerCoords.length < 2) {
         return false;
      }
      String countyCode = GdGeoAddressUtil.getTownCode(centerCoords[0], centerCoords[1]);
      entity.setAreaCode(countyCode);
      // 生成工单编号
      if (StringUtils.isBlank(entity.getWorkOrderCode())) {
         String timestamp = OrderNumUtils.initOrderNum(WordOrderConstant.ORDER_REDIS_KEY);