From cf058a173431d0c45c1a6b1582c7a634d5ddbac8 Mon Sep 17 00:00:00 2001 From: zjh <15615273395@163.com> Date: Tue, 2 Dec 2025 17:19:38 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=AF=B9=E6=A0=87=E6=8A=A5?= =?UTF-8?q?=E5=91=8A=E7=9A=84=E9=99=84=E4=BB=B6=E4=B8=8A=E4=BC=A0=E9=97=AE?= =?UTF-8?q?=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../BenchmarkingReportController.java | 12 ++++++++++++ .../controller/PermissionController.java | 10 ++++++++++ .../form/SaveBenchmarkingReportForm.java | 3 ++- .../self_development/pojo/Permissions.java | 19 +++++++++++++++++++ .../com/xdap/self_development/pojo/Role.java | 18 ++++++++++++++++++ .../pojo/RoleAndPermissions.java | 18 ++++++++++++++++++ .../self_development/pojo/UserAndRoles.java | 18 ++++++++++++++++++ .../self_development/pojo/permissions.java | 4 ---- .../com/xdap/self_development/pojo/role.java | 4 ---- .../service/BenchmarkingReportService.java | 3 +++ .../impl/BenchmarkingReportServiceImpl.java | 13 +++---------- 11 files changed, 103 insertions(+), 19 deletions(-) create mode 100644 src/main/java/com/xdap/self_development/controller/PermissionController.java create mode 100644 src/main/java/com/xdap/self_development/pojo/Permissions.java create mode 100644 src/main/java/com/xdap/self_development/pojo/Role.java create mode 100644 src/main/java/com/xdap/self_development/pojo/RoleAndPermissions.java create mode 100644 src/main/java/com/xdap/self_development/pojo/UserAndRoles.java delete mode 100644 src/main/java/com/xdap/self_development/pojo/permissions.java delete mode 100644 src/main/java/com/xdap/self_development/pojo/role.java diff --git a/src/main/java/com/xdap/self_development/controller/BenchmarkingReportController.java b/src/main/java/com/xdap/self_development/controller/BenchmarkingReportController.java index ff86e5a..0d7c9d2 100644 --- a/src/main/java/com/xdap/self_development/controller/BenchmarkingReportController.java +++ b/src/main/java/com/xdap/self_development/controller/BenchmarkingReportController.java @@ -11,10 +11,12 @@ import com.xdap.self_development.pojo.view.TodoAndReportView; import com.xdap.self_development.service.BenchmarkingReportService; import org.springframework.validation.BindingResult; import org.springframework.web.bind.annotation.*; +import org.springframework.web.multipart.MultipartFile; import javax.annotation.Resource; import javax.validation.Valid; import javax.validation.constraints.NotBlank; +import javax.validation.constraints.NotNull; import java.util.List; @RestController @@ -23,6 +25,16 @@ public class BenchmarkingReportController { @Resource private BenchmarkingReportService benchmarkingReportService; + // 上传附件 + @PostMapping("/uploadFile") + public Response uploadFile( + @NotNull @RequestPart MultipartFile file, + @NotBlank @RequestPart String createBy + ) { + String fileUrl = benchmarkingReportService.uploadFile(file, createBy); + return Response.ok().data(fileUrl); + } + // 新增对标报告并发起审批 @PostMapping("/startReportApproval") public Response startReportApproval( diff --git a/src/main/java/com/xdap/self_development/controller/PermissionController.java b/src/main/java/com/xdap/self_development/controller/PermissionController.java new file mode 100644 index 0000000..942e1b2 --- /dev/null +++ b/src/main/java/com/xdap/self_development/controller/PermissionController.java @@ -0,0 +1,10 @@ +package com.xdap.self_development.controller; + +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +@RestController +@RequestMapping("/custom/permission") +public class PermissionController { + // 查看 +} diff --git a/src/main/java/com/xdap/self_development/controller/form/SaveBenchmarkingReportForm.java b/src/main/java/com/xdap/self_development/controller/form/SaveBenchmarkingReportForm.java index c8931f5..e4e0ec2 100644 --- a/src/main/java/com/xdap/self_development/controller/form/SaveBenchmarkingReportForm.java +++ b/src/main/java/com/xdap/self_development/controller/form/SaveBenchmarkingReportForm.java @@ -1,6 +1,7 @@ package com.xdap.self_development.controller.form; import lombok.Data; +import org.springframework.web.bind.annotation.RequestPart; import org.springframework.web.multipart.MultipartFile; import javax.validation.constraints.NotBlank; @@ -36,7 +37,7 @@ public class SaveBenchmarkingReportForm { @NotBlank(message = "项目编号不能为空") private String projectNumber; - private MultipartFile file; + private String fileUrl; @NotEmpty(message = "校对人员不能为空") private List proofreadUsers; diff --git a/src/main/java/com/xdap/self_development/pojo/Permissions.java b/src/main/java/com/xdap/self_development/pojo/Permissions.java new file mode 100644 index 0000000..9732b84 --- /dev/null +++ b/src/main/java/com/xdap/self_development/pojo/Permissions.java @@ -0,0 +1,19 @@ +package com.xdap.self_development.pojo; + +import com.definesys.mpaas.query.annotation.RowID; +import com.definesys.mpaas.query.annotation.RowIDType; +import com.definesys.mpaas.query.annotation.Table; +import com.definesys.mpaas.query.model.MpaasBasePojo; +import lombok.Data; +import lombok.EqualsAndHashCode; + +@EqualsAndHashCode(callSuper = true) +@Data +@Table("yfsjglpt_model_permissions") +public class Permissions extends MpaasBasePojo { + @RowID(value = "permissions_s", type = RowIDType.UUID) + private String id; + private String permissionName; + private String permPath; + private String description; +} diff --git a/src/main/java/com/xdap/self_development/pojo/Role.java b/src/main/java/com/xdap/self_development/pojo/Role.java new file mode 100644 index 0000000..2d7f79c --- /dev/null +++ b/src/main/java/com/xdap/self_development/pojo/Role.java @@ -0,0 +1,18 @@ +package com.xdap.self_development.pojo; + +import com.definesys.mpaas.query.annotation.RowID; +import com.definesys.mpaas.query.annotation.RowIDType; +import com.definesys.mpaas.query.annotation.Table; +import com.definesys.mpaas.query.model.MpaasBasePojo; +import lombok.Data; +import lombok.EqualsAndHashCode; + +@EqualsAndHashCode(callSuper = true) +@Data +@Table("yfsjglpt_model_roles") +public class Role extends MpaasBasePojo { + @RowID(value = "roles_s", type = RowIDType.UUID) + private String id; + private String roleName; + private String description; +} diff --git a/src/main/java/com/xdap/self_development/pojo/RoleAndPermissions.java b/src/main/java/com/xdap/self_development/pojo/RoleAndPermissions.java new file mode 100644 index 0000000..7a6eb96 --- /dev/null +++ b/src/main/java/com/xdap/self_development/pojo/RoleAndPermissions.java @@ -0,0 +1,18 @@ +package com.xdap.self_development.pojo; + +import com.definesys.mpaas.query.annotation.RowID; +import com.definesys.mpaas.query.annotation.RowIDType; +import com.definesys.mpaas.query.annotation.Table; +import com.definesys.mpaas.query.model.MpaasBasePojo; +import lombok.Data; +import lombok.EqualsAndHashCode; + +@EqualsAndHashCode(callSuper = true) +@Data +@Table("yfsjglpt_model_role_permissions") +public class RoleAndPermissions extends MpaasBasePojo { + @RowID(value = "role_permissions_s", type = RowIDType.UUID) + private String id; + private String roleId; + private String permissionId; +} diff --git a/src/main/java/com/xdap/self_development/pojo/UserAndRoles.java b/src/main/java/com/xdap/self_development/pojo/UserAndRoles.java new file mode 100644 index 0000000..54da3aa --- /dev/null +++ b/src/main/java/com/xdap/self_development/pojo/UserAndRoles.java @@ -0,0 +1,18 @@ +package com.xdap.self_development.pojo; + +import com.definesys.mpaas.query.annotation.RowID; +import com.definesys.mpaas.query.annotation.RowIDType; +import com.definesys.mpaas.query.annotation.Table; +import com.definesys.mpaas.query.model.MpaasBasePojo; +import lombok.Data; +import lombok.EqualsAndHashCode; + +@EqualsAndHashCode(callSuper = true) +@Data +@Table("yfsjglpt_model_user_roles") +public class UserAndRoles extends MpaasBasePojo { + @RowID(value = "user_roles_s", type = RowIDType.UUID) + private String id; + private String roleId; + private String userId; +} diff --git a/src/main/java/com/xdap/self_development/pojo/permissions.java b/src/main/java/com/xdap/self_development/pojo/permissions.java deleted file mode 100644 index 7991a5d..0000000 --- a/src/main/java/com/xdap/self_development/pojo/permissions.java +++ /dev/null @@ -1,4 +0,0 @@ -package com.xdap.self_development.pojo; - -public class permissions { -} diff --git a/src/main/java/com/xdap/self_development/pojo/role.java b/src/main/java/com/xdap/self_development/pojo/role.java deleted file mode 100644 index e631f09..0000000 --- a/src/main/java/com/xdap/self_development/pojo/role.java +++ /dev/null @@ -1,4 +0,0 @@ -package com.xdap.self_development.pojo; - -public class role { -} diff --git a/src/main/java/com/xdap/self_development/service/BenchmarkingReportService.java b/src/main/java/com/xdap/self_development/service/BenchmarkingReportService.java index 256b19a..2840080 100644 --- a/src/main/java/com/xdap/self_development/service/BenchmarkingReportService.java +++ b/src/main/java/com/xdap/self_development/service/BenchmarkingReportService.java @@ -6,6 +6,7 @@ import com.xdap.self_development.controller.form.SaveBenchmarkingReportForm; import com.xdap.self_development.pojo.BenchmarkingReport; import com.xdap.self_development.pojo.view.ApprovalFlowView; import com.xdap.self_development.pojo.view.TodoAndReportView; +import org.springframework.web.multipart.MultipartFile; import javax.validation.Valid; import javax.validation.constraints.NotBlank; @@ -21,4 +22,6 @@ public interface BenchmarkingReportService { BenchmarkingReport getReportDetail(@NotBlank String reportId); ApprovalFlowView getReportProcess(@NotBlank String flowId); + + String uploadFile(MultipartFile file, @NotBlank String createBy); } diff --git a/src/main/java/com/xdap/self_development/service/impl/BenchmarkingReportServiceImpl.java b/src/main/java/com/xdap/self_development/service/impl/BenchmarkingReportServiceImpl.java index fd59a5e..d80a716 100644 --- a/src/main/java/com/xdap/self_development/service/impl/BenchmarkingReportServiceImpl.java +++ b/src/main/java/com/xdap/self_development/service/impl/BenchmarkingReportServiceImpl.java @@ -62,17 +62,9 @@ public class BenchmarkingReportServiceImpl implements BenchmarkingReportService @Transactional public void saveBenchmarkingReport(SaveBenchmarkingReportForm form) { // 1. 创建对标报告并保存 - String realUrl = ""; - if (form.getFile() != null) { - realUrl = uploadFile(form.getFile(), form.getCreateBy()); - if (realUrl.isEmpty()) { - throw new MpaasBusinessException("附件上传失败"); - } - } - BenchmarkingReport report = new BenchmarkingReport(); BeanUtils.copyProperties(form, report); - report.setFilePath(realUrl); + report.setFilePath(form.getFileUrl() == null ? "" : form.getFileUrl()); report.setUploadTime(Timestamp.valueOf(LocalDateTime.now())); report.setStatus("APPROVING"); report.setCreateBy(form.getCreateBy()); @@ -98,7 +90,8 @@ public class BenchmarkingReportServiceImpl implements BenchmarkingReportService }); } - private String uploadFile(MultipartFile file, String userId) { + @Override + public String uploadFile(MultipartFile file, String userId) { String currentTenantId = runtimeAppContextService.getCurrentTenantId(); AppTokenDTO token = apaasMyTokenFeign.getAppToken( "client_credentials",