From e8ed1a91c77ab62a924f12acd55777f227bacd7e Mon Sep 17 00:00:00 2001
From: yangys <y_ys79@sina.com>
Date: 星期五, 21 十一月 2025 17:15:17 +0800
Subject: [PATCH] 工位组删除后，其下工位移动到默认组
---
smart-man-boot/src/main/java/com/qianwen/smartman/modules/mdc/service/impl/AlarmServiceImpl.java | 23 ++++++++++++++---------
1 files changed, 14 insertions(+), 9 deletions(-)
diff --git a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/mdc/service/impl/AlarmServiceImpl.java b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/mdc/service/impl/AlarmServiceImpl.java
index ae94770..1c86695 100644
--- a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/mdc/service/impl/AlarmServiceImpl.java
+++ b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/mdc/service/impl/AlarmServiceImpl.java
@@ -33,10 +33,10 @@
import com.qianwen.smartman.common.utils.LocalDateTimeUtils;
import com.qianwen.smartman.common.utils.LocalDateUtil;
import com.qianwen.smartman.common.utils.MessageUtils;
-import com.qianwen.smartman.modules.cps.dto.ShiftInfoDTO;
-import com.qianwen.smartman.modules.cps.mapper.WorkstationMapper;
-import com.qianwen.smartman.modules.cps.service.IShiftDetailService;
-import com.qianwen.smartman.modules.cps.vo.WorkstationVO;
+import com.qianwen.smartman.modules.smis.dto.ShiftInfoDTO;
+import com.qianwen.smartman.modules.smis.mapper.WorkstationMapper;
+import com.qianwen.smartman.modules.smis.service.IShiftDetailService;
+import com.qianwen.smartman.modules.smis.vo.WorkstationVO;
import com.qianwen.smartman.modules.mdc.convert.AlarmConvert;
import com.qianwen.smartman.modules.mdc.entity.SuperAggregate;
import com.qianwen.smartman.modules.mdc.entity.SuperAlarm;
@@ -80,7 +80,7 @@
return new Page<>();
}
LocalDate queryTime = vo.getQueryTime();
- List<SuperAlarm> list = this.alarmMapper.selectListAlarm(vo, DateUtil.format(queryTime, "yyyyMMdd"));
+ List<SuperAlarm> list = this.alarmMapper.selectListAlarm(vo,Integer.parseInt(DateUtil.format(queryTime, "yyyyMMdd")));
Map<String, List<SuperAlarm>> map = FilterOffUtils.filterOffDay(list, OpenTypeEnums.ALARM_ANALYSIS).stream().collect(Collectors.groupingBy(c -> {
return c.getCode() + c.getMessage();
}));
@@ -90,14 +90,14 @@
if (map.size() == 0) {
return page;
}
- List<SuperAlarm> alarms = this.alarmMapper.selectListAlarm(vo, DateUtil.format(queryTime, "yyyyMMdd"));
+ List<SuperAlarm> alarms = this.alarmMapper.selectListAlarm(vo, Integer.parseInt(DateUtil.format(queryTime, "yyyyMMdd")));
List<AlarmDataSheetVO> res = AlarmConvert.INSTANCE.convert(FilterOffUtils.filterOffDay(alarms, OpenTypeEnums.ALARM_ANALYSIS));
List<AlarmDataSheetVO> alarmDataSheetVOS = new ArrayList<>();
Map<String, List<AlarmDataSheetVO>> resMap = res.stream().collect(Collectors.groupingBy(c2 -> {
return c2.getAlarmCode() + c2.getAlarmMsg();
}));
resMap.values().forEach(alarmDataSheetVOList -> {
- ((AlarmDataSheetVO) alarmDataSheetVOList.get(0)).setCount(Integer.valueOf(alarmDataSheetVOList.size()));
+ ((AlarmDataSheetVO) alarmDataSheetVOList.get(0)).setCount(alarmDataSheetVOList.size());
alarmDataSheetVOS.add(alarmDataSheetVOList.get(0));
});
if (query.getSize().intValue() == -1) {
@@ -114,7 +114,7 @@
public BladeFile exportAlarm(AlarmShiftSearchExcelVO vo) {
BladeFile bladeFile;
- List<SuperAlarm> superAlarms = this.alarmMapper.selectListAlarmByShift(LocalDateTimeUtils.formatTimeLocalDate(vo.getStartTime(), "yyyyMMdd"), LocalDateTimeUtils.formatTimeLocalDate(vo.getEndTime(), "yyyyMMdd"), vo.getWorkstationId());
+ List<SuperAlarm> superAlarms = this.alarmMapper.selectListAlarmByShift(Integer.parseInt(LocalDateTimeUtils.formatTimeLocalDate(vo.getStartTime(), "yyyyMMdd")) , Integer.parseInt(LocalDateTimeUtils.formatTimeLocalDate(vo.getEndTime(), "yyyyMMdd")), vo.getWorkstationId());
superAlarms = FilterOffUtils.filterOffDay(superAlarms, OpenTypeEnums.ALARM_ANALYSIS);
superAlarms.sort(Comparator.comparing(SuperAggregate::getFactoryDate));
Collections.reverse(superAlarms);
@@ -246,7 +246,12 @@
if (Func.isNull(vo.getWorkstationId())) {
return new AlarmSummaryGraphVO();
}
- List<SuperAlarm> alarms = this.alarmMapper.queryAlarm(null, vo, DateUtil.format(vo.getQueryTime(), "yyyyMMdd"));
+ List<SuperAlarm> alarms = this.alarmMapper.queryAlarm(null, vo,Integer.parseInt(DateUtil.format(vo.getQueryTime(), "yyyyMMdd")) );
+ alarms.forEach(a -> {
+ if(a.getCode() == null) {
+ a.setCode("0");//榛樿缁�0锛岄伩鍏嶉敊璇�
+ }
+ });
Map<String, Integer> map = FilterOffUtils.filterOffDay(alarms, OpenTypeEnums.ALARM_ANALYSIS).stream().collect(Collectors.groupingBy((v0) -> {
return v0.getCode();
}, Collectors.reducing(0, e -> {
--
Gitblit v1.9.3