更新

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

@@ -862,6 +862,7 @@ public class HouseNumberStateController implements HouseNumberStateAPI {
         String idCard = checkIdCardDto.getIdCard();
 //        身份证特殊编码
         String idCardInformation = checkIdCardDto.getIdCardInformation();
+        String msg="";
         try {
 
 //        判断是否有用户
@@ -928,7 +929,8 @@ public class HouseNumberStateController implements HouseNumberStateAPI {
 //         开电
             Boolean aBoolean = electricEquipmentService.openMeterControl(houseNumber.getElectricEquipmentId());
             if (!aBoolean) {
-                return CommonResult.fail("开电失败");
+//                return CommonResult.fail("开电失败");
+                msg="开电失败";
             }
             houseNumber.setElectricType("1");
 
@@ -1033,7 +1035,13 @@ public class HouseNumberStateController implements HouseNumberStateAPI {
 
             operatingRecordService.save(operatingRecord);
 
-            return CommonResult.ok();
+            if (msg.equals("")) {
+                return CommonResult.ok();
+            }else {
+                return CommonResult.ok(msg);
+            }
+
+
 
         } catch (Exception e) {
             e.printStackTrace();
@@ -1218,8 +1226,10 @@ public class HouseNumberStateController implements HouseNumberStateAPI {
 //            houseNumber.setHouseStatus(2);
 //         开电
             Boolean aBoolean = electricEquipmentService.openMeterControl(houseNumber.getElectricEquipmentId());
+            String msg="";
             if (!aBoolean) {
-                return CommonResult.fail("开电失败");
+//                return CommonResult.fail("开电失败");
+                msg="开电失败";
             }
             houseNumber.setElectricType("1");
             houseNumberService.updateById(houseNumber);
@@ -1332,7 +1342,11 @@ public class HouseNumberStateController implements HouseNumberStateAPI {
 
             operatingRecordService.save(operatingRecord);
 
-            return CommonResult.ok();
+            if (msg.equals("")) {
+                return CommonResult.ok();
+            }else {
+                return CommonResult.ok(msg);
+            }
 
         } catch (Exception e) {
             e.printStackTrace();
@@ -1573,8 +1587,10 @@ public class HouseNumberStateController implements HouseNumberStateAPI {
 
         //                开电
         Boolean aBoolean = electricEquipmentService.openMeterControl(houseNumber.getElectricEquipmentId());
+        String msg="";
         if (!aBoolean) {
-            return CommonResult.fail("开电失败");
+//                return CommonResult.fail("开电失败");
+            msg="开电失败";
         }
         //        开电
         houseNumber.setElectricType("1");
@@ -1590,7 +1606,11 @@ public class HouseNumberStateController implements HouseNumberStateAPI {
         houseNumberState.setStatus(6);
         houseNumberStateService.save(houseNumberState);
 
-        return CommonResult.ok();
+        if (msg.equals("")) {
+            return CommonResult.ok();
+        }else {
+            return CommonResult.ok(msg);
+        }
     }
 
     @Override
@@ -1653,8 +1673,10 @@ public class HouseNumberStateController implements HouseNumberStateAPI {
 
         //                开电
         Boolean aBoolean = electricEquipmentService.openMeterControl(houseNumber.getElectricEquipmentId());
+        String msg="";
         if (!aBoolean) {
-            return CommonResult.fail("开电失败");
+//                return CommonResult.fail("开电失败");
+            msg="开电失败";
         }
         //        开电
         houseNumber.setElectricType("1");
@@ -1663,7 +1685,11 @@ public class HouseNumberStateController implements HouseNumberStateAPI {
 
         houseNumberService.updateById(houseNumber);
 
-        return CommonResult.ok();
+        if (msg.equals("")) {
+            return CommonResult.ok();
+        }else {
+            return CommonResult.ok(msg);
+        }
     }
 
     @Override
@@ -1690,13 +1716,19 @@ public class HouseNumberStateController implements HouseNumberStateAPI {
         houseNumber.setElectricType("2");
 //        关电
         Boolean aBoolean = electricEquipmentService.closeMeterControl(houseNumber.getElectricEquipmentId());
+        String msg="";
         if (!aBoolean) {
-            return CommonResult.fail("关电失败");
+//            return CommonResult.fail("关电失败");
+            msg="关电失败";
         }
 
         houseNumberService.updateById(houseNumber);
+        if (msg.equals("")) {
+            return CommonResult.ok();
+        }else {
+            return CommonResult.ok(msg);
+        }
 
-        return CommonResult.ok();
     }
 
     @Override
@@ -1713,6 +1745,7 @@ public class HouseNumberStateController implements HouseNumberStateAPI {
             return CommonResult.fail("此账号暂无该权限");
         }
         List<String> list = dirtyRoomDtos.getHouseNumberIds();
+        String msg="";
         try {
             for (String s : list) {
                 HouseNumber houseNumber = houseNumberService.getById(s);
@@ -1722,7 +1755,8 @@ public class HouseNumberStateController implements HouseNumberStateAPI {
 //                开电
                 Boolean aBoolean = electricEquipmentService.openMeterControl(houseNumber.getElectricEquipmentId());
                 if (!aBoolean) {
-                    return CommonResult.fail("开电失败");
+//                return CommonResult.fail("开电失败");
+                    msg="开电失败";
                 }
                 //        开电
                 houseNumber.setElectricType("1");
@@ -1738,7 +1772,11 @@ public class HouseNumberStateController implements HouseNumberStateAPI {
             return CommonResult.fail();
         }
 
-        return CommonResult.ok();
+        if (msg.equals("")) {
+            return CommonResult.ok();
+        }else {
+            return CommonResult.ok(msg);
+        }
     }
 
     @Override
@@ -1755,6 +1793,7 @@ public class HouseNumberStateController implements HouseNumberStateAPI {
             return CommonResult.fail("此账号暂无该权限");
         }
         List<String> houseNumberIds = cleanRoomDtos.getHouseNumberIds();
+        String msg="";
         try {
             for (String houseNumberId : houseNumberIds) {
                 HouseNumber houseNumber = houseNumberService.getById(houseNumberId);
@@ -1767,8 +1806,10 @@ public class HouseNumberStateController implements HouseNumberStateAPI {
                 houseNumber.setElectricType("2");
 //         关电
                 Boolean aBoolean = electricEquipmentService.closeMeterControl(houseNumber.getElectricEquipmentId());
+
                 if (!aBoolean) {
-                    return CommonResult.fail("关电失败");
+//            return CommonResult.fail("关电失败");
+                    msg="关电失败";
                 }
 
                 boolean update = houseNumberService.updateById(houseNumber);
@@ -1780,9 +1821,14 @@ public class HouseNumberStateController implements HouseNumberStateAPI {
             e.printStackTrace();
             return CommonResult.fail();
         }
-        return CommonResult.ok();
+        if (msg.equals("")) {
+            return CommonResult.ok();
+        }else {
+            return CommonResult.ok(msg);
+        }
     }
 
+    
     @Override
     public CommonResult lockRoom(LockRoomDtos lockRoomDtos) {
         int adminId = lockRoomDtos.getAdminId();
@@ -2121,12 +2167,18 @@ public class HouseNumberStateController implements HouseNumberStateAPI {
         houseNumber.setElectricType("2");
 //        关电
         Boolean aBoolean = electricEquipmentService.closeMeterControl(houseNumber.getElectricEquipmentId());
+        String msg="";
         if (!aBoolean) {
-            return CommonResult.fail("关电失败");
+//            return CommonResult.fail("关电失败");
+            msg="关电失败";
         }
         houseNumberService.updateById(houseNumber);
 
-        return CommonResult.ok();
+        if (msg.equals("")) {
+            return CommonResult.ok();
+        }else {
+            return CommonResult.ok(msg);
+        }
     }
 
     @Override
@@ -2234,20 +2286,27 @@ public class HouseNumberStateController implements HouseNumberStateAPI {
         List<String> houseNumberIds = dtos.getHouseNumberIds();
 
         ArrayList<HouseNumber> list = new ArrayList<>();
+        String msg="";
         for (String houseNumberId : houseNumberIds) {
             HouseNumber houseNumber = houseNumberService.getById(houseNumberId);
 //        关电
             houseNumber.setElectricType("2");
 //        关电
             Boolean aBoolean = electricEquipmentService.closeMeterControl(houseNumber.getElectricEquipmentId());
+
             if (!aBoolean) {
-                return CommonResult.fail("关电失败");
+//            return CommonResult.fail("关电失败");
+                msg="关电失败";
             }
             list.add(houseNumber);
         }
         houseNumberService.updateBatchById(list);
 
-        return CommonResult.ok();
+        if (msg.equals("")) {
+            return CommonResult.ok();
+        }else {
+            return CommonResult.ok(msg);
+        }
 
     }
 
@@ -2255,19 +2314,26 @@ public class HouseNumberStateController implements HouseNumberStateAPI {
     public CommonResult openERooms(OpenRoomsDto openRoomsDto) {
         List<String> houseNumberIds = openRoomsDto.getHouseNumberIds();
         ArrayList<HouseNumber> list = new ArrayList<>();
+        String msg="";
         for (String houseNumberId : houseNumberIds) {
             HouseNumber houseNumber = houseNumberService.getById(houseNumberId);
 //            开电
             Boolean aBoolean = electricEquipmentService.openMeterControl(houseNumber.getElectricEquipmentId());
+
             if (!aBoolean) {
-                return CommonResult.fail("开电失败");
+//                return CommonResult.fail("开电失败");
+                msg="开电失败";
             }
             houseNumber.setElectricType("1");
             list.add(houseNumber);
         }
         houseNumberService.updateBatchById(list);
 
-        return CommonResult.ok();
+        if (msg.equals("")) {
+            return CommonResult.ok();
+        }else {
+            return CommonResult.ok(msg);
+        }
     }
 
 

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

@@ -564,8 +564,10 @@ public class HouseOrderController implements HouseOrderAPI {
             HouseNumber number = houseNumberService.getById(houseLock.getHouseNumberId());
 //                开电
                 Boolean aBoolean = electricEquipmentService.openMeterControl(number.getElectricEquipmentId());
+                String msg="";
                 if (!aBoolean) {
-                    return CommonResult.fail("开电失败");
+//                    return CommonResult.fail("开电失败");
+                    msg="开电失败";
                 }
 //                设置开电状态
             number.setElectricType("1");
@@ -590,7 +592,12 @@ public class HouseOrderController implements HouseOrderAPI {
                 houseNumberStates.add(houseNumberState);
             }
             houseNumberStateService.updateBatchById(houseNumberStates);
-            return CommonResult.ok();
+            if (msg.equals("")) {
+                return CommonResult.ok();
+            }else {
+                return CommonResult.ok(msg);
+            }
+
 
         } catch (Exception e) {
             e.printStackTrace();
@@ -892,8 +899,10 @@ public class HouseOrderController implements HouseOrderAPI {
 
 //         开电
             Boolean aBoolean = electricEquipmentService.openMeterControl(houseNumber.getElectricEquipmentId());
+            String msg="";
             if (!aBoolean) {
-                return CommonResult.fail("开电失败");
+//                return CommonResult.fail("开电失败");
+                msg="开电失败";
             }
             houseNumber.setElectricType("1");
 
@@ -997,7 +1006,11 @@ public class HouseOrderController implements HouseOrderAPI {
 
             houseNumberService.updateById(houseNumber);
             operatingRecordService.save(operatingRecord);
-            return CommonResult.ok();
+            if (msg.equals("")) {
+                return CommonResult.ok();
+            }else {
+                return CommonResult.ok(msg);
+            }
 
         } catch (Exception e) {
             e.printStackTrace();
@@ -1318,8 +1331,10 @@ public class HouseOrderController implements HouseOrderAPI {
 //            houseNumber.setHouseStatus(2);
 //         开电
             Boolean aBoolean = electricEquipmentService.openMeterControl(houseNumber.getElectricEquipmentId());
+            String msg="";
             if (!aBoolean) {
-                return CommonResult.fail("开电失败");
+//                return CommonResult.fail("开电失败");
+                msg="开电失败";
             }
             houseNumber.setElectricType("1");
             houseNumberService.updateById(houseNumber);
@@ -1432,7 +1447,11 @@ public class HouseOrderController implements HouseOrderAPI {
                 operatingRecord.setType("添加指纹钥匙");
             }
             operatingRecordService.save(operatingRecord);
-            return CommonResult.ok();
+            if (msg.equals("")) {
+                return CommonResult.ok();
+            }else {
+                return CommonResult.ok(msg);
+            }
 
         } catch (Exception e) {
             e.printStackTrace();