开门记录功能开发

ruoyi-modules/ruoyi-hotel/src/main/java/org/dromara/hotel/controller/KfDoorOpenHisController.java

@@ -0,0 +1,106 @@
+package org.dromara.hotel.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.hotel.domain.vo.KfDoorOpenHisVo;
+import org.dromara.hotel.domain.bo.KfDoorOpenHisBo;
+import org.dromara.hotel.service.IKfDoorOpenHisService;
+import org.dromara.common.mybatis.core.page.TableDataInfo;
+
+/**
+ * 开门记录
+ * 前端访问路由地址为:/report/kfDoorOpenHis
+ *
+ * @author LionLi
+ * @date 2024-11-29
+ */
+@Validated
+@RequiredArgsConstructor
+@RestController
+@RequestMapping("/report/kfDoorOpenHis")
+public class KfDoorOpenHisController extends BaseController {
+
+    private final IKfDoorOpenHisService kfDoorOpenHisService;
+
+    /**
+     * 查询开门记录列表
+     */
+    @SaCheckPermission("report:kfDoorOpenHis:list")
+    @GetMapping("/list")
+    public TableDataInfo<KfDoorOpenHisVo> list(KfDoorOpenHisBo bo, PageQuery pageQuery) {
+        return kfDoorOpenHisService.queryPageList(bo, pageQuery);
+    }
+
+    /**
+     * 导出开门记录列表
+     */
+    @SaCheckPermission("report:kfDoorOpenHis:export")
+    @Log(title = "开门记录", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    public void export(KfDoorOpenHisBo bo, HttpServletResponse response) {
+        List<KfDoorOpenHisVo> list = kfDoorOpenHisService.queryList(bo);
+        ExcelUtil.exportExcel(list, "开门记录", KfDoorOpenHisVo.class, response);
+    }
+
+    /**
+     * 获取开门记录详细信息
+     *
+     * @param id 主键
+     */
+    @SaCheckPermission("report:kfDoorOpenHis:query")
+    @GetMapping("/{id}")
+    public R<KfDoorOpenHisVo> getInfo(@NotNull(message = "主键不能为空")
+                                     @PathVariable Long id) {
+        return R.ok(kfDoorOpenHisService.queryById(id));
+    }
+
+    /**
+     * 新增开门记录
+     */
+    @SaCheckPermission("report:kfDoorOpenHis:add")
+    @Log(title = "开门记录", businessType = BusinessType.INSERT)
+    @RepeatSubmit()
+    @PostMapping()
+    public R<Void> add(@Validated(AddGroup.class) @RequestBody KfDoorOpenHisBo bo) {
+        return toAjax(kfDoorOpenHisService.insertByBo(bo));
+    }
+
+    /**
+     * 修改开门记录
+     */
+    @SaCheckPermission("report:kfDoorOpenHis:edit")
+    @Log(title = "开门记录", businessType = BusinessType.UPDATE)
+    @RepeatSubmit()
+    @PutMapping()
+    public R<Void> edit(@Validated(EditGroup.class) @RequestBody KfDoorOpenHisBo bo) {
+        return toAjax(kfDoorOpenHisService.updateByBo(bo));
+    }
+
+    /**
+     * 删除开门记录
+     *
+     * @param ids 主键串
+     */
+    @SaCheckPermission("report:kfDoorOpenHis:remove")
+    @Log(title = "开门记录", businessType = BusinessType.DELETE)
+    @DeleteMapping("/{ids}")
+    public R<Void> remove(@NotEmpty(message = "主键不能为空")
+                          @PathVariable Long[] ids) {
+        return toAjax(kfDoorOpenHisService.deleteWithValidByIds(List.of(ids), true));
+    }
+}

ruoyi-modules/ruoyi-hotel/src/main/java/org/dromara/hotel/domain/KfDoorOpenHis.java

@@ -0,0 +1,74 @@
+package org.dromara.hotel.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 java.io.Serial;
+
+/**
+ * 开门记录对象 t_kf_door_open_his
+ *
+ * @author LionLi
+ * @date 2024-11-29
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@TableName("t_kf_door_open_his")
+public class KfDoorOpenHis extends TenantEntity {
+
+    @Serial
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键
+     */
+    @TableId(value = "id")
+    private Long id;
+
+    /**
+     * 房间编号
+     */
+    private String roomCode;
+
+    /**
+     * 房间名称
+     */
+    private String roomName;
+
+    /**
+     * 开门方式
+     */
+    private String openDoorMode;
+
+    /**
+     * 开门时间
+     */
+    private Date openTime;
+
+    /**
+     * 开门结果
+     */
+    private String openResult;
+
+    /**
+     * 物理卡号
+     */
+    private String factoryId;
+
+    /**
+     * 开门用户
+     */
+    private Long openDoorUser;
+
+    /**
+     * 删除标志
+     */
+    @TableLogic
+    private String delFlag;
+
+
+}

