From f84d9e69907cb678150eaa6393fd74cf042fcca4 Mon Sep 17 00:00:00 2001
From: zenglf <18502938215@163.com>
Date: 星期四, 28 九月 2023 14:39:03 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master' into develop
---
lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/impl/MdcEquipmentRunningSectionServiceImpl.java | 46 +++++++++++++++++++++++++++++++++-------------
1 files changed, 33 insertions(+), 13 deletions(-)
diff --git a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/impl/MdcEquipmentRunningSectionServiceImpl.java b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/impl/MdcEquipmentRunningSectionServiceImpl.java
index 0531cfc..2fa8719 100644
--- a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/impl/MdcEquipmentRunningSectionServiceImpl.java
+++ b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/impl/MdcEquipmentRunningSectionServiceImpl.java
@@ -10,6 +10,7 @@
import org.jeecg.modules.mdc.service.*;
import org.jeecg.modules.mdc.util.DateUtils;
import org.jeecg.modules.mdc.util.TimeFieldUtils;
+import org.jeecg.modules.mdc.vo.MdcAlarmAnalyzeQueryVo;
import org.jeecg.modules.mdc.vo.MdcEquipmentRunningSectionVo;
import org.springframework.beans.BeanUtils;
import org.springframework.stereotype.Service;
@@ -52,18 +53,22 @@
List<MdcEquipmentRunningSection> errs = loadEquipmentErrorTrace(equipmentRunningSectionVo.getEquipmentId(), equipmentRunningSectionVo.getCollectTimeStr());
if (!running.isEmpty()) {
MdcEquipmentRunningSectionDto dto;
+ Equipment equip = equipmentService.getOne(new LambdaQueryWrapper<Equipment>().eq(Equipment::getEquipmentid, equipmentRunningSectionVo.getEquipmentId()));
+ String tableName = "";
+ Boolean isTableExist = false;
+ if (equip != null) {
+ if (StringUtils.isNotBlank(equip.getDrivetype())) {
+ tableName = equip.getDrivetype() + "_" + equip.getEquipmentid();
+ isTableExist = equipmentWorkLineService.isTableExist(tableName);
+ }
+ }
for (MdcEquipmentRunningSection entity : running) {
dto = new MdcEquipmentRunningSectionDto();
BeanUtils.copyProperties(entity, dto);
- if (entity.getStatus() == 3 && StringUtils.isBlank(entity.getSequenceNumber())) {
- Equipment equip = equipmentService.getOne(new LambdaQueryWrapper<Equipment>().eq(Equipment::getEquipmentid, entity.getEquipmentId()));
- if (equip != null) {
- if (StringUtils.isNotBlank(equip.getDrivetype())) {
- List<EquipmentMachingDto> esList = equipmentWorkLineService.getEquipmentSequencenumber(equip.getDrivetype(), equip.getEquipmentid(), entity.getStartTime(), entity.getEndTime());
- if (esList != null && esList.size() > 1) {
- dto.setSequenceNumber(esList.get(0).getSequencenumber());
- }
- }
+ if (entity.getStatus() == 3 && StringUtils.isBlank(entity.getSequenceNumber()) && isTableExist) {
+ List<EquipmentMachingDto> esList = equipmentWorkLineService.getEquipmentSequencenumber(tableName, entity.getStartTime(), entity.getEndTime());
+ if (esList != null && esList.size() > 1) {
+ dto.setSequenceNumber(esList.get(0).getSequencenumber());
}
}
dtos.add(dto);
@@ -459,7 +464,7 @@
* 璁惧杩愯鐘舵�佺偣鏃堕棿杞负娈垫椂闂�
*/
@Override
- @Transactional
+ @Transactional(rollbackFor = Exception.class)
public void runningAllEquipmentTraceProcess() {
//鑾峰彇鎵�鏈夎澶�
List<Equipment> equipmentList = equipmentService.list();
@@ -582,6 +587,21 @@
@Override
public List<MdcEquipmentRunningSection> listEquipmentRunningSectionError(String equipmentid, long start, long end) {
return this.baseMapper.listEquipmentRunningSectionError(equipmentid, start, end);
+ }
+
+ @Override
+ public List<MdcEquipmentRunningSection> findAlarmList(MdcAlarmAnalyzeQueryVo vo) {
+ return this.baseMapper.findAlarmList(vo);
+ }
+
+ @Override
+ public Integer findAlarmCount(String equipmentId, String startDate, String endDate, String alarmCode) {
+ return this.baseMapper.findAlarmCount(equipmentId, startDate, endDate, alarmCode);
+ }
+
+ @Override
+ public Integer findAlarmCountByDate(String startDate, String endDate, MdcAlarmAnalyzeQueryVo vo) {
+ return this.baseMapper.findAlarmCountByDate(startDate, endDate, vo);
}
private Map<String, List<MdcEquipmentRunningSectionDto>> logCharts(MdcEquipmentRunningSectionVo equipmentRunningSectionVo, String date) {
@@ -808,9 +828,9 @@
ert.setStartTime(logList.get(i).getCollectTime());
ert.setEndTime(logList.get(i + 1).getCollectTime());
ert.setDuration(DateUtils.differentSecond(ert.getStartTime(), ert.getEndTime()));
- if (ert.getDuration() > 0) {
- erts.add(ert);
- }
+// if (ert.getDuration() > 0) {
+ erts.add(ert);
+// }
} else {
long count = differentSecond / 86400;
if (count % 86400 > 0) {
--
Gitblit v1.9.3