diff --git a/data-processing/data-processing-boot/src/main/java/com/njcn/dataProcess/controller/DataRecallController.java b/data-processing/data-processing-boot/src/main/java/com/njcn/dataProcess/controller/DataRecallController.java index e1ea177..67fa509 100644 --- a/data-processing/data-processing-boot/src/main/java/com/njcn/dataProcess/controller/DataRecallController.java +++ b/data-processing/data-processing-boot/src/main/java/com/njcn/dataProcess/controller/DataRecallController.java @@ -114,7 +114,7 @@ public class DataRecallController extends BaseController { if(collect1.containsKey(temp)&&collect1.get(temp).containsKey(curDateString)){ DataIntegrityDto dto = collect1.get(temp).get(curDateString).get(0); if( dto.getDueTime()!=0){ - int i = (dto.getRealTime()) / dto.getDueTime(); + double i =(double)dto.getRealTime() / dto.getDueTime(); if( i>=0.98){ recallType=3; } else if(i<0.98&&i>0.8){ @@ -332,7 +332,7 @@ public class DataRecallController extends BaseController { if(collect1.containsKey(temp)&&collect1.get(temp).containsKey(curDateString)){ DataIntegrityDto dto = collect1.get(temp).get(curDateString).get(0); if( dto.getDueTime()!=0){ - int i = (dto.getRealTime()) / dto.getDueTime(); + double i = (double)dto.getRealTime() / dto.getDueTime(); if( i>=0.98){ recallType=3; } else if(i<0.98&&i>0.8){ diff --git a/data-processing/data-processing-boot/src/main/java/com/njcn/dataProcess/websocket/RecallWebSocketServer.java b/data-processing/data-processing-boot/src/main/java/com/njcn/dataProcess/websocket/RecallWebSocketServer.java index b978dde..424543e 100644 --- a/data-processing/data-processing-boot/src/main/java/com/njcn/dataProcess/websocket/RecallWebSocketServer.java +++ b/data-processing/data-processing-boot/src/main/java/com/njcn/dataProcess/websocket/RecallWebSocketServer.java @@ -210,7 +210,7 @@ public class RecallWebSocketServer { if(collect1.containsKey(temp)&&collect1.get(temp).containsKey(curDateString)){ DataIntegrityDto dto = collect1.get(temp).get(curDateString).get(0); if( dto.getDueTime()!=0){ - int i = (dto.getRealTime()) / dto.getDueTime(); + double i = (double)dto.getRealTime() / dto.getDueTime(); if( i>=0.98){ recallType=3; } else if(i<0.98&&i>0.8){ @@ -255,7 +255,7 @@ public class RecallWebSocketServer { String jsonString =redisUtil.getStringByKey(key); if(Objects.nonNull(jsonString)){ TopicReplyDTO bean = JSONUtil.toBean(jsonString, TopicReplyDTO.class, true); - + redisUtil.delete(key); flag =false; sendInfo(bean.getResult()); BaseParam baseParam = new BaseParam(); @@ -314,6 +314,7 @@ public class RecallWebSocketServer { String jsonString =redisUtil.getStringByKey(key); if(Objects.nonNull(jsonString)){ TopicReplyDTO bean = JSONUtil.toBean(jsonString, TopicReplyDTO.class, true); + redisUtil.delete(key); flag =false; sendInfo(bean.getResult());