Merge remote-tracking branch 'origin/master'

linwei

2026-02-02 1bfbc52da47b22f00a1c1f5f670c30f70d999873

 drone-service/drone-fw/src/main/java/org/sxkj/fw/area/service/impl/FwPoliceStationServiceImpl.java

@@ -20,6 +20,7 @@
import org.springblade.core.tool.utils.StringUtil;
import org.sxkj.common.utils.HeaderUtils;
import org.sxkj.fw.area.entity.FwPoliceStationEntity;
import org.sxkj.fw.area.param.FwPoliceStationQueryParam;
import org.sxkj.fw.area.vo.FwPoliceStationVO;
import org.sxkj.fw.area.excel.FwPoliceStationExcel;
import org.sxkj.fw.area.mapper.FwPoliceStationMapper;
@@ -38,24 +39,26 @@
 * @since 2026-01-08
 */
@Service
public class FwPoliceStationServiceImpl extends BaseServiceImpl<FwPoliceStationMapper, FwPoliceStationEntity> implements IFwPoliceStationService {
public class FwPoliceStationServiceImpl extends BaseServiceImpl<FwPoliceStationMapper, FwPoliceStationEntity>
   implements IFwPoliceStationService {

   @Override
   public IPage<FwPoliceStationVO> selectFwPoliceStationPage(IPage<FwPoliceStationVO> page, FwPoliceStationVO fwPoliceStation) {
      return page.setRecords(baseMapper.selectFwPoliceStationPage(page, fwPoliceStation));
   public IPage<FwPoliceStationVO> selectFwPoliceStationPage(IPage<FwPoliceStationVO> page,
                                               FwPoliceStationQueryParam param) {
      return page.setRecords(baseMapper.selectFwPoliceStationPage(page, param));
   }

   @Override
   public List<FwPoliceStationVO> selectFwPoliceStationList() {
      return baseMapper.selectFwPoliceStationList();
   public List<FwPoliceStationVO> selectFwPoliceStationList(String stationName) {
      return baseMapper.selectFwPoliceStationList(stationName);
   }


   @Override
   public List<FwPoliceStationExcel> exportFwPoliceStation(Wrapper<FwPoliceStationEntity> queryWrapper) {
      List<FwPoliceStationExcel> fwPoliceStationList = baseMapper.exportFwPoliceStation(queryWrapper);
      //fwPoliceStationList.forEach(fwPoliceStation -> {
      //   fwPoliceStation.setTypeName(DictCache.getValue(DictEnum.YES_NO, FwPoliceStation.getType()));
      // fwPoliceStation.setTypeName(DictCache.getValue(DictEnum.YES_NO,
      // FwPoliceStation.getType()));
      //});
      return fwPoliceStationList;
   }