问题修改

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

@@ -801,7 +801,7 @@ public class MqttServiceImpl implements MqttService, MqttHandler, MqttClientCall
             }
             if ("facility_scan".equals(method)) {
                 log.info("收到平台扫描软件请求");
-                programController.addProgram2Platform();
+                programController.addProgram2Platform(bizRequestId);
             }
             ObjectNode paramsNode = newNode();
             paramsNode.put("code", "1");

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

@@ -311,7 +311,7 @@ public class ProgramController {
 
 
     //// @Scheduled(fixedDelay = 60000)
-    public void addProgram2Platform() throws IOException {
+    public void addProgram2Platform(String bizRequestId) throws IOException {
         String mac = macAddrService.getMacAddr();
         if (StrUtil.isBlank(mac)) {
             log.warn("未获取到MAC地址");
@@ -352,10 +352,11 @@ public class ProgramController {
         String postResult = HttpUtil.post(gateway + addProgramUrl,
                 JSONUtil.createObj()
                         .set("macAddress", mac)
+                        .set("requestId", bizRequestId)
                         .set("programList", programNames)
                         .set("processList", processNameVos)
                         .toString());
-        log.info("设备软件扫描,result:{},programList:{},processList:{}", postResult, programNames.size(), processNameVos.size());
+        log.info("设备软件扫描,result:{},requestId:{},programList:{},processList:{}", postResult, bizRequestId, programNames.size(), processNameVos.size());
     }
 
     private boolean containsOfCache(String taskProcess) {