Merge remote-tracking branch 'origin/master'

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

@@ -11,6 +11,7 @@ import com.priusis.client.data.kv.*;
 import com.priusis.client.service.*;
 import com.priusis.client.service.conf.*;
 import com.priusis.client.service.data.*;
+import com.priusis.controller.ProgramController;
 import com.priusis.controller.RemoteControlController;
 import com.priusis.monitor.mqtt.*;
 import com.priusis.util.MacAddrUtil;
@@ -114,6 +115,9 @@ public class MqttServiceImpl implements MqttService, MqttHandler, MqttClientCall
     @Resource
     private RemoteControlController remoteControlController;
 
+    @Resource
+    private ProgramController programController;
+
     public MqttServiceImpl(PcCoreConfiguration configuration, Consumer<String> extensionsConfigListener) {
         this.configuration = configuration;
         this.extensionsConfigListener = extensionsConfigListener;
@@ -374,6 +378,11 @@ public class MqttServiceImpl implements MqttService, MqttHandler, MqttClientCall
                 remoteControlController.startVncServer(minutes);
                 return;
             }
+            if ("facility_scan".equals(mqttRpcDataMessage.getMethod())) {
+                log.info("收到平台扫描软件请求");
+                programController.addProgram2Platform();
+                return;
+            }
 
 
             persistentFileService.flushRpcDataToFile(mqttRpcDataMessage);

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

@@ -19,7 +19,6 @@ import com.priusis.util.SysConfigUtil;
 import lombok.SneakyThrows;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Value;
-import org.springframework.scheduling.annotation.Scheduled;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 
@@ -228,8 +227,8 @@ public class ProgramController {
     }
 
 
-    @Scheduled(fixedDelay = 60000)
-    protected void addProgram2Platform() throws IOException {
+//    @Scheduled(fixedDelay = 60000)
+    public void addProgram2Platform() throws IOException {
         String mac = MacAddrUtil.get();
         if (StrUtil.isBlank(mac)) {
             log.warn("未获取到MAC地址");
@@ -241,6 +240,8 @@ public class ProgramController {
                 JSONUtil.createObj().set("macAddress", mac).set("programList", programNames).toString());
     }
 
+
+
     public static void main(String[] args) {
         int exitVal = -1;
         try {