diff --git a/yq-admin/src/main/java/yq/web/controller/nologin/NoLogin.java b/yq-admin/src/main/java/yq/web/controller/nologin/NoLogin.java index c17b0d0..8c8c9d7 100644 --- a/yq-admin/src/main/java/yq/web/controller/nologin/NoLogin.java +++ b/yq-admin/src/main/java/yq/web/controller/nologin/NoLogin.java @@ -99,7 +99,7 @@ public class NoLogin extends BaseController { return AjaxResult.success(mineWarningService.insertMineWarning(mineWarning)); } - //获取 + //获取机子上报数据 @GetMapping("/temp") public MaptempMap(String id) { diff --git a/yq-common/src/main/java/yq/common/utils/FaceEnginUtil.java b/yq-common/src/main/java/yq/common/utils/FaceEnginUtil.java index cf8cc6c..f463e4d 100644 --- a/yq-common/src/main/java/yq/common/utils/FaceEnginUtil.java +++ b/yq-common/src/main/java/yq/common/utils/FaceEnginUtil.java @@ -42,9 +42,9 @@ public class FaceEnginUtil { @Value(value = "${arcsoft.faceEngine}") - private static String faceEngineUrl = "/home/dk/桌面/jar/arcsoft_lib/LINUX64"; - - + private static String faceEngineUrl = "/usr/local/java/mine/arcsoft_lib/LINUX64"; + /*/usr/local/java/mine/arcsoft_lib/LINUX64*/ + /*D://yq/arcsoft_lib/LINUX64*/ public static FaceEngine init() { FaceEngine faceEngine = new FaceEngine(faceEngineUrl); //激活引擎 diff --git a/yq-common/src/main/java/yq/common/webSocket/MyWebSocketHandler.java b/yq-common/src/main/java/yq/common/webSocket/MyWebSocketHandler.java index 9443a7c..10d5858 100644 --- a/yq-common/src/main/java/yq/common/webSocket/MyWebSocketHandler.java +++ b/yq-common/src/main/java/yq/common/webSocket/MyWebSocketHandler.java @@ -56,11 +56,13 @@ public class MyWebSocketHandler implements WebSocketHandler { if(redisCache.hasKey(id)){ Double temp = Convert.toDouble(object.get("temp")); Map cacheMap = redisCache.getCacheMap(id); - Double temp1 = Convert.toDouble(cacheMap.get("temp")); + Double temp1 = Convert.toDouble(cacheMap.get("temp"),0.0); if(temp>temp1){ + System.out.println("存入到redis" + object); redisCache.setCacheMap(id,object); } }else { + System.out.println("存入到redis" + object); redisCache.setCacheMap(id,object); } redisCache.expire(id,5,TimeUnit.SECONDS);