.

apq-pc-client/src/main/java/com/priusis/cache/InstalledProgramCache.java

@@ -4,7 +4,6 @@ import lombok.extern.slf4j.Slf4j;
 import org.springframework.scheduling.annotation.Scheduled;
 import org.springframework.stereotype.Component;
 
-import javax.annotation.PostConstruct;
 import java.io.BufferedReader;
 import java.io.IOException;
 import java.io.InputStreamReader;
@@ -24,20 +23,10 @@ public class InstalledProgramCache {
     private static List<Map<String, String>> programList;
 
     public List<Map<String, String>> getPrograms() throws IOException {
-        if (programList == null) loadProgramListJob();
+//        if (programList == null) loadProgramListJob();
         return programList;
     }
 
-    @PostConstruct
-    public void init() {
-        try {
-            loadProgramListJob();
-            log.info("程序List-Lines:{}", programList);
-        } catch (IOException e) {
-            log.error("初始化失败", e);
-        }
-    }
-
 
     @Scheduled(fixedDelay = 5000)
     public void loadProgramListJob() throws IOException {
@@ -57,7 +46,6 @@ public class InstalledProgramCache {
                 process.destroy();
             }
         }
-
         programList = programs;
     }
 

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

@@ -73,6 +73,8 @@ public class ProgramController {
                                              @RequestParam(required = false, defaultValue = "1") Integer current,
                                              @RequestParam(required = false, defaultValue = "10") Integer size)
             throws IOException {
+        List<Map<String, String>> programs = installedProgramCache.getPrograms();
+        if (programs == null) return R.error("软件扫描未完成，请稍后重试!");
         String mac = MacAddrUtil.get();
         if (StrUtil.isBlank(mac)) return R.error("未获取到MAC地址");
         String url = gateway + StrUtil.format(type.equals("install") ? installUrl : upgradeUrl, mac, current, size);
@@ -82,7 +84,7 @@ public class ProgramController {
         page.setCurrent(current).setSize(size).setTotal(rsp.getLong("total"));
         JSONArray rows = rsp.getJSONArray("rows");
         if (CollUtil.isEmpty(rows)) return R.success(page.setRecords(Collections.emptyList()));
-        List<Map<String, String>> programs = installedProgramCache.getPrograms();
+
         List<Map<String, String>> list = rows.stream().map(JSONObject.class::cast)
                 .map(o -> {
                     Map<String, String> map = new HashMap<>();
@@ -219,13 +221,13 @@ public class ProgramController {
     }
 
     public static void main(String[] args) {
-            int exitVal = -1;
-            try {
-                exitVal = Runtime.getRuntime().exec("cmd /c \"D:\\work\\priusis\\priusis-iot\\apq-iot\\apq-client\\tools\\install-package\\dist\\apq-info-install.exe\"").waitFor();
-            } catch (Exception e) {
-                log.error("执行安装文件失败", e);
-            }
-            System.out.println(exitVal);
+        int exitVal = -1;
+        try {
+            exitVal = Runtime.getRuntime().exec("cmd /c \"D:\\work\\priusis\\priusis-iot\\apq-iot\\apq-client\\tools\\install-package\\dist\\apq-info-install.exe\"").waitFor();
+        } catch (Exception e) {
+            log.error("执行安装文件失败", e);
+        }
+        System.out.println(exitVal);
         System.out.println("========");
     }
 }