From 078e94627c72eb6cada22a6e5478b003cff57f4c Mon Sep 17 00:00:00 2001
From: Lius <Lius2225@163.com>
Date: 星期二, 31 十二月 2024 11:11:24 +0800
Subject: [PATCH] update
---
lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/job/TransferTableDataJob.java | 20 +++++++++++++++++++-
lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/impl/MdcEquipmentRunningSectionServiceImpl.java | 14 +++++++++-----
lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/entity/MdcImplementLedgers.java | 10 +++++-----
lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/impl/MdcOverallEquipmentEfficiencyServiceImpl.java | 2 +-
4 files changed, 34 insertions(+), 12 deletions(-)
diff --git a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/entity/MdcImplementLedgers.java b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/entity/MdcImplementLedgers.java
index 752a9ec..973b938 100644
--- a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/entity/MdcImplementLedgers.java
+++ b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/entity/MdcImplementLedgers.java
@@ -77,7 +77,7 @@
/**
* 璁惧瀹夋斁浣嶇疆
*/
- @Excel(name = "璁惧瀹夋斁浣嶇疆", width = 15)
+ @Excel(name = "璁惧瀹夋斁浣嶇疆", width = 20)
@ApiModelProperty(value = "璁惧瀹夋斁浣嶇疆")
private String equipmentPosition;
/**
@@ -89,13 +89,13 @@
/**
* MDC瀹夎鎯呭喌(鏄�/鍚�)
*/
- @Excel(name = "MDC瀹夎鎯呭喌(鏄�/鍚�)", width = 15)
+ @Excel(name = "MDC瀹夎鎯呭喌", width = 15, replace={"鏄痏Y","鍚N"})
@ApiModelProperty(value = "MDC瀹夎鎯呭喌(鏄�/鍚�)")
private String isMdcInstall;
/**
* MDC纭欢瀹夎(鏄�/鍚�)
*/
- @Excel(name = "MDC纭欢瀹夎(鏄�/鍚�)", width = 15)
+ @Excel(name = "MDC纭欢瀹夎", width = 15, replace={"鏄痏Y","鍚N"})
@ApiModelProperty(value = "MDC纭欢瀹夎(鏄�/鍚�)")
private String isMdcHardwareInstall;
/**
@@ -107,13 +107,13 @@
/**
* DNC瀹夎鎯呭喌(鏄�/鍚�)
*/
- @Excel(name = "DNC瀹夎鎯呭喌(鏄�/鍚�)", width = 15)
+ @Excel(name = "DNC瀹夎鎯呭喌", width = 15, replace={"鏄痏Y","鍚N"})
@ApiModelProperty(value = "DNC瀹夎鎯呭喌(鏄�/鍚�)")
private String isDncInstall;
/**
* DNC纭欢瀹夎(鏄�/鍚�)
*/
- @Excel(name = "DNC纭欢瀹夎(鏄�/鍚�)", width = 15)
+ @Excel(name = "DNC纭欢瀹夎", width = 15, replace={"鏄痏Y","鍚N"})
@ApiModelProperty(value = "DNC纭欢瀹夎(鏄�/鍚�)")
private String isDncHardwareInstall;
/**
diff --git a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/job/TransferTableDataJob.java b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/job/TransferTableDataJob.java
index 2bc6d5f..16045d3 100644
--- a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/job/TransferTableDataJob.java
+++ b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/job/TransferTableDataJob.java
@@ -27,6 +27,15 @@
@Slf4j
public class TransferTableDataJob implements Job {
+ /**
+ * 鑻ュ弬鏁板彉閲忓悕淇敼 QuartzJobController涓篃闇�瀵瑰簲淇敼 杩佺Щ鏃堕棿 渚嬶細 30
+ */
+ private String parameter;
+
+ public void setParameter(String parameter) {
+ this.parameter = parameter;
+ }
+
@Resource
private ISysQuartzLogService sysQuartzLogService;
@@ -48,6 +57,7 @@
if (byJobClassName != null && !byJobClassName.isEmpty()) {
quartzLog.setJobId(byJobClassName.get(0).getId());
}
+ quartzLog.setParams(this.parameter);
log.info("鏁版嵁杩佺Щ浠诲姟 TransferTableDataJob start! 鏃堕棿:" + DateUtils.getNow());
long startTime = System.currentTimeMillis();
try {
@@ -55,7 +65,15 @@
Equipment info = new Equipment();
info.setSavetablename("EquipmentLog");
list.add(info);
- String day = DateUtils.format(DateUtils.plusTime(DateUtils.getNow(), -30), DateUtils.STR_DATE_TIME_SMALL);
+ int dayNum = 30;
+ if (StringUtils.isNotBlank(this.parameter)) {
+ try {
+ dayNum = Integer.parseInt(this.parameter);
+ } catch (Exception e) {
+ log.error("鍙傛暟鏍煎紡涓嶅", e);
+ }
+ }
+ String day = DateUtils.format(DateUtils.plusTime(DateUtils.getNow(), -dayNum), DateUtils.STR_DATE_TIME_SMALL);
for (Equipment equipment : list) {
if (StringUtils.isNotBlank(equipment.getSavetablename())) {
String tableName = equipmentService.checkTableExists(equipment.getSavetablename());
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 28ebc28..30a29d3 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
@@ -519,9 +519,13 @@
//鑾峰彇running杩愯鐨勬棩蹇楄褰�
List<MdcEquipmentRunningSection> list = this.equipmentRunningTracesLog(equipment.getEquipmentid());
if (list != null && !list.isEmpty()) {
- List<MdcEquipmentRunningSection> equipList = addSequenceNumber(list); //娣诲姞绋嬪簭鍙�
- this.ergodicTrim(equipList);
- super.saveBatch(equipList);
+ try {
+ List<MdcEquipmentRunningSection> equipList = addSequenceNumber(list); //娣诲姞绋嬪簭鍙�
+ this.ergodicTrim(equipList);
+ super.saveBatch(equipList);
+ } catch (Exception e) {
+ log.error("娣诲姞绋嬪簭鍙峰嚭鐜板紓甯�:", e);
+ }
}
//鑾峰彇鎶ヨ鐨勬棩蹇楄褰�
List<MdcEquipmentRunningSection> errorList = this.equipmentRunningTracesErrorLog(equipment.getEquipmentid());
@@ -964,9 +968,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);
-// }
+
} else {
long count = differentSecond / 86400;
if (count % 86400 > 0) {
diff --git a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/impl/MdcOverallEquipmentEfficiencyServiceImpl.java b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/impl/MdcOverallEquipmentEfficiencyServiceImpl.java
index b5557b3..441a6a1 100644
--- a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/impl/MdcOverallEquipmentEfficiencyServiceImpl.java
+++ b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/impl/MdcOverallEquipmentEfficiencyServiceImpl.java
@@ -174,7 +174,7 @@
*/
// mdcOverallEquipmentEfficiency.getShiftTimeCount() - plannedMaintenanceDuration - conferenceTrainingDuration - otherRestDuration
// 璐熻嵎鏃堕棿(鍒嗛挓)
- BigDecimal loadTime = mdcOverallEquipmentEfficiency.getMonthActualWorkDayTimeCount().subtract(plannedMaintenanceDuration).subtract(conferenceTrainingDuration).subtract(otherRestDuration).add(overtime);
+ BigDecimal loadTime = mdcOverallEquipmentEfficiency.getMonthActualWorkDayTimeCount().subtract(plannedMaintenanceDuration).subtract(conferenceTrainingDuration).subtract(otherRestDuration);
if (loadTime.compareTo(BigDecimal.ZERO) < 0) {
loadTime = BigDecimal.ZERO;
}
--
Gitblit v1.9.3