From 1bfbc52da47b22f00a1c1f5f670c30f70d999873 Mon Sep 17 00:00:00 2001
From: linwei <872216696@qq.com>
Date: Mon, 02 Feb 2026 18:18:09 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
drone-service/drone-fw/src/main/java/org/sxkj/fw/area/controller/FwPoliceStationController.java | 88 ++++++++++++++++++++++++--------------------
1 files changed, 48 insertions(+), 40 deletions(-)
diff --git a/drone-service/drone-fw/src/main/java/org/sxkj/fw/area/controller/FwPoliceStationController.java b/drone-service/drone-fw/src/main/java/org/sxkj/fw/area/controller/FwPoliceStationController.java
index afa9b50..ee876f2 100644
--- a/drone-service/drone-fw/src/main/java/org/sxkj/fw/area/controller/FwPoliceStationController.java
+++ b/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;
@@ -73,25 +74,29 @@
FwPoliceStationEntity detail = fwPoliceStationService.getById(id);
return R.data(FwPoliceStationWrapper.build().entityVO(detail));
}
-// /**
-// * 派出所信息表 分页
-// */
-// @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));
-// return R.data(FwPoliceStationWrapper.build().pageVO(pages));
-// }
+ // /**
+ // * 派出所信息表 分页
+ // */
+ // @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));
+ // return R.data(FwPoliceStationWrapper.build().pageVO(pages));
+ // }
/**
* 派出所信息表 列表
*/
@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,30 +106,31 @@
@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);
}
-// /**
-// * 派出所信息表 新增
-// */
-// @PostMapping("/save")
-// @ApiOperationSupport(order = 4)
-// @ApiOperation(value = "新增", notes = "传入fwPoliceStation")
-// public R save(@Valid @RequestBody FwPoliceStationEntity fwPoliceStation) {
-// return R.status(fwPoliceStationService.save(fwPoliceStation));
-// }
-//
-// /**
-// * 派出所信息表 修改
-// */
-// @PostMapping("/update")
-// @ApiOperationSupport(order = 5)
-// @ApiOperation(value = "修改", notes = "传入fwPoliceStation")
-// public R update(@Valid @RequestBody FwPoliceStationEntity fwPoliceStation) {
-// return R.status(fwPoliceStationService.updateById(fwPoliceStation));
-// }
+ // /**
+ // * 派出所信息表 新增
+ // */
+ // @PostMapping("/save")
+ // @ApiOperationSupport(order = 4)
+ // @ApiOperation(value = "新增", notes = "传入fwPoliceStation")
+ // public R save(@Valid @RequestBody FwPoliceStationEntity fwPoliceStation) {
+ // return R.status(fwPoliceStationService.save(fwPoliceStation));
+ // }
+ //
+ // /**
+ // * 派出所信息表 修改
+ // */
+ // @PostMapping("/update")
+ // @ApiOperationSupport(order = 5)
+ // @ApiOperation(value = "修改", notes = "传入fwPoliceStation")
+ // public R update(@Valid @RequestBody FwPoliceStationEntity fwPoliceStation) {
+ // return R.status(fwPoliceStationService.updateById(fwPoliceStation));
+ // }
/**
* 派出所信息表 新增或修改
@@ -146,7 +152,6 @@
return R.status(fwPoliceStationService.deleteLogic(Func.toLongList(ids)));
}
-
/**
* 导出数据
*/
@@ -154,11 +159,14 @@
@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);
- //if (!AuthUtil.isAdministrator()) {
- // queryWrapper.lambda().eq(FwPoliceStation::getTenantId, bladeUser.getTenantId());
- //}
+ 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(FwPoliceStationEntity::getIsDeleted, BladeConstant.DB_NOT_DELETED);
List<FwPoliceStationExcel> list = fwPoliceStationService.exportFwPoliceStation(queryWrapper);
ExcelUtil.export(response, "派出所信息表数据" + DateUtil.time(), "派出所信息表数据表", list, FwPoliceStationExcel.class);
--
Gitblit v1.9.3