优化代码
This commit is contained in:
parent
11ca563c93
commit
52cd102e82
|
|
@ -24,13 +24,13 @@ public class ImportPrjController {
|
||||||
private ImportPrjService importPrjService;
|
private ImportPrjService importPrjService;
|
||||||
|
|
||||||
@RequestMapping("/importPrj")
|
@RequestMapping("/importPrj")
|
||||||
@UserOperation(value = "导入本地工程", modelName = UserOperationModuleEnum.IMPORT_PFJ)
|
@UserOperation(value = "导入本地工程", modelName = UserOperationModuleEnum.IMPORT_PRJ)
|
||||||
public ElectromagneticResult<?> importPrj(@RequestParam("file") MultipartFile file) {
|
public ElectromagneticResult<?> importPrj(@RequestParam("file") MultipartFile file) {
|
||||||
return ElectromagneticResultUtil.success(importPrjService.importPrj(file));
|
return ElectromagneticResultUtil.success(importPrjService.importPrj(file));
|
||||||
}
|
}
|
||||||
|
|
||||||
@RequestMapping("/queryPrjInfo")
|
@RequestMapping("/queryPrjInfo")
|
||||||
@UserOperation(value = "查询导入工程列表", modelName = UserOperationModuleEnum.IMPORT_PFJ)
|
@UserOperation(value = "查询导入工程列表", modelName = UserOperationModuleEnum.IMPORT_PRJ)
|
||||||
public ElectromagneticResult<?> queryPrjInfo(@RequestParam(value = "pageNum", required = false) Integer pageNum,
|
public ElectromagneticResult<?> queryPrjInfo(@RequestParam(value = "pageNum", required = false) Integer pageNum,
|
||||||
@RequestParam(value = "pageSize", required = false) Integer pageSize) {
|
@RequestParam(value = "pageSize", required = false) Integer pageSize) {
|
||||||
pageNum = Optional.ofNullable(pageNum).orElse(1);
|
pageNum = Optional.ofNullable(pageNum).orElse(1);
|
||||||
|
|
@ -39,7 +39,7 @@ public class ImportPrjController {
|
||||||
}
|
}
|
||||||
|
|
||||||
@RequestMapping("/queryImportFileInfo")
|
@RequestMapping("/queryImportFileInfo")
|
||||||
@UserOperation(value = "查询导入工程文件和文件夹信息", modelName = UserOperationModuleEnum.IMPORT_PFJ)
|
@UserOperation(value = "查询导入工程文件和文件夹信息", modelName = UserOperationModuleEnum.IMPORT_PRJ)
|
||||||
public ElectromagneticResult<?> queryImportFileInfo(@RequestParam(value = "pageNum") Integer pageNum,
|
public ElectromagneticResult<?> queryImportFileInfo(@RequestParam(value = "pageNum") Integer pageNum,
|
||||||
@RequestParam(value = "pageSize") Integer pageSize,
|
@RequestParam(value = "pageSize") Integer pageSize,
|
||||||
@RequestParam("id") String id) {
|
@RequestParam("id") String id) {
|
||||||
|
|
@ -47,21 +47,21 @@ public class ImportPrjController {
|
||||||
}
|
}
|
||||||
|
|
||||||
@RequestMapping("/download")
|
@RequestMapping("/download")
|
||||||
@UserOperation(value = "下载工程文件", modelName = UserOperationModuleEnum.IMPORT_PFJ)
|
@UserOperation(value = "下载工程文件", modelName = UserOperationModuleEnum.IMPORT_PRJ)
|
||||||
public ResponseEntity<InputStreamResource> download(@RequestParam("id") String id,
|
public ResponseEntity<InputStreamResource> download(@RequestParam("id") String id,
|
||||||
HttpServletResponse response) {
|
HttpServletResponse response) {
|
||||||
return importPrjService.download(id, response);
|
return importPrjService.download(id, response);
|
||||||
}
|
}
|
||||||
|
|
||||||
@RequestMapping("/removePrj")
|
@RequestMapping("/removePrj")
|
||||||
@UserOperation(value = "删除工程", modelName = UserOperationModuleEnum.IMPORT_PFJ)
|
@UserOperation(value = "删除工程", modelName = UserOperationModuleEnum.IMPORT_PRJ)
|
||||||
public ElectromagneticResult<?> removePrj(@RequestParam("prjId") String prjId) {
|
public ElectromagneticResult<?> removePrj(@RequestParam("prjId") String prjId) {
|
||||||
return ElectromagneticResultUtil.success(importPrjService.removePrj(prjId));
|
return ElectromagneticResultUtil.success(importPrjService.removePrj(prjId));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
@RequestMapping("/tree")
|
@RequestMapping("/tree")
|
||||||
@UserOperation(value = "查询工程树", modelName = UserOperationModuleEnum.IMPORT_PFJ)
|
@UserOperation(value = "查询工程树", modelName = UserOperationModuleEnum.IMPORT_PRJ)
|
||||||
public ElectromagneticResult<?> tree(@RequestParam("prjId") String prjId) {
|
public ElectromagneticResult<?> tree(@RequestParam("prjId") String prjId) {
|
||||||
return ElectromagneticResultUtil.success(importPrjService.tree(prjId));
|
return ElectromagneticResultUtil.success(importPrjService.tree(prjId));
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -13,7 +13,7 @@ public enum UserOperationModuleEnum {
|
||||||
REPO_PRJ_DATABASE("repo_prj_database", "库数据管理"),
|
REPO_PRJ_DATABASE("repo_prj_database", "库数据管理"),
|
||||||
REPO_PRJ_SETTING("repo_prj_setting", "库数据层级定义"),
|
REPO_PRJ_SETTING("repo_prj_setting", "库数据层级定义"),
|
||||||
|
|
||||||
IMPORT_PFJ("import_pjr", "导入的工程数据"),
|
IMPORT_PRJ("import_pjr", "导入的工程数据"),
|
||||||
|
|
||||||
USER_PRJ("user_prj", "个人数据"),
|
USER_PRJ("user_prj", "个人数据"),
|
||||||
UNKNOWN("unknown", "未分组"),
|
UNKNOWN("unknown", "未分组"),
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue