update-区域划分表结构调整

xiebin

2026-01-28 74756c657109a4e48dd6c0b4d8959cdab89b33a9

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

@@ -49,7 +49,7 @@
 * 派出所信息表 控制器
 *
 * @author lw
 * @since 2026-01-07
 * @since 2026-01-08
 */
@RestController
@AllArgsConstructor
@@ -64,20 +64,34 @@
    */
   @GetMapping("/detail")
   @ApiOperationSupport(order = 1)
   @ApiOperation(value = "详情", notes = "传入fwPoliceStation")
   public R<FwPoliceStationVO> detail(FwPoliceStationEntity fwPoliceStation) {
      FwPoliceStationEntity detail = fwPoliceStationService.getOne(Condition.getQueryWrapper(fwPoliceStation));
   @ApiOperation(value = "详情", notes = "传入id")
   public R<FwPoliceStationVO> detail(@ApiParam(value = "主键id", required = true) @RequestParam Long id) {
      if (id == null) {
         return R.fail("主键不能为空");
      }
      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));
   @ApiOperation(value = "列表", notes = "获取全部派出所")
   public R<List<FwPoliceStationVO>> list() {
      List<FwPoliceStationVO> list = fwPoliceStationService.selectFwPoliceStationList();
      return R.data(list);
   }

   /**
@@ -91,25 +105,25 @@
      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));
//   }

   /**
    * 派出所信息表 新增或修改
@@ -135,6 +149,7 @@
   /**
    * 导出数据
    */
   @ApiIgnore
   @GetMapping("/export-fwPoliceStation")
   @ApiOperationSupport(order = 9)
   @ApiOperation(value = "导出数据", notes = "传入fwPoliceStation")