Merge remote-tracking branch 'origin/master'

无关风月

2 天以前 60afc1c228318d136a273cd0b389217f87583277

 ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/AssetRepairRecordController.java

@@ -1,8 +1,31 @@
package com.ruoyi.web.controller.api;


import com.baomidou.mybatisplus.core.metadata.IPage;
import com.ruoyi.common.core.domain.R;
import com.ruoyi.common.utils.SecurityUtils;
import com.ruoyi.system.constants.AssetDeptConstant;
import com.ruoyi.system.dto.AssetRepairRecordAddDTO;
import com.ruoyi.system.dto.asset.AssetRepairCompleteDTO;
import com.ruoyi.system.query.AssetRepairRecordPageQuery;
import com.ruoyi.system.service.AssetRepairRecordService;
import com.ruoyi.system.service.ISysUserService;
import com.ruoyi.system.vo.asset.AssetRepairRecordDetailVO;
import com.ruoyi.system.vo.asset.AssetRepairRecordPageVO;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiParam;
import lombok.RequiredArgsConstructor;
import org.springframework.context.annotation.Lazy;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.DeleteMapping;
import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;

import javax.validation.Valid;

/**
 * <p>
@@ -12,9 +35,72 @@
 * @author WuGuanFengYue
 * @since 2025-09-15
 */
@Validated
@RestController
@Api(tags = {"资产维修记录相关接口"})
@RequiredArgsConstructor(onConstructor_ = {@Lazy})
@RequestMapping("/asset-repair-record")
public class AssetRepairRecordController {

    private final AssetRepairRecordService assetRepairRecordService;
    private final ISysUserService sysUserService;

    @ApiOperation("获取维修记录分页列表")
    @PostMapping("/page-list")
    public R<IPage<AssetRepairRecordPageVO>> getRepairRecordPageList(@RequestBody AssetRepairRecordPageQuery pageQuery) {
        // 数据权限：超级管理员/资产管理部查看所有数据，其他部门查看当前及下级部门的数据
        Long userId = SecurityUtils.getUserId();
        boolean isAdmin = SecurityUtils.isAdmin(userId);

        if (!isAdmin) {
            try {
                // 获取当前用户的部门名称
                String deptName = sysUserService.selectUserById(userId).getDept().getDeptName();

                // 非超级管理员且非资产管理部，设置部门权限
                if (!AssetDeptConstant.ASSET_DEPARTMENT_NAME.equals(deptName)) {
                    pageQuery.setDeptId(Integer.valueOf(SecurityUtils.getLoginUser().getDeptId()));
                }
            } catch (Exception e) {
                // 如果获取部门信息失败，默认设置部门权限
                try {
                    pageQuery.setDeptId(Integer.valueOf(SecurityUtils.getLoginUser().getDeptId()));
                } catch (Exception ex) {
                    // ignore parse, leave null if cannot parse
                }
            }
        }

        IPage<AssetRepairRecordPageVO> page = assetRepairRecordService.getRepairRecordPageList(pageQuery);
        return R.ok(page);
    }

    @ApiOperation("新增维修记录")
    @PostMapping("/add")
    public R<?> addRepairRecord(@Valid @RequestBody AssetRepairRecordAddDTO addDTO) {
        assetRepairRecordService.addRepairRecord(addDTO);
        return R.ok();
    }

    @ApiOperation("获取维修记录详情")
    @PostMapping("/detail/{id}")
    public R<AssetRepairRecordDetailVO> getRepairRecordDetail(  @ApiParam(name = "id",value = "维修记录ID") @PathVariable Integer id) {
        AssetRepairRecordDetailVO detail = assetRepairRecordService.getRepairRecordDetail(id);
        return R.ok(detail);
    }

    @ApiOperation("完成维修")
    @PostMapping("/complete")
    public R<?> completeRepair(@Valid @RequestBody AssetRepairCompleteDTO dto) {
        assetRepairRecordService.completeRepair(dto);
        return R.ok();
    }

    @ApiOperation("删除")
    @DeleteMapping("/{id}")
    public R<?> deleteById(@ApiParam(name = "id",value = "维修记录ID")@PathVariable Integer id){
        assetRepairRecordService.deleteById(id);
        return R.ok();
    }
}