代码修改

business-service/src/main/java/com/ozs/service/utils/PublishCallback.java

@@ -31,6 +31,7 @@ public class PublishCallback implements MqttCallback {
     @Override
     public void messageArrived(String topic, MqttMessage message) throws Exception {
         String sign = null;
+        String deviceSn=null;
         // subscribe后得到的消息会执行到这里面
         System.out.println("接收消息主题 : " + topic);
         System.out.println("接收消息Qos : " + message.getQos());
@@ -41,8 +42,9 @@ public class PublishCallback implements MqttCallback {
             for (int i = 0; i < jsonArray.size(); i++) {
                 JSONObject object = jsonArray.getJSONObject(i);
                 sign = (String) object.get("sign");
+                deviceSn = (String) object.get("device_sn");
             }
-            PublishClient.pull(sign);
+            PublishClient.pull(sign,deviceSn);
         }
         System.out.println("接收消息内容 : " + new String(message.getPayload()));
         

business-service/src/main/java/com/ozs/service/utils/PublishClient.java

@@ -108,11 +108,11 @@ public class PublishClient {
         System.out.println("message is published completely! " + token.isComplete());
     }
     
-    public static void pull(String sign) throws MqttException, InterruptedException {
+    public static void pull(String sign,String deviceSn) throws MqttException, InterruptedException {
         /**
          * 发布客户端
          */
-        PublishClient server = new PublishClient("heart_DEVICESN","heart_DEVICESN");
+        PublishClient server = new PublishClient("heart_"+deviceSn,"heart_"+deviceSn);
         Heartbeat test = new Heartbeat();
         test.setName("HeartResponse");
         Data data = new Data();

hazard-admin/src/main/java/com/ozs/web/controller/system/SysUserController.java

@@ -326,7 +326,7 @@ public class SysUserController extends BaseController {
         for (Long id : Ids) {
             BaseUser baseUser = baseUserService.getUserById(id);
             if (baseUser.getUserName().equals("admin")) {
-                return error("admin账号不能修改");
+                return error("admin账号不能删除");
             }
         }
         return toAjax(userService.deleteUserByIds(Ids));