From 592ea40742cab3bf9c87b4fb8e99f955c7147093 Mon Sep 17 00:00:00 2001 From: tianyongbao Date: Sat, 1 Feb 2025 18:31:33 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E5=81=A5=E5=BA=B7=E7=AE=A1=E7=90=86?= =?UTF-8?q?=E7=B3=BB=E7=BB=9F=EF=BC=8C=E6=96=B0=E5=A2=9E=E5=A9=B4=E5=B9=BC?= =?UTF-8?q?=E5=84=BF=E7=AE=A1=E7=90=86-=E5=90=83=E5=A5=B6=E8=AE=B0?= =?UTF-8?q?=E5=BD=95=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../HealthMilkPowderRecordController.java | 116 +++++++++++++++ .../health/domain/HealthMilkPowderRecord.java | 74 ++++++++++ .../domain/dto/HealthMilkPowderRecordDto.java | 45 ++++++ .../domain/vo/HealthMilkPowderRecordVo.java | 23 +++ .../mapper/HealthMilkPowderRecordMapper.java | 82 +++++++++++ .../IHealthMilkPowderRecordService.java | 63 ++++++++ .../HealthMilkPowderRecordServiceImpl.java | 104 +++++++++++++ .../health/HealthMilkPowderRecordMapper.xml | 139 ++++++++++++++++++ 8 files changed, 646 insertions(+) create mode 100644 intc-modules/intc-health/src/main/java/com/intc/health/controller/HealthMilkPowderRecordController.java create mode 100644 intc-modules/intc-health/src/main/java/com/intc/health/domain/HealthMilkPowderRecord.java create mode 100644 intc-modules/intc-health/src/main/java/com/intc/health/domain/dto/HealthMilkPowderRecordDto.java create mode 100644 intc-modules/intc-health/src/main/java/com/intc/health/domain/vo/HealthMilkPowderRecordVo.java create mode 100644 intc-modules/intc-health/src/main/java/com/intc/health/mapper/HealthMilkPowderRecordMapper.java create mode 100644 intc-modules/intc-health/src/main/java/com/intc/health/service/IHealthMilkPowderRecordService.java create mode 100644 intc-modules/intc-health/src/main/java/com/intc/health/service/impl/HealthMilkPowderRecordServiceImpl.java create mode 100644 intc-modules/intc-health/src/main/resources/mapper/health/HealthMilkPowderRecordMapper.xml diff --git a/intc-modules/intc-health/src/main/java/com/intc/health/controller/HealthMilkPowderRecordController.java b/intc-modules/intc-health/src/main/java/com/intc/health/controller/HealthMilkPowderRecordController.java new file mode 100644 index 0000000..79790a0 --- /dev/null +++ b/intc-modules/intc-health/src/main/java/com/intc/health/controller/HealthMilkPowderRecordController.java @@ -0,0 +1,116 @@ +package com.intc.health.controller; + +import java.util.List; +import java.io.IOException; +import javax.servlet.http.HttpServletResponse; +import javax.annotation.Resource; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.PutMapping; +import org.springframework.web.bind.annotation.DeleteMapping; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; +import com.intc.common.log.annotation.Log; +import com.intc.common.log.enums.BusinessType; +import com.intc.common.security.annotation.RequiresPermissions; +import com.intc.health.domain.HealthMilkPowderRecord; +import com.intc.health.domain.vo.HealthMilkPowderRecordVo; +import com.intc.health.domain.dto.HealthMilkPowderRecordDto; +import com.intc.health.service.IHealthMilkPowderRecordService; +import com.intc.common.core.web.controller.BaseController; +import com.intc.common.core.web.domain.AjaxResult; +import com.intc.common.core.utils.poi.ExcelUtil; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import com.intc.common.core.web.page.TableDataInfo; + +/** + * 吃奶记录Controller + * + * @author tianyongbao + * @date 2025-02-01 + */ +@Api(tags=" 吃奶记录") +@RestController +@RequestMapping("/milkPowderRecord") +public class HealthMilkPowderRecordController extends BaseController +{ + @Resource + private IHealthMilkPowderRecordService healthMilkPowderRecordService; + + /** + * 查询吃奶记录列表 + */ + @ApiOperation(value="查询吃奶记录列表",response = HealthMilkPowderRecordVo.class) + @RequiresPermissions("health:milkPowderRecord:list") + @GetMapping("/list") + public TableDataInfo list(HealthMilkPowderRecordDto healthMilkPowderRecordDto) + { + startPage(); + List list = healthMilkPowderRecordService.selectHealthMilkPowderRecordList(healthMilkPowderRecordDto); + return getDataTable(list); + } + + /** + * 导出吃奶记录列表 + */ + @ApiOperation(value="导出吃奶记录列表") + @RequiresPermissions("health:milkPowderRecord:export") + @Log(title = "吃奶记录", businessType = BusinessType.EXPORT) + @PostMapping("/export") + public void export(HttpServletResponse response, HealthMilkPowderRecordDto healthMilkPowderRecordDto) + { + List list = healthMilkPowderRecordService.selectHealthMilkPowderRecordList(healthMilkPowderRecordDto); + ExcelUtil util = new ExcelUtil(HealthMilkPowderRecordVo.class); + util.exportExcel(response, list, "吃奶记录数据"); + } + + /** + * 获取吃奶记录详细信息 + */ + @ApiOperation(value="获取吃奶记录详细信息") + @RequiresPermissions("health:milkPowderRecord:query") + @GetMapping(value = "/{id}") + public AjaxResult getInfo(@PathVariable("id") Long id) + { + return success(healthMilkPowderRecordService.selectHealthMilkPowderRecordById(id)); + } + + /** + * 新增吃奶记录 + */ + @ApiOperation(value="新增吃奶记录") + @RequiresPermissions("health:milkPowderRecord:add") + @Log(title = "吃奶记录", businessType = BusinessType.INSERT) + @PostMapping + public AjaxResult add(@RequestBody HealthMilkPowderRecord healthMilkPowderRecord) + { + return toAjax(healthMilkPowderRecordService.insertHealthMilkPowderRecord(healthMilkPowderRecord)); + } + + /** + * 修改吃奶记录 + */ + @ApiOperation(value="修改吃奶记录") + @RequiresPermissions("health:milkPowderRecord:edit") + @Log(title = "吃奶记录", businessType = BusinessType.UPDATE) + @PutMapping + public AjaxResult edit(@RequestBody HealthMilkPowderRecord healthMilkPowderRecord) + { + return toAjax(healthMilkPowderRecordService.updateHealthMilkPowderRecord(healthMilkPowderRecord)); + } + + /** + * 删除吃奶记录 + */ + @ApiOperation(value="删除吃奶记录") + @RequiresPermissions("health:milkPowderRecord:remove") + @Log(title = "吃奶记录", businessType = BusinessType.DELETE) + @DeleteMapping("/{ids}") + public AjaxResult remove(@PathVariable Long[] ids) + { + return toAjax(healthMilkPowderRecordService.deleteHealthMilkPowderRecordByIds(ids)); + } +} diff --git a/intc-modules/intc-health/src/main/java/com/intc/health/domain/HealthMilkPowderRecord.java b/intc-modules/intc-health/src/main/java/com/intc/health/domain/HealthMilkPowderRecord.java new file mode 100644 index 0000000..4cda8b0 --- /dev/null +++ b/intc-modules/intc-health/src/main/java/com/intc/health/domain/HealthMilkPowderRecord.java @@ -0,0 +1,74 @@ +package com.intc.health.domain; + +import com.fasterxml.jackson.annotation.JsonFormat; +import com.intc.common.core.annotation.Excel; +import com.intc.common.core.web.domain.BaseEntity; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import org.apache.commons.lang3.builder.ToStringBuilder; +import org.apache.commons.lang3.builder.ToStringStyle; + +import javax.validation.constraints.NotNull; +import java.util.Date; +/** + * 吃奶记录对象 health_milk_powder_record + * + * @author tianyongbao + * @date 2025-02-01 + */ +@ApiModel("吃奶记录对象") +@Data +public class HealthMilkPowderRecord extends BaseEntity +{ + private static final long serialVersionUID = 1L; + + /** 主键 */ + private Long id; + + /** 删除标志（0代表存在 1代表删除） */ + private String delFlag; + + /** 吃奶时间 */ + @ApiModelProperty(value="吃奶时间)") + @NotNull(message="吃奶时间不能为空") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @Excel(name = "吃奶时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss") + private Date sucklesTime; + + /** 吃奶量 */ + @ApiModelProperty(value="吃奶量)") + @NotNull(message="吃奶量不能为空") + @Excel(name = "吃奶量") + private Double consumption; + + /** 人员id */ + @ApiModelProperty(value="人员id)") + @NotNull(message="人员id不能为空") + @Excel(name = "人员id") + private Long personId; + + /** 奶粉品牌 */ + private String milkPowderBrand; + + /** 几勺 */ + private Double spoonful; + + @Override + public String toString() { + return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) + .append("id", getId()) + .append("createBy", getCreateBy()) + .append("createTime", getCreateTime()) + .append("updateBy", getUpdateBy()) + .append("updateTime", getUpdateTime()) + .append("delFlag", getDelFlag()) + .append("remark", getRemark()) + .append("sucklesTime", getSucklesTime()) + .append("consumption", getConsumption()) + .append("personId", getPersonId()) + .append("milkPowderBrand", getMilkPowderBrand()) + .append("spoonful", getSpoonful()) + .toString(); + } +} diff --git a/intc-modules/intc-health/src/main/java/com/intc/health/domain/dto/HealthMilkPowderRecordDto.java b/intc-modules/intc-health/src/main/java/com/intc/health/domain/dto/HealthMilkPowderRecordDto.java new file mode 100644 index 0000000..69b3e46 --- /dev/null +++ b/intc-modules/intc-health/src/main/java/com/intc/health/domain/dto/HealthMilkPowderRecordDto.java @@ -0,0 +1,45 @@ +package com.intc.health.domain.dto; + +import com.fasterxml.jackson.annotation.JsonFormat; +import com.intc.common.core.web.domain.BaseEntity; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; +import java.util.Date; +/** + * 吃奶记录Dto对象 health_milk_powder_record + * + * @author tianyongbao + * @date 2025-02-01 + */ +@ApiModel("吃奶记录Dto对象") +@Data +public class HealthMilkPowderRecordDto extends BaseEntity implements Serializable +{ + private static final long serialVersionUID = 1L; + + /** 吃奶时间 */ + @ApiModelProperty(value="吃奶时间") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + private Date sucklesTime; + + /** 人员id */ + @ApiModelProperty(value="人员id") + private Long personId; + + /** 奶粉品牌 */ + @ApiModelProperty(value="奶粉品牌") + private String milkPowderBrand; + + + /** 开始日期 */ + @ApiModelProperty(value="开始日期") + private String startTime; + + /** 结束日期 */ + @ApiModelProperty(value="结束日期") + private String endTime; + +} diff --git a/intc-modules/intc-health/src/main/java/com/intc/health/domain/vo/HealthMilkPowderRecordVo.java b/intc-modules/intc-health/src/main/java/com/intc/health/domain/vo/HealthMilkPowderRecordVo.java new file mode 100644 index 0000000..f747a1e --- /dev/null +++ b/intc-modules/intc-health/src/main/java/com/intc/health/domain/vo/HealthMilkPowderRecordVo.java @@ -0,0 +1,23 @@ +package com.intc.health.domain.vo; + +import com.intc.common.core.annotation.Excel; +import com.intc.health.domain.HealthMilkPowderRecord; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import io.swagger.annotations.ApiModel; +/** + * 吃奶记录Vo对象 health_milk_powder_record + * + * @author tianyongbao + * @date 2025-02-01 + */ +@ApiModel("吃奶记录Vo对象") +@Data +public class HealthMilkPowderRecordVo extends HealthMilkPowderRecord +{ + /** 人员名称 */ + @ApiModelProperty(value="人员姓名)") + @Excel(name = "人员姓名") + private String personName; + +} diff --git a/intc-modules/intc-health/src/main/java/com/intc/health/mapper/HealthMilkPowderRecordMapper.java b/intc-modules/intc-health/src/main/java/com/intc/health/mapper/HealthMilkPowderRecordMapper.java new file mode 100644 index 0000000..48f0c89 --- /dev/null +++ b/intc-modules/intc-health/src/main/java/com/intc/health/mapper/HealthMilkPowderRecordMapper.java @@ -0,0 +1,82 @@ +package com.intc.health.mapper; + +import com.intc.common.datascope.annotation.DataScope; +import com.intc.health.domain.HealthMilkPowderRecord; +import com.intc.health.domain.dto.HealthMilkPowderRecordDto; +import com.intc.health.domain.vo.HealthMilkPowderRecordVo; + +import java.util.List; + +/** + * 吃奶记录Mapper接口 + * + * @author tianyongbao + * @date 2025-02-01 + */ +public interface HealthMilkPowderRecordMapper +{ + /** + * 查询吃奶记录 + * + * @param id 吃奶记录主键 + * @return 吃奶记录 + */ + public HealthMilkPowderRecordVo selectHealthMilkPowderRecordById(Long id); + + /** + * 查询吃奶记录列表 + * + * @param healthMilkPowderRecordDto 吃奶记录 + * @return 吃奶记录集合 + */ + @DataScope(businessAlias = "a") + public List selectHealthMilkPowderRecordList(HealthMilkPowderRecordDto healthMilkPowderRecordDto); + + /** + * 新增吃奶记录 + * + * @param healthMilkPowderRecord 吃奶记录 + * @return 结果 + */ + public int insertHealthMilkPowderRecord(HealthMilkPowderRecord healthMilkPowderRecord); + + /** + * 修改吃奶记录 + * + * @param healthMilkPowderRecord 吃奶记录 + * @return 结果 + */ + public int updateHealthMilkPowderRecord(HealthMilkPowderRecord healthMilkPowderRecord); + + /** + * 删除吃奶记录 + * + * @param id 吃奶记录主键 + * @return 结果 + */ + public int deleteHealthMilkPowderRecordById(Long id); + + /** + * 批量删除吃奶记录 + * + * @param ids 需要删除的数据主键集合 + * @return 结果 + */ + public int deleteHealthMilkPowderRecordByIds(Long[] ids); + + /** + * 逻辑删除吃奶记录 + * + * @param id 吃奶记录主键 + * @return 结果 + */ + public int removeHealthMilkPowderRecordById(Long id); + + /** + * 批量逻辑删除吃奶记录 + * + * @param ids 需要删除的数据主键集合 + * @return 结果 + */ + public int removeHealthMilkPowderRecordByIds(Long[] ids); +} diff --git a/intc-modules/intc-health/src/main/java/com/intc/health/service/IHealthMilkPowderRecordService.java b/intc-modules/intc-health/src/main/java/com/intc/health/service/IHealthMilkPowderRecordService.java new file mode 100644 index 0000000..52dd9fd --- /dev/null +++ b/intc-modules/intc-health/src/main/java/com/intc/health/service/IHealthMilkPowderRecordService.java @@ -0,0 +1,63 @@ +package com.intc.health.service; + +import java.util.List; +import com.intc.health.domain.HealthMilkPowderRecord; +import com.intc.health.domain.dto.HealthMilkPowderRecordDto; +import com.intc.health.domain.vo.HealthMilkPowderRecordVo; + +/** + * 吃奶记录Service接口 + * + * @author tianyongbao + * @date 2025-02-01 + */ +public interface IHealthMilkPowderRecordService +{ + /** + * 查询吃奶记录 + * + * @param id 吃奶记录主键 + * @return 吃奶记录 + */ + public HealthMilkPowderRecordVo selectHealthMilkPowderRecordById(Long id); + + /** + * 查询吃奶记录列表 + * + * @param healthMilkPowderRecordDto 吃奶记录 + * @return 吃奶记录集合 + */ + public List selectHealthMilkPowderRecordList(HealthMilkPowderRecordDto healthMilkPowderRecordDto); + + /** + * 新增吃奶记录 + * + * @param healthMilkPowderRecord 吃奶记录 + * @return 结果 + */ + public int insertHealthMilkPowderRecord(HealthMilkPowderRecord healthMilkPowderRecord); + + /** + * 修改吃奶记录 + * + * @param healthMilkPowderRecord 吃奶记录 + * @return 结果 + */ + public int updateHealthMilkPowderRecord(HealthMilkPowderRecord healthMilkPowderRecord); + + /** + * 批量删除吃奶记录 + * + * @param ids 需要删除的吃奶记录主键集合 + * @return 结果 + */ + public int deleteHealthMilkPowderRecordByIds(Long[] ids); + + /** + * 删除吃奶记录信息 + * + * @param id 吃奶记录主键 + * @return 结果 + */ + public int deleteHealthMilkPowderRecordById(Long id); +} diff --git a/intc-modules/intc-health/src/main/java/com/intc/health/service/impl/HealthMilkPowderRecordServiceImpl.java b/intc-modules/intc-health/src/main/java/com/intc/health/service/impl/HealthMilkPowderRecordServiceImpl.java new file mode 100644 index 0000000..d9dd347 --- /dev/null +++ b/intc-modules/intc-health/src/main/java/com/intc/health/service/impl/HealthMilkPowderRecordServiceImpl.java @@ -0,0 +1,104 @@ +package com.intc.health.service.impl; + +import com.intc.common.core.utils.DateUtils; +import com.intc.common.core.utils.IdWorker; +import com.intc.common.security.utils.SecurityUtils; +import com.intc.health.domain.HealthMilkPowderRecord; +import com.intc.health.domain.dto.HealthMilkPowderRecordDto; +import com.intc.health.domain.vo.HealthMilkPowderRecordVo; +import com.intc.health.mapper.HealthMilkPowderRecordMapper; +import com.intc.health.service.IHealthMilkPowderRecordService; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; +import java.util.List; + +/** + * 吃奶记录Service业务层处理 + * + * @author tianyongbao + * @date 2025-02-01 + */ +@Service +public class HealthMilkPowderRecordServiceImpl implements IHealthMilkPowderRecordService +{ + @Resource + private HealthMilkPowderRecordMapper healthMilkPowderRecordMapper; + + /** + * 查询吃奶记录 + * + * @param id 吃奶记录主键 + * @return 吃奶记录 + */ + @Override + public HealthMilkPowderRecordVo selectHealthMilkPowderRecordById(Long id) + { + return healthMilkPowderRecordMapper.selectHealthMilkPowderRecordById(id); + } + + /** + * 查询吃奶记录列表 + * + * @param healthMilkPowderRecordDto 吃奶记录 + * @return 吃奶记录 + */ + @Override + public List selectHealthMilkPowderRecordList(HealthMilkPowderRecordDto healthMilkPowderRecordDto) + { + return healthMilkPowderRecordMapper.selectHealthMilkPowderRecordList(healthMilkPowderRecordDto); + } + + /** + * 新增吃奶记录 + * + * @param healthMilkPowderRecord 吃奶记录 + * @return 结果 + */ + @Override + public int insertHealthMilkPowderRecord(HealthMilkPowderRecord healthMilkPowderRecord) + { + healthMilkPowderRecord.setCreateBy(SecurityUtils.getUsername()); + healthMilkPowderRecord.setCreateTime(DateUtils.getNowDate()); + healthMilkPowderRecord.setId(IdWorker.getId()); + return healthMilkPowderRecordMapper.insertHealthMilkPowderRecord(healthMilkPowderRecord); + } + + /** + * 修改吃奶记录 + * + * @param healthMilkPowderRecord 吃奶记录 + * @return 结果 + */ + @Override + public int updateHealthMilkPowderRecord(HealthMilkPowderRecord healthMilkPowderRecord) + { + healthMilkPowderRecord.setUpdateBy(SecurityUtils.getUsername()); + healthMilkPowderRecord.setUpdateTime(DateUtils.getNowDate()); + return healthMilkPowderRecordMapper.updateHealthMilkPowderRecord(healthMilkPowderRecord); + } + + /** + * 批量删除吃奶记录 + * + * @param ids 需要删除的吃奶记录主键 + * @return 结果 + */ + @Override + public int deleteHealthMilkPowderRecordByIds(Long[] ids) + { + return healthMilkPowderRecordMapper.removeHealthMilkPowderRecordByIds(ids); + } + + /** + * 删除吃奶记录信息 + * + * @param id 吃奶记录主键 + * @return 结果 + */ + @Override + public int deleteHealthMilkPowderRecordById(Long id) + { + return healthMilkPowderRecordMapper.removeHealthMilkPowderRecordById(id); + } +} diff --git a/intc-modules/intc-health/src/main/resources/mapper/health/HealthMilkPowderRecordMapper.xml b/intc-modules/intc-health/src/main/resources/mapper/health/HealthMilkPowderRecordMapper.xml new file mode 100644 index 0000000..0884601 --- /dev/null +++ b/intc-modules/intc-health/src/main/resources/mapper/health/HealthMilkPowderRecordMapper.xml @@ -0,0 +1,139 @@ + + + + + + + + + + + + + + + + + + + + + + select + a.id, + a.create_by, + a.create_time, + a.update_by, + a.update_time, + a.del_flag, + a.remark, + a.suckles_time, + a.consumption, + a.person_id, + a.milk_powder_brand, + a.spoonful, + hp."name" as person_name + from + health_milk_powder_record a + left join health_person hp on + hp.id = a.person_id + + + + + + + + + insert into health_milk_powder_record + + id, + create_by, + create_time, + update_by, + update_time, + del_flag, + remark, + suckles_time, + consumption, + person_id, + milk_powder_brand, + spoonful, + + + #{id}, + #{createBy}, + #{createTime}, + #{updateBy}, + #{updateTime}, + #{delFlag}, + #{remark}, + #{sucklesTime}, + #{consumption}, + #{personId}, + #{milkPowderBrand}, + #{spoonful}, + + + + + update health_milk_powder_record + + create_by = #{createBy}, + create_time = #{createTime}, + update_by = #{updateBy}, + update_time = #{updateTime}, + del_flag = #{delFlag}, + remark = #{remark}, + suckles_time = #{sucklesTime}, + consumption = #{consumption}, + person_id = #{personId}, + milk_powder_brand = #{milkPowderBrand}, + spoonful = #{spoonful}, + + where id = #{id} + + + + delete from health_milk_powder_record where id = #{id} + + + + delete from health_milk_powder_record where id in + + #{id} + + + + update health_milk_powder_record set del_flag='1' where id = #{id} + + + + update health_milk_powder_record set del_flag='1' where id in + + #{id} + + +