From 0cb00f06bfd4b21bf6702e12b8f748871ac2d2b7 Mon Sep 17 00:00:00 2001 From: chenxudong Date: Tue, 13 May 2025 09:04:23 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0templatecode=EF=BC=8C?= =?UTF-8?q?=E4=BC=98=E5=8C=96=E4=BB=A3=E7=A0=81=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../software/manage/controller/SysEdFileInfoController.java | 4 ++-- .../industry/software/manage/service/EdFileInfoService.java | 2 +- .../manage/service/serviceimpl/EdFileInfoServiceImpl.java | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/controller/SysEdFileInfoController.java b/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/controller/SysEdFileInfoController.java index 4c4fa1e..fd9fda8 100644 --- a/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/controller/SysEdFileInfoController.java +++ b/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/controller/SysEdFileInfoController.java @@ -210,8 +210,8 @@ public class SysEdFileInfoController { */ @GetMapping("/importPrj") @UserOperation(value = "导入本地工程", modelName = UserOperationModuleEnum.SYS_PRJ_DATABASE) - public ElectromagneticResult importPrj(@RequestParam("file") MultipartFile file) { - return edFileInfoService.importPrj(file); + public ElectromagneticResult importPrj(@RequestParam("file") MultipartFile file, @RequestParam(name = "templateCode", defaultValue = "bhdcfzrjzt", required = false) String templateCode) { + return edFileInfoService.importPrj(file, templateCode); } } diff --git a/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/service/EdFileInfoService.java b/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/service/EdFileInfoService.java index 517d026..9671972 100644 --- a/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/service/EdFileInfoService.java +++ b/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/service/EdFileInfoService.java @@ -247,5 +247,5 @@ public interface EdFileInfoService { /** * 导入工程 */ - ElectromagneticResult importPrj(MultipartFile file); + ElectromagneticResult importPrj(MultipartFile file, String templateCode); } diff --git a/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/service/serviceimpl/EdFileInfoServiceImpl.java b/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/service/serviceimpl/EdFileInfoServiceImpl.java index c2d4426..717967f 100644 --- a/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/service/serviceimpl/EdFileInfoServiceImpl.java +++ b/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/service/serviceimpl/EdFileInfoServiceImpl.java @@ -1517,13 +1517,13 @@ public class EdFileInfoServiceImpl extends ServiceImpl importPrj(MultipartFile file) { + public ElectromagneticResult importPrj(MultipartFile file, String templateCode) { try { // 创建工程 String prjId = updateImportPrj2Db(file); // 层级沿用，先这样写，后续根据需求扩展 EdFileInfo prj = this.baseMapper.selectOne(Wrappers.lambdaQuery(EdFileInfo.class) - .eq(EdFileInfo::getTemplateCode, "bhdcfzrjzt") + .eq(EdFileInfo::getTemplateCode, templateCode) .eq(EdFileInfo::getEffectFlag, EffectFlagEnum.EFFECT.code)); commonService.follow(prj.getId(), prjId, DataOwnEnum.SYS_PRJ.code); // 工程发布