From db8133b419aeceed88dbfc2c48cd35509c782375 Mon Sep 17 00:00:00 2001
From: Lius <Lius2225@163.com>
Date: 星期三, 18 六月 2025 11:48:11 +0800
Subject: [PATCH] 设备故障率和去除故障时间利用率算法调整
---
lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/IMdcEquipmentRunningSectionService.java | 3
lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/mapper/MdcEquipmentFaultInfoMapper.java | 3
lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/impl/MdcEquipmentFaultInfoServiceImpl.java | 188 ++++++++++++++++++++++++++--------------------
lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/impl/MdcEquipmentRunningSectionServiceImpl.java | 5 +
lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/mapper/xml/MdcEquipmentRunningSectionMapper.xml | 4 +
lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/mapper/xml/MdcEquipmentFaultInfoMapper.xml | 4 +
lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/job/CollectEquipmentDataMonthJob.java | 2
lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/mapper/MdcEquipmentRunningSectionMapper.java | 2
8 files changed, 127 insertions(+), 84 deletions(-)
diff --git a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/job/CollectEquipmentDataMonthJob.java b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/job/CollectEquipmentDataMonthJob.java
index 5617bc7..9de3a6f 100644
--- a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/job/CollectEquipmentDataMonthJob.java
+++ b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/job/CollectEquipmentDataMonthJob.java
@@ -111,7 +111,7 @@
mdcEquipmentStatisticalInfoMonth.setUtilizationRate(mdcEquipmentStatisticalDto.getProcessLong().divide((new BigDecimal("86400").multiply(mdcEquipmentStatisticalDto.getDayNum())), 4, RoundingMode.HALF_UP));
mdcEquipmentStatisticalInfoMonth.setFaultLong(mdcEquipmentStatisticalDto.getFaultLong().intValue());
mdcEquipmentStatisticalInfoMonth.setFaultRate(mdcEquipmentStatisticalDto.getFaultRate());
- mdcEquipmentStatisticalInfoMonth.setRemoveFaultRate(mdcEquipmentStatisticalDto.getRemoveFaultRate());
+ mdcEquipmentStatisticalInfoMonth.setRemoveFaultRate(mdcEquipmentStatisticalDto.getRemoveFaultRate().divide(new BigDecimal("100"), 4, RoundingMode.HALF_UP));
mdcEquipmentStatisticalInfoMonth.setRemoveFaultRunLong(mdcEquipmentStatisticalDto.getRemoveFaultRunLong().intValue());
}
mdcEquipmentStatisticalInfoMonthList.add(mdcEquipmentStatisticalInfoMonth);
diff --git a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/mapper/MdcEquipmentFaultInfoMapper.java b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/mapper/MdcEquipmentFaultInfoMapper.java
index 11cc065..0726a92 100644
--- a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/mapper/MdcEquipmentFaultInfoMapper.java
+++ b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/mapper/MdcEquipmentFaultInfoMapper.java
@@ -16,4 +16,7 @@
public interface MdcEquipmentFaultInfoMapper extends BaseMapper<MdcEquipmentFaultInfo> {
List<EquFaultRecord> findFaultRecord(@Param("equipmentIdList") List<String> equipmentIdList, @Param("startTime") String startTime, @Param("endTime") String endTime);
+
+ String getMaxStaticsData();
+
}
diff --git a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/mapper/MdcEquipmentRunningSectionMapper.java b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/mapper/MdcEquipmentRunningSectionMapper.java
index 602ee5c..38c8714 100644
--- a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/mapper/MdcEquipmentRunningSectionMapper.java
+++ b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/mapper/MdcEquipmentRunningSectionMapper.java
@@ -81,4 +81,6 @@
List<MdcEquipmentWaitSectionDto> findWaitList(@Param("date") String date);
List<EquFaultRecord> findFaultList(@Param("equipmentId") String equipmentId, @Param("startTime") Date startTime, @Param("endTime") Date endTime);
+
+ MdcEquipmentRunningSection getFirstRecord();
}
diff --git a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/mapper/xml/MdcEquipmentFaultInfoMapper.xml b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/mapper/xml/MdcEquipmentFaultInfoMapper.xml
index 35d17f7..3136e97 100644
--- a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/mapper/xml/MdcEquipmentFaultInfoMapper.xml
+++ b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/mapper/xml/MdcEquipmentFaultInfoMapper.xml
@@ -23,4 +23,8 @@
</foreach>
AND t1.report_status != 'ABOLISH'
</select>
+
+ <select id="getMaxStaticsData" resultType="java.lang.String">
+ SELECT TOP 1 the_date FROM mdc_equipment_fault_info ORDER BY the_date DESC
+ </select>
</mapper>
\ No newline at end of file
diff --git a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/mapper/xml/MdcEquipmentRunningSectionMapper.xml b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/mapper/xml/MdcEquipmentRunningSectionMapper.xml
index b2eeea9..964540d 100644
--- a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/mapper/xml/MdcEquipmentRunningSectionMapper.xml
+++ b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/mapper/xml/MdcEquipmentRunningSectionMapper.xml
@@ -207,5 +207,9 @@
AND t1.report_status != 'ABOLISH'
</select>
+ <select id="getFirstRecord" resultType="org.jeecg.modules.mdc.entity.MdcEquipmentRunningSection">
+ SELECT TOP 1 * FROM mdc_equipment_running_section ORDER BY start_time
+ </select>
+
</mapper>
\ No newline at end of file
diff --git a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/IMdcEquipmentRunningSectionService.java b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/IMdcEquipmentRunningSectionService.java
index 9cbf340..697f76e 100644
--- a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/IMdcEquipmentRunningSectionService.java
+++ b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/IMdcEquipmentRunningSectionService.java
@@ -90,4 +90,7 @@
List<Integer> getDataList(String equipmentId, Date date);
List<MdcEquipmentWaitSectionDto> findWaitList(String date);
+
+ MdcEquipmentRunningSection getFirstRecord();
+
}
diff --git a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/impl/MdcEquipmentFaultInfoServiceImpl.java b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/impl/MdcEquipmentFaultInfoServiceImpl.java
index 3a35ec8..83fa48f 100644
--- a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/impl/MdcEquipmentFaultInfoServiceImpl.java
+++ b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/impl/MdcEquipmentFaultInfoServiceImpl.java
@@ -48,12 +48,31 @@
@Override
@Transactional(rollbackFor = {Exception.class})
public void runningAllEquFaultStatistical(String dateTime) {
- String validDate = LocalDate.now().minusDays(1).toString().replaceAll("-", "");
+ Date initDate = null;
+
if (StringUtils.isNotBlank(dateTime)) {
- validDate = DateUtils.format(DateUtils.toDate(dateTime, DateUtils.STRDATE), DateUtils.STRDATE);
+ initDate = DateUtils.toDate(dateTime, DateUtils.STRDATE);
+ } else {
+ // 鍙栨渶鍚庣殑缁熻鏃堕棿
+ String date = this.baseMapper.getMaxStaticsData();
+ if (date != null) {
+ initDate = DateUtils.toDate(date, DateUtils.STRDATE);
+ } else {
+ // 鍒濇鍙栧�� 鍙栨渶鏃╂椂闂磋褰�
+ MdcEquipmentRunningSection equipmentRunningSection = mdcEquipmentRunningSectionService.getFirstRecord();
+ if (equipmentRunningSection != null) {
+ initDate = equipmentRunningSection.getStartTime();
+ }
+ }
+ }
+ Date endDate = DateUtils.addDays(DateUtils.getNow(), -1);
+ List<String> dateList = DateUtils.getDatesStringList2(initDate, endDate);
+
+ if (dateList.isEmpty()) {
+ return;
}
try {
- this.remove(new LambdaQueryWrapper<MdcEquipmentFaultInfo>().eq(MdcEquipmentFaultInfo::getTheDate, validDate));
+ this.remove(new LambdaQueryWrapper<MdcEquipmentFaultInfo>().in(MdcEquipmentFaultInfo::getTheDate, dateList));
} catch (Exception e) {
log.error("鍙傛暟鏍煎紡涓嶅", e);
}
@@ -63,13 +82,6 @@
return;
}
- Map<String, MdcEquipmentFaultInfo> map = new HashMap<>();
- String finalValidDate = validDate;
- equipmentList.forEach(equipment -> {
- MdcEquipmentFaultInfo mdcEquipmentFaultInfo = new MdcEquipmentFaultInfo(equipment.getEquipmentid(), finalValidDate);
- map.put(equipment.getEquipmentid(), mdcEquipmentFaultInfo);
- });
-
String planTime = "00:00:00";
MdcSystemParameters mdcSystemParameters = mdcSystemParametersService.getOne(new LambdaQueryWrapper<MdcSystemParameters>().eq(MdcSystemParameters::getCode, "equip_log_statis_time"));
if (mdcSystemParameters != null) {
@@ -77,88 +89,98 @@
}
List<String> equipmentIdList = equipmentList.stream().map(Equipment::getEquipmentid).collect(Collectors.toList());
- String startTime = DateUtils.format(DateUtils.setTimeForDay(DateUtils.toDate(validDate, DateUtils.STRDATE), planTime), DateUtils.STR_DATE_TIME_SMALL);
- Date start = DateUtils.toDate(startTime, DateUtils.STR_DATE_TIME_SMALL);
- String endTime = DateUtils.format(DateUtils.addDays(DateUtils.toDate(startTime, DateUtils.STR_DATE_TIME_SMALL), 1), DateUtils.STR_DATE_TIME_SMALL);
- Date end = DateUtils.toDate(endTime, DateUtils.STR_DATE_TIME_SMALL);
- //鏌ヨ鏁呴殰璁板綍
- List<EquFaultRecord> equFaultRecordList = this.baseMapper.findFaultRecord(equipmentIdList, startTime, endTime);
- if (equFaultRecordList != null && !equFaultRecordList.isEmpty()) {
- // 淇暣鏃堕棿
- Map<String, List<EquFaultRecord>> equFaultRecordMap = equFaultRecordList.stream().collect(Collectors.groupingBy(EquFaultRecord::getEquipmentId));
- map.forEach((key, value1) -> {
- MdcEquipmentFaultInfo equFaultRecords = value1;
- if (equFaultRecordMap.containsKey(key)) {
- List<EquFaultRecord> value = equFaultRecordMap.get(key);
- long faultLong = calculateTotalFaultDuration(value, start, end);
- equFaultRecords.setFaultLong((int) faultLong);
- if (faultLong != 0) {
- equFaultRecords.setFaultRate(new BigDecimal(faultLong).divide(new BigDecimal("864"), 2, RoundingMode.HALF_UP));
- }
- // 璁＄畻鍘婚櫎鏁呴殰鏃堕暱鐨勫姞宸ユ椂闂�
- // step.1 鏌ヨ鍔犲伐鏃堕棿
- List<MdcEquipmentRunningSection> mdcEquipmentRunningSections = mdcEquipmentRunningSectionService.listEquipmentRunningSectionRun(key, start.getTime(), end.getTime());
- if (mdcEquipmentRunningSections != null && !mdcEquipmentRunningSections.isEmpty()) {
- // 鏃堕棿淇
- if (mdcEquipmentRunningSections.get(0).getStartTime().before(start)) {
- mdcEquipmentRunningSections.get(0).setStartTime(start);
+
+ for (String validDate : dateList) {
+ Map<String, MdcEquipmentFaultInfo> map = new HashMap<>();
+ String finalValidDate = validDate;
+ equipmentList.forEach(equipment -> {
+ MdcEquipmentFaultInfo mdcEquipmentFaultInfo = new MdcEquipmentFaultInfo(equipment.getEquipmentid(), finalValidDate);
+ map.put(equipment.getEquipmentid(), mdcEquipmentFaultInfo);
+ });
+
+ String startTime = DateUtils.format(DateUtils.setTimeForDay(DateUtils.toDate(validDate, DateUtils.STRDATE), planTime), DateUtils.STR_DATE_TIME_SMALL);
+ Date start = DateUtils.toDate(startTime, DateUtils.STR_DATE_TIME_SMALL);
+ String endTime = DateUtils.format(DateUtils.addDays(DateUtils.toDate(startTime, DateUtils.STR_DATE_TIME_SMALL), 1), DateUtils.STR_DATE_TIME_SMALL);
+ Date end = DateUtils.toDate(endTime, DateUtils.STR_DATE_TIME_SMALL);
+ //鏌ヨ鏁呴殰璁板綍
+ List<EquFaultRecord> equFaultRecordList = this.baseMapper.findFaultRecord(equipmentIdList, startTime, endTime);
+ if (equFaultRecordList != null && !equFaultRecordList.isEmpty()) {
+ // 淇暣鏃堕棿
+ Map<String, List<EquFaultRecord>> equFaultRecordMap = equFaultRecordList.stream().collect(Collectors.groupingBy(EquFaultRecord::getEquipmentId));
+ map.forEach((key, value1) -> {
+ MdcEquipmentFaultInfo equFaultRecords = value1;
+ if (equFaultRecordMap.containsKey(key)) {
+ List<EquFaultRecord> value = equFaultRecordMap.get(key);
+ long faultLong = calculateTotalFaultDuration(value, start, end);
+ equFaultRecords.setFaultLong((int) faultLong);
+ if (faultLong != 0) {
+ equFaultRecords.setFaultRate(new BigDecimal(faultLong).divide(new BigDecimal("864"), 2, RoundingMode.HALF_UP));
}
- if (mdcEquipmentRunningSections.size() > 1) {
- if (mdcEquipmentRunningSections.get(mdcEquipmentRunningSections.size() - 1).getEndTime().after(end)) {
- mdcEquipmentRunningSections.get(mdcEquipmentRunningSections.size() - 1).setEndTime(end);
+ // 璁＄畻鍘婚櫎鏁呴殰鏃堕暱鐨勫姞宸ユ椂闂�
+ // step.1 鏌ヨ鍔犲伐鏃堕棿
+ List<MdcEquipmentRunningSection> mdcEquipmentRunningSections = mdcEquipmentRunningSectionService.listEquipmentRunningSectionRun(key, start.getTime(), end.getTime());
+ if (mdcEquipmentRunningSections != null && !mdcEquipmentRunningSections.isEmpty()) {
+ // 鏃堕棿淇
+ if (mdcEquipmentRunningSections.get(0).getStartTime().before(start)) {
+ mdcEquipmentRunningSections.get(0).setStartTime(start);
}
- } else {
- if (mdcEquipmentRunningSections.get(0).getEndTime().after(end)) {
- mdcEquipmentRunningSections.get(0).setEndTime(end);
+ if (mdcEquipmentRunningSections.size() > 1) {
+ if (mdcEquipmentRunningSections.get(mdcEquipmentRunningSections.size() - 1).getEndTime().after(end)) {
+ mdcEquipmentRunningSections.get(mdcEquipmentRunningSections.size() - 1).setEndTime(end);
+ }
+ } else {
+ if (mdcEquipmentRunningSections.get(0).getEndTime().after(end)) {
+ mdcEquipmentRunningSections.get(0).setEndTime(end);
+ }
+ }
+ List<MdcEquipmentRunningSection> collect = mdcEquipmentRunningSections.stream().filter(mdcEquipmentRunningSection -> mdcEquipmentRunningSection.getStatus() == 3).collect(Collectors.toList());
+ if (!collect.isEmpty()) {
+ // step.2 璁＄畻鍘婚櫎鏁呴殰鏃堕暱鐨勫姞宸ユ椂闂�
+ long processingTime = calculateProcessingTimeWithoutFaults(collect, value, start, end);
+ equFaultRecords.setRemoveFaultRunLong((int) processingTime);
+ if (faultLong != 0 && faultLong != 86400) {
+ // 璁＄畻鍘婚櫎鏁呴殰鏃堕暱鐨勫埄鐢ㄧ巼
+ BigDecimal removeFaultRate = new BigDecimal(processingTime).divide(new BigDecimal("864").subtract(new BigDecimal(faultLong)), 2, RoundingMode.HALF_UP);
+ equFaultRecords.setRemoveFaultRate(removeFaultRate);
+ }
}
}
- List<MdcEquipmentRunningSection> collect = mdcEquipmentRunningSections.stream().filter(mdcEquipmentRunningSection -> mdcEquipmentRunningSection.getStatus() == 3).collect(Collectors.toList());
- if (!collect.isEmpty()) {
- // step.2 璁＄畻鍘婚櫎鏁呴殰鏃堕暱鐨勫姞宸ユ椂闂�
- long processingTime = calculateProcessingTimeWithoutFaults(collect, value, start, end);
- equFaultRecords.setRemoveFaultRunLong((int) processingTime);
- if (faultLong != 0 && faultLong != 86400) {
+ } else {
+ List<MdcEquipmentRunningSection> mdcEquipmentRunningSections = mdcEquipmentRunningSectionService.listEquipmentRunningSectionRun(key, start.getTime(), end.getTime());
+ if (mdcEquipmentRunningSections != null && !mdcEquipmentRunningSections.isEmpty()) {
+ // 鏃堕棿淇
+ if (mdcEquipmentRunningSections.get(0).getStartTime().before(start)) {
+ mdcEquipmentRunningSections.get(0).setStartTime(start);
+ }
+ if (mdcEquipmentRunningSections.size() > 1) {
+ if (mdcEquipmentRunningSections.get(mdcEquipmentRunningSections.size() - 1).getEndTime().after(end)) {
+ mdcEquipmentRunningSections.get(mdcEquipmentRunningSections.size() - 1).setEndTime(end);
+ }
+ } else {
+ if (mdcEquipmentRunningSections.get(0).getEndTime().after(end)) {
+ mdcEquipmentRunningSections.get(0).setEndTime(end);
+ }
+ }
+ List<MdcEquipmentRunningSection> collect = mdcEquipmentRunningSections.stream().filter(mdcEquipmentRunningSection -> mdcEquipmentRunningSection.getStatus() == 3).collect(Collectors.toList());
+
+ if (!collect.isEmpty()) {
+ long totalProcessingTime = 0;
+ for (MdcEquipmentRunningSection mdcEquipmentRunningSection : collect) {
+ totalProcessingTime += ChronoUnit.SECONDS.between(DateUtils.convertToLocalDateTime(mdcEquipmentRunningSection.getStartTime()), DateUtils.convertToLocalDateTime(mdcEquipmentRunningSection.getEndTime()));
+ }
+ equFaultRecords.setRemoveFaultRunLong((int) totalProcessingTime);
// 璁＄畻鍘婚櫎鏁呴殰鏃堕暱鐨勫埄鐢ㄧ巼
- BigDecimal removeFaultRate = new BigDecimal(processingTime).divide(new BigDecimal("864").subtract(new BigDecimal(faultLong)), 2, RoundingMode.HALF_UP);
+ BigDecimal removeFaultRate = new BigDecimal(totalProcessingTime).divide(new BigDecimal("864"), 2, RoundingMode.HALF_UP);
equFaultRecords.setRemoveFaultRate(removeFaultRate);
}
}
}
- } else {
- List<MdcEquipmentRunningSection> mdcEquipmentRunningSections = mdcEquipmentRunningSectionService.listEquipmentRunningSectionRun(key, start.getTime(), end.getTime());
- if (mdcEquipmentRunningSections != null && !mdcEquipmentRunningSections.isEmpty()) {
- // 鏃堕棿淇
- if (mdcEquipmentRunningSections.get(0).getStartTime().before(start)) {
- mdcEquipmentRunningSections.get(0).setStartTime(start);
- }
- if (mdcEquipmentRunningSections.size() > 1) {
- if (mdcEquipmentRunningSections.get(mdcEquipmentRunningSections.size() - 1).getEndTime().after(end)) {
- mdcEquipmentRunningSections.get(mdcEquipmentRunningSections.size() - 1).setEndTime(end);
- }
- } else {
- if (mdcEquipmentRunningSections.get(0).getEndTime().after(end)) {
- mdcEquipmentRunningSections.get(0).setEndTime(end);
- }
- }
- List<MdcEquipmentRunningSection> collect = mdcEquipmentRunningSections.stream().filter(mdcEquipmentRunningSection -> mdcEquipmentRunningSection.getStatus() == 3).collect(Collectors.toList());
-
- if (!collect.isEmpty()) {
- long totalProcessingTime = 0;
- for (MdcEquipmentRunningSection mdcEquipmentRunningSection : collect) {
- totalProcessingTime += ChronoUnit.SECONDS.between(DateUtils.convertToLocalDateTime(mdcEquipmentRunningSection.getStartTime()), DateUtils.convertToLocalDateTime(mdcEquipmentRunningSection.getEndTime()));
- }
- equFaultRecords.setRemoveFaultRunLong((int) totalProcessingTime);
- // 璁＄畻鍘婚櫎鏁呴殰鏃堕暱鐨勫埄鐢ㄧ巼
- BigDecimal removeFaultRate = new BigDecimal(totalProcessingTime).divide(new BigDecimal("864"), 2, RoundingMode.HALF_UP);
- equFaultRecords.setRemoveFaultRate(removeFaultRate);
- }
- }
- }
- map.put(key, equFaultRecords);
- });
- }
- if (!map.isEmpty()) {
- this.saveBatch(new ArrayList<>(map.values()));
+ map.put(key, equFaultRecords);
+ });
+ }
+ if (!map.isEmpty()) {
+ this.saveBatch(new ArrayList<>(map.values()));
+ }
}
}
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 d4e04f0..5db88df 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
@@ -841,6 +841,11 @@
return this.baseMapper.findWaitList(date);
}
+ @Override
+ public MdcEquipmentRunningSection getFirstRecord() {
+ return this.baseMapper.getFirstRecord();
+ }
+
private Map<String, List<MdcEquipmentRunningSectionDto>> logCharts(MdcEquipmentRunningSectionVo equipmentRunningSectionVo, String date) {
Map<String, List<MdcEquipmentRunningSectionDto>> map = new HashMap<>();
List<MdcEquipmentRunningSectionDto> normal = new ArrayList<>();
--
Gitblit v1.9.3