From 61bd1f27cb0f83890bfcd9aec6257eda13c0fc4d Mon Sep 17 00:00:00 2001
From: Lius <Lius2225@163.com>
Date: 星期二, 04 三月 2025 10:43:32 +0800
Subject: [PATCH] 看板周利用率，日利用率
---
lxzn-module-mdc/src/main/java/org/jeecg/modules/screen/dto/UtilizationRateDto.java | 8
lxzn-module-mdc/src/main/java/org/jeecg/modules/screen/service/impl/MdcLargeScreenServiceImpl.java | 124 +++++++++++++++++++++---
lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/mapper/xml/MdcEquipmentStatisticalInfoMapper.xml | 25 +++++
lxzn-module-mdc/src/main/java/org/jeecg/modules/screen/service/MdcLargeScreenService.java | 17 +++
lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/mapper/MdcEquipmentStatisticalInfoMapper.java | 4
lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/IMdcEquipmentStatisticalInfoService.java | 16 +++
lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/impl/MdcEquipmentStatisticalInfoServiceImpl.java | 20 ++++
lxzn-module-mdc/src/main/java/org/jeecg/modules/screen/dto/UtilizationRate.java | 8
lxzn-module-mdc/src/main/java/org/jeecg/modules/screen/controller/MdcLargeScreenController.java | 14 ++
lxzn-module-mdc/src/main/java/org/jeecg/modules/screen/dto/UtilizationDayDto.java | 10 +-
lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/util/DateUtils.java | 23 ++++
11 files changed, 239 insertions(+), 30 deletions(-)
diff --git a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/mapper/MdcEquipmentStatisticalInfoMapper.java b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/mapper/MdcEquipmentStatisticalInfoMapper.java
index ccdc298..91f4be1 100644
--- a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/mapper/MdcEquipmentStatisticalInfoMapper.java
+++ b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/mapper/MdcEquipmentStatisticalInfoMapper.java
@@ -33,4 +33,8 @@
BigDecimal computeUtilizationMonth(@Param("productionId") String productionId, @Param("startDate") String startDate, @Param("endDate") String endDate);
BigDecimal computeUtilizationMonthTotal(@Param("productionId") String productionId, @Param("startDate") String startDate, @Param("endDate") String endDate);
+
+ BigDecimal computeUtilizationWeek(@Param("productionId") String productionId, @Param("date") String date);
+
+ BigDecimal computeUtilizationWeekTotal(@Param("productionId") String productionId, @Param("date") String date);
}
diff --git a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/mapper/xml/MdcEquipmentStatisticalInfoMapper.xml b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/mapper/xml/MdcEquipmentStatisticalInfoMapper.xml
index 0f53f20..ba6871d 100644
--- a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/mapper/xml/MdcEquipmentStatisticalInfoMapper.xml
+++ b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/mapper/xml/MdcEquipmentStatisticalInfoMapper.xml
@@ -43,4 +43,29 @@
t4.parent_id = #{productionId}
AND t1.the_date BETWEEN #{startDate} AND #{endDate}
</select>
+
+ <select id="computeUtilizationWeek" resultType="java.math.BigDecimal">
+ SELECT AVG
+ ( t1.process_long ) AS processLong
+ FROM
+ mdc_equipment_statistical_info t1
+ INNER JOIN mdc_equipment t2 ON t1.equipment_id = t2.equipment_id
+ INNER JOIN mdc_production_equipment t3 ON t2.id = t3.equipment_id
+ AND t3.production_id = #{productionId}
+ WHERE
+ t1.the_date = #{date}
+ </select>
+
+ <select id="computeUtilizationWeekTotal" resultType="java.math.BigDecimal">
+ SELECT AVG
+ ( t1.process_long ) AS processLong
+ FROM
+ mdc_equipment_statistical_info t1
+ INNER JOIN mdc_equipment t2 ON t1.equipment_id = t2.equipment_id
+ INNER JOIN mdc_production_equipment t3 ON t2.id = t3.equipment_id
+ INNER JOIN mdc_production t4 ON t3.production_id = t4.id
+ WHERE
+ t4.parent_id = #{productionId}
+ AND t1.the_date = #{date}
+ </select>
</mapper>
\ No newline at end of file
diff --git a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/IMdcEquipmentStatisticalInfoService.java b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/IMdcEquipmentStatisticalInfoService.java
index 9e5116a..b4e98bb 100644
--- a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/IMdcEquipmentStatisticalInfoService.java
+++ b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/IMdcEquipmentStatisticalInfoService.java
@@ -55,4 +55,20 @@
* @return
*/
BigDecimal computeUtilizationMonthTotal(String productionId, String startDate, String endDate);
+
+ /**
+ *
+ * @param productionId
+ * @param date
+ * @return
+ */
+ BigDecimal computeUtilizationWeek(String productionId, String date);
+
+ /**
+ *
+ * @param productionId
+ * @param date
+ * @return
+ */
+ BigDecimal computeUtilizationWeekTotal(String productionId, String date);
}
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 994ec9e..ba6f2bf 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
@@ -118,6 +118,26 @@
}
}
+ @Override
+ public BigDecimal computeUtilizationWeek(String productionId, String date) {
+ BigDecimal processLong = this.baseMapper.computeUtilizationWeek(productionId, date);
+ if (processLong != null && processLong.compareTo(BigDecimal.ZERO) > 0) {
+ return processLong.divide(new BigDecimal("864"), 2, RoundingMode.HALF_UP);
+ } else {
+ return BigDecimal.ZERO;
+ }
+ }
+
+ @Override
+ public BigDecimal computeUtilizationWeekTotal(String productionId, String date) {
+ BigDecimal processLong = this.baseMapper.computeUtilizationWeekTotal(productionId, date);
+ if (processLong != null && processLong.compareTo(BigDecimal.ZERO) > 0) {
+ return processLong.divide(new BigDecimal("864"), 2, RoundingMode.HALF_UP);
+ } else {
+ return BigDecimal.ZERO;
+ }
+ }
+
private List<EquipmentStatisticalInfo> dataHandle(List<MdcEquipmentStatisticalInfo> list) {
List<EquipmentStatisticalInfo> result = new ArrayList<>();
list.forEach(item -> {
diff --git a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/util/DateUtils.java b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/util/DateUtils.java
index 0129bd6..2021bb7 100644
--- a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/util/DateUtils.java
+++ b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/util/DateUtils.java
@@ -15,6 +15,7 @@
import java.util.*;
import java.util.regex.Pattern;
import java.util.stream.Collectors;
+import java.util.stream.IntStream;
import java.util.stream.Stream;
public class DateUtils {
@@ -1132,6 +1133,28 @@
return dateRanges;
}
+ /**
+ * 鑾峰彇杩�7澶╂棩鏈� 鏍煎紡涓� yyyy-MM-dd
+ * @return
+ */
+ public static List<String> getNearWeek() {
+ // 鑾峰彇浠婂ぉ鐨勬棩鏈�
+ LocalDate today = LocalDate.now();
+
+ // 瀹氫箟鏃ユ湡鏍煎紡鍖栧櫒
+ DateTimeFormatter formatter = DateTimeFormatter.ofPattern(STR_DATE);
+
+ // 鑾峰彇骞舵牸寮忓寲鍓嶄竷澶╃殑鏃ユ湡
+ return IntStream.rangeClosed(1, 7)
+ .mapToObj(today::minusDays)
+ .sorted(LocalDate::compareTo)
+ .map(date -> date.format(formatter))
+ .collect(Collectors.toList());
+
+ }
+
+
+
}
diff --git a/lxzn-module-mdc/src/main/java/org/jeecg/modules/screen/controller/MdcLargeScreenController.java b/lxzn-module-mdc/src/main/java/org/jeecg/modules/screen/controller/MdcLargeScreenController.java
index d075732..c1e8e28 100644
--- a/lxzn-module-mdc/src/main/java/org/jeecg/modules/screen/controller/MdcLargeScreenController.java
+++ b/lxzn-module-mdc/src/main/java/org/jeecg/modules/screen/controller/MdcLargeScreenController.java
@@ -41,6 +41,18 @@
return Result.OK(result);
}
-// public Result<?> monthUtilizationTendency(String)
+ @ApiOperation(value = "澶у睆鐪嬫澘-鍛ㄥ埄鐢ㄧ巼瓒嬪娍", notes = "澶у睆鐪嬫澘-鍛ㄥ埄鐢ㄧ巼瓒嬪娍")
+ @GetMapping("/weekUtilizationTendency")
+ public Result<?> weekUtilizationTendency(String productionId) {
+ Map<String, Object> result = mdcLargeScreenService.weekUtilizationTendency(productionId);
+ return Result.OK(result);
+ }
+
+ @ApiOperation(value = "澶у睆鐪嬫澘-鏃ュ埄鐢ㄧ巼瓒嬪娍", notes = "澶у睆鐪嬫澘-鏃ュ埄鐢ㄧ巼瓒嬪娍")
+ @GetMapping("/dayUtilizationTendency")
+ public Result<?> dayUtilizationTendency(String productionId) {
+ Map<String, Object> result = mdcLargeScreenService.dayUtilizationTendency(productionId);
+ return Result.OK(result);
+ }
}
diff --git a/lxzn-module-mdc/src/main/java/org/jeecg/modules/screen/dto/UtilizationMonth.java b/lxzn-module-mdc/src/main/java/org/jeecg/modules/screen/dto/UtilizationDayDto.java
similarity index 62%
copy from lxzn-module-mdc/src/main/java/org/jeecg/modules/screen/dto/UtilizationMonth.java
copy to lxzn-module-mdc/src/main/java/org/jeecg/modules/screen/dto/UtilizationDayDto.java
index 3cccda3..48d4ad1 100644
--- a/lxzn-module-mdc/src/main/java/org/jeecg/modules/screen/dto/UtilizationMonth.java
+++ b/lxzn-module-mdc/src/main/java/org/jeecg/modules/screen/dto/UtilizationDayDto.java
@@ -8,15 +8,15 @@
/**
* @Author: Lius
- * @CreateTime: 2025-03-03
+ * @CreateTime: 2025-03-04
* @Description:
*/
@Data
-@ApiModel(value = "鏈堝埄鐢ㄧ巼resp", description = "鏈堝埄鐢ㄧ巼resp")
-public class UtilizationMonth {
+@ApiModel(value = "鏃ュ埄鐢ㄧ巼resp", description = "鏃ュ埄鐢ㄧ巼resp")
+public class UtilizationDayDto {
- @ApiModelProperty(value = "鏈堜唤")
- private String month;
+ @ApiModelProperty(value = "宸ユ鍚嶇О")
+ private String productionName;
@ApiModelProperty(value = "鍒╃敤鐜�")
private BigDecimal utilizationRate = BigDecimal.ZERO;
diff --git a/lxzn-module-mdc/src/main/java/org/jeecg/modules/screen/dto/UtilizationMonth.java b/lxzn-module-mdc/src/main/java/org/jeecg/modules/screen/dto/UtilizationRate.java
similarity index 66%
rename from lxzn-module-mdc/src/main/java/org/jeecg/modules/screen/dto/UtilizationMonth.java
rename to lxzn-module-mdc/src/main/java/org/jeecg/modules/screen/dto/UtilizationRate.java
index 3cccda3..b3d3bce 100644
--- a/lxzn-module-mdc/src/main/java/org/jeecg/modules/screen/dto/UtilizationMonth.java
+++ b/lxzn-module-mdc/src/main/java/org/jeecg/modules/screen/dto/UtilizationRate.java
@@ -12,11 +12,11 @@
* @Description:
*/
@Data
-@ApiModel(value = "鏈堝埄鐢ㄧ巼resp", description = "鏈堝埄鐢ㄧ巼resp")
-public class UtilizationMonth {
+@ApiModel(value = "鍒╃敤鐜噐esp", description = "鍒╃敤鐜噐esp")
+public class UtilizationRate {
- @ApiModelProperty(value = "鏈堜唤")
- private String month;
+ @ApiModelProperty(value = "鏃ユ湡(1鏈�/2025-03-04)")
+ private String date;
@ApiModelProperty(value = "鍒╃敤鐜�")
private BigDecimal utilizationRate = BigDecimal.ZERO;
diff --git a/lxzn-module-mdc/src/main/java/org/jeecg/modules/screen/dto/UtilizationMonthDto.java b/lxzn-module-mdc/src/main/java/org/jeecg/modules/screen/dto/UtilizationRateDto.java
similarity index 73%
rename from lxzn-module-mdc/src/main/java/org/jeecg/modules/screen/dto/UtilizationMonthDto.java
rename to lxzn-module-mdc/src/main/java/org/jeecg/modules/screen/dto/UtilizationRateDto.java
index bb52b5e..ccc3fb0 100644
--- a/lxzn-module-mdc/src/main/java/org/jeecg/modules/screen/dto/UtilizationMonthDto.java
+++ b/lxzn-module-mdc/src/main/java/org/jeecg/modules/screen/dto/UtilizationRateDto.java
@@ -13,8 +13,8 @@
* @Description:
*/
@Data
-@ApiModel(value = "鏈堝埄鐢ㄧ巼resp", description = "鏈堝埄鐢ㄧ巼resp")
-public class UtilizationMonthDto {
+@ApiModel(value = "鍒╃敤鐜噐esp", description = "鍒╃敤鐜噐esp")
+public class UtilizationRateDto {
/**
* 宸ユid
@@ -29,7 +29,7 @@
/**
* 鏈堝埄鐢ㄧ巼
*/
- @ApiModelProperty(value = "鏈堝埄鐢ㄧ巼")
- private List<UtilizationMonth> utilizationMonthList;
+ @ApiModelProperty(value = "鍒╃敤鐜囬泦鍚�")
+ private List<UtilizationRate> utilizationMonthList;
}
diff --git a/lxzn-module-mdc/src/main/java/org/jeecg/modules/screen/service/MdcLargeScreenService.java b/lxzn-module-mdc/src/main/java/org/jeecg/modules/screen/service/MdcLargeScreenService.java
index bf5a962..140921c 100644
--- a/lxzn-module-mdc/src/main/java/org/jeecg/modules/screen/service/MdcLargeScreenService.java
+++ b/lxzn-module-mdc/src/main/java/org/jeecg/modules/screen/service/MdcLargeScreenService.java
@@ -26,4 +26,21 @@
* @return
*/
Map<String, Object> monthUtilizationTendency(String productionId);
+
+ /**
+ * 璁惧鍛ㄥ埄鐢ㄧ巼瓒嬪娍
+ *
+ * @param productionId
+ * @return
+ */
+ Map<String, Object> weekUtilizationTendency(String productionId);
+
+ /**
+ * 璁惧鏃ュ埄鐢ㄧ巼
+ *
+ * @param productionId
+ * @return
+ */
+ Map<String, Object> dayUtilizationTendency(String productionId);
+
}
diff --git a/lxzn-module-mdc/src/main/java/org/jeecg/modules/screen/service/impl/MdcLargeScreenServiceImpl.java b/lxzn-module-mdc/src/main/java/org/jeecg/modules/screen/service/impl/MdcLargeScreenServiceImpl.java
index b33f90f..89c26e7 100644
--- a/lxzn-module-mdc/src/main/java/org/jeecg/modules/screen/service/impl/MdcLargeScreenServiceImpl.java
+++ b/lxzn-module-mdc/src/main/java/org/jeecg/modules/screen/service/impl/MdcLargeScreenServiceImpl.java
@@ -8,8 +8,9 @@
import org.jeecg.modules.mdc.service.IMdcEquipmentStatisticalInfoService;
import org.jeecg.modules.mdc.util.DateUtils;
import org.jeecg.modules.screen.dto.EquipmentStatusOverview;
-import org.jeecg.modules.screen.dto.UtilizationMonth;
-import org.jeecg.modules.screen.dto.UtilizationMonthDto;
+import org.jeecg.modules.screen.dto.UtilizationDayDto;
+import org.jeecg.modules.screen.dto.UtilizationRate;
+import org.jeecg.modules.screen.dto.UtilizationRateDto;
import org.jeecg.modules.screen.service.MdcLargeScreenService;
import org.jeecg.modules.system.entity.MdcProduction;
import org.jeecg.modules.system.service.IMdcProductionService;
@@ -18,6 +19,7 @@
import javax.annotation.Resource;
import java.math.BigDecimal;
+import java.time.LocalDate;
import java.util.*;
import java.util.stream.Collectors;
@@ -115,12 +117,12 @@
result.put("dateList", dateList);
// 璁＄畻姣忎釜瀛愮敓浜х殑鏈堝害鍒╃敤鐜�
- List<UtilizationMonthDto> utilizationMonthDtoList = mdcProductionList.stream()
+ List<UtilizationRateDto> utilizationMonthDtoList = mdcProductionList.stream()
.map(mdcProduction -> createUtilizationMonthDto(mdcProduction, dateLists))
.collect(Collectors.toList());
// 璁＄畻鎬诲巶鐨勬湀搴﹀埄鐢ㄧ巼
- UtilizationMonthDto totalUtilizationMonthDto = createTotalUtilizationMonthDto(productionId, dateLists);
+ UtilizationRateDto totalUtilizationMonthDto = createTotalUtilizationMonthDto(productionId, dateLists);
utilizationMonthDtoList.add(totalUtilizationMonthDto);
result.put("dataList", utilizationMonthDtoList);
@@ -128,14 +130,104 @@
}
/**
+ * 璁惧鍛ㄥ埄鐢ㄧ巼瓒嬪娍
+ *
+ * @param productionId
+ * @return
+ */
+ @Override
+ public Map<String, Object> weekUtilizationTendency(String productionId) {
+ Map<String, Object> result = new HashMap<>();
+
+ // 鑾峰彇瀛愮敓浜у垪琛�
+ List<MdcProduction> mdcProductionList = mdcProductionService.list(
+ new LambdaQueryWrapper<MdcProduction>().eq(MdcProduction::getParentId, productionId)
+ );
+
+ if (mdcProductionList == null || mdcProductionList.isEmpty()) {
+ return result;
+ }
+ // 鐢熸垚鍛ㄨ寖鍥�
+ List<String> dateList = DateUtils.getNearWeek();
+ result.put("dateList", dateList);
+ // 璁＄畻姣忎釜宸ユ鐨勫埄鐢ㄧ巼
+ List<UtilizationRateDto> utilizationMonthDtoList = new ArrayList<>();
+ for (MdcProduction mdcProduction : mdcProductionList) {
+ UtilizationRateDto utilizationRateDto = new UtilizationRateDto();
+ utilizationRateDto.setProductionId(mdcProduction.getId());
+ utilizationRateDto.setProductionName(mdcProduction.getProductionName());
+ List<UtilizationRate> utilizationRates = dateList.stream()
+ .map(date -> {
+ UtilizationRate utilizationMonth = new UtilizationRate();
+ utilizationMonth.setDate(date);
+ BigDecimal utilizationRate = mdcEquipmentStatisticalInfoService.computeUtilizationWeek(productionId, date.replaceAll("-", ""));
+ utilizationMonth.setUtilizationRate(utilizationRate);
+ return utilizationMonth;
+ })
+ .collect(Collectors.toList());
+ utilizationRateDto.setUtilizationMonthList(utilizationRates);
+ utilizationMonthDtoList.add(utilizationRateDto);
+ }
+ //璁＄畻鎬诲巶鐨勫埄鐢ㄧ巼
+ UtilizationRateDto utilizationRateDto = new UtilizationRateDto();
+ utilizationRateDto.setProductionName("鎬诲巶");
+ List<UtilizationRate> utilizationRates = dateList.stream()
+ .map(date -> {
+ UtilizationRate utilizationMonth = new UtilizationRate();
+ utilizationMonth.setDate(date);
+ BigDecimal utilizationRate = mdcEquipmentStatisticalInfoService.computeUtilizationWeekTotal(productionId, date.replaceAll("-", ""));
+ utilizationMonth.setUtilizationRate(utilizationRate);
+ return utilizationMonth;
+ })
+ .collect(Collectors.toList());
+ utilizationRateDto.setUtilizationMonthList(utilizationRates);
+ utilizationMonthDtoList.add(utilizationRateDto);
+ result.put("dataList", utilizationMonthDtoList);
+ return result;
+ }
+
+ /**
+ * 璁惧鏃ュ埄鐢ㄧ巼
+ *
+ * @param productionId
+ * @return
+ */
+ @Override
+ public Map<String, Object> dayUtilizationTendency(String productionId) {
+ Map<String, Object> result = new HashMap<>();
+ // 鑾峰彇瀛愮敓浜у垪琛�
+ List<MdcProduction> mdcProductionList = mdcProductionService.list(
+ new LambdaQueryWrapper<MdcProduction>().eq(MdcProduction::getParentId, productionId)
+ );
+
+ if (mdcProductionList == null || mdcProductionList.isEmpty()) {
+ return result;
+ }
+ List<String> productionList = mdcProductionList.stream().map(MdcProduction::getProductionName).collect(Collectors.toList());
+ result.put("productionList", productionList);
+
+ String date = LocalDate.now().minusDays(1).toString().replaceAll("-", "");
+ List<UtilizationDayDto> utilizationDayDtos = new ArrayList<>();
+ for (MdcProduction mdcProduction : mdcProductionList) {
+ UtilizationDayDto utilizationDayDto = new UtilizationDayDto();
+ utilizationDayDto.setProductionName(mdcProduction.getProductionName());
+ BigDecimal utilizationRate = mdcEquipmentStatisticalInfoService.computeUtilizationWeekTotal(mdcProduction.getId(), date);
+ utilizationDayDto.setUtilizationRate(utilizationRate);
+ utilizationDayDtos.add(utilizationDayDto);
+ }
+ result.put("dataList", utilizationDayDtos);
+ return result;
+ }
+
+ /**
* 鍒涘缓瀛愮敓浜х殑鏈堝害鍒╃敤鐜� DTO
*/
- private UtilizationMonthDto createUtilizationMonthDto(MdcProduction mdcProduction, List<String[]> dateLists) {
- UtilizationMonthDto utilizationMonthDto = new UtilizationMonthDto();
+ private UtilizationRateDto createUtilizationMonthDto(MdcProduction mdcProduction, List<String[]> dateLists) {
+ UtilizationRateDto utilizationMonthDto = new UtilizationRateDto();
utilizationMonthDto.setProductionId(mdcProduction.getId());
utilizationMonthDto.setProductionName(mdcProduction.getProductionName());
- List<UtilizationMonth> utilizationMonthList = calculateUtilizationRates(mdcProduction.getId(), dateLists);
+ List<UtilizationRate> utilizationMonthList = calculateUtilizationRates(mdcProduction.getId(), dateLists);
utilizationMonthDto.setUtilizationMonthList(utilizationMonthList);
return utilizationMonthDto;
@@ -144,11 +236,11 @@
/**
* 鍒涘缓鎬诲巶鐨勬湀搴﹀埄鐢ㄧ巼 DTO
*/
- private UtilizationMonthDto createTotalUtilizationMonthDto(String productionId, List<String[]> dateLists) {
- UtilizationMonthDto utilizationMonthDto = new UtilizationMonthDto();
+ private UtilizationRateDto createTotalUtilizationMonthDto(String productionId, List<String[]> dateLists) {
+ UtilizationRateDto utilizationMonthDto = new UtilizationRateDto();
utilizationMonthDto.setProductionName("鎬诲巶");
- List<UtilizationMonth> utilizationMonthList = calculateUtilizationRatesTotal(productionId, dateLists);
+ List<UtilizationRate> utilizationMonthList = calculateUtilizationRatesTotal(productionId, dateLists);
utilizationMonthDto.setUtilizationMonthList(utilizationMonthList);
return utilizationMonthDto;
@@ -157,11 +249,11 @@
/**
* 璁＄畻瀛愮敓浜х殑鏈堝害鍒╃敤鐜�
*/
- private List<UtilizationMonth> calculateUtilizationRates(String productionId, List<String[]> dateLists) {
+ private List<UtilizationRate> calculateUtilizationRates(String productionId, List<String[]> dateLists) {
return dateLists.stream()
.map(dates -> {
- UtilizationMonth utilizationMonth = new UtilizationMonth();
- utilizationMonth.setMonth(dates[2]);
+ UtilizationRate utilizationMonth = new UtilizationRate();
+ utilizationMonth.setDate(dates[2]);
BigDecimal utilizationRate = mdcEquipmentStatisticalInfoService.computeUtilizationMonth(productionId, dates[0], dates[1]);
utilizationMonth.setUtilizationRate(utilizationRate);
return utilizationMonth;
@@ -172,11 +264,11 @@
/**
* 璁＄畻鎬诲巶鐨勬湀搴﹀埄鐢ㄧ巼
*/
- private List<UtilizationMonth> calculateUtilizationRatesTotal(String productionId, List<String[]> dateLists) {
+ private List<UtilizationRate> calculateUtilizationRatesTotal(String productionId, List<String[]> dateLists) {
return dateLists.stream()
.map(dates -> {
- UtilizationMonth utilizationMonth = new UtilizationMonth();
- utilizationMonth.setMonth(dates[2]);
+ UtilizationRate utilizationMonth = new UtilizationRate();
+ utilizationMonth.setDate(dates[2]);
BigDecimal utilizationRate = mdcEquipmentStatisticalInfoService.computeUtilizationMonthTotal(productionId, dates[0], dates[1]);
utilizationMonth.setUtilizationRate(utilizationRate);
return utilizationMonth;
--
Gitblit v1.9.3