ruoyi-modules/ruoyi-hotel/src/main/java/org/dromara/hotel/domain/bo/KfDoorOpenHisBo.java

@@ -0,0 +1,68 @@
+package org.dromara.hotel.domain.bo;
+
+import org.dromara.hotel.domain.KfDoorOpenHis;
+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;
+
+/**
+ * 开门记录业务对象 t_kf_door_open_his
+ *
+ * @author LionLi
+ * @date 2024-11-29
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@AutoMapper(target = KfDoorOpenHis.class, reverseConvertGenerate = false)
+public class KfDoorOpenHisBo extends BaseEntity {
+
+    /**
+     * 主键
+     */
+    @NotNull(message = "主键不能为空", groups = { EditGroup.class })
+    private Long id;
+
+    /**
+     * 房间编号
+     */
+    @NotBlank(message = "房间编号不能为空", groups = { AddGroup.class, EditGroup.class })
+    private String roomCode;
+
+    /**
+     * 房间名称
+     */
+    private String roomName;
+
+    /**
+     * 开门方式
+     */
+    private String openDoorMode;
+
+    /**
+     * 开门时间
+     */
+    private Date openTime;
+
+    /**
+     * 开门结果
+     */
+    private String openResult;
+
+    /**
+     * 物理卡号
+     */
+    private String factoryId;
+
+    /**
+     * 开门用户
+     */
+    private Long openDoorUser;
+
+
+}

ruoyi-modules/ruoyi-hotel/src/main/java/org/dromara/hotel/domain/vo/KfDoorOpenHisVo.java

@@ -0,0 +1,78 @@
+package org.dromara.hotel.domain.vo;
+
+import java.util.Date;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import org.dromara.hotel.domain.KfDoorOpenHis;
+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;
+
+
+
+/**
+ * 开门记录视图对象 t_kf_door_open_his
+ *
+ * @author LionLi
+ * @date 2024-11-29
+ */
+@Data
+@ExcelIgnoreUnannotated
+@AutoMapper(target = KfDoorOpenHis.class)
+public class KfDoorOpenHisVo implements Serializable {
+
+    @Serial
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键
+     */
+    @ExcelProperty(value = "主键")
+    private Long id;
+
+    /**
+     * 房间编号
+     */
+    @ExcelProperty(value = "房间编号")
+    private String roomCode;
+
+    /**
+     * 房间名称
+     */
+    @ExcelProperty(value = "房间名称")
+    private String roomName;
+
+    /**
+     * 开门方式
+     */
+    @ExcelProperty(value = "开门方式", converter = ExcelDictConvert.class)
+    @ExcelDictFormat(dictType = "open_door_mode")
+    private String openDoorMode;
+
+    /**
+     * 开门时间
+     */
+    @ExcelProperty(value = "开门时间")
+    private Date openTime;
+
+    /**
+     * 开门结果
+     */
+    @ExcelProperty(value = "开门结果", converter = ExcelDictConvert.class)
+    @ExcelDictFormat(dictType = "sys_opration_result")
+    private String openResult;
+
+    /**
+     * 物理卡号
+     */
+    @ExcelProperty(value = "物理卡号")
+    private String factoryId;
+
+
+}

ruoyi-modules/ruoyi-hotel/src/main/java/org/dromara/hotel/mapper/KfDoorOpenHisMapper.java

@@ -0,0 +1,15 @@
+package org.dromara.hotel.mapper;
+
+import org.dromara.hotel.domain.KfDoorOpenHis;
+import org.dromara.hotel.domain.vo.KfDoorOpenHisVo;
+import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
+
+/**
+ * 开门记录Mapper接口
+ *
+ * @author LionLi
+ * @date 2024-11-29
+ */
+public interface KfDoorOpenHisMapper extends BaseMapperPlus<KfDoorOpenHis, KfDoorOpenHisVo> {
+
+}

ruoyi-modules/ruoyi-hotel/src/main/java/org/dromara/hotel/service/IKfDoorOpenHisService.java

