From 094a9290c836827bc1f45fd3549e7cd2ea1e1e45 Mon Sep 17 00:00:00 2001
From: qushaowei <qushaowei@163.com>
Date: 星期二, 07 十一月 2023 09:45:36 +0800
Subject: [PATCH] Merge branch 'master' of http://117.34.109.166:18448/r/mdc_430 into develop
---
lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/impl/MdcEquipmentStatisticalInfoServiceImpl.java | 39 +++++++++++++++++++++++++++++++--------
1 files changed, 31 insertions(+), 8 deletions(-)
diff --git a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/impl/MdcEquipmentStatisticalInfoServiceImpl.java b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/impl/MdcEquipmentStatisticalInfoServiceImpl.java
index 7d337b3..5f89d3e 100644
--- a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/impl/MdcEquipmentStatisticalInfoServiceImpl.java
+++ b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/impl/MdcEquipmentStatisticalInfoServiceImpl.java
@@ -3,16 +3,12 @@
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.apache.commons.lang.StringUtils;
-import org.jeecg.modules.mdc.entity.Equipment;
-import org.jeecg.modules.mdc.entity.MdcEquipmentRunningSection;
-import org.jeecg.modules.mdc.entity.MdcEquipmentStatisticalInfo;
-import org.jeecg.modules.mdc.entity.MdcSystemParameters;
+import org.jeecg.common.system.vo.DictModel;
+import org.jeecg.modules.mdc.entity.*;
import org.jeecg.modules.mdc.mapper.MdcEquipmentStatisticalInfoMapper;
-import org.jeecg.modules.mdc.service.IEquipmentService;
-import org.jeecg.modules.mdc.service.IMdcEquipmentRunningSectionService;
-import org.jeecg.modules.mdc.service.IMdcEquipmentStatisticalInfoService;
-import org.jeecg.modules.mdc.service.IMdcSystemParametersService;
+import org.jeecg.modules.mdc.service.*;
import org.jeecg.modules.mdc.util.DateUtils;
+import org.jeecg.modules.system.service.ISysDictService;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
@@ -37,6 +33,12 @@
@Resource
private IMdcSystemParametersService mdcSystemParametersService;
+
+ @Resource
+ private ISysDictService sysDictService;
+
+ @Resource
+ private IEquipmentStatisticalInfoService equipmentStatisticalInfoService;
/**
* 璁＄畻璁惧鍗曟棩杩愯鏁版嵁
@@ -65,9 +67,30 @@
}
if (!result.isEmpty()) {
this.saveBatch(result);
+ List<DictModel> dictList = sysDictService.queryDictItemsByCode("data_synchronization_flag");
+ if (dictList != null && !dictList.isEmpty() && "0".equals(dictList.get(0).getValue())) {
+ List<EquipmentStatisticalInfo> list = this.dataHandle(result);
+ equipmentStatisticalInfoService.saveBatch(list);
+ }
}
}
+ private List<EquipmentStatisticalInfo> dataHandle(List<MdcEquipmentStatisticalInfo> list) {
+ List<EquipmentStatisticalInfo> result = new ArrayList<>();
+ list.forEach(item -> {
+ EquipmentStatisticalInfo equipmentStatisticalInfo = new EquipmentStatisticalInfo();
+ equipmentStatisticalInfo.setEquipment(item.getEquipmentId());
+ equipmentStatisticalInfo.setTheDate(item.getTheDate());
+ equipmentStatisticalInfo.setClosedLong(item.getCloseLong());
+ equipmentStatisticalInfo.setOpeningLong(item.getOpenLong());
+ equipmentStatisticalInfo.setErroringLong(item.getErrorLong());
+ equipmentStatisticalInfo.setProcessingLong(item.getProcessLong());
+ equipmentStatisticalInfo.setWaitingLong(item.getWaitLong());
+ result.add(equipmentStatisticalInfo);
+ });
+ return result;
+ }
+
private List<MdcEquipmentStatisticalInfo> equipmentStatisticalProcess(Equipment equipment, String dateTime) {
Date initDate = null;
//鍙栨渶鍚庣殑缁熻鏁版嵁
--
Gitblit v1.9.3