Merge remote-tracking branch 'origin/master'

linwei

2026-02-02 1bfbc52da47b22f00a1c1f5f670c30f70d999873

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

@@ -33,9 +33,9 @@
import com.baomidou.mybatisplus.core.metadata.IPage;
import org.sxkj.fw.area.dto.FwDefenseSceneManageDTO;
import org.sxkj.fw.area.entity.FwDefenseSceneManageEntity;
import org.sxkj.fw.area.param.FwDefenseSceneManagePageParam;
import org.sxkj.fw.area.vo.FwDefenseSceneManageVO;
import org.sxkj.fw.area.excel.FwDefenseSceneManageExcel;
import org.sxkj.fw.area.wrapper.FwDefenseSceneManageWrapper;
import org.sxkj.fw.area.service.IFwDefenseSceneManageService;
import org.springblade.core.boot.ctrl.BladeController;
import org.springblade.core.tool.utils.DateUtil;
@@ -43,9 +43,11 @@
import org.springblade.core.tool.constant.BladeConstant;
import org.sxkj.fw.common.GenericConverter;
import org.sxkj.fw.common.IdParam;
import org.springframework.format.annotation.DateTimeFormat;
import springfox.documentation.annotations.ApiIgnore;
import java.util.Map;
import java.util.List;
import java.util.Date;
import javax.servlet.http.HttpServletResponse;

/**
@@ -69,10 +71,11 @@
   @ApiOperationSupport(order = 1)
   @ApiOperation(value = "详情", notes = "传入fwDefenseSceneManage")
   public R<FwDefenseSceneManageVO> detail(IdParam idParam) {
      FwDefenseSceneManageEntity detail = fwDefenseSceneManageService.getOne(
         Condition.getQueryWrapper(
            GenericConverter.convert(idParam, FwDefenseSceneManageEntity.class)));
      return R.data(FwDefenseSceneManageWrapper.build().entityVO(detail));
      if (idParam == null || idParam.getId() == null) {
         return R.fail("主键不能为空");
      }
      FwDefenseSceneManageVO detail = fwDefenseSceneManageService.selectFwDefenseSceneManageDetail(idParam.getId());
      return R.data(detail);
   }

   /**
@@ -80,10 +83,23 @@
    */
   @GetMapping("/page")
   @ApiOperationSupport(order = 3)
   @ApiOperation(value = "分页", notes = "传入fwDefenseSceneManage")
   public R<IPage<FwDefenseSceneManageVO>> page(FwDefenseSceneManageDTO fwDefenseSceneManage, Query query) {
      IPage<FwDefenseSceneManageVO> pages = fwDefenseSceneManageService.selectFwDefenseSceneManagePage(Condition.getPage(query), fwDefenseSceneManage);
   @ApiOperation(value = "分页", notes = "传入fwDefenseSceneManagePageParam")
   public R<IPage<FwDefenseSceneManageVO>> page(FwDefenseSceneManagePageParam fwDefenseSceneManagePageParam, Query query) {
      IPage<FwDefenseSceneManageVO> pages = fwDefenseSceneManageService.selectFwDefenseSceneManagePage(Condition.getPage(query), fwDefenseSceneManagePageParam);
      return R.data(pages);
   }

   /**
    * 场景管理表 列表
    */
   @GetMapping("/list")
   @ApiOperationSupport(order = 4)
   @ApiOperation(value = "列表", notes = "传入time")
   public R<List<FwDefenseSceneManageVO>> list(
      @ApiParam(value = "时间筛选（yyyy-MM-dd HH:mm:ss）") @RequestParam(required = false) @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") Date time) {
      Date filterTime = time == null ? new Date() : time;
      List<FwDefenseSceneManageVO> list = fwDefenseSceneManageService.selectFwDefenseSceneManageList(filterTime);
      return R.data(list);
   }

   /**
@@ -93,7 +109,7 @@
   @ApiOperationSupport(order = 6)
   @ApiOperation(value = "新增或修改", notes = "传入fwDefenseSceneManage")
   public R submit(@Valid @RequestBody FwDefenseSceneManageDTO fwDefenseSceneManage) {
      return R.status(fwDefenseSceneManageService.saveOrUpdate(
      return R.status(fwDefenseSceneManageService.saveOrUpdateFwDefenseSceneManage(
         GenericConverter.convert(fwDefenseSceneManage, FwDefenseSceneManageEntity.class)));
   }

@@ -104,7 +120,7 @@
   @ApiOperationSupport(order = 7)
   @ApiOperation(value = "逻辑删除", notes = "传入ids")
   public R remove(@ApiParam(value = "主键集合", required = true) @RequestParam String ids) {
      return R.status(fwDefenseSceneManageService.deleteLogic(Func.toLongList(ids)));
      return R.status(fwDefenseSceneManageService.deleteFwDefenseSceneManage(Func.toLongList(ids)));
   }

   /**