|
@@ -9,6 +9,7 @@ import com.jjt.calc.service.ITwinCalcHourYhjService;
|
|
|
import com.jjt.common.constant.CacheConstants;
|
|
|
import com.jjt.common.core.redis.RedisCache;
|
|
|
import com.jjt.common.utils.DateUtils;
|
|
|
+import com.jjt.inventory.service.ITwinCalcHourBpOutService;
|
|
|
import com.jjt.utils.AsyncYhjService;
|
|
|
import com.jjt.utils.IotService;
|
|
|
import com.jjt.utils.Tools;
|
|
@@ -28,7 +29,6 @@ import java.util.concurrent.ExecutionException;
|
|
|
import java.util.concurrent.Future;
|
|
|
import java.util.concurrent.TimeUnit;
|
|
|
import java.util.concurrent.TimeoutException;
|
|
|
-import java.util.stream.Collectors;
|
|
|
|
|
|
/**
|
|
|
* 印花机1小时统计数据Service业务层处理
|
|
@@ -53,6 +53,8 @@ public class TwinCalcHourYhjServiceImpl implements ITwinCalcHourYhjService {
|
|
|
private AsyncYhjService asyncYhjService;
|
|
|
@Resource
|
|
|
private RedisCache redisCache;
|
|
|
+ @Resource
|
|
|
+ private ITwinCalcHourBpOutService bpOutService;
|
|
|
|
|
|
/**
|
|
|
* 查询印花机1小时统计数据
|
|
@@ -252,6 +254,7 @@ public class TwinCalcHourYhjServiceImpl implements ITwinCalcHourYhjService {
|
|
|
LocalDateTime stop = Tools.currWholeTime();
|
|
|
while (!end.isAfter(stop)) {
|
|
|
calc(start, end);
|
|
|
+ bpOutService.calc(start, end);
|
|
|
log.info("补录数据===========start:{},end:{},stop:{}", start, end, stop);
|
|
|
if (end.getHour() == 7) {
|
|
|
//跨天,统计前一天的总数据
|