@@ -0,0 +1,69 @@
+package org.dromara.hotel.service;
+
+import org.dromara.hotel.domain.KfDoorOpenHis;
+import org.dromara.hotel.domain.vo.KfDoorOpenHisVo;
+import org.dromara.hotel.domain.bo.KfDoorOpenHisBo;
+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 LionLi
+ * @date 2024-11-29
+ */
+public interface IKfDoorOpenHisService {
+
+    /**
+     * 查询开门记录
+     *
+     * @param id 主键
+     * @return 开门记录
+     */
+    KfDoorOpenHisVo queryById(Long id);
+
+    /**
+     * 分页查询开门记录列表
+     *
+     * @param bo        查询条件
+     * @param pageQuery 分页参数
+     * @return 开门记录分页列表
+     */
+    TableDataInfo<KfDoorOpenHisVo> queryPageList(KfDoorOpenHisBo bo, PageQuery pageQuery);
+
+    /**
+     * 查询符合条件的开门记录列表
+     *
+     * @param bo 查询条件
+     * @return 开门记录列表
+     */
+    List<KfDoorOpenHisVo> queryList(KfDoorOpenHisBo bo);
+
+    /**
+     * 新增开门记录
+     *
+     * @param bo 开门记录
+     * @return 是否新增成功
+     */
+    Boolean insertByBo(KfDoorOpenHisBo bo);
+
+    /**
+     * 修改开门记录
+     *
+     * @param bo 开门记录
+     * @return 是否修改成功
+     */
+    Boolean updateByBo(KfDoorOpenHisBo bo);
+
+    /**
+     * 校验并批量删除开门记录信息
+     *
+     * @param ids     待删除的主键集合
+     * @param isValid 是否进行有效性校验
+     * @return 是否删除成功
+     */
+    Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid);
+}

ruoyi-modules/ruoyi-hotel/src/main/java/org/dromara/hotel/service/impl/KfDoorOpenHisServiceImpl.java

@@ -0,0 +1,150 @@
+package org.dromara.hotel.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.QueryWrapper;
+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.hotel.domain.bo.KfDoorOpenHisBo;
+import org.dromara.hotel.domain.vo.KfDoorOpenHisVo;
+import org.dromara.hotel.domain.KfDoorOpenHis;
+import org.dromara.hotel.mapper.KfDoorOpenHisMapper;
+import org.dromara.hotel.service.IKfDoorOpenHisService;
+
+import java.util.List;
+import java.util.Map;
+import java.util.Collection;
+
+/**
+ * 开门记录Service业务层处理
+ *
+ * @author LionLi
+ * @date 2024-11-29
+ */
+@RequiredArgsConstructor
+@Service
+public class KfDoorOpenHisServiceImpl implements IKfDoorOpenHisService {
+
+    private final KfDoorOpenHisMapper baseMapper;
+
+    /**
+     * 查询开门记录
+     *
+     * @param id 主键
+     * @return 开门记录
+     */
+    @Override
+    public KfDoorOpenHisVo queryById(Long id){
+        return baseMapper.selectVoById(id);
+    }
+
+    /**
+     * 分页查询开门记录列表
+     *
+     * @param bo        查询条件
+     * @param pageQuery 分页参数
+     * @return 开门记录分页列表
+     */
+    @Override
+    public TableDataInfo<KfDoorOpenHisVo> queryPageList(KfDoorOpenHisBo bo, PageQuery pageQuery) {
+        LambdaQueryWrapper<KfDoorOpenHis> lqw = buildQueryWrapper(bo);
+        Page<KfDoorOpenHisVo> result = baseMapper.selectVoPage(pageQuery.build(), lqw);
+        return TableDataInfo.build(result);
+    }
+
+    /**
+     * 查询符合条件的开门记录列表
+     *
+     * @param bo 查询条件
+     * @return 开门记录列表
+     */
+    @Override
+    public List<KfDoorOpenHisVo> queryList(KfDoorOpenHisBo bo) {
+        LambdaQueryWrapper<KfDoorOpenHis> lqw = buildQueryWrapper(bo);
+        return baseMapper.selectVoList(lqw);
+    }
+
+    private LambdaQueryWrapper<KfDoorOpenHis> buildQueryWrapper(KfDoorOpenHisBo bo) {
+        Map<String, Object> params = bo.getParams();
+        LambdaQueryWrapper<KfDoorOpenHis> lqw = Wrappers.lambdaQuery();
+        lqw.like(StringUtils.isNotBlank(bo.getRoomCode()), KfDoorOpenHis::getRoomCode, bo.getRoomCode());
+        lqw.eq(StringUtils.isNotBlank(bo.getOpenDoorMode()), KfDoorOpenHis::getOpenDoorMode, bo.getOpenDoorMode());
+        lqw.between(params.get("beginOpenTime") != null && params.get("endOpenTime") != null,
+            KfDoorOpenHis::getOpenTime ,params.get("beginOpenTime"), params.get("endOpenTime"));
+        lqw.eq(StringUtils.isNotBlank(bo.getOpenResult()), KfDoorOpenHis::getOpenResult, bo.getOpenResult());
+        lqw.orderByDesc(KfDoorOpenHis::getOpenTime);
+        return lqw;
+    }
+
+    private QueryWrapper<KfDoorOpenHis> buildQueryWrapper(KfDoorOpenHisBo bo,String tableAlias) {
+        QueryWrapper<KfDoorOpenHis> lqw = new QueryWrapper<>();
+        Map<String, Object> params = bo.getParams();
+        String columnPrefix = "";
+        if(StringUtils.isNotBlank(tableAlias)){
+            columnPrefix = tableAlias + ".";
+        }
+        lqw.like(StringUtils.isNotBlank(bo.getRoomCode()), columnPrefix+"room_code", bo.getRoomCode());
+        lqw.eq(StringUtils.isNotBlank(bo.getOpenDoorMode()), columnPrefix+"open_door_mode", bo.getOpenDoorMode());
+        lqw.between(params.get("beginOpenTime") != null && params.get("endOpenTime") != null,
+        columnPrefix+"open_time" ,params.get("beginOpenTime"), params.get("endOpenTime"));
+        lqw.eq(StringUtils.isNotBlank(bo.getOpenResult()), columnPrefix+"open_result", bo.getOpenResult());
+        return lqw;
+    }
+
+    /**
+     * 新增开门记录
+     *
+     * @param bo 开门记录
+     * @return 是否新增成功
+     */
+    @Override
+    public Boolean insertByBo(KfDoorOpenHisBo bo) {
+        KfDoorOpenHis add = MapstructUtils.convert(bo, KfDoorOpenHis.class);
+        validEntityBeforeSave(add);
+        boolean flag = baseMapper.insert(add) > 0;
+        if (flag) {
+            bo.setId(add.getId());
+        }
+        return flag;
+    }
+
+    /**
+     * 修改开门记录
+     *
+     * @param bo 开门记录
+     * @return 是否修改成功
+     */
+    @Override
+    public Boolean updateByBo(KfDoorOpenHisBo bo) {
+        KfDoorOpenHis update = MapstructUtils.convert(bo, KfDoorOpenHis.class);
+        validEntityBeforeSave(update);
+        return baseMapper.updateById(update) > 0;
+    }
+
+    /**
+     * 保存前的数据校验
+     */
+    private void validEntityBeforeSave(KfDoorOpenHis entity){
+        //TODO 做一些数据校验,如唯一约束
+    }
+
+    /**
+     * 校验并批量删除开门记录信息
+     *
+     * @param ids     待删除的主键集合
+     * @param isValid 是否进行有效性校验
+     * @return 是否删除成功
+     */
+    @Override
+    public Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid) {
+        if(isValid){
+            //TODO 做一些业务上的校验,判断是否需要校验
+        }
+        return baseMapper.deleteByIds(ids) > 0;
+    }
+}

