开启开电关电功能

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

@@ -926,10 +926,10 @@ public class HouseNumberStateController implements HouseNumberStateAPI {
             HouseNumber houseNumber = houseNumberService.getById(houseNumberId);
 
 //         开电
-//            Boolean aBoolean = electricEquipmentService.openMeterControl(houseNumber.getElectricEquipmentId());
-//            if (!aBoolean) {
-//                return CommonResult.fail("开电失败");
-//            }
+            Boolean aBoolean = electricEquipmentService.openMeterControl(houseNumber.getElectricEquipmentId());
+            if (!aBoolean) {
+                return CommonResult.fail("开电失败");
+            }
             houseNumber.setElectricType("1");
 
             String roomNumber = houseNumber.getRoomNumber();
@@ -1217,10 +1217,10 @@ public class HouseNumberStateController implements HouseNumberStateAPI {
 //        房间置脏需退房后
 //            houseNumber.setHouseStatus(2);
 //         开电
-//            Boolean aBoolean = electricEquipmentService.openMeterControl(houseNumber.getElectricEquipmentId());
-//            if (!aBoolean) {
-//                return CommonResult.fail("开电失败");
-//            }
+            Boolean aBoolean = electricEquipmentService.openMeterControl(houseNumber.getElectricEquipmentId());
+            if (!aBoolean) {
+                return CommonResult.fail("开电失败");
+            }
             houseNumber.setElectricType("1");
             houseNumberService.updateById(houseNumber);
 
@@ -1572,10 +1572,10 @@ public class HouseNumberStateController implements HouseNumberStateAPI {
         }
 
         //                开电
-//        Boolean aBoolean = electricEquipmentService.openMeterControl(houseNumber.getElectricEquipmentId());
-//        if (!aBoolean) {
-//            return CommonResult.fail("开电失败");
-//        }
+        Boolean aBoolean = electricEquipmentService.openMeterControl(houseNumber.getElectricEquipmentId());
+        if (!aBoolean) {
+            return CommonResult.fail("开电失败");
+        }
         //        开电
         houseNumber.setElectricType("1");
 
@@ -1652,10 +1652,10 @@ public class HouseNumberStateController implements HouseNumberStateAPI {
         }
 
         //                开电
-//        Boolean aBoolean = electricEquipmentService.openMeterControl(houseNumber.getElectricEquipmentId());
-//        if (!aBoolean) {
-//            return CommonResult.fail("开电失败");
-//        }
+        Boolean aBoolean = electricEquipmentService.openMeterControl(houseNumber.getElectricEquipmentId());
+        if (!aBoolean) {
+            return CommonResult.fail("开电失败");
+        }
         //        开电
         houseNumber.setElectricType("1");
 
@@ -1689,10 +1689,10 @@ public class HouseNumberStateController implements HouseNumberStateAPI {
 //        关电
         houseNumber.setElectricType("2");
 //        关电
-//        Boolean aBoolean = electricEquipmentService.closeMeterControl(houseNumber.getElectricEquipmentId());
-//        if (!aBoolean) {
-//            return CommonResult.fail("关电失败");
-//        }
+        Boolean aBoolean = electricEquipmentService.closeMeterControl(houseNumber.getElectricEquipmentId());
+        if (!aBoolean) {
+            return CommonResult.fail("关电失败");
+        }
 
         houseNumberService.updateById(houseNumber);
 
@@ -1720,10 +1720,10 @@ public class HouseNumberStateController implements HouseNumberStateAPI {
                     return CommonResult.fail("房间异常");
                 }
 //                开电
-//                Boolean aBoolean = electricEquipmentService.openMeterControl(houseNumber.getElectricEquipmentId());
-//                if (!aBoolean) {
-//                    return CommonResult.fail("开电失败");
-//                }
+                Boolean aBoolean = electricEquipmentService.openMeterControl(houseNumber.getElectricEquipmentId());
+                if (!aBoolean) {
+                    return CommonResult.fail("开电失败");
+                }
                 //        开电
                 houseNumber.setElectricType("1");
                 houseNumber.setHouseStatus(2);
@@ -1766,10 +1766,10 @@ public class HouseNumberStateController implements HouseNumberStateAPI {
 //        关电
                 houseNumber.setElectricType("2");
 //         关电
-//                Boolean aBoolean = electricEquipmentService.closeMeterControl(houseNumber.getElectricEquipmentId());
-//                if (!aBoolean) {
-//                    return CommonResult.fail("关电失败");
-//                }
+                Boolean aBoolean = electricEquipmentService.closeMeterControl(houseNumber.getElectricEquipmentId());
+                if (!aBoolean) {
+                    return CommonResult.fail("关电失败");
+                }
 
                 boolean update = houseNumberService.updateById(houseNumber);
                 if (!update) {
@@ -2120,10 +2120,10 @@ public class HouseNumberStateController implements HouseNumberStateAPI {
 //        关电
         houseNumber.setElectricType("2");
 //        关电
-//        Boolean aBoolean = electricEquipmentService.closeMeterControl(houseNumber.getElectricEquipmentId());
-//        if (!aBoolean) {
-//            return CommonResult.fail("关电失败");
-//        }
+        Boolean aBoolean = electricEquipmentService.closeMeterControl(houseNumber.getElectricEquipmentId());
+        if (!aBoolean) {
+            return CommonResult.fail("关电失败");
+        }
         houseNumberService.updateById(houseNumber);
 
         return CommonResult.ok();
@@ -2239,10 +2239,10 @@ public class HouseNumberStateController implements HouseNumberStateAPI {
 //        关电
             houseNumber.setElectricType("2");
 //        关电
-//            Boolean aBoolean = electricEquipmentService.closeMeterControl(houseNumber.getElectricEquipmentId());
-//            if (!aBoolean) {
-//                return CommonResult.fail("关电失败");
-//            }
+            Boolean aBoolean = electricEquipmentService.closeMeterControl(houseNumber.getElectricEquipmentId());
+            if (!aBoolean) {
+                return CommonResult.fail("关电失败");
+            }
             list.add(houseNumber);
         }
         houseNumberService.updateBatchById(list);
@@ -2258,10 +2258,10 @@ public class HouseNumberStateController implements HouseNumberStateAPI {
         for (String houseNumberId : houseNumberIds) {
             HouseNumber houseNumber = houseNumberService.getById(houseNumberId);
 //            开电
-//            Boolean aBoolean = electricEquipmentService.openMeterControl(houseNumber.getElectricEquipmentId());
-//            if (!aBoolean) {
-//                return CommonResult.fail("开电失败");
-//            }
+            Boolean aBoolean = electricEquipmentService.openMeterControl(houseNumber.getElectricEquipmentId());
+            if (!aBoolean) {
+                return CommonResult.fail("开电失败");
+            }
             houseNumber.setElectricType("1");
             list.add(houseNumber);
         }

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

@@ -563,10 +563,10 @@ public class HouseOrderController implements HouseOrderAPI {
 
             HouseNumber number = houseNumberService.getById(houseLock.getHouseNumberId());
 //                开电
-//                Boolean aBoolean = electricEquipmentService.openMeterControl(number.getElectricEquipmentId());
-//                if (!aBoolean) {
-//                    return CommonResult.fail("开电失败");
-//                }
+                Boolean aBoolean = electricEquipmentService.openMeterControl(number.getElectricEquipmentId());
+                if (!aBoolean) {
+                    return CommonResult.fail("开电失败");
+                }
 //                设置开电状态
             number.setElectricType("1");
 //                房间号设置成脏房需要退房后设置
@@ -891,10 +891,10 @@ public class HouseOrderController implements HouseOrderAPI {
             HouseNumber houseNumber = houseNumberService.getById(houseNumberId);
 
 //         开电
-//            Boolean aBoolean = electricEquipmentService.openMeterControl(houseNumber.getElectricEquipmentId());
-//            if (!aBoolean) {
-//                return CommonResult.fail("开电失败");
-//            }
+            Boolean aBoolean = electricEquipmentService.openMeterControl(houseNumber.getElectricEquipmentId());
+            if (!aBoolean) {
+                return CommonResult.fail("开电失败");
+            }
             houseNumber.setElectricType("1");
 
             String roomNumber = houseNumber.getRoomNumber();
@@ -1317,10 +1317,10 @@ public class HouseOrderController implements HouseOrderAPI {
 //        房间置脏需退房后
 //            houseNumber.setHouseStatus(2);
 //         开电
-//            Boolean aBoolean = electricEquipmentService.openMeterControl(houseNumber.getElectricEquipmentId());
-//            if (!aBoolean) {
-//                return CommonResult.fail("开电失败");
-//            }
+            Boolean aBoolean = electricEquipmentService.openMeterControl(houseNumber.getElectricEquipmentId());
+            if (!aBoolean) {
+                return CommonResult.fail("开电失败");
+            }
             houseNumber.setElectricType("1");
             houseNumberService.updateById(houseNumber);
 

src/main/java/com/template/model/mqtt/MqttConfiguration.java

@@ -36,6 +36,5 @@ public class MqttConfiguration {
  
     @Value("${mqtt.qos}")
     private int qos;
-
     
 }

src/main/java/com/template/model/mqtt/MqttPushClient.java

@@ -4,7 +4,7 @@ import lombok.extern.slf4j.Slf4j;
 import org.eclipse.paho.client.mqttv3.*;
 import org.eclipse.paho.client.mqttv3.persist.MemoryPersistence;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.scheduling.annotation.Scheduled;
+import org.springframework.context.annotation.Bean;
 import org.springframework.stereotype.Component;
 
 import java.io.UnsupportedEncodingException;
@@ -25,7 +25,20 @@ public class MqttPushClient  {
     public static void setClient(MqttClient client) {
         MqttPushClient.client = client;
     }
- 
+
+
+    /**
+     * 在这实例化
+     */
+    @Bean
+    public void getConnect(){
+//        发起连接
+        connect(mqttConfiguration);
+//        订阅主题
+        subscribe();
+    }
+
+
 
     /**
      * 编辑连接信息
@@ -54,19 +67,6 @@ public class MqttPushClient  {
         return option;
     }
 
-    /**
-     * 连接测试
-     */
-//    @Scheduled(cron = "0 19 * * * ? ")
-    public void getConnect(){
-        System.out.println("mqttConfiguration = " + mqttConfiguration);
-        String clientId = mqttConfiguration.getClientId();
-        System.out.println("clientId = " + clientId);
-//        发起连接
-        connect(mqttConfiguration);
-//        订阅主题
-        subscribe();
-    }
 
     /**
      * 发起连接

src/main/java/com/template/model/mqtt/PushCallback.java

@@ -108,6 +108,7 @@ public class PushCallback implements MqttCallback {
 //					设备消息上报
             if ("2".equals(protocol)) {
                 UnlockingRecord unlockingRecord = new UnlockingRecord();
+                unlockingRecord.setType("消息类型");
                 String data = s.getString("data");
                 System.out.println("data = " + data);
                 JSONObject jsonObject = JSONObject.parseObject(data);

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

@@ -24,4 +24,6 @@ public class HouseLockServiceImpl extends ServiceImpl<HouseLockMapper, HouseLock
     public HouseLock getHouseNumberId(String houseNumberId) {
         return houseLockMapper.getHouseNumberId(houseNumberId);
     }
+
+
 }