1.调整software和hardware

portal-service-infrastructure/src/main/java/com/hfln/portal/infrastructure/gateway/impl/WebGatewayImpl.java

@@ -204,7 +204,7 @@ public class WebGatewayImpl implements WebGateway {
             DevInfo devInfo = new DevInfo();
             devInfo.setClientId(item.getClientId());
             devInfo.setDevType(item.getDevType());
-            devInfo.setSoftware(item.getHardware());
+            devInfo.setHardware(item.getHardware());
             devInfo.setStatusLight(1);
             devInfo.setOnline(0);
             devInfo.setIsDeleted(BasePO.DeleteFlag.NOT_DELETED);
@@ -278,7 +278,7 @@ public class WebGatewayImpl implements WebGateway {
         DevInfo saveInfo = new DevInfo();
         saveInfo.setClientId(deviceAddParam.getClientId());
         saveInfo.setDevType(deviceAddParam.getDevType());
-        saveInfo.setSoftware(deviceAddParam.getHardware());
+        saveInfo.setHardware(deviceAddParam.getHardware());
         saveInfo.setTenantId(deviceAddParam.getTenantId());
         saveInfo.setStatusLight(1);
         saveInfo.setOnline(0);

portal-service-infrastructure/src/main/java/com/hfln/portal/infrastructure/mqtt/MqttSubHandle.java

@@ -112,9 +112,9 @@ public class MqttSubHandle {
 //                case "realtime_pos":
 //                    subDasRealtimePos(topic, payload);
 //                    break;
-                case "dev_status":
-                    subDasDevStatus(topic, payload);
-                    break;
+//                case "dev_status":
+//                    subDasDevStatus(topic, payload);
+//                    break;
                 case "exist":
                     subDasExist(topic, payload);
                     break;
@@ -161,8 +161,8 @@ public class MqttSubHandle {
         String deviceInfoStr = obj.getString("device_info");
         JSONObject deviceInfo = JSONObject.parseObject(deviceInfoStr);
 
-        String software = deviceInfo.getString("firmware");
-        dev.setSoftware(software);
+        String hardware = deviceInfo.getString("firmware");
+        dev.setHardware(hardware);
         int indicatorLed = obj.getIntValue("indicator_led");
         dev.setStatusLight(indicatorLed == 0 ? 1 : 0);
         int isCeiling = obj.getIntValue("isCeiling");