Merge remote-tracking branch 'origin/master'

rain

2026-01-28 54898304203f3ea0c132899dca4341dc182d13de

 drone-service/drone-fw/src/main/java/org/sxkj/fw/device/service/impl/FwDeviceMaintainPlanServiceImpl.java

@@ -16,6 +16,9 @@
 */
package org.sxkj.fw.device.service.impl;

import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
import org.springblade.core.secure.utils.AuthUtil;
import org.sxkj.fw.device.dto.FwDeviceMaintainPlanDTO;
import org.sxkj.fw.device.entity.FwDeviceMaintainPlanEntity;
import org.sxkj.fw.device.vo.FwDeviceMaintainPlanVO;
@@ -26,6 +29,8 @@
import com.baomidou.mybatisplus.core.conditions.Wrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import org.springblade.core.mp.base.BaseServiceImpl;
import org.sxkj.system.cache.SysCache;

import java.util.List;

/**
@@ -45,6 +50,8 @@

   @Override
   public IPage<FwDeviceMaintainPlanVO> selectFwDeviceMaintainPlanPage(IPage<FwDeviceMaintainPlanVO> page, FwDeviceMaintainPlanDTO fwDeviceMaintainPlan) {
      List<Long> deptList = SysCache.getDeptChildIds(Long.valueOf(AuthUtil.getDeptId()));
      fwDeviceMaintainPlan.setDeptList(deptList);
      return page.setRecords(baseMapper.selectFwDeviceMaintainPlanPage(page, fwDeviceMaintainPlan));
   }

@@ -58,4 +65,18 @@
      return fwDeviceMaintainPlanList;
   }

   @Override
   public void batchUpdateExpiredPlans(List<Long> planIds) {
      if (planIds == null || planIds.isEmpty()) {
         return;
      }

      // 构建更新条件
      LambdaUpdateWrapper<FwDeviceMaintainPlanEntity> updateWrapper = new LambdaUpdateWrapper<>();
      updateWrapper.in(FwDeviceMaintainPlanEntity::getId, planIds)
            .set(FwDeviceMaintainPlanEntity::getMaintainStatus, 0); // 未维护状态

      // 执行批量更新
      update(updateWrapper);
   }
}