diff --git a/ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/controller/PeopleCheckInfoController.java b/ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/controller/PeopleCheckInfoController.java new file mode 100644 index 0000000..04861f6 --- /dev/null +++ b/ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/controller/PeopleCheckInfoController.java @@ -0,0 +1,105 @@ +package org.dromara.demo.controller; + +import java.util.List; + +import lombok.RequiredArgsConstructor; +import jakarta.servlet.http.HttpServletResponse; +import jakarta.validation.constraints.*; +import cn.dev33.satoken.annotation.SaCheckPermission; +import org.springframework.web.bind.annotation.*; +import org.springframework.validation.annotation.Validated; +import org.dromara.common.idempotent.annotation.RepeatSubmit; +import org.dromara.common.log.annotation.Log; +import org.dromara.common.web.core.BaseController; +import org.dromara.common.mybatis.core.page.PageQuery; +import org.dromara.common.core.domain.R; +import org.dromara.common.core.validate.AddGroup; +import org.dromara.common.core.validate.EditGroup; +import org.dromara.common.log.enums.BusinessType; +import org.dromara.common.excel.utils.ExcelUtil; +import org.dromara.demo.domain.vo.PeopleCheckInfoVo; +import org.dromara.demo.domain.bo.PeopleCheckInfoBo; +import org.dromara.demo.service.IPeopleCheckInfoService; +import org.dromara.common.mybatis.core.page.TableDataInfo; + +/** + * 人员签到统计 + * + * @author GJH + * @date 2025-07-08 + */ +@Validated +@RequiredArgsConstructor +@RestController +@RequestMapping("/air/checkInfo") +public class PeopleCheckInfoController extends BaseController { + + private final IPeopleCheckInfoService peopleCheckInfoService; + + /** + * 查询人员签到统计列表 + */ + //@SaCheckPermission("air:checkInfo:list") + @GetMapping("/list") + public TableDataInfo list(PeopleCheckInfoBo bo, PageQuery pageQuery) { + return peopleCheckInfoService.queryPageList(bo, pageQuery); + } + + /** + * 导出人员签到统计列表 + */ + //@SaCheckPermission("air:checkInfo:export") + @Log(title = "人员签到统计", businessType = BusinessType.EXPORT) + @PostMapping("/export") + public void export(PeopleCheckInfoBo bo, HttpServletResponse response) { + List list = peopleCheckInfoService.queryList(bo); + ExcelUtil.exportExcel(list, "人员签到统计", PeopleCheckInfoVo.class, response); + } + + /** + * 获取人员签到统计详细信息 + * + * @param id 主键 + */ + //@SaCheckPermission("air:checkInfo:query") + @GetMapping("/{id}") + public R getInfo(@NotNull(message = "主键不能为空") + @PathVariable String id) { + return R.ok(peopleCheckInfoService.queryById(id)); + } + + /** + * 新增人员签到统计 + */ + //@SaCheckPermission("air:checkInfo:add") + @Log(title = "人员签到统计", businessType = BusinessType.INSERT) + @RepeatSubmit() + @PostMapping() + public R add(@Validated(AddGroup.class) @RequestBody PeopleCheckInfoBo bo) { + return toAjax(peopleCheckInfoService.insertByBo(bo)); + } + + /** + * 修改人员签到统计 + */ + //@SaCheckPermission("air:checkInfo:edit") + @Log(title = "人员签到统计", businessType = BusinessType.UPDATE) + @RepeatSubmit() + @PutMapping() + public R edit(@Validated(EditGroup.class) @RequestBody PeopleCheckInfoBo bo) { + return toAjax(peopleCheckInfoService.updateByBo(bo)); + } + + /** + * 删除人员签到统计 + * + * @param ids 主键串 + */ + //@SaCheckPermission("air:checkInfo:remove") + @Log(title = "人员签到统计", businessType = BusinessType.DELETE) + @DeleteMapping("/{ids}") + public R remove(@NotEmpty(message = "主键不能为空") + @PathVariable String[] ids) { + return toAjax(peopleCheckInfoService.deleteWithValidByIds(List.of(ids), true)); + } +} diff --git a/ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/domain/PeopleCheckInfo.java b/ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/domain/PeopleCheckInfo.java new file mode 100644 index 0000000..6d430e0 --- /dev/null +++ b/ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/domain/PeopleCheckInfo.java @@ -0,0 +1,77 @@ +package org.dromara.demo.domain; + +import org.dromara.common.tenant.core.TenantEntity; +import com.baomidou.mybatisplus.annotation.*; +import lombok.Data; +import lombok.EqualsAndHashCode; +import java.util.Date; +import com.fasterxml.jackson.annotation.JsonFormat; +import org.springframework.format.annotation.DateTimeFormat; + +import java.io.Serial; + +/** + * 人员签到统计对象 people_check_info + * + * @author GJH + * @date 2025-07-08 + */ +@Data +@EqualsAndHashCode(callSuper = true) +@TableName("people_check_info") +public class PeopleCheckInfo extends TenantEntity { + + @Serial + private static final long serialVersionUID = 1L; + + /** + * 主键ID + */ + @TableId(value = "id") + private String id; + + /** + * 站点名称 + */ + private String station; + + /** + * 所属区域 + */ + private String area; + + /** + * 人员性质 + */ + private String attribute; + + /** + * 人员姓名 + */ + private String person; + + /** + * 所属公司 + */ + private String company; + + /** + * 签到时间 + */ + @JsonFormat(pattern = "yyyy-MM-dd") + @DateTimeFormat(pattern = "yyyy-MM-dd") + private Date registerTime; + + /** + * 签到类型 + */ + private String registerType; + + /** + * 删除标志 + */ + @TableLogic + private Long delFlag; + + +} diff --git a/ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/domain/bo/PeopleCheckInfoBo.java b/ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/domain/bo/PeopleCheckInfoBo.java new file mode 100644 index 0000000..35a370d --- /dev/null +++ b/ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/domain/bo/PeopleCheckInfoBo.java @@ -0,0 +1,77 @@ +package org.dromara.demo.domain.bo; + +import org.dromara.demo.domain.PeopleCheckInfo; +import org.dromara.common.mybatis.core.domain.BaseEntity; +import org.dromara.common.core.validate.AddGroup; +import org.dromara.common.core.validate.EditGroup; +import io.github.linpeilie.annotations.AutoMapper; +import lombok.Data; +import lombok.EqualsAndHashCode; +import jakarta.validation.constraints.*; +import java.util.Date; +import com.fasterxml.jackson.annotation.JsonFormat; +import org.springframework.format.annotation.DateTimeFormat; + +/** + * 人员签到统计业务对象 people_check_info + * + * @author GJH + * @date 2025-07-08 + */ +@Data +@EqualsAndHashCode(callSuper = true) +@AutoMapper(target = PeopleCheckInfo.class, reverseConvertGenerate = false) +public class PeopleCheckInfoBo extends BaseEntity { + + /** + * 主键ID + */ + //@NotBlank(message = "主键ID不能为空", groups = { EditGroup.class }) + private String id; + + /** + * 站点名称 + */ + //@NotBlank(message = "站点名称不能为空", groups = { AddGroup.class, EditGroup.class }) + private String station; + + /** + * 所属区域 + */ + //@NotBlank(message = "所属区域不能为空", groups = { AddGroup.class, EditGroup.class }) + private String area; + + /** + * 人员性质 + */ + //@NotBlank(message = "人员性质不能为空", groups = { AddGroup.class, EditGroup.class }) + private String attribute; + + /** + * 人员姓名 + */ + //@NotBlank(message = "人员姓名不能为空", groups = { AddGroup.class, EditGroup.class }) + private String person; + + /** + * 所属公司 + */ + //@NotBlank(message = "所属公司不能为空", groups = { AddGroup.class, EditGroup.class }) + private String company; + + /** + * 签到时间 + */ + //@NotNull(message = "签到时间不能为空", groups = { AddGroup.class, EditGroup.class }) + @JsonFormat(pattern = "yyyy-MM-dd") + @DateTimeFormat(pattern = "yyyy-MM-dd") + private Date registerTime; + + /** + * 签到类型 + */ + //@NotBlank(message = "签到类型不能为空", groups = { AddGroup.class, EditGroup.class }) + private String registerType; + + +} diff --git a/ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/domain/vo/PeopleCheckInfoVo.java b/ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/domain/vo/PeopleCheckInfoVo.java new file mode 100644 index 0000000..cfc35ed --- /dev/null +++ b/ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/domain/vo/PeopleCheckInfoVo.java @@ -0,0 +1,82 @@ +package org.dromara.demo.domain.vo; + +import java.util.Date; +import com.fasterxml.jackson.annotation.JsonFormat; +import org.dromara.demo.domain.PeopleCheckInfo; +import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; +import com.alibaba.excel.annotation.ExcelProperty; +import org.dromara.common.excel.annotation.ExcelDictFormat; +import org.dromara.common.excel.convert.ExcelDictConvert; +import io.github.linpeilie.annotations.AutoMapper; +import lombok.Data; + +import java.io.Serial; +import java.io.Serializable; +import java.util.Date; + + + +/** + * 人员签到统计视图对象 people_check_info + * + * @author GJH + * @date 2025-07-08 + */ +@Data +@ExcelIgnoreUnannotated +@AutoMapper(target = PeopleCheckInfo.class) +public class PeopleCheckInfoVo implements Serializable { + + @Serial + private static final long serialVersionUID = 1L; + + /** + * 主键ID + */ + @ExcelProperty(value = "主键ID") + private String id; + + /** + * 站点名称 + */ + @ExcelProperty(value = "站点名称") + private String station; + + /** + * 所属区域 + */ + @ExcelProperty(value = "所属区域") + private String area; + + /** + * 人员性质 + */ + @ExcelProperty(value = "人员性质") + private String attribute; + + /** + * 人员姓名 + */ + @ExcelProperty(value = "人员姓名") + private String person; + + /** + * 所属公司 + */ + @ExcelProperty(value = "所属公司") + private String company; + + /** + * 签到时间 + */ + @ExcelProperty(value = "签到时间") + private Date registerTime; + + /** + * 签到类型 + */ + @ExcelProperty(value = "签到类型") + private String registerType; + + +} diff --git a/ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/mapper/PeopleCheckInfoMapper.java b/ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/mapper/PeopleCheckInfoMapper.java new file mode 100644 index 0000000..d62f254 --- /dev/null +++ b/ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/mapper/PeopleCheckInfoMapper.java @@ -0,0 +1,15 @@ +package org.dromara.demo.mapper; + +import org.dromara.demo.domain.PeopleCheckInfo; +import org.dromara.demo.domain.vo.PeopleCheckInfoVo; +import org.dromara.common.mybatis.core.mapper.BaseMapperPlus; + +/** + * 人员签到统计Mapper接口 + * + * @author GJH + * @date 2025-07-08 + */ +public interface PeopleCheckInfoMapper extends BaseMapperPlus { + +} diff --git a/ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/service/IPeopleCheckInfoService.java b/ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/service/IPeopleCheckInfoService.java new file mode 100644 index 0000000..e5b8b7a --- /dev/null +++ b/ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/service/IPeopleCheckInfoService.java @@ -0,0 +1,68 @@ +package org.dromara.demo.service; + +import org.dromara.demo.domain.vo.PeopleCheckInfoVo; +import org.dromara.demo.domain.bo.PeopleCheckInfoBo; +import org.dromara.common.mybatis.core.page.TableDataInfo; +import org.dromara.common.mybatis.core.page.PageQuery; + +import java.util.Collection; +import java.util.List; + +/** + * 人员签到统计Service接口 + * + * @author GJH + * @date 2025-07-08 + */ +public interface IPeopleCheckInfoService { + + /** + * 查询人员签到统计 + * + * @param id 主键 + * @return 人员签到统计 + */ + PeopleCheckInfoVo queryById(String id); + + /** + * 分页查询人员签到统计列表 + * + * @param bo 查询条件 + * @param pageQuery 分页参数 + * @return 人员签到统计分页列表 + */ + TableDataInfo queryPageList(PeopleCheckInfoBo bo, PageQuery pageQuery); + + /** + * 查询符合条件的人员签到统计列表 + * + * @param bo 查询条件 + * @return 人员签到统计列表 + */ + List queryList(PeopleCheckInfoBo bo); + + /** + * 新增人员签到统计 + * + * @param bo 人员签到统计 + * @return 是否新增成功 + */ + Boolean insertByBo(PeopleCheckInfoBo bo); + + /** + * 修改人员签到统计 + * + * @param bo 人员签到统计 + * @return 是否修改成功 + */ + Boolean updateByBo(PeopleCheckInfoBo bo); + + /** + * 校验并批量删除人员签到统计信息 + * + * @param ids 待删除的主键集合 + * @param isValid 是否进行有效性校验 + * @return 是否删除成功 + */ + Boolean deleteWithValidByIds(Collection ids, Boolean isValid); +} diff --git a/ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/service/impl/PeopleCheckInfoServiceImpl.java b/ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/service/impl/PeopleCheckInfoServiceImpl.java new file mode 100644 index 0000000..055fea9 --- /dev/null +++ b/ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/service/impl/PeopleCheckInfoServiceImpl.java @@ -0,0 +1,135 @@ +package org.dromara.demo.service.impl; + +import org.dromara.common.core.utils.MapstructUtils; +import org.dromara.common.core.utils.StringUtils; +import org.dromara.common.mybatis.core.page.TableDataInfo; +import org.dromara.common.mybatis.core.page.PageQuery; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.toolkit.Wrappers; +import lombok.RequiredArgsConstructor; +import org.springframework.stereotype.Service; +import org.dromara.demo.domain.bo.PeopleCheckInfoBo; +import org.dromara.demo.domain.vo.PeopleCheckInfoVo; +import org.dromara.demo.domain.PeopleCheckInfo; +import org.dromara.demo.mapper.PeopleCheckInfoMapper; +import org.dromara.demo.service.IPeopleCheckInfoService; + +import java.util.List; +import java.util.Map; +import java.util.Collection; + +/** + * 人员签到统计Service业务层处理 + * + * @author GJH + * @date 2025-07-08 + */ +@RequiredArgsConstructor +@Service +public class PeopleCheckInfoServiceImpl implements IPeopleCheckInfoService { + + private final PeopleCheckInfoMapper baseMapper; + + /** + * 查询人员签到统计 + * + * @param id 主键 + * @return 人员签到统计 + */ + @Override + public PeopleCheckInfoVo queryById(String id){ + return baseMapper.selectVoById(id); + } + + /** + * 分页查询人员签到统计列表 + * + * @param bo 查询条件 + * @param pageQuery 分页参数 + * @return 人员签到统计分页列表 + */ + @Override + public TableDataInfo queryPageList(PeopleCheckInfoBo bo, PageQuery pageQuery) { + LambdaQueryWrapper lqw = buildQueryWrapper(bo); + Page result = baseMapper.selectVoPage(pageQuery.build(), lqw); + return TableDataInfo.build(result); + } + + /** + * 查询符合条件的人员签到统计列表 + * + * @param bo 查询条件 + * @return 人员签到统计列表 + */ + @Override + public List queryList(PeopleCheckInfoBo bo) { + LambdaQueryWrapper lqw = buildQueryWrapper(bo); + return baseMapper.selectVoList(lqw); + } + + private LambdaQueryWrapper buildQueryWrapper(PeopleCheckInfoBo bo) { + Map params = bo.getParams(); + LambdaQueryWrapper lqw = Wrappers.lambdaQuery(); + lqw.eq(StringUtils.isNotBlank(bo.getStation()), PeopleCheckInfo::getStation, bo.getStation()); + lqw.eq(StringUtils.isNotBlank(bo.getArea()), PeopleCheckInfo::getArea, bo.getArea()); + lqw.eq(StringUtils.isNotBlank(bo.getAttribute()), PeopleCheckInfo::getAttribute, bo.getAttribute()); + lqw.eq(StringUtils.isNotBlank(bo.getPerson()), PeopleCheckInfo::getPerson, bo.getPerson()); + lqw.eq(StringUtils.isNotBlank(bo.getCompany()), PeopleCheckInfo::getCompany, bo.getCompany()); + lqw.eq(bo.getRegisterTime() != null, PeopleCheckInfo::getRegisterTime, bo.getRegisterTime()); + lqw.eq(StringUtils.isNotBlank(bo.getRegisterType()), PeopleCheckInfo::getRegisterType, bo.getRegisterType()); + return lqw; + } + + /** + * 新增人员签到统计 + * + * @param bo 人员签到统计 + * @return 是否新增成功 + */ + @Override + public Boolean insertByBo(PeopleCheckInfoBo bo) { + PeopleCheckInfo add = MapstructUtils.convert(bo, PeopleCheckInfo.class); + validEntityBeforeSave(add); + boolean flag = baseMapper.insert(add) > 0; + if (flag) { + bo.setId(add.getId()); + } + return flag; + } + + /** + * 修改人员签到统计 + * + * @param bo 人员签到统计 + * @return 是否修改成功 + */ + @Override + public Boolean updateByBo(PeopleCheckInfoBo bo) { + PeopleCheckInfo update = MapstructUtils.convert(bo, PeopleCheckInfo.class); + validEntityBeforeSave(update); + return baseMapper.updateById(update) > 0; + } + + /** + * 保存前的数据校验 + */ + private void validEntityBeforeSave(PeopleCheckInfo entity){ + //TODO 做一些数据校验,如唯一约束 + } + + /** + * 校验并批量删除人员签到统计信息 + * + * @param ids 待删除的主键集合 + * @param isValid 是否进行有效性校验 + * @return 是否删除成功 + */ + @Override + public Boolean deleteWithValidByIds(Collection ids, Boolean isValid) { + if(isValid){ + //TODO 做一些业务上的校验,判断是否需要校验 + } + return baseMapper.deleteByIds(ids) > 0; + } +}