修改钥匙管理接口

src/main/java/com/template/controller/HouseLockController.java

@@ -15,6 +15,7 @@ import com.template.model.dto.RemoteUnlocking;
 import com.template.model.pojo.*;
 import com.template.model.result.CommonResult;
 import com.template.model.vo.HouseLockVo;
+import com.template.model.vo.UnlockingEmployeeVo;
 import com.template.model.vo.UnlockingKeyVo;
 import com.template.model.vo.houseLockListVo;
 import com.template.services.*;
@@ -196,17 +197,13 @@ public class HouseLockController implements HouseLockControllerAPI {
         List<UnlockingAdmin> unlockingAdmins = unlockingAdminService.key(houseNumberId, date);
         List<UnlockingCustom> unlockingCustoms = unlockingCustomService.key(houseNumberId, date);
 
-        List<UnlockingEmployee> unlockingEmployees = unlockingEmployeeService.list(
-                new QueryWrapper<UnlockingEmployee>()
-                        .eq("house_number_id", houseNumberId)
-                        .gt("end_time", date)
-                        .lt("start_time", date));
+        List<UnlockingEmployeeVo> unlockingEmployeeVos=unlockingEmployeeService.key(houseNumberId,date);
 
         HashMap<String, Object> map = new HashMap<>();
         map.put("order", unlockingKeyDtos);
         map.put("system", unlockingAdmins);
         map.put("custom", unlockingCustoms);
-        map.put("employee", unlockingEmployees);
+        map.put("employee", unlockingEmployeeVos);
 
 
         return CommonResult.ok(map);

src/main/java/com/template/mapper/UnlockingEmployeeMapper.java

@@ -2,6 +2,12 @@ package com.template.mapper;
 
 import com.template.model.pojo.UnlockingEmployee;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.template.model.vo.UnlockingEmployeeVo;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.Date;
+import java.util.List;
 
 /**
  * <p>
@@ -11,6 +17,8 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
  * @author ceshi
  * @since 2024-08-12
  */
+@Mapper
 public interface UnlockingEmployeeMapper extends BaseMapper<UnlockingEmployee> {
 
+    List<UnlockingEmployeeVo> key(@Param("houseNumberId") String houseNumberId, @Param("date") Date date);
 }

src/main/java/com/template/model/vo/UnlockingEmployeeVo.java

@@ -0,0 +1,41 @@
+package com.template.model.vo;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+public class UnlockingEmployeeVo {
+    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 Integer 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 String startTime;
+
+    @ApiModelProperty(value = "结束时间")
+    private String endTime;
+
+    private Integer employeeUserId;
+}

src/main/java/com/template/services/UnlockingEmployeeService.java

@@ -2,6 +2,10 @@ package com.template.services;
 
 import com.template.model.pojo.UnlockingEmployee;
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.template.model.vo.UnlockingEmployeeVo;
+
+import java.util.Date;
+import java.util.List;
 
 /**
  * <p>
@@ -13,4 +17,5 @@ import com.baomidou.mybatisplus.extension.service.IService;
  */
 public interface UnlockingEmployeeService extends IService<UnlockingEmployee> {
 
+    List<UnlockingEmployeeVo> key(String houseNumberId, Date date);
 }

src/main/java/com/template/services/impl/UnlockingEmployeeServiceImpl.java

@@ -2,10 +2,15 @@ package com.template.services.impl;
 
 import com.template.model.pojo.UnlockingEmployee;
 import com.template.mapper.UnlockingEmployeeMapper;
+import com.template.model.vo.UnlockingEmployeeVo;
 import com.template.services.UnlockingEmployeeService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.util.Date;
+import java.util.List;
+
 /**
  * <p>
  * 员工添加钥匙 服务实现类
@@ -17,4 +22,11 @@ import org.springframework.stereotype.Service;
 @Service
 public class UnlockingEmployeeServiceImpl extends ServiceImpl<UnlockingEmployeeMapper, UnlockingEmployee> implements UnlockingEmployeeService {
 
+    @Autowired
+    UnlockingEmployeeMapper unlockingEmployeeMapper;
+
+    @Override
+    public List<UnlockingEmployeeVo> key(String houseNumberId, Date date) {
+        return unlockingEmployeeMapper.key(houseNumberId,date);
+    }
 }

src/main/resources/mapper/template/UnlockingEmployeeMapper.xml

@@ -2,4 +2,14 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.template.mapper.UnlockingEmployeeMapper">
 
+    <select id="key" resultType="com.template.model.vo.UnlockingEmployeeVo">
+        SELECT u.*,
+               eu.id as employeeUserId
+        FROM `unlocking_employee` u
+                 LEFT JOIN employee_users eu on eu.user_name=u.name and eu.deleted = 0
+        where u.deleted = 0
+          and #{date} > u.start_time
+          and u.end_time > #{date}
+          and u.house_number_id = #{houseNumberId}
+    </select>
 </mapper>