Переглянути джерело

修改单日房态管理接口

liu 1 рік тому
батько
коміт
c744606955

+ 0 - 21
iHotel_student_houtai/src/main/java/com/template/auto/controller/UnlockingEmployeeController.java

@@ -1,21 +0,0 @@
-package com.template.auto.controller;
-
-
-import org.springframework.web.bind.annotation.RequestMapping;
-
-import org.springframework.web.bind.annotation.RestController;
-
-/**
- * <p>
- * 员工添加钥匙 前端控制器
- * </p>
- *
- * @author ceshi
- * @since 2024-08-19
- */
-@RestController
-@RequestMapping("/auto/unlocking-employee")
-public class UnlockingEmployeeController {
-
-}
-

+ 0 - 16
iHotel_student_houtai/src/main/java/com/template/auto/mapper/UnlockingEmployeeMapper.java

@@ -1,16 +0,0 @@
-package com.template.auto.mapper;
-
-import com.template.auto.model.UnlockingEmployee;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-
-/**
- * <p>
- * 员工添加钥匙 Mapper 接口
- * </p>
- *
- * @author ceshi
- * @since 2024-08-19
- */
-public interface UnlockingEmployeeMapper extends BaseMapper<UnlockingEmployee> {
-
-}

+ 0 - 5
iHotel_student_houtai/src/main/java/com/template/auto/mapper/xml/UnlockingEmployeeMapper.xml

@@ -1,5 +0,0 @@
-<?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="com.template.auto.mapper.UnlockingEmployeeMapper">
-
-</mapper>

+ 0 - 89
iHotel_student_houtai/src/main/java/com/template/auto/model/UnlockingEmployee.java

@@ -1,89 +0,0 @@
-package com.template.auto.model;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import java.util.Date;
-import com.baomidou.mybatisplus.annotation.Version;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.FieldFill;
-import com.baomidou.mybatisplus.annotation.TableLogic;
-import com.baomidou.mybatisplus.annotation.TableField;
-import java.io.Serializable;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.experimental.Accessors;
-
-/**
- * <p>
- * 员工添加钥匙
- * </p>
- *
- * @author ceshi
- * @since 2024-08-19
- */
-@Data
-@EqualsAndHashCode(callSuper = false)
-@Accessors(chain = true)
-@ApiModel(value="UnlockingEmployee对象", description="员工添加钥匙")
-public class UnlockingEmployee implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-    @ApiModelProperty(value = "员工添加钥匙")
-    @TableId(value = "id", type = IdType.AUTO)
-    private Integer id;
-
-    @ApiModelProperty(value = "名字")
-    private String name;
-
-    @ApiModelProperty(value = "手机号")
-    private String phone;
-
-    @ApiModelProperty(value = "房间号id")
-    private String houseNumberId;
-
-    @ApiModelProperty(value = "类型(1:管理员用户,2:普通用户(永久),4:时效性用户,5:一次性时效密码用户,100:时效性无网络密码用户)")
-    private String type;
-
-    @ApiModelProperty(value = "锁用户id(每次生成密码/卡片/指纹时都会产生)")
-    private String lockUserId;
-
-    @ApiModelProperty(value = "锁设备UID")
-    private String luid;
-
-    @ApiModelProperty(value = "开锁的方式(1.密码,2.卡片,3.指纹,4:身份证)")
-    private String lockStatus;
-
-    @ApiModelProperty(value = "开锁密码")
-    private String passWord;
-
-    @ApiModelProperty(value = "开始时间")
-    private Date startTime;
-
-    @ApiModelProperty(value = "结束时间")
-    private Date endTime;
-
-    @ApiModelProperty(value = "创建时间")
-    @TableField(fill = FieldFill.INSERT)
-    private Date createTime;
-
-    @ApiModelProperty(value = "更新时间")
-    @TableField(fill = FieldFill.INSERT_UPDATE)
-    private Date updateTime;
-
-    @ApiModelProperty(value = "创建人员")
-    @TableField(fill = FieldFill.INSERT)
-    private String createUser;
-
-    @ApiModelProperty(value = "更新人员")
-    @TableField(fill = FieldFill.INSERT_UPDATE)
-    private String updateUser;
-
-    @ApiModelProperty(value = "逻辑删除 未删除:0;删除:1")
-    @TableField(fill = FieldFill.INSERT)
-    @TableLogic
-    private Integer deleted;
-
-
-}

+ 0 - 20
iHotel_student_houtai/src/main/java/com/template/auto/service/impl/UnlockingEmployeeServiceImpl.java

@@ -1,20 +0,0 @@
-package com.template.auto.service.impl;
-
-import com.template.auto.model.UnlockingEmployee;
-import com.template.auto.mapper.UnlockingEmployeeMapper;
-import com.template.auto.services.UnlockingEmployeeService;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import org.springframework.stereotype.Service;
-
-/**
- * <p>
- * 员工添加钥匙 服务实现类
- * </p>
- *
- * @author ceshi
- * @since 2024-08-19
- */
-@Service
-public class UnlockingEmployeeServiceImpl extends ServiceImpl<UnlockingEmployeeMapper, UnlockingEmployee> implements UnlockingEmployeeService {
-
-}

+ 0 - 16
iHotel_student_houtai/src/main/java/com/template/auto/services/UnlockingEmployeeService.java

@@ -1,16 +0,0 @@
-package com.template.auto.services;
-
-import com.template.auto.model.UnlockingEmployee;
-import com.baomidou.mybatisplus.extension.service.IService;
-
-/**
- * <p>
- * 员工添加钥匙 服务类
- * </p>
- *
- * @author ceshi
- * @since 2024-08-19
- */
-public interface UnlockingEmployeeService extends IService<UnlockingEmployee> {
-
-}

Різницю між файлами не показано, бо вона завелика
+ 37 - 38
src/main/java/com/template/controller/PasswordIssController.java


+ 4 - 0
src/main/java/com/template/model/vo/HouseStateVo.java

@@ -47,4 +47,8 @@ public class HouseStateVo {
     private Integer houseNumberStateId;
     private Integer houseNumberStateId;
     private String liveTime;
     private String liveTime;
     private String leaveTime;
     private String leaveTime;
+
+    private String startTime;
+    private String endTime;
+
 }
 }

+ 3 - 1
src/main/resources/mapper/template/HouseNumberMapper.xml

@@ -25,7 +25,9 @@
         ho.order_status as orderStatus,
         ho.order_status as orderStatus,
         ho.id as houseOrderId,
         ho.id as houseOrderId,
         ho.live_time AS liveTime,
         ho.live_time AS liveTime,
-        ho.leave_time AS leaveTime
+        ho.leave_time AS leaveTime,
+        hns.start_time as startTime,
+        hns.end_time as endTime
         FROM
         FROM
         `house_number` hn
         `house_number` hn
         LEFT JOIN house h ON h.id = hn.house_id
         LEFT JOIN house h ON h.id = hn.house_id