|
@@ -64,12 +64,12 @@ public class ScheduledTask {
|
|
|
if (Blank.isNotEmpty(itemGroupList)) {
|
|
|
for (ItemGroup itemGroup : itemGroupList) {
|
|
|
Integer itemGroupId = itemGroup.getId();
|
|
|
- Server server = OpcDaUtil.createServer(dataSource);
|
|
|
- try {
|
|
|
- server.connect();
|
|
|
- Group group = server.addGroup();
|
|
|
- List<Item> attachItemList = itemGroupDao.getAttributesItemList(itemGroupId, ConstantStr.ATTACH_ATTRIBUTES);
|
|
|
- if (Blank.isNotEmpty(attachItemList)) {
|
|
|
+ List<Item> attachItemList = itemGroupDao.getAttributesItemList(itemGroupId, ConstantStr.ATTACH_ATTRIBUTES);
|
|
|
+ if (Blank.isNotEmpty(attachItemList)) {
|
|
|
+ Server server = OpcDaUtil.createServer(dataSource);
|
|
|
+ try {
|
|
|
+ server.connect();
|
|
|
+ Group group = server.addGroup();
|
|
|
List<String> itemStrList = new ArrayList<>();
|
|
|
for (Item item : attachItemList) {
|
|
|
itemStrList.add(item.getItemReadName());
|
|
@@ -124,11 +124,11 @@ public class ScheduledTask {
|
|
|
if (Blank.isNotEmpty(attachItemList)) {
|
|
|
opcAsyncTask.addAttachRawDataList(attachRawDataList);
|
|
|
}
|
|
|
+ } catch (Exception e) {
|
|
|
+ e.printStackTrace();
|
|
|
+ } finally {
|
|
|
+ server.dispose();
|
|
|
}
|
|
|
- } catch (Exception e) {
|
|
|
- e.printStackTrace();
|
|
|
- } finally {
|
|
|
- server.dispose();
|
|
|
}
|
|
|
}
|
|
|
}
|
|
@@ -143,7 +143,7 @@ public class ScheduledTask {
|
|
|
*/
|
|
|
@Async("threadPoolTaskExecutor")
|
|
|
@Scheduled(cron = "0 0 0/1 * * ?")
|
|
|
- public void packageBasicData(){
|
|
|
+ public void packageBasicData() {
|
|
|
log.info("开始组装基础属性数据,时间为{}", DateUtil.dateChangeStrYmdhmss(new Date()));
|
|
|
List<Integer> itemGroupIdList = rawDataDao.getRawDataGroupIdList();
|
|
|
if (Blank.isNotEmpty(itemGroupIdList)) {
|