Merge remote-tracking branch 'origin/master'

linwei

2026-01-09 bbc3d8a4b43256e6cafefc7ab33f34e1459aed9b

 drone-service/drone-fw/src/main/java/org/sxkj/fw/device/controller/FwDeviceMaintainPlanController.java

@@ -16,40 +16,41 @@
 */
package org.sxkj.fw.device.controller;

import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiParam;
import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
import lombok.AllArgsConstructor;
import javax.validation.Valid;

import org.springblade.core.secure.BladeUser;
import org.springblade.core.boot.ctrl.BladeController;
import org.springblade.core.excel.util.ExcelUtil;
import org.springblade.core.mp.support.Condition;
import org.springblade.core.mp.support.Query;
import org.springblade.core.secure.BladeUser;
import org.springblade.core.tool.api.R;
import org.springblade.core.tool.constant.BladeConstant;
import org.springblade.core.tool.utils.DateUtil;
import org.springblade.core.tool.utils.Func;
import org.springframework.web.bind.annotation.*;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import org.sxkj.fw.device.dto.FwDeviceMaintainPlanDTO;
import org.sxkj.fw.device.entity.FwDeviceMaintainPlanEntity;
import org.sxkj.fw.device.vo.FwDeviceMaintainPlanVO;
import org.sxkj.fw.device.excel.FwDeviceMaintainPlanExcel;
import org.sxkj.fw.device.wrapper.FwDeviceMaintainPlanWrapper;
import org.sxkj.fw.device.service.IFwDeviceMaintainPlanService;
import org.springblade.core.boot.ctrl.BladeController;
import org.springblade.core.tool.utils.DateUtil;
import org.springblade.core.excel.util.ExcelUtil;
import org.springblade.core.tool.constant.BladeConstant;
import org.sxkj.fw.device.vo.FwDeviceMaintainPlanVO;
import org.sxkj.fw.device.wrapper.FwDeviceMaintainPlanWrapper;
import springfox.documentation.annotations.ApiIgnore;
import java.util.Map;
import java.util.List;

import javax.servlet.http.HttpServletResponse;
import javax.validation.Valid;
import java.util.List;
import java.util.Map;

/**
 * 设备维护计划表 控制器
 *
 * @author lw
 * @since 2026-01-07
 * @author Aix
 * @since 2026-01-09
 */
