添加门锁导入示例接口，门锁导入接口，门锁系统用户删除锁的接口，自定义用户删除锁的接口，水电表导入接口，水电表导出接口，修改流程审批接口

src/main/java/com/template/api/HouseLockControllerAPI.java

@@ -52,4 +52,5 @@ public interface HouseLockControllerAPI {
     @ApiOperation(value = "门锁导入", notes = "门锁导入", httpMethod = "POST")
     CommonResult lockImport(@RequestParam("file") MultipartFile file) throws Exception;
 
+
 }

src/main/java/com/template/api/HouseNumberControllerAPI.java

@@ -4,10 +4,8 @@ import com.template.model.dto.HouseNumberBindingDto;
 import com.template.model.dto.HouseNumberDeleteBindingDto;
 import com.template.model.result.CommonResult;
 import io.swagger.annotations.ApiOperation;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
 
 import javax.servlet.http.HttpServletResponse;
 
@@ -35,8 +33,11 @@ public interface HouseNumberControllerAPI {
     CommonResult delete(@RequestBody HouseNumberDeleteBindingDto houseNumberDeleteBindingDto);
 
     @GetMapping("/listExport")
-    @ApiOperation(value = "房间导出", notes = "房间导出", httpMethod = "GET")
+    @ApiOperation(value = "房间水电编码导出", notes = "房间水电编码导出", httpMethod = "GET")
     CommonResult listExport(HttpServletResponse response, String permissionSettingId, String keyWord, String startTime, String endTime);
 
+    @PostMapping("/importList")
+    @ApiOperation(value = "房间水电编码导入", notes = "房间水电编码导入", httpMethod = "POST")
+    CommonResult importList(@RequestParam("file") MultipartFile file) throws Exception;
 
 }

src/main/java/com/template/api/UnlockingAdminControllerAPI.java

@@ -3,12 +3,10 @@ package com.template.api;
 import com.template.model.dto.KeyCardDto;
 import com.template.model.dto.KeyFingerprintDto;
 import com.template.model.dto.KeyPassWordDto;
