From eaf2eac0284186977713964c33b9b4e1ea9a8357 Mon Sep 17 00:00:00 2001
From: kerwincui <164770707@qq.com>
Date: Thu, 19 May 2022 17:08:07 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AD=97=E7=AC=A6=E4=B8=B2=E6=AF=94=E8=BE=83?=
 =?UTF-8?q?=E9=94=99=E8=AF=AF=E5=A4=84=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/java/com/ruoyi/iot/controller/DeviceController.java | 2 +-
 .../main/java/com/ruoyi/iot/controller/GroupController.java  | 2 +-
 .../ruoyi/iot/controller/ThingsModelTemplateController.java  | 2 +-
 .../main/java/com/ruoyi/iot/controller/ToolController.java   | 5 ++---
 4 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/springboot/wumei-iot/src/main/java/com/ruoyi/iot/controller/DeviceController.java b/springboot/wumei-iot/src/main/java/com/ruoyi/iot/controller/DeviceController.java
index a68b3a2c..3c172939 100644
--- a/springboot/wumei-iot/src/main/java/com/ruoyi/iot/controller/DeviceController.java
+++ b/springboot/wumei-iot/src/main/java/com/ruoyi/iot/controller/DeviceController.java
@@ -84,7 +84,7 @@ public class DeviceController extends BaseController
     public TableDataInfo allShortList(Device device)
     {
         List<DeviceAllShortOutput> list = new ArrayList<>();
-        if(device.getUserName()==null || device.getUserName() == "")
+        if(device.getUserName()==null || device.getUserName().equals(""))
         {
             list = deviceService.selectAllDeviceShortList();
         }else {
diff --git a/springboot/wumei-iot/src/main/java/com/ruoyi/iot/controller/GroupController.java b/springboot/wumei-iot/src/main/java/com/ruoyi/iot/controller/GroupController.java
index a283773f..980de8e9 100644
--- a/springboot/wumei-iot/src/main/java/com/ruoyi/iot/controller/GroupController.java
+++ b/springboot/wumei-iot/src/main/java/com/ruoyi/iot/controller/GroupController.java
@@ -51,7 +51,7 @@ public class GroupController extends BaseController
     {
         startPage();
         List<Group> list = new ArrayList<>();
-        if(group.getUserName() == null || group.getUserName() == "")
+        if(group.getUserName() == null || group.getUserName().equals(""))
         {
 //            搜索查询 ,mapper使用的是模糊查询
             list = groupService.selectGroupList(group);
diff --git a/springboot/wumei-iot/src/main/java/com/ruoyi/iot/controller/ThingsModelTemplateController.java b/springboot/wumei-iot/src/main/java/com/ruoyi/iot/controller/ThingsModelTemplateController.java
index bbc20a99..5022a76d 100644
--- a/springboot/wumei-iot/src/main/java/com/ruoyi/iot/controller/ThingsModelTemplateController.java
+++ b/springboot/wumei-iot/src/main/java/com/ruoyi/iot/controller/ThingsModelTemplateController.java
@@ -49,7 +49,7 @@ public class ThingsModelTemplateController extends BaseController
     {
         startPage();
         List<ThingsModelTemplate> list = new ArrayList<>();
-        if (thingsModelTemplate.getTenantName() == ""|| thingsModelTemplate.getTenantName() == null){
+        if (thingsModelTemplate.getTenantName().equals("")|| thingsModelTemplate.getTenantName() == null){
             list = thingsModelTemplateService.selectThingsModelTemplateList(thingsModelTemplate);
         }else{
 //            精准查询
diff --git a/springboot/wumei-iot/src/main/java/com/ruoyi/iot/controller/ToolController.java b/springboot/wumei-iot/src/main/java/com/ruoyi/iot/controller/ToolController.java
index 82ad4f00..6141e257 100644
--- a/springboot/wumei-iot/src/main/java/com/ruoyi/iot/controller/ToolController.java
+++ b/springboot/wumei-iot/src/main/java/com/ruoyi/iot/controller/ToolController.java
@@ -211,7 +211,7 @@ public class ToolController extends BaseController {
      */
     private ResponseEntity encryptAuthentication(MqttAuthenticationModel mqttModel, ProductAuthenticateModel productModel) throws Exception {
         String decryptPassword = AESUtils.decrypt(mqttModel.getPassword(), productModel.getMqttSecret());
-        if (decryptPassword == null || decryptPassword == "") {
+        if (decryptPassword == null || decryptPassword.equals("")) {
             return returnUnauthorized(mqttModel, "设备加密认证，mqtt密码解密失败");
         }
         String[] passwordArray = decryptPassword.split("&");
@@ -229,7 +229,6 @@ public class ToolController extends BaseController {
                 return returnUnauthorized(mqttModel, resultMessage);
             }
         }
-
         if (!mqttPassword.equals(productModel.getMqttPassword())) {
             return returnUnauthorized(mqttModel, "设备加密认证，设备mqtt密码错误");
         }
@@ -262,7 +261,7 @@ public class ToolController extends BaseController {
      */
     private String authCodeProcess(String authCode, MqttAuthenticationModel mqttModel, ProductAuthenticateModel productModel) {
         String message = "";
-        if (authCode == "") {
+        if (authCode.equals("")) {
             message = "设备认证，设备授权码不能为空";
         }
         // 查询授权码是否存在