chenxudong
/
electromagnetic-data-new
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

增加templatecode，优化代码。

This commit is contained in:
chenxudong 2025-05-13 09:04:23 +08:00
parent d50a189cb7
commit 0cb00f06bf
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/controller/SysEdFileInfoController.java
View File

@ -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);
}
}

2
electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/service/EdFileInfoService.java
View File

@ -247,5 +247,5 @@ public interface EdFileInfoService {
/**
* 导入工程
*/
ElectromagneticResult<?> importPrj(MultipartFile file);
ElectromagneticResult<?> importPrj(MultipartFile file, String templateCode);
}

4
electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/service/serviceimpl/EdFileInfoServiceImpl.java
View File

@ -1517,13 +1517,13 @@ public class EdFileInfoServiceImpl extends ServiceImpl<EdFileInfoMapper, EdFileI
*/
@Override
@Transactional(rollbackFor = Exception.class)
public ElectromagneticResult<?> 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);
// 工程发布