提交 89a331b8 authored 作者: yangli's avatar yangli

.

上级 492ed0c1
...@@ -97,7 +97,7 @@ public class ProgramController { ...@@ -97,7 +97,7 @@ public class ProgramController {
map.put("status", SET.contains(key) ? "1" : MAP.containsKey(key) ? "2" : "0"); map.put("status", SET.contains(key) ? "1" : MAP.containsKey(key) ? "2" : "0");
return map; return map;
}) })
.peek(m -> programs.stream() /*.peek(m -> programs.stream()
.collect(Collectors.toMap(p -> StrUtil.similar(p.get("name").toLowerCase(), m.get("name").toLowerCase()), .collect(Collectors.toMap(p -> StrUtil.similar(p.get("name").toLowerCase(), m.get("name").toLowerCase()),
p -> p.getOrDefault("version", ""), (l, r) -> r)) p -> p.getOrDefault("version", ""), (l, r) -> r))
.entrySet() .entrySet()
...@@ -105,7 +105,11 @@ public class ProgramController { ...@@ -105,7 +105,11 @@ public class ProgramController {
.max(Map.Entry.comparingByKey()) .max(Map.Entry.comparingByKey())
.filter(e -> e.getKey() >= MIN_MATCH) .filter(e -> e.getKey() >= MIN_MATCH)
.filter(e -> StrUtil.isNotBlank(e.getValue())) .filter(e -> StrUtil.isNotBlank(e.getValue()))
.ifPresent(e -> m.put("localVersion", e.getValue()))) .ifPresent(e -> m.put("localVersion", e.getValue())))*/
.peek(m -> programs.stream()
.filter(p -> p.get("name").equalsIgnoreCase(m.get("name")))
.findFirst()
.ifPresent(p -> m.put("localVersion", p.get("version"))))
.collect(Collectors.toList()); .collect(Collectors.toList());
return R.success(page.setRecords(list)); return R.success(page.setRecords(list));
} }
...@@ -173,7 +177,7 @@ public class ProgramController { ...@@ -173,7 +177,7 @@ public class ProgramController {
@GetMapping(value = "get_version") @GetMapping(value = "get_version")
public R<String> getVersion(@RequestParam @NotBlank String name) throws IOException { public R<String> getVersion(@RequestParam @NotBlank String name) throws IOException {
installedProgramCache.loadProgramListJob(); installedProgramCache.loadProgramListJob();
return installedProgramCache.getPrograms().stream() /*return installedProgramCache.getPrograms().stream()
.collect(Collectors.toMap(p -> StrUtil.similar(p.get("name").toLowerCase(), name.toLowerCase()), .collect(Collectors.toMap(p -> StrUtil.similar(p.get("name").toLowerCase(), name.toLowerCase()),
p -> p.getOrDefault("version", ""), (l, r) -> r)) p -> p.getOrDefault("version", ""), (l, r) -> r))
.entrySet() .entrySet()
...@@ -183,6 +187,12 @@ public class ProgramController { ...@@ -183,6 +187,12 @@ public class ProgramController {
.filter(e -> StrUtil.isNotBlank(e.getValue())) .filter(e -> StrUtil.isNotBlank(e.getValue()))
.map(Map.Entry::getValue) .map(Map.Entry::getValue)
.map(R::success) .map(R::success)
.orElseGet(R::success);*/
return installedProgramCache.getPrograms().stream()
.filter(p -> p.get("name").equalsIgnoreCase(name))
.findFirst()
.map(m -> m.get("version"))
.map(R::success)
.orElseGet(R::success); .orElseGet(R::success);
} }
......
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论