From 0ad1b0533892c6c8d8268368cd08d41610771cc0 Mon Sep 17 00:00:00 2001 From: sxu <602087911@qq.com> Date: Tue, 13 May 2025 16:29:18 +0800 Subject: [PATCH] =?UTF-8?q?=E6=85=A2=E6=80=A7=E7=97=85=E5=8E=BB=E6=8E=89id?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../nutrition/common/model/HealthChronic.java | 22 ++----------------- .../controller/HealthChronicController.java | 12 +++++----- .../core/nutrition/domain/HealthChronic.java | 3 --- .../nutrition/mapper/HealthChronicMapper.java | 12 +++++----- .../service/IHealthChronicService.java | 12 +++++----- .../impl/HealthChronicServiceImpl.java | 18 +++++++-------- .../mapper/nutrition/HealthChronicMapper.xml | 19 +++++++--------- 7 files changed, 37 insertions(+), 61 deletions(-) diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/nutrition/common/model/HealthChronic.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/nutrition/common/model/HealthChronic.java index f3eaf3f..5759227 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/nutrition/common/model/HealthChronic.java +++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/nutrition/common/model/HealthChronic.java @@ -10,9 +10,6 @@ import java.time.LocalDateTime; @TableName("health_chronic") @ApiModel("慢性病基础表") public class HealthChronic { - @TableId - @ApiModelProperty("主键") - private Long id; @ApiModelProperty("慢性病id") private Long chronicId; @ApiModelProperty("慢性病名称") @@ -35,10 +32,6 @@ public class HealthChronic { return new HealthChronicBuilder(); } - public Long getId() { - return this.id; - } - public Long getChronicId() { return this.chronicId; } @@ -67,10 +60,6 @@ public class HealthChronic { return this.updateTime; } - public void setId(final Long id) { - this.id = id; - } - public void setChronicId(final Long chronicId) { this.chronicId = chronicId; } @@ -100,10 +89,9 @@ public class HealthChronic { } - public HealthChronic(final Long id, final Long chronicId, final String chronicName, + public HealthChronic(final Long chronicId, final String chronicName, final Integer delFlag, final String createBy, final LocalDateTime createTime, final String updateBy, final LocalDateTime updateTime) { - this.id = id; this.chronicId = chronicId; this.chronicName = chronicName; this.delFlag = delFlag; @@ -114,7 +102,6 @@ public class HealthChronic { } public static class HealthChronicBuilder { - private Long id; private Long chronicId; private String chronicName; private Integer delFlag; @@ -126,11 +113,6 @@ public class HealthChronic { HealthChronicBuilder() { } - public HealthChronicBuilder id(final Long id) { - this.id = id; - return this; - } - public HealthChronicBuilder chronicId(final Long chronicId) { this.chronicId = chronicId; return this; @@ -167,7 +149,7 @@ public class HealthChronic { } public HealthChronic build() { - return new HealthChronic(this.id, this.chronicId, this.chronicName, this.delFlag, this.createBy, this.createTime, this.updateBy, this.updateTime); + return new HealthChronic(this.chronicId, this.chronicName, this.delFlag, this.createBy, this.createTime, this.updateBy, this.updateTime); } } diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/nutrition/controller/HealthChronicController.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/nutrition/controller/HealthChronicController.java index b541636..c775f0e 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/nutrition/controller/HealthChronicController.java +++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/nutrition/controller/HealthChronicController.java @@ -68,9 +68,9 @@ public class HealthChronicController extends BaseController { */ @ApiOperation(value = "获取慢性病详细信息") //@RequiresPermissions("nutrition:chronic:query") - @GetMapping(value = "/{id}") - public AjaxResult getInfo(@PathVariable("id") Long id) { - return success(healthChronicService.selectHealthChronicById(id)); + @GetMapping(value = "/{chronicId}") + public AjaxResult getInfo(@PathVariable("chronicId") Long chronicId) { + return success(healthChronicService.selectHealthChronicById(chronicId)); } /** @@ -112,8 +112,8 @@ public class HealthChronicController extends BaseController { //@PreventRepeatSubmit //@RequiresPermissions("nutrition:chronic:remove") @SysLog(title = "慢性病", businessType = OperaType.DELETE, logType = 1,module = "仓储管理->删除慢性病") - @PostMapping("/del/{ids}") - public AjaxResult remove(@PathVariable Long[] ids) { - return toAjax(healthChronicService.deleteHealthChronicByIds(ids)); + @PostMapping("/del/{chronicIds}") + public AjaxResult remove(@PathVariable Long[] chronicIds) { + return toAjax(healthChronicService.deleteHealthChronicByIds(chronicIds)); } } diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/nutrition/domain/HealthChronic.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/nutrition/domain/HealthChronic.java index 02ff93e..41d79a1 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/nutrition/domain/HealthChronic.java +++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/nutrition/domain/HealthChronic.java @@ -19,9 +19,6 @@ import com.bonus.common.core.web.domain.BaseEntity; public class HealthChronic extends BaseEntity { private static final long serialVersionUID = 1L; - /** 主键 */ - private Long id; - /** 慢性病id */ @Excel(name = "慢性病id") @ApiModelProperty(value = "慢性病id") diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/nutrition/mapper/HealthChronicMapper.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/nutrition/mapper/HealthChronicMapper.java index 1d23fab..8dfac35 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/nutrition/mapper/HealthChronicMapper.java +++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/nutrition/mapper/HealthChronicMapper.java @@ -13,10 +13,10 @@ public interface HealthChronicMapper { /** * 查询慢性病 * - * @param id 慢性病主键 + * @param chronicId 慢性病主键 * @return 慢性病 */ - public HealthChronic selectHealthChronicById(Long id); + public HealthChronic selectHealthChronicById(Long chronicId); /** * 查询慢性病列表 @@ -45,16 +45,16 @@ public interface HealthChronicMapper { /** * 删除慢性病 * - * @param id 慢性病主键 + * @param chronicId 慢性病主键 * @return 结果 */ - public int deleteHealthChronicById(Long id); + public int deleteHealthChronicById(Long chronicId); /** * 批量删除慢性病 * - * @param ids 需要删除的数据主键集合 + * @param chronicIds 需要删除的数据主键集合 * @return 结果 */ - public int deleteHealthChronicByIds(Long[] ids); + public int deleteHealthChronicByIds(Long[] chronicIds); } diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/nutrition/service/IHealthChronicService.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/nutrition/service/IHealthChronicService.java index 99c5bd4..21db9b7 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/nutrition/service/IHealthChronicService.java +++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/nutrition/service/IHealthChronicService.java @@ -13,10 +13,10 @@ public interface IHealthChronicService { /** * 查询慢性病 * - * @param id 慢性病主键 + * @param chronicId 慢性病主键 * @return 慢性病 */ - public HealthChronic selectHealthChronicById(Long id); + public HealthChronic selectHealthChronicById(Long chronicId); /** * 查询慢性病列表 @@ -45,16 +45,16 @@ public interface IHealthChronicService { /** * 批量删除慢性病 * - * @param ids 需要删除的慢性病主键集合 + * @param chronicIdss 需要删除的慢性病主键集合 * @return 结果 */ - public int deleteHealthChronicByIds(Long[] ids); + public int deleteHealthChronicByIds(Long[] chronicIdss); /** * 删除慢性病信息 * - * @param id 慢性病主键 + * @param chronicId 慢性病主键 * @return 结果 */ - public int deleteHealthChronicById(Long id); + public int deleteHealthChronicById(Long chronicId); } diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/nutrition/service/impl/HealthChronicServiceImpl.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/nutrition/service/impl/HealthChronicServiceImpl.java index 0919f5b..06793fb 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/nutrition/service/impl/HealthChronicServiceImpl.java +++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/nutrition/service/impl/HealthChronicServiceImpl.java @@ -25,12 +25,12 @@ public class HealthChronicServiceImpl implements IHealthChronicService { /** * 查询慢性病 * - * @param id 慢性病主键 + * @param chronicId 慢性病主键 * @return 慢性病 */ @Override - public HealthChronic selectHealthChronicById(Long id) { - return healthChronicMapper.selectHealthChronicById(id); + public HealthChronic selectHealthChronicById(Long chronicId) { + return healthChronicMapper.selectHealthChronicById(chronicId); } /** @@ -82,22 +82,22 @@ public class HealthChronicServiceImpl implements IHealthChronicService { /** * 批量删除慢性病 * - * @param ids 需要删除的慢性病主键 + * @param chronicIds 需要删除的慢性病主键 * @return 结果 */ @Override - public int deleteHealthChronicByIds(Long[] ids) { - return healthChronicMapper.deleteHealthChronicByIds(ids); + public int deleteHealthChronicByIds(Long[] chronicIds) { + return healthChronicMapper.deleteHealthChronicByIds(chronicIds); } /** * 删除慢性病信息 * - * @param id 慢性病主键 + * @param chronicId 慢性病主键 * @return 结果 */ @Override - public int deleteHealthChronicById(Long id) { - return healthChronicMapper.deleteHealthChronicById(id); + public int deleteHealthChronicById(Long chronicId) { + return healthChronicMapper.deleteHealthChronicById(chronicId); } } diff --git a/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/nutrition/HealthChronicMapper.xml b/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/nutrition/HealthChronicMapper.xml index 54d3f44..40355f1 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/nutrition/HealthChronicMapper.xml +++ b/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/nutrition/HealthChronicMapper.xml @@ -4,7 +4,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> - @@ -16,7 +15,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - select id, chronic_id, chronic_name, del_flag, create_by, create_time, update_by, update_time, remark from health_chronic + select chronic_id, chronic_name, del_flag, create_by, create_time, update_by, update_time, remark from health_chronic - where id = #{id} + where chronic_id = #{chronicId} - + insert into health_chronic - chronic_id, chronic_name, del_flag, create_by, @@ -45,7 +43,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" remark, - #{chronicId}, #{chronicName}, #{delFlag}, #{createBy}, @@ -68,17 +65,17 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" update_time = #{updateTime}, remark = #{remark}, - where id = #{id} + where chronic_id = #{chronicId} - delete from health_chronic where id = #{id} + delete from health_chronic where chronic_id = #{chronicId} - delete from health_chronic where id in - - #{id} + delete from health_chronic where chronic_id in + + #{chronicId} \ No newline at end of file