ruoyi-modules/ruoyi-hotel/src/main/java/org/dromara/hotel/service/impl/KfOrderServiceImpl.java

@@ -282,9 +282,12 @@ public class KfOrderServiceImpl implements IKfOrderService {
                 KfGuestBo guestBo = new KfGuestBo();
                 guestBo.setPhone(phone);
                 R<KfTeamGuestVo> teamGuestVoR = getTeamGuestCheckInfo(guestBo);
+                if("已报到".equals(teamGuestVoR.getData().getCheckInStatus())){
+                    return R.ok("该团客已报到");
+                }
                 //3.报到
                 if(teamGuestCheckIn(teamGuestVoR.getData())){
-                    return R.ok();
+                    return R.ok("报到成功");
                 }else {
                     return R.fail("报到失败");
                 }

ruoyi-modules/ruoyi-hotel/src/main/resources/mapper/hotel/report/KfDoorOpenHisMapper.xml

@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="org.dromara.hotel.mapper.KfDoorOpenHisMapper">
+
+    <resultMap type="org.dromara.hotel.domain.KfDoorOpenHis" id="KfDoorOpenHisResult">
+            <result property="id"    column="id"    />
+            <result property="roomCode"    column="room_code"    />
+            <result property="roomName"    column="room_name"    />
+            <result property="openDoorMode"    column="open_door_mode"    />
+            <result property="openTime"    column="open_time"    />
+            <result property="openResult"    column="open_result"    />
+            <result property="factoryId"    column="factory_id"    />
+            <result property="openDoorUser"    column="open_door_user"    />
+            <result property="createBy"    column="create_by"    />
+            <result property="createTime"    column="create_time"    />
+            <result property="updateBy"    column="update_by"    />
+            <result property="updateTime"    column="update_time"    />
+            <result property="createDept"    column="create_dept"    />
+            <result property="tenantId"    column="tenant_id"    />
+            <result property="delFlag"    column="del_flag"    />
+    </resultMap>
+</mapper>