Merge remote-tracking branch 'origin/binlog' into binlog

linwe

2024-09-03 764d883b5ea3bdc06abbec548b6df0511e567978

 src/main/java/org/springblade/modules/police/controller/PoliceAlarmRecordsController.java

@@ -23,9 +23,12 @@
import lombok.AllArgsConstructor;
import javax.validation.Valid;

import org.springblade.core.log.annotation.ApiLog;
import org.springblade.core.log.logger.BladeLogger;
import org.springblade.core.mp.support.Condition;
import org.springblade.core.mp.support.Query;
import org.springblade.core.tool.api.R;
import org.springblade.core.tool.jackson.JsonUtil;
import org.springblade.core.tool.utils.Func;
import org.springframework.web.bind.annotation.*;
import com.baomidou.mybatisplus.core.metadata.IPage;
@@ -48,6 +51,7 @@
public class PoliceAlarmRecordsController extends BladeController {

   private final IPoliceAlarmRecordsService policeAlarmRecordsService;
   private final BladeLogger bladeLogger;

   /**
    * 报警记录 详情
@@ -55,9 +59,9 @@
   @GetMapping("/detail")
   @ApiOperationSupport(order = 1)
   @ApiOperation(value = "详情", notes = "传入policeAlarmRecords")
   public R<PoliceAlarmRecordsVO> detail(PoliceAlarmRecordsEntity policeAlarmRecords) {
   public R detail(PoliceAlarmRecordsEntity policeAlarmRecords) {
      PoliceAlarmRecordsEntity detail = policeAlarmRecordsService.getOne(Condition.getQueryWrapper(policeAlarmRecords));
      return R.data(PoliceAlarmRecordsWrapper.build().entityVO(detail));
      return R.data(detail);
   }
   /**
    * 报警记录 分页
@@ -74,9 +78,11 @@
    * 报警记录 自定义分页
    */
   @GetMapping("/page")
   @ApiLog("报警记录 自定义分页")
   @ApiOperationSupport(order = 3)
   @ApiOperation(value = "分页", notes = "传入policeAlarmRecords")
   public R<IPage<PoliceAlarmRecordsVO>> page(PoliceAlarmRecordsVO policeAlarmRecords, Query query) {
      bladeLogger.info("报警记录 自定义分页", JsonUtil.toJson(policeAlarmRecords));
      IPage<PoliceAlarmRecordsVO> pages = policeAlarmRecordsService.selectPoliceAlarmRecordsPage(Condition.getPage(query), policeAlarmRecords);
      return R.data(pages);
   }
@@ -86,8 +92,10 @@
    */
   @PostMapping("/save")
   @ApiOperationSupport(order = 4)
   @ApiLog("报警记录 新增")
   @ApiOperation(value = "新增", notes = "传入policeAlarmRecords")
   public R save(@Valid @RequestBody PoliceAlarmRecordsEntity policeAlarmRecords) {
      bladeLogger.info("报警记录 新增", JsonUtil.toJson(policeAlarmRecords));
      return R.status(policeAlarmRecordsService.savePoliceAlarmRecordsEntity(policeAlarmRecords));
   }

@@ -95,9 +103,11 @@
    * 报警记录 修改
    */
   @PostMapping("/update")
   @ApiLog("报警记录 修改")
   @ApiOperationSupport(order = 5)
   @ApiOperation(value = "修改", notes = "传入policeAlarmRecords")
   public R update(@Valid @RequestBody PoliceAlarmRecordsEntity policeAlarmRecords) {
      bladeLogger.info("报警记录 修改", JsonUtil.toJson(policeAlarmRecords));
      return R.status(policeAlarmRecordsService.updateById(policeAlarmRecords));
   }

@@ -116,8 +126,10 @@
    */
   @PostMapping("/remove")
   @ApiOperationSupport(order = 7)
   @ApiLog("报警记录 删除")
   @ApiOperation(value = "逻辑删除", notes = "传入ids")
   public R remove(@ApiParam(value = "主键集合", required = true) @RequestParam String ids) {
      bladeLogger.info("报警记录 删除", JsonUtil.toJson(ids));
      return R.status(policeAlarmRecordsService.removeBatchByIds(Func.toLongList(ids)));
   }