From 52ff3bda72646a532c3297e4843bc4d5aee8b949 Mon Sep 17 00:00:00 2001
From: yangys <y_ys79@sina.com>
Date: 星期二, 03 九月 2024 17:20:49 +0800
Subject: [PATCH] 采集数据增加employeeid的设置
---
collect/src/main/java/com/qianwen/mdc/collect/service/DeviceStateAggregateNoFeedbackService.java | 16 ++++++++++++----
1 files changed, 12 insertions(+), 4 deletions(-)
diff --git a/collect/src/main/java/com/qianwen/mdc/collect/service/DeviceStateAggregateNoFeedbackService.java b/collect/src/main/java/com/qianwen/mdc/collect/service/DeviceStateAggregateNoFeedbackService.java
index 3567bf8..532f733 100644
--- a/collect/src/main/java/com/qianwen/mdc/collect/service/DeviceStateAggregateNoFeedbackService.java
+++ b/collect/src/main/java/com/qianwen/mdc/collect/service/DeviceStateAggregateNoFeedbackService.java
@@ -37,7 +37,8 @@
private AggregateStateMapper workstationAggregateStateMapper;
@Autowired
private IotDBSessionConfig iotdbConfig;
-
+ @Autowired
+ private IotDBCommonService iotDBCommonService;
public List<AggregateState> stateAggregateForSpecialTimeRange(Long workstationId, StateAggregateTimeDTO timeRange, List<DeviceState> effectiveStateList) {
//鎸塼imeRange鏌ヨ鏃堕棿鍖洪棿鍐呯殑鐘舵�佹暟鎹紝闄や簡宸插垹闄ょ殑锛屽叾浠栨暟鎹兘鏌ュ嚭鏉ヤ簡
@@ -90,7 +91,7 @@
schemas.add(new MeasurementSchema("shift_time_type", TSDataType.INT32));
schemas.add(new MeasurementSchema("wcs", TSDataType.INT32));
schemas.add(new MeasurementSchema("rps", TSDataType.INT32));
- schemas.add(new MeasurementSchema("is_sync", TSDataType.BOOLEAN));
+ //schemas.add(new MeasurementSchema("is_sync", TSDataType.BOOLEAN));
schemas.add(new MeasurementSchema("is_plan", TSDataType.INT32));//TODO 杩欎釜灞炴�у簲璇ユ槸GlobalWcsOfRps涓殑鍊硷紝濡備綍濉啓锛�
schemas.add(new MeasurementSchema("feedback_id", TSDataType.INT64));
schemas.add(new MeasurementSchema("is_deleted", TSDataType.BOOLEAN));
@@ -98,8 +99,11 @@
//鍛藉悕锛歛ggregate_state_{workstation_id}
String deviceId = IOTDBConstant.DB_PREFIX+"aggregate_state_"+workstationId;
+
+ iotDBCommonService.setTemmplateIfNotSet(IOTDBConstant.TEMPLATE_AGGREGATESTATE, deviceId);//鎸傝浇妯℃澘
+
Tablet tablet = new Tablet(deviceId, schemas);
- //tablet.rowSize = aggStates.size();
+ tablet.rowSize = aggStates.size();
AggregateState aggState;
for(int i=0;i<aggStates.size();i++) {
@@ -118,7 +122,7 @@
tablet.addValue("shift_time_type", i, aggState.getShiftTimeType());
tablet.addValue("wcs", i, aggState.getWcs());
tablet.addValue("rps", i, aggState.getRps());
- tablet.addValue("is_sync", i, aggState.getIsSync());
+
tablet.addValue("is_plan", i, aggState.getIsPlan());
tablet.addValue("feedback_id", i, aggState.getFeedbackId());
tablet.addValue("is_deleted", i, aggState.getIsDeleted());
@@ -127,6 +131,7 @@
}
try {
this.iotdbConfig.getSessionPool().insertAlignedTablet(tablet);
+ log.info("淇濆瓨鑱氬悎鐘舵�佸畬鎴�");
} catch (Exception e) {
log.error("淇濆瓨鑱氬悎鐘舵�佹暟鎹紓甯�",e);
}
@@ -142,11 +147,14 @@
*/
List<AggregateState> finallyResult = new ArrayList<>();
//for (StateAggregateTimeDTO item : effectTimeRangeList2) {
+ /*
List<AggregateState> temp = this.workstationAggregateStateMapper.selectList(Wrappers.<AggregateState>lambdaQuery()
.eq(AggregateState::getWorkstationId, workstationId).and(wrapper -> {
LambdaQueryWrapper lambdaQueryWrapper = wrapper.eq(AggregateState::getIsDeleted, Boolean.FALSE).or().isNull(AggregateState::getIsDeleted);
}).
ge(Func.isNotEmpty(timeRange.getStartTime()), AggregateState::getTime, timeRange.getStartTime()).le(AggregateState::getTime, timeRange.getEndTime()).orderByAsc(AggregateState::getTime));
+ */
+ List<AggregateState> temp = this.workstationAggregateStateMapper.aggregateStatesInTimeRange(workstationId, timeRange);
if (Func.isNotEmpty(temp)) {
finallyResult.addAll(temp);
}
--
Gitblit v1.9.3