From d4212be4f036c5972e192a93e9a7f3a2e3bb2535 Mon Sep 17 00:00:00 2001
From: yangys <y_ys79@sina.com>
Date: 星期六, 28 九月 2024 15:26:39 +0800
Subject: [PATCH] 加入logback配置
---
collect/src/main/java/com/qianwen/mdc/collect/service/DeviceStateAggregateService.java | 6 +++++-
1 files changed, 5 insertions(+), 1 deletions(-)
diff --git a/collect/src/main/java/com/qianwen/mdc/collect/service/DeviceStateAggregateService.java b/collect/src/main/java/com/qianwen/mdc/collect/service/DeviceStateAggregateService.java
index b5602c1..460af15 100644
--- a/collect/src/main/java/com/qianwen/mdc/collect/service/DeviceStateAggregateService.java
+++ b/collect/src/main/java/com/qianwen/mdc/collect/service/DeviceStateAggregateService.java
@@ -34,6 +34,7 @@
import com.qianwen.mdc.collect.enums.FeedbackTimePointEnum;
import com.qianwen.mdc.collect.mapper.iotdb.DeviceStateMapper;
import com.qianwen.mdc.collect.mapper.mgr.CalendarMapper;
+import com.qianwen.mdc.collect.service.feedback.WorkstationFeedbackService;
import com.qianwen.mdc.collect.utils.FeedbackAnalyseUtils;
import com.qianwen.mdc.collect.utils.LocalDateTimeUtils;
import cn.hutool.core.date.DatePattern;
@@ -62,6 +63,9 @@
@Autowired
private DeviceStateAggregateNoFeedbackService stateAggregateNoFeedbackService;
+ @Autowired
+ private WorkstationFeedbackService workstationFeedbackService;
+
public void stateAggregate(Long workstationId) {
////鑾峰彇鏃堕棿闃舵鍒楄〃(2涓�),涓�涓猲oFeedbackTime=true锛屼竴涓猲oFeedbackTime=false,鎴戜滑鑷繁杩斿洖涓�涓猻tartTime锛宔ndTime鍗冲彲锛宯oFeedbackTime=true鐨勫嵆鍙�
//List<StateAggregateTimeDTO> effective = getCurrentStateAggregateTimeRange(workstationId);
@@ -93,7 +97,7 @@
deviceStateService.saveDeviceStates(noFeedbackStateList);//鏇存柊isSync=true
////浣跨敤workstationWcsFeedbackMapper鏇存柊鍙嶉寰楃姸鎬�,鎴戜滑涓嶉渶瑕�
//IWorkstationFeedbackService workstationFeedbackService = SpringUtil.getBean(IWorkstationFeedbackService.class);
- //workstationFeedbackService.handlerFeedbackComplete(workstationId);
+ workstationFeedbackService.handlerFeedbackComplete(workstationId);
}
--
Gitblit v1.9.3