Merge remote-tracking branch 'origin/master'

rain

2026-02-09 66bfbdb9251c22ffa2b5f05595a76a3547a2f5eb

 drone-service/drone-fw/src/main/java/org/sxkj/fw/detection/service/impl/FwTaskScheduleServiceImpl.java

@@ -16,28 +16,36 @@
 */
package org.sxkj.fw.detection.service.impl;

import org.springblade.core.secure.utils.AuthUtil;
import org.sxkj.fw.detection.entity.FwTaskScheduleEntity;
import org.sxkj.fw.detection.vo.FwTaskScheduleVO;
import org.sxkj.fw.detection.excel.FwTaskScheduleExcel;
import org.sxkj.fw.detection.param.FwTaskSchedulePageParam;
import org.sxkj.fw.detection.vo.FwTaskScheduleVO;
import org.sxkj.fw.detection.mapper.FwTaskScheduleMapper;
import org.sxkj.fw.detection.service.IFwTaskScheduleService;
import org.springframework.stereotype.Service;
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;

/**
 * 任务调度记录表 服务实现类
 *
 * @author lw
 * @since 2026-01-07
 * @since 2026-01-08
 */
@Service
public class FwTaskScheduleServiceImpl extends BaseServiceImpl<FwTaskScheduleMapper, FwTaskScheduleEntity> implements IFwTaskScheduleService {

   @Override
   public IPage<FwTaskScheduleVO> selectFwTaskSchedulePage(IPage<FwTaskScheduleVO> page, FwTaskScheduleVO fwTaskSchedule) {
   public IPage<FwTaskScheduleVO> selectFwTaskSchedulePage(IPage<FwTaskScheduleVO> page, FwTaskSchedulePageParam fwTaskSchedule) {
      if (!AuthUtil.isAdministrator()) {
         List<Long> deptList = SysCache.getDeptChildIds(Long.valueOf(AuthUtil.getDeptId()));
         fwTaskSchedule.setDeptList(deptList);
      }
      return page.setRecords(baseMapper.selectFwTaskSchedulePage(page, fwTaskSchedule));
   }

@@ -45,9 +53,6 @@
   @Override
   public List<FwTaskScheduleExcel> exportFwTaskSchedule(Wrapper<FwTaskScheduleEntity> queryWrapper) {
      List<FwTaskScheduleExcel> fwTaskScheduleList = baseMapper.exportFwTaskSchedule(queryWrapper);
      //fwTaskScheduleList.forEach(fwTaskSchedule -> {
      //   fwTaskSchedule.setTypeName(DictCache.getValue(DictEnum.YES_NO, FwTaskSchedule.getType()));
      //});
      return fwTaskScheduleList;
   }