feat(system): 优化用户搜索功能并完善ERP和MES模块验证逻辑

云

2026-10-25 d54fbc9d4f8981fa0f7f613b33a28a8cd4f764ea

 yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/md/workstation/MesMdWorkstationController.java

@@ -8,6 +8,8 @@
import cn.iocoder.yudao.framework.common.util.collection.MapUtils;
import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
import cn.iocoder.yudao.framework.excel.core.util.ExcelUtils;
import cn.iocoder.yudao.module.mes.controller.admin.md.workstation.vo.MesMdWorkstationImportExcelVO;
import cn.iocoder.yudao.module.mes.controller.admin.md.workstation.vo.MesMdWorkstationImportRespVO;
import cn.iocoder.yudao.module.mes.controller.admin.md.workstation.vo.MesMdWorkstationPageReqVO;
import cn.iocoder.yudao.module.mes.controller.admin.md.workstation.vo.MesMdWorkstationRespVO;
import cn.iocoder.yudao.module.mes.controller.admin.md.workstation.vo.MesMdWorkstationSaveReqVO;
@@ -19,6 +21,7 @@
import cn.iocoder.yudao.module.mes.service.pro.process.MesProProcessService;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.Parameter;
import io.swagger.v3.oas.annotations.Parameters;
import io.swagger.v3.oas.annotations.tags.Tag;
import jakarta.annotation.Resource;
import jakarta.servlet.http.HttpServletResponse;
@@ -26,6 +29,7 @@
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartFile;

import java.io.IOException;
import java.util.Collections;
@@ -104,6 +108,33 @@
        ExcelUtils.write(response, "工作站.xls", "数据", MesMdWorkstationRespVO.class, voList);
    }

    @GetMapping("/get-import-template")
    @Operation(summary = "获得工作站导入模板")
    public void importTemplate(HttpServletResponse response) throws IOException {
        // 手动创建导出 demo
        List<MesMdWorkstationImportExcelVO> list = Collections.singletonList(
                MesMdWorkstationImportExcelVO.builder().code("WK-001").name("示例工作站")
                        .address("A区1号线").workshopCode("WS-001").processCode("P-001")
                        .status(0).remark("").build()
        );
        // 输出
        ExcelUtils.write(response, "工作站导入模板.xls", "工作站列表", MesMdWorkstationImportExcelVO.class, list);
    }

    @PostMapping("/import")
    @Operation(summary = "导入工作站")
    @Parameters({
            @Parameter(name = "file", description = "Excel 文件", required = true),
            @Parameter(name = "updateSupport", description = "是否支持更新，默认为 false", example = "true")
    })
    @PreAuthorize("@ss.hasPermission('mes:md-workstation:import')")
    public CommonResult<MesMdWorkstationImportRespVO> importExcel(@RequestParam("file") MultipartFile file,
                                                                  @RequestParam(value = "updateSupport", required = false,
                                                                          defaultValue = "false") Boolean updateSupport) throws Exception {
        List<MesMdWorkstationImportExcelVO> list = ExcelUtils.read(file, MesMdWorkstationImportExcelVO.class);
        return success(workstationService.importWorkstationList(list, updateSupport));
    }

    // ==================== 拼接 VO ====================

    @SuppressWarnings("CodeBlock2Expr")