+import com.template.model.dto.UpdateLockDto;
 import com.template.model.result.CommonResult;
 import io.swagger.annotations.ApiOperation;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.*;
 
 @RequestMapping("/auto/unlocking-admin")
 public interface UnlockingAdminControllerAPI {
@@ -29,8 +27,12 @@ public interface UnlockingAdminControllerAPI {
     @ApiOperation(value = "指纹管理", notes = "指纹管理", httpMethod = "PSOT")
     CommonResult saveFingerprint(@RequestBody KeyFingerprintDto keyFingerprintDto);
 
+    @GetMapping("/deleteLock")
+    @ApiOperation(value = "删除锁的用户", notes = "解绑", httpMethod = "GET")
+    CommonResult deleteLock(@RequestParam Integer unlockingAdminId);
 
-
-
+    @PostMapping("/updateLock")
+    @ApiOperation(value = "修改锁的用户", notes = "指纹管理", httpMethod = "PSOT")
+    CommonResult updateLock(@RequestBody UpdateLockDto updateLockDto);
 
 }

src/main/java/com/template/api/UnlockingCustomControllerAPI.java

@@ -5,9 +5,7 @@ import com.template.model.dto.CustomKeyFingerprintDto;
 import com.template.model.dto.CustomKeyPassWordDto;
 import com.template.model.result.CommonResult;
 import io.swagger.annotations.ApiOperation;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.*;
 
 @RequestMapping("/auto/unlocking-custom")
 public interface UnlockingCustomControllerAPI {
@@ -24,4 +22,8 @@ public interface UnlockingCustomControllerAPI {
     @ApiOperation(value = "指纹管理", notes = "指纹管理", httpMethod = "PSOT")
     CommonResult saveCustomFingerprint(@RequestBody CustomKeyFingerprintDto dto);
 
+    @GetMapping("/deleteLock")
+    @ApiOperation(value = "删除锁的用户", notes = "解绑", httpMethod = "GET")
+    CommonResult deleteLock(@RequestParam Integer unlockingCustomId);
+
 }

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

@@ -217,7 +217,7 @@ public class ApplicationProcedureController implements ApplicationProcedureContr
 //        当为最高审批人
         if (parentId==0) {
 //            先判断是否已经被审批了
-            if (!"1".equals(applicationProcedureStatus)) {
+            if (!"2".equals(applicationProcedureStatus)) {
 //                当不是处理中时则无法审批
                 return CommonResult.fail("当前无法审批");
             }
@@ -312,7 +312,7 @@ public class ApplicationProcedureController implements ApplicationProcedureContr
 //        当为最高审批人
         if (parentId==0) {
             //            先判断是否已经被审批了
-            if (!"1".equals(applicationProcedureStatus)) {
+            if (!"2".equals(applicationProcedureStatus)) {
 //                当不是处理中时则无法审批
                 return CommonResult.fail("当前无法审批");
             }

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

@@ -204,7 +204,7 @@ public class ApplicationProcedureTemporaryController implements ApplicationProce
 //        当为最高审批人
         if (parentId==0) {
             //            先判断是否已经被审批了
-            if (!"1".equals(applicationProcedureStatus)) {
+            if (!"2".equals(applicationProcedureStatus)) {
 //                当不是处理中时则无法审批
                 return CommonResult.fail("当前无法审批");
             }
@@ -304,7 +304,7 @@ public class ApplicationProcedureTemporaryController implements ApplicationProce
 //        当为最高审批人
         if (parentId==0) {
             //            先判断是否已经被审批了
-            if (!"1".equals(applicationProcedureStatus)) {
+            if (!"2".equals(applicationProcedureStatus)) {
 //                当不是处理中时则无法审批
                 return CommonResult.fail("当前无法审批");
             }

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

@@ -176,11 +176,11 @@ public class HouseLockController implements HouseLockControllerAPI {
             return CommonResult.fail("参数异常");
         }
 
+        Date date = new Date();
+        List<UnlockingKeyVo> unlockingKeyDtos = unlockingService.key(houseNumberId,date);
 
-        List<UnlockingKeyVo> unlockingKeyDtos = unlockingService.key(houseNumberId);
-
-        List<UnlockingAdmin> unlockingAdmins = unlockingAdminService.key(houseNumberId);
-        List<UnlockingCustom> unlockingCustoms = unlockingCustomService.key(houseNumberId);
+        List<UnlockingAdmin> unlockingAdmins = unlockingAdminService.key(houseNumberId,date);
+        List<UnlockingCustom> unlockingCustoms = unlockingCustomService.key(houseNumberId,date);
 
         HashMap<String, Object> map = new HashMap<>();
         map.put("order", unlockingKeyDtos);

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

@@ -6,23 +6,26 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.template.api.HouseNumberControllerAPI;
+import com.template.common.utils.ExcelUtils;
+import com.template.common.utils.ExcelUtils2;
 import com.template.model.dto.HouseNumberBindingDto;
 import com.template.model.dto.HouseNumberDeleteBindingDto;
-import com.template.model.pojo.ElectricEquipment;
-import com.template.model.pojo.HouseNumber;
-import com.template.model.pojo.PermissionSetting;
-import com.template.model.pojo.WaterEquipment;
+import com.template.model.dto.HouseNumberImportDto;
+import com.template.model.pojo.*;
 import com.template.model.result.CommonResult;
 import com.template.model.result.PageUtils;
 import com.template.model.vo.HouseNumberPageVo;
-import com.template.services.ElectricEquipmentService;
-import com.template.services.HouseNumberService;
-import com.template.services.PermissionSettingService;
-import com.template.services.WaterEquipmentService;
+import com.template.services.*;
+import org.apache.poi.ss.usermodel.Row;
+import org.apache.poi.ss.usermodel.Sheet;
+import org.apache.poi.ss.usermodel.Workbook;
+import org.apache.poi.xssf.usermodel.XSSFWorkbook;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.multipart.MultipartFile;
 
 import javax.servlet.http.HttpServletResponse;
+import java.util.ArrayList;
 import java.util.List;
 
 /**
@@ -48,6 +51,8 @@ public class HouseNumberController implements HouseNumberControllerAPI {
     @Autowired
     PermissionSettingService permissionSettingService;
 
+    @Autowired
+    HouseService houseService;
     @Override
     public CommonResult pullDownList(String permissionSettingId, int page, int size, String keyWord) {
         PermissionSetting permissionSetting = permissionSettingService.getById(permissionSettingId);
@@ -290,14 +295,105 @@ public class HouseNumberController implements HouseNumberControllerAPI {
             return CommonResult.fail("此账号暂无该权限");
         }
 
-        List<HouseNumberPageVo> listExport =houseNumberService.listExport(keyWord,startTime,endTime);
-
-
+        List<HouseNumberPageVo> vos =houseNumberService.listExport(keyWord,startTime,endTime);
+
+
+//        导出
+        Workbook workbook = new XSSFWorkbook();
+        Sheet sheet = workbook.createSheet("水电设备绑定表");
+        Row headerRow = sheet.createRow(0);
+        headerRow.createCell(0).setCellValue("序号");
+        headerRow.createCell(1).setCellValue("水表编码");
+        headerRow.createCell(2).setCellValue("电表编码");
+        headerRow.createCell(3).setCellValue("房型类型");
+        headerRow.createCell(4).setCellValue("房型名称");
+        headerRow.createCell(5).setCellValue("房间号");
+
+        if (ObjectUtils.isNotEmpty(vos) && vos.size() > 0) {
+            for (int i = 0; i < vos.size(); i++) {
+                Row dataRow1 = sheet.createRow(i + 1);
+                HouseNumberPageVo vo = vos.get(i);
+                dataRow1.createCell(0).setCellValue(i+1);
+                dataRow1.createCell(1).setCellValue(vo.getWaterEquipmentMeterName());
+                dataRow1.createCell(2).setCellValue(vo.getElectricEquipmentMeterName());
+                Integer roomType = vo.getRoomType();
+                String houseType="";
+                if (1==roomType) {
+                    houseType="全日房";
+                }else {
+                    houseType="钟点房";
+                }
+                dataRow1.createCell(3).setCellValue(houseType);
+                dataRow1.createCell(4).setCellValue(vo.getHouseName());
+                dataRow1.createCell(5).setCellValue(vo.getHouseName());
+
+            }
+        }
+        // 将工作簿写入文件
+        ExcelUtils2.excelDownload(workbook, "水电设备绑定表.xlsx", response);
 
+        return CommonResult.ok();
+    }
 
+    @Override
+    public CommonResult importList(MultipartFile file) throws Exception {
+        List<HouseNumberImportDto> dtos= ExcelUtils.readMultipartFile(file, HouseNumberImportDto.class);
+
+        ArrayList<HouseNumber> houseNumbers = new ArrayList<>();
+        for (int i = 0; i < dtos.size(); i++) {
+            HouseNumberImportDto dto = dtos.get(i);
+
+            Integer roomType = dto.getRoomType();
+//            房间号
+            String roomNumber = dto.getRoomNumber();
+//            房型
+            String houseName = dto.getHouseName();
+
+            //            判断当前房型是否存在当前房间号
+            House house=houseService.getHouseName(houseName,roomType);
+            if (ObjectUtils.isEmpty(house)) {
+                return CommonResult.fail("第"+(i+2)+"行,"+"不存在"+houseName+"该房型");
+            }
+
+            Integer houseId = house.getId();
+
+            HouseNumber houseNumber=houseNumberService.getRoomNumber(houseId,roomNumber);
+            if (ObjectUtils.isEmpty(houseNumber)) {
+                return CommonResult.fail("第"+(i+2)+"行,"+"不存在"+roomNumber+"该房间号");
+            }
+
+
+            String electricEquipmentMeterName = dto.getElectricEquipmentMeterName();
+            LambdaQueryWrapper<ElectricEquipment> wrapperEE=new LambdaQueryWrapper<>();
+            wrapperEE.eq(ElectricEquipment::getMeterName,electricEquipmentMeterName);
+            ElectricEquipment electricEquipment = electricEquipmentService.getOne(wrapperEE);
+
+            if (ObjectUtils.isEmpty(electricEquipment)) {
+                return CommonResult.fail("第"+(i+2)+"行,"+"不存在"+electricEquipmentMeterName+"该电表设备号");
+            }
+
+            String waterEquipmentMeterName = dto.getWaterEquipmentMeterName();
+            LambdaQueryWrapper<WaterEquipment> wrapperWE=new LambdaQueryWrapper<>();
+            wrapperWE.eq(WaterEquipment::getMeterName,waterEquipmentMeterName);
+            WaterEquipment waterEquipment = waterEquipmentService.getOne(wrapperWE);
+            if (ObjectUtils.isEmpty(waterEquipment)) {
+                return CommonResult.fail("第"+(i+2)+"行,"+"不存在"+waterEquipmentMeterName+"该水表设备号");
+            }
+
+            houseNumber.setElectricEquipmentId(electricEquipment.getId()+"");
+            houseNumber.setElectricEquipmentMeterName(electricEquipment.getMeterName());
+            houseNumber.setWaterEquipmentId(waterEquipment.getId()+"");
+            houseNumber.setWaterEquipmentMeterName(waterEquipment.getMeterName());
+            houseNumbers.add(houseNumber);
+        }
 
-        return null;
+        boolean b = houseNumberService.saveOrUpdateBatch(houseNumbers);
+        if (b) {
+            return CommonResult.ok();
+        }
+        return CommonResult.fail();
     }
 
+
 }
 

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

@@ -165,7 +165,12 @@ public class PasswordIssController {
 //            锁用户id
             String id = data.getString("id");
             unlocking.setLockUserId(id);
-            unlocking.setLockStatus("2");
+            if (0==ciq.getCardType()) {
+                unlocking.setLockStatus("2");
+            }else {
+                unlocking.setLockStatus("4");
+            }
+
             unlocking.setLuid(ciq.getLuid());
             unlocking.setHouseNumberId(ciq.houseNumberId);
             unlocking.setOrderNumber(ciq.orderNumber);
@@ -314,7 +319,7 @@ public class PasswordIssController {
             unlocking.setLuid(luid);
             unlocking.setHouseNumberId(keyPassWordDto.getHouseNumberId());
             unlocking.setStartTime(startTime);
-            unlocking.setStartTime(endTime);
+            unlocking.setEndTime(endTime);
             unlocking.setType(keyPassWordDto.getType());
 
             return unlocking;
@@ -356,11 +361,17 @@ public class PasswordIssController {
 //            锁用户id
             String id = data.getString("id");
             unlocking.setLockUserId(id);
-            unlocking.setLockStatus("2");
+            int cardType = keyCardDto.getCardType();
+            if (0==cardType) {
+                unlocking.setLockStatus("2");
+            }else {
+                unlocking.setLockStatus("4");
+            }
+
             unlocking.setLuid(keyCardDto.getLuid());
             unlocking.setHouseNumberId(keyCardDto.getHouseNumberId());
             unlocking.setStartTime(startTime);
-            unlocking.setStartTime(endTime);
+            unlocking.setEndTime(endTime);
             unlocking.setType(keyCardDto.getType());
 
             return unlocking;
@@ -393,17 +404,17 @@ public class PasswordIssController {
         String jsonContent = JSONObject.toJSONString(map);
 
         try {
-            JSONObject jsonObject = queryData(jsonContent, PasswordUrlEnum.Card_Info.getUrl());
+            JSONObject jsonObject = queryData(jsonContent, PasswordUrlEnum.Fingerprint_Data.getUrl());
             JSONObject data = jsonObject.getJSONObject("data");
             UnlockingAdmin unlocking = new UnlockingAdmin();
 //            锁用户id
             String id = data.getString("id");
             unlocking.setLockUserId(id);
-            unlocking.setLockStatus("2");
+            unlocking.setLockStatus("3");
             unlocking.setLuid(keyFingerprintDto.getLuid());
             unlocking.setHouseNumberId(keyFingerprintDto.getHouseNumberId());
             unlocking.setStartTime(startTime);
-            unlocking.setStartTime(endTime);
+            unlocking.setEndTime(endTime);
             unlocking.setType(keyFingerprintDto.getType());
 
             return unlocking;
@@ -533,7 +544,7 @@ public class PasswordIssController {
                 unlocking.setLuid(luid);
                 unlocking.setHouseNumberId(dto.getHouseNumberId());
                 unlocking.setStartTime(startTime);
-                unlocking.setStartTime(endTime);
+                unlocking.setEndTime(endTime);
                 unlocking.setType(dto.getType());
 
                 return unlocking;
@@ -571,11 +582,16 @@ public class PasswordIssController {
 //            锁用户id
             String id = data.getString("id");
             unlocking.setLockUserId(id);
-            unlocking.setLockStatus("2");
+            if (0==dto.getCardType()) {
+                unlocking.setLockStatus("2");
+            }else {
+                unlocking.setLockStatus("4");
+            }
+
             unlocking.setLuid(dto.getLuid());
             unlocking.setHouseNumberId(dto.getHouseNumberId());
             unlocking.setStartTime(startTime);
-            unlocking.setStartTime(endTime);
+            unlocking.setEndTime(endTime);
             unlocking.setType(dto.getType());
 
             return unlocking;
@@ -605,17 +621,17 @@ public class PasswordIssController {
         String jsonContent = JSONObject.toJSONString(map);
 
         try {
-            JSONObject jsonObject = queryData(jsonContent, PasswordUrlEnum.Card_Info.getUrl());
+            JSONObject jsonObject = queryData(jsonContent, PasswordUrlEnum.Fingerprint_Data.getUrl());
             JSONObject data = jsonObject.getJSONObject("data");
             UnlockingCustom unlocking = new UnlockingCustom();
 //            锁用户id
             String id = data.getString("id");
             unlocking.setLockUserId(id);
-            unlocking.setLockStatus("2");
+            unlocking.setLockStatus("3");
             unlocking.setLuid(dto.getLuid());
             unlocking.setHouseNumberId(dto.getHouseNumberId());
             unlocking.setStartTime(startTime);
-            unlocking.setStartTime(endTime);
+            unlocking.setEndTime(endTime);
             unlocking.setType(dto.getType());
 
             return unlocking;
@@ -625,4 +641,9 @@ public class PasswordIssController {
         return null;
 
     }
+
+
+
+
+
 }

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

@@ -7,6 +7,7 @@ import com.template.common.utils.PasswordChecker;
 import com.template.model.dto.KeyCardDto;
 import com.template.model.dto.KeyFingerprintDto;
 import com.template.model.dto.KeyPassWordDto;
+import com.template.model.dto.UpdateLockDto;
 import com.template.model.pojo.*;
 import com.template.model.result.CommonResult;
 import com.template.services.*;
@@ -85,11 +86,11 @@ public class UnlockingAdminController implements UnlockingAdminControllerAPI {
         if (ObjectUtils.isEmpty(houseNumber)) {
             return CommonResult.fail("该房间不存在");
         }
-        String usersId = keyPassWordDto.getUsersId();
-        Users byId = usersService.getById(usersId);
-        if (ObjectUtils.isEmpty(byId)) {
-            return CommonResult.fail("无该用户");
-        }
+//        String usersId = keyPassWordDto.getUsersId();
+//        Users byId = usersService.getById(usersId);
+//        if (ObjectUtils.isEmpty(byId)) {
+//            return CommonResult.fail("无该用户");
+//        }
         UnlockingAdmin unlockingAdmin = null;
         /**
          * 缺少人的名字和
@@ -101,8 +102,8 @@ public class UnlockingAdminController implements UnlockingAdminControllerAPI {
                 return CommonResult.fail("该密码已存在，请更换");
             }
 
-            unlockingAdmin.setName(byId.getUserName());
-            unlockingAdmin.setPhone(byId.getPhone());
+            unlockingAdmin.setName(admin.getName());
+            unlockingAdmin.setPhone(admin.getPhoneNumber());
 
 //        添加操作记录
 
@@ -112,7 +113,7 @@ public class UnlockingAdminController implements UnlockingAdminControllerAPI {
             operatingRecord.setOperatorName(admin.getName());
             DateTimeFormatter dateTimeFormatter1 = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
             operatingRecord.setDataTime(LocalDateTime.now().format(dateTimeFormatter1));
-            operatingRecord.setContent("姓名:" + byId.getUserName());
+            operatingRecord.setContent("姓名:" + admin.getName());
             operatingRecord.setType("添加密码钥匙");
 
 
@@ -151,19 +152,19 @@ public class UnlockingAdminController implements UnlockingAdminControllerAPI {
         if (ObjectUtils.isEmpty(houseNumber)) {
             return CommonResult.fail("该房间不存在");
         }
-        String usersId = keyCardDto.getUsersId();
-        Users byId = usersService.getById(usersId);
-        if (ObjectUtils.isEmpty(byId)) {
-            return CommonResult.fail("无该用户");
-        }
+//        String usersId = keyCardDto.getUsersId();
+//        Users byId = usersService.getById(usersId);
+//        if (ObjectUtils.isEmpty(byId)) {
+//            return CommonResult.fail("无该用户");
+//        }
 
         UnlockingAdmin unlockingAdmin = null;
 
         try {
           unlockingAdmin = passwordIssController.addCard(keyCardDto);
 
-            unlockingAdmin.setName(byId.getUserName());
-            unlockingAdmin.setPhone(byId.getPhone());
+            unlockingAdmin.setName(admin.getName());
+            unlockingAdmin.setPhone(admin.getPhoneNumber());
 
 //        添加操作记录
 
@@ -174,7 +175,7 @@ public class UnlockingAdminController implements UnlockingAdminControllerAPI {
             operatingRecord.setOperatorName(admin.getName());
             DateTimeFormatter dateTimeFormatter1 = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
             operatingRecord.setDataTime(LocalDateTime.now().format(dateTimeFormatter1));
-            operatingRecord.setContent("姓名:" + byId.getUserName());
+            operatingRecord.setContent("姓名:" + admin.getName());
             operatingRecord.setType("添加卡片钥匙");
 
 
@@ -213,19 +214,19 @@ public class UnlockingAdminController implements UnlockingAdminControllerAPI {
         if (ObjectUtils.isEmpty(houseNumber)) {
             return CommonResult.fail("该房间不存在");
         }
-        String usersId = keyFingerprintDto.getUsersId();
-        Users byId = usersService.getById(usersId);
-        if (ObjectUtils.isEmpty(byId)) {
-            return CommonResult.fail("无该用户");
-        }
+//        String usersId = keyFingerprintDto.getUsersId();
+//        Users byId = usersService.getById(usersId);
+//        if (ObjectUtils.isEmpty(byId)) {
+//            return CommonResult.fail("无该用户");
+//        }
 
         UnlockingAdmin unlockingAdmin = null;
 
         try {
             unlockingAdmin = passwordIssController.addFingerprintDto(keyFingerprintDto);
 
-            unlockingAdmin.setName(byId.getUserName());
-            unlockingAdmin.setPhone(byId.getPhone());
+            unlockingAdmin.setName(admin.getName());
+            unlockingAdmin.setPhone(admin.getPhoneNumber());
 
 //        添加操作记录
 
@@ -235,7 +236,7 @@ public class UnlockingAdminController implements UnlockingAdminControllerAPI {
             operatingRecord.setOperatorName(admin.getName());
             DateTimeFormatter dateTimeFormatter1 = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
             operatingRecord.setDataTime(LocalDateTime.now().format(dateTimeFormatter1));
-            operatingRecord.setContent("姓名:" + byId.getUserName());
+            operatingRecord.setContent("姓名:" + admin.getName());
             operatingRecord.setType("添加指纹钥匙");
 
 
@@ -252,8 +253,34 @@ public class UnlockingAdminController implements UnlockingAdminControllerAPI {
 
     }
 
+    @Override
+    public CommonResult deleteLock(Integer unlockingAdminId) {
+        UnlockingAdmin byId = unlockingAdminService.getById(unlockingAdminId);
+        if (ObjectUtils.isEmpty(byId)) {
+            return CommonResult.fail("不存在该记录");
+        }
+
+        String lockUserId = byId.getLockUserId();
+        String luid = byId.getLuid();
 
+        passwordIssController.deleteLockUser(luid,lockUserId);
 
+        unlockingAdminService.removeById(unlockingAdminId);
+
+        return CommonResult.ok();
+    }
+
+    @Override
+    public CommonResult updateLock(UpdateLockDto updateLockDto) {
+        UnlockingAdmin byId = unlockingAdminService.getById(updateLockDto.getUnlockingAdminId());
+        if (ObjectUtils.isEmpty(byId)) {
+            return CommonResult.fail("不存在该记录");
+        }
+
+        String luid = byId.getLuid();
+
+        return null;
+    }
 
 
 }

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

@@ -223,5 +223,22 @@ public class UnlockingCustomController implements UnlockingCustomControllerAPI {
         }
     }
 
+    @Override
+    public CommonResult deleteLock(Integer unlockingAdminId) {
+        UnlockingCustom byId = unlockingCustomService.getById(unlockingAdminId);
+        if (ObjectUtils.isEmpty(byId)) {
+            return CommonResult.fail("不存在该记录");
+        }
+
+        String lockUserId = byId.getLockUserId();
+        String luid = byId.getLuid();
+
+        passwordIssController.deleteLockUser(luid,lockUserId);
+
+        unlockingCustomService.removeById(unlockingAdminId);
+
+        return CommonResult.ok();
+    }
+
 }
 

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

@@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
+import java.util.Date;
 import java.util.List;
 
 /**
@@ -18,5 +19,5 @@ import java.util.List;
 @Mapper
 public interface UnlockingAdminMapper extends BaseMapper<UnlockingAdmin> {
 
-    List<UnlockingAdmin> key(@Param("houseNumberId") String houseNumberId);
+    List<UnlockingAdmin> key(@Param("houseNumberId") String houseNumberId,@Param("date") Date date);
 }

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

@@ -5,6 +5,7 @@ import com.template.model.pojo.UnlockingCustom;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
+import java.util.Date;
 import java.util.List;
 
 /**
@@ -18,5 +19,5 @@ import java.util.List;
 @Mapper
 public interface UnlockingCustomMapper extends BaseMapper<UnlockingCustom> {
 
-    List<UnlockingCustom> key(@Param("houseNumberId") String houseNumberId);
+    List<UnlockingCustom> key(@Param("houseNumberId") String houseNumberId,@Param("date") Date date);
 }

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

@@ -6,6 +6,7 @@ import com.template.model.vo.UnlockingKeyVo;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
+import java.util.Date;
 import java.util.List;
 
 /**
@@ -19,6 +20,6 @@ import java.util.List;
 @Mapper
 public interface UnlockingMapper extends BaseMapper<Unlocking> {
 
-    List<UnlockingKeyVo> key(@Param("houseNumberId") String houseNumberId);
+    List<UnlockingKeyVo> key(@Param("houseNumberId") String houseNumberId,@Param("date") Date date);
 
 }

src/main/java/com/template/model/dto/CustomKeyCardDto.java

@@ -48,6 +48,6 @@ public String luid;
 
     //    锁用户类型状态码（1：管理员用户，2：普通用户（永久），4：时效性用户，5：一次性时效密码用户，100：时效性无网络密码用户）
     @NotNull(message = "锁用户类型状态码不能为空")
-    private String type;
+    private Integer type;
 
 }

src/main/java/com/template/model/dto/CustomKeyFingerprintDto.java

@@ -46,6 +46,6 @@ public class CustomKeyFingerprintDto {
 
     //    锁用户类型状态码（1：管理员用户，2：普通用户（永久），4：时效性用户，5：一次性时效密码用户，100：时效性无网络密码用户）
     @NotNull(message = "锁用户类型状态码不能为空")
-    private String type;
+    private Integer type;
 
 }

src/main/java/com/template/model/dto/CustomKeyPassWordDto.java

@@ -45,5 +45,5 @@ public class CustomKeyPassWordDto {
 
     //    锁用户类型状态码（1：管理员用户，2：普通用户（永久），4：时效性用户，5：一次性时效密码用户，100：时效性无网络密码用户）
     @NotNull(message = "锁用户类型状态码不能为空")
-    private String type;
+    private Integer type;
 }

src/main/java/com/template/model/dto/HouseNumberImportDto.java

@@ -0,0 +1,28 @@
+package com.template.model.dto;
+
+import com.template.annotation.ExcelImport;
+import lombok.Data;
+
+@Data
+public class HouseNumberImportDto {
+
+    @ExcelImport("序号")
+    private Integer serialNumber;
+
+    @ExcelImport(value = "水表编码")
+    private String waterEquipmentMeterName;
+
+    @ExcelImport(value = "电表编码")
+    private String electricEquipmentMeterName;
+
+    @ExcelImport(value = "房型类型",kv = "1-全日房;2-钟点房")
+    private Integer roomType;
+
+    @ExcelImport("房型名称")
+    private String houseName;
+
+    @ExcelImport("房间号")
+    private String roomNumber;
+
+
+}

src/main/java/com/template/model/dto/KeyCardDto.java

@@ -45,5 +45,5 @@ public class KeyCardDto {
     private String usersId;
     //    锁用户类型状态码（1：管理员用户，2：普通用户（永久），4：时效性用户，5：一次性时效密码用户，100：时效性无网络密码用户）
     @NotNull(message = "锁用户类型状态码不能为空")
-    private String type;
+    private Integer type;
 }

src/main/java/com/template/model/dto/KeyFingerprintDto.java

@@ -43,6 +43,6 @@ public class KeyFingerprintDto {
     private String usersId;
     //    锁用户类型状态码（1：管理员用户，2：普通用户（永久），4：时效性用户，5：一次性时效密码用户，100：时效性无网络密码用户）
     @NotNull(message = "锁用户类型状态码不能为空")
-    private String type;
+    private Integer type;
 
 }

src/main/java/com/template/model/dto/KeyPassWordDto.java

@@ -39,6 +39,6 @@ public class KeyPassWordDto {
 
     //    锁用户类型状态码（1：管理员用户，2：普通用户（永久），4：时效性用户，5：一次性时效密码用户，100：时效性无网络密码用户）
     @NotNull(message = "锁用户类型状态码不能为空")
-    private String type;
+    private Integer type;
 
 }

src/main/java/com/template/model/dto/UpdateLockDto.java

@@ -0,0 +1,13 @@
+package com.template.model.dto;
+
+import lombok.Data;
+
+@Data
+public class UpdateLockDto {
+    private Integer unlockingAdminId;
+
+    private String startTime;
+
+    private String endTime;
+
+}

src/main/java/com/template/model/enumModel/PasswordUrlEnum.java

@@ -14,7 +14,8 @@ public enum PasswordUrlEnum {
     Password("addPassword","下发密码"),
     DeleteLockUser("deleteLockUser","删除锁用户"),
     GetLockDeviceList("getLockDeviceList","获得门锁设备信息列表"),
-    RemoteOpen("remoteOpen","远程开锁");
+    RemoteOpen("remoteOpen","远程开锁"),
+    BatchModifyUserValidTimeRequest("batchModifyUserValidTimeRequest","批量修改用户时效");
     String url;
     String dsc;
 

src/main/java/com/template/model/pojo/UnlockingAdmin.java

@@ -39,7 +39,7 @@ public class UnlockingAdmin implements Serializable {
     private String houseNumberId;
 
     @ApiModelProperty(value = "类型（1：管理员用户，2：普通用户（永久），4：时效性用户，5：一次性时效密码用户，100：时效性无网络密码用户）")
-    private String type;
+    private Integer type;
 
     @ApiModelProperty(value = "锁用户id（每次生成密码/卡片/指纹时都会产生）")
     private String lockUserId;

src/main/java/com/template/model/pojo/UnlockingCustom.java

@@ -39,7 +39,7 @@ public class UnlockingCustom implements Serializable {
     private String houseNumberId;
 
     @ApiModelProperty(value = "类型（1：管理员用户，2：普通用户（永久），4：时效性用户，5：一次性时效密码用户，100：时效性无网络密码用户）")
-    private String type;
+    private Integer type;
 
     @ApiModelProperty(value = "锁用户id（每次生成密码/卡片/指纹时都会产生）")
     private String lockUserId;

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

@@ -3,6 +3,7 @@ package com.template.services;
 import com.template.model.pojo.UnlockingAdmin;
 import com.baomidou.mybatisplus.extension.service.IService;
 
+import java.util.Date;
 import java.util.List;
 
 /**
@@ -15,6 +16,6 @@ import java.util.List;
  */
 public interface UnlockingAdminService extends IService<UnlockingAdmin> {
 
-    List<UnlockingAdmin> key(String houseNumberId);
+    List<UnlockingAdmin> key(String houseNumberId, Date date);
 
 }

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

@@ -3,6 +3,7 @@ package com.template.services;
 import com.template.model.pojo.UnlockingCustom;
 import com.baomidou.mybatisplus.extension.service.IService;
 
+import java.util.Date;
 import java.util.List;
 
 /**
@@ -15,5 +16,5 @@ import java.util.List;
  */
 public interface UnlockingCustomService extends IService<UnlockingCustom> {
 
-    List<UnlockingCustom> key(String houseNumberId);
+    List<UnlockingCustom> key(String houseNumberId, Date date);
 }

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

@@ -4,6 +4,7 @@ import com.template.model.pojo.Unlocking;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.template.model.vo.UnlockingKeyVo;
 
+import java.util.Date;
 import java.util.List;
 
 /**
@@ -16,7 +17,7 @@ import java.util.List;
  */
 public interface UnlockingService extends IService<Unlocking> {
 
-    List<UnlockingKeyVo> key(String houseNumberId);
+    List<UnlockingKeyVo> key(String houseNumberId, Date date);
 
     Unlocking getOrderNumber(String orderNumber);
 }

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

@@ -7,6 +7,7 @@ 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;
 
 /**
@@ -24,8 +25,8 @@ public class UnlockingAdminServiceImpl extends ServiceImpl<UnlockingAdminMapper,
     UnlockingAdminMapper unlockingAdminMapper;
 
     @Override
-    public List<UnlockingAdmin> key(String houseNumberId) {
-        List<UnlockingAdmin> unlockingAdmins=unlockingAdminMapper.key(houseNumberId);
+    public List<UnlockingAdmin> key(String houseNumberId, Date date) {
+        List<UnlockingAdmin> unlockingAdmins=unlockingAdminMapper.key(houseNumberId,date);
 
         return unlockingAdmins;
     }

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

@@ -7,6 +7,7 @@ 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;
 
 /**
@@ -24,7 +25,7 @@ public class UnlockingCustomServiceImpl extends ServiceImpl<UnlockingCustomMappe
     UnlockingCustomMapper unlockingCustomMapper;
 
     @Override
-    public List<UnlockingCustom> key(String houseNumberId) {
-        return unlockingCustomMapper.key(houseNumberId);
+    public List<UnlockingCustom> key(String houseNumberId, Date date) {
+        return unlockingCustomMapper.key(houseNumberId,date);
     }
 }

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

@@ -9,6 +9,7 @@ import com.template.services.UnlockingService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.util.Date;
 import java.util.List;
 
 /**
@@ -25,8 +26,8 @@ public class UnlockingServiceImpl extends ServiceImpl<UnlockingMapper, Unlocking
     UnlockingMapper unlockingMapper;
 
     @Override
-    public List<UnlockingKeyVo> key(String houseNumberId) {
-        List<UnlockingKeyVo> unlockingKeyVos=unlockingMapper.key(houseNumberId);
+    public List<UnlockingKeyVo> key(String houseNumberId, Date date) {
+        List<UnlockingKeyVo> unlockingKeyVos=unlockingMapper.key(houseNumberId,date);
 
         return unlockingKeyVos;
     }

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

@@ -6,8 +6,8 @@
         SELECT u.*
         FROM `unlocking_admin` u
         where u.deleted = 0
-          and CURDATE() > u.start_time
-          and u.end_time > CURDATE()
+          and #{date} > u.start_time
+          and u.end_time > #{date}
           and u.house_number_id = #{houseNumberId}
     </select>
 </mapper>

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

@@ -6,8 +6,8 @@
         SELECT u.*
         FROM `unlocking_custom` u
         where u.deleted = 0
-          and CURDATE() > u.start_time
-          and u.end_time > CURDATE()
+          and #{date} > u.start_time
+          and u.end_time > #{date}
           and u.house_number_id = #{houseNumberId}
     </select>
 </mapper>

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

@@ -16,8 +16,8 @@
         FROM `unlocking` u
                  LEFT JOIN house_order ho on ho.order_number = u.order_number and ho.deleted = 0
         where u.deleted = 0
-          and CURDATE() > u.start_time
-          and u.end_time > CURDATE()
+          and #{date} > u.start_time
+          and u.end_time > #{date}
           and u.house_number_id = #{houseNumberId}
     </select>
 </mapper>