Merge remote-tracking branch 'origin/master'

linwei

2026-02-02 1bfbc52da47b22f00a1c1f5f670c30f70d999873

 drone-service/drone-fw/src/main/java/org/sxkj/fw/area/controller/FwPoliceStationController.java

@@ -33,6 +33,7 @@
import com.baomidou.mybatisplus.core.metadata.IPage;
import org.sxkj.fw.area.dto.FwPoliceStationPolygonQueryDTO;
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.wrapper.FwPoliceStationWrapper;
@@ -79,8 +80,11 @@
//   @GetMapping("/list")
//   @ApiOperationSupport(order = 2)
//   @ApiOperation(value = "分页", notes = "传入fwPoliceStation")
//   public R<IPage<FwPoliceStationVO>> list(@ApiIgnore @RequestParam Map<String, Object> fwPoliceStation, Query query) {
//      IPage<FwPoliceStationEntity> pages = fwPoliceStationService.page(Condition.getPage(query), Condition.getQueryWrapper(fwPoliceStation, FwPoliceStationEntity.class));
   // public R<IPage<FwPoliceStationVO>> list(@ApiIgnore @RequestParam Map<String,
   // Object> fwPoliceStation, Query query) {
   // IPage<FwPoliceStationEntity> pages =
   // fwPoliceStationService.page(Condition.getPage(query),
   // Condition.getQueryWrapper(fwPoliceStation, FwPoliceStationEntity.class));
//      return R.data(FwPoliceStationWrapper.build().pageVO(pages));
//   }

@@ -89,9 +93,10 @@
    */
   @GetMapping("/list")
   @ApiOperationSupport(order = 2)
   @ApiOperation(value = "列表", notes = "获取全部派出所")
   public R<List<FwPoliceStationVO>> list() {
      List<FwPoliceStationVO> list = fwPoliceStationService.selectFwPoliceStationList();
   @ApiOperation(value = "列表", notes = "获取派出所列表,支持按名称模糊查询")
   public R<List<FwPoliceStationVO>> list(
      @ApiParam(value = "派出所名称") @RequestParam(required = false) String stationName) {
      List<FwPoliceStationVO> list = fwPoliceStationService.selectFwPoliceStationList(stationName);
      return R.data(list);
   }

@@ -101,8 +106,9 @@
   @GetMapping("/page")
   @ApiOperationSupport(order = 3)
   @ApiOperation(value = "分页", notes = "传入fwPoliceStation")
   public R<IPage<FwPoliceStationVO>> page(FwPoliceStationVO fwPoliceStation, Query query) {
      IPage<FwPoliceStationVO> pages = fwPoliceStationService.selectFwPoliceStationPage(Condition.getPage(query), fwPoliceStation);
   public R<IPage<FwPoliceStationVO>> page(FwPoliceStationQueryParam param, Query query) {
      IPage<FwPoliceStationVO> pages = fwPoliceStationService.selectFwPoliceStationPage(Condition.getPage(query),
         param);
      return R.data(pages);
   }

@@ -146,7 +152,6 @@
      return R.status(fwPoliceStationService.deleteLogic(Func.toLongList(ids)));
   }


   /**
    * 导出数据
    */
@@ -154,10 +159,13 @@
   @GetMapping("/export-fwPoliceStation")
   @ApiOperationSupport(order = 9)
   @ApiOperation(value = "导出数据", notes = "传入fwPoliceStation")
   public void exportFwPoliceStation(@ApiIgnore @RequestParam Map<String, Object> fwPoliceStation, BladeUser bladeUser, HttpServletResponse response) {
      QueryWrapper<FwPoliceStationEntity> queryWrapper = Condition.getQueryWrapper(fwPoliceStation, FwPoliceStationEntity.class);
   public void exportFwPoliceStation(@ApiIgnore @RequestParam Map<String, Object> fwPoliceStation, BladeUser bladeUser,
                             HttpServletResponse response) {
      QueryWrapper<FwPoliceStationEntity> queryWrapper = Condition.getQueryWrapper(fwPoliceStation,
         FwPoliceStationEntity.class);
      //if (!AuthUtil.isAdministrator()) {
      //   queryWrapper.lambda().eq(FwPoliceStation::getTenantId, bladeUser.getTenantId());
      // queryWrapper.lambda().eq(FwPoliceStation::getTenantId,
      // bladeUser.getTenantId());
      //}
      queryWrapper.lambda().eq(FwPoliceStationEntity::getIsDeleted, BladeConstant.DB_NOT_DELETED);
      List<FwPoliceStationExcel> list = fwPoliceStationService.exportFwPoliceStation(queryWrapper);