更新事务回滚

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

@@ -106,7 +106,7 @@ public interface HouseOrderAPI {
     // 取消
     @PostMapping("/cancelApplet")
     @ApiOperation(value = "小程序-订单取消", notes = "小程序-订单取消", httpMethod = "POST")
-    CommonResult cancelApplet(@RequestBody CancelAppletDto cancelAppletDto,HttpServletRequest request);
+    CommonResult cancelApplet(@RequestBody CancelAppletDto cancelAppletDto,HttpServletRequest request) throws Exception;
 
 
     @PostMapping(value = "/returnRefund")

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

@@ -50,7 +50,7 @@ public class AdminMenuController implements AdminMenuAPI {
     AdminService adminService;
 
     @Override
-    @Transactional(rollbackFor = Exception.class)
+    @Transactional(rollbackFor = Exception.class)//1
     public CommonResult saveParent(SaveParentDto saveParentDto, BindingResult bindingResult) {
 
         if (ObjectUtils.isEmpty(saveParentDto)) {
@@ -77,30 +77,25 @@ public class AdminMenuController implements AdminMenuAPI {
         if (ObjectUtils.isNotEmpty(one)) {
             return CommonResult.fail("已有该角色");
         }
-        try {
 
-            AdminMenu adminMenu = new AdminMenu();
-            adminMenu.setParentId(0);
-            adminMenu.setName(name);
-            adminMenuService.save(adminMenu);
-            PermissionSetting permissionSetting = new PermissionSetting();
-            BeanUtils.copyProperties(saveParentDto, permissionSetting);
-            permissionSetting.setAdminMenuId(adminMenu.getId());
 
-            permissionSettingService.save(permissionSetting);
+        AdminMenu adminMenu = new AdminMenu();
+        adminMenu.setParentId(0);
+        adminMenu.setName(name);
+        adminMenuService.save(adminMenu);
+        PermissionSetting permissionSetting = new PermissionSetting();
+        BeanUtils.copyProperties(saveParentDto, permissionSetting);
+        permissionSetting.setAdminMenuId(adminMenu.getId());
 
-            return CommonResult.ok();
+        permissionSettingService.save(permissionSetting);
 
-        } catch (Exception e) {
-            e.printStackTrace();
-            return CommonResult.fail();
-        }
+        return CommonResult.ok();
 
 
     }
 
     @Override
-    public CommonResult saveSecondary(SaveSecondaryDto saveSecondaryDto,BindingResult bindingResult) {
+    public CommonResult saveSecondary(SaveSecondaryDto saveSecondaryDto, BindingResult bindingResult) {
         if (ObjectUtils.isEmpty(saveSecondaryDto)) {
             return CommonResult.fail();
         }
@@ -146,7 +141,7 @@ public class AdminMenuController implements AdminMenuAPI {
 
     @Override
     public CommonResult getRole() {
-        Wrapper<AdminMenu> wrapper=new LambdaQueryWrapper<>();
+        Wrapper<AdminMenu> wrapper = new LambdaQueryWrapper<>();
         List<AdminMenu> adminMenus = adminMenuService.list(wrapper);
         List<AdminMenuTreeVo> adminMenuTreeVos = QueryAreaTreeRecords(0, adminMenus);
 
@@ -154,7 +149,7 @@ public class AdminMenuController implements AdminMenuAPI {
     }
 
     @Override
-    public CommonResult adminListPage(int adminMenuId,int page, int size, String keyWord, String startTime, String endTime) {
+    public CommonResult adminListPage(int adminMenuId, int page, int size, String keyWord, String startTime, String endTime) {
 
         PermissionSetting permissionSetting = permissionSettingService.getById(adminMenuId);
         if (ObjectUtils.isEmpty(permissionSetting)) {
@@ -186,9 +181,9 @@ public class AdminMenuController implements AdminMenuAPI {
         ArrayList<AdminMenuVo> adminMenuVos = new ArrayList<>();
         for (AdminMenu record : records) {
             AdminMenuVo adminMenuVo = new AdminMenuVo();
-            BeanUtils.copyProperties(record,adminMenuVo);
+            BeanUtils.copyProperties(record, adminMenuVo);
             Integer parentId = record.getParentId();
-            if (parentId!=0) {
+            if (parentId != 0) {
                 Integer id = record.getParentId();
                 AdminMenu byId = adminMenuService.getById(id);
                 adminMenuVo.setParentName(byId.getName());
@@ -197,13 +192,13 @@ public class AdminMenuController implements AdminMenuAPI {
         }
 
         Page<AdminMenuVo> adminMenuVoPage = new Page<>();
-        BeanUtils.copyProperties(page1,adminMenuVoPage);
+        BeanUtils.copyProperties(page1, adminMenuVoPage);
         adminMenuVoPage.setRecords(adminMenuVos);
         return CommonResult.ok(adminMenuVoPage);
     }
 
     @Override
-    public CommonResult getMenuPermissionSetting(String adminMenuId,String permissionSettingId) {
+    public CommonResult getMenuPermissionSetting(String adminMenuId, String permissionSettingId) {
         PermissionSetting permissionSetting = permissionSettingService.getById(permissionSettingId);
         if (ObjectUtils.isEmpty(permissionSetting)) {
             return CommonResult.fail("非法进入");
@@ -217,13 +212,13 @@ public class AdminMenuController implements AdminMenuAPI {
         if (ObjectUtils.isEmpty(adminMenuId)) {
             return CommonResult.fail("参数异常");
         }
-        PermissionSetting p=permissionSettingService.getMenuPermissionSetting(adminMenuId);
+        PermissionSetting p = permissionSettingService.getMenuPermissionSetting(adminMenuId);
 
         return CommonResult.ok(p);
     }
 
     @Override
-    @Transactional(rollbackFor = Exception.class)
+    @Transactional(rollbackFor = Exception.class)//1
     public CommonResult updateMenuPermissionSetting(UpdateMenuPermissionSettingDto updateMenuPermissionSetting) {
         String permissionSettingId = updateMenuPermissionSetting.getPermissionSettingId();
         PermissionSetting permissionSetting = permissionSettingService.getById(permissionSettingId);
@@ -237,19 +232,16 @@ public class AdminMenuController implements AdminMenuAPI {
         }
 
         PermissionSetting permissionSetting1 = new PermissionSetting();
-        BeanUtils.copyProperties(updateMenuPermissionSetting,permissionSetting1);
+        BeanUtils.copyProperties(updateMenuPermissionSetting, permissionSetting1);
 
         AdminMenu adminMenu = adminMenuService.getById(permissionSetting1.getAdminMenuId());
         adminMenu.setName(updateMenuPermissionSetting.getName());
 
-        try {
-            boolean update = permissionSettingService.updateById(permissionSetting1);
-            boolean update1 = adminMenuService.updateById(adminMenu);
-            if (update && update1) {
-                return CommonResult.ok();
-            }
-        }catch (Exception e){
-            e.printStackTrace();
+
+        boolean update = permissionSettingService.updateById(permissionSetting1);
+        boolean update1 = adminMenuService.updateById(adminMenu);
+        if (update && update1) {
+            return CommonResult.ok();
         }
 
         return CommonResult.fail();
@@ -273,17 +265,17 @@ public class AdminMenuController implements AdminMenuAPI {
 
         Integer id = adminMenu.getId();
         List<Admin> adminList = adminService.getByAdminMenuId(id);
-        if (adminList.size()>0) {
+        if (adminList.size() > 0) {
             return CommonResult.fail("该角色下还有用户");
         }
 
-        if (parentId!=0) {
+        if (parentId != 0) {
             adminMenuService.removeById(adminMenuId);
         }
         //通过角色id找到对应的下级
         List<AdminMenu> list = adminMenuService.getList(adminMenu.getId());
 
-        if (list.size()>0) {
+        if (list.size() > 0) {
             return CommonResult.fail("子级未全部被删除");
         }
 
@@ -294,8 +286,9 @@ public class AdminMenuController implements AdminMenuAPI {
 
     /**
      * 根据父类ID获取树形菜单数据
+     *
      * @param parentID 父级ID
-     * @param lists 数据集合
+     * @param lists    数据集合
      * @return
      */
     private List<AdminMenuTreeVo> QueryAreaTreeRecords(Integer parentID, List<AdminMenu> lists) {

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

@@ -56,7 +56,7 @@ public class BlacklistController implements BlacklistControllerAPI {
     }
 
     @Override
-    @Transactional(rollbackFor = Exception.class)
+    @Transactional(rollbackFor = Exception.class)//1
     public CommonResult delete(BlacklistDeleteDto dto) {
         List<Integer> ids = dto.getIds();
         if (ObjectUtils.isEmpty(ids)) {
@@ -67,38 +67,35 @@ public class BlacklistController implements BlacklistControllerAPI {
         wrapperB.in(Blacklist::getId, ids);
         List<Blacklist> blacklists = blacklistService.list(wrapperB);
 
-        try {
 
-            for (Blacklist blacklist : blacklists) {
-                Integer reserveUserId = blacklist.getReserveUserId();
+        for (Blacklist blacklist : blacklists) {
+            Integer reserveUserId = blacklist.getReserveUserId();
 
-                LambdaQueryWrapper<BlacklistOrder> wrapperBO = new LambdaQueryWrapper<>();
-                wrapperBO.eq(BlacklistOrder::getReserveUserId, reserveUserId);
-                List<BlacklistOrder> list = blacklistOrderService.list(wrapperBO);
+            LambdaQueryWrapper<BlacklistOrder> wrapperBO = new LambdaQueryWrapper<>();
+            wrapperBO.eq(BlacklistOrder::getReserveUserId, reserveUserId);
+            List<BlacklistOrder> list = blacklistOrderService.list(wrapperBO);
 
-                if (ObjectUtils.isNotEmpty(list)) {
-                    ArrayList<Integer> blacklistOrders = new ArrayList<>();
-                    for (BlacklistOrder blacklistOrder : list) {
-                        blacklistOrders.add(blacklistOrder.getId());
-                    }
-                    blacklistOrderService.removeByIds(blacklistOrders);
+            if (ObjectUtils.isNotEmpty(list)) {
+                ArrayList<Integer> blacklistOrders = new ArrayList<>();
+                for (BlacklistOrder blacklistOrder : list) {
+                    blacklistOrders.add(blacklistOrder.getId());
                 }
-
+                blacklistOrderService.removeByIds(blacklistOrders);
             }
 
-            blacklistService.removeByIds(ids);
-            return CommonResult.ok();
-        }catch (Exception e){
-            e.printStackTrace();
         }
-        return CommonResult.fail();
+
+        blacklistService.removeByIds(ids);
+        return CommonResult.ok();
+
+
     }
 
 
     //    每月定期清空黑名单表
     @Scheduled(cron = "0 0 2 1 * ? ")
 //    @Scheduled(cron = "0 0/1 * * * ?")
-    public void deleteBlacklist(){
+    public void deleteBlacklist() {
 //        先删除黑名单订单
         blacklistOrderService.remove(new LambdaQueryWrapper<>());
 //        删除黑名单

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

@@ -44,7 +44,7 @@ public class BlacklistOrderController implements BlacklistOrderControllerAPI {
 
 
     @Override
-    public CommonResult list(Integer page, Integer size, String reserveName, String phone, String cardNumber,String startTime,String endTime) {
+    public CommonResult list(Integer page, Integer size, String reserveName, String phone, String cardNumber, String startTime, String endTime) {
 
 
         LambdaQueryWrapper<BlacklistOrder> wrapper = new LambdaQueryWrapper<>();
@@ -60,7 +60,7 @@ public class BlacklistOrderController implements BlacklistOrderControllerAPI {
     }
 
     @Override
-    @Transactional(rollbackFor = Exception.class)
+    @Transactional(rollbackFor = Exception.class)//1
     public CommonResult delete(BlacklistOrderDeleteDto dto) {
 
         List<Integer> ids = dto.getIds();
@@ -75,30 +75,26 @@ public class BlacklistOrderController implements BlacklistOrderControllerAPI {
         wrapperBO.in(BlacklistOrder::getId, ids);
         List<BlacklistOrder> blacklistOrders = blacklistOrderService.list(wrapperBO);
 
-        try {
-
-            for (BlacklistOrder blacklistOrder : blacklistOrders) {
-                LambdaQueryWrapper<Blacklist> wrapperB = new LambdaQueryWrapper<>();
-                wrapperB.eq(Blacklist::getReserveUserId, blacklistOrder.getReserveUserId());
-                Blacklist blacklist = blacklistService.getOne(wrapperB);
-                if (ObjectUtils.isNotEmpty(blacklist)) {
-                    Integer count1 = blacklist.getCount();
-                    if (count1 - 1 >= count) {
-                        blacklist.setCount(count1 - 1);
-                        blacklistService.updateById(blacklist);
-                    } else {
-                        blacklistService.removeById(blacklist.getId());
-                    }
-                }
 
+        for (BlacklistOrder blacklistOrder : blacklistOrders) {
+            LambdaQueryWrapper<Blacklist> wrapperB = new LambdaQueryWrapper<>();
+            wrapperB.eq(Blacklist::getReserveUserId, blacklistOrder.getReserveUserId());
+            Blacklist blacklist = blacklistService.getOne(wrapperB);
+            if (ObjectUtils.isNotEmpty(blacklist)) {
+                Integer count1 = blacklist.getCount();
+                if (count1 - 1 >= count) {
+                    blacklist.setCount(count1 - 1);
+                    blacklistService.updateById(blacklist);
+                } else {
+                    blacklistService.removeById(blacklist.getId());
+                }
             }
-            blacklistOrderService.removeByIds(ids);
-            return CommonResult.ok();
-        } catch (Exception e) {
-            e.printStackTrace();
+
         }
+        blacklistOrderService.removeByIds(ids);
+        return CommonResult.ok();
+
 
-        return CommonResult.fail();
     }
 }
 

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

@@ -59,7 +59,7 @@ public class BlacklistSettingController implements BlacklistSettingControllerAPI
     }
 
     @Override
-    @Transactional(rollbackFor = Exception.class)
+    @Transactional(rollbackFor = Exception.class)//1
     public CommonResult update(BlacklistUpdateDto blacklistUpdateDto) {
         Integer id = blacklistUpdateDto.getId();
         Integer count = blacklistUpdateDto.getCount();
@@ -70,64 +70,61 @@ public class BlacklistSettingController implements BlacklistSettingControllerAPI
         }
 
         Integer count2 = byId.getCount();
-        try {
-
-            if (count.equals(count2)) {
-                return CommonResult.ok();
-            } else if (count > count2) {
-                LambdaQueryWrapper<Blacklist> wrapperB = new LambdaQueryWrapper<>();
-                wrapperB.eq(Blacklist::getCount, count2);
-                List<Blacklist> list = blacklistService.list(wrapperB);
-                ArrayList<Integer> ids = new ArrayList<>();
-                for (Blacklist blacklist : list) {
-                    ids.add(blacklist.getId());
-                }
-                if (ids.size() > 0) {
-                    blacklistService.removeByIds(ids);
-                }
 
-            } else if (count < count2) {
+
+        if (count.equals(count2)) {
+            return CommonResult.ok();
+        } else if (count > count2) {
+            LambdaQueryWrapper<Blacklist> wrapperB = new LambdaQueryWrapper<>();
+            wrapperB.eq(Blacklist::getCount, count2);
+            List<Blacklist> list = blacklistService.list(wrapperB);
+            ArrayList<Integer> ids = new ArrayList<>();
+            for (Blacklist blacklist : list) {
+                ids.add(blacklist.getId());
+            }
+            if (ids.size() > 0) {
+                blacklistService.removeByIds(ids);
+            }
+
+        } else if (count < count2) {
 //            多变少,需要从黑名单订单表里找
-                List<BlacklistVo> vos = blacklistOrderService.getBlacklist(count);
-                if (vos.size() > 0) {
-                    ArrayList<Blacklist> blacklists = new ArrayList<>();
-                    for (BlacklistVo vo : vos) {
-                        Integer id1 = vo.getId();
-                        Users users = usersService.getById(id1);
+            List<BlacklistVo> vos = blacklistOrderService.getBlacklist(count);
+            if (vos.size() > 0) {
+                ArrayList<Blacklist> blacklists = new ArrayList<>();
+                for (BlacklistVo vo : vos) {
+                    Integer id1 = vo.getId();
+                    Users users = usersService.getById(id1);
 //                        通过预定id找到对应的黑名单预定人id
-                        LambdaQueryWrapper<Blacklist> wrapperB=new LambdaQueryWrapper<>();
-                        wrapperB.eq(Blacklist::getReserveUserId,id1);
-                        Blacklist one = blacklistService.getOne(wrapperB);
-                        if (ObjectUtils.isNotEmpty(one)) {
-                            one.setCount(vo.getCount());
-                            blacklists.add(one);
-                        }else {
-                            if (ObjectUtils.isNotEmpty(users)) {
-                                Blacklist blacklist = new Blacklist();
-                                blacklist.setReserveUserId(id1);
-                                blacklist.setReserveName(users.getUserName());
-                                blacklist.setPhone(users.getPhone());
-                                blacklist.setCardNumber(users.getCardNumber());
-                                blacklist.setCount(vo.getCount());
-                                blacklists.add(blacklist);
-                            }
+                    LambdaQueryWrapper<Blacklist> wrapperB = new LambdaQueryWrapper<>();
+                    wrapperB.eq(Blacklist::getReserveUserId, id1);
+                    Blacklist one = blacklistService.getOne(wrapperB);
+                    if (ObjectUtils.isNotEmpty(one)) {
+                        one.setCount(vo.getCount());
+                        blacklists.add(one);
+                    } else {
+                        if (ObjectUtils.isNotEmpty(users)) {
+                            Blacklist blacklist = new Blacklist();
+                            blacklist.setReserveUserId(id1);
+                            blacklist.setReserveName(users.getUserName());
+                            blacklist.setPhone(users.getPhone());
+                            blacklist.setCardNumber(users.getCardNumber());
+                            blacklist.setCount(vo.getCount());
+                            blacklists.add(blacklist);
                         }
-
-                    }
-                    if (blacklists.size() > 0) {
-                        blacklistService.saveOrUpdateBatch(blacklists);
                     }
+
+                }
+                if (blacklists.size() > 0) {
+                    blacklistService.saveOrUpdateBatch(blacklists);
                 }
             }
+        }
 
-            byId.setCount(count);
-            blacklistSettingService.updateById(byId);
+        byId.setCount(count);
+        blacklistSettingService.updateById(byId);
+
+        return CommonResult.ok();
 
-            return CommonResult.ok();
-        } catch (Exception e) {
-            e.printStackTrace();
-        }
-        return CommonResult.fail();
     }
 }
 

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

@@ -22,7 +22,7 @@ import java.util.List;
 
 /**
  * <p>
- *  前端控制器
+ * 前端控制器
  * </p>
  *
  * @author ceshi
@@ -55,8 +55,8 @@ public class FacilityServicesController implements FacilityServicesControllerAPI
             return CommonResult.fail("此账号暂无该权限");
         }
         String houseService = facilityServicesSaveDto.getHouseService();
-        LambdaQueryWrapper<FacilityServices> wrapperRC=new LambdaQueryWrapper<>();
-        wrapperRC.eq(FacilityServices::getHouseService,houseService);
+        LambdaQueryWrapper<FacilityServices> wrapperRC = new LambdaQueryWrapper<>();
+        wrapperRC.eq(FacilityServices::getHouseService, houseService);
         FacilityServices one = facilityServicesService.getOne(wrapperRC);
         if (ObjectUtils.isNotEmpty(one)) {
             return CommonResult.fail("该设施已存在");
@@ -94,7 +94,7 @@ public class FacilityServicesController implements FacilityServicesControllerAPI
     }
 
     @Override
-    @Transactional(rollbackFor = Exception.class)
+    @Transactional(rollbackFor = Exception.class)//1
     public CommonResult update(FacilityServicesUpdateDto facilityServicesUpdateDto) {
         String permissionSettingId = facilityServicesUpdateDto.getPermissionSettingId();
         PermissionSetting permissionSetting = permissionSettingService.getById(permissionSettingId);
@@ -111,8 +111,8 @@ public class FacilityServicesController implements FacilityServicesControllerAPI
         String houseService = facilityServicesUpdateDto.getHouseService();
 
         if (!houseService1.equals(houseService)) {
-            LambdaQueryWrapper<FacilityServices> wrapperRC=new LambdaQueryWrapper<>();
-            wrapperRC.eq(FacilityServices::getHouseService,houseService);
+            LambdaQueryWrapper<FacilityServices> wrapperRC = new LambdaQueryWrapper<>();
+            wrapperRC.eq(FacilityServices::getHouseService, houseService);
             FacilityServices one = facilityServicesService.getOne(wrapperRC);
             if (ObjectUtils.isNotEmpty(one)) {
                 return CommonResult.fail("该设施已存在");
@@ -126,28 +126,23 @@ public class FacilityServicesController implements FacilityServicesControllerAPI
         facilityServices.setId(facilityServicesUpdateDto.getId());
 
 //        修改房型设施
-        List<House> list=housesService.getHouseService(houseService1);
+        List<House> list = housesService.getHouseService(houseService1);
         ArrayList<House> houses = new ArrayList<>();
         for (House house : list) {
             String roomConfiguration = house.getRoomConfiguration();
-            String configurations=roomConfiguration.replace(houseService1,houseService);
+            String configurations = roomConfiguration.replace(houseService1, houseService);
             house.setRoomConfiguration(configurations);
             houses.add(house);
         }
-        try {
-            facilityServicesService.updateById(facilityServices);
-            housesService.updateBatchById(houses);
-            return CommonResult.ok();
-        }catch (Exception e){
-            e.printStackTrace();
-        }
 
+        facilityServicesService.updateById(facilityServices);
+        housesService.updateBatchById(houses);
+        return CommonResult.ok();
 
-        return CommonResult.fail();
     }
 
     @Override
-    @Transactional(rollbackFor = Exception.class)
+    @Transactional(rollbackFor = Exception.class)//1
     public CommonResult delete(String permissionSettingId, int id) {
         PermissionSetting permissionSetting = permissionSettingService.getById(permissionSettingId);
         if (ObjectUtils.isEmpty(permissionSetting)) {
@@ -165,20 +160,20 @@ public class FacilityServicesController implements FacilityServicesControllerAPI
         FacilityServices byId = facilityServicesService.getById(id);
         String houseService = byId.getHouseService();
         //        修改房型设施
-        List<House> list=housesService.getHouseService(houseService);
+        List<House> list = housesService.getHouseService(houseService);
         ArrayList<House> houses = new ArrayList<>();
         for (House house : list) {
             String roomConfiguration = house.getRoomConfiguration();
-            String configurations=roomConfiguration.replace(houseService,"");
+            String configurations = roomConfiguration.replace(houseService, "");
             String[] split = configurations.split(",");
-            String configs="";
-            for (int i = 0; i <split.length; i++) {
-                String s= split[i];
+            String configs = "";
+            for (int i = 0; i < split.length; i++) {
+                String s = split[i];
                 if (ObjectUtils.isNotEmpty(s)) {
                     if (ObjectUtils.isNotEmpty(configs)) {
-                        configs=configs+","+s;
-                    }else {
-                       configs=s;
+                        configs = configs + "," + s;
+                    } else {
+                        configs = s;
                     }
                 }
 
@@ -188,18 +183,13 @@ public class FacilityServicesController implements FacilityServicesControllerAPI
         }
 
 
-        try {
-            boolean b = facilityServicesService.removeById(id);
-            if (ObjectUtils.isNotEmpty(houses)) {
-                housesService.updateBatchById(houses);
-            }
-
-            return CommonResult.ok();
-        }catch (Exception e){
-            e.printStackTrace();
+        boolean b = facilityServicesService.removeById(id);
+        if (ObjectUtils.isNotEmpty(houses)) {
+            housesService.updateBatchById(houses);
         }
 
-        return CommonResult.fail();
+        return CommonResult.ok();
+
 
     }
 

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

@@ -60,9 +60,9 @@ public class HouseController implements HouseAPI {
 
     @Override
     @Encrypt
-    @Transactional(rollbackFor = Exception.class)
+    @Transactional(rollbackFor = Exception.class)//1
     public CommonResult save(@RequestBody HouseDto houseDto) {
-        if (ObjectUtils.isEmpty(houseDto)  && ObjectUtils.isEmpty(houseDto.getAdminId())) {
+        if (ObjectUtils.isEmpty(houseDto) && ObjectUtils.isEmpty(houseDto.getAdminId())) {
             return CommonResult.fail("参数异常");
         }
 
@@ -95,8 +95,7 @@ public class HouseController implements HouseAPI {
             return CommonResult.fail("该房型已存在");
         }
 
-        try {
-            houseService.save(house);
+        houseService.save(house);
 
 //            ArrayList<HouseNumber> houseNumbers = new ArrayList<>();
 //            for (String roomNumber : roomNumbers) {
@@ -111,9 +110,6 @@ public class HouseController implements HouseAPI {
 //                return CommonResult.ok();
 //            }
 
-        } catch (Exception e) {
-            return CommonResult.fail();
-        }
 
         return CommonResult.ok();
     }
@@ -168,7 +164,7 @@ public class HouseController implements HouseAPI {
 
 
     @Override
-    @Transactional(rollbackFor = Exception.class)
+    @Transactional(rollbackFor = Exception.class)//1
     public CommonResult update(HouseDto houseDto) {
         if (ObjectUtils.isEmpty(houseDto) && ObjectUtils.isEmpty(houseDto.getHouse().getId()) && ObjectUtils.isEmpty(houseDto.getAdminId())) {
             return CommonResult.fail("参数异常");
@@ -199,7 +195,7 @@ public class HouseController implements HouseAPI {
 
         String roomName = byId.getRoomName();
         Integer type = byId.getRoomType();
-        if (!house.getRoomName().equals(roomName)||!type.equals(house.getRoomType())) {
+        if (!house.getRoomName().equals(roomName) || !type.equals(house.getRoomType())) {
             LambdaQueryWrapper<House> wrapper = new LambdaQueryWrapper<>();
             wrapper.eq(House::getRoomName, house.getRoomName())
                     .eq(House::getRoomType, house.getRoomType());
@@ -214,8 +210,6 @@ public class HouseController implements HouseAPI {
         return CommonResult.ok();
 
 
-
-
 //        try {
 //            //        通过houseId,找到房间号
 ////            LambdaQueryWrapper<HouseNumber> wrapperHn = new LambdaQueryWrapper<>();
@@ -272,7 +266,7 @@ public class HouseController implements HouseAPI {
 
 
     @Override
-    @Transactional(rollbackFor = Exception.class)
+    @Transactional(rollbackFor = Exception.class)//1
     public CommonResult delete(String houseId, int adminId) {
         if (ObjectUtils.isEmpty(houseId) && ObjectUtils.isEmpty(adminId)) {
             return CommonResult.fail();
@@ -304,7 +298,7 @@ public class HouseController implements HouseAPI {
 //                return CommonResult.fail(houseNumber.getRoomNumber() + "房间在使用,无法删除");
 //            }
 //        }
-        try {
+
 //            for (HouseNumber houseNumber : list) {
 //                Integer id = houseNumber.getId();
 //                houseNumberService.removeById(id);
@@ -314,19 +308,16 @@ public class HouseController implements HouseAPI {
             if (ObjectUtils.isEmpty(byId)) {
                 return CommonResult.fail("参数异常");
             }
-            List<HouseNumber> houseNumberList=houseNumberService.getHouseId(houseId);
+            List<HouseNumber> houseNumberList = houseNumberService.getHouseId(houseId);
 
-            if (ObjectUtils.isNotEmpty(houseNumberList)||houseNumberList.size()>0) {
+            if (ObjectUtils.isNotEmpty(houseNumberList) || houseNumberList.size() > 0) {
                 return CommonResult.fail("该房型下还有房间");
             }
 
             houseService.removeById(Integer.valueOf(houseId));
 
             return CommonResult.ok();
-        } catch (Exception e) {
-            e.printStackTrace();
-            return CommonResult.fail();
-        }
+
 
 
     }
@@ -372,7 +363,7 @@ public class HouseController implements HouseAPI {
         LambdaQueryWrapper<House> wrapper = new LambdaQueryWrapper<>();
         wrapper.eq(House::getRoomType, type);
 //        上架
-        wrapper.eq(House::getIsAdded,1);
+        wrapper.eq(House::getIsAdded, 1);
         IPage<House> page1 = houseService.page(new Page<>(page, size), wrapper);
 
         List<House> records = page1.getRecords();
@@ -406,9 +397,9 @@ public class HouseController implements HouseAPI {
             String[] split1 = roomConfiguration.split(",");
             ArrayList<FacilityServices> strings = new ArrayList<>();
             for (int i = 0; i < split1.length; i++) {
-                String name=split1[i];
-                LambdaQueryWrapper<FacilityServices> wrapperRC=new LambdaQueryWrapper<>();
-                wrapperRC.eq(FacilityServices::getHouseService,name);
+                String name = split1[i];
+                LambdaQueryWrapper<FacilityServices> wrapperRC = new LambdaQueryWrapper<>();
+                wrapperRC.eq(FacilityServices::getHouseService, name);
                 FacilityServices one = facilityServicesService.getOne(wrapperRC);
                 if (ObjectUtils.isNotEmpty(one)) {
                     strings.add(one);
@@ -461,15 +452,15 @@ public class HouseController implements HouseAPI {
 
             LambdaQueryWrapper<HouseNumber> wrapperHN2 = new LambdaQueryWrapper<>();
             wrapperHN2.eq(HouseNumber::getHouseId, id);
-            wrapperHN2.eq(HouseNumber::getHouseStatus,2);
+            wrapperHN2.eq(HouseNumber::getHouseStatus, 2);
             List<HouseNumber> list = houseNumberService.list(wrapperHN2);
 
-            if (houseNumberList.size()-houseNumberStates.size()-list.size()>0) {
+            if (houseNumberList.size() - houseNumberStates.size() - list.size() > 0) {
                 houseAppletPageVo.setHouseStatus("1");
 
-                houseAppletPageVo.setSurplusCount(houseNumberList.size()-houseNumberStates.size()-list.size());
+                houseAppletPageVo.setSurplusCount(houseNumberList.size() - houseNumberStates.size() - list.size());
 
-            }else {
+            } else {
                 houseAppletPageVo.setHouseStatus("2");
                 houseAppletPageVo.setSurplusCount(0);
             }
@@ -497,8 +488,8 @@ public class HouseController implements HouseAPI {
             return CommonResult.fail("参数异常");
         }
         JSONObject jsonObject = new JSONObject();
-        jsonObject.put("housePicture",house.getHousePicture());
-        jsonObject.put("introductory",house.getIntroductory());
+        jsonObject.put("housePicture", house.getHousePicture());
+        jsonObject.put("introductory", house.getIntroductory());
         return CommonResult.ok(jsonObject);
     }
 

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

@@ -78,7 +78,7 @@ public class HouseLockController implements HouseLockControllerAPI {
     BuildingService buildingService;
 
     @Override
-    public CommonResult list(String permissionSettingId, String roomNumber, String roomName,Integer houseType,Integer buildingId) {
+    public CommonResult list(String permissionSettingId, String roomNumber, String roomName, Integer houseType, Integer buildingId) {
         PermissionSetting permissionSetting = permissionSettingService.getById(permissionSettingId);
         if (ObjectUtils.isEmpty(permissionSetting)) {
             return CommonResult.fail("非法进入");
@@ -92,7 +92,7 @@ public class HouseLockController implements HouseLockControllerAPI {
 
         LambdaQueryWrapper<House> hWrapper = new LambdaQueryWrapper<>();
         hWrapper.eq(ObjectUtils.isNotEmpty(roomName), House::getRoomName, roomName);
-        hWrapper.eq(ObjectUtils.isNotEmpty(houseType),House::getRoomType,houseType);
+        hWrapper.eq(ObjectUtils.isNotEmpty(houseType), House::getRoomType, houseType);
         List<House> list = houseService.list(hWrapper);
         String houseIds = "";
         for (int i = 0; i < list.size(); i++) {
@@ -106,7 +106,7 @@ public class HouseLockController implements HouseLockControllerAPI {
             }
         }
 
-        List<houseLockListVo> voList = houseNumberService.houseLockPage(roomNumber, houseIds,buildingId);
+        List<houseLockListVo> voList = houseNumberService.houseLockPage(roomNumber, houseIds, buildingId);
 
         ArrayList<HouseLockVo> vos = new ArrayList<>();
         for (House house : list) {
@@ -126,7 +126,7 @@ public class HouseLockController implements HouseLockControllerAPI {
     }
 
     @Override
-    public CommonResult particular(String permissionSettingId,Integer houseNumberId) {
+    public CommonResult particular(String permissionSettingId, Integer houseNumberId) {
         PermissionSetting permissionSetting = permissionSettingService.getById(permissionSettingId);
         if (ObjectUtils.isEmpty(permissionSetting)) {
             return CommonResult.fail("非法进入");
@@ -140,8 +140,8 @@ public class HouseLockController implements HouseLockControllerAPI {
             return CommonResult.fail("参数异常");
         }
 
-        LambdaQueryWrapper<HouseLock> wrapper=new LambdaQueryWrapper<>();
-        wrapper.eq(HouseLock::getHouseNumberId,houseNumberId);
+        LambdaQueryWrapper<HouseLock> wrapper = new LambdaQueryWrapper<>();
+        wrapper.eq(HouseLock::getHouseNumberId, houseNumberId);
         HouseLock houseLock = houseLockService.getOne(wrapper);
         if (ObjectUtils.isEmpty(houseLock)) {
             return CommonResult.fail("请先绑定门锁");
@@ -184,16 +184,16 @@ public class HouseLockController implements HouseLockControllerAPI {
         }
 
         Date date = new Date();
-        List<UnlockingKeyVo> unlockingKeyDtos = unlockingService.key(houseNumberId,date);
+        List<UnlockingKeyVo> unlockingKeyDtos = unlockingService.key(houseNumberId, date);
 
-        List<UnlockingAdmin> unlockingAdmins = unlockingAdminService.key(houseNumberId,date);
-        List<UnlockingCustom> unlockingCustoms = unlockingCustomService.key(houseNumberId,date);
+        List<UnlockingAdmin> unlockingAdmins = unlockingAdminService.key(houseNumberId, date);
+        List<UnlockingCustom> unlockingCustoms = unlockingCustomService.key(houseNumberId, date);
 
-        List<UnlockingEmployee> unlockingEmployees= unlockingEmployeeService.list(
+        List<UnlockingEmployee> unlockingEmployees = unlockingEmployeeService.list(
                 new QueryWrapper<UnlockingEmployee>()
-                        .eq("house_number_id",houseNumberId)
-                        .gt("end_time",date)
-                        .lt("start_time",date));
+                        .eq("house_number_id", houseNumberId)
+                        .gt("end_time", date)
+                        .lt("start_time", date));
 
         HashMap<String, Object> map = new HashMap<>();
         map.put("order", unlockingKeyDtos);
@@ -245,7 +245,7 @@ public class HouseLockController implements HouseLockControllerAPI {
     }
 
     @Override
-    @Transactional(rollbackFor = Exception.class)
+    @Transactional(rollbackFor = Exception.class)//1
     public CommonResult unbind(String permissionSettingId, String houseNumberId, String adminId) {
         PermissionSetting permissionSetting = permissionSettingService.getById(permissionSettingId);
         if (ObjectUtils.isEmpty(permissionSetting)) {
@@ -272,39 +272,33 @@ public class HouseLockController implements HouseLockControllerAPI {
         }
 
 
-        try {
+        LambdaQueryWrapper<HouseLock> wrapper = new LambdaQueryWrapper<>();
+        wrapper.eq(HouseLock::getHouseNumberId, houseNumberId);
 
-            LambdaQueryWrapper<HouseLock> wrapper = new LambdaQueryWrapper<>();
-            wrapper.eq(HouseLock::getHouseNumberId, houseNumberId);
-
-            HouseLock houseLock = houseLockService.getOne(wrapper);
-            if (ObjectUtils.isEmpty(houseLock)) {
-                return CommonResult.fail("该门锁不存在");
-            }
+        HouseLock houseLock = houseLockService.getOne(wrapper);
+        if (ObjectUtils.isEmpty(houseLock)) {
+            return CommonResult.fail("该门锁不存在");
+        }
 
 
-            OperatingRecord operatingRecord = new OperatingRecord();
-            operatingRecord.setType("解绑设备");
-           operatingRecord.setHouseNumberId(houseNumber.getId());
-            operatingRecord.setRoomNumber(houseNumber.getRoomNumber());
-            operatingRecord.setOperatorName(admin.getName());
-            DateTimeFormatter dateTimeFormatter1 = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
-            operatingRecord.setDataTime(LocalDateTime.now().format(dateTimeFormatter1));
-            operatingRecord.setContent("解绑设备:" + houseLock.getEquipmentType());
+        OperatingRecord operatingRecord = new OperatingRecord();
+        operatingRecord.setType("解绑设备");
+        operatingRecord.setHouseNumberId(houseNumber.getId());
+        operatingRecord.setRoomNumber(houseNumber.getRoomNumber());
+        operatingRecord.setOperatorName(admin.getName());
+        DateTimeFormatter dateTimeFormatter1 = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
+        operatingRecord.setDataTime(LocalDateTime.now().format(dateTimeFormatter1));
+        operatingRecord.setContent("解绑设备:" + houseLock.getEquipmentType());
 
-            houseLockService.remove(wrapper);
-            operatingRecordService.save(operatingRecord);
-            return CommonResult.ok();
+        houseLockService.remove(wrapper);
+        operatingRecordService.save(operatingRecord);
+        return CommonResult.ok();
 
-        } catch (Exception e) {
-            e.printStackTrace();
-            return CommonResult.fail();
-        }
 
     }
 
     @Override
-    @Transactional(rollbackFor = Exception.class)
+    @Transactional(rollbackFor = Exception.class)//1
     public CommonResult binding(BingingDto bingingDto) {
         String permissionSettingId = bingingDto.getPermissionSettingId();
         PermissionSetting permissionSetting = permissionSettingService.getById(permissionSettingId);
@@ -333,77 +327,73 @@ public class HouseLockController implements HouseLockControllerAPI {
             return CommonResult.fail("该管理员不存在");
         }
 
-        try {
+
 //            判断该房间是否已绑定
-            LambdaQueryWrapper<HouseLock> wrapper = new LambdaQueryWrapper<>();
-            wrapper.eq(HouseLock::getHouseNumberId, houseNumberId);
+        LambdaQueryWrapper<HouseLock> wrapper = new LambdaQueryWrapper<>();
+        wrapper.eq(HouseLock::getHouseNumberId, houseNumberId);
 
-            HouseLock houseLockOld = houseLockService.getOne(wrapper);
-            if (ObjectUtils.isNotEmpty(houseLockOld)) {
-                return CommonResult.fail("该房间已绑定，请解绑后在绑定");
-            }
+        HouseLock houseLockOld = houseLockService.getOne(wrapper);
+        if (ObjectUtils.isNotEmpty(houseLockOld)) {
+            return CommonResult.fail("该房间已绑定，请解绑后在绑定");
+        }
 
 
 //            绑定设备
-            HouseLock houseLock = new HouseLock();
+        HouseLock houseLock = new HouseLock();
 //            设备型号
-            houseLock.setEquipmentType(bingingDto.getLuid());
-            JSONObject jsonObject = passwordIssController.particular(bingingDto.getLuid());
-            if (ObjectUtils.isEmpty(jsonObject) || jsonObject.getString("state") == null) {
-                return CommonResult.fail("门锁不存在");
-            }
+        houseLock.setEquipmentType(bingingDto.getLuid());
+        JSONObject jsonObject = passwordIssController.particular(bingingDto.getLuid());
+        if (ObjectUtils.isEmpty(jsonObject) || jsonObject.getString("state") == null) {
+            return CommonResult.fail("门锁不存在");
+        }
 //            电量
-            String battery = jsonObject.getString("battery");
-            houseLock.setElectricQuantity(battery);
+        String battery = jsonObject.getString("battery");
+        houseLock.setElectricQuantity(battery);
 //            绑定时间
-            houseLock.setBindingTime(new Date());
-            String state = jsonObject.getString("state");
+        houseLock.setBindingTime(new Date());
+        String state = jsonObject.getString("state");
 //            网络状态
-            houseLock.setNetworkState(state);
+        houseLock.setNetworkState(state);
 //            设备状态
-            houseLock.setEquipmentState(state);
+        houseLock.setEquipmentState(state);
 //            房 间号
-            houseLock.setHouseNumberId(Integer.valueOf(houseNumberId));
-            houseLock.setNetworkType("WiFi");
-            houseLock.setWifiMac("WIFIMAC");
-            houseLock.setNfcFunction(0);
+        houseLock.setHouseNumberId(Integer.valueOf(houseNumberId));
+        houseLock.setNetworkType("WiFi");
+        houseLock.setWifiMac("WIFIMAC");
+        houseLock.setNfcFunction(0);
 
 //            操作记录
-            OperatingRecord operatingRecord = new OperatingRecord();
-            operatingRecord.setType("绑定设备");
-            operatingRecord.setHouseNumberId(houseNumber.getId());
-            operatingRecord.setRoomNumber(houseNumber.getRoomNumber());
-            operatingRecord.setOperatorName(admin.getName());
-            DateTimeFormatter dateTimeFormatter1 = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
-            operatingRecord.setDataTime(LocalDateTime.now().format(dateTimeFormatter1));
-            operatingRecord.setContent("绑定设备:" + bingingDto.getLuid());
-
-            houseLockService.save(houseLock);
-            operatingRecordService.save(operatingRecord);
+        OperatingRecord operatingRecord = new OperatingRecord();
+        operatingRecord.setType("绑定设备");
+        operatingRecord.setHouseNumberId(houseNumber.getId());
+        operatingRecord.setRoomNumber(houseNumber.getRoomNumber());
+        operatingRecord.setOperatorName(admin.getName());
+        DateTimeFormatter dateTimeFormatter1 = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
+        operatingRecord.setDataTime(LocalDateTime.now().format(dateTimeFormatter1));
+        operatingRecord.setContent("绑定设备:" + bingingDto.getLuid());
+
+        houseLockService.save(houseLock);
+        operatingRecordService.save(operatingRecord);
 
-            return CommonResult.ok();
+        return CommonResult.ok();
 
-        } catch (Exception e) {
-            e.printStackTrace();
-        }
 
-        return CommonResult.fail();
     }
 
     @Override
     public CommonResult ifBinging(String houseNumberId) {
-        LambdaQueryWrapper<HouseLock> wrapper=new LambdaQueryWrapper<>();
-        wrapper.eq(HouseLock::getHouseNumberId,houseNumberId);
+        LambdaQueryWrapper<HouseLock> wrapper = new LambdaQueryWrapper<>();
+        wrapper.eq(HouseLock::getHouseNumberId, houseNumberId);
         HouseLock houseLock = houseLockService.getOne(wrapper);
-        Integer status =0;
+        Integer status = 0;
         if (ObjectUtils.isNotEmpty(houseLock)) {
             String equipmentType = houseLock.getEquipmentType();
             if (ObjectUtils.isNotEmpty(equipmentType)) {
-                status=1;
+                status = 1;
             }
         }
         HashMap<Object, Object> map = new HashMap<>();
-        map.put("binging",status);
+        map.put("binging", status);
 
         return CommonResult.ok(map);
     }
@@ -411,7 +401,7 @@ public class HouseLockController implements HouseLockControllerAPI {
     @Override
     public void lockExport(HttpServletResponse response) {
         // 表头数据
-        List<Object> head = Arrays.asList("楼栋","单元","房型类型","房型名称","房间号","门锁设备型号");
+        List<Object> head = Arrays.asList("楼栋", "单元", "房型类型", "房型名称", "房间号", "门锁设备型号");
         // 用户1数据
         List<Object> user1 = new ArrayList<>();
         user1.add("17栋");
@@ -433,14 +423,14 @@ public class HouseLockController implements HouseLockControllerAPI {
         sheetDataList.add(user1);
         sheetDataList.add(user2);
 // 导出数据
-        ExcelUtils.export(response,"门锁绑定示例表", sheetDataList);
+        ExcelUtils.export(response, "门锁绑定示例表", sheetDataList);
 
 //        return CommonResult.ok();
     }
 
     @Override
     public CommonResult lockImport(MultipartFile file) throws Exception {
-        List<HouseLockListImportDto> dtos=ExcelUtils.readMultipartFile(file,HouseLockListImportDto.class);
+        List<HouseLockListImportDto> dtos = ExcelUtils.readMultipartFile(file, HouseLockListImportDto.class);
 
 
         ArrayList<HouseLock> houseLocks = new ArrayList<>();
@@ -457,7 +447,7 @@ public class HouseLockController implements HouseLockControllerAPI {
                     .eq(Building::getElement, element);
             Building one = buildingService.getOne(wrapperB);
             if (ObjectUtils.isEmpty(one)) {
-                return CommonResult.fail("第" + (i + 2) + "行," + "不存在" + building+"/"+element + "该楼栋单元");
+                return CommonResult.fail("第" + (i + 2) + "行," + "不存在" + building + "/" + element + "该楼栋单元");
             }
 
             Integer roomType = houseLockListImportDto.getRoomType();
@@ -469,24 +459,24 @@ public class HouseLockController implements HouseLockControllerAPI {
             String equipmentType = houseLockListImportDto.getEquipmentType();
 
 //            判断当前房型是否存在当前房间号
-            House house=houseService.getHouseName(houseName,roomType);
+            House house = houseService.getHouseName(houseName, roomType);
             if (ObjectUtils.isEmpty(house)) {
-                return CommonResult.fail("第"+(i+2)+"行,"+"不存在"+houseName+"该房型");
+                return CommonResult.fail("第" + (i + 2) + "行," + "不存在" + houseName + "该房型");
             }
             Integer houseId = house.getId();
-            HouseNumber houseNumber=houseNumberService.getRoomNumber(houseId,roomNumber);
+            HouseNumber houseNumber = houseNumberService.getRoomNumber(houseId, roomNumber);
             if (ObjectUtils.isEmpty(houseNumber)) {
-                return CommonResult.fail("第"+(i+2)+"行,"+"不存在"+roomNumber+"该房间号");
+                return CommonResult.fail("第" + (i + 2) + "行," + "不存在" + roomNumber + "该房间号");
             }
             Integer houseNumberId = houseNumber.getId();
 
-            LambdaQueryWrapper<HouseLock> wrapper=new LambdaQueryWrapper<>();
-            wrapper.eq(HouseLock::getHouseNumberId,houseNumberId);
+            LambdaQueryWrapper<HouseLock> wrapper = new LambdaQueryWrapper<>();
+            wrapper.eq(HouseLock::getHouseNumberId, houseNumberId);
             HouseLock houseLock = houseLockService.getOne(wrapper);
             if (ObjectUtils.isNotEmpty(houseLock)) {
                 houseLock.setEquipmentType(equipmentType);
                 houseLocks.add(houseLock);
-            }else {
+            } else {
                 HouseLock houseLock1 = new HouseLock();
                 houseLock1.setHouseNumberId(houseNumberId);
                 houseLock1.setEquipmentType(equipmentType);
@@ -524,7 +514,7 @@ public class HouseLockController implements HouseLockControllerAPI {
             return CommonResult.fail("未绑定门锁");
         }
 
-        passwordIssController.nfcFunction(nfcFunction,equipmentType);
+        passwordIssController.nfcFunction(nfcFunction, equipmentType);
 
         houseLock.setNfcFunction(nfcFunction);
 
@@ -535,7 +525,7 @@ public class HouseLockController implements HouseLockControllerAPI {
 
     @Override
     public CommonResult deleteLock(String id, String luid) {
-        passwordIssController.deleteLockUser(luid,id);
+        passwordIssController.deleteLockUser(luid, id);
         return CommonResult.ok();
     }
 

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

@@ -466,7 +466,7 @@ public class HouseNumberController implements HouseNumberControllerAPI {
     }
 
     @Override
-    @Transactional(rollbackFor = Exception.class)
+    @Transactional(rollbackFor = Exception.class)//1
     public CommonResult saveHouseNumber(HouseNumberDto houseNumberDto) {
         String electricEquipmentMeterName = houseNumberDto.getElectricEquipmentMeterName();
         LambdaQueryWrapper<ElectricEquipment> wrapperE = new LambdaQueryWrapper<>();
@@ -501,43 +501,40 @@ public class HouseNumberController implements HouseNumberControllerAPI {
         houseNumber.setHouseStatus(1);
 //                默认关电
         houseNumber.setElectricType("2");
-        try {
 
-            houseNumberService.save(houseNumber);
 
-            String doorLock = houseNumberDto.getDoorLock();
-            if (ObjectUtils.isNotEmpty(doorLock)) {
-                HouseLock houseLock = new HouseLock();
-                houseLock.setHouseNumberId(houseNumber.getId());
-                houseLock.setEquipmentType(doorLock);
-                //            绑定时间
-                houseLock.setBindingTime(new Date());
+        houseNumberService.save(houseNumber);
 
-                JSONObject particular = passwordIssController.particular(doorLock);
-                if (ObjectUtils.isEmpty(particular) || particular.getString("state") == null) {
-                    return CommonResult.fail("门锁不存在");
-                }
-                //        设备连接状态
-                String state = particular.getString("state");
+        String doorLock = houseNumberDto.getDoorLock();
+        if (ObjectUtils.isNotEmpty(doorLock)) {
+            HouseLock houseLock = new HouseLock();
+            houseLock.setHouseNumberId(houseNumber.getId());
+            houseLock.setEquipmentType(doorLock);
+            //            绑定时间
+            houseLock.setBindingTime(new Date());
+
+            JSONObject particular = passwordIssController.particular(doorLock);
+            if (ObjectUtils.isEmpty(particular) || particular.getString("state") == null) {
+                return CommonResult.fail("门锁不存在");
+            }
+            //        设备连接状态
+            String state = particular.getString("state");
 //        电量
-                String battery = particular.getString("battery");
-                houseLock.setElectricQuantity(battery);
+            String battery = particular.getString("battery");
+            houseLock.setElectricQuantity(battery);
 
 //            网络状态
-                houseLock.setNetworkState(state);
+            houseLock.setNetworkState(state);
 //            设备状态
-                houseLock.setEquipmentState(state);
+            houseLock.setEquipmentState(state);
 
 //            房 间号
-                houseLock.setNetworkType("WiFi");
-                houseLock.setWifiMac("WIFIMAC");
-                houseLock.setNfcFunction(0);
-                houseLockService.save(houseLock);
-            }
-        } catch (Exception e) {
-            e.printStackTrace();
-            return CommonResult.fail();
+            houseLock.setNetworkType("WiFi");
+            houseLock.setWifiMac("WIFIMAC");
+            houseLock.setNfcFunction(0);
+            houseLockService.save(houseLock);
         }
+
         return CommonResult.ok();
     }
 
@@ -551,117 +548,114 @@ public class HouseNumberController implements HouseNumberControllerAPI {
     }
 
     @Override
-    @Transactional(rollbackFor = Exception.class)
+    @Transactional(rollbackFor = Exception.class)//1
     public CommonResult updateHouseNumber(HouseNumberUpdateDto dto) {
         HouseNumber byId = houseNumberService.getById(dto.getId());
         if (ObjectUtils.isEmpty(byId)) {
             return CommonResult.fail("参数异常");
         }
-        try {
 
-            String electricEquipmentMeterName1 = byId.getElectricEquipmentMeterName();
-            String electricEquipmentMeterName = dto.getElectricEquipmentMeterName();
-            if (!electricEquipmentMeterName1.equals(electricEquipmentMeterName)) {
-                LambdaQueryWrapper<ElectricEquipment> wrapperE = new LambdaQueryWrapper<>();
-                wrapperE.eq(ElectricEquipment::getMeterName, electricEquipmentMeterName);
-                ElectricEquipment electricEquipment = electricEquipmentService.getOne(wrapperE);
-                if (ObjectUtils.isEmpty(electricEquipment)) {
-                    return CommonResult.fail("电表设备不存在");
-                }
-                byId.setElectricEquipmentId(electricEquipment.getId() + "");
-            }
 
-            String waterEquipmentMeterName1 = byId.getWaterEquipmentMeterName();
-            String waterEquipmentMeterName = dto.getWaterEquipmentMeterName();
-            if (!waterEquipmentMeterName1.equals(waterEquipmentMeterName)) {
-                LambdaQueryWrapper<WaterEquipment> wrapperW = new LambdaQueryWrapper<>();
-                wrapperW.eq(WaterEquipment::getMeterName, waterEquipmentMeterName);
-                WaterEquipment waterEquipment = waterEquipmentService.getOne(wrapperW);
-                if (ObjectUtils.isEmpty(waterEquipment)) {
-                    return CommonResult.fail("水表设备不存在");
-                }
-                byId.setWaterEquipmentId(waterEquipment.getId() + "");
+        String electricEquipmentMeterName1 = byId.getElectricEquipmentMeterName();
+        String electricEquipmentMeterName = dto.getElectricEquipmentMeterName();
+        if (!electricEquipmentMeterName1.equals(electricEquipmentMeterName)) {
+            LambdaQueryWrapper<ElectricEquipment> wrapperE = new LambdaQueryWrapper<>();
+            wrapperE.eq(ElectricEquipment::getMeterName, electricEquipmentMeterName);
+            ElectricEquipment electricEquipment = electricEquipmentService.getOne(wrapperE);
+            if (ObjectUtils.isEmpty(electricEquipment)) {
+                return CommonResult.fail("电表设备不存在");
             }
-            byId.setHouseId(dto.getHouseId());
-            byId.setBuildingId(dto.getBuildingId());
-            byId.setRoomNumber(dto.getRoomNumber());
-            byId.setWaterEquipmentMeterName(dto.getWaterEquipmentMeterName());
-            byId.setElectricEquipmentMeterName(dto.getElectricEquipmentMeterName());
-            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)) {
-                if (ObjectUtils.isNotEmpty(houseLock)) {
-                    String equipmentType = houseLock.getEquipmentType();
-                    if (!equipmentType.equals(doorLock)) {
-                        JSONObject   particular = passwordIssController.particular(doorLock);
-
-                        if (ObjectUtils.isEmpty(particular) || particular.getString("state") == null) {
-                            return CommonResult.fail("门锁不存在");
-                        }
-
-                        //        设备连接状态
-                        String state = particular.getString("state");
-//        电量
-                        String battery = particular.getString("battery");
-                        houseLock.setEquipmentType(doorLock);
-                        houseLock.setElectricQuantity(battery);
+            byId.setElectricEquipmentId(electricEquipment.getId() + "");
+        }
 
-//            网络状态
-                        houseLock.setNetworkState(state);
-//            设备状态
-                        houseLock.setEquipmentState(state);
-                        //            绑定时间
-                        houseLock.setBindingTime(new Date());
+        String waterEquipmentMeterName1 = byId.getWaterEquipmentMeterName();
+        String waterEquipmentMeterName = dto.getWaterEquipmentMeterName();
+        if (!waterEquipmentMeterName1.equals(waterEquipmentMeterName)) {
+            LambdaQueryWrapper<WaterEquipment> wrapperW = new LambdaQueryWrapper<>();
+            wrapperW.eq(WaterEquipment::getMeterName, waterEquipmentMeterName);
+            WaterEquipment waterEquipment = waterEquipmentService.getOne(wrapperW);
+            if (ObjectUtils.isEmpty(waterEquipment)) {
+                return CommonResult.fail("水表设备不存在");
+            }
+            byId.setWaterEquipmentId(waterEquipment.getId() + "");
+        }
+        byId.setHouseId(dto.getHouseId());
+        byId.setBuildingId(dto.getBuildingId());
+        byId.setRoomNumber(dto.getRoomNumber());
+        byId.setWaterEquipmentMeterName(dto.getWaterEquipmentMeterName());
+        byId.setElectricEquipmentMeterName(dto.getElectricEquipmentMeterName());
+        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)) {
+            if (ObjectUtils.isNotEmpty(houseLock)) {
+                String equipmentType = houseLock.getEquipmentType();
+                if (!equipmentType.equals(doorLock)) {
+                    JSONObject particular = passwordIssController.particular(doorLock);
 
-                        houseLockService.updateById(houseLock);
-                    }
-                } else {
-                    HouseLock hl = new HouseLock();
-                    hl.setHouseNumberId(dto.getId());
-                    hl.setEquipmentType(dto.getDoorLock());
-                    //            绑定时间
-                    hl.setBindingTime(new Date());
-                    
-                    JSONObject    particular = passwordIssController.particular(doorLock);
                     if (ObjectUtils.isEmpty(particular) || particular.getString("state") == null) {
                         return CommonResult.fail("门锁不存在");
                     }
 
-//        设备连接状态
+                    //        设备连接状态
                     String state = particular.getString("state");
 //        电量
                     String battery = particular.getString("battery");
-                    hl.setElectricQuantity(battery);
+                    houseLock.setEquipmentType(doorLock);
+                    houseLock.setElectricQuantity(battery);
 
 //            网络状态
-                    hl.setNetworkState(state);
+                    houseLock.setNetworkState(state);
 //            设备状态
-                    hl.setEquipmentState(state);
-//            房 间号
-                    hl.setNetworkType("WiFi");
-                    hl.setWifiMac("WIFIMAC");
-                    hl.setNfcFunction(0);
-                    houseLockService.save(hl);
+                    houseLock.setEquipmentState(state);
+                    //            绑定时间
+                    houseLock.setBindingTime(new Date());
+
+                    houseLockService.updateById(houseLock);
                 }
             } else {
-                if (ObjectUtils.isNotEmpty(houseLock)) {
-                    houseLockService.removeById(houseLock.getId());
+                HouseLock hl = new HouseLock();
+                hl.setHouseNumberId(dto.getId());
+                hl.setEquipmentType(dto.getDoorLock());
+                //            绑定时间
+                hl.setBindingTime(new Date());
+
+                JSONObject particular = passwordIssController.particular(doorLock);
+                if (ObjectUtils.isEmpty(particular) || particular.getString("state") == null) {
+                    return CommonResult.fail("门锁不存在");
                 }
+
+//        设备连接状态
+                String state = particular.getString("state");
+//        电量
+                String battery = particular.getString("battery");
+                hl.setElectricQuantity(battery);
+
+//            网络状态
+                hl.setNetworkState(state);
+//            设备状态
+                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) {
-            e.printStackTrace();
-            return CommonResult.fail();
         }
 
+
         return CommonResult.ok();
     }
 
 
     @Override
-    @Transactional(rollbackFor = Exception.class)
+    @Transactional(rollbackFor = Exception.class)//1
     public CommonResult deleteHouseNumber(Integer houseNumberId) {
         HouseNumber houseNumber = houseNumberService.getById(houseNumberId);
         if (ObjectUtils.isEmpty(houseNumber)) {
@@ -677,15 +671,12 @@ public class HouseNumberController implements HouseNumberControllerAPI {
         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();
+
+        if (ObjectUtils.isNotEmpty(houseLock)) {
+            houseLockService.removeById(houseLock.getId());
         }
+        houseNumberService.removeById(houseNumberId);
+
         return CommonResult.ok();
     }
 
@@ -729,103 +720,100 @@ public class HouseNumberController implements HouseNumberControllerAPI {
     }
 
     @Override
-    @Transactional(rollbackFor = Exception.class)
+    @Transactional(rollbackFor = Exception.class)//1
     public CommonResult importHouseNumbers(MultipartFile file) throws Exception {
         List<HouseNumbersImportDto> dtos = ExcelUtils.readMultipartFile(file, HouseNumbersImportDto.class);
 
         ArrayList<HouseNumber> houseNumbers = new ArrayList<>();
 
-        try {
 
-            for (int i = 0; i < dtos.size(); i++) {
-                HouseNumbersImportDto dto = dtos.get(i);
-                HouseNumber houseNumber = new HouseNumber();
+        for (int i = 0; i < dtos.size(); i++) {
+            HouseNumbersImportDto dto = dtos.get(i);
+            HouseNumber houseNumber = new HouseNumber();
 
 //            判断是否存在该楼栋单元
-                String building = dto.getBuilding();
-                String element = dto.getElement();
-
-                LambdaQueryWrapper<Building> wrapper = new LambdaQueryWrapper<>();
-                wrapper.eq(Building::getBuilding, building)
-                        .eq(Building::getElement, element);
-                Building one = buildingService.getOne(wrapper);
-                if (ObjectUtils.isEmpty(one)) {
-                    return CommonResult.fail("第" + (i + 2) + "行," + "不存在" + building + "/" + element + "该楼栋单元");
-                }
-                Integer bId = one.getId();
-                houseNumber.setBuildingId(bId);
+            String building = dto.getBuilding();
+            String element = dto.getElement();
+
+            LambdaQueryWrapper<Building> wrapper = new LambdaQueryWrapper<>();
+            wrapper.eq(Building::getBuilding, building)
+                    .eq(Building::getElement, element);
+            Building one = buildingService.getOne(wrapper);
+            if (ObjectUtils.isEmpty(one)) {
+                return CommonResult.fail("第" + (i + 2) + "行," + "不存在" + building + "/" + element + "该楼栋单元");
+            }
+            Integer bId = one.getId();
+            houseNumber.setBuildingId(bId);
 
 //            判断是否存在该房型
-                Integer roomType = dto.getRoomType();
+            Integer roomType = dto.getRoomType();
 //            房型
-                String houseName = dto.getHouseName();
+            String houseName = dto.getHouseName();
 
-                //            判断当前房型是否存在当前房间号
-                House house = houseService.getHouseName(houseName, roomType);
-                if (ObjectUtils.isEmpty(house)) {
-                    return CommonResult.fail("第" + (i + 2) + "行," + "不存在" + houseName + "该房型");
-                }
-                houseNumber.setHouseId(house.getId() + "");
+            //            判断当前房型是否存在当前房间号
+            House house = houseService.getHouseName(houseName, roomType);
+            if (ObjectUtils.isEmpty(house)) {
+                return CommonResult.fail("第" + (i + 2) + "行," + "不存在" + houseName + "该房型");
+            }
+            houseNumber.setHouseId(house.getId() + "");
 
 //            判断该房间号是否已经存在
-                //            房间号
-                String roomNumber = dto.getRoomNumber();
-                HouseNumber hn = houseNumberService.getBRoomNumber(bId, roomNumber);
-                if (ObjectUtils.isNotEmpty(hn)) {
-                    return CommonResult.fail("第" + (i + 2) + "行," + "该楼栋单元下已存在" + roomNumber + "该房间号");
-                }
-                houseNumber.setRoomNumber(roomNumber);
-
+            //            房间号
+            String roomNumber = dto.getRoomNumber();
+            HouseNumber hn = houseNumberService.getBRoomNumber(bId, roomNumber);
+            if (ObjectUtils.isNotEmpty(hn)) {
+                return CommonResult.fail("第" + (i + 2) + "行," + "该楼栋单元下已存在" + roomNumber + "该房间号");
+            }
+            houseNumber.setRoomNumber(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 electricEquipmentMeterName = dto.getElectricEquipmentMeterName();
+            LambdaQueryWrapper<ElectricEquipment> wrapperEE = new LambdaQueryWrapper<>();
+            wrapperEE.eq(ElectricEquipment::getMeterName, electricEquipmentMeterName);
+            ElectricEquipment electricEquipment = electricEquipmentService.getOne(wrapperEE);
 
-                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 + "该水表设备号");
-                }
+            if (ObjectUtils.isEmpty(electricEquipment)) {
+                return CommonResult.fail("第" + (i + 2) + "行," + "不存在" + electricEquipmentMeterName + "该电表设备号");
+            }
 
-                houseNumber.setElectricEquipmentId(electricEquipment.getId() + "");
-                houseNumber.setElectricEquipmentMeterName(electricEquipment.getMeterName());
-                houseNumber.setWaterEquipmentId(waterEquipment.getId() + "");
-                houseNumber.setWaterEquipmentMeterName(waterEquipment.getMeterName());
+            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.setHouseStatus(1);
-                houseNumber.setElectricType("2");
+            houseNumber.setElectricEquipmentId(electricEquipment.getId() + "");
+            houseNumber.setElectricEquipmentMeterName(electricEquipment.getMeterName());
+            houseNumber.setWaterEquipmentId(waterEquipment.getId() + "");
+            houseNumber.setWaterEquipmentMeterName(waterEquipment.getMeterName());
 
-                houseNumbers.add(houseNumber);
+            houseNumber.setHouseStatus(1);
+            houseNumber.setElectricType("2");
 
-                houseNumberService.save(houseNumber);
+            houseNumbers.add(houseNumber);
 
-                //            门锁
-                String doorLock = dto.getDoorLock();
-                if (ObjectUtils.isNotEmpty(doorLock)) {
-                    HouseLock houseLock = new HouseLock();
-                    houseLock.setHouseNumberId(houseNumber.getId());
-                    houseLock.setEquipmentType(doorLock);
-                    houseLock.setNetworkType("WIFI");
-                    houseLock.setWifiMac("WIFIMAC");
-                    houseLock.setBindingTime(new Date());
-                    houseLock.setElectricQuantity("0");
-                    houseLock.setNetworkState("1");
-                    houseLock.setEquipmentState("1");
-                    houseLock.setNfcFunction(0);
-                    houseLockService.save(houseLock);
-                }
+            houseNumberService.save(houseNumber);
 
+            //            门锁
+            String doorLock = dto.getDoorLock();
+            if (ObjectUtils.isNotEmpty(doorLock)) {
+                HouseLock houseLock = new HouseLock();
+                houseLock.setHouseNumberId(houseNumber.getId());
+                houseLock.setEquipmentType(doorLock);
+                houseLock.setNetworkType("WIFI");
+                houseLock.setWifiMac("WIFIMAC");
+                houseLock.setBindingTime(new Date());
+                houseLock.setElectricQuantity("0");
+                houseLock.setNetworkState("1");
+                houseLock.setEquipmentState("1");
+                houseLock.setNfcFunction(0);
+                houseLockService.save(houseLock);
             }
-        } catch (Exception e) {
-            e.printStackTrace();
+
         }
+
         return CommonResult.ok();
     }
 

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

@@ -31,8 +31,22 @@ public class PasswordIssController {
     DoorLockConfig doorLockConfig;
 
 
-//    @Scheduled(cron = "0 0/1 * * * ?")
+//        @Scheduled(cron = "0 0/1 * * * ?")
     public void test() {
+
+        HashMap<String, String> map = new HashMap<>();
+        map.put("categoryId", doorLockConfig.getCategoryId());//"d0c248256f8346d2a19afa296562b319");//设备分类ID 所有蓝牙wifi锁默认统一值
+        map.put("luid", "80A036AE25AB");//"80A036AEA1D3"
+
+        String jsonContent = JSONObject.toJSONString(map);
+
+        try {
+        JSONObject jsonObject = queryData(jsonContent, PasswordUrlEnum.Device_Info.getUrl());
+        JSONObject data = jsonObject.getJSONObject("data");
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+
 //        密码下发，后续需通过luid(设备id)通过aes解码
 //        HashMap<String, Object> map = new HashMap<>();
 //        map.put("luid", "047863CA78E0");//"80A036AEA1D3");
@@ -98,19 +112,19 @@ public class PasswordIssController {
 
 
 //            删除
-            HashMap<String, Object> map = new HashMap<>();
-            map.put("categoryId", doorLockConfig.getCategoryId());
-            map.put("luid", "047863CA78E0");
-//            map.put("id", "12ea7b0761b040e18ab95348287d6bae");
-            map.put("id", "66336c9de4fa47b6aeb9e4216937f904");
-            String jsonContent = JSONObject.toJSONString(map);
-            try {
-                JSONObject jsonObject = queryData(jsonContent, PasswordUrlEnum.DeleteLockUser.getUrl());
-                System.out.println("jsonObject = " + jsonObject);
-//            return jsonObject;
-            } catch (Exception e) {
-                e.printStackTrace();
-            }
+//        HashMap<String, Object> map = new HashMap<>();
+//        map.put("categoryId", doorLockConfig.getCategoryId());
+//        map.put("luid", "047863CA78E0");
+////            map.put("id", "12ea7b0761b040e18ab95348287d6bae");
+//        map.put("id", "66336c9de4fa47b6aeb9e4216937f904");
+//        String jsonContent = JSONObject.toJSONString(map);
+//        try {
+//            JSONObject jsonObject = queryData(jsonContent, PasswordUrlEnum.DeleteLockUser.getUrl());
+//            System.out.println("jsonObject = " + jsonObject);
+////            return jsonObject;
+//        } catch (Exception e) {
+//            e.printStackTrace();
+//        }
 
 
     }
@@ -181,9 +195,9 @@ public class PasswordIssController {
 //            锁用户id
             String id = data.getString("id");
             unlocking.setLockUserId(id);
-            if (0==ciq.getCardType()) {
+            if (0 == ciq.getCardType()) {
                 unlocking.setLockStatus("2");
-            }else {
+            } else {
                 unlocking.setLockStatus("4");
             }
 
@@ -378,9 +392,9 @@ public class PasswordIssController {
             String id = data.getString("id");
             unlocking.setLockUserId(id);
             int cardType = keyCardDto.getCardType();
-            if (0==cardType) {
+            if (0 == cardType) {
                 unlocking.setLockStatus("2");
-            }else {
+            } else {
                 unlocking.setLockStatus("4");
             }
 
@@ -455,9 +469,9 @@ public class PasswordIssController {
         try {
             JSONObject jsonObject = queryData(jsonContent, PasswordUrlEnum.RemoteOpen.getUrl());
             Integer result = jsonObject.getInteger("result");
-            if (result==1) {
+            if (result == 1) {
                 return true;
-            }else {
+            } else {
                 return false;
             }
         } catch (Exception e) {
@@ -527,53 +541,53 @@ public class PasswordIssController {
 
     public UnlockingCustom saveCustomPassWord(CustomKeyPassWordDto dto) {
 //        将时间转成时间戳
-            String startTime = dto.getStartTime();
-            String endTime =dto.getEndTime();
-            DateTimeFormatter dateTimeFormatter1 = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
-            long start = LocalDateTime.parse(startTime, dateTimeFormatter1).atZone(ZoneId.systemDefault()).toInstant().toEpochMilli();
-            long end = LocalDateTime.parse(endTime, dateTimeFormatter1).atZone(ZoneId.systemDefault()).toInstant().toEpochMilli();
+        String startTime = dto.getStartTime();
+        String endTime = dto.getEndTime();
+        DateTimeFormatter dateTimeFormatter1 = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
+        long start = LocalDateTime.parse(startTime, dateTimeFormatter1).atZone(ZoneId.systemDefault()).toInstant().toEpochMilli();
+        long end = LocalDateTime.parse(endTime, dateTimeFormatter1).atZone(ZoneId.systemDefault()).toInstant().toEpochMilli();
 
 //    将密码加密
-            String passWord = dto.getPassWord();
-            String luid =dto.getEquipmentType();
-            String encryptPassWord = AesUtils.encrypt(passWord, luid);
-
-
-            HashMap<String, Object> map = new HashMap<>();
-            map.put("luid", luid);//"80A036AEA1D3");
-            map.put("categoryId", doorLockConfig.getCategoryId());//"d0c248256f8346d2a19afa296562b319");//设备分类ID 所有蓝牙wifi锁默认统一值
-            map.put("startTime", start);//"1686067200000");
-            map.put("endTime", end);//"1686204000000");
-            map.put("userName", "13097286670");// 用户名 也就是管理锁的账号
-            map.put("type", dto.getType());
-            map.put("password", encryptPassWord);
-
-            String jsonContent = JSONObject.toJSONString(map);
-
-            try {
-                JSONObject jsonObject = queryData(jsonContent, PasswordUrlEnum.Password.getUrl());
-                JSONObject data = jsonObject.getJSONObject("data");
-                String temporaryPassword = data.getString("temporaryPassword");
-                String passWord2 = AesUtils.decrypt(temporaryPassword, luid);
-                UnlockingCustom unlocking = new UnlockingCustom();
-                unlocking.setPassWord(passWord);
+        String passWord = dto.getPassWord();
+        String luid = dto.getEquipmentType();
+        String encryptPassWord = AesUtils.encrypt(passWord, luid);
+
+
+        HashMap<String, Object> map = new HashMap<>();
+        map.put("luid", luid);//"80A036AEA1D3");
+        map.put("categoryId", doorLockConfig.getCategoryId());//"d0c248256f8346d2a19afa296562b319");//设备分类ID 所有蓝牙wifi锁默认统一值
+        map.put("startTime", start);//"1686067200000");
+        map.put("endTime", end);//"1686204000000");
+        map.put("userName", "13097286670");// 用户名 也就是管理锁的账号
+        map.put("type", dto.getType());
+        map.put("password", encryptPassWord);
+
+        String jsonContent = JSONObject.toJSONString(map);
+
+        try {
+            JSONObject jsonObject = queryData(jsonContent, PasswordUrlEnum.Password.getUrl());
+            JSONObject data = jsonObject.getJSONObject("data");
+            String temporaryPassword = data.getString("temporaryPassword");
+            String passWord2 = AesUtils.decrypt(temporaryPassword, luid);
+            UnlockingCustom unlocking = new UnlockingCustom();
+            unlocking.setPassWord(passWord);
 //            锁用户id
-                String id = data.getString("id");
-                unlocking.setLockUserId(id);
-                unlocking.setLockStatus("1");
-                unlocking.setLuid(luid);
-                unlocking.setHouseNumberId(dto.getHouseNumberId());
-                unlocking.setStartTime(startTime);
-                unlocking.setEndTime(endTime);
-                unlocking.setType(dto.getType());
-
-                return unlocking;
-            } catch (Exception e) {
-                e.printStackTrace();
-            }
-            return null;
+            String id = data.getString("id");
+            unlocking.setLockUserId(id);
+            unlocking.setLockStatus("1");
+            unlocking.setLuid(luid);
+            unlocking.setHouseNumberId(dto.getHouseNumberId());
+            unlocking.setStartTime(startTime);
+            unlocking.setEndTime(endTime);
+            unlocking.setType(dto.getType());
 
+            return unlocking;
+        } catch (Exception e) {
+            e.printStackTrace();
         }
+        return null;
+
+    }
 
     public UnlockingCustom addCustomCard(CustomKeyCardDto dto) {
         //        将时间转成时间戳
@@ -602,9 +616,9 @@ public class PasswordIssController {
 //            锁用户id
             String id = data.getString("id");
             unlocking.setLockUserId(id);
-            if (0==dto.getCardType()) {
+            if (0 == dto.getCardType()) {
                 unlocking.setLockStatus("2");
-            }else {
+            } else {
                 unlocking.setLockStatus("4");
             }
 
@@ -663,7 +677,7 @@ public class PasswordIssController {
     }
 
 
-    public void nfcFunction(Integer nfcFunction,String luid) {
+    public void nfcFunction(Integer nfcFunction, String luid) {
         HashMap<String, Object> map = new HashMap<>();
         map.put("luid", luid);//"80A036AEA1D3");
         map.put("categoryId", doorLockConfig.getCategoryId());//"d0c248256f8346d2a19afa296562b319");//设备分类ID 所有蓝牙wifi锁默认统一值

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

@@ -60,7 +60,7 @@ public class TotalCardController implements TotalCardControllerAPI {
     AdminService adminService;
 
     @Override
-    @Transactional(rollbackFor = Exception.class)
+    @Transactional(rollbackFor = Exception.class)//1
     public CommonResult saveTotalCard(TotalCardDto totalCardDto) {
         Integer adminId = totalCardDto.getAdminId();
 
@@ -107,60 +107,55 @@ public class TotalCardController implements TotalCardControllerAPI {
         }
 
         //        添加总卡
-        try {
-            for (HouseLock houseLock : houseLockList) {
-                Integer houseNumberId = houseLock.getHouseNumberId();
-                HouseNumber houseNumber = houseNumberService.getById(houseNumberId);
-
-                KeyCardDto dto = new KeyCardDto();
-                dto.setLuid(houseLock.getEquipmentType());
-                dto.setCard(totalCardDto.getRoomCardInformation());
-                dto.setCardType(0);
-                dto.setStartTime(totalCardDto.getStartTime());
-                dto.setEndTime(totalCardDto.getEndTime());
-                dto.setHouseNumberId(houseLock.getHouseNumberId() + "");
-                dto.setAdminId(totalCardDto.getAdminId() + "");
-                dto.setType(4);
-
-                UnlockingAdmin unlockingAdmin = passwordIssController.addCard(dto);
-
-                unlockingAdmin.setName(employeeUsers.getUserName());
-                unlockingAdmin.setPhone(employeeUsers.getPhone());
-
-                UnlockingEmployee unlockingEmployee = new UnlockingEmployee();
-                BeanUtils.copyProperties(unlockingAdmin, unlockingEmployee);
-                unlockingEmployeeService.save(unlockingEmployee);
 
-//        添加操作记录
+        for (HouseLock houseLock : houseLockList) {
+            Integer houseNumberId = houseLock.getHouseNumberId();
+            HouseNumber houseNumber = houseNumberService.getById(houseNumberId);
+
+            KeyCardDto dto = new KeyCardDto();
+            dto.setLuid(houseLock.getEquipmentType());
+            dto.setCard(totalCardDto.getRoomCardInformation());
+            dto.setCardType(0);
+            dto.setStartTime(totalCardDto.getStartTime());
+            dto.setEndTime(totalCardDto.getEndTime());
+            dto.setHouseNumberId(houseLock.getHouseNumberId() + "");
+            dto.setAdminId(totalCardDto.getAdminId() + "");
+            dto.setType(4);
+
+            UnlockingAdmin unlockingAdmin = passwordIssController.addCard(dto);
 
-                OperatingRecord operatingRecord = new OperatingRecord();
+            unlockingAdmin.setName(employeeUsers.getUserName());
+            unlockingAdmin.setPhone(employeeUsers.getPhone());
 
-                operatingRecord.setHouseNumberId(houseLock.getHouseNumberId());
-                operatingRecord.setRoomNumber(houseNumber.getRoomNumber());
-                operatingRecord.setOperatorName(admin.getName());
-                DateTimeFormatter dateTimeFormatter1 = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
-                operatingRecord.setDataTime(LocalDateTime.now().format(dateTimeFormatter1));
-                operatingRecord.setContent("姓名:" + employeeUsers.getUserName());
-                operatingRecord.setType("添加卡片钥匙");
-                operatingRecordService.save(operatingRecord);
+            UnlockingEmployee unlockingEmployee = new UnlockingEmployee();
+            BeanUtils.copyProperties(unlockingAdmin, unlockingEmployee);
+            unlockingEmployeeService.save(unlockingEmployee);
+
+//        添加操作记录
 
-            }
+            OperatingRecord operatingRecord = new OperatingRecord();
 
-            TotalCard totalCard1 = new TotalCard();
-            BeanUtils.copyProperties(totalCardDto, totalCard1);
-            totalCardService.save(totalCard1);
-            return CommonResult.ok();
+            operatingRecord.setHouseNumberId(houseLock.getHouseNumberId());
+            operatingRecord.setRoomNumber(houseNumber.getRoomNumber());
+            operatingRecord.setOperatorName(admin.getName());
+            DateTimeFormatter dateTimeFormatter1 = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
+            operatingRecord.setDataTime(LocalDateTime.now().format(dateTimeFormatter1));
+            operatingRecord.setContent("姓名:" + employeeUsers.getUserName());
+            operatingRecord.setType("添加卡片钥匙");
+            operatingRecordService.save(operatingRecord);
 
-        } catch (Exception e) {
-            e.printStackTrace();
-            return CommonResult.fail();
         }
 
+        TotalCard totalCard1 = new TotalCard();
+        BeanUtils.copyProperties(totalCardDto, totalCard1);
+        totalCardService.save(totalCard1);
+        return CommonResult.ok();
+
 
     }
 
     @Override
-    @Transactional(rollbackFor = Exception.class)
+    @Transactional(rollbackFor = Exception.class)//1
     public CommonResult deleteTotalCard(Integer id) {
         TotalCard totalCard = totalCardService.getById(id);
 
@@ -194,34 +189,31 @@ public class TotalCardController implements TotalCardControllerAPI {
         wrapperUe.eq(UnlockingEmployee::getName, employeeUsers.getUserName())
                 .eq(UnlockingEmployee::getPhone, employeeUsers.getPhone())
                 .in(UnlockingEmployee::getHouseNumberId, houseNumberIds)
-                .eq(UnlockingEmployee::getStartTime,totalCard.getStartTime())
-                .eq(UnlockingEmployee::getEndTime,totalCard.getEndTime())
-                .eq(UnlockingEmployee::getLockStatus,2);
+                .eq(UnlockingEmployee::getStartTime, totalCard.getStartTime())
+                .eq(UnlockingEmployee::getEndTime, totalCard.getEndTime())
+                .eq(UnlockingEmployee::getLockStatus, 2);
 
         List<UnlockingEmployee> list = unlockingEmployeeService.list(wrapperUe);
 
-        try {
-            ArrayList<Integer> idUEs = new ArrayList<>();
-            for (UnlockingEmployee unlockingEmployee : list) {
-                String luid = unlockingEmployee.getLuid();
-                String lockUserId = unlockingEmployee.getLockUserId();
-                passwordIssController.deleteLockUser(luid, lockUserId);
-                idUEs.add(unlockingEmployee.getId());
-            }
-
-            unlockingEmployeeService.removeByIds(idUEs);
-            totalCardService.removeById(id);
-            return CommonResult.ok();
-
-        }catch (Exception e){
-            e.printStackTrace();
-            return CommonResult.fail();
+
+        ArrayList<Integer> idUEs = new ArrayList<>();
+        for (UnlockingEmployee unlockingEmployee : list) {
+            String luid = unlockingEmployee.getLuid();
+            String lockUserId = unlockingEmployee.getLockUserId();
+            passwordIssController.deleteLockUser(luid, lockUserId);
+            idUEs.add(unlockingEmployee.getId());
         }
+
+        unlockingEmployeeService.removeByIds(idUEs);
+        totalCardService.removeById(id);
+        return CommonResult.ok();
+
+
     }
 
     @Override
     public CommonResult listEmployeeTotalCard(Integer page, Integer size, String employeeName, Integer buildingId, String startTime, String endTime) {
-        PageUtils<TotalCardPageVo> pageUtils=totalCardService.totalCardPage(page,size,employeeName,buildingId,startTime,endTime);
+        PageUtils<TotalCardPageVo> pageUtils = totalCardService.totalCardPage(page, size, employeeName, buildingId, startTime, endTime);
         return CommonResult.ok(pageUtils);
     }
 

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

@@ -21,7 +21,7 @@ import java.util.HashMap;
 
 /**
  * <p>
- *  前端控制器
+ * 前端控制器
  * </p>
  *
  * @author ceshi
@@ -54,12 +54,12 @@ public class UnlockingAdminController implements UnlockingAdminControllerAPI {
     public CommonResult getPassWord() {
         String passWord = PasswordChecker.getPassWord();
         HashMap<String, String> map = new HashMap<>();
-        map.put("passWord",passWord);
+        map.put("passWord", passWord);
         return CommonResult.ok(map);
     }
 
     @Override
-    @Transactional(rollbackFor = Exception.class)
+    @Transactional(rollbackFor = Exception.class)//1
     public CommonResult savePassWord(KeyPassWordDto keyPassWordDto) {
         String permissionSettingId = keyPassWordDto.getPermissionSettingId();
         PermissionSetting permissionSetting = permissionSettingService.getById(permissionSettingId);
@@ -107,37 +107,34 @@ public class UnlockingAdminController implements UnlockingAdminControllerAPI {
             if (ObjectUtils.isEmpty(unlockingAdmin)) {
                 return CommonResult.fail("参数异常");
             }
-
             unlockingAdmin.setName(byId.getName());
             unlockingAdmin.setPhone(byId.getPhoneNumber());
-
-//        添加操作记录
-
-            OperatingRecord operatingRecord = new OperatingRecord();
-            operatingRecord.setRoomNumber(houseNumber.getRoomNumber());
-            operatingRecord.setHouseNumberId(houseNumber.getId());
-            operatingRecord.setOperatorName(admin.getName());
-            DateTimeFormatter dateTimeFormatter1 = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
-            operatingRecord.setDataTime(LocalDateTime.now().format(dateTimeFormatter1));
-            operatingRecord.setContent("姓名:" + byId.getName());
-            operatingRecord.setType("添加密码钥匙");
-
-
             unlockingAdminService.save(unlockingAdmin);
-            operatingRecordService.save(operatingRecord);
-            return CommonResult.ok();
-        }catch (Exception e){
+        } catch (Exception e) {
             e.printStackTrace();
 //            删除锁
-            passwordIssController.deleteLockUser(unlockingAdmin.getLuid(),unlockingAdmin.getLockUserId());
+            passwordIssController.deleteLockUser(unlockingAdmin.getLuid(), unlockingAdmin.getLockUserId());
             return CommonResult.fail();
         }
 
+//        添加操作记录
+        OperatingRecord operatingRecord = new OperatingRecord();
+        operatingRecord.setRoomNumber(houseNumber.getRoomNumber());
+        operatingRecord.setHouseNumberId(houseNumber.getId());
+        operatingRecord.setOperatorName(admin.getName());
+        DateTimeFormatter dateTimeFormatter1 = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
+        operatingRecord.setDataTime(LocalDateTime.now().format(dateTimeFormatter1));
+        operatingRecord.setContent("姓名:" + byId.getName());
+        operatingRecord.setType("添加密码钥匙");
+
+        operatingRecordService.save(operatingRecord);
+        return CommonResult.ok();
+
 
     }
 
     @Override
-    @Transactional(rollbackFor = Exception.class)
+    @Transactional(rollbackFor = Exception.class)//1
     public CommonResult saveCard(KeyCardDto keyCardDto) {
         String permissionSettingId = keyCardDto.getPermissionSettingId();
         PermissionSetting permissionSetting = permissionSettingService.getById(permissionSettingId);
@@ -173,8 +170,13 @@ public class UnlockingAdminController implements UnlockingAdminControllerAPI {
         UnlockingAdmin unlockingAdmin = null;
 
         try {
-          unlockingAdmin = passwordIssController.addCard(keyCardDto);
-
+            unlockingAdmin = passwordIssController.addCard(keyCardDto);
+        } catch (Exception e) {
+            e.printStackTrace();
+//            删除锁
+            passwordIssController.deleteLockUser(unlockingAdmin.getLuid(), unlockingAdmin.getLockUserId());
+            return CommonResult.fail();
+        }
             unlockingAdmin.setName(byId.getName());
             unlockingAdmin.setPhone(byId.getPhoneNumber());
 
@@ -195,17 +197,12 @@ public class UnlockingAdminController implements UnlockingAdminControllerAPI {
             operatingRecordService.save(operatingRecord);
             return CommonResult.ok();
 
-        }catch (Exception e){
-            e.printStackTrace();
-//            删除锁
-            passwordIssController.deleteLockUser(unlockingAdmin.getLuid(),unlockingAdmin.getLockUserId());
-            return CommonResult.fail();
-        }
+
 
     }
 
     @Override
-    @Transactional(rollbackFor = Exception.class)
+    @Transactional(rollbackFor = Exception.class)//1
     public CommonResult saveFingerprint(KeyFingerprintDto keyFingerprintDto) {
         String permissionSettingId = keyFingerprintDto.getPermissionSettingId();
         PermissionSetting permissionSetting = permissionSettingService.getById(permissionSettingId);
@@ -243,6 +240,13 @@ public class UnlockingAdminController implements UnlockingAdminControllerAPI {
         try {
             unlockingAdmin = passwordIssController.addFingerprintDto(keyFingerprintDto);
 
+        } catch (Exception e) {
+            e.printStackTrace();
+//            删除锁
+            passwordIssController.deleteLockUser(unlockingAdmin.getLuid(), unlockingAdmin.getLockUserId());
+            return CommonResult.fail();
+        }
+
             unlockingAdmin.setName(byId.getName());
             unlockingAdmin.setPhone(byId.getPhoneNumber());
 
@@ -262,12 +266,7 @@ public class UnlockingAdminController implements UnlockingAdminControllerAPI {
             operatingRecordService.save(operatingRecord);
             return CommonResult.ok();
 
-        }catch (Exception e){
-            e.printStackTrace();
-//            删除锁
-            passwordIssController.deleteLockUser(unlockingAdmin.getLuid(),unlockingAdmin.getLockUserId());
-            return CommonResult.fail();
-        }
+
 
     }
 
@@ -281,7 +280,7 @@ public class UnlockingAdminController implements UnlockingAdminControllerAPI {
         String lockUserId = byId.getLockUserId();
         String luid = byId.getLuid();
 
-        passwordIssController.deleteLockUser(luid,lockUserId);
+        passwordIssController.deleteLockUser(luid, lockUserId);
 
         unlockingAdminService.removeById(unlockingAdminId);
 
@@ -304,7 +303,7 @@ public class UnlockingAdminController implements UnlockingAdminControllerAPI {
         String startTime = updateLockDto.getStartTime();
         String endTime = updateLockDto.getEndTime();
 
-        passwordIssController.updateLock(lockUserId,luid,startTime,endTime);
+        passwordIssController.updateLock(lockUserId, luid, startTime, endTime);
 
         byId.setStartTime(startTime);
         byId.setEndTime(endTime);

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

@@ -4,7 +4,6 @@ package com.template.controller;
 import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
 import com.template.api.UnlockingEmployeeControllerAPI;
 import com.template.common.utils.PasswordChecker;
-import com.template.common.utils.TimeExchange;
 import com.template.model.dto.*;
 import com.template.model.pojo.*;
 import com.template.model.result.CommonResult;
@@ -13,7 +12,6 @@ import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.StringUtils;
-import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
 import java.time.LocalDateTime;
@@ -52,7 +50,7 @@ public class UnlockingEmployeeController implements UnlockingEmployeeControllerA
     PasswordIssController passwordIssController;
 
     @Override
-    @Transactional(rollbackFor = Exception.class)
+    @Transactional(rollbackFor = Exception.class)//1
     public CommonResult savePassWord(KeyPassWordDto keyPassWordDto) {
         String permissionSettingId = keyPassWordDto.getPermissionSettingId();
         PermissionSetting permissionSetting = permissionSettingService.getById(permissionSettingId);
@@ -104,34 +102,34 @@ public class UnlockingEmployeeController implements UnlockingEmployeeControllerA
 
             unlockingAdmin.setName(byId.getUserName());
             unlockingAdmin.setPhone(byId.getPhone());
-
-//        添加操作记录
-
-            OperatingRecord operatingRecord = new OperatingRecord();
-            operatingRecord.setRoomNumber(houseNumber.getRoomNumber());
-            operatingRecord.setHouseNumberId(houseNumber.getId());
-            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.setType("添加员工密码钥匙");
-
-            BeanUtils.copyProperties(unlockingAdmin,unlockingEmployee);
+            BeanUtils.copyProperties(unlockingAdmin, unlockingEmployee);
             unlockingEmployeeService.save(unlockingEmployee);
-            operatingRecordService.save(operatingRecord);
-            return CommonResult.ok();
-        }catch (Exception e){
+        } catch (Exception e) {
             e.printStackTrace();
 //            删除锁
-            passwordIssController.deleteLockUser(unlockingAdmin.getLuid(),unlockingAdmin.getLockUserId());
+            passwordIssController.deleteLockUser(unlockingAdmin.getLuid(), unlockingAdmin.getLockUserId());
             return CommonResult.fail();
         }
+//        添加操作记录
+
+        OperatingRecord operatingRecord = new OperatingRecord();
+        operatingRecord.setRoomNumber(houseNumber.getRoomNumber());
+        operatingRecord.setHouseNumberId(houseNumber.getId());
+        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.setType("添加员工密码钥匙");
+
+
+        operatingRecordService.save(operatingRecord);
+        return CommonResult.ok();
 
 
     }
 
     @Override
-    @Transactional(rollbackFor = Exception.class)
+    @Transactional(rollbackFor = Exception.class)//1
     public CommonResult saveCard(KeyCardEmpDto keyCardDto) {
         String permissionSettingId = keyCardDto.getPermissionSettingId();
         PermissionSetting permissionSetting = permissionSettingService.getById(permissionSettingId);
@@ -154,10 +152,10 @@ public class UnlockingEmployeeController implements UnlockingEmployeeControllerA
             return CommonResult.fail("添加的员工不存在");
         }
         //没传卡片id则使用用户信息身份证
-        if(!StringUtils.hasText(keyCardDto.getCard())){
-            if (!StringUtils.hasText(byId.getIdCardInformation())){
+        if (!StringUtils.hasText(keyCardDto.getCard())) {
+            if (!StringUtils.hasText(byId.getIdCardInformation())) {
                 return CommonResult.fail("该员工没有卡片信息");
-            }else{
+            } else {
                 keyCardDto.setCard(byId.getIdCardInformation());
                 keyCardDto.setCardType(1);
             }
@@ -177,41 +175,41 @@ public class UnlockingEmployeeController implements UnlockingEmployeeControllerA
         UnlockingEmployee unlockingEmployee = new UnlockingEmployee();
 
         try {
-            KeyCardDto keyCardDto1=new KeyCardDto();
-            BeanUtils.copyProperties(keyCardDto,keyCardDto1);
+            KeyCardDto keyCardDto1 = new KeyCardDto();
+            BeanUtils.copyProperties(keyCardDto, keyCardDto1);
             unlockingAdmin = passwordIssController.addCard(keyCardDto1);
 
             unlockingAdmin.setName(byId.getUserName());
             unlockingAdmin.setPhone(byId.getPhone());
-
-//        添加操作记录
-
-            OperatingRecord operatingRecord = new OperatingRecord();
-
-            operatingRecord.setHouseNumberId(houseNumber.getId());
-            operatingRecord.setRoomNumber(houseNumber.getRoomNumber());
-            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.setType("添加员工卡片钥匙");
-
-            BeanUtils.copyProperties(unlockingAdmin,unlockingEmployee);
+            BeanUtils.copyProperties(unlockingAdmin, unlockingEmployee);
             unlockingEmployeeService.save(unlockingEmployee);
-            operatingRecordService.save(operatingRecord);
-            return CommonResult.ok();
 
-        }catch (Exception e){
+        } catch (Exception e) {
             e.printStackTrace();
 //            删除锁
-            passwordIssController.deleteLockUser(unlockingAdmin.getLuid(),unlockingAdmin.getLockUserId());
+            passwordIssController.deleteLockUser(unlockingAdmin.getLuid(), unlockingAdmin.getLockUserId());
             return CommonResult.fail();
         }
 
+//        添加操作记录
+
+        OperatingRecord operatingRecord = new OperatingRecord();
+
+        operatingRecord.setHouseNumberId(houseNumber.getId());
+        operatingRecord.setRoomNumber(houseNumber.getRoomNumber());
+        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.setType("添加员工卡片钥匙");
+
+        operatingRecordService.save(operatingRecord);
+        return CommonResult.ok();
+
     }
 
     @Override
-    @Transactional(rollbackFor = Exception.class)
+    @Transactional(rollbackFor = Exception.class)//1
     public CommonResult saveFingerprint(KeyFingerprintEmpDto keyFingerprintEmpDto) {
         String permissionSettingId = keyFingerprintEmpDto.getPermissionSettingId();
         PermissionSetting permissionSetting = permissionSettingService.getById(permissionSettingId);
@@ -233,9 +231,9 @@ public class UnlockingEmployeeController implements UnlockingEmployeeControllerA
             return CommonResult.fail("添加的用户不存在");
         }
         KeyFingerprintDto keyFingerprintDto = new KeyFingerprintDto();
-        if (!StringUtils.hasText(byId.getFingerprint())){
+        if (!StringUtils.hasText(byId.getFingerprint())) {
             return CommonResult.fail("缺少指纹，请前往员工管理添加该员工指纹");
-        }else{
+        } else {
             keyFingerprintDto.setFingerprintData(byId.getFingerprint());
         }
 
@@ -254,36 +252,34 @@ public class UnlockingEmployeeController implements UnlockingEmployeeControllerA
         UnlockingEmployee unlockingEmployee = new UnlockingEmployee();
         try {
 
-            BeanUtils.copyProperties(keyFingerprintEmpDto,keyFingerprintDto);
+            BeanUtils.copyProperties(keyFingerprintEmpDto, keyFingerprintDto);
             unlockingAdmin = passwordIssController.addFingerprintDto(keyFingerprintDto);
-
             unlockingAdmin.setName(byId.getUserName());
             unlockingAdmin.setPhone(byId.getPhone());
-
-//        添加操作记录
-
-            OperatingRecord operatingRecord = new OperatingRecord();
-            operatingRecord.setHouseNumberId(houseNumber.getId());
-            operatingRecord.setRoomNumber(houseNumber.getRoomNumber());
-            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.setType("添加员工指纹钥匙");
-
-
-            BeanUtils.copyProperties(unlockingAdmin,unlockingEmployee);
+            BeanUtils.copyProperties(unlockingAdmin, unlockingEmployee);
             unlockingEmployeeService.save(unlockingEmployee);
-            operatingRecordService.save(operatingRecord);
-            return CommonResult.ok();
-
-        }catch (Exception e){
+        } catch (Exception e) {
             e.printStackTrace();
 //            删除锁
-            passwordIssController.deleteLockUser(unlockingAdmin.getLuid(),unlockingAdmin.getLockUserId());
+            passwordIssController.deleteLockUser(unlockingAdmin.getLuid(), unlockingAdmin.getLockUserId());
             return CommonResult.fail();
         }
 
+
+//        添加操作记录
+
+        OperatingRecord operatingRecord = new OperatingRecord();
+        operatingRecord.setHouseNumberId(houseNumber.getId());
+        operatingRecord.setRoomNumber(houseNumber.getRoomNumber());
+        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.setType("添加员工指纹钥匙");
+
+        operatingRecordService.save(operatingRecord);
+        return CommonResult.ok();
+
     }
 
     @Override
@@ -296,7 +292,7 @@ public class UnlockingEmployeeController implements UnlockingEmployeeControllerA
         String lockUserId = byId.getLockUserId();
         String luid = byId.getLuid();
 
-        passwordIssController.deleteLockUser(luid,lockUserId);
+        passwordIssController.deleteLockUser(luid, lockUserId);
 
         unlockingEmployeeService.removeById(unlockingEmpId);
 
@@ -319,7 +315,7 @@ public class UnlockingEmployeeController implements UnlockingEmployeeControllerA
         String startTime = updateLockDto.getStartTime();
         String endTime = updateLockDto.getEndTime();
 
-        passwordIssController.updateLock(lockUserId,luid,startTime,endTime);
+        passwordIssController.updateLock(lockUserId, luid, startTime, endTime);
 
         byId.setStartTime(startTime);
         byId.setEndTime(endTime);

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

@@ -16,7 +16,7 @@ import java.util.ArrayList;
 
 /**
  * <p>
- *  服务实现类
+ * 服务实现类
  * </p>
  *
  * @author ceshi
@@ -30,16 +30,16 @@ public class ElectricEquipmentServiceImpl extends ServiceImpl<ElectricEquipmentM
      * 获取所有房间的电表设备
      */
 //    @Scheduled(cron = "0 22 * * * ? ")
-    @Transactional(rollbackFor = Exception.class)
-    public void getHouseNumberEquipment(){
-        String url="http://172.16.20.87/api/wechat/main/meterQuery?meterType=1";
+//    1
+    @Transactional(rollbackFor = Exception.class)//1
+    public void getHouseNumberEquipment() {
+        String url = "http://172.16.20.87/api/wechat/main/meterQuery?meterType=1";
 
         RestTemplate restTemplate = new RestTemplate();
         String forObject = restTemplate.getForObject(url, String.class);
         JSONObject jsonObject = JSONObject.parseObject(forObject);
 //        System.out.println("jsonObject = " + jsonObject);
         JSONArray meterObj = jsonObject.getJSONArray("meterObj");
-        try {
         ArrayList<ElectricEquipment> electricEquipments = new ArrayList<>();
 
         for (int i = 0; i < meterObj.size(); i++) {
@@ -53,21 +53,19 @@ public class ElectricEquipmentServiceImpl extends ServiceImpl<ElectricEquipmentM
 //            this.save(electricEquipment);
         }
 
-            System.out.println("electricEquipments.size() = " + electricEquipments.size());
-            System.out.println("meterObj.size() = " + meterObj.size());
-            this.saveBatch(electricEquipments);
-        }catch (Exception e){
-         e.printStackTrace();
-        }
+        System.out.println("electricEquipments.size() = " + electricEquipments.size());
+        System.out.println("meterObj.size() = " + meterObj.size());
+        this.saveBatch(electricEquipments);
+
     }
 
 
     //    计算电费
     @Override
-    public JSONObject roomCostRecord(String roomId,String beginTime,String endTime){
+    public JSONObject roomCostRecord(String roomId, String beginTime, String endTime) {
         JSONObject objectElectric = new JSONObject();
 
-        String url="http://172.16.20.87/api/wechat/main/roomCostRecord?roomId="+roomId+"&beginTime="+beginTime+"&endTime="+endTime+"&pageNumber=1&pageSize=1000&dataType=0&costType=0";
+        String url = "http://172.16.20.87/api/wechat/main/roomCostRecord?roomId=" + roomId + "&beginTime=" + beginTime + "&endTime=" + endTime + "&pageNumber=1&pageSize=1000&dataType=0&costType=0";
         RestTemplate restTemplate = new RestTemplate();
         String forObject = restTemplate.getForObject(url, String.class);
         JSONObject jsonObject = JSONObject.parseObject(forObject);
@@ -78,9 +76,9 @@ public class ElectricEquipmentServiceImpl extends ServiceImpl<ElectricEquipmentM
         BigDecimal bigDecimalCost = new BigDecimal(0);
         BigDecimal bigDecimalConsume = new BigDecimal(0);
 
-        if (ObjectUtils.isEmpty(costObj)&&costObj.size()<=0) {
-            objectElectric.put("cost",bigDecimalCost);
-            objectElectric.put("consume",bigDecimalConsume);
+        if (ObjectUtils.isEmpty(costObj) && costObj.size() <= 0) {
+            objectElectric.put("cost", bigDecimalCost);
+            objectElectric.put("consume", bigDecimalConsume);
             return objectElectric;
         }
 
@@ -92,13 +90,14 @@ public class ElectricEquipmentServiceImpl extends ServiceImpl<ElectricEquipmentM
             bigDecimalConsume = bigDecimalConsume.add(consumeTotal);
         }
 
-        objectElectric.put("cost",bigDecimalCost);
-        objectElectric.put("consume",bigDecimalConsume);
+        objectElectric.put("cost", bigDecimalCost);
+        objectElectric.put("consume", bigDecimalConsume);
         return objectElectric;
     }
 
     /**
      * 远程开电
+     *
      * @param electricEquipmentId
      * @return
      */
@@ -109,18 +108,18 @@ public class ElectricEquipmentServiceImpl extends ServiceImpl<ElectricEquipmentM
             return false;
         }
         String meterId = electricEquipment.getMeterId();
-        String url="http://172.16.20.87/api/wechat/main/meterControl?meterId="+meterId+"&ifOpen=Y&meterType=1";
+        String url = "http://172.16.20.87/api/wechat/main/meterControl?meterId=" + meterId + "&ifOpen=Y&meterType=1";
         RestTemplate restTemplate = new RestTemplate();
         String forObject = restTemplate.getForObject(url, String.class);
         JSONObject jsonObject = JSONObject.parseObject(forObject);
         JSONArray meterObj = jsonObject.getJSONArray("meterObj");
-        Boolean state= false;
+        Boolean state = false;
         for (int i = 0; i < meterObj.size(); i++) {
             JSONObject object = meterObj.getJSONObject(i);
             String meterId1 = object.getString("meterId");
             String opState = object.getString("opState");
             if ("Y".equals(opState)) {
-                state=true;
+                state = true;
             }
         }
         return state;
@@ -128,6 +127,7 @@ public class ElectricEquipmentServiceImpl extends ServiceImpl<ElectricEquipmentM
 
     /**
      * 关电
+     *
      * @param electricEquipmentId
      * @return
      */
@@ -138,25 +138,25 @@ public class ElectricEquipmentServiceImpl extends ServiceImpl<ElectricEquipmentM
             return false;
         }
         String meterId = electricEquipment.getMeterId();
-        String url="http://172.16.20.87/api/wechat/main/meterControl?meterId="+meterId+"&ifOpen=N&meterType=1";
+        String url = "http://172.16.20.87/api/wechat/main/meterControl?meterId=" + meterId + "&ifOpen=N&meterType=1";
         RestTemplate restTemplate = new RestTemplate();
         String forObject = restTemplate.getForObject(url, String.class);
         JSONObject jsonObject = JSONObject.parseObject(forObject);
         JSONArray meterObj = jsonObject.getJSONArray("meterObj");
-        Boolean state= false;
+        Boolean state = false;
         for (int i = 0; i < meterObj.size(); i++) {
             JSONObject object = meterObj.getJSONObject(i);
             String meterId1 = object.getString("meterId");
             String opState = object.getString("opState");
             if ("Y".equals(opState)) {
-                state=true;
+                state = true;
             }
         }
         return state;
     }
 
-//    @Scheduled(cron = "0 55 * * * ? ")
-    public void test(){
+    //    @Scheduled(cron = "0 55 * * * ? ")
+    public void test() {
 //        JSONObject jsonObject = roomCostRecord("H1", "2024-04-02 08:10:10", "2024-04-03 07:00:00");
 //        System.out.println("jsonObject = " + jsonObject);
         Boolean aBoolean = openMeterControl("2");
@@ -164,7 +164,4 @@ public class ElectricEquipmentServiceImpl extends ServiceImpl<ElectricEquipmentM
     }
 
 
-
-
-
 }

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

@@ -16,7 +16,7 @@ import java.util.ArrayList;
 
 /**
  * <p>
- *  服务实现类
+ * 服务实现类
  * </p>
  *
  * @author ceshi
@@ -26,8 +26,8 @@ import java.util.ArrayList;
 public class WaterEquipmentServiceImpl extends ServiceImpl<WaterEquipmentMapper, WaterEquipment> implements WaterEquipmentService {
 
 
-//    @Scheduled(cron = "0 26 * * * ? ")
-    @Transactional(rollbackFor = Exception.class)
+    //    @Scheduled(cron = "0 26 * * * ? ")
+    @Transactional(rollbackFor = Exception.class)//1
     public void getHouseNumberEquipment() {
         String url = "http://172.16.20.87/api/wechat/main/meterQuery?meterType=2";
 
@@ -36,36 +36,34 @@ public class WaterEquipmentServiceImpl extends ServiceImpl<WaterEquipmentMapper,
         JSONObject jsonObject = JSONObject.parseObject(forObject);
 //        System.out.println("jsonObject = " + jsonObject);
         JSONArray meterObj = jsonObject.getJSONArray("meterObj");
-        try {
-            ArrayList<WaterEquipment> waterEquipments = new ArrayList<>();
-
-            for (int i = 0; i < meterObj.size(); i++) {
-                JSONObject jsonObject1 = meterObj.getJSONObject(i);
-                WaterEquipment waterEquipment = new WaterEquipment();
-                waterEquipment.setMeterId(jsonObject1.getString("meterId"));
-                waterEquipment.setRoomId(jsonObject1.getString("roomId"));
-                waterEquipment.setRoomNum(jsonObject1.getString("roomNum"));
-                waterEquipment.setMeterName(jsonObject1.getString("meterName"));
-                waterEquipments.add(waterEquipment);
-//            this.save(electricEquipment);
-            }
 
-            System.out.println("electricEquipments.size() = " + waterEquipments.size());
-            System.out.println("meterObj.size() = " + meterObj.size());
-            this.saveBatch(waterEquipments);
-        } catch (Exception e) {
-            e.printStackTrace();
+        ArrayList<WaterEquipment> waterEquipments = new ArrayList<>();
+
+        for (int i = 0; i < meterObj.size(); i++) {
+            JSONObject jsonObject1 = meterObj.getJSONObject(i);
+            WaterEquipment waterEquipment = new WaterEquipment();
+            waterEquipment.setMeterId(jsonObject1.getString("meterId"));
+            waterEquipment.setRoomId(jsonObject1.getString("roomId"));
+            waterEquipment.setRoomNum(jsonObject1.getString("roomNum"));
+            waterEquipment.setMeterName(jsonObject1.getString("meterName"));
+            waterEquipments.add(waterEquipment);
+//            this.save(electricEquipment);
         }
 
+        System.out.println("electricEquipments.size() = " + waterEquipments.size());
+        System.out.println("meterObj.size() = " + meterObj.size());
+        this.saveBatch(waterEquipments);
+
+
     }
 
 
-//    计算水费
+    //    计算水费
     @Override
-    public JSONObject roomCostRecord(String roomId,String beginTime,String endTime){
+    public JSONObject roomCostRecord(String roomId, String beginTime, String endTime) {
         JSONObject objectWater = new JSONObject();
 
-        String url="http://172.16.20.87/api/wechat/main/roomCostRecord?roomId="+roomId+"&beginTime="+beginTime+"&endTime="+endTime+"&pageNumber=1&pageSize=1000&dataType=0&costType=1";
+        String url = "http://172.16.20.87/api/wechat/main/roomCostRecord?roomId=" + roomId + "&beginTime=" + beginTime + "&endTime=" + endTime + "&pageNumber=1&pageSize=1000&dataType=0&costType=1";
         RestTemplate restTemplate = new RestTemplate();
         String forObject = restTemplate.getForObject(url, String.class);
         JSONObject jsonObject = JSONObject.parseObject(forObject);
@@ -76,9 +74,9 @@ public class WaterEquipmentServiceImpl extends ServiceImpl<WaterEquipmentMapper,
         BigDecimal bigDecimalCost = new BigDecimal(0);
         BigDecimal bigDecimalConsume = new BigDecimal(0);
 
-        if (ObjectUtils.isEmpty(costObj)&&costObj.size()<=0) {
-            objectWater.put("cost",bigDecimalCost);
-            objectWater.put("consume",bigDecimalConsume);
+        if (ObjectUtils.isEmpty(costObj) && costObj.size() <= 0) {
+            objectWater.put("cost", bigDecimalCost);
+            objectWater.put("consume", bigDecimalConsume);
             return objectWater;
         }
 
@@ -90,8 +88,8 @@ public class WaterEquipmentServiceImpl extends ServiceImpl<WaterEquipmentMapper,
             bigDecimalConsume = bigDecimalConsume.add(consumeTotal);
         }
 
-        objectWater.put("cost",bigDecimalCost);
-        objectWater.put("consume",bigDecimalConsume);
+        objectWater.put("cost", bigDecimalCost);
+        objectWater.put("consume", bigDecimalConsume);
         return objectWater;
     }