|
@@ -1,9 +1,13 @@
|
|
|
package com.example.opc_da.config;
|
|
|
|
|
|
import com.example.opc_common.entity.DataSource;
|
|
|
+import com.example.opc_common.entity.Item;
|
|
|
+import com.example.opc_common.entity.ItemGroup;
|
|
|
import com.example.opc_common.enums.DataSourceTypeEnum;
|
|
|
import com.example.opc_common.util.Blank;
|
|
|
import com.example.opc_da.dao.DataSourceDao;
|
|
|
+import com.example.opc_da.dao.ItemGroupDao;
|
|
|
+import com.example.opc_da.dao.RawDataDao;
|
|
|
import com.example.opc_da.task.OpcAsyncTask;
|
|
|
import lombok.extern.slf4j.Slf4j;
|
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
@@ -20,9 +24,15 @@ import java.util.List;
|
|
|
public class InitRunner {
|
|
|
|
|
|
@Autowired
|
|
|
+ private ItemGroupDao itemGroupDao;
|
|
|
+
|
|
|
+ @Autowired
|
|
|
private DataSourceDao dataSourceDao;
|
|
|
|
|
|
@Autowired
|
|
|
+ private RawDataDao rawDataDao;
|
|
|
+
|
|
|
+ @Autowired
|
|
|
private OpcAsyncTask opcAsyncTask;
|
|
|
|
|
|
@PostConstruct
|
|
@@ -42,5 +52,21 @@ public class InitRunner {
|
|
|
}
|
|
|
}
|
|
|
}
|
|
|
+
|
|
|
+ //组装系统挂了没有组装的数据
|
|
|
+ List<Integer> itemGroupIdList = rawDataDao.getRawDataGroupIdList();
|
|
|
+ if (Blank.isNotEmpty(itemGroupIdList)) {
|
|
|
+ for (Integer itemGroupId : itemGroupIdList) {
|
|
|
+ List<String> belongTimeList = rawDataDao.getRawDataBelongTime(itemGroupId);
|
|
|
+ if (Blank.isNotEmpty(belongTimeList)) {
|
|
|
+ for (int i = 0; i < belongTimeList.size(); i++) {
|
|
|
+ List<Item> itemList = itemGroupDao.getItemListByGroupId(itemGroupId);
|
|
|
+ ItemGroup itemGroup = itemGroupDao.getItemGroupById(itemGroupId);
|
|
|
+ Integer dataSourceId = itemGroup.getDataSourceId();
|
|
|
+ opcAsyncTask.packageRawDataList(itemList, dataSourceId, belongTimeList.get(i));
|
|
|
+ }
|
|
|
+ }
|
|
|
+ }
|
|
|
+ }
|
|
|
}
|
|
|
}
|