.

apq-pc-client/src/main/java/com/priusis/client/service/core/MqttServiceImpl.java

@@ -682,7 +682,7 @@ public class MqttServiceImpl implements MqttService, MqttHandler, MqttClientCall
                 return null;
             }
 
-            deviceInfo = StrUtil.format(deviceInfo, "5a:a0:23:67:0e:a2");
+            deviceInfo = StrUtil.format(deviceInfo, mac);
             String remoteDeviceVoJson = HttpUtil.get(gateway + deviceInfo);
             RemoteDeviceVoResult remoteDeviceVo = JSONUtil.toBean(remoteDeviceVoJson, RemoteDeviceVoResult.class);
             MqttClientSecurityConfiguration mqttClientSecurityConfiguration = new MqttClientSecurityConfiguration();

apq-pc-client/src/main/java/com/priusis/controller/ConfigController.java

@@ -11,6 +11,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 
+import javax.annotation.PostConstruct;
 import java.io.File;
 import java.io.IOException;
 import java.util.Map;
@@ -81,4 +82,11 @@ public class ConfigController {
         }
         return R.success();
     }
+
+
+    @PostConstruct
+    public void init() throws IOException {
+        // 初始化自动保存一次数据上报设置
+        saveDataReporting(getDataReporting().getData());
+    }
 }

apq-pc-client/src/main/java/com/priusis/controller/ProgramController.java

@@ -86,7 +86,7 @@ public class ProgramController {
                         .build())
                 .peek(m -> programs.stream()
                         .collect(Collectors.toMap(p -> StrUtil.similar(p.get("name").toLowerCase(), m.get("name").toLowerCase()),
-                                p -> StrUtil.nullToEmpty(p.get("version")), (l, r) -> r))
+                                p -> p.getOrDefault("version", ""), (l, r) -> r))
                         .entrySet()
                         .stream()
                         .max(Map.Entry.comparingByKey())