提交 ca3b948f authored 作者: wangqiang's avatar wangqiang

海康客户端问题

上级 99c9cd0d
...@@ -40,8 +40,6 @@ public class DeviceInfoController { ...@@ -40,8 +40,6 @@ public class DeviceInfoController {
private Map<String, Object> info; private Map<String, Object> info;
Sigar sigar = new Sigar();
@GetMapping(value = "get") @GetMapping(value = "get")
public R<Map<String, Object>> get() throws UnknownHostException, SocketException { public R<Map<String, Object>> get() throws UnknownHostException, SocketException {
if (info == null) refresh(); if (info == null) refresh();
...@@ -50,6 +48,7 @@ public class DeviceInfoController { ...@@ -50,6 +48,7 @@ public class DeviceInfoController {
@Scheduled(fixedDelay = 600000) @Scheduled(fixedDelay = 600000)
protected void refresh() throws UnknownHostException { protected void refresh() throws UnknownHostException {
Sigar sigar = new Sigar();
JSONObject diskModel = null; JSONObject diskModel = null;
JSONObject diskCap = null; JSONObject diskCap = null;
JSONObject diskFree = null; JSONObject diskFree = null;
......
...@@ -62,8 +62,6 @@ public class ApqInfoJob { ...@@ -62,8 +62,6 @@ public class ApqInfoJob {
private int runningIndex = 0; private int runningIndex = 0;
Sigar sigar = new Sigar();
private static Map<String, Map<String, String>> hardwareCache = new HashMap<>(); private static Map<String, Map<String, String>> hardwareCache = new HashMap<>();
private static Map<String, String> attrCache = new HashMap<>(); private static Map<String, String> attrCache = new HashMap<>();
...@@ -117,6 +115,7 @@ public class ApqInfoJob { ...@@ -117,6 +115,7 @@ public class ApqInfoJob {
Map<String, Object> data = null; Map<String, Object> data = null;
try { try {
Sigar sigar = new Sigar();
// 上报PC实时信息 // 上报PC实时信息
String collect = Oshi4NoneSigarUtil.getDiskStoresModelFromOshi(); String collect = Oshi4NoneSigarUtil.getDiskStoresModelFromOshi();
String collectForCheck = Oshi4NoneSigarUtil.getDiskStoresModelJsonFromOshi(); String collectForCheck = Oshi4NoneSigarUtil.getDiskStoresModelJsonFromOshi();
......
...@@ -52,7 +52,7 @@ public class SigarUtil { ...@@ -52,7 +52,7 @@ public class SigarUtil {
// net(); // net();
// System.out.println("----------------------------------"); // System.out.println("----------------------------------");
// // 以太网信息 // // 以太网信息
System.out.println(ethernet(sigar)); System.out.println(ethernetSimple(sigar));
System.out.println("----------------------------------"); System.out.println("----------------------------------");
Thread.sleep(15000); Thread.sleep(15000);
} }
......
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论