修改房间编辑，添加房间删除接口

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

@@ -47,7 +47,7 @@ public interface HouseNumberControllerAPI {
     CommonResult houseNumberPullDown();
 
 
-    @PostMapping("/saveHouseNuber")
+    @PostMapping("/saveHouseNumber")
     @ApiOperation(value = "添加房间", notes = "添加房间", httpMethod = "POST")
     CommonResult saveHouseNumber(@RequestBody HouseNumberDto houseNumberDto);
 
@@ -56,12 +56,12 @@ public interface HouseNumberControllerAPI {
     @ApiOperation(value = "房间列表查询", notes = "房间列表查询", httpMethod = "GET")
     CommonResult getPageHouseNumber(@RequestParam int page,@RequestParam int size, String keyWord,Integer buildingId,Integer houseId);
 
-    @PostMapping("/updateHouseNuber")
+    @PostMapping("/updateHouseNumber")
     @ApiOperation(value = "房间编辑", notes = "房间编辑", httpMethod = "POST")
     CommonResult updateHouseNumber(@RequestBody HouseNumberUpdateDto dto);
 
 
-    @GetMapping("/deleteHouseNuber")
+    @GetMapping("/deleteHouseNumber")
     @ApiOperation(value = "房间删除", notes = "房间删除", httpMethod = "GET")
     CommonResult deleteHouseNumber(@RequestParam Integer houseNumberId);
 

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

@@ -556,36 +556,71 @@ public class HouseNumberController implements HouseNumberControllerAPI {
                 byId.setWaterEquipmentId(waterEquipment.getId() + "");
             }
             houseNumberService.updateById(byId);
-
+            LambdaQueryWrapper<HouseLock> wrapper = new LambdaQueryWrapper<>();
+            wrapper.eq(HouseLock::getHouseNumberId, dto.getId());
+            HouseLock houseLock = houseLockService.getOne(wrapper);
             String doorLock = dto.getDoorLock();
             if (ObjectUtils.isNotEmpty(doorLock)) {
-                HouseLock houseLock = houseLockService.getById(dto.getId());
-                String equipmentType = houseLock.getEquipmentType();
-                if (!equipmentType.equals(doorLock)) {
+                if (ObjectUtils.isNotEmpty(houseLock)) {
+                    String equipmentType = houseLock.getEquipmentType();
+                    if (!equipmentType.equals(doorLock)) {
+                        JSONObject particular = null;
+                        try {
+                            particular = passwordIssController.particular(doorLock);
+                        } catch (Exception e) {
+                            return CommonResult.fail("门锁异常");
+                        }
+                        //        设备连接状态
+                        String state = particular.getString("state");
+//        电量
+                        String battery = particular.getString("battery");
+                        houseLock.setEquipmentType(doorLock);
+                        houseLock.setElectricQuantity(battery);
+
+//            网络状态
+                        houseLock.setNetworkState(state);
+//            设备状态
+                        houseLock.setEquipmentState(state);
+                        //            绑定时间
+                        houseLock.setBindingTime(new Date());
+
+                        houseLockService.updateById(houseLock);
+                    }
+                } else {
+                    HouseLock hl = new HouseLock();
+                    hl.setHouseNumberId(dto.getId());
+                    hl.setEquipmentType(dto.getDoorLock());
+                    //            绑定时间
+                    hl.setBindingTime(new Date());
                     JSONObject particular = null;
                     try {
                         particular = passwordIssController.particular(doorLock);
                     } catch (Exception e) {
                         return CommonResult.fail("门锁异常");
                     }
-                    //        设备连接状态
+
+//        设备连接状态
                     String state = particular.getString("state");
 //        电量
                     String battery = particular.getString("battery");
-                    houseLock.setEquipmentType(doorLock);
-                    houseLock.setElectricQuantity(battery);
+                    hl.setElectricQuantity(battery);
 
 //            网络状态
-                    houseLock.setNetworkState(state);
+                    hl.setNetworkState(state);
 //            设备状态
-                    houseLock.setEquipmentState(state);
-                    //            绑定时间
-                    houseLock.setBindingTime(new Date());
-
-                    houseLockService.updateById(houseLock);
+                    hl.setEquipmentState(state);
+//            房 间号
+                    hl.setNetworkType("WiFi");
+                    hl.setWifiMac("WIFIMAC");
+                    hl.setNfcFunction(0);
+                    houseLockService.save(hl);
+                }
+            }else {
+                if (ObjectUtils.isNotEmpty(houseLock)) {
+                   houseLockService.removeById(houseLock.getId());
                 }
             }
-        }catch (Exception e){
+        } catch (Exception e) {
             e.printStackTrace();
             return CommonResult.fail();
         }
@@ -594,8 +629,26 @@ public class HouseNumberController implements HouseNumberControllerAPI {
     }
 
     @Override
+    @Transactional(rollbackFor = Exception.class)
     public CommonResult deleteHouseNumber(Integer houseNumberId) {
-        return null;
+        HouseNumber houseNumber = houseNumberService.getById(houseNumberId);
+        if (ObjectUtils.isEmpty(houseNumber)) {
+            return CommonResult.fail("参数异常");
+        }
+
+        LambdaQueryWrapper<HouseLock> wrapper = new LambdaQueryWrapper<>();
+        wrapper.eq(HouseLock::getHouseNumberId, houseNumberId);
+        HouseLock houseLock = houseLockService.getOne(wrapper);
+        try {
+            if (ObjectUtils.isNotEmpty(houseLock)) {
+                houseLockService.removeById(houseLock.getId());
+            }
+            houseNumberService.removeById(houseNumberId);
+        }catch (Exception e){
+            e.printStackTrace();
+            return CommonResult.fail();
+        }
+        return CommonResult.ok();
     }