Browse Source

提交:11

mine
袁强 1 week ago
parent
commit
6a4c5035c2
  1. 2
      yq-admin/src/main/java/yq/web/controller/nologin/NoLogin.java
  2. 6
      yq-common/src/main/java/yq/common/utils/FaceEnginUtil.java
  3. 4
      yq-common/src/main/java/yq/common/webSocket/MyWebSocketHandler.java

2
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 Map<String, Object>tempMap(String id)
{

6
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);
//激活引擎

4
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<String, Object> 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);

Loading…
Cancel
Save