提交 59c26282 authored 作者: yangli's avatar yangli

.

上级 18c06f4a
...@@ -23,7 +23,7 @@ public class InstalledProgramCache { ...@@ -23,7 +23,7 @@ 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;
} }
......
...@@ -73,8 +73,6 @@ public class ProgramController { ...@@ -73,8 +73,6 @@ 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);
...@@ -84,7 +82,7 @@ public class ProgramController { ...@@ -84,7 +82,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<>();
...@@ -221,13 +219,13 @@ public class ProgramController { ...@@ -221,13 +219,13 @@ public class ProgramController {
} }
public static void main(String[] args) { public static void main(String[] args) {
int exitVal = -1; int exitVal = -1;
try { 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(); 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) { } catch (Exception e) {
log.error("执行安装文件失败", e); log.error("执行安装文件失败", e);
} }
System.out.println(exitVal); System.out.println(exitVal);
System.out.println("========"); System.out.println("========");
} }
} }
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论