From b5d02520af582a86aa95d7903558a5bf50a77aa7 Mon Sep 17 00:00:00 2001
From: cuilei <ray_tsu1@163.com>
Date: 星期二, 17 六月 2025 16:12:46 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/impl/MdcEquipmentStatisticalInfoServiceImpl.java | 28 ++--------------------------
1 files changed, 2 insertions(+), 26 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 c149df2..4e6a883 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
@@ -37,10 +37,7 @@
private IMdcSystemParametersService mdcSystemParametersService;
@Resource
- private ISysDictService sysDictService;
-
- @Resource
- private IEquipmentStatisticalInfoService equipmentStatisticalInfoService;
+ private IMdcEquipmentFaultInfoService mdcEquipmentFaultInfoService;
/**
* 璁＄畻璁惧鍗曟棩杩愯鏁版嵁
@@ -69,28 +66,8 @@
}
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;
+ mdcEquipmentFaultInfoService.runningAllEquFaultStatistical(dateTime);
}
private List<MdcEquipmentStatisticalInfo> equipmentStatisticalProcess(Equipment equipment, String dateTime) {
@@ -141,7 +118,6 @@
List<MdcEquipmentRunningSection> equipmentRunningSectionList = mdcEquipmentRunningSectionService.listForEquipmentStatisticalInfo(equipment.getEquipmentid(), startDate, endDate);
return this.statisticsData(equipmentRunningSectionList, planTime, startDate, endDate, equipment);
} else {
- //寰呴獙璇�
Date end = DateUtils.plusTime(initDate, 1);
endDate = DateUtils.setTimeForDay(end, planTime);
List<MdcEquipmentRunningSection> equipmentRunningSectionList = mdcEquipmentRunningSectionService.listForEquipmentStatisticalInfo(equipment.getEquipmentid(), startDate, endDate);
--
Gitblit v1.9.3