@RestController
@AllArgsConstructor
@@ -65,67 +66,47 @@
   @GetMapping("/detail")
   @ApiOperationSupport(order = 1)
   @ApiOperation(value = "详情", notes = "传入fwDeviceMaintainPlan")
   public R<FwDeviceMaintainPlanVO> detail(FwDeviceMaintainPlanEntity fwDeviceMaintainPlan) {
      FwDeviceMaintainPlanEntity detail = fwDeviceMaintainPlanService.getOne(Condition.getQueryWrapper(fwDeviceMaintainPlan));
      return R.data(FwDeviceMaintainPlanWrapper.build().entityVO(detail));
   }
   /**
    * 设备维护计划表 分页
    */
   @GetMapping("/list")
   @ApiOperationSupport(order = 2)
   @ApiOperation(value = "分页", notes = "传入fwDeviceMaintainPlan")
   public R<IPage<FwDeviceMaintainPlanVO>> list(@ApiIgnore @RequestParam Map<String, Object> fwDeviceMaintainPlan, Query query) {
      IPage<FwDeviceMaintainPlanEntity> pages = fwDeviceMaintainPlanService.page(Condition.getPage(query), Condition.getQueryWrapper(fwDeviceMaintainPlan, FwDeviceMaintainPlanEntity.class));
      return R.data(FwDeviceMaintainPlanWrapper.build().pageVO(pages));
   public R<FwDeviceMaintainPlanVO> detail(FwDeviceMaintainPlanDTO fwDeviceMaintainPlan) {
      if (fwDeviceMaintainPlan.getId() == null) {
         return R.fail("参数错误");
      }

      FwDeviceMaintainPlanVO detailVO = fwDeviceMaintainPlanService.getFwDeviceMaintainPlanById(fwDeviceMaintainPlan.getId());
      if (detailVO == null) {
         return R.fail("数据不存在");
      }
      return R.data(detailVO);
   }

   /**
    * 设备维护计划表 自定义分页
    */
   @GetMapping("/page")
   @ApiOperationSupport(order = 3)
   @ApiOperationSupport(order = 2)
   @ApiOperation(value = "分页", notes = "传入fwDeviceMaintainPlan")
   public R<IPage<FwDeviceMaintainPlanVO>> page(FwDeviceMaintainPlanVO fwDeviceMaintainPlan, Query query) {
   public R<IPage<FwDeviceMaintainPlanVO>> page(FwDeviceMaintainPlanDTO fwDeviceMaintainPlan, Query query) {
      IPage<FwDeviceMaintainPlanVO> pages = fwDeviceMaintainPlanService.selectFwDeviceMaintainPlanPage(Condition.getPage(query), fwDeviceMaintainPlan);
      return R.data(pages);
   }

   /**
    * 设备维护计划表 新增
    */
   @PostMapping("/save")
   @ApiOperationSupport(order = 4)
   @ApiOperation(value = "新增", notes = "传入fwDeviceMaintainPlan")
   public R save(@Valid @RequestBody FwDeviceMaintainPlanEntity fwDeviceMaintainPlan) {
      return R.status(fwDeviceMaintainPlanService.save(fwDeviceMaintainPlan));
   }

   /**
    * 设备维护计划表 修改
    */
   @PostMapping("/update")
   @ApiOperationSupport(order = 5)
   @ApiOperation(value = "修改", notes = "传入fwDeviceMaintainPlan")
   public R update(@Valid @RequestBody FwDeviceMaintainPlanEntity fwDeviceMaintainPlan) {
      return R.status(fwDeviceMaintainPlanService.updateById(fwDeviceMaintainPlan));
   }

   /**
    * 设备维护计划表 新增或修改
    */
   @PostMapping("/submit")
   @ApiOperationSupport(order = 6)
   @ApiOperationSupport(order = 3)
   @ApiOperation(value = "新增或修改", notes = "传入fwDeviceMaintainPlan")
   public R submit(@Valid @RequestBody FwDeviceMaintainPlanEntity fwDeviceMaintainPlan) {
      return R.status(fwDeviceMaintainPlanService.saveOrUpdate(fwDeviceMaintainPlan));
   public R submit(@Valid @RequestBody FwDeviceMaintainPlanDTO fwDeviceMaintainPlan) {
      if (null == fwDeviceMaintainPlan.getDeviceId()) {
         return R.fail("参数错误");
      }
      return R.status(fwDeviceMaintainPlanService.saveOrUpdate(FwDeviceMaintainPlanWrapper.build().entityDTO(fwDeviceMaintainPlan)));
   }

   /**
    * 设备维护计划表 删除
    */
   @PostMapping("/remove")
   @ApiOperationSupport(order = 7)
   @ApiOperationSupport(order = 4)
   @ApiOperation(value = "逻辑删除", notes = "传入ids")
   public R remove(@ApiParam(value = "主键集合", required = true) @RequestParam String ids) {
      return R.status(fwDeviceMaintainPlanService.deleteLogic(Func.toLongList(ids)));
@@ -136,8 +117,9 @@
    * 导出数据
    */
   @GetMapping("/export-fwDeviceMaintainPlan")
   @ApiOperationSupport(order = 9)
   @ApiOperationSupport(order = 5)
   @ApiOperation(value = "导出数据", notes = "传入fwDeviceMaintainPlan")
   @ApiIgnore
   public void exportFwDeviceMaintainPlan(@ApiIgnore @RequestParam Map<String, Object> fwDeviceMaintainPlan, BladeUser bladeUser, HttpServletResponse response) {
      QueryWrapper<FwDeviceMaintainPlanEntity> queryWrapper = Condition.getQueryWrapper(fwDeviceMaintainPlan, FwDeviceMaintainPlanEntity.class);
      //if (!AuthUtil.isAdministrator()) {