提交 18c06f4a authored 作者: yangli's avatar yangli

.

上级 b8363840
...@@ -4,7 +4,6 @@ import lombok.extern.slf4j.Slf4j; ...@@ -4,7 +4,6 @@ import lombok.extern.slf4j.Slf4j;
import org.springframework.scheduling.annotation.Scheduled; import org.springframework.scheduling.annotation.Scheduled;
import org.springframework.stereotype.Component; import org.springframework.stereotype.Component;
import javax.annotation.PostConstruct;
import java.io.BufferedReader; import java.io.BufferedReader;
import java.io.IOException; import java.io.IOException;
import java.io.InputStreamReader; import java.io.InputStreamReader;
...@@ -24,20 +23,10 @@ public class InstalledProgramCache { ...@@ -24,20 +23,10 @@ public class InstalledProgramCache {
private static List<Map<String, String>> programList; private static List<Map<String, String>> programList;
public List<Map<String, String>> getPrograms() throws IOException { public List<Map<String, String>> getPrograms() throws IOException {
if (programList == null) loadProgramListJob(); // if (programList == null) loadProgramListJob();
return programList; return programList;
} }
@PostConstruct
public void init() {
try {
loadProgramListJob();
log.info("程序List-Lines:{}", programList);
} catch (IOException e) {
log.error("初始化失败", e);
}
}
@Scheduled(fixedDelay = 5000) @Scheduled(fixedDelay = 5000)
public void loadProgramListJob() throws IOException { public void loadProgramListJob() throws IOException {
...@@ -57,7 +46,6 @@ public class InstalledProgramCache { ...@@ -57,7 +46,6 @@ public class InstalledProgramCache {
process.destroy(); process.destroy();
} }
} }
programList = programs; programList = programs;
} }
......
...@@ -73,6 +73,8 @@ public class ProgramController { ...@@ -73,6 +73,8 @@ public class ProgramController {
@RequestParam(required = false, defaultValue = "1") Integer current, @RequestParam(required = false, defaultValue = "1") Integer current,
@RequestParam(required = false, defaultValue = "10") Integer size) @RequestParam(required = false, defaultValue = "10") Integer size)
throws IOException { throws IOException {
List<Map<String, String>> programs = installedProgramCache.getPrograms();
if (programs == null) return R.error("软件扫描未完成,请稍后重试!");
String mac = MacAddrUtil.get(); String mac = MacAddrUtil.get();
if (StrUtil.isBlank(mac)) return R.error("未获取到MAC地址"); if (StrUtil.isBlank(mac)) return R.error("未获取到MAC地址");
String url = gateway + StrUtil.format(type.equals("install") ? installUrl : upgradeUrl, mac, current, size); String url = gateway + StrUtil.format(type.equals("install") ? installUrl : upgradeUrl, mac, current, size);
...@@ -82,7 +84,7 @@ public class ProgramController { ...@@ -82,7 +84,7 @@ public class ProgramController {
page.setCurrent(current).setSize(size).setTotal(rsp.getLong("total")); page.setCurrent(current).setSize(size).setTotal(rsp.getLong("total"));
JSONArray rows = rsp.getJSONArray("rows"); JSONArray rows = rsp.getJSONArray("rows");
if (CollUtil.isEmpty(rows)) return R.success(page.setRecords(Collections.emptyList())); 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) List<Map<String, String>> list = rows.stream().map(JSONObject.class::cast)
.map(o -> { .map(o -> {
Map<String, String> map = new HashMap<>(); Map<String, String> map = new HashMap<>();
......
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论