From c64caa25a8f6ffa026527828c1da3cd97c5c99c6 Mon Sep 17 00:00:00 2001
From: cuilei <ray_tsu1@163.com>
Date: 星期四, 17 七月 2025 16:22:34 +0800
Subject: [PATCH] 企业微信H5登录手动授权并获取手机号码适配修改，用户同步根据现场情况调整
---
lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/impl/MdcDowntimeServiceImpl.java | 32 +++++++++++++++++++++++++++++++-
1 files changed, 31 insertions(+), 1 deletions(-)
diff --git a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/impl/MdcDowntimeServiceImpl.java b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/impl/MdcDowntimeServiceImpl.java
index 8826b16..c7dff38 100644
--- a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/impl/MdcDowntimeServiceImpl.java
+++ b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/impl/MdcDowntimeServiceImpl.java
@@ -6,17 +6,21 @@
import org.apache.commons.lang3.StringUtils;
import org.jeecg.modules.mdc.dto.MdcDowntimeDto;
import org.jeecg.modules.mdc.entity.MdcDowntime;
+import org.jeecg.modules.mdc.entity.MdcEquipment;
+import org.jeecg.modules.mdc.entity.MdcStandardProcessDuration;
import org.jeecg.modules.mdc.mapper.MdcDowntimeMapper;
import org.jeecg.modules.mdc.service.IMdcDowntimeService;
import org.jeecg.modules.mdc.service.IMdcEquipmentService;
import org.jeecg.modules.mdc.util.DateUtils;
import org.jeecg.modules.mdc.vo.MdcDowntimeVo;
+import org.springframework.beans.BeanUtils;
import org.springframework.stereotype.Service;
import javax.annotation.Resource;
import javax.servlet.http.HttpServletRequest;
import java.util.ArrayList;
import java.util.Collections;
+import java.util.Date;
import java.util.List;
/**
@@ -62,12 +66,38 @@
List<MdcDowntime> mdcDowntimeList = this.baseMapper.findPlanTimeDuration(equipmentId, validDate, closeType);
if (mdcDowntimeList != null && !mdcDowntimeList.isEmpty()) {
for (MdcDowntime mdcDowntime : mdcDowntimeList) {
- result = DateUtils.differentMinutes(mdcDowntime.getStartDate(), mdcDowntime.getEndDate()) + result;
+// Date startDate = DateUtils.toDate(mdcDowntime.getTheDate() + " " + mdcDowntime.getStartTime(), DateUtils.STR_DATE_TIME_SMALL);
+// Date endDate = DateUtils.toDate(mdcDowntime.getTheDate() + " " + mdcDowntime.getEndTime(), DateUtils.STR_DATE_TIME_SMALL);
+ result = mdcDowntime.getDownLong() + result;
}
}
return result;
}
+ /**
+ * 娣诲姞
+ * @param mdcDowntime
+ * @return
+ */
+ @Override
+ public boolean saveDowntime(MdcDowntime mdcDowntime) {
+ boolean result = false;
+ String[] equipmentIds = mdcDowntime.getEquipmentIds().split(",");
+ for (String equipmentId : equipmentIds) {
+ MdcEquipment mdcEquipment = mdcEquipmentService.findEquipmentNameByEquipmentId(equipmentId);
+ MdcDowntime downtime = new MdcDowntime();
+ BeanUtils.copyProperties(mdcDowntime, downtime);
+ downtime.setEquipmentId(mdcEquipment.getEquipmentId());
+ downtime.setEquipmentName(mdcEquipment.getEquipmentName());
+ boolean b = super.save(downtime);
+ if (b) {
+ result = true;
+ }
+ }
+
+ return result;
+ }
+
private List<String> getEquipmentIds(String userId, MdcDowntimeVo mdcDowntimeVo) {
if (StringUtils.isNotEmpty(mdcDowntimeVo.getEquipmentId())) {
return Collections.singletonList(mdcDowntimeVo.getEquipmentId());
--
Gitblit v1.9.3