From 31172af16e527338ed6cf8f68e62211db2b34414 Mon Sep 17 00:00:00 2001 From: sxu <602087911@qq.com> Date: Tue, 13 May 2025 13:31:08 +0800 Subject: [PATCH] =?UTF-8?q?=E8=90=A5=E5=85=BB=E7=A7=91=E6=99=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../HealthPopularScienceController.java | 12 +++++----- .../mapper/HealthPopularScienceMapper.java | 12 +++++----- .../service/IHealthPopularScienceService.java | 12 +++++----- .../impl/HealthPopularScienceServiceImpl.java | 22 +++++++++++-------- 4 files changed, 31 insertions(+), 27 deletions(-) diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/nutrition/controller/HealthPopularScienceController.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/nutrition/controller/HealthPopularScienceController.java index 07fdeb6..d1ce56f 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/nutrition/controller/HealthPopularScienceController.java +++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/nutrition/controller/HealthPopularScienceController.java @@ -68,9 +68,9 @@ public class HealthPopularScienceController extends BaseController { */ @ApiOperation(value = "获取营养科普详细信息") //@RequiresPermissions("nutrition:science:query") - @GetMapping(value = "/{id}") - public AjaxResult getInfo(@PathVariable("id") Long id) { - return success(healthPopularScienceService.selectHealthPopularScienceById(id)); + @GetMapping(value = "/{articleId}") + public AjaxResult getInfo(@PathVariable("articleId") Long articleId) { + return success(healthPopularScienceService.selectHealthPopularScienceById(articleId)); } /** @@ -112,8 +112,8 @@ public class HealthPopularScienceController extends BaseController { //@PreventRepeatSubmit //@RequiresPermissions("nutrition:science:remove") @SysLog(title = "营养科普", businessType = OperaType.DELETE, logType = 1,module = "仓储管理->删除营养科普") - @PostMapping("/del/{ids}") - public AjaxResult remove(@PathVariable Long[] ids) { - return toAjax(healthPopularScienceService.deleteHealthPopularScienceByIds(ids)); + @PostMapping("/del/{articleIds}") + public AjaxResult remove(@PathVariable Long[] articleIds) { + return toAjax(healthPopularScienceService.deleteHealthPopularScienceByIds(articleIds)); } } diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/nutrition/mapper/HealthPopularScienceMapper.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/nutrition/mapper/HealthPopularScienceMapper.java index 6012d5d..2c1428f 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/nutrition/mapper/HealthPopularScienceMapper.java +++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/nutrition/mapper/HealthPopularScienceMapper.java @@ -13,10 +13,10 @@ public interface HealthPopularScienceMapper { /** * 查询营养科普 * - * @param id 营养科普主键 + * @param articleId 营养科普主键 * @return 营养科普 */ - public HealthPopularScience selectHealthPopularScienceById(Long id); + public HealthPopularScience selectHealthPopularScienceById(Long articleId); /** * 查询营养科普列表 @@ -45,16 +45,16 @@ public interface HealthPopularScienceMapper { /** * 删除营养科普 * - * @param id 营养科普主键 + * @param articleId 营养科普主键 * @return 结果 */ - public int deleteHealthPopularScienceById(Long id); + public int deleteHealthPopularScienceById(Long articleId); /** * 批量删除营养科普 * - * @param ids 需要删除的数据主键集合 + * @param articleIds 需要删除的数据主键集合 * @return 结果 */ - public int deleteHealthPopularScienceByIds(Long[] ids); + public int deleteHealthPopularScienceByIds(Long[] articleIds); } diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/nutrition/service/IHealthPopularScienceService.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/nutrition/service/IHealthPopularScienceService.java index cb386d8..c70b475 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/nutrition/service/IHealthPopularScienceService.java +++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/nutrition/service/IHealthPopularScienceService.java @@ -13,10 +13,10 @@ public interface IHealthPopularScienceService { /** * 查询营养科普 * - * @param id 营养科普主键 + * @param articleId 营养科普主键 * @return 营养科普 */ - public HealthPopularScience selectHealthPopularScienceById(Long id); + public HealthPopularScience selectHealthPopularScienceById(Long articleId); /** * 查询营养科普列表 @@ -45,16 +45,16 @@ public interface IHealthPopularScienceService { /** * 批量删除营养科普 * - * @param ids 需要删除的营养科普主键集合 + * @param articleIds 需要删除的营养科普主键集合 * @return 结果 */ - public int deleteHealthPopularScienceByIds(Long[] ids); + public int deleteHealthPopularScienceByIds(Long[] articleIds); /** * 删除营养科普信息 * - * @param id 营养科普主键 + * @param articleId 营养科普主键 * @return 结果 */ - public int deleteHealthPopularScienceById(Long id); + public int deleteHealthPopularScienceById(Long articleId); } diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/nutrition/service/impl/HealthPopularScienceServiceImpl.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/nutrition/service/impl/HealthPopularScienceServiceImpl.java index cf1bed7..e361aad 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/nutrition/service/impl/HealthPopularScienceServiceImpl.java +++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/nutrition/service/impl/HealthPopularScienceServiceImpl.java @@ -33,12 +33,12 @@ public class HealthPopularScienceServiceImpl implements IHealthPopularScienceSer /** * 查询营养科普 * - * @param id 营养科普主键 + * @param articleId 营养科普主键 * @return 营养科普 */ @Override - public HealthPopularScience selectHealthPopularScienceById(Long id) { - return healthPopularScienceMapper.selectHealthPopularScienceById(id); + public HealthPopularScience selectHealthPopularScienceById(Long articleId) { + return healthPopularScienceMapper.selectHealthPopularScienceById(articleId); } /** @@ -106,22 +106,26 @@ public class HealthPopularScienceServiceImpl implements IHealthPopularScienceSer /** * 批量删除营养科普 * - * @param ids 需要删除的营养科普主键 + * @param articleIds 需要删除的营养科普主键 * @return 结果 */ @Override - public int deleteHealthPopularScienceByIds(Long[] ids) { - return healthPopularScienceMapper.deleteHealthPopularScienceByIds(ids); + public int deleteHealthPopularScienceByIds(Long[] articleIds) { + for (Long articleId : articleIds) { + healthArticleChronicMapper.deleteHealthArticleChronicByArticleId(articleId); + } + return healthPopularScienceMapper.deleteHealthPopularScienceByIds(articleIds); } /** * 删除营养科普信息 * - * @param id 营养科普主键 + * @param articleId 营养科普主键 * @return 结果 */ @Override - public int deleteHealthPopularScienceById(Long id) { - return healthPopularScienceMapper.deleteHealthPopularScienceById(id); + public int deleteHealthPopularScienceById(Long articleId) { + healthArticleChronicMapper.deleteHealthArticleChronicByArticleId(articleId); + return healthPopularScienceMapper.deleteHealthPopularScienceById(articleId); } }