From 3c48d562a807ca25dc317e05805bbfa76c633f69 Mon Sep 17 00:00:00 2001 From: chen-xin-zhi <3588068430@qq.com> Date: Wed, 14 May 2025 19:37:40 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AE=8C=E6=88=90=E4=BA=86=E7=AC=AC=E4=B8=80?= =?UTF-8?q?=E7=89=88?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/project/ProjectController.java | 4 ++-- .../controller/project/ProjectDetailController.java | 3 +++ .../project/ProjectNotificationController.java | 13 +++++++++---- .../controller/project/PromoCodeController.java | 9 ++++++++- src/main/resources/templates/controller.java.vm | 5 ++--- 5 files changed, 24 insertions(+), 10 deletions(-) diff --git a/src/main/java/com/greenorange/promotion/controller/project/ProjectController.java b/src/main/java/com/greenorange/promotion/controller/project/ProjectController.java index b9777b2..05eebe8 100644 --- a/src/main/java/com/greenorange/promotion/controller/project/ProjectController.java +++ b/src/main/java/com/greenorange/promotion/controller/project/ProjectController.java @@ -192,10 +192,10 @@ public class ProjectController { @Operation(summary = "web端管理员添加项目", description = "参数：项目添加请求体，权限：管理员，方法名：addProject") @RequiresPermission(mustRole = UserConstant.ADMIN_ROLE) @SysLog(title = "项目管理", content = "web端管理员添加项目") - public BaseResponse addProject(@Valid @RequestBody ProjectAddRequest projectAddRequest) { + public BaseResponse addProject(@Valid @RequestBody ProjectAddRequest projectAddRequest) { Project project = commonService.copyProperties(projectAddRequest, Project.class); projectService.save(project); - return ResultUtils.success(true); + return ResultUtils.success(project.getId()); } /** diff --git a/src/main/java/com/greenorange/promotion/controller/project/ProjectDetailController.java b/src/main/java/com/greenorange/promotion/controller/project/ProjectDetailController.java index f45e66c..f1b3fb3 100644 --- a/src/main/java/com/greenorange/promotion/controller/project/ProjectDetailController.java +++ b/src/main/java/com/greenorange/promotion/controller/project/ProjectDetailController.java @@ -75,6 +75,9 @@ public class ProjectDetailController { @RequiresPermission(mustRole = UserConstant.ADMIN_ROLE) @SysLog(title = "项目明细管理", content = "web端管理员添加项目明细") public BaseResponse addProjectDetail(@Valid @RequestBody ProjectDetailAddRequest projectDetailAddRequest) { + Long proId = projectDetailAddRequest.getProjectId(); + Project pro = projectService.getById(proId); + ThrowUtils.throwIf(pro == null, ErrorCode.OPERATION_ERROR, "项目不存在"); ProjectDetail projectDetail = commonService.copyProperties(projectDetailAddRequest, ProjectDetail.class); projectDetailService.save(projectDetail); diff --git a/src/main/java/com/greenorange/promotion/controller/project/ProjectNotificationController.java b/src/main/java/com/greenorange/promotion/controller/project/ProjectNotificationController.java index 8399a85..39358aa 100644 --- a/src/main/java/com/greenorange/promotion/controller/project/ProjectNotificationController.java +++ b/src/main/java/com/greenorange/promotion/controller/project/ProjectNotificationController.java @@ -13,10 +13,12 @@ import com.greenorange.promotion.model.dto.CommonBatchRequest; import com.greenorange.promotion.model.dto.projectNotification.ProjectNotificationAddRequest; import com.greenorange.promotion.model.dto.projectNotification.ProjectNotificationQueryRequest; import com.greenorange.promotion.model.dto.projectNotification.ProjectNotificationUpdateRequest; +import com.greenorange.promotion.model.entity.Project; import com.greenorange.promotion.model.entity.ProjectNotification; import com.greenorange.promotion.model.vo.projectNotification.ProjectNotificationVO; import com.greenorange.promotion.service.common.CommonService; import com.greenorange.promotion.service.project.ProjectNotificationService; +import com.greenorange.promotion.service.project.ProjectService; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.tags.Tag; import jakarta.annotation.Resource; @@ -47,6 +49,9 @@ public class ProjectNotificationController { @Resource private CommonService commonService; + @Resource + private ProjectService projectService; + /** * web端管理员添加项目通知 * @param projectNotificationAddRequest 项目通知添加请求体 @@ -57,6 +62,9 @@ public class ProjectNotificationController { @RequiresPermission(mustRole = UserConstant.ADMIN_ROLE) @SysLog(title = "项目通知管理", content = "web端管理员添加项目通知") public BaseResponse addProjectNotification(@Valid @RequestBody ProjectNotificationAddRequest projectNotificationAddRequest) { + Long proId = projectNotificationAddRequest.getProjectId(); + Project pro = projectService.getById(proId); + ThrowUtils.throwIf(pro == null, ErrorCode.OPERATION_ERROR, "项目不存在"); ProjectNotification projectNotification = commonService.copyProperties(projectNotificationAddRequest, ProjectNotification.class); projectNotificationService.save(projectNotification); return ResultUtils.success(true); @@ -105,7 +113,6 @@ public class ProjectNotificationController { public BaseResponse queryProjectNotificationById(@Valid @RequestBody CommonRequest commonRequest) { Long id = commonRequest.getId(); ProjectNotification projectNotification = projectNotificationService.getById(id); - ThrowUtils.throwIf(projectNotification == null, ErrorCode.OPERATION_ERROR, "当前项目通知不存在"); ProjectNotificationVO projectNotificationVO = commonService.copyProperties(projectNotification, ProjectNotificationVO.class); return ResultUtils.success(projectNotificationVO); } @@ -122,9 +129,7 @@ public class ProjectNotificationController { @SysLog(title = "项目通知管理", content = "web端管理员根据项目id查询项目通知") public BaseResponse> queryProjectNotificationByPid(@Valid @RequestBody CommonRequest commonRequest) { Long id = commonRequest.getId(); - LambdaQueryWrapper lambdaQueryWrapper = new LambdaQueryWrapper<>(); - lambdaQueryWrapper.eq(ProjectNotification::getProjectId, id); - List projectNotificationList = projectNotificationService.list(lambdaQueryWrapper); + List projectNotificationList = commonService.findByFieldEqTargetField(ProjectNotification::getProjectId, id, projectNotificationService); List projectNotificationVOS = commonService.convertList(projectNotificationList, ProjectNotificationVO.class); return ResultUtils.success(projectNotificationVOS); } diff --git a/src/main/java/com/greenorange/promotion/controller/project/PromoCodeController.java b/src/main/java/com/greenorange/promotion/controller/project/PromoCodeController.java index b4e041f..fa2cdfd 100644 --- a/src/main/java/com/greenorange/promotion/controller/project/PromoCodeController.java +++ b/src/main/java/com/greenorange/promotion/controller/project/PromoCodeController.java @@ -13,10 +13,12 @@ import com.greenorange.promotion.model.dto.CommonBatchRequest; import com.greenorange.promotion.model.dto.promoCode.PromoCodeAddRequest; import com.greenorange.promotion.model.dto.promoCode.PromoCodeQueryRequest; import com.greenorange.promotion.model.dto.promoCode.PromoCodeUpdateRequest; +import com.greenorange.promotion.model.entity.Project; import com.greenorange.promotion.model.entity.PromoCode; import com.greenorange.promotion.model.entity.UserInfo; import com.greenorange.promotion.model.vo.promoCode.PromoCodeVO; import com.greenorange.promotion.service.common.CommonService; +import com.greenorange.promotion.service.project.ProjectService; import com.greenorange.promotion.service.project.PromoCodeService; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.tags.Tag; @@ -48,6 +50,9 @@ public class PromoCodeController { @Resource private CommonService commonService; + @Resource + private ProjectService projectService; + /** * web端管理员添加推广码 * @param promoCodeAddRequest 推广码添加请求体 @@ -58,6 +63,9 @@ public class PromoCodeController { @RequiresPermission(mustRole = UserConstant.ADMIN_ROLE) @SysLog(title = "推广码管理", content = "web端管理员添加推广码") public BaseResponse addPromoCode(@Valid @RequestBody PromoCodeAddRequest promoCodeAddRequest) { + Long proId = promoCodeAddRequest.getProjectId(); + Project pro = projectService.getById(proId); + ThrowUtils.throwIf(pro == null, ErrorCode.OPERATION_ERROR, "项目不存在"); PromoCode promoCode = commonService.copyProperties(promoCodeAddRequest, PromoCode.class); promoCodeService.save(promoCode); return ResultUtils.success(true); @@ -127,7 +135,6 @@ public class PromoCodeController { public BaseResponse queryPromoCodeById(@Valid @RequestBody CommonRequest commonRequest) { Long id = commonRequest.getId(); PromoCode promoCode = promoCodeService.getById(id); - ThrowUtils.throwIf(promoCode == null, ErrorCode.OPERATION_ERROR, "当前推广码不存在"); PromoCodeVO promoCodeVO = commonService.copyProperties(promoCode, PromoCodeVO.class); return ResultUtils.success(promoCodeVO); } diff --git a/src/main/resources/templates/controller.java.vm b/src/main/resources/templates/controller.java.vm index 56fba72..7426b50 100644 --- a/src/main/resources/templates/controller.java.vm +++ b/src/main/resources/templates/controller.java.vm @@ -30,10 +30,10 @@ public class ${entityName}Controller { @Operation(summary = "web端管理员添加${entityComment}", description = "参数：${entityComment}添加请求体，权限：管理员，方法名：add${entityName}") @RequiresPermission(mustRole = UserConstant.ADMIN_ROLE) @SysLog(title = "${entityComment}管理", content = "web端管理员添加${entityComment}") - public BaseResponse add${entityName}(@Valid @RequestBody ${entityName}AddRequest ${entityNameLower}AddRequest) { + public BaseResponse add${entityName}(@Valid @RequestBody ${entityName}AddRequest ${entityNameLower}AddRequest) { ${entityName} ${entityNameLower} = commonService.copyProperties(${entityNameLower}AddRequest, ${entityName}.class); ${entityNameLower}Service.save(${entityNameLower}); - return ResultUtils.success(true); + return ResultUtils.success(${entityNameLower}.getId()); } /** @@ -93,7 +93,6 @@ public class ${entityName}Controller { public BaseResponse<${entityName}VO> query${entityName}ById(@Valid @RequestBody CommonRequest commonRequest) { Long id = commonRequest.getId(); ${entityName} ${entityNameLower} = ${entityNameLower}Service.getById(id); - ThrowUtils.throwIf(${entityNameLower} == null, ErrorCode.OPERATION_ERROR, "当前${entityComment}不存在"); ${entityName}VO ${entityNameLower}VO = commonService.copyProperties(${entityNameLower}, ${entityName}VO.class); return ResultUtils.success(${entityNameLower}VO); }