提交 d1b1f89b authored 作者: 李炎's avatar 李炎

大萨达

上级 c746871c
...@@ -10,7 +10,7 @@ public class Constants { ...@@ -10,7 +10,7 @@ public class Constants {
public static final String IMSMAC ="02-42-AC-12-00-03"; public static final String IMSMAC ="02-42-AC-12-00-03";
public static final String IMSMAC2 ="02-42-AC-12-00-02"; public static final String IMSMAC2 ="02-42-AC-12-00-02";
public static Map<String, String> entity = new HashMap<String, String>() {{ public static Map<String, String> entity = new HashMap<String, String>(16) {{
put(OZTIMSMAC, ""); put(OZTIMSMAC, "");
put(TESTIMSMAC, ""); put(TESTIMSMAC, "");
put(IMSMAC, ""); put(IMSMAC, "");
......
...@@ -8,6 +8,7 @@ import org.springframework.web.bind.annotation.*; ...@@ -8,6 +8,7 @@ import org.springframework.web.bind.annotation.*;
import java.net.InetAddress; import java.net.InetAddress;
import java.net.SocketException; import java.net.SocketException;
import java.net.UnknownHostException; import java.net.UnknownHostException;
import java.util.HashMap;
import java.util.Map; import java.util.Map;
@CrossOrigin @CrossOrigin
...@@ -18,9 +19,10 @@ public class InspectController { ...@@ -18,9 +19,10 @@ public class InspectController {
private static final String localMacString = "localMac"; private static final String localMacString = "localMac";
@PostMapping(value = "/mac") @PostMapping(value = "/mac")
public Boolean inspectMac(@RequestBody(required = false) Map Mac) { public Boolean inspectMac(@RequestBody(required = false) Map Mac) {
System.out.println("有登录"+Mac); System.out.println("有登录" + Mac);
if (null != Mac && null != Mac.get(localMacString)) { if (null != Mac && null != Mac.get(localMacString)) {
if (Constants.entity.containsKey(Mac.get(localMacString))) { if (Constants.entity.containsKey(Mac.get(localMacString))) {
return true; return true;
...@@ -28,11 +30,25 @@ public class InspectController { ...@@ -28,11 +30,25 @@ public class InspectController {
} }
return false; return false;
} }
@GetMapping(value = "/getMac") @GetMapping(value = "/getMac")
public String getMac() throws SocketException, UnknownHostException { public String getMac() throws SocketException, UnknownHostException {
System.out.println("执行了"); System.out.println("执行了");
// inetAddress =
String localMac = LocalMACUtil.getLocalMac(InetAddress.getLocalHost()); String localMac = LocalMACUtil.getLocalMac(InetAddress.getLocalHost());
return localMac; return localMac;
} }
@PostMapping(value = "/resartMac")
public String resartMac(@RequestBody(required = false) Map Mac) {
System.out.println("有登录" + Mac);
if (null != Mac && null != Mac.get(localMacString)) {
if (Constants.entity.containsKey(Mac.get(localMacString))) {
return "已有mac";
} else {
Constants.entity.put(Mac.get(localMacString).toString(),Mac.get(localMacString).toString());
return "ok";
}
}
return "ok";
}
} }
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论